Your deck page redesigned

wwwxkz · May 3, 2020 · 463e59a · 463e59a
1 parent 3a412f6
commit 463e59a
Show file tree

Hide file tree

Showing 4 changed files with 183 additions and 162 deletions.
diff --git a/lib/pages/initial/course_selection.dart b/lib/pages/initial/course_selection.dart
@@ -131,7 +131,6 @@ class _ListPageState extends State<ListPage> {
         );
 
     final makeBody = Container(
-        color: Colors.white,
         margin: EdgeInsets.symmetric(vertical: 60.0, horizontal: 20.0),
         child: Column(
           crossAxisAlignment: CrossAxisAlignment.start,
@@ -155,6 +154,7 @@ class _ListPageState extends State<ListPage> {
         ));
 
     final bottomAppBar = BottomAppBar(
+      elevation: 20,
       child: Row(
         mainAxisAlignment: MainAxisAlignment.spaceAround,
         children: <Widget>[
@@ -217,6 +217,7 @@ class _ListPageState extends State<ListPage> {
     );
 
     return Scaffold(
+      backgroundColor: Colors.white,
       body: makeBody,
       bottomNavigationBar: bottomAppBar,
     );

diff --git a/lib/pages/readDeck/study.dart b/lib/pages/readDeck/study.dart
@@ -305,50 +305,58 @@ class _StudyPageState extends State<StudyPage> {
     return Column(
       children: <Widget>[
         Row(
-          mainAxisAlignment: MainAxisAlignment.spaceAround,
+          mainAxisAlignment: MainAxisAlignment.spaceBetween,
           children: <Widget>[
-            new DropdownButton<String>(
-              items: <String>['Espanhol', 'Francês', 'Inglês', 'Português']
-                  .map((String value) {
-                return new DropdownMenuItem<String>(
-                  value: value,
-                  child: new Text(value),
-                );
-              }).toList(),
-              onChanged: (String value) {
-                setState(() => input1 = value);
-                if (value == "Espanhol") {
-                  flutterTts.setLanguage("es-ES");
-                }
-                if (value == "Francês") {
-                  flutterTts.setLanguage("fr-FR");
-                }
-                if (value == "Inglês") {
-                  flutterTts.setLanguage("en-US");
-                }
-                if (value == "Português") {
-                  flutterTts.setLanguage("pt-BR");
-                }
-              },
-              hint: Text(input1,
-                  style: TextStyle(
-                    color: Colors.grey[850],
-                  )),
-            ),
-            new DropdownButton<String>(
-              items: <String>['Voz 1', 'Voz 2', 'Voz 3'].map((String value) {
-                return new DropdownMenuItem<String>(
-                  value: value,
-                  child: new Text(value),
-                );
-              }).toList(),
-              onChanged: (String value) {
-                setState(() => input2 = value);
-              },
-              hint: Text(input2,
-                  style: TextStyle(
-                    color: Colors.grey[850],
-                  )),
+            SizedBox(),
+            Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: <Widget>[
+                new DropdownButton<String>(
+                  items: <String>['Espanhol', 'Francês', 'Inglês', 'Português']
+                      .map((String value) {
+                    return new DropdownMenuItem<String>(
+                      value: value,
+                      child: new Text(value),
+                    );
+                  }).toList(),
+                  onChanged: (String value) {
+                    setState(() => input1 = value);
+                    if (value == "Espanhol") {
+                      flutterTts.setLanguage("es-ES");
+                    }
+                    if (value == "Francês") {
+                      flutterTts.setLanguage("fr-FR");
+                    }
+                    if (value == "Inglês") {
+                      flutterTts.setLanguage("en-US");
+                    }
+                    if (value == "Português") {
+                      flutterTts.setLanguage("pt-BR");
+                    }
+                  },
+                  hint: Text(input1,
+                      style: TextStyle(
+                        color: Colors.grey[850],
+                      )),
+                ),
+                new DropdownButton<String>(
+                  elevation: 1,
+                  items:
+                      <String>['Voz 1', 'Voz 2', 'Voz 3'].map((String value) {
+                    return new DropdownMenuItem<String>(
+                      value: value,
+                      child: new Text(value),
+                    );
+                  }).toList(),
+                  onChanged: (String value) {
+                    setState(() => input2 = value);
+                  },
+                  hint: Text(input2,
+                      style: TextStyle(
+                        color: Colors.grey[850],
+                      )),
+                ),
+              ],
             ),
           ],
         ),

diff --git a/lib/pages/shopping/store.dart b/lib/pages/shopping/store.dart
@@ -118,25 +118,23 @@ class _StorePageState extends State<StorePage> {
   Widget _showBody() {
     return new Container(
       margin: EdgeInsets.symmetric(vertical: 30.0, horizontal: 20.0),
-      //color: Colors.grey[300],
-      padding: EdgeInsets.only(bottom: 200),
       child: _showNoteList(),
     );
   }
 
   Widget _showNoteList() {
     return Container(
-      alignment: Alignment.topLeft,
       child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
         children: <Widget>[
           Text(
-            'Decks',
+            'Shop',
             style: TextStyle(
                 color: Colors.black, fontWeight: FontWeight.w600, fontSize: 24),
           ),
           SizedBox(height: 10),
           Text(
-            "Em breve",
+            "Soon",
             style: TextStyle(fontSize: 18, color: Colors.grey),
           ),
         ],