Merge from aniyomi and mihon

.editorconfig

@@ -7,7 +7,7 @@ indent_style = space
 insert_final_newline = true
 trim_trailing_whitespace = true
 
-[*.{xml,sq,sqm}]
+[*.{xml,sq,sqm,aidl}]
 indent_size = 4
 
 # noinspection EditorConfigKeyCorrectness
@@ -29,3 +29,4 @@ ktlint_standard_function-expression-body = disabled
 ktlint_standard_function-signature = disabled
 ktlint_standard_type-argument-comment = disabled
 ktlint_standard_type-parameter-comment = disabled
+ktlint_standard_blank-line-between-when-conditions = disabled

.github/workflows/build.yml

@@ -34,14 +34,14 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
 
       - name: Dependency Review
         if: github.event_name == 'pull_request'
-        uses: actions/dependency-review-action@56339e523c0409420f6c2c9a2f4292bbb3c07dd3 # v4.8.0
+        uses: actions/dependency-review-action@3c4e3dcb1aa7874d2c16be7d79418e9b7efd6261 # v4.8.2
 
       - name: Set up JDK
-        uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
+        uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0
         with:
           java-version: 17
           distribution: temurin
@@ -56,16 +56,24 @@ jobs:
         run: ./gradlew assembleRelease -Penable-updater
 
       - name: Run unit tests
+        id: unit_tests
         run: ./gradlew testReleaseUnitTest
 
+      - name: Upload test report
+        if: steps.unit_tests.outcome == 'failure'
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+        with:
+          name: test-report-${{ github.sha }}
+          path: app/build/reports/tests/testReleaseUnitTest
+
       - name: Upload APK
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
         with:
           name: arm64-v8a-${{ github.sha }}
           path: app/build/outputs/apk/release/app-arm64-v8a-release-unsigned.apk
 
       - name: Upload mapping
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
         with:
           name: mapping-${{ github.sha }}
           path: app/build/outputs/mapping/release

.github/workflows/release.yml

@@ -35,10 +35,10 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
 
       - name: Set up JDK
-        uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
+        uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0
         with:
           java-version: 17
           distribution: temurin
@@ -80,7 +80,7 @@ jobs:
           mv app/build/outputs/apk/release/app-x86_64-release-unsigned-signed.apk Animiru-x86_64-${{ needs.get_tag.outputs.tag }}.apk
 
       - name: Upload APK
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
         with:
           name: Animiru
           path: |
@@ -98,7 +98,7 @@ jobs:
 
     steps:
       - name: Download all artifacts
-        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
+        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
         with:
           merge-multiple: true
 
@@ -110,7 +110,7 @@ jobs:
             Animiru
 
       - name: Create GitHub Release
-        uses: softprops/action-gh-release@aec2ec56f94eb8180ceec724245f64ef008b89f5 # v2.4.0
+        uses: softprops/action-gh-release@a06a81a03ee405af7f2048a818ed3f03bbf83c7b # v2.5.0
         with:
           tag_name: ${{ needs.get_tag.outputs.tag }}
           name: Animiru ${{ needs.get_tag.outputs.tag }}

app/build.gradle.kts

@@ -19,7 +19,7 @@ android {
     defaultConfig {
         applicationId = "xyz.Quickdev.Animiru.mi"
 
-        versionCode = 131
+        versionCode = 132
         versionName = "0.19.0.0"
 
         buildConfigField("String", "COMMIT_COUNT", "\"${getCommitCount()}\"")
@@ -137,9 +137,9 @@ android {
     buildFeatures {
         viewBinding = true
         buildConfig = true
+        aidl = true
 
         // Disable some unused things
-        aidl = false
         renderScript = false
         shaders = false
     }
@@ -276,7 +276,6 @@ dependencies {
     // implementation(libs.directionalviewpager) {
     //     exclude(group = "androidx.viewpager", module = "viewpager")
     // }
-    // implementation(libs.insetter)
     // <-- AM (REMOVE_LIBRARIES)
     implementation(libs.richeditor.compose)
     implementation(libs.aboutLibraries.compose)

app/src/main/aidl/mihon/app/shizuku/IShellInterface.aidl

@@ -0,0 +1,7 @@
+package mihon.app.shizuku;
+
+interface IShellInterface {
+    void install(in AssetFileDescriptor apk) = 1;
+
+    void destroy() = 16777114;
+}

app/src/main/java/eu/kanade/presentation/anime/SeasonSettingsDialog.kt

@@ -262,7 +262,7 @@ private fun ColumnScope.SeasonDisplayPage(
             value = displayGridModeSize,
             valueRange = 0..10,
             label = stringResource(AYMR.strings.pref_library_rows),
-            valueText = if (displayGridModeSize > 0) {
+            valueString = if (displayGridModeSize > 0) {
                 displayGridModeSize.toString()
             } else {
                 stringResource(MR.strings.label_auto)
@@ -275,7 +275,7 @@ private fun ColumnScope.SeasonDisplayPage(
             value = displayGridModeSize,
             valueRange = 0..10,
             label = stringResource(MR.strings.pref_library_columns),
-            valueText = if (displayGridModeSize > 0) {
+            valueString = if (displayGridModeSize > 0) {
                 displayGridModeSize.toString()
             } else {
                 stringResource(MR.strings.label_auto)

app/src/main/java/eu/kanade/presentation/components/DateText.kt

@@ -23,7 +23,7 @@ fun relativeDateText(
             Instant.ofEpochMilli(dateEpochMillis),
             ZoneId.systemDefault(),
         )
-            .takeIf { dateEpochMillis > 0L },
+            .takeIf { dateEpochMillis != 0L },
     )
 }
 

app/src/main/java/eu/kanade/presentation/library/LibrarySettingsDialog.kt

@@ -294,7 +294,7 @@ private fun ColumnScope.DisplayPage(
             value = columns,
             valueRange = 0..10,
             label = stringResource(AYMR.strings.pref_library_rows),
-            valueText = if (columns > 0) {
+            valueString = if (columns > 0) {
                 columns.toString()
             } else {
                 stringResource(MR.strings.label_auto)
@@ -308,7 +308,7 @@ private fun ColumnScope.DisplayPage(
             value = columns,
             valueRange = 0..10,
             label = stringResource(MR.strings.pref_library_columns),
-            valueText = if (columns > 0) {
+            valueString = if (columns > 0) {
                 columns.toString()
             } else {
                 stringResource(MR.strings.label_auto)

app/src/main/java/eu/kanade/presentation/more/settings/Preference.kt

@@ -26,10 +26,10 @@ sealed class Preference {
     abstract val title: String
     abstract val enabled: Boolean
 
-    sealed class PreferenceItem<T> : Preference() {
+    sealed class PreferenceItem<T, R> : Preference() {
         abstract val subtitle: String?
         abstract val icon: ImageVector?
-        abstract val onValueChanged: suspend (value: T) -> Boolean
+        abstract val onValueChanged: suspend (value: T) -> R
 
         /**
          * A basic [PreferenceItem] that only displays texts.
@@ -42,8 +42,8 @@ sealed class Preference {
             // <-- AY
             override val enabled: Boolean = true,
             val onClick: (() -> Unit)? = null,
-        ) : PreferenceItem<String>() {
-            override val onValueChanged: suspend (value: String) -> Boolean = { true }
+        ) : PreferenceItem<String, Unit>() {
+            override val onValueChanged: suspend (value: String) -> Unit = { }
         }
 
         /**
@@ -55,7 +55,7 @@ sealed class Preference {
             override val subtitle: String? = null,
             override val enabled: Boolean = true,
             override val onValueChanged: suspend (value: Boolean) -> Boolean = { true },
-        ) : PreferenceItem<Boolean>() {
+        ) : PreferenceItem<Boolean, Boolean>() {
             override val icon: ImageVector? = null
         }
 
@@ -65,12 +65,13 @@ sealed class Preference {
         data class SliderPreference(
             val value: Int,
             override val title: String,
+            override val subtitle: String? = null,
+            val valueString: String? = null,
             val valueRange: IntProgression = 0..1,
             @IntRange(from = 0) val steps: Int = with(valueRange) { (last - first) - 1 },
-            override val subtitle: String? = null,
             override val enabled: Boolean = true,
-            override val onValueChanged: suspend (value: Int) -> Boolean = { true },
-        ) : PreferenceItem<Int>() {
+            override val onValueChanged: suspend (value: Int) -> Unit = { },
+        ) : PreferenceItem<Int, Unit>() {
             override val icon: ImageVector? = null
         }
 
@@ -88,7 +89,7 @@ sealed class Preference {
             override val icon: ImageVector? = null,
             override val enabled: Boolean = true,
             override val onValueChanged: suspend (value: T) -> Boolean = { true },
-        ) : PreferenceItem<T>() {
+        ) : PreferenceItem<T, Boolean>() {
             internal fun internalSet(value: Any) = preference.set(value as T)
             internal suspend fun internalOnValueChanged(value: Any) = onValueChanged(value as T)
 
@@ -109,8 +110,8 @@ sealed class Preference {
                 { v, e -> subtitle?.format(e[v]) },
             override val icon: ImageVector? = null,
             override val enabled: Boolean = true,
-            override val onValueChanged: suspend (value: String) -> Boolean = { true },
-        ) : PreferenceItem<String>()
+            override val onValueChanged: suspend (value: String) -> Unit = { },
+        ) : PreferenceItem<String, Unit>()
 
         /**
          * A [PreferenceItem] that displays a list of entries as a dialog.
@@ -134,7 +135,7 @@ sealed class Preference {
             override val icon: ImageVector? = null,
             override val enabled: Boolean = true,
             override val onValueChanged: suspend (value: Set<String>) -> Boolean = { true },
-        ) : PreferenceItem<Set<String>>()
+        ) : PreferenceItem<Set<String>, Boolean>()
 
         /**
          * A [PreferenceItem] that shows a EditText in the dialog.
@@ -145,7 +146,7 @@ sealed class Preference {
             override val subtitle: String? = "%s",
             override val enabled: Boolean = true,
             override val onValueChanged: suspend (value: String) -> Boolean = { true },
-        ) : PreferenceItem<String>() {
+        ) : PreferenceItem<String, Boolean>() {
             override val icon: ImageVector? = null
         }
 
@@ -162,7 +163,7 @@ sealed class Preference {
             override val icon: ImageVector? = null,
             override val enabled: Boolean = true,
             override val onValueChanged: suspend (value: String) -> Boolean = { true },
-        ) : PreferenceItem<String>()
+        ) : PreferenceItem<String, Boolean>()
 
         /**
          * A [PreferenceItem] for editing MPV config files.
@@ -200,7 +201,7 @@ sealed class Preference {
                 }
                 true
             },
-        ) : PreferenceItem<String>()
+        ) : PreferenceItem<String, Boolean>()
 
         /**
          * A [PreferenceItem] that shows a EditText with a subtitle in the dialog.
@@ -216,7 +217,7 @@ sealed class Preference {
             override val icon: ImageVector? = null,
             override val enabled: Boolean = true,
             override val onValueChanged: suspend (value: String) -> Boolean = { true },
-        ) : PreferenceItem<String>()
+        ) : PreferenceItem<String, Boolean>()
         // <-- AY
 
         /**
@@ -226,12 +227,12 @@ sealed class Preference {
             val tracker: Tracker,
             val login: () -> Unit,
             val logout: () -> Unit,
-        ) : PreferenceItem<String>() {
+        ) : PreferenceItem<String, Unit>() {
             override val title: String = ""
             override val enabled: Boolean = true
             override val subtitle: String? = null
             override val icon: ImageVector? = null
-            override val onValueChanged: suspend (value: String) -> Boolean = { true }
+            override val onValueChanged: suspend (value: String) -> Unit = { }
         }
 
         // AM (CONNECTION) -->
@@ -244,38 +245,38 @@ sealed class Preference {
             override val title: String,
             val login: () -> Unit,
             val openSettings: () -> Unit,
-        ) : PreferenceItem<String>() {
+        ) : PreferenceItem<String, Unit>() {
             override val enabled: Boolean = true
             override val subtitle: String? = null
             override val icon: ImageVector? = null
-            override val onValueChanged: suspend (newValue: String) -> Boolean = { true }
+            override val onValueChanged: suspend (newValue: String) -> Unit = { }
         }
         // <-- AM (CONNECTION)
 
         data class InfoPreference(
             override val title: String,
             override val enabled: Boolean = true,
-        ) : PreferenceItem<String>() {
+        ) : PreferenceItem<String, Unit>() {
             override val subtitle: String? = null
             override val icon: ImageVector? = null
-            override val onValueChanged: suspend (value: String) -> Boolean = { true }
+            override val onValueChanged: suspend (value: String) -> Unit = { }
         }
 
         data class CustomPreference(
             override val title: String,
             val content: @Composable () -> Unit,
-        ) : PreferenceItem<Unit>() {
+        ) : PreferenceItem<Unit, Unit>() {
             override val enabled: Boolean = true
             override val subtitle: String? = null
             override val icon: ImageVector? = null
-            override val onValueChanged: suspend (value: Unit) -> Boolean = { true }
+            override val onValueChanged: suspend (value: Unit) -> Unit = { }
         }
     }
 
     data class PreferenceGroup(
         override val title: String,
         override val enabled: Boolean = true,
 
-        val preferenceItems: ImmutableList<PreferenceItem<out Any>>,
+        val preferenceItems: ImmutableList<PreferenceItem<out Any, out Any>>,
     ) : Preference()
 }

app/src/main/java/eu/kanade/presentation/more/settings/PreferenceItem.kt

@@ -39,7 +39,7 @@ val LocalPreferenceMinHeight = compositionLocalOf(structuralEqualityPolicy()) {
 
 @Composable
 fun StatusWrapper(
-    item: Preference.PreferenceItem<*>,
+    item: Preference.PreferenceItem<*, *>,
     highlightKey: String?,
     content: @Composable () -> Unit,
 ) {
@@ -60,7 +60,7 @@ fun StatusWrapper(
 
 @Composable
 internal fun PreferenceItem(
-    item: Preference.PreferenceItem<*>,
+    item: Preference.PreferenceItem<*, *>,
     highlightKey: String?,
 ) {
     val scope = rememberCoroutineScope()
@@ -87,17 +87,18 @@ internal fun PreferenceItem(
             }
             is Preference.PreferenceItem.SliderPreference -> {
                 BaseSliderItem(
-                    label = item.title,
                     value = item.value,
                     valueRange = item.valueRange,
-                    valueText = item.subtitle.takeUnless { it.isNullOrEmpty() } ?: item.value.toString(),
                     steps = item.steps,
-                    labelStyle = MaterialTheme.typography.titleLarge.copy(fontSize = TitleFontSize),
+                    title = item.title,
+                    subtitle = item.subtitle,
+                    valueString = item.valueString.takeUnless { it.isNullOrEmpty() } ?: item.value.toString(),
                     onChange = {
                         scope.launch {
                             item.onValueChanged(it)
                         }
                     },
+                    titleStyle = MaterialTheme.typography.titleLarge.copy(fontSize = TitleFontSize),
                     modifier = Modifier.padding(
                         horizontal = PrefsHorizontalPadding,
                         vertical = PrefsVerticalPadding,