From a2410274ebfa86c3d6cabc33d522efe523b7745d Mon Sep 17 00:00:00 2001 From: tibbi Date: Sat, 24 Aug 2019 16:43:45 +0200 Subject: [PATCH] disable sos or strobo if the other one is enabled --- .../flashlight/activities/MainActivity.kt | 2 ++ .../flashlight/helpers/MyCameraImpl.kt | 10 ++++++++++ 2 files changed, 12 insertions(+) diff --git a/app/src/main/kotlin/com/simplemobiletools/flashlight/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/flashlight/activities/MainActivity.kt index 5326eee..57ef217 100644 --- a/app/src/main/kotlin/com/simplemobiletools/flashlight/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/flashlight/activities/MainActivity.kt @@ -248,6 +248,8 @@ class MainActivity : SimpleActivity() { window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON) mIsFlashlightOn = true + sos_btn.setTextColor(getContrastColor()) + changeIconColor(getContrastColor(), stroboscope_btn) stroboscope_bar.beInvisible() } diff --git a/app/src/main/kotlin/com/simplemobiletools/flashlight/helpers/MyCameraImpl.kt b/app/src/main/kotlin/com/simplemobiletools/flashlight/helpers/MyCameraImpl.kt index ef5f860..124e2e4 100644 --- a/app/src/main/kotlin/com/simplemobiletools/flashlight/helpers/MyCameraImpl.kt +++ b/app/src/main/kotlin/com/simplemobiletools/flashlight/helpers/MyCameraImpl.kt @@ -57,6 +57,11 @@ class MyCameraImpl(val context: Context) { } fun toggleStroboscope(): Boolean { + if (isSOSRunning) { + stopSOS() + return false + } + isStroboSOS = false if (!isStroboscopeRunning) { disableFlashlight() @@ -81,6 +86,11 @@ class MyCameraImpl(val context: Context) { } fun toggleSOS(): Boolean { + if (isStroboscopeRunning) { + stopStroboscope() + return false + } + isStroboSOS = true if (isStroboscopeRunning) { stopStroboscope()