PageFragment: move some data to the view model

This should advance on #4.

app/src/main/java/dev/lowrespalmtree/comet/PageFragment.kt

@@ -19,7 +19,7 @@ import androidx.activity.addCallback
 import androidx.appcompat.app.AlertDialog
 import androidx.core.view.setMargins
 import androidx.fragment.app.Fragment
-import androidx.lifecycle.ViewModelProvider
+import androidx.fragment.app.viewModels
 import androidx.preference.PreferenceManager
 import androidx.recyclerview.widget.LinearLayoutManager
 import dev.lowrespalmtree.comet.PageAdapter.ContentAdapterListener
@@ -28,29 +28,30 @@ import kotlinx.coroutines.ExperimentalCoroutinesApi
 
 @ExperimentalCoroutinesApi
 class PageFragment : Fragment(), ContentAdapterListener {
+    private val vm: PageViewModel by viewModels()
     private lateinit var binding: FragmentPageViewBinding
-    private lateinit var pageViewModel: PageViewModel
     private lateinit var adapter: PageAdapter
 
     /** Property to access and set the current address bar URL value. */
-    private var currentUrl
+    private var currentUrl: String
-        get() = binding.addressBar.text.toString()
+        get() = vm.currentUrl
-        set(value) = binding.addressBar.setText(value)
+        set(value) {
-
+            vm.currentUrl = value
-    /** A non-saved list of visited URLs. Not an history, just used for going back. */
+            binding.addressBar.setText(value)
-    private val visitedUrls = mutableListOf<String>()
+        }
 
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View {
+        Log.d(TAG, "onCreateView")
         binding = FragmentPageViewBinding.inflate(layoutInflater)
         return binding.root
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        pageViewModel = ViewModelProvider(this)[PageViewModel::class.java]
+        Log.d(TAG, "onViewCreated")
         adapter = PageAdapter(this)
         binding.contentRecycler.layoutManager = LinearLayoutManager(requireContext())
         binding.contentRecycler.adapter = adapter
@@ -59,16 +60,20 @@ class PageFragment : Fragment(), ContentAdapterListener {
 
         binding.contentSwipeLayout.setOnRefreshListener { openUrl(currentUrl) }
 
-        pageViewModel.state.observe(viewLifecycleOwner, { updateState(it) })
+        vm.state.observe(viewLifecycleOwner, { updateState(it) })
-        pageViewModel.lines.observe(viewLifecycleOwner, { updateLines(it) })
+        vm.lines.observe(viewLifecycleOwner, { updateLines(it) })
-        pageViewModel.event.observe(viewLifecycleOwner, { handleEvent(it) })
+        vm.event.observe(viewLifecycleOwner, { handleEvent(it) })
 
         activity?.onBackPressedDispatcher?.addCallback(viewLifecycleOwner) { onBackPressed() }
 
         val url = arguments?.getString("url")
         if (!url.isNullOrEmpty()) {
+            Log.d(TAG, "onViewCreated: open \"$url\"")
             openUrl(url)
-        } else if (visitedUrls.isEmpty()) {
+        } else if (vm.currentUrl.isNotEmpty()) {
+            Log.d(TAG, "onViewCreated: reuse current URL, probably fragment recreation")
+        } else if (vm.visitedUrls.isEmpty()) {
+            Log.d(TAG, "onViewCreated: no current URL, open home if configured")
             Preferences.getHomeUrl(requireContext())?.let { openUrl(it) }
         }
     }
@@ -78,9 +83,9 @@ class PageFragment : Fragment(), ContentAdapterListener {
     }
 
     private fun onBackPressed() {
-        if (visitedUrls.size >= 2) {
+        if (vm.visitedUrls.size >= 2) {
-            visitedUrls.removeLastOrNull()  // Always remove current page first.
+            vm.visitedUrls.removeLastOrNull()  // Always remove current page first.
-            visitedUrls.removeLastOrNull()?.also { openUrl(it) }
+            vm.visitedUrls.removeLastOrNull()?.also { openUrl(it) }
         }
     }
 
@@ -127,7 +132,7 @@ class PageFragment : Fragment(), ContentAdapterListener {
                     prefs.getInt("connection_timeout", Request.DEFAULT_CONNECTION_TIMEOUT_SEC)
                 val readTimeout =
                     prefs.getInt("read_timeout", Request.DEFAULT_READ_TIMEOUT_SEC)
-                pageViewModel.sendGeminiRequest(uri, connectionTimeout, readTimeout)
+                vm.sendGeminiRequest(uri, connectionTimeout, readTimeout)
             }
             else -> openUnknownScheme(uri)
         }
@@ -157,53 +162,30 @@ class PageFragment : Fragment(), ContentAdapterListener {
 
     private fun handleEvent(event: PageViewModel.Event) {
         Log.d(TAG, "handleEvent: $event")
-        if (!event.handled) {
+        if (event.handled)
-            when (event) {
+            return
-                is PageViewModel.InputEvent -> {
+        when (event) {
-                    val editText = EditText(requireContext())
+            is PageViewModel.InputEvent -> {
-                    editText.inputType = InputType.TYPE_CLASS_TEXT
+                askForInput(event.prompt, event.uri)
-                    val inputView = FrameLayout(requireContext()).apply {
+            }
-                        addView(FrameLayout(requireContext()).apply {
+            is PageViewModel.SuccessEvent -> {
-                            addView(editText)
+                currentUrl = event.uri
-                            val params = FrameLayout.LayoutParams(
+                vm.visitedUrls.add(event.uri)
-                                FrameLayout.LayoutParams.MATCH_PARENT,
+            }
-                                FrameLayout.LayoutParams.WRAP_CONTENT
+            is PageViewModel.RedirectEvent -> {
-                            )
+                openUrl(event.uri, base = currentUrl, redirections = event.redirects)
-                            params.setMargins(resources.getDimensionPixelSize(R.dimen.text_margin))
+            }
-                            layoutParams = params
+            is PageViewModel.FailureEvent -> {
-                        })
+                var message = event.details
-                    }
+                if (!event.serverDetails.isNullOrEmpty())
-                    AlertDialog.Builder(requireContext())
+                    message += "\n\nServer details: ${event.serverDetails}"
-                        .setMessage(if (event.prompt.isNotEmpty()) event.prompt else "Input required")
+                if (!isConnectedToNetwork(requireContext()))
-                        .setView(inputView)
+                    message += "\n\nInternet may be inaccessible…"
-                        .setPositiveButton(android.R.string.ok) { _, _ ->
+                alert(message, title = event.short)
-                            val newUri =
+                updateState(PageViewModel.State.IDLE)
-                                event.uri.buildUpon().query(editText.text.toString()).build()
-                            openUrl(newUri.toString(), base = currentUrl)
-                        }
-                        .setOnDismissListener { updateState(PageViewModel.State.IDLE) }
-                        .create()
-                        .show()
-                }
-                is PageViewModel.SuccessEvent -> {
-                    currentUrl = event.uri
-                    visitedUrls.add(event.uri)
-                }
-                is PageViewModel.RedirectEvent -> {
-                    openUrl(event.uri, base = currentUrl, redirections = event.redirects)
-                }
-                is PageViewModel.FailureEvent -> {
-                    var message = event.details
-                    if (!event.serverDetails.isNullOrEmpty())
-                        message += "\n\nServer details: ${event.serverDetails}"
-                    if (!isConnectedToNetwork(requireContext()))
-                        message += "\n\nInternet may be inaccessible…"
-                    alert(message, title = event.short)
-                    updateState(PageViewModel.State.IDLE)
-                }
             }
-            event.handled = true
         }
+        event.handled = true
     }
 
     private fun alert(message: String, title: String? = null) {
@@ -214,6 +196,32 @@ class PageFragment : Fragment(), ContentAdapterListener {
             .show()
     }
 
+    private fun askForInput(prompt: String, uri: Uri) {
+        val editText = EditText(requireContext())
+        editText.inputType = InputType.TYPE_CLASS_TEXT
+        val inputView = FrameLayout(requireContext()).apply {
+            addView(FrameLayout(requireContext()).apply {
+                addView(editText)
+                val params = FrameLayout.LayoutParams(
+                    FrameLayout.LayoutParams.MATCH_PARENT,
+                    FrameLayout.LayoutParams.WRAP_CONTENT
+                )
+                params.setMargins(resources.getDimensionPixelSize(R.dimen.text_margin))
+                layoutParams = params
+            })
+        }
+        AlertDialog.Builder(requireContext())
+            .setMessage(if (prompt.isNotEmpty()) prompt else "Input required")
+            .setView(inputView)
+            .setPositiveButton(android.R.string.ok) { _, _ ->
+                val newUri = uri.buildUpon().query(editText.text.toString()).build()
+                openUrl(newUri.toString(), base = currentUrl)
+            }
+            .setOnDismissListener { updateState(PageViewModel.State.IDLE) }
+            .create()
+            .show()
+    }
+
     private fun openUnknownScheme(uri: Uri) {
         try {
             startActivity(Intent(Intent.ACTION_VIEW, uri))

app/src/main/java/dev/lowrespalmtree/comet/PageViewModel.kt

@@ -3,6 +3,7 @@ package dev.lowrespalmtree.comet
 import android.net.Uri
 import android.util.Log
 import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import kotlinx.coroutines.*
@@ -13,13 +14,18 @@ import java.net.UnknownHostException
 import java.nio.charset.Charset
 
 @ExperimentalCoroutinesApi
-class PageViewModel : ViewModel() {
+class PageViewModel(@Suppress("unused") private val savedStateHandle: SavedStateHandle) :
+    ViewModel() {
+    var currentUrl: String = ""
     private var requestJob: Job? = null
     val state: MutableLiveData<State> by lazy { MutableLiveData<State>(State.IDLE) }
     private var linesList = ArrayList<Line>()
     val lines: MutableLiveData<List<Line>> by lazy { MutableLiveData<List<Line>>() }
     val event: MutableLiveData<Event> by lazy { MutableLiveData<Event>() }
 
+    /** A non-saved list of visited URLs. Not an history, just used for going back. */
+    val visitedUrls = mutableListOf<String>()
+
     enum class State {
         IDLE, CONNECTING, RECEIVING
     }