From 18c464b1c933acaddb4d55dc6cad7b34eb1e4a28 Mon Sep 17 00:00:00 2001
From: Hixie <github.com@spam.hixie.ch>
Date: Tue, 25 Aug 2015 10:18:36 -0700
Subject: [PATCH] Replace Flex to Row and Column in tests and examples.

This still leaves Flex and FlexDirection available. At some point once
people have transitioned to Row/Column we should rename Flex to _Flex
and stop reexporting FlexDirection from basic.dart.
---
 engine/src/flutter/examples/address_book/lib/main.dart |  5 ++---
 engine/src/flutter/examples/mine_digger/lib/main.dart  | 10 +++-------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/engine/src/flutter/examples/address_book/lib/main.dart b/engine/src/flutter/examples/address_book/lib/main.dart
index ebc84a9de0a..ca7bd08c29b 100644
--- a/engine/src/flutter/examples/address_book/lib/main.dart
+++ b/engine/src/flutter/examples/address_book/lib/main.dart
@@ -20,7 +20,7 @@ class Field extends Component {
   final String placeholder;
 
   Widget build() {
-    return new Flex([
+    return new Row([
         new Padding(
           padding: const EdgeDims.symmetric(horizontal: 16.0),
           child: new Icon(type: icon, size: 24)
@@ -31,8 +31,7 @@ class Field extends Component {
             placeholder: placeholder
           )
         )
-      ],
-      direction: FlexDirection.horizontal
+      ]
     );
   }
 }
diff --git a/engine/src/flutter/examples/mine_digger/lib/main.dart b/engine/src/flutter/examples/mine_digger/lib/main.dart
index 8b0b919aebf..ede98ad244b 100644
--- a/engine/src/flutter/examples/mine_digger/lib/main.dart
+++ b/engine/src/flutter/examples/mine_digger/lib/main.dart
@@ -96,7 +96,7 @@ class MineDiggerApp extends App {
 
   Widget buildBoard() {
     bool hasCoveredCell = false;
-    List<Flex> flexRows = <Flex>[];
+    List<Row> flexRows = <Row>[];
     for (int iy = 0; iy != 9; iy++) {
       List<Widget> row = <Widget>[];
       for (int ix = 0; ix != 9; ix++) {
@@ -139,9 +139,8 @@ class MineDiggerApp extends App {
         }
       }
       flexRows.add(
-        new Flex(
+        new Row(
           row,
-          direction: FlexDirection.horizontal,
           justifyContent: FlexJustifyContent.center,
           key: new Key.stringify(iy)
         )
@@ -159,10 +158,7 @@ class MineDiggerApp extends App {
       padding: new EdgeDims.all(10.0),
       margin: new EdgeDims.all(10.0),
       decoration: new BoxDecoration(backgroundColor: const Color(0xFF6B6B6B)),
-      child: new Flex(
-        flexRows,
-        direction: FlexDirection.vertical
-      )
+      child: new Column(flexRows)
     );
   }