chore: some (many) fixes n tweakies

namidaco · Jun 7, 2024 · 4dacb21 · 4dacb21
1 parent 895fc4c
commit 4dacb21
Show file tree

Hide file tree

Showing 26 changed files with 239 additions and 215 deletions.
diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml
@@ -39,17 +39,38 @@ jobs:
       - name: Git Submodule Update
         run: git clone https://github.com/namidaco/namida-translations/ assets/language
 
-      - name: flutter clean
-        run: flutter clean
-
-      - name: Install dependencies
-        run: flutter pub get
+      - name: Setup dependencies
+        run: |
+          flutter clean
+          flutter pub get
+          flutter pub upgrade
 
       - name: Modify applicationId
         run: sed -i 's/applicationId "com.msob7y.namida"/applicationId "com.msob7y.namida.snapshot"/g' android/app/build.gradle
 
-      - name: Build APKs
-        run: flutter build apk --target-platform android-arm64 --release -v
+      - name: Extract version from pubspec.yaml
+        id: extract_version
+        run: |
+          VERSION=$(grep -o 'version:.*' pubspec.yaml | awk '{print $2}')
+          echo ::set-output name=version::"$VERSION"
+
+      - name: Build APK -> arm64-v8a
+        run: flutter build apk --target-platform android-arm64 --release
+
+      - name: Move arm64-v8a
+        run: |
+          mkdir -p build_final
+          mv build/app/outputs/flutter-apk/app-arm64-v8a-release.apk build_final/namida-v${{ steps.extract_version.outputs.version}}-snapshot-arm64-v8a.apk
+          mv build/app/outputs/flutter-apk/app-arm64-v8a-release.apk.sha1 build_final/namida-v${{ steps.extract_version.outputs.version}}-snapshot-arm64-v8a.apk.sha1
+
+      - name: Build APK -> armeabi-v7a
+        run: flutter build apk --target-platform android-arm --release
+
+      - name: Move armeabi-v7a
+        run: |
+          mkdir -p build_final
+          mv build/app/outputs/flutter-apk/app-armeabi-v7a-release.apk build_final/namida-v${{ steps.extract_version.outputs.version}}-snapshot-armeabi-v7a.apk
+          mv build/app/outputs/flutter-apk/app-armeabi-v7a-release.apk.sha1 build_final/namida-v${{ steps.extract_version.outputs.version}}-snapshot-armeabi-v7a.apk.sha1
 
       # - name: Sign App Bundle
       #   uses: r0adkll/sign-android-release@v1
@@ -67,33 +88,18 @@ jobs:
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Extract version from pubspec.yaml
-        id: extract_version
-        run: |
-          VERSION=$(grep -o 'version:.*' pubspec.yaml | awk '{print $2}')
-          echo ::set-output name=version::"$VERSION"
-
       - name: Creating Snapshot Release at namida-snapshots
         uses: softprops/action-gh-release@v2
         with:
           repository: namidaco/namida-snapshots
           tag_name: ${{ steps.extract_version.outputs.version}}
           body: ${{ steps.generate_changelog.outputs.changelog }}
           files: |
-            build/app/outputs/flutter-apk/app-arm64-v8a-release.apk
-            build/app/outputs/flutter-apk/app-arm64-v8a-release.apk.sha1
-            build/app/outputs/flutter-apk/app-armeabi-v7a-release.apk
-            build/app/outputs/flutter-apk/app-armeabi-v7a-release.apk.sha1
+            build_final/*
           token: ${{ secrets.SNAPSHOTS_REPO_SECRET }}
 
-      - name: Upload arm64-v8a APK
-        uses: actions/upload-artifact@v3
-        with:
-          name: app-arm64-v8a-release
-          path: build/app/outputs/flutter-apk/app-arm64-v8a-release.apk
-
-      - name: Upload armeabi-v7a
+      - name: Upload all APKs
         uses: actions/upload-artifact@v3
         with:
-          name: app-armeabi-v7a-release
-          path: build/app/outputs/flutter-apk/app-armeabi-v7a-release.apk
+          name: all-apks
+          path: build_final/**
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -29,6 +29,7 @@ if (flutterVersionName == null) {
 // }
 
 android {
+    namespace 'com.msob7y.namida'
     compileSdkVersion 34
     ndkVersion flutter.ndkVersion
     splits {
@@ -47,7 +48,7 @@ android {
     }
 
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = JavaVersion.VERSION_1_8
     }
 
     sourceSets {

diff --git a/android/app/proguard-rules.pro b/android/app/proguard-rules.pro
@@ -27,6 +27,8 @@
 
 -dontwarn android.arch.util.paging.CountedDataSource
 -dontwarn android.arch.persistence.room.paging.LimitOffsetDataSource
+
+
 -keep class com.artxdev.** { *; }
 -keep class com.namidaco.** { *; }
 -keep class org.jaudiotagger.** { *; }
@@ -37,4 +39,12 @@
 -keep class io.flutter.view.**  { *; }
 -keep class io.flutter.**  { *; }
 -keep class io.flutter.plugins.**  { *; }
--keep class androidx.lifecycle.DefaultLifecycleObserver
+-keep class androidx.lifecycle.DefaultLifecycleObserver
+
+
+-keep class android.window.** { *; }
+
+-dontwarn com.google.android.play.core.**
+-dontwarn java.awt.**
+-dontwarn javax.imageio.**
+-dontwarn javax.swing.filechooser.FileFilter
diff --git a/android/build.gradle b/android/build.gradle
@@ -5,6 +5,18 @@ allprojects {
         mavenCentral()
         maven { url 'https://jitpack.io' }
     }
+
+    subprojects {
+        afterEvaluate { project ->
+            if (project.hasProperty('android')) {
+                project.android {
+                    if (namespace == null) {
+                        namespace project.group
+                    }
+                }
+            }
+        }
+    }
 }
 
 rootProject.buildDir = '../build'

diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
diff --git a/android/settings.gradle b/android/settings.gradle
@@ -18,7 +18,7 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "7.4.0" apply false
+    id "com.android.application" version "8.3.0" apply false
     id "org.jetbrains.kotlin.android" version "1.8.22" apply false
 }
 

diff --git a/lib/class/route.dart b/lib/class/route.dart
@@ -15,9 +15,12 @@ class NamidaDummyPage extends StatelessWidget with NamidaRouteWidget {
 mixin NamidaRouteWidget on Widget implements NamidaRoute {
   @override
   String? get name => null;
+
+  @override
+  bool isSameRouteAs(NamidaRoute r) => this.name == r.name && this.route == r.route;
 }
 
-class NamidaRoute {
+abstract class NamidaRoute {
   final RouteType route;
   final String? name;
 
@@ -29,6 +32,8 @@ class NamidaRoute {
   @override
   String toString() => '(route: $route, name: $name)';
 
+  bool isSameRouteAs(NamidaRoute r);
+
   @override
   bool operator ==(other) {
     if (other is NamidaRoute) {

diff --git a/lib/controller/indexer_controller.dart b/lib/controller/indexer_controller.dart
@@ -653,6 +653,7 @@ class Indexer {
     if (updateArtwork) {
       imageCache.clear();
       imageCache.clearLiveImages();
+      AudioService.evictArtworkCache();
     }
 
     tracksMissing.loop((e) => onProgress(false));

diff --git a/lib/controller/miniplayer_controller.dart b/lib/controller/miniplayer_controller.dart
@@ -140,7 +140,7 @@ class MiniPlayerController {
   bool bounceUp = false;
   bool bounceDown = false;
 
-  double get _currentItemExtent => Player.inst.currentItem is YoutubeID ? Dimensions.youtubeCardItemExtent : Dimensions.inst.trackTileItemExtent;
+  double get _currentItemExtent => Player.inst.currentItem.value is YoutubeID ? Dimensions.youtubeCardItemExtent : Dimensions.inst.trackTileItemExtent;
 
   void animateQueueToCurrentTrack({bool jump = false, bool minZero = false}) {
     if (queueScrollController.hasClients) {

diff --git a/lib/controller/notification_controller.dart b/lib/controller/notification_controller.dart
@@ -7,7 +7,7 @@ import 'package:namida/core/extensions.dart';
 class NotificationService {
   //Hanle displaying of notifications.
   static final NotificationService _notificationService = NotificationService._internal();
-  final FlutterLocalNotificationsPlugin _flutterLocalNotificationsPlugin = FlutterLocalNotificationsPlugin();
+  static final FlutterLocalNotificationsPlugin _flutterLocalNotificationsPlugin = FlutterLocalNotificationsPlugin();
 
   factory NotificationService() => NotificationService._internal();
 
@@ -17,8 +17,14 @@ class NotificationService {
     init();
   }
 
+  static Future<void> cancelAll() async {
+    try {
+      await _flutterLocalNotificationsPlugin.cancelAll();
+    } catch (_) {}
+  }
+
   final _historyImportID = 1;
-  final _historyImportPayload = 'history_import';
+  static const _historyImportPayload = 'history_import';
   final _historyImportChannelName = 'History Import';
   final _historyImportChannelDescription = 'Imports Tracks to History from a source';
 
@@ -27,7 +33,7 @@ class NotificationService {
   final _youtubeDownloadChannelName = 'Downloads';
   final _youtubeDownloadChannelDescription = 'Downlaod content from youtube';
 
-  Future<void> init() async {
+  static Future<void> init() async {
     await _flutterLocalNotificationsPlugin.initialize(
       const InitializationSettings(
         android: AndroidInitializationSettings('ic_stat_musicnote'),
@@ -167,7 +173,7 @@ class NotificationService {
     );
   }
 
-  void _onDidReceiveLocalNotification(NotificationResponse details) async {
+  static void _onDidReceiveLocalNotification(NotificationResponse details) async {
     if (details.payload == _historyImportPayload) {
       JsonToHistoryParser.inst.showParsingProgressDialog();
     }

diff --git a/lib/controller/player_controller.dart b/lib/controller/player_controller.dart
@@ -331,7 +331,7 @@ class Player {
             insertionType?.shuffleOrSort(finalTracks);
 
             if (showSnackBar && finalTracks.isEmpty) {
-              snackyy(title: lang.NOTE, message: emptyTracksMessage ?? lang.NO_TRACKS_FOUND);
+              snackyy(title: lang.NOTE, message: emptyTracksMessage ?? lang.NO_TRACKS_FOUND, top: false);
               return false;
             }
             await _audioHandler.addToQueue(
@@ -344,6 +344,7 @@ class Player {
               snackyy(
                 icon: shouldInsertNext ? Broken.redo : Broken.add_circle,
                 message: '${addins.capitalizeFirst()} ${finalTracks.displayTrackKeyword}',
+                top: false,
               );
             }
             return true;
@@ -388,7 +389,6 @@ class Player {
       icon: Broken.rotate_left,
       title: lang.UNDO_CHANGES,
       message: lang.UNDO_CHANGES_DELETED_TRACK,
-      displaySeconds: 2,
       top: false,
       button: (
         lang.UNDO,
@@ -592,7 +592,7 @@ class Player {
 
 extension QueueListExt on List<Playable> {
   Iterable<T> mapAs<T extends Playable>() {
-    if (Player._instance.currentItem is! T) return <T>[];
+    if (Player._instance.currentItem.value is! T) return <T>[];
     return this.map((e) => e as T);
   }
 }

diff --git a/lib/controller/playlist_controller.dart b/lib/controller/playlist_controller.dart
@@ -119,7 +119,6 @@ class PlaylistController extends PlaylistManager<TrackWithDate> {
 
     snackyy(
       message: "${lang.ADDED} ${addedTracksLength.displayTrackKeyword}",
-      displaySeconds: 2,
       button: addedTracksLength > 0
           ? (
               lang.UNDO,

diff --git a/lib/controller/scroll_search_controller.dart b/lib/controller/scroll_search_controller.dart
@@ -3,15 +3,14 @@ import 'package:flutter/rendering.dart';
 import 'package:flutter/scheduler.dart';
 import 'package:flutter/services.dart';
 
-import 'package:namida/core/utils.dart';
-
 import 'package:namida/controller/miniplayer_controller.dart';
 import 'package:namida/controller/navigator_controller.dart';
 import 'package:namida/controller/search_sort_controller.dart';
 import 'package:namida/controller/settings_controller.dart';
 import 'package:namida/core/enums.dart';
 import 'package:namida/core/extensions.dart';
 import 'package:namida/core/namida_converter_ext.dart';
+import 'package:namida/core/utils.dart';
 import 'package:namida/packages/searchbar_animation.dart';
 import 'package:namida/ui/pages/main_page.dart';
 import 'package:namida/youtube/pages/yt_search_results_page.dart';
@@ -61,7 +60,7 @@ class ScrollSearchController {
       return;
     }
 
-    if (w.toNamidaRoute() == NamidaNavigator.inst.currentRoute) {
+    if (NamidaNavigator.inst.currentRoute?.isSameRouteAs(w) == true) {
       if (scrollController.hasClients) {
         MiniPlayerController.inst.snapToMini();
         scrollController.animateToEff(0.0, duration: const Duration(milliseconds: 500), curve: Curves.easeInOutQuart);

diff --git a/lib/controller/search_sort_controller.dart b/lib/controller/search_sort_controller.dart
@@ -276,7 +276,7 @@ class SearchSortController {
           if (fetchedQuery == lastSearchText) _searchMapTemp[type]?.value = r.$1;
         } else {
           final typeNomalize = type == MediaType.albumArtist || type == MediaType.composer ? MediaType.artist : type;
-          if (fetchedQuery == typeNomalize.toLibraryTab()?.textSearchController?.text) _searchMap[typeNomalize]?.value = r.$1;
+          if (fetchedQuery == typeNomalize.toLibraryTab().textSearchController?.text) _searchMap[typeNomalize]?.value = r.$1;
         }
       },
       isolateFunction: (itemsSendPort) async {
@@ -447,7 +447,7 @@ class SearchSortController {
         _searchMapTemp[type]?.clear();
       } else {
         final typeNomalize = type == MediaType.albumArtist || type == MediaType.composer ? MediaType.artist : type;
-        typeNomalize.toLibraryTab()?.textSearchController?.clear();
+        typeNomalize.toLibraryTab().textSearchController?.clear();
         _searchMap[typeNomalize]?.value = keys.toList();
       }
       return;
@@ -722,7 +722,7 @@ class SearchSortController {
         sortThis((e) => HistoryController.inst.topTracksMapListens[e]?.lastOrNull ?? 0);
         break;
 
-      default:
+      case null:
         null;
     }
     onDone(sortBy, reverse);

diff --git a/lib/core/dimensions.dart b/lib/core/dimensions.dart
@@ -31,7 +31,7 @@ class Dimensions {
             route == RouteType.YOUTUBE_PLAYLIST_DOWNLOAD_SUBPAGE || // bcz has fab
             route == RouteType.SUBPAGE_INDEXER_UPDATE_MISSING_TRACKS || // bcz has fab
             ((fab == FABType.shuffle || fab == FABType.play) && currentRoute?.hasTracksInside() != true) ||
-            (settings.selectedLibraryTab.valueR == LibraryTab.tracks && LibraryTab.tracks.isBarVisible == false);
+            (settings.selectedLibraryTab.valueR == LibraryTab.tracks && LibraryTab.tracks.isBarVisible.valueR == false);
     return shouldHide;
   }
 

diff --git a/lib/core/enums.dart b/lib/core/enums.dart
@@ -238,7 +238,6 @@ enum MediaType {
 
   /// not used
   folder,
-  others,
 }
 
 enum VideoPlaybackSource {
-Original file line number
+Diff line change
@@ Expand Up / @@ -238,7 +238,6 @@ enum MediaType { @@
       /// not used
       folder,
-      others,
     }
     enum VideoPlaybackSource {
@@ Expand Down @@