Add option to control whether screen remains on when connected to server

gujjwal00 · Feb 6, 2024 · 4a91bd5 · 4a91bd5
1 parent ddebd90
commit 4a91bd5
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 1 deletion.
diff --git a/app/src/main/java/com/gaurav/avnc/ui/vnc/VncActivity.kt b/app/src/main/java/com/gaurav/avnc/ui/vnc/VncActivity.kt
@@ -244,7 +244,7 @@ class VncActivity : AppCompatActivity() {
 
         binding.drawerLayout.setDrawerLockMode(drawerLockMode)
         binding.frameView.isVisible = isConnected
-        binding.frameView.keepScreenOn = isConnected
+        binding.frameView.keepScreenOn = isConnected && viewModel.pref.viewer.keepScreenOn
         SamsungDex.setMetaKeyCapture(this, isConnected)
         layoutManager.onConnectionStateChanged()
         updateStatusContainerVisibility(isConnected)

diff --git a/app/src/main/java/com/gaurav/avnc/util/AppPreferences.kt b/app/src/main/java/com/gaurav/avnc/util/AppPreferences.kt
@@ -32,6 +32,7 @@ class AppPreferences(context: Context) {
         val fullscreen; get() = prefs.getBoolean("fullscreen_display", true)
         val pipEnabled; get() = prefs.getBoolean("pip_enabled", false)
         val drawBehindCutout; get() = prefs.getBoolean("viewer_draw_behind_cutout", false)
+        val keepScreenOn; get() = prefs.getBoolean("keep_screen_on", true)
         val toolbarAlignment; get() = prefs.getString("toolbar_alignment", "start")
         val zoomMax; get() = prefs.getInt("zoom_max", 500) / 100F
         val zoomMin; get() = prefs.getInt("zoom_min", 50) / 100F

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -190,6 +190,7 @@
     <string name="pref_fullscreen">Fullscreen</string>
     <string name="pref_display_cutout">Draw behind display cutout (experimental)</string>
     <string name="pref_enable_pip">Picture-in-picture</string>
+    <string name="pref_keep_screen_on">Keep screen on</string>
     <string name="pref_toolbar">Toolbar</string>
     <string name="pref_toolbar_alignment">Alignment</string>
     <string name="pref_toolbar_alignment_option_start">Start</string>

diff --git a/app/src/main/res/xml/pref_viewer.xml b/app/src/main/res/xml/pref_viewer.xml
@@ -33,6 +33,11 @@
         app:key="viewer_draw_behind_cutout"
         app:title="@string/pref_display_cutout" />
 
+    <SwitchPreference
+        app:defaultValue="true"
+        app:key="keep_screen_on"
+        app:title="@string/pref_keep_screen_on" />
+
     <PreferenceCategory
         app:icon="@drawable/ic_zoom_in"
         app:title="@string/pref_zoom">