Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MBL-806] Update (Remove) WebViewViewModel #1925

Merged
merged 1 commit into from
Jan 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 15 additions & 26 deletions app/src/main/java/com/kickstarter/ui/activities/WebViewActivity.kt
Original file line number Diff line number Diff line change
@@ -1,42 +1,31 @@
package com.kickstarter.ui.activities

import android.os.Bundle
import androidx.activity.ComponentActivity
import androidx.activity.addCallback
import com.kickstarter.databinding.WebViewLayoutBinding
import com.kickstarter.libs.BaseActivity
import com.kickstarter.libs.qualifiers.RequiresActivityViewModel
import com.kickstarter.libs.utils.TransitionUtils
import com.kickstarter.viewmodels.WebViewViewModel
import rx.android.schedulers.AndroidSchedulers
import com.kickstarter.ui.IntentKey
import com.kickstarter.ui.extensions.finishWithAnimation

@RequiresActivityViewModel(WebViewViewModel.ViewModel::class)
class WebViewActivity : BaseActivity<WebViewViewModel.ViewModel>() {
class WebViewActivity : ComponentActivity() {
private lateinit var binding: WebViewLayoutBinding

override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
binding = WebViewLayoutBinding.inflate(layoutInflater)
setContentView(binding.root)

viewModel.outputs.toolbarTitle()
.compose(bindToLifecycle())
.observeOn(AndroidSchedulers.mainThread())
.subscribe { binding.webViewToolbar.webViewToolbar.setTitle(it) }
val toolbarTitle = intent.getStringExtra(IntentKey.TOOLBAR_TITLE)
toolbarTitle?.let { binding.webViewToolbar.webViewToolbar.setTitle(it) }
val url = intent.getStringExtra(IntentKey.URL)
url?.let { binding.webView.loadUrl(it) }

viewModel.outputs.url()
.compose(bindToLifecycle())
.observeOn(AndroidSchedulers.mainThread())
.subscribe { binding.webView.loadUrl(it) }
}

override fun back() {
// This logic is sound only for web view activities without RequestHandlers.
// TODO: Refactor the client to update web history properly for activities with RequestHandlers.
if (binding.webView.canGoBack()) {
binding.webView.goBack()
} else {
super.back()
onBackPressedDispatcher.addCallback {
if (binding.webView.canGoBack()) {
binding.webView.goBack()
} else {
finishWithAnimation()
}
}
}

override fun exitTransition() = TransitionUtils.slideInFromLeft()
}
50 changes: 0 additions & 50 deletions app/src/main/java/com/kickstarter/viewmodels/WebViewViewModel.kt

This file was deleted.

This file was deleted.