create a config context extension

Author: tibbi

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

@@ -23,6 +23,7 @@ import com.simplemobiletools.notes.adapters.NotesPagerAdapter
 import com.simplemobiletools.notes.dialogs.NewNoteDialog
 import com.simplemobiletools.notes.dialogs.OpenNoteDialog
 import com.simplemobiletools.notes.dialogs.RenameNoteDialog
+import com.simplemobiletools.notes.extensions.config
 import com.simplemobiletools.notes.extensions.getTextSize
 import com.simplemobiletools.notes.helpers.DBHelper
 import com.simplemobiletools.notes.helpers.TYPE_NOTE

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

@@ -6,6 +6,7 @@ import android.widget.AdapterView
 import android.widget.ArrayAdapter
 import com.simplemobiletools.commons.extensions.updateTextColors
 import com.simplemobiletools.notes.R
+import com.simplemobiletools.notes.extensions.config
 import com.simplemobiletools.notes.extensions.updateWidget
 import com.simplemobiletools.notes.helpers.DBHelper
 import com.simplemobiletools.notes.models.Note

app/src/main/kotlin/com/simplemobiletools/notes/activities/SimpleActivity.kt

@@ -2,13 +2,9 @@ package com.simplemobiletools.notes.activities
 
 import android.os.Bundle
 import com.simplemobiletools.commons.activities.BaseSimpleActivity
-import com.simplemobiletools.notes.helpers.Config
 
 open class SimpleActivity : BaseSimpleActivity() {
-    lateinit var config: Config
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        config = Config.newInstance(applicationContext)
     }
 }

app/src/main/kotlin/com/simplemobiletools/notes/activities/WidgetConfigureActivity.kt

@@ -11,8 +11,8 @@ import android.widget.RemoteViews
 import android.widget.SeekBar
 import com.simplemobiletools.commons.dialogs.ColorPickerDialog
 import com.simplemobiletools.notes.R
+import com.simplemobiletools.notes.extensions.config
 import com.simplemobiletools.notes.extensions.getTextSize
-import com.simplemobiletools.notes.helpers.Config
 import com.simplemobiletools.notes.helpers.MyWidgetProvider
 import kotlinx.android.synthetic.main.widget_config.*
 
@@ -47,7 +47,6 @@ class WidgetConfigureActivity : AppCompatActivity() {
     }
 
     private fun initVariables() {
-        val config = Config.newInstance(this)
         mBgColor = config.widgetBgColor
         if (mBgColor == 1) {
             mBgColor = Color.BLACK
@@ -83,7 +82,7 @@ class WidgetConfigureActivity : AppCompatActivity() {
     }
 
     private fun storeWidgetBackground() {
-        Config.newInstance(this).apply {
+        config.apply {
             widgetBgColor = mBgColor
             widgetTextColor = mTextColor
         }

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

@@ -7,16 +7,15 @@ import android.widget.RadioButton
 import android.widget.RadioGroup
 import com.simplemobiletools.commons.extensions.setupDialogStuff
 import com.simplemobiletools.notes.R
+import com.simplemobiletools.notes.extensions.config
 import com.simplemobiletools.notes.helpers.DBHelper
-import com.simplemobiletools.notes.helpers.Config
 import kotlinx.android.synthetic.main.dialog_radio_group.view.*
 
 class OpenNoteDialog(val activity: Activity, val callback: (checkedId: Int) -> Unit) : RadioGroup.OnCheckedChangeListener {
     val dialog: AlertDialog?
     var wasInit = false
 
     init {
-        val config = Config.newInstance(activity)
         val view = activity.layoutInflater.inflate(R.layout.dialog_radio_group, null)
         val radioGroup = view.dialog_radio_group
         radioGroup.setOnCheckedChangeListener(this)
@@ -26,7 +25,7 @@ class OpenNoteDialog(val activity: Activity, val callback: (checkedId: Int) -> U
             val radioButton = activity.layoutInflater.inflate(R.layout.radio_button, null) as RadioButton
             radioButton.apply {
                 text = it.title
-                isChecked = it.id == config.currentNoteId
+                isChecked = it.id == activity.config.currentNoteId
                 id = it.id
             }
             radioGroup.addView(radioButton, RadioGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT))

app/src/main/kotlin/com/simplemobiletools/notes/extensions/Context.kt

@@ -5,19 +5,19 @@ import android.content.ComponentName
 import android.content.Context
 import android.content.Intent
 import android.view.Gravity
-import com.simplemobiletools.notes.*
+import com.simplemobiletools.notes.R
 import com.simplemobiletools.notes.helpers.*
 
 fun Context.getTextSize() =
-        when (Config.newInstance(this).fontSize) {
+        when (config.fontSize) {
             FONT_SIZE_SMALL -> resources.getDimension(R.dimen.smaller_text_size)
             FONT_SIZE_LARGE -> resources.getDimension(R.dimen.big_text_size)
             FONT_SIZE_EXTRA_LARGE -> resources.getDimension(R.dimen.extra_big_text_size)
             else -> resources.getDimension(R.dimen.bigger_text_size)
         }
 
 fun Context.getTextGravity() =
-        when (Config.newInstance(this).gravity) {
+        when (config.gravity) {
             GRAVITY_CENTER -> Gravity.CENTER_HORIZONTAL
             GRAVITY_RIGHT -> Gravity.RIGHT
             else -> Gravity.LEFT
@@ -33,3 +33,5 @@ fun Context.updateWidget() {
         sendBroadcast(this)
     }
 }
+
+val Context.config: Config get() = Config.newInstance(this)

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

@@ -10,10 +10,10 @@ import android.view.ViewGroup
 import android.view.inputmethod.InputMethodManager
 import com.simplemobiletools.commons.extensions.value
 import com.simplemobiletools.notes.R
+import com.simplemobiletools.notes.extensions.config
 import com.simplemobiletools.notes.extensions.getTextGravity
 import com.simplemobiletools.notes.extensions.getTextSize
 import com.simplemobiletools.notes.extensions.updateWidget
-import com.simplemobiletools.notes.helpers.Config
 import com.simplemobiletools.notes.helpers.DBHelper
 import com.simplemobiletools.notes.helpers.NOTE_ID
 import com.simplemobiletools.notes.models.Note
@@ -52,7 +52,7 @@ class NoteFragment : Fragment() {
     override fun onResume() {
         super.onResume()
 
-        val config = Config.newInstance(context)
+        val config = context.config
         view.notes_view.apply {
             setText(note.value)
             setColors(config.textColor, config.primaryColor, config.backgroundColor)

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

@@ -10,6 +10,7 @@ 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.extensions.config
 import com.simplemobiletools.notes.extensions.getTextSize
 
 class MyWidgetProvider : AppWidgetProvider() {
@@ -22,7 +23,7 @@ class MyWidgetProvider : AppWidgetProvider() {
 
     override fun onUpdate(context: Context, appWidgetManager: AppWidgetManager, appWidgetIds: IntArray) {
         initVariables(context)
-        val config = Config.newInstance(context)
+        val config = context.config
         val widgetBgColor = config.widgetBgColor
         val widgetTextColor = config.widgetTextColor
 
@@ -44,7 +45,7 @@ class MyWidgetProvider : AppWidgetProvider() {
     }
 
     private fun getProperTextView(context: Context): Int {
-        return when (Config.newInstance(context).gravity) {
+        return when (context.config.gravity) {
             GRAVITY_CENTER -> R.id.notes_view_center
             GRAVITY_RIGHT -> R.id.notes_view_right
             else -> R.id.notes_view_left
@@ -64,7 +65,7 @@ class MyWidgetProvider : AppWidgetProvider() {
     }
 
     private fun updateWidget(widgetManager: AppWidgetManager, widgetId: Int, remoteViews: RemoteViews, context: Context) {
-        val note = mDb.getNote(Config.newInstance(context).widgetNoteId)
+        val note = mDb.getNote(context.config.widgetNoteId)
         for (id in textIds)
             remoteViews.setTextViewText(id, note?.value ?: "")
         widgetManager.updateAppWidget(widgetId, remoteViews)