Skip to content

[Oztechan/CCC#3590] Remove CalculatorFragment navigation result logic #3595

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.

Sign up for GitHub

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

Merged
mustafaozhan merged 4 commits into from
Jun 25, 2024
+1 −21
Merged

[Oztechan/CCC#3590] Remove CalculatorFragment navigation result logic #3595

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a6df2e7
[Oztechan/CCC#3585] Remove SelectCurrencyFragment navigation result l…
mustafaozhan Jun 23, 2024
2bd2e12
[Oztechan/CCC#3585] Remove SelectCurrencyFragment navigation result l…
mustafaozhan Jun 24, 2024
9800f27
[Oztechan/CCC#3587] Remove CurrenciesFragment navigation result logic
mustafaozhan Jun 24, 2024
adb12b1
[Oztechan/CCC#3590] Remove CalculatorFragment navigation result logic
mustafaozhan Jun 24, 2024
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
14 changes: 0 additions & 14 deletions ...c/main/kotlin/com/oztechan/ccc/android/ui/mobile/content/calculator/CalculatorFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import com.oztechan.ccc.android.ui.mobile.util.copyToClipBoard
import com.oztechan.ccc.android.ui.mobile.util.dataState
import com.oztechan.ccc.android.ui.mobile.util.destroyBanner
import com.oztechan.ccc.android.ui.mobile.util.getFromClipBoard
import com.oztechan.ccc.android.ui.mobile.util.getNavigationResult
import com.oztechan.ccc.android.ui.mobile.util.setBackgroundByName
import com.oztechan.ccc.android.ui.mobile.util.setBannerAd
import com.oztechan.ccc.android.ui.mobile.util.showSnack
Expand Down Expand Up @@ -55,7 +54,6 @@ class CalculatorFragment : BaseVBFragment<FragmentCalculatorBinding>() {
binding.observeStates()
binding.setListeners()
observeEffects()
observeNavigationResults()
}

override fun onResume() {
Expand All @@ -75,14 +73,6 @@ class CalculatorFragment : BaseVBFragment<FragmentCalculatorBinding>() {
super.onDestroyView()
}

private fun observeNavigationResults() = getNavigationResult<String>(
CHANGE_BASE_EVENT,
R.id.calculatorFragment
)?.observe(viewLifecycleOwner) {
Logger.i { "CalculatorFragment observeNavigationResults $it" }
calculatorViewModel.event.onBaseChange(it)
}

private fun FragmentCalculatorBinding.initViews() {
adViewContainer.setBannerAd(
adManager = adManager,
Expand Down Expand Up @@ -204,8 +194,4 @@ class CalculatorFragment : BaseVBFragment<FragmentCalculatorBinding>() {
private fun Button.setKeyboardListener() = setOnClickListener {
calculatorViewModel.event.onKeyPress(text.toString())
}

companion object {
const val CHANGE_BASE_EVENT = "change_base"
}
}
8 changes: 1 addition & 7 deletions ...c/main/kotlin/com/oztechan/ccc/android/ui/mobile/content/currencies/CurrenciesFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,10 @@ import com.github.submob.basemob.fragment.BaseVBFragment
import com.oztechan.ccc.android.core.ad.AdManager
import com.oztechan.ccc.android.ui.mobile.BuildConfig
import com.oztechan.ccc.android.ui.mobile.R
import com.oztechan.ccc.android.ui.mobile.content.calculator.CalculatorFragment.Companion.CHANGE_BASE_EVENT
import com.oztechan.ccc.android.ui.mobile.databinding.FragmentCurrenciesBinding
import com.oztechan.ccc.android.ui.mobile.util.destroyBanner
import com.oztechan.ccc.android.ui.mobile.util.hideKeyboard
import com.oztechan.ccc.android.ui.mobile.util.setBannerAd
import com.oztechan.ccc.android.ui.mobile.util.setNavigationResult
import com.oztechan.ccc.android.ui.mobile.util.showSnack
import com.oztechan.ccc.android.ui.mobile.util.visibleIf
import com.oztechan.ccc.client.core.analytics.AnalyticsManager
Expand Down Expand Up @@ -132,11 +130,7 @@ class CurrenciesFragment : BaseVBFragment<FragmentCurrenciesBinding>() {
view?.hideKeyboard()
}

is CurrenciesEffect.ChangeBase -> setNavigationResult(
R.id.calculatorFragment,
viewEffect.newBase,
CHANGE_BASE_EVENT
)
is CurrenciesEffect.ChangeBase -> Unit // iOS only
}
}.launchIn(viewLifecycleOwner.lifecycleScope)

Expand Down