dece/Comet
Archived
1
0
Fork 0
Code Issues 12 Pull requests Projects Releases Wiki Activity

PageFragment: fix currentUrl messy property

Browse source
This commit is contained in:
dece 2022-01-26 18:34:22 +01:00
parent 1f2be8cdee
commit caa6f03e20
1 changed files with 6 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
app/src/main/java/dev/lowrespalmtree/comet/PageFragment.kt
View file

@ -32,14 +32,6 @@ class PageFragment : Fragment(), ContentAdapterListener {
private lateinit var binding: FragmentPageViewBinding private lateinit var binding: FragmentPageViewBinding
private lateinit var adapter: PageAdapter private lateinit var adapter: PageAdapter
/** Property to access and set the current address bar URL value. */
private var currentUrl: String
get() = vm.currentUrl
set(value) {
vm.currentUrl = value
binding.addressBar.setText(value)
}
override fun onCreateView( override fun onCreateView(
inflater: LayoutInflater, inflater: LayoutInflater,
container: ViewGroup?, container: ViewGroup?,
@ -58,7 +50,7 @@ class PageFragment : Fragment(), ContentAdapterListener {
binding.addressBar.setOnEditorActionListener { v, id, _ -> onAddressBarAction(v, id) } binding.addressBar.setOnEditorActionListener { v, id, _ -> onAddressBarAction(v, id) }
binding.contentSwipeLayout.setOnRefreshListener { openUrl(currentUrl) } binding.contentSwipeLayout.setOnRefreshListener { openUrl(vm.currentUrl) }
vm.state.observe(viewLifecycleOwner, { updateState(it) }) vm.state.observe(viewLifecycleOwner, { updateState(it) })
vm.lines.observe(viewLifecycleOwner, { updateLines(it) }) vm.lines.observe(viewLifecycleOwner, { updateLines(it) })
@ -79,7 +71,7 @@ class PageFragment : Fragment(), ContentAdapterListener {
} }
override fun onLinkClick(url: String) { override fun onLinkClick(url: String) {
openUrl(url, base = if (currentUrl.isNotEmpty()) currentUrl else null) openUrl(url, base = if (vm.currentUrl.isNotEmpty()) vm.currentUrl else null)
} }
private fun onBackPressed() { private fun onBackPressed() {
@ -169,11 +161,12 @@ class PageFragment : Fragment(), ContentAdapterListener {
askForInput(event.prompt, event.uri) askForInput(event.prompt, event.uri)
} }
is PageViewModel.SuccessEvent -> { is PageViewModel.SuccessEvent -> {
currentUrl = event.uri vm.currentUrl = event.uri
vm.visitedUrls.add(event.uri) vm.visitedUrls.add(event.uri)
binding.addressBar.setText(event.uri)
} }
is PageViewModel.RedirectEvent -> { is PageViewModel.RedirectEvent -> {
openUrl(event.uri, base = currentUrl, redirections = event.redirects) openUrl(event.uri, base = vm.currentUrl, redirections = event.redirects)
} }
is PageViewModel.FailureEvent -> { is PageViewModel.FailureEvent -> {
var message = event.details var message = event.details
@ -215,7 +208,7 @@ class PageFragment : Fragment(), ContentAdapterListener {
.setView(inputView) .setView(inputView)
.setPositiveButton(android.R.string.ok) { _, _ -> .setPositiveButton(android.R.string.ok) { _, _ ->
val newUri = uri.buildUpon().query(editText.text.toString()).build() val newUri = uri.buildUpon().query(editText.text.toString()).build()
openUrl(newUri.toString(), base = currentUrl) openUrl(newUri.toString(), base = vm.currentUrl)
} }
.setOnDismissListener { updateState(PageViewModel.State.IDLE) } .setOnDismissListener { updateState(PageViewModel.State.IDLE) }
.create() .create()