fix: search field ios dark icon , lyrics tabbar ios background color

KRTirtho · Nov 24, 2022 · be56ad4 · be56ad4
1 parent 39a7794
commit be56ad4
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 5 deletions.
diff --git a/lib/components/Lyrics/Lyrics.dart b/lib/components/Lyrics/Lyrics.dart
@@ -46,16 +46,26 @@ class Lyrics extends HookConsumerWidget {
       extendBodyBehindAppBar: true,
       appBar: !kIsMacOS
           ? PageWindowTitleBar(
-              backgroundColor: Colors.transparent,
               toolbarOpacity: 0,
+              backgroundColor: Colors.transparent,
               center: PlatformTabBar(
                 isNavigational:
                     PlatformProperty.only(linux: true, other: false),
                 selectedIndex: index.value,
                 onSelectedIndexChanged: (value) => index.value = value,
+                backgroundColor:
+                    PlatformTheme.of(context).scaffoldBackgroundColor,
                 tabs: [
-                  PlatformTab(label: "Synced", icon: const SizedBox.shrink()),
-                  PlatformTab(label: "Genius", icon: const SizedBox.shrink()),
+                  PlatformTab(
+                    label: "Synced",
+                    icon: const SizedBox.shrink(),
+                    color: PlatformTextTheme.of(context).caption?.color,
+                  ),
+                  PlatformTab(
+                    label: "Genius",
+                    icon: const SizedBox.shrink(),
+                    color: PlatformTextTheme.of(context).caption?.color,
+                  ),
                 ],
               ),
             )

diff --git a/lib/components/Player/PlayerView.dart b/lib/components/Player/PlayerView.dart
@@ -63,7 +63,12 @@ class PlayerView extends HookConsumerWidget {
         backgroundColor: Colors.transparent,
         foregroundColor: paletteColor.titleTextColor,
         toolbarOpacity: 0,
-        automaticallyImplyLeading: true,
+        leading: PlatformBackButton(
+          color: PlatformProperty.only(
+            macos: Colors.transparent,
+            other: paletteColor.titleTextColor,
+          ).resolve(platform!),
+        ),
       ),
       extendBodyBehindAppBar: true,
       body: Container(

diff --git a/lib/components/Search/Search.dart b/lib/components/Search/Search.dart
@@ -89,6 +89,10 @@ class Search extends HookConsumerWidget {
                       ref.read(searchTermStateProvider.notifier).state = value;
                     },
                     prefixIcon: Icons.search_rounded,
+                    prefixIconColor: PlatformProperty.only(
+                      ios: PlatformTheme.of(context).textTheme?.caption?.color,
+                      other: null,
+                    ).resolve(platform!),
                     placeholder: "Search...",
                     onSubmitted: (value) {
                       onSearch();

diff --git a/lib/themes/dark-theme.dart b/lib/themes/dark-theme.dart
@@ -89,5 +89,8 @@ ThemeData darkTheme({
       unselectedLabelStyle:
           const TextStyle(fontWeight: FontWeight.w600, fontSize: 16),
     ),
+    appBarTheme: AppBarTheme(
+      backgroundColor: backgroundMaterialColor[900],
+    ),
   );
 }
diff --git a/lib/themes/light-theme.dart b/lib/themes/light-theme.dart
@@ -149,7 +149,9 @@ final macosDarkTheme = MacosThemeData.dark().copyWith(
   typography: MacosTypography(color: MacosColors.textColor),
 );
 const iosTheme = CupertinoThemeData(brightness: Brightness.light);
-const iosDarkTheme = CupertinoThemeData(brightness: Brightness.dark);
+const iosDarkTheme = CupertinoThemeData(
+  brightness: Brightness.dark,
+);
 
 final linuxTheme = AdwaitaThemeData.light().copyWith(
   listTileTheme: ListTileThemeData(