Updated and migrated to Flutter 2.0

MrBananaPants · Mar 6, 2021 · 319e35c · 319e35c
1 parent 3fa3e1e
commit 319e35c
Show file tree

Hide file tree

Showing 5 changed files with 522 additions and 689 deletions.
diff --git a/lib/AboutPage.dart b/lib/AboutPage.dart
@@ -119,7 +119,7 @@ class MyAppState extends State<AboutPage> {
                       Padding(
                         padding: const EdgeInsets.fromLTRB(0, 0, 0, 0),
                         child: Text(
-                          "Flutter: 1.22.6",
+                          "Flutter: 2.0.1",
                           style: TextStyle(
                             color: Theme.of(context).textTheme.bodyText1.color,
                           ),

diff --git a/lib/SettingsPage.dart b/lib/SettingsPage.dart
@@ -91,8 +91,7 @@ class SettingsPageState extends State<SettingsPage> {
                             title: Text(
                               'Arduino LED',
                               style: TextStyle(
-                                color:
-                                    Theme.of(context).textTheme.bodyText1.color,
+                                color: Theme.of(context).textTheme.bodyText1.color,
                               ),
                             ),
                           ),
@@ -101,92 +100,74 @@ class SettingsPageState extends State<SettingsPage> {
                               cases: [
                                 Case(
                                   buttonThema == true,
-                                  builder: () => ButtonBar(
-                                    buttonHeight: 40,
-                                    buttonMinWidth:
-                                        SizeConfig.blockSizeHorizontal * 38,
-                                    alignment: MainAxisAlignment.spaceBetween,
-                                    children: [
-                                      OutlineButton(
-                                        shape: RoundedRectangleBorder(
-                                          borderRadius:
-                                              BorderRadius.circular(7),
-                                        ),
-                                        child: Text(
-                                          'AAN',
-                                          style: TextStyle(
-                                            color: Theme.of(context)
-                                                .textTheme
-                                                .bodyText2
-                                                .color,
+                                  builder: () => Padding(
+                                    padding: const EdgeInsets.all(8.0),
+                                    child: Row(
+                                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                                      children: [
+                                        OutlinedButton(
+                                          style: OutlinedButton.styleFrom(minimumSize: Size(SizeConfig.blockSizeHorizontal * 38, 40)),
+                                          child: Text(
+                                            'AAN',
+                                            style: TextStyle(
+                                              color: Theme.of(context).textTheme.bodyText2.color,
+                                            ),
                                           ),
+                                          onPressed: () {
+                                            setState(() {
+                                              changeThemeToAAN();
+                                            });
+                                          },
                                         ),
-                                        onPressed: () {
-                                          setState(() {
-                                            changeThemeToAAN();
-                                          });
-                                        },
-                                      ),
-                                      RaisedButton(
-                                        shape: RoundedRectangleBorder(
-                                          borderRadius:
-                                              BorderRadius.circular(7),
+                                        ElevatedButton(
+                                          style: ElevatedButton.styleFrom(minimumSize: Size(SizeConfig.blockSizeHorizontal * 38, 40)),
+                                          child: const Text('UIT'),
+                                          onPressed: () {
+                                            setState(() {
+                                              changeThemeToUIT();
+                                            });
+                                          },
                                         ),
-                                        color: Color(0xFF3D5AFE),
-                                        child: const Text('UIT'),
-                                        onPressed: () {
-                                          setState(() {
-                                            changeThemeToUIT();
-                                          });
-                                        },
-                                      ),
-                                    ],
+                                      ],
+                                    ),
                                   ),
                                 ),
                                 Case(
                                   buttonThema == false,
-                                  builder: () => ButtonBar(
-                                    buttonHeight: 40,
-                                    buttonMinWidth:
-                                        SizeConfig.blockSizeHorizontal * 38,
-                                    alignment: MainAxisAlignment.spaceBetween,
-                                    children: [
-                                      RaisedButton(
-                                        shape: RoundedRectangleBorder(
-                                            borderRadius:
-                                                BorderRadius.circular(7)),
-                                        color: Color(0xFF3D5AFE),
-                                        child: const Text('AAN'),
-                                        onPressed: () {
-                                          setState(
-                                            () {
-                                              changeThemeToAAN();
-                                            },
-                                          );
-                                        },
-                                      ),
-                                      OutlineButton(
-                                        shape: RoundedRectangleBorder(
-                                            borderRadius:
-                                                BorderRadius.circular(7)),
-                                        child: Text(
-                                          'UIT',
-                                          style: TextStyle(
-                                            color: Theme.of(context)
-                                                .textTheme
-                                                .bodyText2
-                                                .color,
+                                  builder: () => Padding(
+                                    padding: const EdgeInsets.all(8.0),
+                                    child: Row(
+                                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                                      children: [
+                                        ElevatedButton(
+                                          style: ElevatedButton.styleFrom(minimumSize: Size(SizeConfig.blockSizeHorizontal * 38, 40)),
+                                          child: const Text('AAN'),
+                                          onPressed: () {
+                                            setState(
+                                              () {
+                                                changeThemeToAAN();
+                                              },
+                                            );
+                                          },
+                                        ),
+                                        OutlinedButton(
+                                          style: OutlinedButton.styleFrom(minimumSize: Size(SizeConfig.blockSizeHorizontal * 38, 40)),
+                                          child: Text(
+                                            'UIT',
+                                            style: TextStyle(
+                                              color: Theme.of(context).textTheme.bodyText2.color,
+                                            ),
                                           ),
+                                          onPressed: () {
+                                            setState(
+                                              () {
+                                                changeThemeToUIT();
+                                              },
+                                            );
+                                          },
                                         ),
-                                        onPressed: () {
-                                          setState(
-                                            () {
-                                              changeThemeToUIT();
-                                            },
-                                          );
-                                        },
-                                      ),
-                                    ],
+                                      ],
+                                    ),
                                   ),
                                 ),
                               ],