Skip to content

Commit f31d649

Browse files
tibbitibbi
committed
move DBHelper in helpers folder
1 parent e17d139 commit f31d649

File tree

8 files changed

+17
-18
lines changed

8 files changed

+17
-18
lines changed

‎app/src/main/kotlin/com/simplemobiletools/notes/activities/MainActivity.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import com.simplemobiletools.commons.helpers.LICENSE_STETHO
1818
import com.simplemobiletools.notes.BuildConfig
1919
import com.simplemobiletools.notes.R
2020
import com.simplemobiletools.notes.adapters.NotesPagerAdapter
21-
import com.simplemobiletools.notes.databases.DBHelper
21+
import com.simplemobiletools.notes.helpers.DBHelper
2222
import com.simplemobiletools.notes.dialogs.NewNoteDialog
2323
import com.simplemobiletools.notes.dialogs.OpenNoteDialog
2424
import com.simplemobiletools.notes.dialogs.RenameNoteDialog

‎app/src/main/kotlin/com/simplemobiletools/notes/activities/SettingsActivity.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import android.view.View
55
import android.widget.AdapterView
66
import android.widget.ArrayAdapter
77
import com.simplemobiletools.notes.R
8-
import com.simplemobiletools.notes.databases.DBHelper
8+
import com.simplemobiletools.notes.helpers.DBHelper
99
import com.simplemobiletools.notes.extensions.updateWidget
1010
import com.simplemobiletools.notes.models.Note
1111
import kotlinx.android.synthetic.main.activity_settings.*

‎app/src/main/kotlin/com/simplemobiletools/notes/dialogs/NewNoteDialog.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import com.simplemobiletools.commons.extensions.setupDialogStuff
66
import com.simplemobiletools.commons.extensions.toast
77
import com.simplemobiletools.commons.extensions.value
88
import com.simplemobiletools.notes.R
9-
import com.simplemobiletools.notes.databases.DBHelper
9+
import com.simplemobiletools.notes.helpers.DBHelper
1010
import kotlinx.android.synthetic.main.new_note.view.*
1111

1212
class NewNoteDialog(val activity: Activity, val db: DBHelper, callback: (title: String) -> Unit) {

‎app/src/main/kotlin/com/simplemobiletools/notes/dialogs/OpenNoteDialog.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import android.widget.RadioButton
77
import android.widget.RadioGroup
88
import com.simplemobiletools.commons.extensions.setupDialogStuff
99
import com.simplemobiletools.notes.R
10-
import com.simplemobiletools.notes.databases.DBHelper
10+
import com.simplemobiletools.notes.helpers.DBHelper
1111
import com.simplemobiletools.notes.helpers.Config
1212
import kotlinx.android.synthetic.main.dialog_radio_group.view.*
1313

‎app/src/main/kotlin/com/simplemobiletools/notes/dialogs/RenameNoteDialog.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import com.simplemobiletools.commons.extensions.setupDialogStuff
77
import com.simplemobiletools.commons.extensions.toast
88
import com.simplemobiletools.commons.extensions.value
99
import com.simplemobiletools.notes.R
10-
import com.simplemobiletools.notes.databases.DBHelper
10+
import com.simplemobiletools.notes.helpers.DBHelper
1111
import com.simplemobiletools.notes.models.Note
1212
import kotlinx.android.synthetic.main.new_note.view.*
1313

‎app/src/main/kotlin/com/simplemobiletools/notes/fragments/NoteFragment.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import android.view.ViewGroup
1010
import android.view.inputmethod.InputMethodManager
1111
import com.simplemobiletools.commons.extensions.value
1212
import com.simplemobiletools.notes.R
13-
import com.simplemobiletools.notes.databases.DBHelper
13+
import com.simplemobiletools.notes.helpers.DBHelper
1414
import com.simplemobiletools.notes.extensions.getTextGravity
1515
import com.simplemobiletools.notes.extensions.getTextSize
1616
import com.simplemobiletools.notes.extensions.updateWidget

app/src/main/kotlin/com/simplemobiletools/notes/databases/DBHelper.kt renamed to app/src/main/kotlin/com/simplemobiletools/notes/helpers/DBHelper.kt

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.simplemobiletools.notes.databases
1+
package com.simplemobiletools.notes.helpers
22

33
import android.content.ContentValues
44
import android.content.Context
@@ -8,11 +8,10 @@ import android.database.sqlite.SQLiteOpenHelper
88
import com.simplemobiletools.commons.extensions.getIntValue
99
import com.simplemobiletools.commons.extensions.getStringValue
1010
import com.simplemobiletools.notes.R
11-
import com.simplemobiletools.notes.helpers.TYPE_NOTE
1211
import com.simplemobiletools.notes.models.Note
1312
import java.util.*
1413

15-
class DBHelper private constructor(private val mContext: Context) : SQLiteOpenHelper(mContext, DBHelper.DB_NAME, null, DBHelper.DB_VERSION) {
14+
class DBHelper private constructor(private val mContext: Context) : SQLiteOpenHelper(mContext, DB_NAME, null, DB_VERSION) {
1615
private val mDb: SQLiteDatabase = writableDatabase
1716

1817
companion object {
@@ -30,16 +29,16 @@ class DBHelper private constructor(private val mContext: Context) : SQLiteOpenHe
3029
}
3130

3231
override fun onCreate(db: SQLiteDatabase) {
33-
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)")
32+
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)")
3433
insertFirstNote(db)
3534
}
3635

3736
override fun onUpgrade(db: SQLiteDatabase, oldVersion: Int, newVersion: Int) {
3837
if (oldVersion < 2)
39-
db.execSQL("ALTER TABLE $TABLE_NAME ADD COLUMN $COL_TYPE INTEGER DEFAULT 0")
38+
db.execSQL("ALTER TABLE ${TABLE_NAME} ADD COLUMN ${COL_TYPE} INTEGER DEFAULT 0")
4039

4140
if (oldVersion < 3)
42-
db.execSQL("ALTER TABLE $TABLE_NAME ADD COLUMN $COL_PATH TEXT")
41+
db.execSQL("ALTER TABLE ${TABLE_NAME} ADD COLUMN ${COL_PATH} TEXT")
4342
}
4443

4544
private fun insertFirstNote(db: SQLiteDatabase) {
@@ -67,12 +66,12 @@ class DBHelper private constructor(private val mContext: Context) : SQLiteOpenHe
6766
}
6867

6968
fun deleteNote(id: Int) {
70-
mDb.delete(TABLE_NAME, "$COL_ID = $id", null)
69+
mDb.delete(TABLE_NAME, "${COL_ID} = $id", null)
7170
}
7271

7372
fun doesTitleExist(title: String): Boolean {
7473
val cols = arrayOf(COL_ID)
75-
val selection = "$COL_TITLE = ?"
74+
val selection = "${COL_TITLE} = ?"
7675
val selectionArgs = arrayOf(title)
7776
var cursor: Cursor? = null
7877
try {
@@ -88,7 +87,7 @@ class DBHelper private constructor(private val mContext: Context) : SQLiteOpenHe
8887
val cols = arrayOf(COL_ID, COL_TITLE, COL_VALUE, COL_TYPE)
8988
var cursor: Cursor? = null
9089
try {
91-
cursor = mDb.query(TABLE_NAME, cols, null, null, null, null, "$COL_TITLE COLLATE NOCASE ASC")
90+
cursor = mDb.query(TABLE_NAME, cols, null, null, null, null, "${COL_TITLE} COLLATE NOCASE ASC")
9291
if (cursor?.moveToFirst() == true) {
9392
do {
9493
val id = cursor.getIntValue(COL_ID)
@@ -108,7 +107,7 @@ class DBHelper private constructor(private val mContext: Context) : SQLiteOpenHe
108107

109108
fun getNote(id: Int): Note? {
110109
val cols = arrayOf(COL_TITLE, COL_VALUE, COL_TYPE)
111-
val selection = "$COL_ID = ?"
110+
val selection = "${COL_ID} = ?"
112111
val selectionArgs = arrayOf(id.toString())
113112
var note: Note? = null
114113
var cursor: Cursor? = null
@@ -128,7 +127,7 @@ class DBHelper private constructor(private val mContext: Context) : SQLiteOpenHe
128127

129128
fun updateNote(note: Note) {
130129
val values = fillContentValues(note)
131-
val selection = "$COL_ID = ?"
130+
val selection = "${COL_ID} = ?"
132131
val selectionArgs = arrayOf(note.id.toString())
133132
mDb.update(TABLE_NAME, values, selection, selectionArgs)
134133
}

‎app/src/main/kotlin/com/simplemobiletools/notes/helpers/MyWidgetProvider.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import android.widget.RemoteViews
1212
import com.simplemobiletools.notes.R
1313
import com.simplemobiletools.notes.R.layout.widget
1414
import com.simplemobiletools.notes.activities.MainActivity
15-
import com.simplemobiletools.notes.databases.DBHelper
15+
import com.simplemobiletools.notes.helpers.DBHelper
1616
import com.simplemobiletools.notes.extensions.getTextSize
1717

1818
class MyWidgetProvider : AppWidgetProvider() {

0 commit comments

Comments
 (0)