Merge branch 'redesign' into pr-1474-flutter-carplay

Author: Chaphasilor

.github/workflows/build.yml

@@ -15,42 +15,18 @@ on:
 # workaround by always running flutter pub get immediately before building,
 # and performing build for msix:create manually to allow implementing this workaround
 jobs:
-  # test:
-  #   name: Run Tests
-  #   runs-on: ubuntu-latest
-  #   steps:
-  #   - name: Clone repository
-  #     uses: actions/checkout@v6
-  #   - uses: actions/setup-java@v5
-  #     with:
-  #       distribution: 'zulu'
-  #       java-version: '17'
-  #   - name: Install dependencies
-  #     run: |
-  #       sudo apt-get update
-  #       sudo apt-get install -y build-essential cmake ninja-build libgtk-3-dev
-  #   - name: Set up Flutter
-  #     uses: subosito/flutter-action@v2
-  #     with:
-  #       channel: 'stable'
-  #   - run: flutter doctor
-  #   - run: flutter pub get
-  #   - run: flutter test
-
   build-android:
     name: Build for Android
     runs-on: ubuntu-latest
     steps:
     - name: Clone repository
       uses: actions/checkout@v6
+    
     - uses: actions/setup-java@v5
       with:
         distribution: 'zulu'
         java-version: '17'
-    - name: Install dependencies
-      run: |
-        sudo apt-get update
-        sudo apt-get install -y build-essential cmake ninja-build libgtk-3-dev
+  
     - name: Free up disk space
       run: |
         # Remove .NET SDKs
@@ -64,32 +40,95 @@ jobs:
         # Remove PowerShell
         sudo rm -rf /usr/local/share/powershell
         df -h
-    - name: Set up Flutter
+
+    # Use the same flutter setup as the linux build to allow sharing the pub cache and it utilizing the same cache key
+    - name: Determine Flutter stable version
       uses: subosito/flutter-action@v2
+      id: flutter-version
       with:
+        architecture: 'x64'
         channel: 'stable'
+        dry-run: true
+    - name: Set up Flutter
+      uses: subosito/flutter-action@v2
+      with:
+        # Prebuilt ARM linux builds are not provided, so build flutter from source
+        channel: master
+        flutter-version: "${{ steps.flutter-version.outputs.VERSION }}"
+        cache: false
+        pub-cache: true
+        # Include arch as linux aarch64 include isar overriding
+        # arch can be removed later once isar aarch64 is easily available on pub.dev and overriding is not needed anymore
+        pub-cache-key: "flutter-pub-:os:-:channel:-:version:-:arch:-:hash:"
+
+    
+    - name: Gradle cache
+      uses: actions/cache@v5
+      with: 
+        path: |
+          ~/.gradle/caches
+          ~/.gradle/wrapper
+        key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+        # If exact match is not found, fallback to OS match
+        restore-keys: ${{ runner.os }}-gradle-
+
+    - name: Cache Dart build cache
+      uses: actions/cache@v5
+      with:
+        path: |
+          .dart_tool
+          build
+        key: ${{ runner.os }}-android-dart-build-${{ hashFiles('pubspec.lock') }}
+        restore-keys: ${{ runner.os }}-android-dart-build-
+
     - run: flutter doctor
     - run: flutter pub get
+
     - run: flutter build apk --debug --no-pub
+
     - uses: actions/upload-artifact@v6
       with:
         name: finamp-android-debug.apk
         path: build/app/outputs/flutter-apk/app-debug.apk
         compression-level: 0 # no compression
+
     - run: flutter build appbundle --debug --no-pub
 
   build-ios:
     name: Build for iOS
     runs-on: macos-latest
     steps:
     - uses: actions/checkout@v6
+
     - name: Set up Flutter
       uses: subosito/flutter-action@v2
       with:
         channel: 'stable'
-        architecture: x64
+        cache: false
+        pub-cache: true
+
+    - name: Cache CocoaPods
+      uses: actions/cache@v5
+      with:
+        path: |
+          ios/Pods
+          ~/.cocoapods
+        key: ${{ runner.os }}-pods-${{ hashFiles('ios/Podfile.lock') }}
+        restore-keys: ${{ runner.os }}-pods-
+
+    - name: Cache Dart build cache
+      uses: actions/cache@v5
+      with:
+        path: |
+          .dart_tool
+          build
+        key: ${{ runner.os }}-dart-build-${{ hashFiles('pubspec.lock') }}
+        restore-keys: ${{ runner.os }}-dart-build-
+
+
     - run: flutter doctor
     - run: flutter pub get
+
     - run: flutter build ios --release --no-pub --no-codesign
 
   build-linux:
@@ -106,14 +145,17 @@ jobs:
     steps:
     - name: Clone repository
       uses: actions/checkout@v6
+
     - uses: actions/setup-java@v5
       with:
         distribution: 'zulu'
         java-version: '17'
+
     - name: Install dependencies
       run: |
         sudo apt-get update
         sudo apt-get install -y build-essential cmake ninja-build libgtk-3-dev
+
     - name: Determine Flutter stable version
       uses: subosito/flutter-action@v2
       id: flutter-version
@@ -127,6 +169,21 @@ jobs:
         # Prebuilt ARM linux builds are not provided, so build flutter from source
         channel: master
         flutter-version: "${{ steps.flutter-version.outputs.VERSION }}"
+        cache: false
+        pub-cache: true
+        # Include arch as linux aarch64 include isar overriding
+        # arch can be removed later once isar aarch64 is easily available on pub.dev and overriding is not needed anymore
+        pub-cache-key: "flutter-pub-:os:-:channel:-:version:-:arch:-:hash:"
+
+    - name: Cache Dart build cache
+      uses: actions/cache@v5
+      with:
+        path: |
+          .dart_tool
+          build
+        key: ${{ runner.os }}-${{ matrix.arch }}-dart-build-${{ hashFiles('pubspec.lock') }}
+        restore-keys: ${{ runner.os }}-${{ matrix.arch }}-dart-build-
+
     - run: flutter doctor
     - run: flutter pub get
 
@@ -142,7 +199,7 @@ jobs:
       if: matrix.arch == 'arm64'
       run: |
         sh tool/build_linux.sh aarch64
-        mv libisar_linux_arm64.so $HOME/.pub-cache/git/isar_flutter_libs-59103190aa2ac03041d61ad6d127b540be079ec8/linux/libisar.so
+        mv libisar_linux_arm64.so $HOME/.pub-cache/git/isar_flutter_libs-*/linux/libisar.so
       working-directory: isar
 
     - run: flutter build linux --release --no-pub
@@ -196,6 +253,7 @@ jobs:
     steps:
     - name: Support longpaths
       run: git config --system core.longpaths true
+
     - name: Clone repository
       uses: actions/checkout@v6
     # - uses: actions/setup-java@v2
@@ -204,12 +262,25 @@ jobs:
     #     java-version: '17'
     - name: Set up Rust (for smtc_windows)
       uses: hecrj/setup-rust-action@v2
+
     - name: Set up Flutter
       uses: subosito/flutter-action@v2
       with:
         channel: 'stable'
+        cache: false
+        pub-cache: true
+
     - run: flutter doctor
     - run: flutter pub get
+
+    - name: Cache Dart build cache
+      uses: actions/cache@v5
+      with:
+        path: |
+          build
+        key: ${{ runner.os }}-dart-build-${{ hashFiles('**/pubspec.yaml') }}
+        restore-keys: ${{ runner.os }}-dart-build-
+
     - run: flutter build windows
 
     - name: Set archive and msix base name

.github/workflows/pr-healthchecks.yml

@@ -72,7 +72,7 @@ jobs:
           git reset HEAD -- . # clear any staged changes from previous steps
           dart run flutter_native_splash:create --path=flutter_native_splash.yaml
           git add .
-          if git diff --cached --name-only | grep -q .; then
+          if git diff --cached --name-only | grep -v pubspec.lock | grep -q .; then
             echo "Splash screen generation is different, diff follows"
             git diff --cached | cat
             exit 2

android/app/src/main/kotlin/com/unicornsonlsd/finamp/MainActivity.kt

@@ -1,5 +1,7 @@
 package com.unicornsonlsd.finamp
 
+import android.app.UiModeManager
+import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import android.provider.Settings
@@ -18,13 +20,17 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import java.io.File
 
+
 class MainActivity : AudioServiceActivity() {
     companion object {
         private const val DOWNLOADS_SERVICE_CHANNEL = "com.unicornsonlsd.finamp/downloads_service"
         private const val DOWNLOADS_SERVICE_CHANNEL_LOG_TAG = "DownloadsServiceChannel"
 
         private const val OUTPUT_SWITCHER_CHANNEL = "com.unicornsonlsd.finamp/output_switcher"
         private const val OUTPUT_SWITCHER_CHANNEL_LOG_TAG = "OutputSwitcherChannel"
+
+        private const val SET_NATIVE_THEME_CHANNEL = "com.unicornsonlsd.finamp/set_native_theme"
+        private const val SET_NATIVE_THEME_CHANNEL_LOG_TAG = "setNativeThemeChannel"
     }
 
     private lateinit var mediaRouter: MediaRouter
@@ -57,6 +63,40 @@ class MainActivity : AudioServiceActivity() {
                 }
             }
         }
+        MethodChannel(
+            flutterEngine.dartExecutor.binaryMessenger,
+            SET_NATIVE_THEME_CHANNEL,
+        ).setMethodCallHandler { call, result ->
+            when (call.method) {
+                "setNativeThemeMode" -> {
+                    val uiManager: UiModeManager =
+                        getApplicationContext().getSystemService(Context.UI_MODE_SERVICE) as UiModeManager
+                    val targetMode = call.argument<Int?>("targetMode")
+                    when (targetMode) {
+                        0 -> {
+                            uiManager.setApplicationNightMode( UiModeManager.MODE_NIGHT_AUTO)
+                            result.success(null)
+                        }
+                        1 -> {
+                            uiManager.setApplicationNightMode( UiModeManager.MODE_NIGHT_NO)
+                            result.success(null)
+                        }
+                        2 -> {
+                            uiManager.setApplicationNightMode( UiModeManager.MODE_NIGHT_YES)
+                            result.success(null)
+                        }
+                        else -> {
+                            Log.e(SET_NATIVE_THEME_CHANNEL_LOG_TAG, "Method not found: '${call.method}'")
+                            result.notImplemented()
+                        }
+                    }
+                }
+                else -> {
+                    Log.e(SET_NATIVE_THEME_CHANNEL_LOG_TAG, "Method not found: '${call.method}'")
+                    result.notImplemented()
+                }
+            }
+        }
         MethodChannel(
             flutterEngine.dartExecutor.binaryMessenger,
             OUTPUT_SWITCHER_CHANNEL,

assets/com.unicornsonlsd.finamp.metainfo.xml

@@ -5,11 +5,15 @@
   <summary>Open source Jellyfin music player</summary>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>MPL-2.0</project_license>
-  <recommends>
-    <control>pointing</control>
+  <supports>
     <control>keyboard</control>
+    <control>pointing</control>
     <control>touch</control>
-  </recommends>
+  </supports>
+  <requires>
+    <display_length side="shortest" compare="ge">250</display_length>
+    <display_length side="longest" compare="ge">400</display_length>
+  </requires>
   <developer id="com.unicornsonlsd">
     <name>
       jmshrv

lib/color_schemes.g.dart

@@ -90,14 +90,20 @@ const darkColorScheme = ColorScheme(
 /// If [color] is provided -> returns a generated color scheme
 /// otherwise falls back to default color schemes
 /// [lightColorScheme] or [darkColorScheme]
-ColorScheme getColorScheme(Color? color, Brightness brightness) {
+ColorScheme getColorScheme(Color? color, Brightness brightness, bool amoledTheme) {
+  ColorScheme scheme = brightness == Brightness.dark ? darkColorScheme : lightColorScheme;
+
   if (color != null) {
-    return ColorScheme.fromSeed(
+    scheme = ColorScheme.fromSeed(
       seedColor: color,
       brightness: brightness,
       dynamicSchemeVariant: DynamicSchemeVariant.fidelity,
     );
   }
 
-  return brightness == Brightness.dark ? darkColorScheme : lightColorScheme;
+  if (amoledTheme && brightness == Brightness.dark) {
+    scheme = scheme.copyWith(background: Color(0xFF000000), surface: Color(0xFF000000));
+  }
+
+  return scheme;
 }

lib/components/LayoutSettingsScreen/accent_color_selector.dart

@@ -78,6 +78,7 @@ class AccentColorPopup extends ConsumerStatefulWidget {
 
 class _AccentColorPopupState extends ConsumerState<AccentColorPopup> {
   Color? previewColor = FinampSettingsHelper.finampSettings.accentColor;
+  bool amoledTheme = FinampSettingsHelper.finampSettings.amoledTheme;
   late final controller = TextEditingController(text: previewColor?.toHex());
 
   void updatePreview(String value) => setState(() {
@@ -91,7 +92,9 @@ class _AccentColorPopupState extends ConsumerState<AccentColorPopup> {
 
   @override
   Widget build(BuildContext context) {
-    final previewTheme = Theme.of(context).withColorScheme(getColorScheme(previewColor, ref.watch(brightnessProvider)));
+    final previewTheme = Theme.of(
+      context,
+    ).withColorScheme(getColorScheme(previewColor, ref.watch(brightnessProvider), amoledTheme));
 
     return Theme(
       data: previewTheme,

lib/components/LayoutSettingsScreen/amoled_theme.dart

@@ -0,0 +1,18 @@
+import 'package:finamp/l10n/app_localizations.dart';
+import 'package:finamp/services/finamp_settings_helper.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+
+class AmoledTheme extends ConsumerWidget {
+  const AmoledTheme({super.key});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    return SwitchListTile.adaptive(
+      title: Text(AppLocalizations.of(context)!.amoledTheme),
+      subtitle: Text(AppLocalizations.of(context)!.amoledThemeSubtitle),
+      value: ref.watch(finampSettingsProvider.amoledTheme),
+      onChanged: (value) => FinampSetters.setAmoledTheme(value),
+    );
+  }
+}