From f4b0a0e69196a8cefc0cb06eeeb443bda35ae438 Mon Sep 17 00:00:00 2001 From: tibbi Date: Fri, 6 Jan 2017 19:44:49 +0100 Subject: [PATCH] moving a couple files in Helpers folder --- app/src/main/AndroidManifest.xml | 2 +- .../com/simplemobiletools/notes/activities/MainActivity.kt | 2 +- .../simplemobiletools/notes/activities/SimpleActivity.kt | 2 +- .../notes/activities/WidgetConfigureActivity.kt | 4 ++++ .../simplemobiletools/notes/adapters/NotesPagerAdapter.kt | 2 +- .../com/simplemobiletools/notes/databases/DBHelper.kt | 6 +++--- .../com/simplemobiletools/notes/dialogs/OpenNoteDialog.kt | 2 +- .../com/simplemobiletools/notes/extensions/Context.kt | 1 + .../com/simplemobiletools/notes/fragments/NoteFragment.kt | 2 +- .../com/simplemobiletools/notes/{ => helpers}/Config.kt | 3 ++- .../com/simplemobiletools/notes/{ => helpers}/Constants.kt | 2 +- .../notes/{ => helpers}/MyWidgetProvider.kt | 3 ++- 12 files changed, 19 insertions(+), 12 deletions(-) rename app/src/main/kotlin/com/simplemobiletools/notes/{ => helpers}/Config.kt (90%) rename app/src/main/kotlin/com/simplemobiletools/notes/{ => helpers}/Constants.kt (93%) rename app/src/main/kotlin/com/simplemobiletools/notes/{ => helpers}/MyWidgetProvider.kt (97%) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 31204f07..0edea10c 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -49,7 +49,7 @@ android:parentActivityName=".activities.MainActivity"/> 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 28d2a641..54879e5a 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/activities/MainActivity.kt @@ -16,7 +16,7 @@ import com.simplemobiletools.commons.helpers.LICENSE_KOTLIN import com.simplemobiletools.commons.helpers.LICENSE_STETHO import com.simplemobiletools.notes.BuildConfig import com.simplemobiletools.notes.R -import com.simplemobiletools.notes.TYPE_NOTE +import com.simplemobiletools.notes.helpers.TYPE_NOTE import com.simplemobiletools.notes.adapters.NotesPagerAdapter import com.simplemobiletools.notes.databases.DBHelper import com.simplemobiletools.notes.dialogs.NewNoteDialog diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/activities/SimpleActivity.kt b/app/src/main/kotlin/com/simplemobiletools/notes/activities/SimpleActivity.kt index 9cb5e18c..641bc254 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/activities/SimpleActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/activities/SimpleActivity.kt @@ -2,7 +2,7 @@ package com.simplemobiletools.notes.activities import android.os.Bundle import com.simplemobiletools.commons.activities.BaseSimpleActivity -import com.simplemobiletools.notes.Config +import com.simplemobiletools.notes.helpers.Config open class SimpleActivity : BaseSimpleActivity() { lateinit var config: Config diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/activities/WidgetConfigureActivity.kt b/app/src/main/kotlin/com/simplemobiletools/notes/activities/WidgetConfigureActivity.kt index aa5f257c..8610d555 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/activities/WidgetConfigureActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/activities/WidgetConfigureActivity.kt @@ -12,6 +12,10 @@ import android.widget.RemoteViews import android.widget.SeekBar import com.simplemobiletools.notes.* import com.simplemobiletools.notes.extensions.getTextSize +import com.simplemobiletools.notes.helpers.MyWidgetProvider +import com.simplemobiletools.notes.helpers.PREFS_KEY +import com.simplemobiletools.notes.helpers.WIDGET_BG_COLOR +import com.simplemobiletools.notes.helpers.WIDGET_TEXT_COLOR import kotlinx.android.synthetic.main.widget_config.* import yuku.ambilwarna.AmbilWarnaDialog 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 68b29c30..421c58a8 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/adapters/NotesPagerAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/adapters/NotesPagerAdapter.kt @@ -5,7 +5,7 @@ import android.support.v4.app.Fragment import android.support.v4.app.FragmentManager import android.support.v4.app.FragmentStatePagerAdapter import android.util.SparseArray -import com.simplemobiletools.notes.NOTE_ID +import com.simplemobiletools.notes.helpers.NOTE_ID import com.simplemobiletools.notes.fragments.NoteFragment import com.simplemobiletools.notes.models.Note 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 048b1fc0..dff00ade 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/databases/DBHelper.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/databases/DBHelper.kt @@ -5,10 +5,10 @@ import android.content.Context import android.database.Cursor import android.database.sqlite.SQLiteDatabase import android.database.sqlite.SQLiteOpenHelper -import com.simplemobiletools.notes.PREFS_KEY +import com.simplemobiletools.notes.helpers.PREFS_KEY import com.simplemobiletools.notes.R -import com.simplemobiletools.notes.TEXT -import com.simplemobiletools.notes.TYPE_NOTE +import com.simplemobiletools.notes.helpers.TEXT +import com.simplemobiletools.notes.helpers.TYPE_NOTE import com.simplemobiletools.notes.extensions.getIntValue import com.simplemobiletools.notes.extensions.getStringValue import com.simplemobiletools.notes.models.Note 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 ebbb1fb7..024fe329 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/dialogs/OpenNoteDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/dialogs/OpenNoteDialog.kt @@ -5,7 +5,7 @@ import android.app.AlertDialog import android.view.ViewGroup import android.widget.RadioButton import android.widget.RadioGroup -import com.simplemobiletools.notes.Config +import com.simplemobiletools.notes.helpers.Config import com.simplemobiletools.notes.R import com.simplemobiletools.notes.databases.DBHelper import kotlinx.android.synthetic.main.dialog_radio_group.view.* diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/extensions/Context.kt b/app/src/main/kotlin/com/simplemobiletools/notes/extensions/Context.kt index aa3e0668..b6cc3451 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/extensions/Context.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/extensions/Context.kt @@ -6,6 +6,7 @@ import android.content.Context import android.content.Intent import android.view.Gravity import com.simplemobiletools.notes.* +import com.simplemobiletools.notes.helpers.* fun Context.getTextSize() = when (Config.newInstance(this).fontSize) { 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 dbc7617f..0a03cc05 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/fragments/NoteFragment.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/fragments/NoteFragment.kt @@ -9,7 +9,7 @@ import android.view.View import android.view.ViewGroup import android.view.inputmethod.InputMethodManager import com.simplemobiletools.commons.extensions.value -import com.simplemobiletools.notes.NOTE_ID +import com.simplemobiletools.notes.helpers.NOTE_ID import com.simplemobiletools.notes.R import com.simplemobiletools.notes.databases.DBHelper import com.simplemobiletools.notes.extensions.getTextGravity diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/Config.kt b/app/src/main/kotlin/com/simplemobiletools/notes/helpers/Config.kt similarity index 90% rename from app/src/main/kotlin/com/simplemobiletools/notes/Config.kt rename to app/src/main/kotlin/com/simplemobiletools/notes/helpers/Config.kt index 3d7091ac..8cb19025 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/Config.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/helpers/Config.kt @@ -1,7 +1,8 @@ -package com.simplemobiletools.notes +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/Constants.kt b/app/src/main/kotlin/com/simplemobiletools/notes/helpers/Constants.kt similarity index 93% rename from app/src/main/kotlin/com/simplemobiletools/notes/Constants.kt rename to app/src/main/kotlin/com/simplemobiletools/notes/helpers/Constants.kt index e8d97b86..1c687f57 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/Constants.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/helpers/Constants.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.notes +package com.simplemobiletools.notes.helpers val TEXT = "text" val NOTE_ID = "note_id" diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/MyWidgetProvider.kt b/app/src/main/kotlin/com/simplemobiletools/notes/helpers/MyWidgetProvider.kt similarity index 97% rename from app/src/main/kotlin/com/simplemobiletools/notes/MyWidgetProvider.kt rename to app/src/main/kotlin/com/simplemobiletools/notes/helpers/MyWidgetProvider.kt index e54f31b2..91a83dda 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/MyWidgetProvider.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/helpers/MyWidgetProvider.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.notes +package com.simplemobiletools.notes.helpers import android.app.PendingIntent import android.appwidget.AppWidgetManager @@ -9,6 +9,7 @@ import android.content.SharedPreferences import android.graphics.Color import android.view.View 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