From d99450c5a3ade0d5e94db50da56e886691d2bdc2 Mon Sep 17 00:00:00 2001 From: Koitharu Date: Thu, 21 May 2020 20:40:53 +0300 Subject: [PATCH 1/3] Prepopulate favourite categories --- .../main/java/org/koitharu/kotatsu/KotatsuApp.kt | 2 ++ .../core/db/DatabasePrePopulateCallback.kt | 16 ++++++++++++++++ app/src/main/res/values-ru/strings.xml | 1 + app/src/main/res/values/strings.xml | 1 + 4 files changed, 20 insertions(+) create mode 100644 app/src/main/java/org/koitharu/kotatsu/core/db/DatabasePrePopulateCallback.kt diff --git a/app/src/main/java/org/koitharu/kotatsu/KotatsuApp.kt b/app/src/main/java/org/koitharu/kotatsu/KotatsuApp.kt index 50f28cec9..af136fb62 100644 --- a/app/src/main/java/org/koitharu/kotatsu/KotatsuApp.kt +++ b/app/src/main/java/org/koitharu/kotatsu/KotatsuApp.kt @@ -14,6 +14,7 @@ import org.koin.android.ext.koin.androidContext import org.koin.android.ext.koin.androidLogger import org.koin.core.context.startKoin import org.koin.dsl.module +import org.koitharu.kotatsu.core.db.DatabasePrePopulateCallback import org.koitharu.kotatsu.core.db.MangaDatabase import org.koitharu.kotatsu.core.db.migrations.Migration1To2 import org.koitharu.kotatsu.core.db.migrations.Migration2To3 @@ -126,4 +127,5 @@ class KotatsuApp : Application() { MangaDatabase::class.java, "kotatsu-db" ).addMigrations(Migration1To2, Migration2To3, Migration3To4, Migration4To5) + .addCallback(DatabasePrePopulateCallback(resources)) } \ No newline at end of file diff --git a/app/src/main/java/org/koitharu/kotatsu/core/db/DatabasePrePopulateCallback.kt b/app/src/main/java/org/koitharu/kotatsu/core/db/DatabasePrePopulateCallback.kt new file mode 100644 index 000000000..ce8749d9d --- /dev/null +++ b/app/src/main/java/org/koitharu/kotatsu/core/db/DatabasePrePopulateCallback.kt @@ -0,0 +1,16 @@ +package org.koitharu.kotatsu.core.db + +import android.content.res.Resources +import androidx.room.RoomDatabase +import androidx.sqlite.db.SupportSQLiteDatabase +import org.koitharu.kotatsu.R + +class DatabasePrePopulateCallback(private val resources: Resources) : RoomDatabase.Callback() { + + override fun onCreate(db: SupportSQLiteDatabase) { + db.execSQL( + "INSERT INTO favourite_categories (created_at, sort_key, title) VALUES (?,?,?)", + arrayOf(System.currentTimeMillis(), 1, resources.getString(R.string.read_later)) + ) + } +} \ No newline at end of file diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 0241cf46a..eee8e8e82 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -134,4 +134,5 @@ Готово Всё избранное В этой категории ничего нет + Прочитать позже \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index fe78a9a74..04f54363d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -135,4 +135,5 @@ Done All favourites This category is empty + Read later \ No newline at end of file From 3bd7b544053330c516ec297cb97c13342b92a525 Mon Sep 17 00:00:00 2001 From: Koitharu Date: Thu, 21 May 2020 20:47:10 +0300 Subject: [PATCH 2/3] Capitalize MangaLib genres --- .../koitharu/kotatsu/core/parser/site/MangaLibRepository.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/MangaLibRepository.kt b/app/src/main/java/org/koitharu/kotatsu/core/parser/site/MangaLibRepository.kt index ae63ab89b..e749f5f90 100644 --- a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/MangaLibRepository.kt +++ b/app/src/main/java/org/koitharu/kotatsu/core/parser/site/MangaLibRepository.kt @@ -128,7 +128,7 @@ open class MangaLibRepository(loaderContext: MangaLoaderContext) : tags = info.getElementsMatchingOwnText("Жанры")?.firstOrNull() ?.nextElementSibling()?.select("a")?.mapNotNull { a -> MangaTag( - title = a.text(), + title = a.text().capitalize(), key = a.attr("href").substringAfterLast('='), source = source ) @@ -182,7 +182,7 @@ open class MangaLibRepository(loaderContext: MangaLoaderContext) : result += MangaTag( source = source, key = x.getInt("id").toString(), - title = x.getString("name") + title = x.getString("name").capitalize() ) } return result From 6d193baa69dc7c2db034eb4a5920c56f0f503f4b Mon Sep 17 00:00:00 2001 From: Koitharu Date: Thu, 21 May 2020 20:48:01 +0300 Subject: [PATCH 3/3] Increment version --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 4272b2891..0bc9fa659 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -17,7 +17,7 @@ android { minSdkVersion 21 targetSdkVersion 29 versionCode gitCommits - versionName '0.3.2' + versionName '0.4' buildConfigField 'String', 'GIT_BRANCH', "\"${gitBranch}\""