From f0d2c8e4918d2ba8abc1acf3d8e04a6dcf2bc94e Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Sat, 8 Apr 2017 20:39:18 +0200
Subject: [PATCH] create a config extension for getting the Config

---
 .../draw/activities/MainActivity.kt            | 18 +++++++++---------
 .../draw/activities/SettingsActivity.kt        |  6 +++---
 .../draw/extensions/context.kt                 |  6 ++++++
 3 files changed, 18 insertions(+), 12 deletions(-)
 create mode 100644 app/src/main/kotlin/com/simplemobiletools/draw/extensions/context.kt

diff --git a/app/src/main/kotlin/com/simplemobiletools/draw/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/draw/activities/MainActivity.kt
index 4744b0e..374b86e 100644
--- a/app/src/main/kotlin/com/simplemobiletools/draw/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/draw/activities/MainActivity.kt
@@ -28,7 +28,7 @@ import com.simplemobiletools.draw.BuildConfig
 import com.simplemobiletools.draw.MyCanvas
 import com.simplemobiletools.draw.R
 import com.simplemobiletools.draw.Svg
-import com.simplemobiletools.draw.helpers.Config
+import com.simplemobiletools.draw.extensions.config
 import kotlinx.android.synthetic.main.activity_main.*
 import java.io.ByteArrayOutputStream
 import java.io.File
@@ -56,10 +56,10 @@ class MainActivity : SimpleActivity(), MyCanvas.PathsChangedListener {
         my_canvas.setListener(this)
         stroke_width_bar.setOnSeekBarChangeListener(onStrokeWidthBarChangeListener)
 
-        setBackgroundColor(Config.newInstance(this).canvasBackgroundColor)
-        setColor(Config.newInstance(this).brushColor)
+        setBackgroundColor(config.canvasBackgroundColor)
+        setColor(config.brushColor)
 
-        strokeWidth = Config.newInstance(this).brushSize
+        strokeWidth = config.brushSize
         my_canvas.setStrokeWidth(strokeWidth)
         stroke_width_bar.progress = strokeWidth.toInt()
 
@@ -69,20 +69,20 @@ class MainActivity : SimpleActivity(), MyCanvas.PathsChangedListener {
 
     override fun onResume() {
         super.onResume()
-        val isStrokeWidthBarEnabled = Config.newInstance(this).showBrushSize
+        val isStrokeWidthBarEnabled = config.showBrushSize
         stroke_width_bar.beVisibleIf(isStrokeWidthBarEnabled)
         my_canvas.setIsStrokeWidthBarEnabled(isStrokeWidthBarEnabled)
     }
 
     override fun onPause() {
         super.onPause()
-        Config.newInstance(this).brushColor = color
-        Config.newInstance(this).brushSize = strokeWidth
+        config.brushColor = color
+        config.brushSize = strokeWidth
     }
 
     override fun onDestroy() {
         super.onDestroy()
-        Config.newInstance(applicationContext).isFirstRun = false
+        config.isFirstRun = false
     }
 
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
@@ -112,7 +112,7 @@ class MainActivity : SimpleActivity(), MyCanvas.PathsChangedListener {
                 val oldColor = (my_canvas.background as ColorDrawable).color
                 ColorPickerDialog(this, oldColor) {
                     setBackgroundColor(it)
-                    Config.newInstance(applicationContext).canvasBackgroundColor = it
+                    config.canvasBackgroundColor = it
                 }
                 return true
             }
diff --git a/app/src/main/kotlin/com/simplemobiletools/draw/activities/SettingsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/draw/activities/SettingsActivity.kt
index 55d999b..9d107e9 100644
--- a/app/src/main/kotlin/com/simplemobiletools/draw/activities/SettingsActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/draw/activities/SettingsActivity.kt
@@ -2,8 +2,8 @@ package com.simplemobiletools.draw.activities
 
 import android.os.Bundle
 import com.simplemobiletools.commons.extensions.updateTextColors
-import com.simplemobiletools.draw.helpers.Config
 import com.simplemobiletools.draw.R
+import com.simplemobiletools.draw.extensions.config
 import kotlinx.android.synthetic.main.activity_settings.*
 
 class SettingsActivity : SimpleActivity() {
@@ -27,10 +27,10 @@ class SettingsActivity : SimpleActivity() {
     }
 
     private fun setupBrushSize() {
-        settings_show_brush_size.isChecked = Config.newInstance(this).showBrushSize
+        settings_show_brush_size.isChecked = config.showBrushSize
         settings_show_brush_size_holder.setOnClickListener {
             settings_show_brush_size.toggle()
-            Config.newInstance(this).showBrushSize = settings_show_brush_size.isChecked
+            config.showBrushSize = settings_show_brush_size.isChecked
         }
     }
 }
diff --git a/app/src/main/kotlin/com/simplemobiletools/draw/extensions/context.kt b/app/src/main/kotlin/com/simplemobiletools/draw/extensions/context.kt
new file mode 100644
index 0000000..9bbad9f
--- /dev/null
+++ b/app/src/main/kotlin/com/simplemobiletools/draw/extensions/context.kt
@@ -0,0 +1,6 @@
+package com.simplemobiletools.draw.extensions
+
+import android.content.Context
+import com.simplemobiletools.draw.helpers.Config
+
+val Context.config: Config get() = Config.newInstance(this)