KotatsuApp
/
Kotatsu
2
0
Fork 0
Code Issues 124 Pull Requests Packages Projects Releases 163 Wiki Activity

Update parsers

Browse Source
pull/314/head v4.4.2
Koitharu 3 years ago
parent d0b9412559
commit 4ec50f83d2
No known key found for this signature in database
GPG Key ID: 8E861F8CE6E7CE27
6 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File

14
app/build.gradle
Unescape Escape View File

@ -15,8 +15,8 @@ android {
applicationId 'org.koitharu.kotatsu' applicationId 'org.koitharu.kotatsu'
minSdkVersion 21 minSdkVersion 21
targetSdkVersion 33 targetSdkVersion 33
versionCode 517 versionCode 518
versionName '4.4.1' versionName '4.4.2'
generatedDensities = [] generatedDensities = []
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@ -87,7 +87,7 @@ afterEvaluate {
} }
} }
dependencies { dependencies {
implementation('com.github.KotatsuApp:kotatsu-parsers:f4c47b5b84') { implementation('com.github.KotatsuApp:kotatsu-parsers:1093584202') {
exclude group: 'org.json', module: 'json' 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:4.3.2'
implementation 'com.hannesdorfmann:adapterdelegates4-kotlin-dsl-viewbinding:4.3.2' implementation 'com.hannesdorfmann:adapterdelegates4-kotlin-dsl-viewbinding:4.3.2'
implementation 'com.google.dagger:hilt-android:2.44.2' implementation 'com.google.dagger:hilt-android:2.45'
kapt 'com.google.dagger:hilt-compiler:2.44.2' kapt 'com.google.dagger:hilt-compiler:2.45'
implementation 'androidx.hilt:hilt-work:1.0.0' implementation 'androidx.hilt:hilt-work:1.0.0'
kapt 'androidx.hilt:hilt-compiler: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 'androidx.room:room-testing:2.5.0'
androidTestImplementation 'com.squareup.moshi:moshi-kotlin:1.14.0' androidTestImplementation 'com.squareup.moshi:moshi-kotlin:1.14.0'
androidTestImplementation 'com.google.dagger:hilt-android-testing:2.44.2' androidTestImplementation 'com.google.dagger:hilt-android-testing:2.45'
kaptAndroidTest 'com.google.dagger:hilt-android-compiler:2.44.2' kaptAndroidTest 'com.google.dagger:hilt-android-compiler:2.45'
} }

1
app/src/main/java/org/koitharu/kotatsu/core/prefs/SourceSettings.kt
Unescape Escape View File

@ -23,6 +23,7 @@ class SourceSettings(context: Context, source: MangaSource) : MangaSourceConfig
@Suppress("UNCHECKED_CAST") @Suppress("UNCHECKED_CAST")
override fun <T> get(key: ConfigKey<T>): T { override fun <T> get(key: ConfigKey<T>): T {
return when (key) { 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.Domain -> prefs.getString(key.key, key.defaultValue).ifNullOrEmpty { key.defaultValue }
is ConfigKey.ShowSuspiciousContent -> prefs.getBoolean(key.key, key.defaultValue) is ConfigKey.ShowSuspiciousContent -> prefs.getBoolean(key.key, key.defaultValue)
} as T } as T

15
app/src/main/java/org/koitharu/kotatsu/settings/SourceSettingsExt.kt
Unescape Escape View File

@ -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 -> { is ConfigKey.ShowSuspiciousContent -> {
SwitchPreferenceCompat(requireContext()).apply { SwitchPreferenceCompat(requireContext()).apply {
setDefaultValue(key.defaultValue) setDefaultValue(key.defaultValue)

1
app/src/main/res/values/strings.xml
Unescape Escape View File

@ -424,4 +424,5 @@
<string name="allow_unstable_updates">Allow unstable updates</string> <string name="allow_unstable_updates">Allow unstable updates</string>
<string name="allow_unstable_updates_summary">Propose updates to beta versions of the app</string> <string name="allow_unstable_updates_summary">Propose updates to beta versions of the app</string>
<string name="download_started">Download started</string> <string name="download_started">Download started</string>
<string name="user_agent">UserAgent header</string>
</resources> </resources>

2
build.gradle
Unescape Escape View File

@ -6,7 +6,7 @@ buildscript {
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:7.4.1' classpath 'com.android.tools.build:gradle:7.4.1'
classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.10' 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'
} }
} }

6
gradle/wrapper/gradle-wrapper.properties vendored
Unescape Escape View File

@ -1,7 +1,7 @@
#Fri Jan 20 14:35:39 EET 2023 #Sat Feb 25 17:16:02 EET 2023
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionSha256Sum=7ba68c54029790ab444b39d7e293d3236b2632631fb5f2e012bb28b4ff669e4b distributionSha256Sum=6147605a23b4eff6c334927a86ff3508cb5d6722cd624c97ded4c2e8640f1f87
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

Write Preview
Loading…
Cancel
Save