Parcourir la source

Merge branch 'patch'

arkon il y a 2 ans
Parent
commit
ab1a44e108

+ 1 - 1
.github/ISSUE_TEMPLATE.md

@@ -3,7 +3,7 @@
 I acknowledge that:
 
 - I have updated:
-  - To the latest version of the app (stable is v0.13.4)
+  - To the latest version of the app (stable is v0.13.5)
   - All extensions
 - I have tried the troubleshooting guide: https://tachiyomi.org/help/guides/troubleshooting-problems/
 - If this is an issue with an extension, that I should be opening an issue in https://github.com/tachiyomiorg/tachiyomi-extensions

+ 2 - 2
.github/ISSUE_TEMPLATE/report_issue.yml

@@ -53,7 +53,7 @@ body:
       label: Tachiyomi version
       description: You can find your Tachiyomi version in **More → About**.
       placeholder: |
-        Example: "0.13.4"
+        Example: "0.13.5"
     validations:
       required: true
 
@@ -98,7 +98,7 @@ body:
           required: true
         - label: I have tried the [troubleshooting guide](https://tachiyomi.org/help/guides/troubleshooting/).
           required: true
-        - label: I have updated the app to version **[0.13.4](https://github.com/tachiyomiorg/tachiyomi/releases/latest)**.
+        - label: I have updated the app to version **[0.13.5](https://github.com/tachiyomiorg/tachiyomi/releases/latest)**.
           required: true
         - label: I have updated all installed extensions.
           required: true

+ 1 - 1
.github/ISSUE_TEMPLATE/request_feature.yml

@@ -33,7 +33,7 @@ body:
           required: true
         - label: If this is an issue with an extension, I should be opening an issue in the [extensions repository](https://github.com/tachiyomiorg/tachiyomi-extensions/issues/new/choose).
           required: true
-        - label: I have updated the app to version **[0.13.4](https://github.com/tachiyomiorg/tachiyomi/releases/latest)**.
+        - label: I have updated the app to version **[0.13.5](https://github.com/tachiyomiorg/tachiyomi/releases/latest)**.
           required: true
         - label: I will fill out all of the requested information in this form.
           required: true

+ 1 - 1
app/build.gradle.kts

@@ -27,7 +27,7 @@ android {
         minSdk = AndroidConfig.minSdk
         targetSdk = AndroidConfig.targetSdk
         versionCode = 81
-        versionName = "0.13.4"
+        versionName = "0.13.5"
 
         buildConfigField("String", "COMMIT_COUNT", "\"${getCommitCount()}\"")
         buildConfigField("String", "COMMIT_SHA", "\"${getGitSha()}\"")

+ 3 - 2
app/src/main/java/eu/kanade/presentation/components/ChapterDownloadIndicator.kt

@@ -60,8 +60,8 @@ fun ChapterDownloadIndicator(
                 },
             ) {
                 val indicatorModifier = Modifier
-                        .size(IndicatorSize)
-                        .padding(IndicatorPadding)
+                    .size(IndicatorSize)
+                    .padding(IndicatorPadding)
                 if (isDownloaded) {
                     Icon(
                         imageVector = Icons.Default.CheckCircle,
@@ -151,5 +151,6 @@ fun ChapterDownloadIndicator(
 
 private val IndicatorSize = 26.dp
 private val IndicatorPadding = 2.dp
+
 // To match composable parameter name when used later
 private val IndicatorStrokeWidth = IndicatorPadding

+ 2 - 0
app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt

@@ -196,6 +196,8 @@ class LibraryUpdateService(
      */
     override fun onDestroy() {
         updateJob?.cancel()
+        // Despite what Android Studio
+        // states this can be null
         ioScope?.cancel()
         if (wakeLock.isHeld) {
             wakeLock.release()

+ 2 - 2
gradle/androidx.versions.toml

@@ -31,5 +31,5 @@ lifecycle = ["lifecycle-common", "lifecycle-process", "lifecycle-runtimektx"]
 workmanager = ["work-runtime", "guava"]
 
 [plugins]
-application = { id = "com.android.application", version.ref = "agp_version"}
-library = { id = "com.android.library", version.ref = "agp_version"}
+application = { id = "com.android.application", version.ref = "agp_version" }
+library = { id = "com.android.library", version.ref = "agp_version" }