feat(YouTube - Swipe controls): Save and restore brightness and add auto-brightness toggle

app/src/main/java/app/revanced/integrations/youtube/settings/Settings.java

@@ -246,9 +246,9 @@ public class Settings extends BaseSettings {
  parentsAny(SWIPE_BRIGHTNESS, SWIPE_VOLUME));
  public static final LongSetting SWIPE_OVERLAY_TIMEOUT = new LongSetting("revanced_swipe_overlay_timeout", 500L, true,
  parentsAny(SWIPE_BRIGHTNESS, SWIPE_VOLUME));
- public static final BooleanSetting SWIPE_SAVE_AND_RESTORE_BRIGHTNESS = new BooleanSetting("revanced_swipe_save_and_restore_brightness", TRUE, true,
-  parentsAny(SWIPE_BRIGHTNESS, SWIPE_VOLUME));
-
+ public static final BooleanSetting SWIPE_SAVE_AND_RESTORE_BRIGHTNESS = new BooleanSetting("revanced_swipe_save_and_restore_brightness", TRUE, true, parent(SWIPE_BRIGHTNESS));
+ public static final FloatSetting SWIPE_BRIGHTNESS_VALUE = new FloatSetting("revanced_swipe_brightness_value", -1f);
+ public static final BooleanSetting SWIPE_ENABLE_LOWEST_VALUE_AUTO_BRIGHTNESS = new BooleanSetting("revanced_swipe_enable_lowest_value_auto_brightness", TRUE, true, parent(SWIPE_BRIGHTNESS));
  // Debugging
  /**
  * When enabled, share the debug logs with care.

app/src/main/java/app/revanced/integrations/youtube/swipecontrols/SwipeControlsConfigurationProvider.kt

@@ -104,5 +104,17 @@ class SwipeControlsConfigurationProvider(
  val shouldSaveAndRestoreBrightness: Boolean
  get() = Settings.SWIPE_SAVE_AND_RESTORE_BRIGHTNESS.get()
 
+ /**
+ * should the auto-brightness be enabled at the lowest value of the brightness gesture
+ */
+ val shouldEnableLowestValueAutoBrightness: Boolean
+ get() = Settings.SWIPE_ENABLE_LOWEST_VALUE_AUTO_BRIGHTNESS.get()
+
+ /**
+ * variable that stores the brightness gesture value
+ */
+ var savedScreenBrightnessValue: Float
+ get() = Settings.SWIPE_BRIGHTNESS_VALUE.get()
+ set(value) = Settings.SWIPE_BRIGHTNESS_VALUE.save(value)
 //endregion
-}
+}

app/src/main/java/app/revanced/integrations/youtube/swipecontrols/SwipeControlsHostActivity.kt

@@ -180,6 +180,8 @@ class SwipeControlsHostActivity : Activity() {
  screen?.restoreDefaultBrightness()
  }
  }
+ } else {
+ screen?.restoreDefaultBrightness() // here was lost the function of restore the default brightness
  }
  }
 
@@ -198,7 +200,7 @@ class SwipeControlsHostActivity : Activity() {
  */
  private fun createScreenController() =
  if (config.enableBrightnessControl) {
- ScreenBrightnessController(this)
+ ScreenBrightnessController(this, config)
  } else {
  null
  }
@@ -222,4 +224,4 @@ class SwipeControlsHostActivity : Activity() {
  var currentHost: WeakReference<SwipeControlsHostActivity> = WeakReference(null)
  private set
  }
-}
+}

app/src/main/java/app/revanced/integrations/youtube/swipecontrols/controller/ScreenBrightnessController.kt

@@ -2,6 +2,7 @@ package app.revanced.integrations.youtube.swipecontrols.controller
 
 import android.app.Activity
 import android.view.WindowManager
+import app.revanced.integrations.youtube.swipecontrols.SwipeControlsConfigurationProvider
 import app.revanced.integrations.youtube.swipecontrols.misc.clamp
 
 /**
@@ -11,11 +12,8 @@ import app.revanced.integrations.youtube.swipecontrols.misc.clamp
  */
 class ScreenBrightnessController(
  private val host: Activity,
+ val config: SwipeControlsConfigurationProvider,
 ) {
- /**
- * screen brightness saved by [save]
- */
- private var savedScreenBrightness: Float? = null
 
  /**
  * the current screen brightness in percent, ranging from 0.0 to 100.0
@@ -40,22 +38,20 @@ class ScreenBrightnessController(
  get() = (rawScreenBrightness == WindowManager.LayoutParams.BRIGHTNESS_OVERRIDE_NONE)
 
  /**
- * save the current screen brightness, to be brought back using [restore]
+ * save the current screen brightness into settings, to be brought back using [restore]
  */
  fun save() {
- if (savedScreenBrightness == null) {
- savedScreenBrightness = rawScreenBrightness
+ if (config.savedScreenBrightnessValue == -1f) {
+ config.savedScreenBrightnessValue = rawScreenBrightness
  }
  }
 
  /**
- * restore the screen brightness saved using [save]
+ * restore the screen brightness from settings saved using [save]
  */
  fun restore() {
- savedScreenBrightness?.let {
- rawScreenBrightness = it
- }
- savedScreenBrightness = null
+ rawScreenBrightness = config.savedScreenBrightnessValue
+ config.savedScreenBrightnessValue = -1f
  }
 
  /**
@@ -68,4 +64,4 @@ class ScreenBrightnessController(
  attr.screenBrightness = value
  host.window.attributes = attr
  }
-}
+}

app/src/main/java/app/revanced/integrations/youtube/swipecontrols/controller/gesture/core/VolumeAndBrightnessScroller.kt

@@ -77,12 +77,17 @@ class VolumeAndBrightnessScrollerImpl(
  ),
  ) { _, _, direction ->
  screenController?.run {
- if (screenBrightness > 0 || direction > 0) {
+ val shouldAdjustBrightness = if (config.shouldEnableLowestValueAutoBrightness) {
+ screenBrightness > 0 || direction > 0
+ } else {
+ screenBrightness >= 0 || direction >= 0
+ }
+
+ if (shouldAdjustBrightness) {
  screenBrightness += direction
  } else {
  restoreDefaultBrightness()
  }
-
  overlayController.onBrightnessChanged(screenBrightness)
  }
  }
@@ -94,4 +99,4 @@ class VolumeAndBrightnessScrollerImpl(
  volumeScroller.reset()
  brightnessScroller.reset()
  }
-}
+}

app/src/main/java/app/revanced/integrations/youtube/swipecontrols/views/SwipeControlsOverlayLayout.kt

@@ -11,6 +11,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.RelativeLayout
 import android.widget.TextView
+import app.revanced.integrations.shared.StringRef.str
 import app.revanced.integrations.shared.Utils
 import app.revanced.integrations.youtube.swipecontrols.SwipeControlsConfigurationProvider
 import app.revanced.integrations.youtube.swipecontrols.misc.SwipeControlsOverlay
@@ -122,10 +123,13 @@ class SwipeControlsOverlayLayout(
  }
 
  override fun onBrightnessChanged(brightness: Double) {
- if (brightness > 0) {
+ if (config.shouldEnableLowestValueAutoBrightness && brightness <= 0) {
+ showFeedbackView(
+ str("revanced_swipe_enable_lowest_value_auto_brightness_overlay_text"),
+ autoBrightnessIcon
+ )
+ } else if (brightness >= 0) {
  showFeedbackView("${round(brightness).toInt()}%", manualBrightnessIcon)
- } else {
- showFeedbackView("AUTO", autoBrightnessIcon)
  }
  }
 
@@ -138,4 +142,4 @@ class SwipeControlsOverlayLayout(
  )
  }
  }
-}
+}