Trust the user-added CA store

.fvm/fvm_config.json

@@ -0,0 +1,4 @@
+{
+  "flutterSdkVersion": "3.7.11",
+  "flavors": {}
+}

.fvmrc

@@ -1,4 +0,0 @@
-{
-  "flutter": "3.24.5",
-  "flavors": {}
-}

.gitignore

@@ -16,8 +16,10 @@ migrate_working_dir/
 *.iws
 .idea/
 
-# VSCode related
-.vscode/settings.json
+# The .vscode folder contains launch configuration and tasks you configure in
+# VS Code which you may wish to be included in version control, so this line
+# is commented out by default.
+#.vscode/
 
 # Flutter/Dart/Pub related
 **/doc/api/
@@ -43,5 +45,5 @@ app.*.map.json
 
 /.env
 *.sqlite*
-.fvm/
+/.fvm/flutter_sdk
 *.keystore

android/app/build.gradle

@@ -1,9 +1,3 @@
-plugins {
-    id "com.android.application"
-    id "kotlin-android"
-    id "dev.flutter.flutter-gradle-plugin"
-}
-
 def localProperties = new Properties()
 def localPropertiesFile = rootProject.file('local.properties')
 if (localPropertiesFile.exists()) {
@@ -12,6 +6,11 @@ if (localPropertiesFile.exists()) {
     }
 }
 
+def flutterRoot = localProperties.getProperty('flutter.sdk')
+if (flutterRoot == null) {
+    throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
+}
+
 def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
 if (flutterVersionCode == null) {
     flutterVersionCode = '1'
@@ -22,6 +21,10 @@ if (flutterVersionName == null) {
     flutterVersionName = '1.0'
 }
 
+apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
+apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
+
 def keystoreProperties = new Properties()
 def keystorePropertiesFile = rootProject.file('key.properties')
 if (keystorePropertiesFile.exists()) {
@@ -50,7 +53,7 @@ android {
         applicationId "com.subtracks2"
         // You can update the following values to match your application needs.
         // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
-        minSdkVersion flutter.minSdkVersion
+        minSdkVersion 19
         targetSdkVersion flutter.targetSdkVersion
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
@@ -78,4 +81,8 @@ android {
 
 flutter {
     source '../..'
-}
+}
+
+dependencies {
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+}

android/app/src/main/AndroidManifest.xml

@@ -6,7 +6,8 @@
             android:label="subtracks"
             android:name="${applicationName}"
             android:icon="@mipmap/ic_launcher"
-            android:usesCleartextTraffic="true">
+            android:usesCleartextTraffic="true"
+            android:networkSecurityConfig="@xml/network_security_config">
         <activity
                 android:name="com.ryanheise.audioservice.AudioServiceActivity"
                 android:exported="true"

android/app/src/main/java/io/flutter/app/FlutterMultiDexApplication.java

@@ -0,0 +1,25 @@
+// Generated file.
+//
+// If you wish to remove Flutter's multidex support, delete this entire file.
+//
+// Modifications to this file should be done in a copy under a different name
+// as this file may be regenerated.
+
+package io.flutter.app;
+
+import android.app.Application;
+import android.content.Context;
+import androidx.annotation.CallSuper;
+import androidx.multidex.MultiDex;
+
+/**
+ * Extension of {@link android.app.Application}, adding multidex support.
+ */
+public class FlutterMultiDexApplication extends Application {
+  @Override
+  @CallSuper
+  protected void attachBaseContext(Context base) {
+    super.attachBaseContext(base);
+    MultiDex.install(this);
+  }
+}

android/app/src/main/res/xml/network_security_config.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+    <base-config cleartextTrafficPermitted="true">
+        <trust-anchors>
+            <certificates src="system" />
+            <certificates src="user" />
+        </trust-anchors>
+    </base-config>
+</network-security-config>

android/build.gradle

@@ -1,3 +1,16 @@
+buildscript {
+    ext.kotlin_version = '1.7.10'
+    repositories {
+        google()
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:7.2.0'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+    }
+}
+
 allprojects {
     repositories {
         google()
@@ -13,6 +26,6 @@ subprojects {
     project.evaluationDependsOn(':app')
 }
 
-tasks.register("clean", Delete) {
+task clean(type: Delete) {
     delete rootProject.buildDir
 }

android/settings.gradle

@@ -1,25 +1,11 @@
-pluginManagement {
-    def flutterSdkPath = {
-        def properties = new Properties()
-        file("local.properties").withInputStream { properties.load(it) }
-        def flutterSdkPath = properties.getProperty("flutter.sdk")
-        assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
-        return flutterSdkPath
-    }()
+include ':app'
 
-    includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
+def localPropertiesFile = new File(rootProject.projectDir, "local.properties")
+def properties = new Properties()
 
-    repositories {
-        google()
-        mavenCentral()
-        gradlePluginPortal()
-    }
-}
+assert localPropertiesFile.exists()
+localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) }
 
-plugins {
-    id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "7.2.0" apply false
-    id "org.jetbrains.kotlin.android" version "2.0.21" apply false
-}
-
-include ":app"
+def flutterSdkPath = properties.getProperty("flutter.sdk")
+assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
+apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle"

lib/app/context_menus.dart

@@ -25,7 +25,7 @@ Future<T?> showContextMenu<T>({
   required WidgetBuilder builder,
 }) {
   return showModalBottomSheet<T>(
-    backgroundColor: ref.read(baseThemeProvider).theme.colorScheme.surface,
+    backgroundColor: ref.read(baseThemeProvider).theme.colorScheme.background,
     useRootNavigator: true,
     isScrollControlled: true,
     context: context,

lib/app/hooks/use_download_actions.dart

@@ -112,9 +112,9 @@ List<DownloadAction> useListDownloadActions({
   DownloadAction cancel() {
     return DownloadAction(
       type: DownloadActionType.cancel,
-      iconBuilder: (context) => const Stack(
+      iconBuilder: (context) => Stack(
         alignment: Alignment.center,
-        children: [
+        children: const [
           Icon(Icons.cancel_rounded),
           SizedBox(
             height: 32,

lib/app/images.dart

@@ -213,7 +213,7 @@ class CardClip extends StatelessWidget {
     final cardShape = Theme.of(context).cardTheme.shape;
     return ClipRRect(
       borderRadius:
-          cardShape is RoundedRectangleBorder ? cardShape.borderRadius : BorderRadius.zero,
+          cardShape is RoundedRectangleBorder ? cardShape.borderRadius : null,
       child: !square
           ? child
           : AspectRatio(

lib/app/lists.dart

@@ -127,7 +127,6 @@ class SyncAllRefresh extends HookConsumerWidget {
         try {
           await ref.read(syncServiceProvider.notifier).syncAll();
         } catch (e) {
-          if (!context.mounted) return;
           showErrorSnackbar(context, e.toString());
         }
       },

lib/app/now_playing_bar.dart

@@ -30,13 +30,13 @@ class NowPlayingBar extends HookConsumerWidget {
         elevation: 3,
         color: colors?.darkBackground,
         // surfaceTintColor: theme?.colorScheme.background,
-        child: const Column(
+        child: Column(
           children: [
             SizedBox(
               height: 70,
               child: Row(
                 mainAxisSize: MainAxisSize.max,
-                children: [
+                children: const [
                   Padding(
                     padding: EdgeInsets.all(10),
                     child: _ArtImage(),
@@ -54,7 +54,7 @@ class NowPlayingBar extends HookConsumerWidget {
                 ],
               ),
             ),
-            _ProgressBar(),
+            const _ProgressBar(),
           ],
         ),
       ),
@@ -173,7 +173,7 @@ class PlayPauseButton extends HookConsumerWidget {
             width: size / 3,
             child: CircularProgressIndicator(
               strokeWidth: size / 16,
-              color: Theme.of(context).colorScheme.surface,
+              color: Theme.of(context).colorScheme.background,
             ),
           ),
         ],
@@ -195,7 +195,7 @@ class PlayPauseButton extends HookConsumerWidget {
         }
       },
       icon: icon,
-      color: Theme.of(context).colorScheme.surface,
+      color: Theme.of(context).colorScheme.onBackground,
     );
   }
 }

lib/app/pages/bottom_nav_page.dart

@@ -111,13 +111,13 @@ class OfflineIndicator extends HookConsumerWidget {
       ),
       child: FilledButton.tonal(
         style: const ButtonStyle(
-          padding: WidgetStatePropertyAll<EdgeInsetsGeometry>(
+          padding: MaterialStatePropertyAll<EdgeInsetsGeometry>(
             EdgeInsets.zero,
           ),
-          fixedSize: WidgetStatePropertyAll<Size>(
+          fixedSize: MaterialStatePropertyAll<Size>(
             Size(42, 42),
           ),
-          minimumSize: WidgetStatePropertyAll<Size>(
+          minimumSize: MaterialStatePropertyAll<Size>(
             Size(42, 42),
           ),
         ),

lib/app/pages/now_playing_page.dart

@@ -55,13 +55,13 @@ class NowPlayingPage extends HookConsumerWidget {
             ],
           ),
         ),
-        body: const Stack(
+        body: Stack(
           children: [
-            MediaItemGradient(),
+            const MediaItemGradient(),
             Padding(
-              padding: EdgeInsets.symmetric(horizontal: 8, vertical: 8),
+              padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 8),
               child: Column(
-                children: [
+                children: const [
                   Expanded(
                     child: Padding(
                       padding: EdgeInsets.symmetric(horizontal: 16),
@@ -229,8 +229,8 @@ class _Progress extends HookConsumerWidget {
           value: changing.value ? changeValue.value : position.toDouble(),
           min: 0,
           max: max(duration.toDouble(), position.toDouble()),
-          thumbColor: colors?.theme.colorScheme.surface,
-          activeColor: colors?.theme.colorScheme.surface,
+          thumbColor: colors?.theme.colorScheme.onBackground,
+          activeColor: colors?.theme.colorScheme.onBackground,
           inactiveColor: colors?.theme.colorScheme.surface,
           onChanged: (value) {
             changeValue.value = value;
@@ -354,7 +354,7 @@ class _Controls extends HookConsumerWidget {
     final audio = ref.watch(audioControlProvider);
 
     return IconTheme(
-      data: IconThemeData(color: base.theme.colorScheme.surface),
+      data: IconThemeData(color: base.theme.colorScheme.onBackground),
       child: Column(
         children: [
           SizedBox(

lib/app/pages/settings_page.dart

@@ -191,7 +191,7 @@ class _ShareLogsButton extends StatelessWidget {
             final files = await logFiles();
             if (files.isEmpty) return;
 
-            if (!context.mounted) return;
+            // ignore: use_build_context_synchronously
             final value = await showDialog<String>(
               context: context,
               builder: (context) => MultipleChoiceDialog<String>(

lib/app/pages/source_page.dart

@@ -76,8 +76,8 @@ class SourcePage extends HookConsumerWidget {
       onChanged: (value) => forcePlaintextPassword.value = value,
     );
 
-    return PopScope(
-      canPop: !isSaving.value && !isDeleting.value,
+    return WillPopScope(
+      onWillPop: () async => !isSaving.value && !isDeleting.value,
       child: Scaffold(
         appBar: AppBar(),
         floatingActionButton: Row(
@@ -164,7 +164,6 @@ class SourcePage extends HookConsumerWidget {
                               );
                         }
                       } catch (e, st) {
-                        if (!context.mounted) return;
                         showErrorSnackbar(context, e.toString());
                         log.severe('Saving source', e, st);
                         error = true;

lib/services/download_service.dart

@@ -534,7 +534,7 @@ class DownloadService extends _$DownloadService {
 
     _port.asyncMap((dynamic data) async {
       final taskId = (data as List<dynamic>)[0] as String;
-      final status = DownloadTaskStatus.fromInt(data[1] as int);
+      final status = DownloadTaskStatus(data[1] as int);
       final progress = data[2] as int;
 
       var download = state.downloads.firstWhereOrNull(
@@ -579,11 +579,11 @@ class DownloadService extends _$DownloadService {
   @pragma('vm:entry-point')
   static void downloadCallback(
     String id,
-    int status,
+    DownloadTaskStatus status,
     int progress,
   ) {
     IsolateNameServer.lookupPortByName('downloader_send_port')?.send(
-      [id, status, progress],
+      [id, status.value, progress],
     );
   }
 }

lib/sources/subsonic/source.dart

@@ -144,7 +144,7 @@ class SubsonicSource implements MusicSource {
     return Uri.tryParse(res.xml
             .getElement('artistInfo2')
             ?.getElement(thumbnail ? 'smallImageUrl' : 'largeImageUrl')
-            ?.value ??
+            ?.text ??
         '');
   }
 

lib/state/theme.dart

@@ -87,6 +87,7 @@ ColorTheme _colorTheme(_ColorThemeRef ref, Palette palette) {
   final colorScheme = ColorScheme.fromSeed(
     brightness: Brightness.dark,
     seedColor: background?.color ?? Colors.purple[800]!,
+    background: background?.color,
     primaryContainer: primary?.color,
     onPrimaryContainer: primary?.bodyTextColor,
     secondaryContainer: secondary?.color,
@@ -95,8 +96,8 @@ ColorTheme _colorTheme(_ColorThemeRef ref, Palette palette) {
     surfaceTint: vibrant?.color,
   );
 
-  final hsv = HSVColor.fromColor(colorScheme.surface);
-  final hsl = HSLColor.fromColor(colorScheme.surface);
+  final hsv = HSVColor.fromColor(colorScheme.background);
+  final hsl = HSLColor.fromColor(colorScheme.background);
 
   return base.copyWith(
     theme: ThemeData(
@@ -105,7 +106,7 @@ ColorTheme _colorTheme(_ColorThemeRef ref, Palette palette) {
       brightness: base.theme.brightness,
       cardTheme: base.theme.cardTheme,
     ),
-    gradientHigh: colorScheme.surface,
+    gradientHigh: colorScheme.background,
     darkBackground: hsv.withValue(kDarkBackgroundValue).toColor(),
     darkerBackground: hsl.withLightness(kDarkerBackgroundLightness).toColor(),
     onDarkerBackground:
@@ -127,13 +128,13 @@ ColorTheme baseTheme(BaseThemeRef ref) {
     ),
   );
 
-  final hsv = HSVColor.fromColor(theme.colorScheme.surface);
-  final hsl = HSLColor.fromColor(theme.colorScheme.surface);
+  final hsv = HSVColor.fromColor(theme.colorScheme.background);
+  final hsl = HSLColor.fromColor(theme.colorScheme.background);
 
   return ColorTheme(
     theme: theme,
-    gradientHigh: theme.colorScheme.surface,
-    gradientLow: HSLColor.fromColor(theme.colorScheme.surface)
+    gradientHigh: theme.colorScheme.background,
+    gradientLow: HSLColor.fromColor(theme.colorScheme.background)
         .withLightness(0.06)
         .toColor(),
     darkBackground: hsv.withValue(kDarkBackgroundValue).toColor(),

pubspec.yaml

@@ -7,7 +7,7 @@ publish_to: 'none'
 version: 2.0.0-alpha.3+12
 
 environment:
-  sdk: '>=3.0.0 <4.0.0'
+  sdk: '>=2.19.2 <3.0.0'
 
 dependencies:
   flutter:
@@ -55,7 +55,7 @@ dependencies:
   synchronized: ^3.1.0
   flutter_keyboard_visibility: ^5.4.0
   connectivity_plus: ^3.0.4
-  package_info_plus: ^8.1.1
+  package_info_plus: ^3.1.1
   url_launcher: ^6.1.10
   logging: ^1.1.1
   share_plus: ^7.0.0