原産地はpriceとかより先に来て欲しい

sesta · Aug 31, 2020 · 1b7fd01 · 1b7fd01
1 parent 974a30c
commit 1b7fd01
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 19 deletions.
diff --git a/flutter/lib/app/pages/drink.dart b/flutter/lib/app/pages/drink.dart
@@ -206,9 +206,9 @@ class _DrinkPageState extends State<DrinkPage> {
                         children: <Widget>[
                           Label(widget.drink.drinkType.label),
                           widget.drink.subDrinkType == SubDrinkType.Empty ? Container(width: 0) : Label(widget.drink.subDrinkType.label),
+                          widget.drink.origin == '' ? Container(width: 0) : Label(widget.drink.origin),
                           widget.drink.price == 0 ? Container(width: 0) : Label(widget.drink.priceString),
                           widget.drink.place == '' ? Container(width: 0) : Label(widget.drink.place),
-                          widget.drink.origin == '' ? Container(width: 0) : Label(widget.drink.origin),
                         ],
                       ),
                     ),

diff --git a/flutter/lib/app/widget/drink_form.dart b/flutter/lib/app/widget/drink_form.dart
@@ -195,59 +195,59 @@ class DrinkForm extends StatelessWidget {
 
           Row(
             children: <Widget>[
-              Container(
-                width: 104,
+              Expanded(
                 child: Column(
                   crossAxisAlignment: CrossAxisAlignment.start,
                   children: <Widget>[
                     Text(
-                      '価格',
+                      '原産地',
                       style: Theme.of(context).textTheme.subtitle2,
                     ),
                     TextInput(
-                      priceController,
+                      originController,
                       textStyle: Theme.of(context).textTheme.subtitle1,
-                      inputType: InputType.Number,
+                      placeholder: 'イタリア、新潟',
                     ),
                   ],
                 ),
               ),
-              Padding(padding: EdgeInsets.only(right: 24)),
+            ],
+          ),
+          Padding(padding: EdgeInsets.only(bottom: 24)),
 
-              Expanded(
+          Row(
+            children: <Widget>[
+              Container(
+                width: 104,
                 child: Column(
                   crossAxisAlignment: CrossAxisAlignment.start,
                   children: <Widget>[
                     Text(
-                      '購入した場所',
+                      '価格',
                       style: Theme.of(context).textTheme.subtitle2,
                     ),
                     TextInput(
-                      placeController,
+                      priceController,
                       textStyle: Theme.of(context).textTheme.subtitle1,
-                      placeholder: 'Amazon、飲食店、プレゼント',
+                      inputType: InputType.Number,
                     ),
                   ],
                 ),
               ),
-            ],
-          ),
-          Padding(padding: EdgeInsets.only(bottom: 24)),
+              Padding(padding: EdgeInsets.only(right: 24)),
 
-          Row(
-            children: <Widget>[
               Expanded(
                 child: Column(
                   crossAxisAlignment: CrossAxisAlignment.start,
                   children: <Widget>[
                     Text(
-                      '原産地',
+                      '購入した場所',
                       style: Theme.of(context).textTheme.subtitle2,
                     ),
                     TextInput(
-                      originController,
+                      placeController,
                       textStyle: Theme.of(context).textTheme.subtitle1,
-                      placeholder: 'イタリア、新潟',
+                      placeholder: 'Amazon、飲食店、プレゼント',
                     ),
                   ],
                 ),