fix: small minwidth of window in desktop, linux wrong light theme acc…

…ent color, search field transparent background
KRTirtho · Dec 8, 2022 · 5b0e22c · 5b0e22c
1 parent 261aaf1
commit 5b0e22c
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 10 deletions.
diff --git a/lib/main.dart b/lib/main.dart
@@ -40,7 +40,7 @@ void main() async {
       final savedSize = rawSize != null ? json.decode(rawSize) : null;
       final double? height = savedSize?["height"];
       final double? width = savedSize?["width"];
-      appWindow.minSize = const Size(359, 700);
+      appWindow.minSize = const Size(900, 700);
       appWindow.alignment = Alignment.center;
       appWindow.title = "Spotube";
       if (height != null && width != null && height >= 700 && width >= 359) {

diff --git a/lib/pages/search/search.dart b/lib/pages/search/search.dart
@@ -86,6 +86,7 @@ class SearchPage extends HookConsumerWidget {
                       horizontal: 20,
                       vertical: 10,
                     ),
+                    color: PlatformTheme.of(context).scaffoldBackgroundColor,
                     child: PlatformTextField(
                       onChanged: (value) {
                         ref.read(searchTermStateProvider.notifier).state =

diff --git a/lib/themes/light_theme.dart b/lib/themes/light_theme.dart
@@ -3,7 +3,7 @@ import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:macos_ui/macos_ui.dart';
 import 'package:spotube/extensions/theme.dart';
-import 'package:fluent_ui/fluent_ui.dart' as FluentUI;
+import 'package:fluent_ui/fluent_ui.dart' as fluent_ui;
 
 final materialWhite = MaterialColor(Colors.white.value, {
   50: Colors.white,
@@ -120,17 +120,17 @@ ThemeData lightTheme({
   );
 }
 
-final windowsTheme = FluentUI.ThemeData.light().copyWith(
-  buttonTheme: FluentUI.ButtonThemeData(
-    iconButtonStyle: FluentUI.ButtonStyle(
-      iconSize: FluentUI.ButtonState.all(20),
+final windowsTheme = fluent_ui.ThemeData.light().copyWith(
+  buttonTheme: fluent_ui.ButtonThemeData(
+    iconButtonStyle: fluent_ui.ButtonStyle(
+      iconSize: fluent_ui.ButtonState.all(20),
     ),
   ),
 );
-final windowsDarkTheme = FluentUI.ThemeData.dark().copyWith(
-  buttonTheme: FluentUI.ButtonThemeData(
-    iconButtonStyle: FluentUI.ButtonStyle(
-      iconSize: FluentUI.ButtonState.all(20),
+final windowsDarkTheme = fluent_ui.ThemeData.dark().copyWith(
+  buttonTheme: fluent_ui.ButtonThemeData(
+    iconButtonStyle: fluent_ui.ButtonStyle(
+      iconSize: fluent_ui.ButtonState.all(20),
     ),
   ),
 );
@@ -154,12 +154,22 @@ const iosDarkTheme = CupertinoThemeData(
 );
 
 final linuxTheme = AdwaitaThemeData.light().copyWith(
+  primaryColor: const Color(0xFF3582e5),
   extensions: [
     ShimmerColorTheme(
       shimmerBackgroundColor: Colors.grey[300],
       shimmerColor: Colors.grey[400],
     )
   ],
+  switchTheme: SwitchThemeData(
+    trackColor: MaterialStateProperty.all(const Color(0xFF3582e5)),
+  ),
+  colorScheme: const ColorScheme.light(
+    primary: Color(0xFF3582e5),
+  ),
+  progressIndicatorTheme: const ProgressIndicatorThemeData(
+    color: Color(0xFF3582e5),
+  ),
   listTileTheme: ListTileThemeData(
     iconColor: Colors.grey[900],
     horizontalTitleGap: 0,