feat(media-player): enhancement

app/build.gradle.kts

@@ -526,6 +526,7 @@ dependencies {
 
     // region Kotlin
     implementation(libs.kotlin.stdlib)
+    implementation(libs.kotlinx.coroutines.core)
     // endregion
 
     // region Stateless

app/lint.xml

@@ -76,6 +76,11 @@
         <ignore path="build" />
     </issue>
 
+    <!-- Dagger factories generated for media3 @UnstableApi types cannot carry an @OptIn annotation. -->
+    <issue id="UnsafeOptInUsageError" severity="error">
+        <ignore path="build" />
+    </issue>
+
     <issue id="ObsoleteLintCustomCheck" severity="warning">
         <ignore path="**/fragment-1.2.5/**/lint.jar" />
         <ignore path="**/work-runtime-2.**/**/lint.jar" />

app/src/main/AndroidManifest.xml

@@ -384,16 +384,19 @@
             android:theme="@style/PreferenceTheme" />
         <activity
             android:name=".ui.preview.PreviewImageActivity"
+            android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
             android:exported="false"
+            android:supportsPictureInPicture="true"
+            android:launchMode="singleTask"
             android:theme="@style/Theme.ownCloud.Overlay" />
         <activity
-            android:name=".ui.preview.PreviewMediaActivity"
-            android:configChanges="orientation|screenLayout|screenSize|keyboardHidden"
-            android:exported="false"
-            android:theme="@style/Theme.ownCloud.Media" />
+            android:name="com.nextcloud.client.player.ui.PlayerActivity"
+            android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
+            android:launchMode="singleTask"
+            android:supportsPictureInPicture="true" />
 
         <service
-            android:name="com.nextcloud.client.media.BackgroundPlayerService"
+            android:name="com.nextcloud.client.player.media3.PlaybackService"
             android:exported="true"
             android:foregroundServiceType="mediaPlayback"
             tools:ignore="ExportedService">
@@ -402,6 +405,13 @@
             </intent-filter>
         </service>
 
+        <receiver android:name="androidx.media3.session.MediaButtonReceiver"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MEDIA_BUTTON" />
+            </intent-filter>
+        </receiver>
+
         <service
             android:name=".authentication.AccountAuthenticatorService"
             android:exported="false">
@@ -555,11 +565,6 @@
             android:name="com.nextcloud.client.jobs.transfer.FileTransferService"
             android:exported="false"
             android:foregroundServiceType="dataSync" />
-        <service
-            android:name="com.nextcloud.client.media.PlayerService"
-            android:exported="false"
-            android:foregroundServiceType="mediaPlayback" />
-
         <activity
             android:name=".ui.activity.PassCodeActivity"
             android:exported="false"

app/src/main/java/com/nextcloud/client/database/dao/FileDao.kt

@@ -71,7 +71,7 @@ interface FileDao {
             " AND file_owner = :fileOwner" +
             " AND path LIKE :pathPrefix || '%'" +
             " AND (:mimeFilter IS NULL OR content_type LIKE :mimeFilter)" +
-            " ORDER BY modified DESC" +
+            " ORDER BY modified DESC, ${ProviderTableMeta._ID} DESC" +
             " LIMIT :limit OFFSET :offset"
     )
     suspend fun getGalleryItemsPageSuspended(
@@ -169,6 +169,17 @@ interface FileDao {
     )
     suspend fun getFavoriteFiles(fileOwner: String): List<FileEntity>
 
+    @Query(
+        """
+    SELECT * 
+    FROM filelist 
+    WHERE file_owner = :fileOwner 
+      AND favorite = 1
+    ORDER BY ${ProviderTableMeta.FILE_DEFAULT_SORT_ORDER}
+    """
+    )
+    fun getFavoriteFilesNonBlocking(fileOwner: String): List<FileEntity>
+
     @Query("SELECT remote_id FROM filelist WHERE file_owner = :accountName AND remote_id IS NOT NULL")
     fun getAllRemoteIds(accountName: String): List<String>
 

app/src/main/java/com/nextcloud/client/di/AppComponent.kt

@@ -0,0 +1,78 @@
+/*
+ * Nextcloud - Android Client
+ *
+ * SPDX-FileCopyrightText: 2019 Chris Narkiewicz <hello@ezaquarii.com>
+ * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
+ */
+package com.nextcloud.client.di
+
+import android.app.Application
+import com.nextcloud.appReview.InAppReviewModule
+import com.nextcloud.client.appinfo.AppInfoModule
+import com.nextcloud.client.database.DatabaseModule
+import com.nextcloud.client.device.DeviceModule
+import com.nextcloud.client.integrations.IntegrationsModule
+import com.nextcloud.client.jobs.JobsModule
+import com.nextcloud.client.jobs.download.FileDownloadHelper
+import com.nextcloud.client.jobs.folderDownload.FolderDownloadWorkerReceiver
+import com.nextcloud.client.jobs.offlineOperations.receiver.OfflineOperationReceiver
+import com.nextcloud.client.jobs.upload.FileUploadBroadcastReceiver
+import com.nextcloud.client.jobs.upload.FileUploadHelper
+import com.nextcloud.client.network.NetworkModule
+import com.nextcloud.client.onboarding.OnboardingModule
+import com.nextcloud.client.player.PlayerModule
+import com.nextcloud.client.preferences.PreferencesModule
+import com.owncloud.android.MainApp
+import com.owncloud.android.ui.ThemeableSwitchPreference
+import com.owncloud.android.ui.whatsnew.ProgressIndicator
+import dagger.BindsInstance
+import dagger.Component
+import dagger.android.support.AndroidSupportInjectionModule
+import javax.inject.Singleton
+
+@Component(
+    modules = [
+        AndroidSupportInjectionModule::class,
+        AppModule::class,
+        PreferencesModule::class,
+        AppInfoModule::class,
+        NetworkModule::class,
+        DeviceModule::class,
+        OnboardingModule::class,
+        ViewModelModule::class,
+        JobsModule::class,
+        IntegrationsModule::class,
+        InAppReviewModule::class,
+        ThemeModule::class,
+        DatabaseModule::class,
+        DispatcherModule::class,
+        VariantModule::class,
+        PlayerModule::class
+    ]
+)
+@Singleton
+interface AppComponent {
+    fun inject(app: MainApp)
+
+    fun inject(switchPreference: ThemeableSwitchPreference)
+
+    fun inject(fileUploadHelper: FileUploadHelper)
+
+    fun inject(fileDownloadHelper: FileDownloadHelper)
+
+    fun inject(progressIndicator: ProgressIndicator)
+
+    fun inject(fileUploadBroadcastReceiver: FileUploadBroadcastReceiver)
+
+    fun inject(offlineOperationReceiver: OfflineOperationReceiver)
+
+    fun inject(folderDownloadWorkerReceiver: FolderDownloadWorkerReceiver)
+
+    @Component.Builder
+    interface Builder {
+        @BindsInstance
+        fun application(application: Application): Builder
+
+        fun build(): AppComponent
+    }
+}

app/src/main/java/com/nextcloud/client/di/ComponentsModule.java

@@ -18,8 +18,6 @@
 import com.nextcloud.client.jobs.upload.FileUploadHelper;
 import com.nextcloud.client.logger.ui.LogsActivity;
 import com.nextcloud.client.logger.ui.LogsViewModel;
-import com.nextcloud.client.media.BackgroundPlayerService;
-import com.nextcloud.client.media.PlayerService;
 import com.nextcloud.client.migrations.Migrations;
 import com.nextcloud.client.onboarding.FirstRunActivity;
 import com.nextcloud.client.onboarding.WhatsNewActivity;
@@ -129,8 +127,7 @@
 import com.owncloud.android.ui.preview.PreviewBitmapActivity;
 import com.owncloud.android.ui.preview.PreviewImageActivity;
 import com.owncloud.android.ui.preview.PreviewImageFragment;
-import com.owncloud.android.ui.preview.PreviewMediaActivity;
-import com.owncloud.android.ui.preview.PreviewMediaFragment;
+import com.owncloud.android.ui.preview.PreviewPlaybackFragment;
 import com.owncloud.android.ui.preview.PreviewTextFileFragment;
 import com.owncloud.android.ui.preview.PreviewTextFragment;
 import com.owncloud.android.ui.preview.PreviewTextStringFragment;
@@ -213,9 +210,6 @@ abstract class ComponentsModule {
     @ContributesAndroidInjector
     abstract PreviewImageActivity previewImageActivity();
 
-    @ContributesAndroidInjector
-    abstract PreviewMediaActivity previewMediaActivity();
-
     @ContributesAndroidInjector
     abstract ReceiveExternalFilesActivity receiveExternalFilesActivity();
 
@@ -297,9 +291,6 @@ abstract class ComponentsModule {
     @ContributesAndroidInjector
     abstract BackupListFragment chooseContactListFragment();
 
-    @ContributesAndroidInjector
-    abstract PreviewMediaFragment previewMediaFragment();
-
     @ContributesAndroidInjector
     abstract PreviewTextFragment previewTextFragment();
 
@@ -309,6 +300,9 @@ abstract class ComponentsModule {
     @ContributesAndroidInjector
     abstract SetOnlineStatusBottomSheet setOnlineStatusBottomSheet();
 
+    @ContributesAndroidInjector
+    abstract PreviewPlaybackFragment previewPlaybackFragment();
+
     @ContributesAndroidInjector
     abstract PreviewTextFileFragment previewTextFileFragment();
 
@@ -351,9 +345,6 @@ abstract class ComponentsModule {
     @ContributesAndroidInjector
     abstract OperationsService operationsService();
 
-    @ContributesAndroidInjector
-    abstract PlayerService playerService();
-
     @ContributesAndroidInjector
     abstract FileTransferService fileDownloaderService();
 
@@ -505,9 +496,6 @@ abstract class ComponentsModule {
     abstract InternalTwoWaySyncActivity internalTwoWaySyncActivity();
 
     @OptIn(markerClass = UnstableApi.class)
-    @ContributesAndroidInjector
-    abstract BackgroundPlayerService backgroundPlayerService();
-
     @ContributesAndroidInjector
     abstract TermsOfServiceDialog termsOfServiceDialog();
 

app/src/main/java/com/nextcloud/client/di/ViewModelModule.kt

@@ -12,6 +12,7 @@ import androidx.lifecycle.ViewModelProvider
 import com.nextcloud.client.documentscan.DocumentScanViewModel
 import com.nextcloud.client.etm.EtmViewModel
 import com.nextcloud.client.logger.ui.LogsViewModel
+import com.nextcloud.client.player.ui.PlayerViewModel
 import com.nextcloud.ui.fileactions.FileActionsViewModel
 import com.nextcloud.ui.tags.TagManagementViewModel
 import com.nextcloud.ui.trashbinFileActions.TrashbinFileActionsViewModel
@@ -63,6 +64,11 @@ abstract class ViewModelModule {
     @ViewModelKey(TagManagementViewModel::class)
     abstract fun tagManagementViewModel(vm: TagManagementViewModel): ViewModel
 
+    @Binds
+    @IntoMap
+    @ViewModelKey(PlayerViewModel::class)
+    abstract fun playerViewModel(vm: PlayerViewModel): ViewModel
+
     @Binds
     abstract fun bindViewModelFactory(factory: ViewModelFactory): ViewModelProvider.Factory
 }