From 252ad3d0791ab0a6a3f6c2d769e49acab5525c95 Mon Sep 17 00:00:00 2001 From: jakepurple13 Date: Mon, 17 May 2021 07:00:21 -0400 Subject: [PATCH] - moved strings to strings.xml --- .../java/com/programmersbox/animeworld/MainActivity.kt | 7 +++---- animeworld/src/main/res/values/strings.xml | 2 ++ build.gradle | 2 +- .../java/com/programmersbox/novelworld/MainActivity.kt | 2 +- .../main/java/com/programmersbox/novelworld/NovelApp.kt | 1 + 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/animeworld/src/main/java/com/programmersbox/animeworld/MainActivity.kt b/animeworld/src/main/java/com/programmersbox/animeworld/MainActivity.kt index 6e0c95b99..81d050b00 100644 --- a/animeworld/src/main/java/com/programmersbox/animeworld/MainActivity.kt +++ b/animeworld/src/main/java/com/programmersbox/animeworld/MainActivity.kt @@ -240,14 +240,13 @@ class MainActivity : BaseMainActivity() { it.addPreference( SwitchPreference(it.context).apply { - title = "Wcostream Recent Type" - summary = - "Due to some possible with this source, multiple calls need to be made which we need to be careful of. If you turn this off, just be wary that Wcostream could stop you from getting data." + title = getString(R.string.wco_recent_title) + summary = getString(R.string.wco_recent_info) key = "wco_recent" isChecked = wcoRecent setOnPreferenceChangeListener { _, newValue -> WcoStream.RECENT_TYPE = newValue as Boolean - wcoRecent = newValue as Boolean + wcoRecent = newValue true } icon = ContextCompat.getDrawable(it.context, R.drawable.ic_baseline_article_24) diff --git a/animeworld/src/main/res/values/strings.xml b/animeworld/src/main/res/values/strings.xml index d39d73670..a952d7b2d 100644 --- a/animeworld/src/main/res/values/strings.xml +++ b/animeworld/src/main/res/values/strings.xml @@ -76,4 +76,6 @@ Retry View Downloads View Videos + Due to some possible with this source, multiple calls need to be made which we need to be careful of. If you turn this off, just be wary that Wcostream could stop you from getting data. + Wcostream Recent Type \ No newline at end of file diff --git a/build.gradle b/build.gradle index 9a16ec616..6e888765f 100644 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,7 @@ buildscript { ext.kotlin_version = "1.5.0" ext.jakepurple13 = "10.6.3" - ext.otakuVersionName = "11.2" + ext.otakuVersionName = "12.0" ext.latestAboutLibsRelease = "+" ext.coroutinesCore = "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.1" diff --git a/novelworld/src/main/java/com/programmersbox/novelworld/MainActivity.kt b/novelworld/src/main/java/com/programmersbox/novelworld/MainActivity.kt index da635a8f2..9f300d0a5 100644 --- a/novelworld/src/main/java/com/programmersbox/novelworld/MainActivity.kt +++ b/novelworld/src/main/java/com/programmersbox/novelworld/MainActivity.kt @@ -52,7 +52,7 @@ class MainActivity : BaseMainActivity() { } - override val apkString: String get() = "" + override val apkString: String get() = "novelworld-debug.apk" override val showMiddleChapterButton: Boolean get() = false diff --git a/novelworld/src/main/java/com/programmersbox/novelworld/NovelApp.kt b/novelworld/src/main/java/com/programmersbox/novelworld/NovelApp.kt index 8b2b84d54..fa22ead99 100644 --- a/novelworld/src/main/java/com/programmersbox/novelworld/NovelApp.kt +++ b/novelworld/src/main/java/com/programmersbox/novelworld/NovelApp.kt @@ -7,6 +7,7 @@ import com.programmersbox.uiviews.utils.FirebaseDb class NovelApp : OtakuApp() { override fun onCreated() { + logo = R.mipmap.ic_launcher notificationLogo = R.drawable.ic_launcher_foreground