fenix/Simple-Notes
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Notes.git synced 2025-04-15 15:57:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

move DBHelper in helpers folder

Browse Source
This commit is contained in:
tibbi 2017-01-06 20:09:30 +01:00
parent e17d139238
commit f31d649f28
8 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/kotlin/com/simplemobiletools/notes/activities/MainActivity.kt
View File

@ -18,7 +18,7 @@ import com.simplemobiletools.commons.helpers.LICENSE_STETHO
import com.simplemobiletools.notes.BuildConfig import com.simplemobiletools.notes.BuildConfig
import com.simplemobiletools.notes.R import com.simplemobiletools.notes.R
import com.simplemobiletools.notes.adapters.NotesPagerAdapter 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.NewNoteDialog
import com.simplemobiletools.notes.dialogs.OpenNoteDialog import com.simplemobiletools.notes.dialogs.OpenNoteDialog
import com.simplemobiletools.notes.dialogs.RenameNoteDialog import com.simplemobiletools.notes.dialogs.RenameNoteDialog

2
app/src/main/kotlin/com/simplemobiletools/notes/activities/SettingsActivity.kt
View File

@ -5,7 +5,7 @@ import android.view.View
import android.widget.AdapterView import android.widget.AdapterView
import android.widget.ArrayAdapter import android.widget.ArrayAdapter
import com.simplemobiletools.notes.R 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.extensions.updateWidget
import com.simplemobiletools.notes.models.Note import com.simplemobiletools.notes.models.Note
import kotlinx.android.synthetic.main.activity_settings.* import kotlinx.android.synthetic.main.activity_settings.*

2
app/src/main/kotlin/com/simplemobiletools/notes/dialogs/NewNoteDialog.kt
View File

@ -6,7 +6,7 @@ import com.simplemobiletools.commons.extensions.setupDialogStuff
import com.simplemobiletools.commons.extensions.toast import com.simplemobiletools.commons.extensions.toast
import com.simplemobiletools.commons.extensions.value import com.simplemobiletools.commons.extensions.value
import com.simplemobiletools.notes.R 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.* import kotlinx.android.synthetic.main.new_note.view.*
class NewNoteDialog(val activity: Activity, val db: DBHelper, callback: (title: String) -> Unit) { class NewNoteDialog(val activity: Activity, val db: DBHelper, callback: (title: String) -> Unit) {

2
app/src/main/kotlin/com/simplemobiletools/notes/dialogs/OpenNoteDialog.kt
View File

@ -7,7 +7,7 @@ import android.widget.RadioButton
import android.widget.RadioGroup import android.widget.RadioGroup
import com.simplemobiletools.commons.extensions.setupDialogStuff import com.simplemobiletools.commons.extensions.setupDialogStuff
import com.simplemobiletools.notes.R import com.simplemobiletools.notes.R
import com.simplemobiletools.notes.databases.DBHelper import com.simplemobiletools.notes.helpers.DBHelper
import com.simplemobiletools.notes.helpers.Config import com.simplemobiletools.notes.helpers.Config
import kotlinx.android.synthetic.main.dialog_radio_group.view.* import kotlinx.android.synthetic.main.dialog_radio_group.view.*

2
app/src/main/kotlin/com/simplemobiletools/notes/dialogs/RenameNoteDialog.kt
View File

@ -7,7 +7,7 @@ import com.simplemobiletools.commons.extensions.setupDialogStuff
import com.simplemobiletools.commons.extensions.toast import com.simplemobiletools.commons.extensions.toast
import com.simplemobiletools.commons.extensions.value import com.simplemobiletools.commons.extensions.value
import com.simplemobiletools.notes.R import com.simplemobiletools.notes.R
import com.simplemobiletools.notes.databases.DBHelper import com.simplemobiletools.notes.helpers.DBHelper
import com.simplemobiletools.notes.models.Note import com.simplemobiletools.notes.models.Note
import kotlinx.android.synthetic.main.new_note.view.* import kotlinx.android.synthetic.main.new_note.view.*

2
app/src/main/kotlin/com/simplemobiletools/notes/fragments/NoteFragment.kt
View File

@ -10,7 +10,7 @@ import android.view.ViewGroup
import android.view.inputmethod.InputMethodManager import android.view.inputmethod.InputMethodManager
import com.simplemobiletools.commons.extensions.value import com.simplemobiletools.commons.extensions.value
import com.simplemobiletools.notes.R 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.getTextGravity
import com.simplemobiletools.notes.extensions.getTextSize import com.simplemobiletools.notes.extensions.getTextSize
import com.simplemobiletools.notes.extensions.updateWidget import com.simplemobiletools.notes.extensions.updateWidget

21
app/src/main/kotlin/com/simplemobiletools/notes/databases/DBHelper.kt → app/src/main/kotlin/com/simplemobiletools/notes/helpers/DBHelper.kt
View File

@ -1,4 +1,4 @@
package com.simplemobiletools.notes.databases package com.simplemobiletools.notes.helpers
import android.content.ContentValues import android.content.ContentValues
import android.content.Context import android.content.Context
@ -8,11 +8,10 @@ import android.database.sqlite.SQLiteOpenHelper
import com.simplemobiletools.commons.extensions.getIntValue import com.simplemobiletools.commons.extensions.getIntValue
import com.simplemobiletools.commons.extensions.getStringValue import com.simplemobiletools.commons.extensions.getStringValue
import com.simplemobiletools.notes.R import com.simplemobiletools.notes.R
import com.simplemobiletools.notes.helpers.TYPE_NOTE
import com.simplemobiletools.notes.models.Note import com.simplemobiletools.notes.models.Note
import java.util.* 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 private val mDb: SQLiteDatabase = writableDatabase
companion object { companion object {
@ -30,16 +29,16 @@ class DBHelper private constructor(private val mContext: Context) : SQLiteOpenHe
} }
override fun onCreate(db: SQLiteDatabase) { 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) insertFirstNote(db)
} }
override fun onUpgrade(db: SQLiteDatabase, oldVersion: Int, newVersion: Int) { override fun onUpgrade(db: SQLiteDatabase, oldVersion: Int, newVersion: Int) {
if (oldVersion < 2) 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) 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) { private fun insertFirstNote(db: SQLiteDatabase) {
@ -67,12 +66,12 @@ class DBHelper private constructor(private val mContext: Context) : SQLiteOpenHe
} }
fun deleteNote(id: Int) { 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 { fun doesTitleExist(title: String): Boolean {
val cols = arrayOf(COL_ID) val cols = arrayOf(COL_ID)
val selection = "$COL_TITLE = ?" val selection = "${COL_TITLE} = ?"
val selectionArgs = arrayOf(title) val selectionArgs = arrayOf(title)
var cursor: Cursor? = null var cursor: Cursor? = null
try { 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) val cols = arrayOf(COL_ID, COL_TITLE, COL_VALUE, COL_TYPE)
var cursor: Cursor? = null var cursor: Cursor? = null
try { 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) { if (cursor?.moveToFirst() == true) {
do { do {
val id = cursor.getIntValue(COL_ID) val id = cursor.getIntValue(COL_ID)
@ -108,7 +107,7 @@ class DBHelper private constructor(private val mContext: Context) : SQLiteOpenHe
fun getNote(id: Int): Note? { fun getNote(id: Int): Note? {
val cols = arrayOf(COL_TITLE, COL_VALUE, COL_TYPE) val cols = arrayOf(COL_TITLE, COL_VALUE, COL_TYPE)
val selection = "$COL_ID = ?" val selection = "${COL_ID} = ?"
val selectionArgs = arrayOf(id.toString()) val selectionArgs = arrayOf(id.toString())
var note: Note? = null var note: Note? = null
var cursor: Cursor? = null var cursor: Cursor? = null
@ -128,7 +127,7 @@ class DBHelper private constructor(private val mContext: Context) : SQLiteOpenHe
fun updateNote(note: Note) { fun updateNote(note: Note) {
val values = fillContentValues(note) val values = fillContentValues(note)
val selection = "$COL_ID = ?" val selection = "${COL_ID} = ?"
val selectionArgs = arrayOf(note.id.toString()) val selectionArgs = arrayOf(note.id.toString())
mDb.update(TABLE_NAME, values, selection, selectionArgs) mDb.update(TABLE_NAME, values, selection, selectionArgs)
} }

2
app/src/main/kotlin/com/simplemobiletools/notes/helpers/MyWidgetProvider.kt
View File

@ -12,7 +12,7 @@ import android.widget.RemoteViews
import com.simplemobiletools.notes.R import com.simplemobiletools.notes.R
import com.simplemobiletools.notes.R.layout.widget import com.simplemobiletools.notes.R.layout.widget
import com.simplemobiletools.notes.activities.MainActivity import com.simplemobiletools.notes.activities.MainActivity
import com.simplemobiletools.notes.databases.DBHelper import com.simplemobiletools.notes.helpers.DBHelper
import com.simplemobiletools.notes.extensions.getTextSize import com.simplemobiletools.notes.extensions.getTextSize
class MyWidgetProvider : AppWidgetProvider() { class MyWidgetProvider : AppWidgetProvider() {