merge upstream

.github/workflows/upload-assets.yml

@@ -59,21 +59,21 @@ jobs:
         && cp assets/com.unicornsonlsd.finamp.metainfo.xml build/linux/x64/release/
     # archive bundle and generate checksum
     - run: |
-        tar -czf finamp-${{ github.ref }}-linux-release.tar.gz --directory build/linux/x64/release/ bundle icons finamp.desktop.m4 com.unicornsonlsd.finamp.metainfo.xml \
-        && sha256sum finamp-${{ github.ref }}-linux-release.tar.gz > finamp-${{ github.ref }}-linux-release.tar.gz.sha256sum
+        tar -czf finamp-${{ github.ref_name }}-linux-release.tar.gz --directory build/linux/x64/release/ bundle icons finamp.desktop.m4 com.unicornsonlsd.finamp.metainfo.xml \
+        && sha256sum finamp-${{ github.ref_name }}-linux-release.tar.gz > finamp-${{ github.ref_name }}-linux-release.tar.gz.sha256sum
     - uses: actions/upload-artifact@v4
       with:
-        name: finamp-${{ github.ref }}-linux-release.tar.gz
-        path: finamp-${{ github.ref }}-linux-release.tar.gz
+        name: finamp-${{ github.ref_name }}-linux-release.tar.gz
+        path: finamp-${{ github.ref_name }}-linux-release.tar.gz
         compression-level: 0 # no compression
     - uses: actions/upload-artifact@v4
       with:
-        name: finamp-${{ github.ref }}-linux-release.tar.gz.sha256sum
-        path: finamp-${{ github.ref }}-linux-release.tar.gz.sha256sum
+        name: finamp-${{ github.ref_name }}-linux-release.tar.gz.sha256sum
+        path: finamp-${{ github.ref_name }}-linux-release.tar.gz.sha256sum
         compression-level: 0 # no compression
     - name: Upload release archive
       uses: alexellis/[email protected]
       env:
         GITHUB_TOKEN: ${{ github.token }}
       with:
-        asset_paths: '["./finamp-${{ github.ref }}-linux-release.tar.gz", "./finamp-${{ github.ref }}-linux-release.tar.gz.sha256sum"]'
+        asset_paths: '["./finamp-${{ github.ref_name }}-linux-release.tar.gz", "./finamp-${{ github.ref_name }}-linux-release.tar.gz.sha256sum"]'

android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml

@@ -0,0 +1,57 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="174.5"
+    android:viewportHeight="214.19">
+    <group
+        android:scaleX="0.35846677"
+        android:scaleY="0.44"
+        android:translateX="55.973774"
+        android:translateY="59.9732">
+        <path
+            android:fillAlpha="0.97647"
+            android:fillColor="#8374d3"
+            android:pathData="m133.41,92.25c2.09,4.9 -2.15,11.34 -19.15,29.07 -18.22,19.01 -23.33,22.33 -30.86,20.09 -7.53,-2.24 -9.99,-7.82 -14.85,-33.7 -7.41,-39.47 -4.89,-41.72 33.87,-30.19 19.64,5.85 29.13,10.35 31,14.72z"
+            android:strokeWidth="3.81" />
+        <path
+            android:pathData="m133.41,92.25c2.09,4.9 -2.15,11.34 -19.15,29.07 -18.22,19.01 -23.33,22.33 -30.86,20.09 -7.53,-2.24 -9.99,-7.82 -14.85,-33.7 -7.41,-39.47 -4.89,-41.72 33.87,-30.19 19.64,5.85 29.13,10.35 31,14.72z"
+            android:strokeWidth="3.81">
+            <aapt:attr name="android:fillColor">
+                <gradient
+                    android:endX="90.98"
+                    android:endY="100.15"
+                    android:startX="133.42"
+                    android:startY="92.24"
+                    android:type="linear">
+                    <item
+                        android:color="#FFAC5FC8"
+                        android:offset="0" />
+                    <item
+                        android:color="#00AC5FC8"
+                        android:offset="1" />
+                </gradient>
+            </aapt:attr>
+        </path>
+        <path
+            android:fillColor="#4f87d3"
+            android:pathData="m45.4,214.19c41.96,-48.42 -66.31,-188.64 42.74,-170.49 13.37,2.07 24.81,3.01 44.42,1.06 27.29,-16.43 24.39,-21.25 41.94,-37.84 -89.54,1.09 -55.66,6.6 -104.91,-1.85 -16.51,-2.83 -40.86,-9.55 -56.5,-0.5 -16.98,9.83 -13.04,40.65 -11.83,56.94 3.51,47.42 11.22,116.4 44.14,152.69" />
+        <path android:pathData="m45.4,214.19c41.96,-48.42 -66.31,-188.64 42.74,-170.49 13.37,2.07 24.81,3.01 44.42,1.06 27.29,-16.43 24.39,-21.25 41.94,-37.84 -89.54,1.09 -55.66,6.6 -104.91,-1.85 -16.51,-2.83 -40.86,-9.55 -56.5,-0.5 -16.98,9.83 -13.04,40.65 -11.83,56.94 3.51,47.42 11.22,116.4 44.14,152.69">
+            <aapt:attr name="android:fillColor">
+                <gradient
+                    android:endX="34.14"
+                    android:endY="108.05"
+                    android:startX="149.04"
+                    android:startY="100.8"
+                    android:type="linear">
+                    <item
+                        android:color="#FF03A2DB"
+                        android:offset="0" />
+                    <item
+                        android:color="#0003A2DB"
+                        android:offset="1" />
+                </gradient>
+            </aapt:attr>
+        </path>
+    </group>
+</vector>

android/build.gradle

@@ -9,6 +9,17 @@ rootProject.buildDir = '../build'
 subprojects {
     project.buildDir = "${rootProject.buildDir}/${project.name}"
 }
+subprojects {
+    afterEvaluate { project ->
+        if (project.plugins.hasPlugin("com.android.application") ||
+                project.plugins.hasPlugin("com.android.library")) {
+            project.android {
+                compileSdkVersion 34
+                buildToolsVersion "34.0.0"
+            }
+        }
+    }
+}
 subprojects {
     project.evaluationDependsOn(':app')
 }

assets/com.unicornsonlsd.finamp.metainfo.xml

@@ -39,6 +39,45 @@
   </screenshots>
   <launchable type="desktop-id">com.unicornsonlsd.finamp.desktop</launchable>
   <releases>
+    <release version="0.9.11-beta" date="2024-09-17">
+      <url type="details">https://github.com/jmshrv/finamp/releases/tag/0.9.11-beta</url>
+      <description>
+        <p>This is a hotfix for a bug introduced with 0.9.10</p>
+        <p>
+          Bug Fixes
+        </p>
+        <ul>
+          <li>Fix white overlay preventing further interaction when using the fast scroller / alphabet list</li>
+        </ul>
+        <p>
+          <em>Thank you for using Finamp!</em>
+        </p>
+      </description>
+    </release>
+    <release version="0.9.10-beta" date="2024-09-15">
+      <url type="details">https://github.com/jmshrv/finamp/releases/tag/0.9.10-beta</url>
+      <description>
+        <p>
+          New Features
+        </p>
+        <ul>
+          <li>Added setting to keep the screen on</li>
+          <li>Accessibility improvements</li>
+          <li>More lyrics screen customizations</li>
+        </ul>
+        <p>
+          Bug Fixes
+        </p>
+        <ul>
+          <li>Improved handling of non-square album covers</li>
+          <li>Improve fast scroller</li>
+          <li>Fixed fully black offline mode toggle</li>
+        </ul>
+        <p>
+          <em>Thank you for using Finamp!</em>
+        </p>
+      </description>
+    </release>
     <release version="0.9.9-beta" date="2024-07-21">
       <url type="details">https://github.com/jmshrv/finamp/releases/tag/0.9.9-beta</url>
       <description>

ios/Podfile.lock

@@ -1,10 +1,14 @@
 PODS:
+  - app_set_id (1.2.0):
+    - Flutter
   - audio_service (0.0.1):
     - Flutter
   - audio_session (0.0.1):
     - Flutter
   - background_downloader (0.0.1):
     - Flutter
+  - battery_plus (1.0.0):
+    - Flutter
   - CropViewController (2.6.1)
   - device_info_plus (0.0.1):
     - Flutter
@@ -91,11 +95,15 @@ PODS:
   - SwiftyGif (5.4.4)
   - url_launcher_ios (0.0.1):
     - Flutter
+  - wakelock_plus (0.0.1):
+    - Flutter
 
 DEPENDENCIES:
+  - app_set_id (from `.symlinks/plugins/app_set_id/ios`)
   - audio_service (from `.symlinks/plugins/audio_service/ios`)
   - audio_session (from `.symlinks/plugins/audio_session/ios`)
   - background_downloader (from `.symlinks/plugins/background_downloader/ios`)
+  - battery_plus (from `.symlinks/plugins/battery_plus/ios`)
   - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`)
   - DKImagePickerController (= 4.3.4)
   - file_picker (from `.symlinks/plugins/file_picker/ios`)
@@ -110,6 +118,7 @@ DEPENDENCIES:
   - share_plus (from `.symlinks/plugins/share_plus/ios`)
   - sqflite (from `.symlinks/plugins/sqflite/darwin`)
   - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
+  - wakelock_plus (from `.symlinks/plugins/wakelock_plus/ios`)
 
 SPEC REPOS:
   trunk:
@@ -123,12 +132,16 @@ SPEC REPOS:
     - SwiftyGif
 
 EXTERNAL SOURCES:
+  app_set_id:
+    :path: ".symlinks/plugins/app_set_id/ios"
   audio_service:
     :path: ".symlinks/plugins/audio_service/ios"
   audio_session:
     :path: ".symlinks/plugins/audio_session/ios"
   background_downloader:
     :path: ".symlinks/plugins/background_downloader/ios"
+  battery_plus:
+    :path: ".symlinks/plugins/battery_plus/ios"
   device_info_plus:
     :path: ".symlinks/plugins/device_info_plus/ios"
   file_picker:
@@ -155,11 +168,15 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/sqflite/darwin"
   url_launcher_ios:
     :path: ".symlinks/plugins/url_launcher_ios/ios"
+  wakelock_plus:
+    :path: ".symlinks/plugins/wakelock_plus/ios"
 
 SPEC CHECKSUMS:
+  app_set_id: a4d12ebbc7915f987b4a04983b4c0104c64d5e02
   audio_service: f509d65da41b9521a61f1c404dd58651f265a567
   audio_session: 088d2483ebd1dc43f51d253d4a1c517d9a2e7207
   background_downloader: 9f788ffc5de45acf87d6380e91ca0841066c18cf
+  battery_plus: 1ff2e16ba75af2a78387f65476057a390b47885e
   CropViewController: 58fb440f30dac788b129d2a1f24cffdcb102669c
   device_info_plus: 97af1d7e84681a90d0693e63169a5d50e0839a0d
   DKCamera: a902b66921fca14b7a75266feb8c7568aa7caa71
@@ -181,7 +198,8 @@ SPEC CHECKSUMS:
   sqflite: 673a0e54cc04b7d6dba8d24fb8095b31c3a99eec
   SwiftyGif: 93a1cc87bf3a51916001cf8f3d63835fb64c819f
   url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe
+  wakelock_plus: 78ec7c5b202cab7761af8e2b2b3d0671be6c4ae1
 
 PODFILE CHECKSUM: 047c0919aa274fcdf0ce568f883473a4587eda02
 
-COCOAPODS: 1.13.0
+COCOAPODS: 1.15.2

ios/Runner/AppDelegate.swift

@@ -1,7 +1,7 @@
 import UIKit
 import Flutter
 
-@UIApplicationMain
+@main
 @objc class AppDelegate: FlutterAppDelegate {
     override func application(
         _ application: UIApplication,

lib/components/AddToPlaylistScreen/add_to_playlist_button.dart

@@ -6,6 +6,7 @@ import 'package:finamp/services/favorite_provider.dart';
 import 'package:finamp/services/feedback_helper.dart';
 import 'package:finamp/services/finamp_settings_helper.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter/semantics.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter_vibrate/flutter_vibrate.dart';
@@ -41,37 +42,47 @@ class _AddToPlaylistButtonState extends ConsumerState<AddToPlaylistButton> {
     }
 
     bool isFav = ref.watch(isFavoriteProvider(FavoriteRequest(widget.item)));
-    return GestureDetector(
-      onLongPress: () async {
-        FeedbackHelper.feedback(FeedbackType.selection);
-        ref
-            .read(isFavoriteProvider(FavoriteRequest(widget.item)).notifier)
-            .updateFavorite(!isFav);
-      },
-      child: IconButton(
-          icon: Icon(
-            isFav ? Icons.favorite : Icons.favorite_outline,
-            size: widget.size ?? 24.0,
-          ),
-          color: widget.color ?? IconTheme.of(context).color,
-          disabledColor:
-              (widget.color ?? IconTheme.of(context).color)!.withOpacity(0.3),
-          visualDensity: widget.visualDensity ?? VisualDensity.compact,
-          // tooltip: AppLocalizations.of(context)!.addToPlaylistTooltip,
-          onPressed: () async {
-            if (FinampSettingsHelper.finampSettings.isOffline) {
-              return GlobalSnackbar.message((context) =>
-                  AppLocalizations.of(context)!.notAvailableInOfflineMode);
-            }
+    return Semantics.fromProperties(
+      properties: SemanticsProperties(
+        label: AppLocalizations.of(context)!.addToPlaylistTooltip,
+        hint: AppLocalizations.of(context)!.playlistActionsMenuButtonTooltip,
+        button: true,
+      ),
+      excludeSemantics: true,
+      container: true,
+      child: GestureDetector(
+        onLongPress: () async {
+          FeedbackHelper.feedback(FeedbackType.selection);
+          ref
+              .read(isFavoriteProvider(FavoriteRequest(widget.item)).notifier)
+              .updateFavorite(!isFav);
+        },
+        child: IconButton(
+            icon: Icon(
+              isFav ? Icons.favorite : Icons.favorite_outline,
+              size: widget.size ?? 24.0,
+            ),
+            color: widget.color ?? IconTheme.of(context).color,
+            disabledColor:
+                (widget.color ?? IconTheme.of(context).color)!.withOpacity(0.3),
+            visualDensity: widget.visualDensity ?? VisualDensity.compact,
+            // tooltip: AppLocalizations.of(context)!.addToPlaylistTooltip,
+            onPressed: () async {
+              if (FinampSettingsHelper.finampSettings.isOffline) {
+                return GlobalSnackbar.message((context) =>
+                    AppLocalizations.of(context)!.notAvailableInOfflineMode);
+              }
 
-            bool inPlaylist = queueItemInPlaylist(widget.queueItem);
-            await showPlaylistActionsMenu(
-              context: context,
-              item: widget.item!,
-              parentPlaylist: inPlaylist ? widget.queueItem!.source.item : null,
-              usePlayerTheme: true,
-            );
-          }),
+              bool inPlaylist = queueItemInPlaylist(widget.queueItem);
+              await showPlaylistActionsMenu(
+                context: context,
+                item: widget.item!,
+                parentPlaylist:
+                    inPlaylist ? widget.queueItem!.source.item : null,
+                usePlayerTheme: true,
+              );
+            }),
+      ),
     );
   }
 }

lib/components/AlbumScreen/album_screen_content_flexible_space_bar.dart

@@ -1,8 +1,8 @@
 import 'package:finamp/components/Buttons/cta_medium.dart';
 import 'package:finamp/components/global_snackbar.dart';
 import 'package:finamp/models/finamp_models.dart';
-import 'package:finamp/services/queue_service.dart';
 import 'package:finamp/services/feedback_helper.dart';
+import 'package:finamp/services/queue_service.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:flutter_tabler_icons/flutter_tabler_icons.dart';
@@ -260,7 +260,8 @@ class AlbumScreenContentFlexibleSpaceBar extends StatelessWidget {
                               children: [
                                 CTAMedium(
                                   text: AppLocalizations.of(context)!
-                                      .playButtonLabel,
+                                      .playButtonLabel
+                                      .toUpperCase(),
                                   icon: TablerIcons.player_play,
                                   onPressed: () => playAlbum(),
                                   // set the minimum width as 25% of the screen width,
@@ -345,7 +346,8 @@ class AlbumScreenContentFlexibleSpaceBar extends StatelessWidget {
                               children: [
                                 CTAMedium(
                                   text: AppLocalizations.of(context)!
-                                      .shuffleButtonLabel,
+                                      .shuffleButtonLabel
+                                      .toUpperCase(),
                                   icon: TablerIcons.arrows_shuffle,
                                   onPressed: () => shuffleAlbum(),
                                   // set the minimum width as 25% of the screen width,