[Redesign] Downloads Storage Rewrite

analysis_options.yaml

@@ -1 +1,9 @@
-include: package:flutter_lints/flutter.yaml
+include: package:flutter_lints/flutter.yaml
+linter:
+  rules:
+    - unawaited_futures
+    - always_declare_return_types
+    - use_if_null_to_convert_nulls_to_bools
+analyzer:
+  plugins:
+    - custom_lint

android/app/build.gradle

@@ -1,3 +1,9 @@
+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()) {
@@ -6,11 +12,6 @@ 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'
@@ -27,12 +28,8 @@ if (keystorePropertiesFile.exists()) {
    keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
 }
 
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
-
 android {
-    compileSdkVersion 33
+    compileSdkVersion 34
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
@@ -44,8 +41,8 @@ android {
 
     defaultConfig {
         applicationId "com.unicornsonlsd.finamp"
-        minSdkVersion 26
-        targetSdkVersion 33
+        minSdkVersion 21
+        targetSdkVersion 34
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
     }
@@ -72,8 +69,3 @@ android {
 flutter {
     source '../..'
 }
-
-dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava'
-}

android/app/src/main/AndroidManifest.xml

@@ -2,6 +2,7 @@
   <uses-permission android:name="android.permission.INTERNET"/>
   <uses-permission android:name="android.permission.WAKE_LOCK"/>
   <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
+  <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK"/>
   <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
   <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
   <uses-permission android:name="android.permission.VIBRATE"/>
@@ -29,7 +30,8 @@
         <category android:name="android.intent.category.LAUNCHER"/>
       </intent-filter>
     </activity>
-    <service android:name="com.ryanheise.audioservice.AudioService" android:exported="true">
+    <service android:name="com.ryanheise.audioservice.AudioService" android:foregroundServiceType="mediaPlayback"
+        android:exported="true">
       <intent-filter>
         <action android:name="android.media.browse.MediaBrowserService" />
       </intent-filter>

android/build.gradle

@@ -1,16 +1,3 @@
-buildscript {
-    ext.kotlin_version = '1.8.20'
-    repositories {
-        google()
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath 'com.android.tools.build:gradle:7.3.0'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-    }
-}
-
 allprojects {
     repositories {
         google()

android/settings.gradle

@@ -1,11 +1,26 @@
-include ':app'
+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
+    }
+    settings.ext.flutterSdkPath = flutterSdkPath()
 
-def localPropertiesFile = new File(rootProject.projectDir, "local.properties")
-def properties = new Properties()
+    includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle")
 
-assert localPropertiesFile.exists()
-localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) }
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
 
-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"
+plugins {
+    id "dev.flutter.flutter-plugin-loader" version "1.0.0"
+    id "com.android.application" version "7.3.0" apply false
+    id "org.jetbrains.kotlin.android" version "1.9.10" apply false
+}
+
+include ":app"

ios/Flutter/AppFrameworkInfo.plist

@@ -21,6 +21,6 @@
 	<key>CFBundleVersion</key>
 	<string>1.0</string>
 	<key>MinimumOSVersion</key>
-	<string>11.0</string>
+	<string>13.0</string>
 </dict>
 </plist>

ios/Podfile

@@ -1,5 +1,5 @@
 # Uncomment this line to define a global platform for your project
-platform :ios, '12.0'
+platform :ios, '13.0'
 
 # Fixing DKImagePickerController Bug
 use_modular_headers!
@@ -43,7 +43,7 @@ post_install do |installer|
     flutter_additional_ios_build_settings(target)
 
     target.build_configurations.each do |config|
-      config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '11.0'
+      config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '13.0'
     end
 
     target.build_configurations.each do |config|
@@ -93,5 +93,13 @@ post_install do |installer|
       ]
 
     end
+
+    target.build_configurations.each do |config|
+      config.build_settings['OTHER_SWIFT_FLAGS'] ||= ['$(inherited)']
+      # Do not need ios photo permissions
+      #config.build_settings['OTHER_SWIFT_FLAGS'] << '-D BYPASS_PERMISSION_NOTIFICATIONS'
+      config.build_settings['OTHER_SWIFT_FLAGS'] << '-D BYPASS_PERMISSION_IOSADDTOPHOTOLIBRARY'
+      config.build_settings['OTHER_SWIFT_FLAGS'] << '-D BYPASS_PERMISSION_IOSCHANGEPHOTOLIBRARY'
+    end
   end
 end

ios/Runner/AppDelegate.swift

@@ -1,6 +1,5 @@
 import UIKit
 import Flutter
-import flutter_downloader
 
 @UIApplicationMain
 @objc class AppDelegate: FlutterAppDelegate {
@@ -9,7 +8,6 @@ import flutter_downloader
     didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?
   ) -> Bool {
     GeneratedPluginRegistrant.register(with: self)
-    FlutterDownloaderPlugin.setPluginRegistrantCallback(registerPlugins)
 
     // Exclude the documents folder from iCloud backup since we keep songs there.
     try! setExcludeFromiCloudBackup(isExcluded: true)
@@ -24,10 +22,3 @@ private func setExcludeFromiCloudBackup(isExcluded: Bool) throws {
     values.isExcludedFromBackup = isExcluded
     try fileOrDirectoryURL.setResourceValues(values)
 }
-
-
-private func registerPlugins(registry: FlutterPluginRegistry) { 
-    if (!registry.hasPlugin("FlutterDownloaderPlugin")) {
-       FlutterDownloaderPlugin.register(with: registry.registrar(forPlugin: "FlutterDownloaderPlugin")!)
-    }
-}

lib/components/AddDownloadLocationScreen/custom_download_location_form.dart

@@ -86,10 +86,8 @@ class _CustomDownloadLocationFormState
                       child: Text(
                         field.errorText ??
                             AppLocalizations.of(context)!.unknownError,
-                        style: Theme.of(context)
-                            .textTheme
-                            .bodySmall
-                            ?.copyWith(color: Theme.of(context).colorScheme.error),
+                        style: Theme.of(context).textTheme.bodySmall?.copyWith(
+                            color: Theme.of(context).colorScheme.error),
                       ),
                     ),
                 ],
@@ -109,14 +107,14 @@ class _CustomDownloadLocationFormState
               }
 
               // This checks if the chosen directory is empty
-              if (selectedDirectory!
+              /*if (selectedDirectory!
                   .listSync()
                   .where((event) => !event.path
                       .replaceFirst(selectedDirectory!.path, "")
                       .contains("."))
                   .isNotEmpty) {
                 return AppLocalizations.of(context)!.directoryMustBeEmpty;
-              }
+              }*/
               return null;
             },
             onSaved: (_) {
@@ -149,4 +147,4 @@ class _CustomDownloadLocationFormState
       ),
     );
   }
-}
+}

lib/components/AddToPlaylistScreen/add_to_playlist_list.dart

@@ -1,10 +1,14 @@
+import 'dart:async';
+
+import 'package:finamp/models/finamp_models.dart';
+import 'package:finamp/services/downloads_service.dart';
 import 'package:flutter/material.dart';
 import 'package:get_it/get_it.dart';
 
 import '../../models/jellyfin_models.dart';
 import '../../services/jellyfin_api_helper.dart';
 import '../MusicScreen/album_item.dart';
-import '../error_snackbar.dart';
+import '../global_snackbar.dart';
 
 class AddToPlaylistList extends StatefulWidget {
   const AddToPlaylistList({
@@ -28,7 +32,6 @@ class _AddToPlaylistListState extends State<AddToPlaylistList> {
     addToPlaylistListFuture = jellyfinApiHelper.getItems(
       includeItemTypes: "Playlist",
       sortBy: "SortName",
-      isGenres: false,
     );
   }
 
@@ -52,6 +55,14 @@ class _AddToPlaylistListState extends State<AddToPlaylistList> {
                         playlistId: snapshot.data![index].id,
                         ids: [widget.itemToAddId],
                       );
+                      final downloadsService =
+                          GetIt.instance<DownloadsService>();
+                      unawaited(downloadsService.resync(
+                          DownloadStub.fromItem(
+                              type: DownloadItemType.collection,
+                              item: snapshot.data![index]),
+                          null,
+                          keepSlow: true));
 
                       if (!mounted) return;
                       ScaffoldMessenger.of(context).showSnackBar(

lib/components/AddToPlaylistScreen/new_playlist_dialog.dart

@@ -5,7 +5,7 @@ import 'package:get_it/get_it.dart';
 
 import '../../services/finamp_user_helper.dart';
 import '../../services/jellyfin_api_helper.dart';
-import '../error_snackbar.dart';
+import '../global_snackbar.dart';
 
 class NewPlaylistDialog extends StatefulWidget {
   const NewPlaylistDialog({