From 4ec50f83d28c56bbec1f5ab220fba698b461668c Mon Sep 17 00:00:00 2001 From: Koitharu Date: Sat, 25 Feb 2023 18:44:31 +0200 Subject: [PATCH] Update parsers --- app/build.gradle | 14 +++++++------- .../koitharu/kotatsu/core/prefs/SourceSettings.kt | 1 + .../kotatsu/settings/SourceSettingsExt.kt | 15 +++++++++++++++ app/src/main/res/values/strings.xml | 1 + build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 6 +++--- 6 files changed, 28 insertions(+), 11 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 306555035..37c28fe9f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -15,8 +15,8 @@ android { applicationId 'org.koitharu.kotatsu' minSdkVersion 21 targetSdkVersion 33 - versionCode 517 - versionName '4.4.1' + versionCode 518 + versionName '4.4.2' generatedDensities = [] testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" @@ -87,7 +87,7 @@ afterEvaluate { } } dependencies { - implementation('com.github.KotatsuApp:kotatsu-parsers:f4c47b5b84') { + implementation('com.github.KotatsuApp:kotatsu-parsers:1093584202') { exclude group: 'org.json', module: 'json' } @@ -124,8 +124,8 @@ dependencies { implementation 'com.hannesdorfmann:adapterdelegates4-kotlin-dsl:4.3.2' implementation 'com.hannesdorfmann:adapterdelegates4-kotlin-dsl-viewbinding:4.3.2' - implementation 'com.google.dagger:hilt-android:2.44.2' - kapt 'com.google.dagger:hilt-compiler:2.44.2' + implementation 'com.google.dagger:hilt-android:2.45' + kapt 'com.google.dagger:hilt-compiler:2.45' implementation 'androidx.hilt:hilt-work:1.0.0' kapt 'androidx.hilt:hilt-compiler:1.0.0' @@ -154,6 +154,6 @@ dependencies { androidTestImplementation 'androidx.room:room-testing:2.5.0' androidTestImplementation 'com.squareup.moshi:moshi-kotlin:1.14.0' - androidTestImplementation 'com.google.dagger:hilt-android-testing:2.44.2' - kaptAndroidTest 'com.google.dagger:hilt-android-compiler:2.44.2' + androidTestImplementation 'com.google.dagger:hilt-android-testing:2.45' + kaptAndroidTest 'com.google.dagger:hilt-android-compiler:2.45' } diff --git a/app/src/main/java/org/koitharu/kotatsu/core/prefs/SourceSettings.kt b/app/src/main/java/org/koitharu/kotatsu/core/prefs/SourceSettings.kt index b93cb6f5f..5f74b3b2d 100644 --- a/app/src/main/java/org/koitharu/kotatsu/core/prefs/SourceSettings.kt +++ b/app/src/main/java/org/koitharu/kotatsu/core/prefs/SourceSettings.kt @@ -23,6 +23,7 @@ class SourceSettings(context: Context, source: MangaSource) : MangaSourceConfig @Suppress("UNCHECKED_CAST") override fun get(key: ConfigKey): T { return when (key) { + is ConfigKey.UserAgent -> prefs.getString(key.key, key.defaultValue).ifNullOrEmpty { key.defaultValue } is ConfigKey.Domain -> prefs.getString(key.key, key.defaultValue).ifNullOrEmpty { key.defaultValue } is ConfigKey.ShowSuspiciousContent -> prefs.getBoolean(key.key, key.defaultValue) } as T diff --git a/app/src/main/java/org/koitharu/kotatsu/settings/SourceSettingsExt.kt b/app/src/main/java/org/koitharu/kotatsu/settings/SourceSettingsExt.kt index 41a2639a9..5137fe95e 100644 --- a/app/src/main/java/org/koitharu/kotatsu/settings/SourceSettingsExt.kt +++ b/app/src/main/java/org/koitharu/kotatsu/settings/SourceSettingsExt.kt @@ -37,6 +37,21 @@ fun PreferenceFragmentCompat.addPreferencesFromRepository(repository: RemoteMang } } + is ConfigKey.UserAgent -> { + EditTextPreference(requireContext()).apply { + summaryProvider = EditTextDefaultSummaryProvider(key.defaultValue) + setOnBindEditTextListener( + EditTextBindListener( + inputType = EditorInfo.TYPE_CLASS_TEXT, + hint = key.defaultValue, + validator = null, + ), + ) + setTitle(R.string.user_agent) + setDialogTitle(R.string.user_agent) + } + } + is ConfigKey.ShowSuspiciousContent -> { SwitchPreferenceCompat(requireContext()).apply { setDefaultValue(key.defaultValue) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 579d88ae6..8f4f5e1ee 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -424,4 +424,5 @@ Allow unstable updates Propose updates to beta versions of the app Download started + UserAgent header diff --git a/build.gradle b/build.gradle index f38bda893..db65af4c4 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { dependencies { classpath 'com.android.tools.build:gradle:7.4.1' classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.10' - classpath 'com.google.dagger:hilt-android-gradle-plugin:2.44.2' + classpath 'com.google.dagger:hilt-android-gradle-plugin:2.45' } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 3d86b3e83..dd15212a9 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ -#Fri Jan 20 14:35:39 EET 2023 +#Sat Feb 25 17:16:02 EET 2023 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=7ba68c54029790ab444b39d7e293d3236b2632631fb5f2e012bb28b4ff669e4b -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip +distributionSha256Sum=6147605a23b4eff6c334927a86ff3508cb5d6722cd624c97ded4c2e8640f1f87 +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists