WIP: Rewrite the app user interface using Jetpack Compose

app/build.gradle.kts

@@ -11,6 +11,10 @@ plugins {
     id("kotlin-parcelize")
     id("com.apollographql.apollo3") version "3.8.4"
     id("kotlin-kapt")
+    id("com.google.dagger.hilt.android")
+    kotlin("kapt")
+    id("androidx.navigation.safeargs.kotlin")
+    kotlin("plugin.serialization") version "1.9.25"
 }
 
 fun getVersionCode(): Int {
@@ -43,8 +47,12 @@ android {
 
     buildFeatures {
         buildConfig = true
+        compose = true
+    }
+    composeOptions {
+        // https://developer.android.com/jetpack/androidx/releases/compose-kotlin
+        kotlinCompilerExtensionVersion = "1.5.14"
     }
-
     defaultConfig {
         applicationId = "com.github.damontecres.stashapp"
         minSdk = 23
@@ -129,12 +137,18 @@ tasks.register<com.github.damontecres.buildsrc.ParseStashStrings>("generateStrin
     outputDirectory = File("$buildDir/generated/res/server")
 }
 
+// Allow references to generated code
+kapt {
+    correctErrorTypes = true
+}
+
 // tasks.preBuild.dependsOn("generateStrings")
 tasks.preBuild.dependsOn("generateStrings")
 
 val mediaVersion = "1.3.1"
 val glideVersion = "4.16.0"
 val acraVersion = "5.11.3"
+val navVersion = "2.8.0-beta06"
 
 dependencies {
     implementation("androidx.core:core-ktx:1.13.1")
@@ -143,7 +157,25 @@ dependencies {
     implementation("androidx.leanback:leanback-paging:1.1.0-alpha11")
     implementation("com.github.bumptech.glide:glide:$glideVersion")
     implementation("com.github.bumptech.glide:okhttp3-integration:$glideVersion")
+    implementation("com.github.bumptech.glide:compose:1.0.0-beta01")
     implementation("androidx.leanback:leanback-tab:1.1.0-beta01")
+    implementation("androidx.navigation:navigation-runtime-ktx:$navVersion")
+    implementation("androidx.compose.runtime:runtime-android:1.6.8")
+    implementation("androidx.navigation:navigation-compose:$navVersion")
+    implementation("androidx.navigation:navigation-fragment-ktx:$navVersion")
+    implementation(platform("androidx.compose:compose-bom:2024.06.00"))
+    implementation("androidx.activity:activity-compose:1.9.1")
+    implementation("androidx.compose.ui:ui:1.6.8")
+    implementation("androidx.compose.ui:ui-tooling-preview:1.6.8")
+    implementation("androidx.compose.material3:material3-android:1.2.1")
+    debugImplementation("androidx.compose.ui:ui-tooling")
+    implementation("androidx.tv:tv-foundation:1.0.0-alpha11")
+    implementation("androidx.tv:tv-material:1.0.0-rc01")
+    implementation("androidx.compose.ui:ui-viewbinding:1.7.0-beta06")
+    implementation("androidx.paging:paging-runtime-ktx:3.3.1")
+    implementation("androidx.paging:paging-compose:3.3.1")
+    implementation("androidx.compose.runtime:runtime-livedata:1.6.8")
+    implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.8.4")
     implementation("androidx.test.ext:junit-ktx:1.2.1")
     kapt("com.github.bumptech.glide:compiler:$glideVersion")
     implementation("com.caverock:androidsvg-aar:1.4")
@@ -165,8 +197,11 @@ dependencies {
     implementation("androidx.constraintlayout:constraintlayout:2.1.4")
     implementation("androidx.lifecycle:lifecycle-process:2.8.3")
     implementation("com.otaliastudios:zoomlayout:1.9.0")
-    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.1")
+    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3")
     implementation("io.noties.markwon:core:4.6.2")
+    implementation("com.google.dagger:hilt-android:2.51.1")
+    implementation("androidx.hilt:hilt-navigation-compose:1.2.0")
+    kapt("com.google.dagger:hilt-android-compiler:2.51.1")
 
     implementation("ch.acra:acra-http:$acraVersion")
     implementation("ch.acra:acra-dialog:$acraVersion")

app/src/main/AndroidManifest.xml

@@ -36,8 +36,6 @@
             android:exported="true"
             android:icon="@mipmap/stash_logo"
             android:logo="@mipmap/stash_logo"
-            android:noHistory="true"
-            android:screenOrientation="landscape"
             android:theme="@style/NoTitleTheme">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -49,6 +47,10 @@
             android:name=".MainActivity"
             android:exported="false"
             android:launchMode="singleTop" />
+        <activity
+            android:name=".MainComposeActivity"
+            android:exported="false"
+            android:launchMode="singleTop" />
         <activity
             android:name=".SceneDetailsActivity"
             android:exported="false"

app/src/main/java/com/github/damontecres/stashapp/FilterListActivity.kt

@@ -203,6 +203,9 @@ class FilterListActivity : FragmentActivity() {
                             FilterType.APP_FILTER -> {
                                 intent.getParcelableExtra("filter")
                             }
+                            FilterType.DEFAULT_FILTER -> {
+                                throw IllegalStateException()
+                            }
                         }
                     setupFragment(filterData, true)
                 } else {

app/src/main/java/com/github/damontecres/stashapp/GalleryActivity.kt

@@ -41,6 +41,7 @@ import com.github.damontecres.stashapp.util.StashCoroutineExceptionHandler
 import com.github.damontecres.stashapp.util.StashGlide
 import com.github.damontecres.stashapp.util.TagComparator
 import com.github.damontecres.stashapp.util.getInt
+import com.github.damontecres.stashapp.util.isNavHostActive
 import com.github.damontecres.stashapp.util.isNotNullOrBlank
 import com.github.damontecres.stashapp.util.name
 import com.github.damontecres.stashapp.util.onlyScrollIfNeeded
@@ -53,7 +54,6 @@ class GalleryActivity : FragmentActivity() {
         setContentView(R.layout.activity_gallery)
         if (savedInstanceState == null) {
             val galleryId = intent.getStringExtra(INTENT_GALLERY_ID)!!
-            val galleryName = intent.getStringExtra(INTENT_GALLERY_NAME)
 
             val cardSize =
                 PreferenceManager.getDefaultSharedPreferences(this)
@@ -73,10 +73,15 @@ class GalleryActivity : FragmentActivity() {
                 tabLayout.nextFocusDownId = R.id.gallery_view_pager
                 tabLayout.children.forEach { it.nextFocusDownId = R.id.gallery_view_pager }
                 tabLayout.children.first().requestFocus()
-
-                supportFragmentManager.beginTransaction()
-                    .replace(R.id.gallery_details, GalleryFragment(gallery))
-                    .commitNow()
+                if (isNavHostActive()) {
+                    supportFragmentManager.beginTransaction()
+                        .replace(R.id.gallery_details, NavFragment(GalleryFragment(gallery)))
+                        .commitNow()
+                } else {
+                    supportFragmentManager.beginTransaction()
+                        .replace(R.id.gallery_details, GalleryFragment(gallery))
+                        .commitNow()
+                }
             }
         }
     }
@@ -100,14 +105,39 @@ class GalleryActivity : FragmentActivity() {
         }
 
         override fun getItem(position: Int): Fragment {
-            return when (position) {
-                0 -> {
-                    val fragment =
+            val createdFragment =
+                when (position) {
+                    0 -> {
+                        val fragment =
+                            StashGridFragment(
+                                ImageComparator,
+                                ImageDataSupplier(
+                                    DataType.IMAGE.asDefaultFindFilterType,
+                                    ImageFilterType(
+                                        galleries =
+                                            Optional.present(
+                                                MultiCriterionInput(
+                                                    value = Optional.present(listOf(gallery.id)),
+                                                    modifier = CriterionModifier.INCLUDES_ALL,
+                                                ),
+                                            ),
+                                    ),
+                                ),
+                                getColumns(DataType.IMAGE),
+                            )
+                        fragment.onItemViewClickedListener =
+                            ImageGridClickedListener(this@GalleryActivity, fragment) {
+                                it.putExtra(ImageActivity.INTENT_GALLERY_ID, gallery.id)
+                            }
+                        fragment
+                    }
+
+                    1 ->
                         StashGridFragment(
-                            ImageComparator,
-                            ImageDataSupplier(
-                                DataType.IMAGE.asDefaultFindFilterType,
-                                ImageFilterType(
+                            SceneComparator,
+                            SceneDataSupplier(
+                                DataType.SCENE.asDefaultFindFilterType,
+                                SceneFilterType(
                                     galleries =
                                         Optional.present(
                                             MultiCriterionInput(
@@ -117,47 +147,29 @@ class GalleryActivity : FragmentActivity() {
                                         ),
                                 ),
                             ),
-                            getColumns(DataType.IMAGE),
+                            getColumns(DataType.SCENE),
+                        )
+
+                    2 ->
+                        StashGridFragment(
+                            PerformerComparator,
+                            GalleryPerformerDataSupplier(gallery),
+                            getColumns(DataType.PERFORMER),
                         )
-                    fragment.onItemViewClickedListener =
-                        ImageGridClickedListener(this@GalleryActivity, fragment) {
-                            it.putExtra(ImageActivity.INTENT_GALLERY_ID, gallery.id)
-                        }
-                    fragment
+
+                    3 ->
+                        StashGridFragment(
+                            TagComparator,
+                            GalleryTagDataSupplier(gallery),
+                            getColumns(DataType.TAG),
+                        )
+
+                    else -> throw IllegalArgumentException()
                 }
-                1 ->
-                    StashGridFragment(
-                        SceneComparator,
-                        SceneDataSupplier(
-                            DataType.SCENE.asDefaultFindFilterType,
-                            SceneFilterType(
-                                galleries =
-                                    Optional.present(
-                                        MultiCriterionInput(
-                                            value = Optional.present(listOf(gallery.id)),
-                                            modifier = CriterionModifier.INCLUDES_ALL,
-                                        ),
-                                    ),
-                            ),
-                        ),
-                        getColumns(DataType.SCENE),
-                    )
-
-                2 ->
-                    StashGridFragment(
-                        PerformerComparator,
-                        GalleryPerformerDataSupplier(gallery),
-                        getColumns(DataType.PERFORMER),
-                    )
-
-                3 ->
-                    StashGridFragment(
-                        TagComparator,
-                        GalleryTagDataSupplier(gallery),
-                        getColumns(DataType.TAG),
-                    )
-
-                else -> throw IllegalArgumentException()
+            return if (isNavHostActive()) {
+                NavFragment(createdFragment)
+            } else {
+                createdFragment
             }
         }
     }
@@ -274,7 +286,6 @@ class GalleryActivity : FragmentActivity() {
     }
 
     companion object {
-        const val INTENT_GALLERY_ID = "gallery.id"
-        const val INTENT_GALLERY_NAME = "gallery.name"
+        const val INTENT_GALLERY_ID = "id"
     }
 }

app/src/main/java/com/github/damontecres/stashapp/ImageActivity.kt

@@ -52,6 +52,7 @@ import com.github.damontecres.stashapp.util.concatIfNotBlank
 import com.github.damontecres.stashapp.util.height
 import com.github.damontecres.stashapp.util.isGif
 import com.github.damontecres.stashapp.util.isImageClip
+import com.github.damontecres.stashapp.util.isNavHostActive
 import com.github.damontecres.stashapp.util.maxFileSize
 import com.github.damontecres.stashapp.util.showSetRatingToast
 import com.github.damontecres.stashapp.util.toFindFilterType
@@ -88,9 +89,15 @@ class ImageActivity : FragmentActivity() {
                     } else {
                         ImageFragment(image)
                     }
-                supportFragmentManager.beginTransaction()
-                    .replace(R.id.image_fragment, imageFragment as Fragment)
-                    .commitNow()
+                if (isNavHostActive()) {
+                    supportFragmentManager.beginTransaction()
+                        .replace(R.id.image_fragment, NavFragment(imageFragment as Fragment))
+                        .commitNow()
+                } else {
+                    supportFragmentManager.beginTransaction()
+                        .replace(R.id.image_fragment, imageFragment as Fragment)
+                        .commitNow()
+                }
 
                 val pageSize =
                     PreferenceManager.getDefaultSharedPreferences(this@ImageActivity)
@@ -231,9 +238,18 @@ class ImageActivity : FragmentActivity() {
                             } else {
                                 ImageFragment(image)
                             }
-                        supportFragmentManager.beginTransaction()
-                            .replace(R.id.image_fragment, imageFragment as Fragment)
-                            .commitNow()
+                        if (isNavHostActive()) {
+                            supportFragmentManager.beginTransaction()
+                                .replace(
+                                    R.id.image_fragment,
+                                    NavFragment(imageFragment as Fragment),
+                                )
+                                .commitNow()
+                        } else {
+                            supportFragmentManager.beginTransaction()
+                                .replace(R.id.image_fragment, imageFragment as Fragment)
+                                .commitNow()
+                        }
                     } else if (image == null) {
                         Toast.makeText(this@ImageActivity, "No more images", Toast.LENGTH_SHORT)
                             .show()
@@ -247,7 +263,7 @@ class ImageActivity : FragmentActivity() {
 
     companion object {
         const val TAG = "ImageActivity"
-        const val INTENT_IMAGE_ID = "image.id"
+        const val INTENT_IMAGE_ID = "id"
         const val INTENT_IMAGE_URL = "image.url"
         const val INTENT_IMAGE_SIZE = "image.size"
 

app/src/main/java/com/github/damontecres/stashapp/MainComposeActivity.kt

@@ -0,0 +1,31 @@
+package com.github.damontecres.stashapp
+
+import android.os.Bundle
+import androidx.activity.ComponentActivity
+import androidx.activity.compose.setContent
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.RectangleShape
+import androidx.core.view.WindowCompat
+import androidx.tv.material3.Surface
+import com.github.damontecres.stashapp.ui.App
+import com.github.damontecres.stashapp.ui.theme.AppTheme
+import dagger.hilt.android.AndroidEntryPoint
+
+@AndroidEntryPoint
+class MainComposeActivity : ComponentActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        WindowCompat.setDecorFitsSystemWindows(window, false)
+        setContent {
+            AppTheme {
+                Surface(
+                    shape = RectangleShape,
+                    modifier = Modifier.fillMaxSize(),
+                ) {
+                    App()
+                }
+            }
+        }
+    }
+}