Add Android Widget

.github/workflows/build.yml

@@ -225,19 +225,20 @@ jobs:
         sudo apt-get update
         sudo apt-get install -y build-essential cmake ninja-build libgtk-3-dev libmpv-dev
 
-    - name: Determine Flutter stable version
-      uses: subosito/flutter-action@v2
-      id: flutter-version
-      with:
-        architecture: 'x64'
-        channel: 'stable'
-        dry-run: true
+    # - 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 }}"
+        # flutter-version: "${{ steps.flutter-version.outputs.VERSION }}"
+        flutter-version: "3.41.9"
         cache: false
         pub-cache: true
         # Include arch as linux aarch64 include isar overriding
@@ -308,6 +309,14 @@ jobs:
         path: ${{ env.SHA_NAME }}
         compression-level: 0 # no compression
 
+    - name: Upload release archive
+      if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')
+      uses: alexellis/upload-assets@0.4.1
+      env:
+        GITHUB_TOKEN: ${{ github.token }}
+      with:
+        asset_paths: '["./${{ env.TAR_NAME }}", "./${{ env.SHA_NAME }}"]'
+
     - name: Run Integration Tests
       if: *integration_if
       run: |
@@ -320,14 +329,6 @@ jobs:
         fi
         exit $exitcode
 
-    - name: Upload release archive
-      if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')
-      uses: alexellis/upload-assets@0.4.1
-      env:
-        GITHUB_TOKEN: ${{ github.token }}
-      with:
-        asset_paths: '["./${{ env.TAR_NAME }}", "./${{ env.SHA_NAME }}"]'
-
   build-windows:
     name: Build for Windows
     runs-on: windows-latest
@@ -394,19 +395,6 @@ jobs:
         path: ./${{ env.BASE_NAME }}.msix
         compression-level: 0 # no compression
 
-    - name: Run Integration Tests
-      if: *integration_if
-      shell: bash
-      run: |
-        set +e
-        flutter test integration_test/test_cases.dart -d windows
-        exitcode=$?
-        if [[ $exitcode == 79 ]]; then
-          echo "Potential native crash - attempting to display"
-          timeout 2m flutter run -d windows
-        fi
-        exit $exitcode
-
     - name: Prepare release archive
       if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')
       run: |
@@ -422,6 +410,19 @@ jobs:
         # upload zip archive here, uploading the raw directory fails
         asset_paths: '["./${{ env.BASE_NAME }}.msix", "./${{ env.BASE_NAME }}.zip"]'
 
+    - name: Run Integration Tests
+      if: *integration_if
+      shell: bash
+      run: |
+        set +e
+        flutter test integration_test/test_cases.dart -d windows
+        exitcode=$?
+        if [[ $exitcode == 79 ]]; then
+          echo "Potential native crash - attempting to display"
+          timeout 2m flutter run -d windows
+        fi
+        exit $exitcode
+
   # build-macos:
   #   name: Build for macOS
   #   runs-on: macos-latest

CONTRIBUTING.md

@@ -20,6 +20,7 @@ The project includes a `flake.nix` file that can help you install Flutter and Ru
 use `nix develop`, which allows rustup for Discord RPC dependency. Also, there's `nix develop .#fenix` which stubs rustup with [fenix](https://github.com/nix-community/fenix/), but it is a hack.
 
 To get the application running on NixOS once you are in the development shell:
+
 - `flutter build linux` - generates the build files in `./build/linux/x64/release/bundle` where the `lib` folder will have all the dynamic libraries.
 - `cd ./build/linux/x64/release/bundle/lib` - flutter cannot find the dynamic libraries by default. Probably works only with this CWD because the fallback is CWD.
 - `../finamp` - start the application.  
@@ -33,8 +34,8 @@ Note that code generation fails since 21baadbaf6852d34d7d12725a293c359c05cf20b d
 
 ```diff
 diff --git a/lib/builders/finamp_settings_builder.dart b/lib/builders/finamp_settings_builder.dart
---- a/lib/builders/finamp_settings_builder.dart	(revision 66736f47c5d084463591dd74189c46123f4144ff)
-+++ b/lib/builders/finamp_settings_builder.dart	(date 1768146068892)
+--- a/lib/builders/finamp_settings_builder.dart (revision 66736f47c5d084463591dd74189c46123f4144ff)
++++ b/lib/builders/finamp_settings_builder.dart (date 1768146068892)
 @@ -129,13 +129,6 @@
    }
 
@@ -67,7 +68,14 @@ This also means that you can keep using your regular install of Finamp (from the
 If you try to install a release build you built yourself (with your signing key) on top of a release build you downloaded from the Play Store or GitHub, Android will prevent you from doing so and show a generic error message. The only solution here is to uninstall the existing version, and then install your build. Note that this will delete any logins, settings and downloads that you had configured.  
 This generally shouldn't be needed, since debug builds works fine for daily usage, even though they are a bit less performant.
 
+### Developing on Windows
+
+With recent Flutter updates, there have been some issue with caches not being closed when trying to build *on* Windows (no matter which platform).  
+If you run into this (something about "unclosed caches"), then check if your pub.dev cache is on the same drive (e.g. `C:`, `D:`) as your Finamp directory (the one you cloned via Git). If they aren't on the same drive, you'll have to move either your Finamp directory, or your pub.dev package cache. For the latter, simply clear the old cache via `flutter pub cache clean`, and then point the cache to a new location (<https://dart.dev/tools/pub/environment-variables>).  
+This should fix the issue.
+
 ### Developing on an Android Device without Android Studio on linux (not recommended)
+
 1. You need the following packages  
     *you may need to find out the equivalents for your distro, these are for Arch*  
     `android-sdk android-sdk-build-tools android-sdk-cmdline-tools-latest android-platform android-sdk-platform-tools`
@@ -79,8 +87,8 @@ This generally shouldn't be needed, since debug builds works fine for daily usag
 6. Find your device  
     `flutter devices`
 7. Run on device  
-    `flutter run -d <device>` eg. for google pixel phones `flutter run -d pixel`   
-8. Go back to develop on linux   
+    `flutter run -d <device>` eg. for google pixel phones `flutter run -d pixel`
+8. Go back to develop on linux
     `flutter run -d linux`
 
 ### Code Generation (The Arcane Arts)
@@ -149,7 +157,9 @@ As mentioned above, Finamp uses Hive for most data storage needs. If you're doin
 When creating new types, note that you'll also have to register an adapter in `main.dart`. After code generation, there should be a class called `[YourType]Adapter`, which you can initialize in `setupHive`.
 
 ## Project Structure
+
 Here is a short description on the paths you'll most likely come across
+
 ```
 lib/                                -- the codebase also known as src in other projects
     components/                     -- Contains elements used by screens
@@ -159,13 +169,14 @@ lib/                                -- the codebase also known as src in other p
         screens/                    -- All the "pages", "screens", "views" what ever you want to call them
         services/                   -- Things that run in the background, kinda like backend
 ```
+
 ## Developing
 
 *Remember to format your changes before pushing (ideally in a **separate commit**), by running `flutter gen-l10n` or the "Generate Localizations" command in VS Code*
 
 ### Extending the Jellyfin API
 
-1. Figure out the endpoint you need. You can use https://api.jellyfin.org for this, for example
+1. Figure out the endpoint you need. You can use <https://api.jellyfin.org> for this, for example
 2. Create a new matching endpoint in `jellyfin_api.dart`. Just copy-paste the needed annotations from other similar endpoints.
 3. Run code-generation (`dart run build_runner build --delete-conflicting-outputs`) to generate actual code based on the endpoint annotations
 4. Create a new method for interacting with the endpoint in `jellyfin_api_helper.dart`. Again, just copy-paste what you need.
@@ -180,7 +191,7 @@ lib/                                -- the codebase also known as src in other p
 5. Now duplicate the code for the new setting in the appropriate settings screen file, and update the settings property it references to match your newly added setting
 6. Now add new translation strings in `app_en.arb` at the bottom, then generate the new localizations via `flutter gen-l10n` (see "Adding i18n strings")
 7. Use the new translation tokens in your new settings' code, replacing the old translation tokens
-8. Format everything via `dart format . `
+8. Format everything via `dart format .`
 
 ### Adding i18n strings
 
@@ -216,7 +227,9 @@ But since **making one request for each track that is queued up is simply not fe
 Notably, since we already have the full `BaseItemDto`s and additional metadata for each track, we could simply build client-side automatic transcoding. This would be needed anyway for considering network connectivity and such, so we're not losing much here.  
 
 Should the API for this improve in the future, for example by allowing us to submit the supported codecs and bitrate limits to an endpoint like [`/Sessions/Capabilities/Full`](https://api.jellyfin.org/#tag/Session/operation/PostFullCapabilities) (that part is already possible) and then getting the corresponding `PlaySessionId`s and transcode URLs via the regular `BaseItemDto`, then we could think about doing this the proper way. But until then we'll most likely handle the ID generation and transcoding settings client-side.
+
 ### Android Debug Build stuck in 'assembleDebug'
+
 1. `cd android`
 2. `./gradlew clean`
 3. `cd ..`
@@ -238,6 +251,7 @@ Note: CarPlay can only be tested on the simulator with the included entitlements
 If Finamp doesn't appear in the CarPlay display after enabling it, the most common cause is corruption in the Xcode project file from repeated `pod install` runs. This can break entitlement embedding for simulator builds.
 
 **Fix:**
+
 ```bash
 # Restore project file to committed state
 git checkout -- ios/Runner.xcodeproj/project.pbxproj
@@ -252,6 +266,7 @@ flutter build ios --simulator
 Then restart the simulator and re-enable CarPlay via **I/O > External Displays > CarPlay**.
 
 ### Add dbus message
+
 1. Open `lib/services/dbus_manager.dart`
 2. Add another `else if (call.interface == 'com.unicornsonlsd.Finamp' && call.name == 'YOUR FUNCTION NAME')`
 3. Profit

android/app/build.gradle

@@ -2,6 +2,7 @@ plugins {
     id "com.android.application"
     id "kotlin-android"
     id "dev.flutter.flutter-gradle-plugin"
+    id("org.jetbrains.kotlin.plugin.compose") version "2.2.10"
 }
 
 def localProperties = new Properties()
@@ -18,10 +19,24 @@ if (keystorePropertiesFile.exists()) {
     keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
 }
 
+configurations.all {
+    resolutionStrategy {
+        force "androidx.glance:glance-appwidget:1.1.1"
+    }
+}
+
 android {
     compileSdkVersion flutter.compileSdkVersion
     ndkVersion flutter.ndkVersion
 
+    buildFeatures {
+        compose true
+    }
+
+    composeOptions {
+       kotlinCompilerExtensionVersion = "1.5.15"
+    }
+
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
     }
@@ -97,4 +112,5 @@ dependencies {
     implementation 'androidx.mediarouter:mediarouter:1.8.1'
     implementation "androidx.core:core-splashscreen:1.2.0"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2"
+    implementation "androidx.glance:glance-appwidget:1.1.1"
 }

android/app/src/main/AndroidManifest.xml

@@ -52,16 +52,22 @@
 
       <intent-filter>
         <action android:name="android.intent.action.MAIN" />
+
+        <category android:name="android.intent.category.LAUNCHER" />
+      </intent-filter>
+      <intent-filter>
         <action android:name="android.intent.action.MUSIC_PLAYER" />
 
         <category android:name="android.intent.category.DEFAULT" />
-        <category android:name="android.intent.category.LAUNCHER" />
         <category android:name="android.intent.category.APP_MUSIC" />
       </intent-filter>
       <intent-filter>
         <action android:name="android.media.action.MEDIA_PLAY_FROM_SEARCH" />
         <category android:name="android.intent.category.DEFAULT" />
       </intent-filter>
+      <intent-filter>
+        <action android:name="es.antonborri.home_widget.action.LAUNCH" />
+      </intent-filter>
     </activity>
     <provider
             android:name=".MediaItemContentProvider"
@@ -91,6 +97,38 @@
     <!-- <meta-data
       android:name="com.android.automotive"
       android:resource="@xml/automotive_app_desc" /> -->
+
+    <receiver
+        android:name=".widget.receiver.CircularWidgetReceiver"
+        android:label="@string/circular_widget_label"
+        android:exported="true">
+      <intent-filter>
+        <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+      </intent-filter>
+      <meta-data
+        android:name="android.appwidget.provider"
+        android:resource="@xml/circular_widget_config" />
+    </receiver>
+
+    <receiver
+        android:name=".widget.receiver.RectangularWidgetReceiver"
+        android:label="@string/rectangular_widget_label"
+        android:exported="true">
+      <intent-filter>
+        <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+      </intent-filter>
+      <meta-data
+        android:name="android.appwidget.provider"
+        android:resource="@xml/rectangular_widget_config" />
+    </receiver>
+
+    <!-- Used for Background Work -->
+    <receiver android:name="es.antonborri.home_widget.HomeWidgetBackgroundReceiver"  android:exported="true">
+      <intent-filter>
+        <action android:name="es.antonborri.home_widget.action.BACKGROUND" />
+      </intent-filter>
+    </receiver>
+
     <!-- Don't delete the meta-data below.
              This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
     <meta-data android:name="flutterEmbedding" android:value="2" />

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

@@ -2,6 +2,7 @@ package com.unicornsonlsd.finamp
 
 import android.app.UiModeManager
 import android.content.Intent
+import android.content.Intent.CATEGORY_APP_MUSIC
 import android.os.Bundle
 import android.provider.Settings
 import android.system.ErrnoException
@@ -19,12 +20,15 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import java.io.File
 import android.os.Build
+import android.provider.MediaStore.INTENT_ACTION_MUSIC_PLAYER
+import androidx.core.net.toUri
 
 
 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 INTENT_CHANNEL_LOG_TAG = "intentChannel"
 
         private const val OUTPUT_SWITCHER_CHANNEL = "com.unicornsonlsd.finamp/output_switcher"
         private const val OUTPUT_SWITCHER_CHANNEL_LOG_TAG = "OutputSwitcherChannel"
@@ -36,11 +40,24 @@ class MainActivity : AudioServiceActivity() {
     private lateinit var mediaRouter: MediaRouter
 
     override fun onCreate(savedInstanceState: Bundle?) {
+        updateIntent(intent)
         super.onCreate(savedInstanceState)
 
         mediaRouter = MediaRouter.getInstance(this)
     }
 
+    override fun onNewIntent(intent: Intent) {
+        updateIntent(intent)
+        super.onNewIntent(intent)
+    }
+
+    private fun updateIntent(intent: Intent){
+        if((intent.action==INTENT_ACTION_MUSIC_PLAYER || intent.action==CATEGORY_APP_MUSIC)
+            &&intent.data==null){
+            intent.data = "finamp://play/surprisemix".toUri()
+        }
+    }
+
     override fun configureFlutterEngine(flutterEngine: FlutterEngine) {
         super.configureFlutterEngine(flutterEngine)
         MethodChannel(