From 380fee7e1165ddf352fa7a2a43f77a74e2ac9070 Mon Sep 17 00:00:00 2001 From: tibbi Date: Thu, 25 Jan 2018 23:11:19 +0100 Subject: [PATCH] declade some values as const --- .../notes/adapters/NotesPagerAdapter.kt | 2 +- .../notes/adapters/WidgetAdapter.kt | 2 +- .../notes/helpers/Constants.kt | 48 +++++++++---------- .../notes/helpers/DBHelper.kt | 16 +++---- 4 files changed, 34 insertions(+), 34 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/adapters/NotesPagerAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/notes/adapters/NotesPagerAdapter.kt index ebe8ec90..46af84da 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/adapters/NotesPagerAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/adapters/NotesPagerAdapter.kt @@ -25,7 +25,7 @@ class NotesPagerAdapter(fm: FragmentManager, val notes: List, val activity val fragment = NoteFragment() fragment.arguments = bundle - fragments.put(position, fragment) + fragments[position] = fragment return fragment } diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/adapters/WidgetAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/notes/adapters/WidgetAdapter.kt index 41cd1247..245ce4f3 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/adapters/WidgetAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/adapters/WidgetAdapter.kt @@ -20,7 +20,7 @@ import com.simplemobiletools.notes.helpers.OPEN_NOTE_ID class WidgetAdapter(val context: Context) : RemoteViewsService.RemoteViewsFactory { private val textIds = arrayOf(R.id.widget_text_left, R.id.widget_text_center, R.id.widget_text_right) val config = context.config - val widgetTextColor = config.widgetTextColor + private val widgetTextColor = config.widgetTextColor override fun getViewAt(position: Int): RemoteViews { val views = RemoteViews(context.packageName, R.layout.widget_text_layout).apply { 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 96b98cc6..a536f855 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/helpers/Constants.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/helpers/Constants.kt @@ -1,36 +1,36 @@ package com.simplemobiletools.notes.helpers -val NOTE_ID = "note_id" -val OPEN_NOTE_ID = "open_note_id" +const val NOTE_ID = "note_id" +const val OPEN_NOTE_ID = "open_note_id" // shared preferences -val CURRENT_NOTE_ID = "current_note_id" -val DISPLAY_SUCCESS = "display_success" -val CLICKABLE_LINKS = "clickable_links" -val WIDGET_NOTE_ID = "widget_note_id" -val MONOSPACED_FONT = "monospaced_font" -val SHOW_KEYBOARD = "show_keyboard" -val SHOW_WORD_COUNT = "show_word_count" -val FONT_SIZE = "font_size" -val GRAVITY = "gravity" -val CURSOR_PLACEMENT = "cursor_placement" -val LAST_USED_EXTENSION = "last_used_extension" -val LAST_USED_SAVE_PATH = "last_used_save_path" +const val CURRENT_NOTE_ID = "current_note_id" +const val DISPLAY_SUCCESS = "display_success" +const val CLICKABLE_LINKS = "clickable_links" +const val WIDGET_NOTE_ID = "widget_note_id" +const val MONOSPACED_FONT = "monospaced_font" +const val SHOW_KEYBOARD = "show_keyboard" +const val SHOW_WORD_COUNT = "show_word_count" +const val FONT_SIZE = "font_size" +const val GRAVITY = "gravity" +const val CURSOR_PLACEMENT = "cursor_placement" +const val LAST_USED_EXTENSION = "last_used_extension" +const val LAST_USED_SAVE_PATH = "last_used_save_path" // gravity -val GRAVITY_LEFT = 0 -val GRAVITY_CENTER = 1 -val GRAVITY_RIGHT = 2 +const val GRAVITY_LEFT = 0 +const val GRAVITY_CENTER = 1 +const val GRAVITY_RIGHT = 2 // font sizes -val FONT_SIZE_SMALL = 0 -val FONT_SIZE_MEDIUM = 1 -val FONT_SIZE_LARGE = 2 -val FONT_SIZE_EXTRA_LARGE = 3 +const val FONT_SIZE_SMALL = 0 +const val FONT_SIZE_MEDIUM = 1 +const val FONT_SIZE_LARGE = 2 +const val FONT_SIZE_EXTRA_LARGE = 3 // note types -val TYPE_NOTE = 0 -val TYPE_CHECKLIST = 1 +const val TYPE_NOTE = 0 +const val TYPE_CHECKLIST = 1 // mime types -val MIME_TEXT_PLAIN = "text/plain" +const val MIME_TEXT_PLAIN = "text/plain" diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/helpers/DBHelper.kt b/app/src/main/kotlin/com/simplemobiletools/notes/helpers/DBHelper.kt index 889c93f2..d7a6d655 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/helpers/DBHelper.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/helpers/DBHelper.kt @@ -16,15 +16,15 @@ class DBHelper private constructor(private val mContext: Context) : SQLiteOpenHe private val mDb: SQLiteDatabase = writableDatabase companion object { - private val DB_NAME = "notes.db" - private val DB_VERSION = 3 - private val TABLE_NAME = "notes" + private const val DB_NAME = "notes.db" + private const val DB_VERSION = 3 + private const val TABLE_NAME = "notes" - private val COL_ID = "id" - private val COL_TITLE = "title" - private val COL_VALUE = "value" - private val COL_TYPE = "type" - private val COL_PATH = "path" + private const val COL_ID = "id" + private const val COL_TITLE = "title" + private const val COL_VALUE = "value" + private const val COL_TYPE = "type" + private const val COL_PATH = "path" fun newInstance(context: Context) = DBHelper(context) }