fenix/Simple-App-Launcher
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-App-Launcher.git synced 2025-03-06 12:17:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

movemove DBHelper in Helpers package

Browse Source
This commit is contained in:
tibbi 2017-11-10 23:38:06 +01:00
parent 904fa7ca88
commit 779d5498f5
3 changed files with 19 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/kotlin/com/simplemobiletools/applauncher/activities/MainActivity.kt
View File

@ -10,7 +10,7 @@ import android.widget.ImageView
import com.simplemobiletools.applauncher.BuildConfig import com.simplemobiletools.applauncher.BuildConfig
import com.simplemobiletools.applauncher.R import com.simplemobiletools.applauncher.R
import com.simplemobiletools.applauncher.adapters.RecyclerAdapter import com.simplemobiletools.applauncher.adapters.RecyclerAdapter
import com.simplemobiletools.applauncher.databases.DbHelper import com.simplemobiletools.applauncher.helpers.DBHelper
import com.simplemobiletools.applauncher.dialogs.AddAppDialog import com.simplemobiletools.applauncher.dialogs.AddAppDialog
import com.simplemobiletools.applauncher.models.AppLauncher import com.simplemobiletools.applauncher.models.AppLauncher
import com.simplemobiletools.commons.extensions.beInvisible import com.simplemobiletools.commons.extensions.beInvisible
@ -20,14 +20,14 @@ import kotlinx.android.synthetic.main.activity_main.*
import java.util.* import java.util.*
class MainActivity : SimpleActivity(), AddAppDialog.AddLaunchersInterface, RecyclerAdapter.RecyclerInterface { class MainActivity : SimpleActivity(), AddAppDialog.AddLaunchersInterface, RecyclerAdapter.RecyclerInterface {
lateinit var dbHelper: DbHelper lateinit var dbHelper: DBHelper
lateinit var launchers: ArrayList<AppLauncher> lateinit var launchers: ArrayList<AppLauncher>
lateinit var remainingLaunchers: ArrayList<AppLauncher> lateinit var remainingLaunchers: ArrayList<AppLauncher>
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
setContentView(R.layout.activity_main) setContentView(R.layout.activity_main)
dbHelper = DbHelper(applicationContext) dbHelper = DBHelper(applicationContext)
setupLaunchers() setupLaunchers()
fab.setOnClickListener { fab.setOnClickListener {

6
app/src/main/kotlin/com/simplemobiletools/applauncher/adapters/RecyclerAdapter.kt
View File

@ -11,7 +11,7 @@ import com.bignerdranch.android.multiselector.ModalMultiSelectorCallback
import com.bignerdranch.android.multiselector.MultiSelector import com.bignerdranch.android.multiselector.MultiSelector
import com.bignerdranch.android.multiselector.SwappingHolder import com.bignerdranch.android.multiselector.SwappingHolder
import com.simplemobiletools.applauncher.R import com.simplemobiletools.applauncher.R
import com.simplemobiletools.applauncher.databases.DbHelper import com.simplemobiletools.applauncher.helpers.DBHelper
import com.simplemobiletools.applauncher.models.AppLauncher import com.simplemobiletools.applauncher.models.AppLauncher
import com.simplemobiletools.commons.extensions.beInvisibleIf import com.simplemobiletools.commons.extensions.beInvisibleIf
import com.simplemobiletools.commons.extensions.beVisible import com.simplemobiletools.commons.extensions.beVisible
@ -92,7 +92,7 @@ class RecyclerAdapter(val act: Activity, val launchers: List<AppLauncher>, val i
getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener { getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener {
val newName = editView.edit_launcher_edittext.text.toString().trim() val newName = editView.edit_launcher_edittext.text.toString().trim()
if (!newName.isEmpty()) { if (!newName.isEmpty()) {
if (DbHelper(act).updateLauncherName(selectedLauncher.id, newName) > 0) { if (DBHelper(act).updateLauncherName(selectedLauncher.id, newName) > 0) {
(act as RecyclerInterface).launcherRenamed() (act as RecyclerInterface).launcherRenamed()
finishActionMode() finishActionMode()
dismiss() dismiss()
@ -123,7 +123,7 @@ class RecyclerAdapter(val act: Activity, val launchers: List<AppLauncher>, val i
if (launcher.name.isNotEmpty()) if (launcher.name.isNotEmpty())
deletedLaunchers.add(launcher) deletedLaunchers.add(launcher)
} }
DbHelper(act).deleteLaunchers(deleteIds) DBHelper(act).deleteLaunchers(deleteIds)
finishActionMode() finishActionMode()
(act as RecyclerInterface).launchersDeleted(positions, deletedLaunchers) (act as RecyclerInterface).launchersDeleted(positions, deletedLaunchers)
} }

29
app/src/main/kotlin/com/simplemobiletools/applauncher/databases/DbHelper.kt → app/src/main/kotlin/com/simplemobiletools/applauncher/helpers/DBHelper.kt
View File

@ -1,4 +1,4 @@
package com.simplemobiletools.applauncher.databases package com.simplemobiletools.applauncher.helpers
import android.content.ContentValues import android.content.ContentValues
import android.content.Context import android.content.Context
@ -7,18 +7,14 @@ import android.database.sqlite.SQLiteOpenHelper
import android.text.TextUtils import android.text.TextUtils
import com.simplemobiletools.applauncher.R import com.simplemobiletools.applauncher.R
import com.simplemobiletools.applauncher.models.AppLauncher import com.simplemobiletools.applauncher.models.AppLauncher
import com.simplemobiletools.commons.extensions.getIntValue
import com.simplemobiletools.commons.extensions.getStringValue
import java.util.* import java.util.*
class DbHelper(context: Context) : SQLiteOpenHelper(context, "launchers.db", null, 1) { class DBHelper(context: Context) : SQLiteOpenHelper(context, "launchers.db", null, 1) {
val resources = context.resources private val resources = context.resources
val TABLE = "launchers" private val TABLE = "launchers"
val CREATE_DB = "CREATE TABLE $TABLE (" + private val CREATE_DB = "CREATE TABLE $TABLE ($ID INTEGER PRIMARY KEY AUTOINCREMENT, $NAME TEXT, $PKG_NAME TEXT UNIQUE, $ICON_ID INTEGER, $POSITION INTEGER)"
"$ID INTEGER PRIMARY KEY AUTOINCREMENT," +
"$NAME TEXT," +
"$PKG_NAME TEXT UNIQUE," +
"$ICON_ID INTEGER, " +
"$POSITION INTEGER " +
")"
companion object { companion object {
val ID: String = "_id" val ID: String = "_id"
@ -75,11 +71,12 @@ class DbHelper(context: Context) : SQLiteOpenHelper(context, "launchers.db", nul
val cursor = readableDatabase.query(TABLE, arrayOf(ID, NAME, PKG_NAME, ICON_ID), null, null, null, null, NAME) val cursor = readableDatabase.query(TABLE, arrayOf(ID, NAME, PKG_NAME, ICON_ID), null, null, null, null, NAME)
cursor.use { cursor.use {
while (cursor.moveToNext()) { while (cursor.moveToNext()) {
val id = cursor.getInt(cursor.getColumnIndex(DbHelper.ID)) val id = cursor.getIntValue(ID)
val name = cursor.getString(cursor.getColumnIndex(DbHelper.NAME)) val name = cursor.getStringValue(NAME)
val pkgName = cursor.getString(cursor.getColumnIndex(DbHelper.PKG_NAME)) val pkgName = cursor.getStringValue(PKG_NAME)
val icon = cursor.getInt(cursor.getColumnIndex(DbHelper.ICON_ID)) val icon = cursor.getIntValue(ICON_ID)
launchers.add(AppLauncher(id, name, pkgName, icon)) val launcher = AppLauncher(id, name, pkgName, icon)
launchers.add(launcher)
} }
} }
return launchers return launchers