Merge branch 'main' of https://github.com/deniscerri/ytdlnis

app/src/main/java/com/deniscerri/ytdl/database/viewmodel/TerminalViewModel.kt

@@ -58,8 +58,9 @@ class TerminalViewModel(private val application: Application) : AndroidViewModel
         session.updateTerminalSessionClient(client)
         terminal.setBackgroundColor(android.graphics.Color.TRANSPARENT)
 
-        val zoom = PreferenceManager.getDefaultSharedPreferences(context)
+        val storedZoom = PreferenceManager.getDefaultSharedPreferences(context)
             .getFloat("terminal_text_zoom", 35f)
+        val zoom = if (storedZoom.isFinite()) storedZoom.coerceIn(10f, 37f) else 35f
         terminal.setTextSize(zoom.toInt())
         terminal.setTypeface(TerminalUtils.typeface)
 

app/src/main/java/com/deniscerri/ytdl/ui/more/terminal/TerminalFragment.kt

@@ -67,6 +67,11 @@ class TerminalFragment : Fragment() {
     private lateinit var session : TerminalSession
     private var sessionId: String? = null
 
+    private fun terminalZoom(): Int {
+        val zoom = sharedPreferences.getFloat("terminal_text_zoom", 35f)
+        return if (zoom.isFinite()) zoom.coerceIn(10f, 37f).toInt() else 35
+    }
+
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
@@ -128,7 +133,7 @@ class TerminalFragment : Fragment() {
         slider?.apply {
             valueFrom = 10f
             valueTo = 37f
-            value = sharedPreferences.getFloat("terminal_text_zoom", 35f)
+            value = terminalZoom().toFloat()
 
             addOnChangeListener { _, value, _ ->
                 terminalView.setTextSize(value.toInt())
@@ -292,8 +297,7 @@ class TerminalFragment : Fragment() {
             val termView = view as TerminalView
 
             termView.post {
-                val textSize = sharedPreferences.getFloat("terminal_text_zoom", 35f).toInt()
+                termView.setTextSize(terminalZoom())
-                termView.setTextSize(if (textSize < 10) 10 else textSize)
 
                 termView.setTypeface(TerminalUtils.typeface)
                 termView.setTerminalViewClient(client)