Reset to saved zoom instead of 100%

Re: #108
gujjwal00 · Mar 26, 2023 · 65b1144 · 65b1144
1 parent 8169500
commit 65b1144
Show file tree

Hide file tree

Showing 3 changed files with 12 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
@@ -106,7 +106,7 @@ class VncActivity : AppCompatActivity() {
         //Buttons
         binding.keyboardBtn.setOnClickListener { showKeyboard(); closeDrawers() }
         binding.zoomOptions.setOnLongClickListener { resetZoom(); closeDrawers(); true }
-        binding.zoomResetBtn.setOnClickListener { resetZoom(); closeDrawers() }
+        binding.zoomResetBtn.setOnClickListener { resetZoomToDefault(); closeDrawers() }
         binding.zoomSaveBtn.setOnClickListener { saveZoom(); closeDrawers() }
         binding.virtualKeysBtn.setOnClickListener { virtualKeys.show(); closeDrawers() }
         binding.reconnectBtn.setOnClickListener { retryConnection() }
@@ -203,6 +203,11 @@ class VncActivity : AppCompatActivity() {
         Toast.makeText(this, getString(R.string.msg_zoom_reset), Toast.LENGTH_SHORT).show()
     }
 
+    private fun resetZoomToDefault() {
+        viewModel.resetZoomToDefault()
+        Toast.makeText(this, getString(R.string.msg_zoom_reset_default), Toast.LENGTH_SHORT).show()
+    }
+
     private fun saveZoom() {
         viewModel.saveZoom()
         Toast.makeText(this, getString(R.string.msg_zoom_saved), Toast.LENGTH_SHORT).show()

diff --git a/app/src/main/java/com/gaurav/avnc/viewmodel/VncViewModel.kt b/app/src/main/java/com/gaurav/avnc/viewmodel/VncViewModel.kt
@@ -270,6 +270,11 @@ class VncViewModel(val profile: ServerProfile, app: Application) : BaseViewModel
         frameViewRef.get()?.requestRender()
     }
 
+    fun resetZoomToDefault() {
+        frameState.setZoom(profile.zoom1, profile.zoom2)
+        frameViewRef.get()?.requestRender()
+    }
+
     fun panFrame(deltaX: Float, deltaY: Float) {
         frameState.pan(deltaX, deltaY)
         frameViewRef.get()?.requestRender()

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -67,6 +67,7 @@
     <string name="msg_server_profile_added">Server added</string>
     <string name="msg_server_profile_deleted">Server deleted</string>
     <string name="msg_zoom_reset">Zoom reset to 100%</string>
+    <string name="msg_zoom_reset_default">Zoom reset to default</string>
     <string name="msg_zoom_saved">Saved current zoom as default</string>
     <string name="msg_pip_not_supported">Not supported on this device</string>
     <string name="msg_ptr_hiding_not_supported">Not supported on this device</string>