Merge pull request #507 from namehillsoftware/feature/add-rating-to-media-metadata

[Feature] Add Rating to Media Metadata

Author: davidvedvick

.github/workflows/build-release.yml

@@ -0,0 +1,44 @@
+name: Build Release
+
+on:
+  push:
+    tags:
+      - '**'
+
+jobs:
+
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v1
+    - name: Build and test project blue
+      env:
+        ANDROID_KEY_STORE_PASSWORD: "${{ secrets.ANDROID_KEY_STORE_PASSWORD }}"
+        ANDROID_STORE_PASSWORD: "${{ secrets.ANDROID_STORE_PASSWORD }}"
+      run: sh build-release.sh
+    - name: Upload artifact
+      uses: actions/upload-artifact@v4
+      with:
+        # Artifact name
+        name: project-blue.build
+        path: _artifacts/
+
+  upload:
+    name: Create release and upload artifacts
+    needs:
+      - build
+    runs-on: ubuntu-latest
+    steps:
+      - name: Download artifacts
+        uses: actions/download-artifact@v4
+      - name: Inspect directory after downloading artifacts
+        run: ls -alFR
+      - name: Create release and upload artifacts
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          wget -q https://github.com/TheAssassin/pyuploadtool/releases/download/continuous/pyuploadtool-x86_64.AppImage
+          chmod +x pyuploadtool-x86_64.AppImage
+          ./pyuploadtool-x86_64.AppImage **/*.apk

Dockerfile

@@ -30,7 +30,7 @@ RUN curl -sSL https://dl.google.com/android/repository/${SDK_VERSION} -o /tmp/sd
 
 # Set these to the same versions as in build.gradle to avoid downloading updated tools
 ARG ANDROID_BUILD_VERSION=35
-ARG ANDROID_TOOLS_VERSION=34.0.0
+ARG ANDROID_TOOLS_VERSION=35.0.0
 
 RUN yes | sdkmanager "platform-tools" \
 #        "emulator" \ # keeping just in case it is needed

README.md

@@ -52,7 +52,7 @@ Run the tests via the IDE.
 Android Studio can perform the build. To run a CI build like it is run in Github, run the following command:
 
 ```shell script
-./build-bundle.sh
+./build-release.sh
 ```
 
 ## Deployment

build-bundle.sh build-release.shbuild-bundle.sh renamed to build-release.sh

@@ -4,6 +4,7 @@ rm -rf _artifacts
 
 docker compose build && docker compose run --rm -v "$(pwd)":/src -w /src -u "$(id -u)":"$(id -g)" gradle \
   :projectBlueWater:testReleaseUnitTest \
+  :projectBlueWater:assembleRelease \
   :projectBlueWater:bundleRelease
 EXIT_CODE=${PIPESTATUS[0]}
 

build.gradle

@@ -10,8 +10,8 @@ buildscript {
 }
 
 plugins {
-	id 'com.android.application' version '8.7.3' apply false
-	id 'com.android.library' version '8.7.3' apply false
+	id 'com.android.application' version '8.8.0' apply false
+	id 'com.android.library' version '8.8.0' apply false
 	id 'org.jetbrains.kotlin.android' version "$kotlin_version" apply false
 	id 'org.jetbrains.kotlin.plugin.compose' version "$kotlin_version" apply false
 }

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip

projectBlueWater/build.gradle

@@ -190,7 +190,7 @@ dependencies {
 	implementation 'commons-io:commons-io:2.18.0'
 	implementation 'org.slf4j:slf4j-api:2.0.16'
 	implementation 'com.github.tony19:logback-android:3.0.0'
-	implementation 'com.namehillsoftware:handoff:0.29.0'
+	implementation 'com.namehillsoftware:handoff:0.30.0'
 	implementation 'io.reactivex.rxjava3:rxjava:3.1.10'
 	implementation 'com.namehillsoftware:lazy-j:0.11.0'
 	implementation 'org.jsoup:jsoup:1.18.3'
@@ -203,7 +203,7 @@ dependencies {
 	implementation "androidx.compose.material:material:$compose_version"
 	implementation "androidx.compose.ui:ui-tooling:$compose_version"
 	implementation "androidx.compose.runtime:runtime-rxjava3:$compose_version"
-	implementation 'androidx.activity:activity-compose:1.9.3'
+	implementation 'androidx.activity:activity-compose:1.10.0'
 	implementation 'dev.olshevski.navigation:reimagined:1.5.0'
 	debugImplementation "androidx.compose.ui:ui-tooling:$compose_version"
 	debugImplementation "androidx.compose.ui:ui-test-manifest:$compose_version"

projectBlueWater/src/main/java/com/lasthopesoftware/bluewater/ActivityApplicationNavigation.kt

@@ -6,9 +6,9 @@ import com.lasthopesoftware.bluewater.android.intents.BuildIntents
 import com.lasthopesoftware.bluewater.client.browsing.files.ServiceFile
 import com.lasthopesoftware.bluewater.client.browsing.files.properties.FileProperty
 import com.lasthopesoftware.bluewater.client.browsing.library.repository.LibraryId
+import com.lasthopesoftware.promises.extensions.preparePromise
 import com.lasthopesoftware.resources.executors.HandlerExecutor
 import com.namehillsoftware.handoff.promises.Promise
-import com.namehillsoftware.handoff.promises.queued.QueuedPromise
 import com.namehillsoftware.handoff.promises.queued.cancellation.CancellableMessageWriter
 
 class ActivityApplicationNavigation(
@@ -40,5 +40,5 @@ class ActivityApplicationNavigation(
 
 	override fun navigateUp() = loopInOperation { componentActivity.finish(); true }
 
-	private fun <T> loopInOperation(operation: CancellableMessageWriter<T>) = QueuedPromise(operation, executor)
+	private fun <T> loopInOperation(operation: CancellableMessageWriter<T>) = executor.preparePromise(operation)
 }

projectBlueWater/src/main/java/com/lasthopesoftware/bluewater/ApplicationDependencies.kt

@@ -16,9 +16,11 @@ import com.lasthopesoftware.bluewater.shared.android.ui.ProvideScreenDimensions
 import com.lasthopesoftware.bluewater.shared.images.ProvideDefaultImage
 import com.lasthopesoftware.bluewater.shared.messages.application.RegisterForApplicationMessages
 import com.lasthopesoftware.bluewater.shared.messages.application.SendApplicationMessages
+import com.lasthopesoftware.resources.bitmaps.ProduceBitmaps
 import com.lasthopesoftware.resources.strings.GetStringResources
 
 interface ApplicationDependencies {
+	val bitmapProducer: ProduceBitmaps
 	val libraryProvider: ILibraryProvider
 	val libraryStorage: ILibraryStorage
 	val storedItemAccess: AccessStoredItems

projectBlueWater/src/main/java/com/lasthopesoftware/bluewater/ApplicationDependenciesContainer.kt

@@ -41,6 +41,8 @@ import com.lasthopesoftware.bluewater.shared.images.DefaultImageProvider
 import com.lasthopesoftware.bluewater.shared.messages.application.ApplicationMessageBus
 import com.lasthopesoftware.bluewater.shared.messages.application.RegisterForApplicationMessages
 import com.lasthopesoftware.bluewater.shared.messages.application.SendApplicationMessages
+import com.lasthopesoftware.resources.bitmaps.DefaultAwareCachingBitmapProducer
+import com.lasthopesoftware.resources.bitmaps.QueuedBitmapProducer
 import com.lasthopesoftware.resources.network.ActiveNetworkFinder
 import com.lasthopesoftware.resources.strings.Base64Encoder
 import com.lasthopesoftware.resources.strings.StringResources
@@ -79,6 +81,8 @@ object ApplicationDependenciesContainer {
 
 		private val imageDiskCacheDirectory by lazy { AndroidDiskCacheDirectoryProvider(context, ImageCacheConfiguration) }
 
+		override val bitmapProducer by lazy { DefaultAwareCachingBitmapProducer(QueuedBitmapProducer, defaultImageProvider) }
+
 		override val applicationSettings by lazy {
 			CachingApplicationSettingsRepository(
 				ApplicationSettingsRepository(context, sendApplicationMessages)