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 38946510..769375f7 100644 --- a/app/src/main/kotlin/com/simplemobiletools/flashlight/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/flashlight/activities/MainActivity.kt @@ -88,6 +88,10 @@ class MainActivity : SimpleActivity() { sos_btn.setTextColor(contrastColor) } + if (brightness_value.currentTextColor != getProperPrimaryColor()) { + brightness_value.setTextColor(contrastColor) + } + stroboscope_btn.beVisibleIf(config.stroboscope) if (!config.stroboscope) { @@ -196,6 +200,9 @@ class MainActivity : SimpleActivity() { override fun onTorchEnabled(isEnabled: Boolean) { if (mCameraImpl!!.supportsBrightnessControl()) { brightness_bar.beVisibleIf(isEnabled) + + brightness_value.beVisibleIf(isEnabled) + brightness_value.text = "${mCameraImpl?.getPercentageBrightnessLevel()}%" } } @@ -242,6 +249,7 @@ class MainActivity : SimpleActivity() { val newLevel = level.coerceAtLeast(MIN_BRIGHTNESS_LEVEL) mCameraImpl?.updateBrightnessLevel(newLevel) config.brightnessLevel = newLevel + brightness_value.text = "${mCameraImpl?.getPercentageBrightnessLevel()}%" } } 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 f544cdb2..1a7da260 100644 --- a/app/src/main/kotlin/com/simplemobiletools/flashlight/helpers/MyCameraImpl.kt +++ b/app/src/main/kotlin/com/simplemobiletools/flashlight/helpers/MyCameraImpl.kt @@ -277,6 +277,10 @@ class MyCameraImpl private constructor(val context: Context, private var cameraT cameraFlash!!.changeTorchBrightness(level) } + fun getPercentageBrightnessLevel(): Int { + return (getCurrentBrightnessLevel() * 100) / getMaximumBrightnessLevel() + } + fun onCameraNotAvailable() { disableFlashlight() } diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 1547162d..084955bd 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -111,6 +111,18 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/stroboscope_btn" /> + +