fenix/Simple-App-Launcher
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-App-Launcher.git synced 2025-06-05 21:49:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

adding Order to the AppLauncher model

Browse Source
This commit is contained in:
tibbi
2020-11-07 22:51:22 +01:00
parent 4921a4f4b2
commit 28a9a29762
3 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/kotlin/com/simplemobiletools/applauncher/extensions/Context.kt
View File

@@ -45,7 +45,7 @@ fun Context.getNotDisplayedLaunchers(displayedLaunchers: ArrayList<AppLauncher>)
} }
} }
allApps.add(AppLauncher(0, label, packageName, drawable)) allApps.add(AppLauncher(0, label, packageName, 0, drawable))
} }
if (config.sorting and SORT_BY_CUSTOM != 0) { if (config.sorting and SORT_BY_CUSTOM != 0) {

18
app/src/main/kotlin/com/simplemobiletools/applauncher/helpers/DBHelper.kt
View File

@@ -49,12 +49,12 @@ class DBHelper private constructor(val context: Context) : SQLiteOpenHelper(cont
override fun onUpgrade(db: SQLiteDatabase, oldVersion: Int, newVersion: Int) { override fun onUpgrade(db: SQLiteDatabase, oldVersion: Int, newVersion: Int) {
if (oldVersion < 3) { if (oldVersion < 3) {
val contacts = AppLauncher(0, context.getString(R.string.contacts_short), "com.simplemobiletools.contacts") val contacts = AppLauncher(0, context.getString(R.string.contacts_short), "com.simplemobiletools.contacts", 0)
addAppLauncher(contacts, db) addAppLauncher(contacts, db)
} }
if (oldVersion < 4) { if (oldVersion < 4) {
val clock = AppLauncher(0, context.getString(R.string.clock_short), "com.simplemobiletools.clock") val clock = AppLauncher(0, context.getString(R.string.clock_short), "com.simplemobiletools.clock", 0)
addAppLauncher(clock, db) addAppLauncher(clock, db)
} }
@@ -67,9 +67,9 @@ class DBHelper private constructor(val context: Context) : SQLiteOpenHelper(cont
} }
if (oldVersion < 7) { if (oldVersion < 7) {
val dialer = AppLauncher(0, context.getString(R.string.dialer_short), "com.simplemobiletools.dialer") val dialer = AppLauncher(0, context.getString(R.string.dialer_short), "com.simplemobiletools.dialer", 0)
val smsMessenger = AppLauncher(0, context.getString(R.string.sms_messenger_short), "com.simplemobiletools.smsmessenger") val smsMessenger = AppLauncher(0, context.getString(R.string.sms_messenger_short), "com.simplemobiletools.smsmessenger", 0)
val voiceRecorder = AppLauncher(0, context.getString(R.string.voice_recorder_short), "com.simplemobiletools.voicerecorder") val voiceRecorder = AppLauncher(0, context.getString(R.string.voice_recorder_short), "com.simplemobiletools.voicerecorder", 0)
addAppLauncher(dialer, db) addAppLauncher(dialer, db)
addAppLauncher(smsMessenger, db) addAppLauncher(smsMessenger, db)
addAppLauncher(voiceRecorder, db) addAppLauncher(voiceRecorder, db)
@@ -99,7 +99,7 @@ class DBHelper private constructor(val context: Context) : SQLiteOpenHelper(cont
val resources = context.resources val resources = context.resources
val packages = predefinedPackageNames val packages = predefinedPackageNames
for (i in 0 until cnt) { for (i in 0 until cnt) {
val appLauncher = AppLauncher(0, resources.getString(titles[i]), packages[i]) val appLauncher = AppLauncher(0, resources.getString(titles[i]), packages[i], 0)
addAppLauncher(appLauncher, db) addAppLauncher(appLauncher, db)
} }
} }
@@ -117,6 +117,7 @@ class DBHelper private constructor(val context: Context) : SQLiteOpenHelper(cont
return ContentValues().apply { return ContentValues().apply {
put(COL_NAME, appLauncher.title) put(COL_NAME, appLauncher.title)
put(COL_PKG_NAME, appLauncher.packageName) put(COL_PKG_NAME, appLauncher.packageName)
put(COL_APP_ORDER, appLauncher.order)
} }
} }
@@ -141,7 +142,7 @@ class DBHelper private constructor(val context: Context) : SQLiteOpenHelper(cont
val resources = context.resources val resources = context.resources
val packageManager = context.packageManager val packageManager = context.packageManager
val launchers = ArrayList<AppLauncher>() val launchers = ArrayList<AppLauncher>()
val cols = arrayOf(COL_ID, COL_NAME, COL_PKG_NAME, COL_WAS_RENAMED) val cols = arrayOf(COL_ID, COL_NAME, COL_PKG_NAME, COL_WAS_RENAMED, COL_APP_ORDER)
val cursor = mDb.query(MAIN_TABLE_NAME, cols, null, null, null, null, "$COL_NAME COLLATE NOCASE") val cursor = mDb.query(MAIN_TABLE_NAME, cols, null, null, null, null, "$COL_NAME COLLATE NOCASE")
val IDsToDelete = ArrayList<String>() val IDsToDelete = ArrayList<String>()
cursor.use { cursor.use {
@@ -150,6 +151,7 @@ class DBHelper private constructor(val context: Context) : SQLiteOpenHelper(cont
var name = cursor.getStringValue(COL_NAME) var name = cursor.getStringValue(COL_NAME)
val packageName = cursor.getStringValue(COL_PKG_NAME) val packageName = cursor.getStringValue(COL_PKG_NAME)
val wasRenamed = cursor.getIntValue(COL_WAS_RENAMED) == 1 val wasRenamed = cursor.getIntValue(COL_WAS_RENAMED) == 1
val order = cursor.getIntValue(COL_APP_ORDER)
var drawable: Drawable? = null var drawable: Drawable? = null
try { try {
@@ -182,7 +184,7 @@ class DBHelper private constructor(val context: Context) : SQLiteOpenHelper(cont
} }
if (drawable != null) { if (drawable != null) {
val launcher = AppLauncher(id, name, packageName, drawable) val launcher = AppLauncher(id, name, packageName, order, drawable)
launchers.add(launcher) launchers.add(launcher)
} }
} }

2
app/src/main/kotlin/com/simplemobiletools/applauncher/models/AppLauncher.kt
View File

@@ -4,7 +4,7 @@ import android.graphics.drawable.Drawable
import com.simplemobiletools.commons.helpers.SORT_BY_TITLE import com.simplemobiletools.commons.helpers.SORT_BY_TITLE
import com.simplemobiletools.commons.helpers.SORT_DESCENDING import com.simplemobiletools.commons.helpers.SORT_DESCENDING
data class AppLauncher(val id: Int, var title: String, val packageName: String, val drawable: Drawable? = null) : Comparable<AppLauncher> { data class AppLauncher(val id: Int, var title: String, val packageName: String, val order: Int, val drawable: Drawable? = null) : Comparable<AppLauncher> {
companion object { companion object {
var sorting = 0 var sorting = 0
} }