Uniform styling in settings.dart

raag-music · Nov 29, 2021 · e1eb1d7 · e1eb1d7
1 parent fc38026
commit e1eb1d7
Show file tree

Hide file tree

Showing 6 changed files with 51 additions and 52 deletions.
diff --git a/lib/model/SharedPreferences.dart b/lib/model/SharedPreferences.dart
@@ -18,13 +18,13 @@ class Preferences {
     return prefs.getBool(key) ?? false;
   }
 
-  void setString (String key, String value) async {
+  void setString(String key, String value) async {
     prefs = await SharedPreferences.getInstance();
     prefs.setString(key, value);
   }
 
-  Future<String> getString (String key) async {
+  Future<String> getString(String key) async {
     prefs = await SharedPreferences.getInstance();
     return prefs.getString(key);
   }
-}
+}
diff --git a/lib/view/download_music.dart b/lib/view/download_music.dart
@@ -230,7 +230,7 @@ class _DownloadMusicState extends State<DownloadMusic> {
             : SystemUiOverlayStyle.light,
         elevation: 0,
         leading: IconButton(
-            icon: Icon(Icons.arrow_back_ios_outlined),
+            icon: Icon(Icons.arrow_back_ios_rounded),
             onPressed: () => Navigator.pop(context)),
         title: Text(
             downloadMusicString,

diff --git a/lib/view/settings.dart b/lib/view/settings.dart
@@ -20,7 +20,7 @@ class Settings extends StatelessWidget {
           SliverAppBar(
             expandedHeight: screenHeight * 0.3,
             toolbarHeight: screenHeight * 0.08,
-            collapsedHeight: screenHeight * 0.1,
+            collapsedHeight: screenHeight * 0.15,
             systemOverlayStyle: themeProvider.darkTheme
                 ? SystemUiOverlayStyle.light
                 : SystemUiOverlayStyle.dark,
@@ -31,7 +31,9 @@ class Settings extends StatelessWidget {
               title: Text(settings,
                   style: Theme.of(context).textTheme.headline1),
             ),
-          ),
+            leading: IconButton(
+                icon: Icon(Icons.arrow_back_ios_rounded),
+                onPressed: () => Navigator.pop(context)),          ),
           SliverList(
             delegate: SliverChildListDelegate([
               SizedBox(height: screenHeight * 0.05),

diff --git a/lib/widgets/download_location_button_settings.dart b/lib/widgets/download_location_button_settings.dart
@@ -17,13 +17,9 @@ class DownloadLocationButton extends StatelessWidget {
           if (provider.appStorage != false) {
             provider.appStorage = false;
             Fluttertoast.showToast(
-                msg:
-                willBeStored,
-                toastLength: Toast.LENGTH_LONG);
+                msg: willBeStored, toastLength: Toast.LENGTH_LONG);
           } else {
-            Fluttertoast.showToast(
-                msg: y,
-                toastLength: Toast.LENGTH_LONG);
+            Fluttertoast.showToast(msg: y, toastLength: Toast.LENGTH_LONG);
             provider.appStorage = true;
           }
         },

diff --git a/lib/widgets/refresh_button.dart b/lib/widgets/refresh_button.dart
@@ -39,7 +39,9 @@ class RefreshButton extends StatelessWidget {
         },
         child: Padding(
           padding: const EdgeInsets.all(16.0),
-          child: Row(children: [
+          child: Row(
+            mainAxisAlignment: MainAxisAlignment.start,
+              children: [
             Container(
                 padding: EdgeInsets.all(8.0),
                 child: Icon(

diff --git a/lib/widgets/theme_button.dart b/lib/widgets/theme_button.dart
@@ -4,6 +4,7 @@ import 'package:provider/provider.dart';
 import 'package:raag/provider/settings_provider.dart';
 import 'package:raag/provider/theme.dart';
 import 'package:raag/model/strings.dart';
+
 class ThemeButton extends StatefulWidget {
   @override
   _ThemeButtonState createState() => _ThemeButtonState();
@@ -41,45 +42,43 @@ class _ThemeButtonState extends State<ThemeButton>
       provider.darkTheme ? controller.forward() : controller.reverse();
     }
 
-    return Container(
-      width: MediaQuery.of(context).size.width,
-      height: MediaQuery.of(context).size.height * 0.1,
-      child: Card(
-        elevation: 3,
-        child: InkWell(
-          splashColor: Colors.transparent,
-          onTap: () => changeTheme(),
-          child: Padding(
-            padding: const EdgeInsets.all(16.0),
-            child: Row(
-              children: [
-                AnimatedIconButton(
-                  size: screenWidth * 0.08,
-                  animationController: controller,
-                  initialIcon: (provider.darkTheme) ? 1:0,
-                  icons: [
-                    AnimatedIconItem(icon: nightIcon),
-                    AnimatedIconItem(icon: dayIcon),
-                  ],
-                  onPressed: () {},
-                ),
-                SizedBox(
-                  width: screenWidth * 0.04,
-                ),
-                Text(
-                  darktheme,
-                  style: Theme.of(context).textTheme.headline3,
-                ),
-                SizedBox(
-                  width: screenWidth * 0.3,
-                ),
-                Switch(
-                  activeColor: Theme.of(context).colorScheme.secondary,
-                  value: !provider.darkTheme,
-                  onChanged: (bool value) => changeTheme(),
-                )
-              ],
-            ),
+    return Card(
+      elevation: 3,
+      child: InkWell(
+        splashColor: Colors.transparent,
+        onTap: () => changeTheme(),
+        child: Padding(
+          padding: const EdgeInsets.symmetric(vertical: 16, horizontal: 12),
+          child: Row(
+            mainAxisAlignment: MainAxisAlignment.start,
+            children: [
+              AnimatedIconButton(
+                padding: EdgeInsets.all(8.0),
+                size: screenWidth * 0.08,
+                animationController: controller,
+                initialIcon: (provider.darkTheme) ? 1 : 0,
+                icons: [
+                  AnimatedIconItem(icon: nightIcon),
+                  AnimatedIconItem(icon: dayIcon),
+                ],
+                onPressed: () => changeTheme(),
+              ),
+              SizedBox(
+                width: screenWidth * 0.01,
+              ),
+              Text(
+                darktheme,
+                style: Theme.of(context).textTheme.headline3,
+              ),
+              SizedBox(
+                width: screenWidth * 0.3,
+              ),
+              Switch(
+                activeColor: Theme.of(context).colorScheme.secondary,
+                value: !provider.darkTheme,
+                onChanged: (bool value) => changeTheme(),
+              )
+            ],
           ),
         ),
       ),