From 5b937691e34238bf2853968c5b7f6a0f5c548ffb Mon Sep 17 00:00:00 2001 From: tibbi Date: Wed, 29 Nov 2017 18:51:06 +0100 Subject: [PATCH] use the shared BaseSplash activity --- app/build.gradle | 2 +- .../thankyou/activities/SplashActivity.kt | 8 +++----- .../thankyou/dbhelpers/MyContentProviderDbHelper.kt | 10 +++++----- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 147e4d9..c78efd2 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -38,7 +38,7 @@ android { } dependencies { - compile 'com.simplemobiletools:commons:2.41.19' + compile 'com.simplemobiletools:commons:2.42.6' } Properties props = new Properties() diff --git a/app/src/main/kotlin/com/simplemobiletools/thankyou/activities/SplashActivity.kt b/app/src/main/kotlin/com/simplemobiletools/thankyou/activities/SplashActivity.kt index 8b4d0b1..69572c4 100644 --- a/app/src/main/kotlin/com/simplemobiletools/thankyou/activities/SplashActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/thankyou/activities/SplashActivity.kt @@ -1,12 +1,10 @@ package com.simplemobiletools.thankyou.activities import android.content.Intent -import android.os.Bundle -import android.support.v7.app.AppCompatActivity +import com.simplemobiletools.commons.activities.BaseSplashActivity -class SplashActivity : AppCompatActivity() { - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) +class SplashActivity : BaseSplashActivity() { + override fun initActivity() { startActivity(Intent(this, MainActivity::class.java)) finish() } diff --git a/app/src/main/kotlin/com/simplemobiletools/thankyou/dbhelpers/MyContentProviderDbHelper.kt b/app/src/main/kotlin/com/simplemobiletools/thankyou/dbhelpers/MyContentProviderDbHelper.kt index bf2c59c..18322c6 100644 --- a/app/src/main/kotlin/com/simplemobiletools/thankyou/dbhelpers/MyContentProviderDbHelper.kt +++ b/app/src/main/kotlin/com/simplemobiletools/thankyou/dbhelpers/MyContentProviderDbHelper.kt @@ -46,12 +46,16 @@ class MyContentProviderDbHelper private constructor(private val context: Context } fun updateTheme(values: ContentValues): Int { + if (!isThemeAvailable()) { + insertDefaultTheme() + } + val selection = "$COL_ID = ?" val selectionArgs = arrayOf(THEME_ID.toString()) return mDb.update(TABLE_NAME, values, selection, selectionArgs) } - fun isThemeAvailable(): Boolean { + private fun isThemeAvailable(): Boolean { val cols = arrayOf(COL_ID) val selection = "$COL_ID = ?" val selectionArgs = arrayOf(THEME_ID.toString()) @@ -65,10 +69,6 @@ class MyContentProviderDbHelper private constructor(private val context: Context } fun getSharedTheme(): Cursor? { - if (!isThemeAvailable()) { - insertDefaultTheme() - } - val cols = arrayOf(COL_TEXT_COLOR, COL_BACKGROUND_COLOR, COL_PRIMARY_COLOR, COL_LAST_UPDATED_TS) val selection = "$COL_ID = ?" val selectionArgs = arrayOf(THEME_ID.toString())