Skip to content

Commit

Permalink
remove unneeded viewmodel (#1925)
Browse files Browse the repository at this point in the history
  • Loading branch information
mtgriego committed Jan 9, 2024
1 parent 10a75aa commit 69c7220
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 115 deletions.
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.

0 comments on commit 69c7220

Please sign in to comment.