From 0c5758a2a8dfff50c0765864c60c92aed4f75c89 Mon Sep 17 00:00:00 2001 From: Naveen Date: Sun, 12 Jun 2022 17:51:32 +0530 Subject: [PATCH 1/2] Remove default apps from prepaid variant --- app/src/fdroid/res/values/bools.xml | 1 + .../com/simplemobiletools/applauncher/extensions/Context.kt | 5 +++++ .../com/simplemobiletools/applauncher/helpers/DBHelper.kt | 6 ++++-- app/src/main/res/values/bools.xml | 4 ++++ app/src/prepaid/res/values/bools.xml | 1 + 5 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 app/src/main/res/values/bools.xml diff --git a/app/src/fdroid/res/values/bools.xml b/app/src/fdroid/res/values/bools.xml index ac02880..873966f 100644 --- a/app/src/fdroid/res/values/bools.xml +++ b/app/src/fdroid/res/values/bools.xml @@ -3,4 +3,5 @@ true true true + true diff --git a/app/src/main/kotlin/com/simplemobiletools/applauncher/extensions/Context.kt b/app/src/main/kotlin/com/simplemobiletools/applauncher/extensions/Context.kt index 6dc62d2..f8d946f 100644 --- a/app/src/main/kotlin/com/simplemobiletools/applauncher/extensions/Context.kt +++ b/app/src/main/kotlin/com/simplemobiletools/applauncher/extensions/Context.kt @@ -5,6 +5,7 @@ import android.content.Intent import android.content.pm.LauncherApps import android.content.pm.PackageManager import android.graphics.drawable.Drawable +import com.simplemobiletools.applauncher.R import com.simplemobiletools.applauncher.helpers.Config import com.simplemobiletools.applauncher.helpers.DBHelper import com.simplemobiletools.applauncher.models.AppLauncher @@ -68,3 +69,7 @@ fun Context.getAllLaunchers(): ArrayList { val unique = allApps.distinctBy { it.packageName } return unique.filter { it.packageName != "com.simplemobiletools.applauncher" } as ArrayList } + +fun Context.addDefaultApps(): Boolean { + return resources.getBoolean(R.bool.add_default_apps) +} diff --git a/app/src/main/kotlin/com/simplemobiletools/applauncher/helpers/DBHelper.kt b/app/src/main/kotlin/com/simplemobiletools/applauncher/helpers/DBHelper.kt index 5a25013..c1f3fb2 100644 --- a/app/src/main/kotlin/com/simplemobiletools/applauncher/helpers/DBHelper.kt +++ b/app/src/main/kotlin/com/simplemobiletools/applauncher/helpers/DBHelper.kt @@ -9,12 +9,12 @@ import android.database.sqlite.SQLiteOpenHelper import android.graphics.drawable.Drawable import android.text.TextUtils import com.simplemobiletools.applauncher.R +import com.simplemobiletools.applauncher.extensions.addDefaultApps import com.simplemobiletools.applauncher.extensions.getLauncherDrawable import com.simplemobiletools.applauncher.extensions.isAPredefinedApp import com.simplemobiletools.applauncher.models.AppLauncher import com.simplemobiletools.commons.extensions.getIntValue import com.simplemobiletools.commons.extensions.getStringValue -import java.util.* class DBHelper private constructor(val context: Context) : SQLiteOpenHelper(context, DB_NAME, null, DB_VERSION) { private val MAIN_TABLE_NAME = "launchers" @@ -46,7 +46,9 @@ class DBHelper private constructor(val context: Context) : SQLiteOpenHelper(cont "CREATE TABLE $MAIN_TABLE_NAME ($COL_ID INTEGER PRIMARY KEY AUTOINCREMENT, $COL_NAME TEXT, $COL_PKG_NAME TEXT UNIQUE, $COL_POSITION INTEGER," + "$COL_WAS_RENAMED INTEGER, $COL_APP_ORDER INTEGER)" ) - addInitialLaunchers(db) + if (context.addDefaultApps()) { + addInitialLaunchers(db) + } } override fun onUpgrade(db: SQLiteDatabase, oldVersion: Int, newVersion: Int) { diff --git a/app/src/main/res/values/bools.xml b/app/src/main/res/values/bools.xml new file mode 100644 index 0000000..c0d434a --- /dev/null +++ b/app/src/main/res/values/bools.xml @@ -0,0 +1,4 @@ + + + true + diff --git a/app/src/prepaid/res/values/bools.xml b/app/src/prepaid/res/values/bools.xml index 88ed415..7930cba 100644 --- a/app/src/prepaid/res/values/bools.xml +++ b/app/src/prepaid/res/values/bools.xml @@ -4,4 +4,5 @@ true true true + false From b3143245ba9f85051fcd8cd9e73074842a40962a Mon Sep 17 00:00:00 2001 From: Naveen Date: Sun, 12 Jun 2022 18:23:05 +0530 Subject: [PATCH 2/2] Remove unnecessary extension function --- .../com/simplemobiletools/applauncher/extensions/Context.kt | 5 ----- .../com/simplemobiletools/applauncher/helpers/DBHelper.kt | 3 +-- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/applauncher/extensions/Context.kt b/app/src/main/kotlin/com/simplemobiletools/applauncher/extensions/Context.kt index f8d946f..6dc62d2 100644 --- a/app/src/main/kotlin/com/simplemobiletools/applauncher/extensions/Context.kt +++ b/app/src/main/kotlin/com/simplemobiletools/applauncher/extensions/Context.kt @@ -5,7 +5,6 @@ import android.content.Intent import android.content.pm.LauncherApps import android.content.pm.PackageManager import android.graphics.drawable.Drawable -import com.simplemobiletools.applauncher.R import com.simplemobiletools.applauncher.helpers.Config import com.simplemobiletools.applauncher.helpers.DBHelper import com.simplemobiletools.applauncher.models.AppLauncher @@ -69,7 +68,3 @@ fun Context.getAllLaunchers(): ArrayList { val unique = allApps.distinctBy { it.packageName } return unique.filter { it.packageName != "com.simplemobiletools.applauncher" } as ArrayList } - -fun Context.addDefaultApps(): Boolean { - return resources.getBoolean(R.bool.add_default_apps) -} diff --git a/app/src/main/kotlin/com/simplemobiletools/applauncher/helpers/DBHelper.kt b/app/src/main/kotlin/com/simplemobiletools/applauncher/helpers/DBHelper.kt index c1f3fb2..04fcc60 100644 --- a/app/src/main/kotlin/com/simplemobiletools/applauncher/helpers/DBHelper.kt +++ b/app/src/main/kotlin/com/simplemobiletools/applauncher/helpers/DBHelper.kt @@ -9,7 +9,6 @@ import android.database.sqlite.SQLiteOpenHelper import android.graphics.drawable.Drawable import android.text.TextUtils import com.simplemobiletools.applauncher.R -import com.simplemobiletools.applauncher.extensions.addDefaultApps import com.simplemobiletools.applauncher.extensions.getLauncherDrawable import com.simplemobiletools.applauncher.extensions.isAPredefinedApp import com.simplemobiletools.applauncher.models.AppLauncher @@ -46,7 +45,7 @@ class DBHelper private constructor(val context: Context) : SQLiteOpenHelper(cont "CREATE TABLE $MAIN_TABLE_NAME ($COL_ID INTEGER PRIMARY KEY AUTOINCREMENT, $COL_NAME TEXT, $COL_PKG_NAME TEXT UNIQUE, $COL_POSITION INTEGER," + "$COL_WAS_RENAMED INTEGER, $COL_APP_ORDER INTEGER)" ) - if (context.addDefaultApps()) { + if (context.resources.getBoolean(R.bool.add_default_apps)) { addInitialLaunchers(db) } }