diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index 9af821d54..a4e64f445 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -2,4 +2,4 @@ blank_issues_enabled: false contact_links: - name: ⚠️ Source issue url: https://github.com/KotatsuApp/kotatsu-parsers/issues/new - about: If you have troubles with a manga parser or want to propose new manga source, please open an issue in the kotatsu-parsers repository instead \ No newline at end of file + about: If you have a problem with a specific **manga source** or want to propose a new one, please open an issue in the kotatsu-parsers repository instead diff --git a/.github/ISSUE_TEMPLATE/report_bug.yml b/.github/ISSUE_TEMPLATE/report_bug.yml index 26ef27e7f..f2a5a5b4d 100644 --- a/.github/ISSUE_TEMPLATE/report_bug.yml +++ b/.github/ISSUE_TEMPLATE/report_bug.yml @@ -60,7 +60,7 @@ body: attributes: label: Acknowledgements options: - - label: I have searched the existing issues and this is a new ticket, **NOT** a duplicate or related to another open issue. + - label: This is not a duplicate of an existing issue. Please look through the list of [open issues](https://github.com/KotatsuApp/Kotatsu/issues) before creating a new one. required: true - - label: If this is an issue with a parser, I should be opening an issue in the [parsers repository](https://github.com/KotatsuApp/kotatsu-parsers/issues/new/choose). + - label: This is not an issue with a specific manga source. Otherwise, you have to open an issue in the [parsers repository](https://github.com/KotatsuApp/kotatsu-parsers/issues/new/choose). required: true diff --git a/.github/ISSUE_TEMPLATE/request_feature.yml b/.github/ISSUE_TEMPLATE/request_feature.yml index a8539d394..a1dab7e18 100644 --- a/.github/ISSUE_TEMPLATE/request_feature.yml +++ b/.github/ISSUE_TEMPLATE/request_feature.yml @@ -20,5 +20,5 @@ body: label: Acknowledgements description: Read this carefully, we will close and ignore your issue if you skimmed through this. options: - - label: I have searched the existing issues and this is a new ticket, **NOT** a duplicate or related to another open issue. - required: true \ No newline at end of file + - label: This is not a duplicate of an existing issue. Please look through the list of [open issues](https://github.com/KotatsuApp/Kotatsu/issues) before creating a new one. + required: true diff --git a/app/build.gradle b/app/build.gradle index 968972860..4dda79e66 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -16,8 +16,8 @@ android { applicationId 'org.koitharu.kotatsu' minSdk = 21 targetSdk = 34 - versionCode = 644 - versionName = '7.1.1' + versionCode = 645 + versionName = '7.1.2' generatedDensities = [] testInstrumentationRunner 'org.koitharu.kotatsu.HiltTestRunner' ksp { @@ -82,7 +82,7 @@ afterEvaluate { } dependencies { //noinspection GradleDependency - implementation('com.github.KotatsuApp:kotatsu-parsers:51da0b62c1') { + implementation('com.github.KotatsuApp:kotatsu-parsers:26be293f24') { exclude group: 'org.json', module: 'json' } diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/BaseActivity.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/BaseActivity.kt index d66e1328b..26f0214f4 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/BaseActivity.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/BaseActivity.kt @@ -3,6 +3,7 @@ package org.koitharu.kotatsu.core.ui import android.content.Intent import android.content.res.Configuration import android.graphics.Color +import android.os.Build import android.os.Bundle import android.view.KeyEvent import android.view.View @@ -92,7 +93,20 @@ abstract class BaseActivity : } override fun onSupportNavigateUp(): Boolean { - dispatchNavigateUp() + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) { + // TODO fix behavior on Android 14 + dispatchNavigateUp() + return true + } + val fm = supportFragmentManager + if (fm.isStateSaved) { + return false + } + if (fm.backStackEntryCount > 0) { + fm.popBackStack() + } else { + dispatchNavigateUp() + } return true } diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/tracker/domain/Tracker.kt b/app/src/main/kotlin/org/koitharu/kotatsu/tracker/domain/Tracker.kt index 49f36de9e..9b19ea0ff 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/tracker/domain/Tracker.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/tracker/domain/Tracker.kt @@ -30,10 +30,6 @@ class Tracker @Inject constructor( return repository.getTracks(offset = 0, limit = limit) } - suspend fun gc() { - repository.gc() - } - suspend fun fetchUpdates( track: MangaTracking, commit: Boolean