improved code

kittean · Mar 26, 2023 · 6a64f8a · 6a64f8a
1 parent 93eb0ce
commit 6a64f8a
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 55 deletions.
diff --git a/lib/screens/local_music_page.dart b/lib/screens/local_music_page.dart
@@ -4,7 +4,6 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:musify/API/musify.dart';
 import 'package:musify/services/audio_manager.dart';
 import 'package:musify/services/offline_audio.dart';
-import 'package:musify/style/app_colors.dart';
 import 'package:musify/style/app_themes.dart';
 import 'package:musify/widgets/spinner.dart';
 import 'package:on_audio_query/on_audio_query.dart';
@@ -114,9 +113,7 @@ class _LocalMusicPageState extends State<LocalMusicPage> {
                         ),
                         child: Text(
                           AppLocalizations.of(context)!.playAll.toUpperCase(),
-                          style: TextStyle(
-                            color: isAccentWhite(),
-                          ),
+                          style: Theme.of(context).textTheme.bodyMedium,
                         ),
                       ),
                     ],

diff --git a/lib/screens/playlist_page.dart b/lib/screens/playlist_page.dart
@@ -3,7 +3,6 @@ import 'dart:math';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:musify/API/musify.dart';
-import 'package:musify/style/app_colors.dart';
 import 'package:musify/style/app_themes.dart';
 import 'package:musify/utilities/flutter_toast.dart';
 import 'package:musify/widgets/playlist_cube.dart';
@@ -119,11 +118,7 @@ class _PlaylistPageState extends State<PlaylistPage> {
       child: Text(
         widget.playlist['title'].toString(),
         textAlign: TextAlign.center,
-        style: TextStyle(
-          color: colorScheme.primary,
-          fontSize: 18,
-          fontWeight: FontWeight.w600,
-        ),
+        style: Theme.of(context).textTheme.bodyMedium,
       ),
     );
   }
@@ -132,36 +127,27 @@ class _PlaylistPageState extends State<PlaylistPage> {
     return Text(
       widget.playlist['header_desc'].toString(),
       textAlign: TextAlign.center,
-      style: TextStyle(
-        color: colorScheme.primary,
-        fontSize: 10,
-        fontWeight: FontWeight.w600,
-      ),
+      style: Theme.of(context).textTheme.bodySmall,
     );
   }
 
   Widget _buildPlayAllButton() {
-    return Padding(
-      padding: const EdgeInsets.symmetric(vertical: 10),
-      child: ElevatedButton(
-        onPressed: () {
-          setActivePlaylist(widget.playlist);
-          showToast(
-            AppLocalizations.of(context)!.queueInitText,
-          );
-        },
-        style: ButtonStyle(
-          backgroundColor: MaterialStateProperty.all<Color>(
-            colorScheme.primary,
-          ),
-        ),
-        child: Text(
-          AppLocalizations.of(context)!.playAll.toUpperCase(),
-          style: TextStyle(
-            color: isAccentWhite(),
-          ),
+    return ElevatedButton(
+      onPressed: () {
+        setActivePlaylist(widget.playlist);
+        showToast(
+          AppLocalizations.of(context)!.queueInitText,
+        );
+      },
+      style: ButtonStyle(
+        backgroundColor: MaterialStateProperty.all<Color>(
+          colorScheme.primary,
         ),
       ),
+      child: Text(
+        AppLocalizations.of(context)!.playAll.toUpperCase(),
+        style: Theme.of(context).textTheme.bodyMedium,
+      ),
     );
   }
 

diff --git a/lib/screens/setup_page.dart b/lib/screens/setup_page.dart
@@ -3,7 +3,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:musify/services/data_manager.dart';
 import 'package:musify/services/settings_manager.dart';
-import 'package:musify/style/app_colors.dart';
 import 'package:musify/style/app_themes.dart';
 import 'package:musify/widgets/marque.dart';
 
@@ -54,9 +53,7 @@ class _SetupPageState extends State<SetupPage> {
                     ),
                     child: Text(
                       AppLocalizations.of(context)!.add.toUpperCase(),
-                      style: TextStyle(
-                        color: isAccentWhite(),
-                      ),
+                      style: Theme.of(context).textTheme.bodyMedium,
                     ),
                   ),
                 ),

diff --git a/lib/screens/user_liked_songs_page.dart b/lib/screens/user_liked_songs_page.dart
@@ -2,7 +2,6 @@ import 'package:fluentui_system_icons/fluentui_system_icons.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:musify/API/musify.dart';
-import 'package:musify/style/app_colors.dart';
 import 'package:musify/style/app_themes.dart';
 import 'package:musify/widgets/song_bar.dart';
 
@@ -105,9 +104,7 @@ class _UserLikedSongsState extends State<UserLikedSongs> {
                         ),
                         child: Text(
                           AppLocalizations.of(context)!.playAll.toUpperCase(),
-                          style: TextStyle(
-                            color: isAccentWhite(),
-                          ),
+                          style: Theme.of(context).textTheme.bodyMedium,
                         ),
                       ),
                     ],

diff --git a/lib/screens/user_playlists_page.dart b/lib/screens/user_playlists_page.dart
@@ -2,7 +2,6 @@ import 'package:fluentui_system_icons/fluentui_system_icons.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:musify/API/musify.dart';
-import 'package:musify/style/app_colors.dart';
 import 'package:musify/style/app_themes.dart';
 import 'package:musify/utilities/flutter_toast.dart';
 import 'package:musify/widgets/playlist_cube.dart';
@@ -67,7 +66,7 @@ class _UserPlaylistsPageState extends State<UserPlaylistsPage> {
         backgroundColor: colorScheme.primary,
         child: Icon(
           FluentIcons.add_24_filled,
-          color: isAccentWhite(),
+          color: Theme.of(context).textTheme.bodyMedium!.color,
         ),
       ),
       body: SingleChildScrollView(

diff --git a/lib/style/app_colors.dart b/lib/style/app_colors.dart
@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:musify/style/app_themes.dart';
 
 final availableColors = <Color>[
   const Color(0xFF9ACD32),
@@ -88,9 +87,3 @@ MaterialColor getPrimarySwatch(Color color) {
     ),
   });
 }
-
-Color isAccentWhite() {
-  return colorScheme.primary != const Color(0xFFFFFFFF)
-      ? Colors.white
-      : Colors.black;
-}
diff --git a/lib/style/app_themes.dart b/lib/style/app_themes.dart
@@ -1,3 +1,4 @@
+import 'package:dynamic_color/dynamic_color.dart';
 import 'package:flutter/material.dart';
 import 'package:hive/hive.dart';
 import 'package:musify/style/app_colors.dart';
@@ -27,7 +28,7 @@ ThemeData getAppDarkTheme() {
     bottomSheetTheme: const BottomSheetThemeData(
       backgroundColor: Color(0xFF121212),
     ),
-    colorScheme: colorScheme,
+    colorScheme: colorScheme.harmonized(),
     visualDensity: VisualDensity.adaptivePlatformDensity,
     fontFamily: 'Ubuntu',
     useMaterial3: true,
@@ -86,7 +87,7 @@ ThemeData getAppLightTheme() {
   return ThemeData(
     scaffoldBackgroundColor: Colors.white,
     canvasColor: Colors.white,
-    colorScheme: colorScheme,
+    colorScheme: colorScheme.harmonized(),
     bottomSheetTheme: const BottomSheetThemeData(backgroundColor: Colors.white),
     appBarTheme: AppBarTheme(
       backgroundColor: Colors.white,

diff --git a/lib/utilities/flutter_toast.dart b/lib/utilities/flutter_toast.dart
@@ -1,11 +1,13 @@
+import 'package:flutter/material.dart';
 import 'package:fluttertoast/fluttertoast.dart';
-import 'package:musify/style/app_colors.dart';
 import 'package:musify/style/app_themes.dart';
 
 void showToast(String text) {
   Fluttertoast.showToast(
     backgroundColor: colorScheme.primary,
-    textColor: isAccentWhite(),
+    textColor: colorScheme.primary != const Color(0xFFFFFFFF)
+        ? Colors.white
+        : Colors.black,
     msg: text,
     toastLength: Toast.LENGTH_SHORT,
     gravity: ToastGravity.BOTTOM,