From 0932fb3816cb5bfca9187544ca84fdd0ffc4b07c Mon Sep 17 00:00:00 2001 From: tibbi Date: Fri, 6 Jan 2017 20:00:10 +0100 Subject: [PATCH] remove the cursor extensions --- .../com/simplemobiletools/notes/databases/DBHelper.kt | 4 ++-- .../com/simplemobiletools/notes/extensions/Cursor.kt | 7 ------- .../com/simplemobiletools/notes/fragments/NoteFragment.kt | 2 +- .../kotlin/com/simplemobiletools/notes/helpers/Config.kt | 1 - .../com/simplemobiletools/notes/helpers/Constants.kt | 1 - 5 files changed, 3 insertions(+), 12 deletions(-) delete mode 100644 app/src/main/kotlin/com/simplemobiletools/notes/extensions/Cursor.kt diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/databases/DBHelper.kt b/app/src/main/kotlin/com/simplemobiletools/notes/databases/DBHelper.kt index 76147dc3..4c8dfe97 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/databases/DBHelper.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/databases/DBHelper.kt @@ -5,9 +5,9 @@ import android.content.Context import android.database.Cursor import android.database.sqlite.SQLiteDatabase 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.extensions.getIntValue -import com.simplemobiletools.notes.extensions.getStringValue import com.simplemobiletools.notes.helpers.TYPE_NOTE import com.simplemobiletools.notes.models.Note import java.util.* diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/extensions/Cursor.kt b/app/src/main/kotlin/com/simplemobiletools/notes/extensions/Cursor.kt deleted file mode 100644 index a9581cb2..00000000 --- a/app/src/main/kotlin/com/simplemobiletools/notes/extensions/Cursor.kt +++ /dev/null @@ -1,7 +0,0 @@ -package com.simplemobiletools.notes.extensions - -import android.database.Cursor - -fun Cursor.getStringValue(key: String) = getString(getColumnIndex(key)) - -fun Cursor.getIntValue(key: String) = getInt(getColumnIndex(key)) 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 0a03cc05..1c6ec769 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/fragments/NoteFragment.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/fragments/NoteFragment.kt @@ -9,12 +9,12 @@ import android.view.View import android.view.ViewGroup import android.view.inputmethod.InputMethodManager import com.simplemobiletools.commons.extensions.value -import com.simplemobiletools.notes.helpers.NOTE_ID import com.simplemobiletools.notes.R import com.simplemobiletools.notes.databases.DBHelper import com.simplemobiletools.notes.extensions.getTextGravity import com.simplemobiletools.notes.extensions.getTextSize import com.simplemobiletools.notes.extensions.updateWidget +import com.simplemobiletools.notes.helpers.NOTE_ID import com.simplemobiletools.notes.models.Note import kotlinx.android.synthetic.main.fragment_note.view.* diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/helpers/Config.kt b/app/src/main/kotlin/com/simplemobiletools/notes/helpers/Config.kt index 8cb19025..dad0a627 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/helpers/Config.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/helpers/Config.kt @@ -2,7 +2,6 @@ package com.simplemobiletools.notes.helpers import android.content.Context import com.simplemobiletools.commons.helpers.BaseConfig -import com.simplemobiletools.notes.* class Config(context: Context) : BaseConfig(context) { companion object { diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/helpers/Constants.kt b/app/src/main/kotlin/com/simplemobiletools/notes/helpers/Constants.kt index 78a0e7e4..08cbb194 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/helpers/Constants.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/helpers/Constants.kt @@ -1,6 +1,5 @@ package com.simplemobiletools.notes.helpers -val TEXT = "text" val NOTE_ID = "note_id" // shared preferences