From f31d649f286c85f60a4ce35dd7e46985b125a925 Mon Sep 17 00:00:00 2001 From: tibbi Date: Fri, 6 Jan 2017 20:09:30 +0100 Subject: [PATCH] move DBHelper in helpers folder --- .../notes/activities/MainActivity.kt | 2 +- .../notes/activities/SettingsActivity.kt | 2 +- .../notes/dialogs/NewNoteDialog.kt | 2 +- .../notes/dialogs/OpenNoteDialog.kt | 2 +- .../notes/dialogs/RenameNoteDialog.kt | 2 +- .../notes/fragments/NoteFragment.kt | 2 +- .../notes/{databases => helpers}/DBHelper.kt | 21 +++++++++---------- .../notes/helpers/MyWidgetProvider.kt | 2 +- 8 files changed, 17 insertions(+), 18 deletions(-) rename app/src/main/kotlin/com/simplemobiletools/notes/{databases => helpers}/DBHelper.kt (84%) diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/notes/activities/MainActivity.kt index 714c7861..8a54db82 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/activities/MainActivity.kt @@ -18,7 +18,7 @@ import com.simplemobiletools.commons.helpers.LICENSE_STETHO import com.simplemobiletools.notes.BuildConfig import com.simplemobiletools.notes.R import com.simplemobiletools.notes.adapters.NotesPagerAdapter -import com.simplemobiletools.notes.databases.DBHelper +import com.simplemobiletools.notes.helpers.DBHelper import com.simplemobiletools.notes.dialogs.NewNoteDialog import com.simplemobiletools.notes.dialogs.OpenNoteDialog import com.simplemobiletools.notes.dialogs.RenameNoteDialog diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/activities/SettingsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/notes/activities/SettingsActivity.kt index 19afd17c..4309d16a 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/activities/SettingsActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/activities/SettingsActivity.kt @@ -5,7 +5,7 @@ import android.view.View import android.widget.AdapterView import android.widget.ArrayAdapter import com.simplemobiletools.notes.R -import com.simplemobiletools.notes.databases.DBHelper +import com.simplemobiletools.notes.helpers.DBHelper import com.simplemobiletools.notes.extensions.updateWidget import com.simplemobiletools.notes.models.Note import kotlinx.android.synthetic.main.activity_settings.* diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/dialogs/NewNoteDialog.kt b/app/src/main/kotlin/com/simplemobiletools/notes/dialogs/NewNoteDialog.kt index 732b9e6b..dc3e2f23 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/dialogs/NewNoteDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/dialogs/NewNoteDialog.kt @@ -6,7 +6,7 @@ import com.simplemobiletools.commons.extensions.setupDialogStuff import com.simplemobiletools.commons.extensions.toast import com.simplemobiletools.commons.extensions.value import com.simplemobiletools.notes.R -import com.simplemobiletools.notes.databases.DBHelper +import com.simplemobiletools.notes.helpers.DBHelper import kotlinx.android.synthetic.main.new_note.view.* class NewNoteDialog(val activity: Activity, val db: DBHelper, callback: (title: String) -> Unit) { diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/dialogs/OpenNoteDialog.kt b/app/src/main/kotlin/com/simplemobiletools/notes/dialogs/OpenNoteDialog.kt index 4dd00939..52c10dd5 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/dialogs/OpenNoteDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/dialogs/OpenNoteDialog.kt @@ -7,7 +7,7 @@ import android.widget.RadioButton import android.widget.RadioGroup import com.simplemobiletools.commons.extensions.setupDialogStuff import com.simplemobiletools.notes.R -import com.simplemobiletools.notes.databases.DBHelper +import com.simplemobiletools.notes.helpers.DBHelper import com.simplemobiletools.notes.helpers.Config import kotlinx.android.synthetic.main.dialog_radio_group.view.* diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/dialogs/RenameNoteDialog.kt b/app/src/main/kotlin/com/simplemobiletools/notes/dialogs/RenameNoteDialog.kt index e304a383..39dcd665 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/dialogs/RenameNoteDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/dialogs/RenameNoteDialog.kt @@ -7,7 +7,7 @@ import com.simplemobiletools.commons.extensions.setupDialogStuff import com.simplemobiletools.commons.extensions.toast import com.simplemobiletools.commons.extensions.value import com.simplemobiletools.notes.R -import com.simplemobiletools.notes.databases.DBHelper +import com.simplemobiletools.notes.helpers.DBHelper import com.simplemobiletools.notes.models.Note import kotlinx.android.synthetic.main.new_note.view.* diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/fragments/NoteFragment.kt b/app/src/main/kotlin/com/simplemobiletools/notes/fragments/NoteFragment.kt index 1c6ec769..29b86b17 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/fragments/NoteFragment.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/fragments/NoteFragment.kt @@ -10,7 +10,7 @@ import android.view.ViewGroup import android.view.inputmethod.InputMethodManager import com.simplemobiletools.commons.extensions.value import com.simplemobiletools.notes.R -import com.simplemobiletools.notes.databases.DBHelper +import com.simplemobiletools.notes.helpers.DBHelper import com.simplemobiletools.notes.extensions.getTextGravity import com.simplemobiletools.notes.extensions.getTextSize import com.simplemobiletools.notes.extensions.updateWidget diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/databases/DBHelper.kt b/app/src/main/kotlin/com/simplemobiletools/notes/helpers/DBHelper.kt similarity index 84% rename from app/src/main/kotlin/com/simplemobiletools/notes/databases/DBHelper.kt rename to app/src/main/kotlin/com/simplemobiletools/notes/helpers/DBHelper.kt index 4c8dfe97..fc612175 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/databases/DBHelper.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/helpers/DBHelper.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.notes.databases +package com.simplemobiletools.notes.helpers import android.content.ContentValues import android.content.Context @@ -8,11 +8,10 @@ import android.database.sqlite.SQLiteOpenHelper import com.simplemobiletools.commons.extensions.getIntValue import com.simplemobiletools.commons.extensions.getStringValue import com.simplemobiletools.notes.R -import com.simplemobiletools.notes.helpers.TYPE_NOTE import com.simplemobiletools.notes.models.Note import java.util.* -class DBHelper private constructor(private val mContext: Context) : SQLiteOpenHelper(mContext, DBHelper.DB_NAME, null, DBHelper.DB_VERSION) { +class DBHelper private constructor(private val mContext: Context) : SQLiteOpenHelper(mContext, DB_NAME, null, DB_VERSION) { private val mDb: SQLiteDatabase = writableDatabase companion object { @@ -30,16 +29,16 @@ class DBHelper private constructor(private val mContext: Context) : SQLiteOpenHe } override fun onCreate(db: SQLiteDatabase) { - db.execSQL("CREATE TABLE $TABLE_NAME ($COL_ID INTEGER PRIMARY KEY, $COL_TITLE TEXT UNIQUE, $COL_VALUE TEXT, $COL_TYPE INTEGER DEFAULT 0, $COL_PATH TEXT)") + db.execSQL("CREATE TABLE ${TABLE_NAME} (${COL_ID} INTEGER PRIMARY KEY, ${COL_TITLE} TEXT UNIQUE, ${COL_VALUE} TEXT, ${COL_TYPE} INTEGER DEFAULT 0, ${COL_PATH} TEXT)") insertFirstNote(db) } override fun onUpgrade(db: SQLiteDatabase, oldVersion: Int, newVersion: Int) { if (oldVersion < 2) - db.execSQL("ALTER TABLE $TABLE_NAME ADD COLUMN $COL_TYPE INTEGER DEFAULT 0") + db.execSQL("ALTER TABLE ${TABLE_NAME} ADD COLUMN ${COL_TYPE} INTEGER DEFAULT 0") if (oldVersion < 3) - db.execSQL("ALTER TABLE $TABLE_NAME ADD COLUMN $COL_PATH TEXT") + db.execSQL("ALTER TABLE ${TABLE_NAME} ADD COLUMN ${COL_PATH} TEXT") } private fun insertFirstNote(db: SQLiteDatabase) { @@ -67,12 +66,12 @@ class DBHelper private constructor(private val mContext: Context) : SQLiteOpenHe } fun deleteNote(id: Int) { - mDb.delete(TABLE_NAME, "$COL_ID = $id", null) + mDb.delete(TABLE_NAME, "${COL_ID} = $id", null) } fun doesTitleExist(title: String): Boolean { val cols = arrayOf(COL_ID) - val selection = "$COL_TITLE = ?" + val selection = "${COL_TITLE} = ?" val selectionArgs = arrayOf(title) var cursor: Cursor? = null try { @@ -88,7 +87,7 @@ class DBHelper private constructor(private val mContext: Context) : SQLiteOpenHe val cols = arrayOf(COL_ID, COL_TITLE, COL_VALUE, COL_TYPE) var cursor: Cursor? = null try { - cursor = mDb.query(TABLE_NAME, cols, null, null, null, null, "$COL_TITLE COLLATE NOCASE ASC") + cursor = mDb.query(TABLE_NAME, cols, null, null, null, null, "${COL_TITLE} COLLATE NOCASE ASC") if (cursor?.moveToFirst() == true) { do { val id = cursor.getIntValue(COL_ID) @@ -108,7 +107,7 @@ class DBHelper private constructor(private val mContext: Context) : SQLiteOpenHe fun getNote(id: Int): Note? { val cols = arrayOf(COL_TITLE, COL_VALUE, COL_TYPE) - val selection = "$COL_ID = ?" + val selection = "${COL_ID} = ?" val selectionArgs = arrayOf(id.toString()) var note: Note? = null var cursor: Cursor? = null @@ -128,7 +127,7 @@ class DBHelper private constructor(private val mContext: Context) : SQLiteOpenHe fun updateNote(note: Note) { val values = fillContentValues(note) - val selection = "$COL_ID = ?" + val selection = "${COL_ID} = ?" val selectionArgs = arrayOf(note.id.toString()) mDb.update(TABLE_NAME, values, selection, selectionArgs) } diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/helpers/MyWidgetProvider.kt b/app/src/main/kotlin/com/simplemobiletools/notes/helpers/MyWidgetProvider.kt index 91a83dda..0b368f7b 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/helpers/MyWidgetProvider.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/helpers/MyWidgetProvider.kt @@ -12,7 +12,7 @@ import android.widget.RemoteViews import com.simplemobiletools.notes.R import com.simplemobiletools.notes.R.layout.widget import com.simplemobiletools.notes.activities.MainActivity -import com.simplemobiletools.notes.databases.DBHelper +import com.simplemobiletools.notes.helpers.DBHelper import com.simplemobiletools.notes.extensions.getTextSize class MyWidgetProvider : AppWidgetProvider() {