From 8386dd4286e5b4de53cae12f1b594a0ad7f33f6b Mon Sep 17 00:00:00 2001 From: tibbi Date: Mon, 12 Feb 2018 16:07:03 +0100 Subject: [PATCH] adding a toggle for preventing the phone from falling asleep --- .../draw/activities/MainActivity.kt | 7 ++++++ .../draw/activities/SettingsActivity.kt | 9 ++++++++ .../simplemobiletools/draw/helpers/Config.kt | 4 ++++ .../draw/helpers/Constants.kt | 1 + app/src/main/res/layout/activity_settings.xml | 23 +++++++++++++++++++ 5 files changed, 44 insertions(+) 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 f2520b7..95b7be4 100644 --- a/app/src/main/kotlin/com/simplemobiletools/draw/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/draw/activities/MainActivity.kt @@ -9,6 +9,7 @@ import android.os.Bundle import android.provider.MediaStore import android.view.Menu import android.view.MenuItem +import android.view.WindowManager import android.webkit.MimeTypeMap import android.widget.SeekBar import com.simplemobiletools.commons.dialogs.ColorPickerDialog @@ -85,6 +86,9 @@ class MainActivity : SimpleActivity(), CanvasListener { stroke_width_bar.beVisibleIf(isStrokeWidthBarEnabled) my_canvas.setIsStrokeWidthBarEnabled(isStrokeWidthBarEnabled) updateTextColors(main_holder) + if (config.preventPhoneFromSleeping) { + window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON) + } } override fun onPause() { @@ -92,6 +96,9 @@ class MainActivity : SimpleActivity(), CanvasListener { config.brushColor = color config.brushSize = strokeWidth storeStateVariables() + if (config.preventPhoneFromSleeping) { + window.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON) + } } override fun onDestroy() { 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 db6e447..84ae64b 100644 --- a/app/src/main/kotlin/com/simplemobiletools/draw/activities/SettingsActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/draw/activities/SettingsActivity.kt @@ -21,6 +21,7 @@ class SettingsActivity : SimpleActivity() { setupCustomizeColors() setupUseEnglish() setupAvoidWhatsNew() + setupPreventPhoneFromSleeping() setupBrushSize() updateTextColors(settings_holder) } @@ -49,6 +50,14 @@ class SettingsActivity : SimpleActivity() { } } + private fun setupPreventPhoneFromSleeping() { + settings_prevent_phone_from_sleeping.isChecked = config.preventPhoneFromSleeping + settings_prevent_phone_from_sleeping_holder.setOnClickListener { + settings_prevent_phone_from_sleeping.toggle() + config.preventPhoneFromSleeping = settings_prevent_phone_from_sleeping.isChecked + } + } + private fun setupBrushSize() { settings_show_brush_size.isChecked = config.showBrushSize settings_show_brush_size_holder.setOnClickListener { diff --git a/app/src/main/kotlin/com/simplemobiletools/draw/helpers/Config.kt b/app/src/main/kotlin/com/simplemobiletools/draw/helpers/Config.kt index b8bdc78..4de5632 100644 --- a/app/src/main/kotlin/com/simplemobiletools/draw/helpers/Config.kt +++ b/app/src/main/kotlin/com/simplemobiletools/draw/helpers/Config.kt @@ -28,4 +28,8 @@ class Config(context: Context) : BaseConfig(context) { var lastSaveFolder: String get() = prefs.getString(LAST_SAVE_FOLDER, "") set(lastSaveFolder) = prefs.edit().putString(LAST_SAVE_FOLDER, lastSaveFolder).apply() + + var preventPhoneFromSleeping: Boolean + get() = prefs.getBoolean(PREVENT_PHONE_FROM_SLEEPING, true) + set(preventPhoneFromSleeping) = prefs.edit().putBoolean(PREVENT_PHONE_FROM_SLEEPING, preventPhoneFromSleeping).apply() } diff --git a/app/src/main/kotlin/com/simplemobiletools/draw/helpers/Constants.kt b/app/src/main/kotlin/com/simplemobiletools/draw/helpers/Constants.kt index 9e848ee..8ab86b6 100644 --- a/app/src/main/kotlin/com/simplemobiletools/draw/helpers/Constants.kt +++ b/app/src/main/kotlin/com/simplemobiletools/draw/helpers/Constants.kt @@ -5,6 +5,7 @@ const val CANVAS_BACKGROUND_COLOR = "canvas_background_color" const val SHOW_BRUSH_SIZE = "show_brush_size" const val BRUSH_SIZE = "brush_size" const val LAST_SAVE_FOLDER = "last_save_folder" +const val PREVENT_PHONE_FROM_SLEEPING = "prevent_phone_from_sleeping" const val PNG = "png" const val SVG = "svg" diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index 5dd88e7..c910589 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -79,6 +79,29 @@ + + + + + +