Skip to content
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
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@ class CalculatorFragment : BaseVBFragment<FragmentCalculatorBinding>() {

private val analyticsManager: AnalyticsManager by inject()
private val adManager: AdManager by inject()
private val calculatorViewModel: CalculatorViewModel by viewModel()
private val viewModel: CalculatorViewModel by viewModel()

private val calculatorAdapter: CalculatorAdapter by lazy {
CalculatorAdapter(calculatorViewModel.event)
CalculatorAdapter(viewModel.event)
}

override fun getViewBinding() = FragmentCalculatorBinding.inflate(layoutInflater)
Expand Down Expand Up @@ -81,7 +81,7 @@ class CalculatorFragment : BaseVBFragment<FragmentCalculatorBinding>() {
R.id.calculatorFragment
)?.observe(viewLifecycleOwner) {
Logger.i { "CalculatorFragment observeNavigationResults $it" }
calculatorViewModel.event.onBaseChange(it)
viewModel.event.onBaseChange(it)
}

private fun FragmentCalculatorBinding.initViews() {
Expand All @@ -92,17 +92,17 @@ class CalculatorFragment : BaseVBFragment<FragmentCalculatorBinding>() {
} else {
getString(R.string.banner_ad_unit_id_calculator_release)
},
shouldShowAd = calculatorViewModel.state.value.isBannerAdVisible
shouldShowAd = viewModel.state.value.isBannerAdVisible
)
recyclerViewMain.adapter = calculatorAdapter
}

@SuppressLint("SetTextI18n")
private fun FragmentCalculatorBinding.observeStates() = calculatorViewModel.state
private fun FragmentCalculatorBinding.observeStates() = viewModel.state
.flowWithLifecycle(lifecycle)
.onEach {
with(it) {
calculatorAdapter.submitList(currencyList.toValidList(calculatorViewModel.state.value.base))
calculatorAdapter.submitList(currencyList.toValidList(viewModel.state.value.base))

txtInput.text = input
with(layoutBar) {
Expand All @@ -117,7 +117,7 @@ class CalculatorFragment : BaseVBFragment<FragmentCalculatorBinding>() {
}
}.launchIn(viewLifecycleOwner.lifecycleScope)

private fun observeEffects() = calculatorViewModel.effect
private fun observeEffects() = viewModel.effect
.flowWithLifecycle(lifecycle)
.onEach { viewEffect ->
Logger.i { "CalculatorFragment observeEffects ${viewEffect::class.simpleName}" }
Expand Down Expand Up @@ -150,7 +150,7 @@ class CalculatorFragment : BaseVBFragment<FragmentCalculatorBinding>() {
text = R.string.text_paste_request,
actionText = R.string.text_paste
) {
calculatorViewModel.onPasteToInput(it.context.getFromClipBoard())
viewModel.onPasteToInput(it.context.getFromClipBoard())
}
}

Expand All @@ -162,7 +162,7 @@ class CalculatorFragment : BaseVBFragment<FragmentCalculatorBinding>() {
}
}.launchIn(viewLifecycleOwner.lifecycleScope)

private fun FragmentCalculatorBinding.setListeners() = with(calculatorViewModel.event) {
private fun FragmentCalculatorBinding.setListeners() = with(viewModel.event) {
btnSettings.setOnClickListener { onSettingsClicked() }
layoutBar.root.setOnClickListener { onBarClick() }

Expand Down Expand Up @@ -203,7 +203,7 @@ class CalculatorFragment : BaseVBFragment<FragmentCalculatorBinding>() {
}

private fun Button.setKeyboardListener() = setOnClickListener {
calculatorViewModel.event.onKeyPress(text.toString())
viewModel.event.onKeyPress(text.toString())
}

companion object {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@ class CurrenciesFragment : BaseVBFragment<FragmentCurrenciesBinding>() {

private val analyticsManager: AnalyticsManager by inject()
private val adManager: AdManager by inject()
private val currenciesViewModel: CurrenciesViewModel by viewModel()
private val viewModel: CurrenciesViewModel by viewModel()

private val currenciesAdapter: CurrenciesAdapter by lazy {
CurrenciesAdapter(currenciesViewModel.event)
CurrenciesAdapter(viewModel.event)
}

override fun getViewBinding() = FragmentCurrenciesBinding.inflate(layoutInflater)
Expand Down Expand Up @@ -71,7 +71,7 @@ class CurrenciesFragment : BaseVBFragment<FragmentCurrenciesBinding>() {
} else {
getString(R.string.banner_ad_unit_id_currencies_release)
},
shouldShowAd = currenciesViewModel.state.value.isBannerAdVisible
shouldShowAd = viewModel.state.value.isBannerAdVisible
)

setSpanByOrientation(resources.configuration.orientation)
Expand All @@ -82,7 +82,7 @@ class CurrenciesFragment : BaseVBFragment<FragmentCurrenciesBinding>() {
}
}

private fun FragmentCurrenciesBinding.observeStates() = currenciesViewModel.state
private fun FragmentCurrenciesBinding.observeStates() = viewModel.state
.flowWithLifecycle(lifecycle)
.onEach {
with(it) {
Expand Down Expand Up @@ -113,7 +113,7 @@ class CurrenciesFragment : BaseVBFragment<FragmentCurrenciesBinding>() {
}
}.launchIn(viewLifecycleOwner.lifecycleScope)

private fun observeEffects() = currenciesViewModel.effect
private fun observeEffects() = viewModel.effect
.flowWithLifecycle(lifecycle)
.onEach { viewEffect ->
Logger.i { "CurrenciesFragment observeEffects ${viewEffect::class.simpleName}" }
Expand All @@ -140,7 +140,7 @@ class CurrenciesFragment : BaseVBFragment<FragmentCurrenciesBinding>() {
}
}.launchIn(viewLifecycleOwner.lifecycleScope)

private fun FragmentCurrenciesBinding.setListeners() = with(currenciesViewModel.event) {
private fun FragmentCurrenciesBinding.setListeners() = with(viewModel.event) {
btnDone.setOnClickListener { onDoneClick() }

with(layoutCurrenciesToolbar) {
Expand All @@ -152,7 +152,7 @@ class CurrenciesFragment : BaseVBFragment<FragmentCurrenciesBinding>() {
override fun onQueryTextSubmit(query: String) = false
override fun onQueryTextChange(newText: String): Boolean {
Logger.i { "CurrenciesFragment onQueryTextChange $newText" }
currenciesViewModel.event.onQueryChange(newText)
viewModel.event.onQueryChange(newText)
return true
}
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class MainActivity : BaseActivity() {
override var containerId: Int = R.id.content

private val adManager: AdManager by inject()
private val mainViewModel: MainViewModel by viewModel()
private val viewModel: MainViewModel by viewModel()

init {
// use dark mode default for old devices
Expand All @@ -52,7 +52,7 @@ class MainActivity : BaseActivity() {
observeEffects()
}

private fun observeStates() = mainViewModel.state
private fun observeStates() = viewModel.state
.flowWithLifecycle(lifecycle)
.onEach {
with(it) {
Expand All @@ -65,7 +65,7 @@ class MainActivity : BaseActivity() {
}
}.launchIn(lifecycleScope)

private fun observeEffects() = mainViewModel.effect
private fun observeEffects() = viewModel.effect
.flowWithLifecycle(lifecycle)
.onEach { viewEffect ->
Logger.i { "MainActivity observeEffects ${viewEffect::class.simpleName}" }
Expand Down Expand Up @@ -105,12 +105,12 @@ class MainActivity : BaseActivity() {
override fun onResume() {
super.onResume()
Logger.i { "MainActivity onResume" }
mainViewModel.event.onResume()
viewModel.event.onResume()
}

override fun onPause() {
Logger.i { "MainActivity onPause" }
mainViewModel.event.onPause()
viewModel.event.onPause()
super.onPause()
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@ class PremiumBottomSheet : BaseVBBottomSheetDialogFragment<BottomSheetPremiumBin
private val analyticsManager: AnalyticsManager by inject()
private val adManager: AdManager by inject()
private val billingManager: BillingManager by inject()
private val premiumViewModel: PremiumViewModel by viewModel()
private val viewModel: PremiumViewModel by viewModel()

private val premiumAdapter: PremiumAdapter by lazy {
PremiumAdapter(premiumViewModel.event)
PremiumAdapter(viewModel.event)
}

override fun getViewBinding() = BottomSheetPremiumBinding.inflate(layoutInflater)
Expand Down Expand Up @@ -75,7 +75,7 @@ class PremiumBottomSheet : BaseVBBottomSheetDialogFragment<BottomSheetPremiumBin
recyclerViewPremium.adapter = premiumAdapter
}

private fun BottomSheetPremiumBinding.observeStates() = premiumViewModel.state
private fun BottomSheetPremiumBinding.observeStates() = viewModel.state
.flowWithLifecycle(lifecycle)
.onEach {
with(it) {
Expand All @@ -84,7 +84,7 @@ class PremiumBottomSheet : BaseVBBottomSheetDialogFragment<BottomSheetPremiumBin
}
}.launchIn(viewLifecycleOwner.lifecycleScope)

private fun observeEffects() = premiumViewModel.effect
private fun observeEffects() = viewModel.effect
.flowWithLifecycle(lifecycle)
.onEach { viewEffect ->
Logger.i { "PremiumBottomSheet observeEffects ${viewEffect::class.simpleName}" }
Expand Down Expand Up @@ -121,19 +121,19 @@ class PremiumBottomSheet : BaseVBBottomSheetDialogFragment<BottomSheetPremiumBin
Logger.i { "PremiumBottomSheet observeBillingEffects ${viewEffect::class.simpleName}" }
when (viewEffect) {
BillingEffect.SuccessfulPurchase -> restartActivity()
is BillingEffect.RestorePurchase -> premiumViewModel.event.onRestorePurchase(
is BillingEffect.RestorePurchase -> viewModel.event.onRestorePurchase(
viewEffect.purchaseHistoryRecordRecordList.toOldPurchaseList()
)

is BillingEffect.AddPurchaseMethods -> premiumViewModel.event.onAddPurchaseMethods(
is BillingEffect.AddPurchaseMethods -> viewModel.event.onAddPurchaseMethods(
viewEffect.productDetailsList.toPremiumDataList()
)

is BillingEffect.UpdatePremiumEndDate -> premiumViewModel.onPremiumActivated(
is BillingEffect.UpdatePremiumEndDate -> viewModel.onPremiumActivated(
PremiumType.getById(viewEffect.id)
)

BillingEffect.BillingUnavailable -> premiumViewModel.event.onPremiumActivationFailed()
BillingEffect.BillingUnavailable -> viewModel.event.onPremiumActivationFailed()
}
}.launchIn(viewLifecycleOwner.lifecycleScope)

Expand All @@ -147,10 +147,10 @@ class PremiumBottomSheet : BaseVBBottomSheetDialogFragment<BottomSheetPremiumBin
},
onAdFailedToLoad = {
view?.showSnack(R.string.error_text_unknown)
premiumViewModel.event.onPremiumActivationFailed()
viewModel.event.onPremiumActivationFailed()
},
onReward = {
premiumViewModel.event.onPremiumActivated(PremiumType.VIDEO)
viewModel.event.onPremiumActivated(PremiumType.VIDEO)
}
)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ class SelectCurrencyBottomSheet :
BaseVBBottomSheetDialogFragment<BottomSheetSelectCurrencyBinding>() {

private val analyticsManager: AnalyticsManager by inject()
private val selectCurrencyViewModel: SelectCurrencyViewModel by viewModel()
private val viewModel: SelectCurrencyViewModel by viewModel()

private val selectCurrencyAdapter: SelectCurrencyAdapter by lazy {
SelectCurrencyAdapter(selectCurrencyViewModel.event)
SelectCurrencyAdapter(viewModel.event)
}

override fun getViewBinding() = BottomSheetSelectCurrencyBinding.inflate(layoutInflater)
Expand Down Expand Up @@ -60,7 +60,7 @@ class SelectCurrencyBottomSheet :
recyclerViewSelectCurrency.adapter = selectCurrencyAdapter
}

private fun BottomSheetSelectCurrencyBinding.observeStates() = selectCurrencyViewModel.state
private fun BottomSheetSelectCurrencyBinding.observeStates() = viewModel.state
.flowWithLifecycle(lifecycle)
.onEach {
with(it) {
Expand All @@ -81,7 +81,7 @@ class SelectCurrencyBottomSheet :
}
}.launchIn(viewLifecycleOwner.lifecycleScope)

private fun observeEffects() = selectCurrencyViewModel.effect
private fun observeEffects() = viewModel.effect
.flowWithLifecycle(lifecycle)
.onEach { viewEffect ->
Logger.i { "SelectCurrencyBottomSheet observeEffects ${viewEffect::class.simpleName}" }
Expand All @@ -103,6 +103,6 @@ class SelectCurrencyBottomSheet :
}.launchIn(viewLifecycleOwner.lifecycleScope)

private fun BottomSheetSelectCurrencyBinding.setListeners() = btnSelect.setOnClickListener {
selectCurrencyViewModel.event.onSelectClick()
viewModel.event.onSelectClick()
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ class SettingsFragment : BaseVBFragment<FragmentSettingsBinding>() {

private val analyticsManager: AnalyticsManager by inject()
private val adManager: AdManager by inject()
private val settingsViewModel: SettingsViewModel by viewModel()
private val viewModel: SettingsViewModel by viewModel()

override fun getViewBinding() = FragmentSettingsBinding.inflate(layoutInflater)

Expand Down Expand Up @@ -73,7 +73,7 @@ class SettingsFragment : BaseVBFragment<FragmentSettingsBinding>() {
} else {
getString(R.string.banner_ad_unit_id_settings_release)
},
shouldShowAd = settingsViewModel.state.value.isBannerAdVisible
shouldShowAd = viewModel.state.value.isBannerAdVisible
)

with(itemCurrencies) {
Expand Down Expand Up @@ -146,7 +146,7 @@ class SettingsFragment : BaseVBFragment<FragmentSettingsBinding>() {
}
}

private fun FragmentSettingsBinding.observeStates() = settingsViewModel.state
private fun FragmentSettingsBinding.observeStates() = viewModel.state
.flowWithLifecycle(lifecycle)
.onEach {
with(it) {
Expand Down Expand Up @@ -182,7 +182,7 @@ class SettingsFragment : BaseVBFragment<FragmentSettingsBinding>() {
}.launchIn(viewLifecycleOwner.lifecycleScope)

@Suppress("ComplexMethod")
private fun observeEffects() = settingsViewModel.effect
private fun observeEffects() = viewModel.effect
.flowWithLifecycle(lifecycle)
.onEach { viewEffect ->
Logger.i { "SettingsFragment observeEffects ${viewEffect::class.simpleName}" }
Expand Down Expand Up @@ -241,7 +241,7 @@ class SettingsFragment : BaseVBFragment<FragmentSettingsBinding>() {
}
}.launchIn(viewLifecycleOwner.lifecycleScope)

private fun FragmentSettingsBinding.setListeners() = with(settingsViewModel.event) {
private fun FragmentSettingsBinding.setListeners() = with(viewModel.event) {
backButton.setOnClickListener { onBackClick() }

itemCurrencies.root.setOnClickListener { onCurrenciesClick() }
Expand All @@ -267,9 +267,9 @@ class SettingsFragment : BaseVBFragment<FragmentSettingsBinding>() {
activity?.showSingleChoiceDialog(
getString(R.string.title_dialog_choose_theme),
AppTheme.values().map { it.themeName }.toTypedArray(),
settingsViewModel.state.value.appThemeType.ordinal
viewModel.state.value.appThemeType.ordinal
) { index ->
AppTheme.getThemeByOrdinal(index)?.let { settingsViewModel.event.onThemeChange(it) }
AppTheme.getThemeByOrdinal(index)?.let { viewModel.event.onThemeChange(it) }
}
}

Expand All @@ -281,9 +281,9 @@ class SettingsFragment : BaseVBFragment<FragmentSettingsBinding>() {
it
)
}.toTypedArray(),
settingsViewModel.state.value.precision.numberToIndex()
viewModel.state.value.precision.numberToIndex()
) {
settingsViewModel.event.onPrecisionSelect(it)
viewModel.event.onPrecisionSelect(it)
}

private fun share(marketLink: String) = Intent(Intent.ACTION_SEND).apply {
Expand Down
Loading