fenix/Simple-Thank-You
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Thank-You.git synced 2025-06-05 22:09:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

stop using Shared Theme if it has been disabled in the app settings

Browse Source
This commit is contained in:
tibbi
2020-12-28 16:15:58 +01:00
parent 529b101c28
commit 721e359c29
3 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@@ -55,5 +55,5 @@ android {
} }
dependencies { dependencies {
implementation 'com.simplemobiletools:commons:5.32.9' implementation 'com.simplemobiletools:commons:5.32.10'
} }

6
app/src/main/kotlin/com/simplemobiletools/thankyou/contentproviders/MyContentProvider.kt
View File

@@ -4,6 +4,7 @@ import android.content.ContentProvider
import android.content.ContentValues import android.content.ContentValues
import android.net.Uri import android.net.Uri
import com.simplemobiletools.thankyou.dbhelpers.MyContentProviderDbHelper import com.simplemobiletools.thankyou.dbhelpers.MyContentProviderDbHelper
import com.simplemobiletools.thankyou.extensions.config
class MyContentProvider : ContentProvider() { class MyContentProvider : ContentProvider() {
lateinit var dbHelper: MyContentProviderDbHelper lateinit var dbHelper: MyContentProviderDbHelper
@@ -17,7 +18,10 @@ class MyContentProvider : ContentProvider() {
return true return true
} }
override fun update(uri: Uri, contentValues: ContentValues?, selection: String?, selectionArgs: Array<out String>?): Int = dbHelper.updateTheme(contentValues!!) override fun update(uri: Uri, contentValues: ContentValues?, selection: String?, selectionArgs: Array<out String>?): Int {
context?.config?.shouldUseSharedTheme = true
return dbHelper.updateTheme(contentValues!!)
}
override fun delete(uri: Uri, selection: String?, selectionArgs: Array<out String>?): Int = 0 override fun delete(uri: Uri, selection: String?, selectionArgs: Array<out String>?): Int = 0

6
app/src/main/kotlin/com/simplemobiletools/thankyou/dbhelpers/MyContentProviderDbHelper.kt
View File

@@ -15,7 +15,9 @@ import com.simplemobiletools.commons.helpers.MyContentProvider.Companion.COL_NAV
import com.simplemobiletools.commons.helpers.MyContentProvider.Companion.COL_PRIMARY_COLOR import com.simplemobiletools.commons.helpers.MyContentProvider.Companion.COL_PRIMARY_COLOR
import com.simplemobiletools.commons.helpers.MyContentProvider.Companion.COL_TEXT_COLOR import com.simplemobiletools.commons.helpers.MyContentProvider.Companion.COL_TEXT_COLOR
import com.simplemobiletools.commons.helpers.MyContentProvider.Companion.fillThemeContentValues import com.simplemobiletools.commons.helpers.MyContentProvider.Companion.fillThemeContentValues
import com.simplemobiletools.commons.helpers.mydebug
import com.simplemobiletools.commons.models.SharedTheme import com.simplemobiletools.commons.models.SharedTheme
import com.simplemobiletools.thankyou.extensions.config
class MyContentProviderDbHelper private constructor(private val context: Context) : SQLiteOpenHelper(context, DB_NAME, null, DB_VERSION) { class MyContentProviderDbHelper private constructor(private val context: Context) : SQLiteOpenHelper(context, DB_NAME, null, DB_VERSION) {
private val mDb = writableDatabase private val mDb = writableDatabase
@@ -81,6 +83,10 @@ class MyContentProviderDbHelper private constructor(private val context: Context
} }
fun getSharedTheme(): Cursor? { fun getSharedTheme(): Cursor? {
if (!context.config.shouldUseSharedTheme) {
return null
}
val cols = arrayOf(COL_TEXT_COLOR, COL_BACKGROUND_COLOR, COL_PRIMARY_COLOR, COL_APP_ICON_COLOR, COL_NAVIGATION_BAR_COLOR, COL_LAST_UPDATED_TS) val cols = arrayOf(COL_TEXT_COLOR, COL_BACKGROUND_COLOR, COL_PRIMARY_COLOR, COL_APP_ICON_COLOR, COL_NAVIGATION_BAR_COLOR, COL_LAST_UPDATED_TS)
val selection = "$COL_ID = ?" val selection = "$COL_ID = ?"
val selectionArgs = arrayOf(THEME_ID.toString()) val selectionArgs = arrayOf(THEME_ID.toString())