Skip to content
Snippets Groups Projects
Commit c3edd5f3 authored by Pierre Nicolas's avatar Pierre Nicolas :joy:
Browse files

donation: hide donation button properly

GitLab: #1695
Change-Id: Ib015c5310fd274e4ece6e9bb4e0934e6295dec94
parent 84ea28b2
Branches
Tags
No related merge requests found
...@@ -48,6 +48,7 @@ import net.jami.model.Settings ...@@ -48,6 +48,7 @@ import net.jami.model.Settings
import net.jami.mvp.GenericView import net.jami.mvp.GenericView
import net.jami.settings.SettingsPresenter import net.jami.settings.SettingsPresenter
import net.jami.settings.SettingsViewModel import net.jami.settings.SettingsViewModel
import net.jami.utils.DonationUtils
import net.jami.utils.DonationUtils.endDonationTimeMillis import net.jami.utils.DonationUtils.endDonationTimeMillis
import net.jami.utils.DonationUtils.startDonationTimeMillis import net.jami.utils.DonationUtils.startDonationTimeMillis
...@@ -74,7 +75,7 @@ class SettingsFragment : ...@@ -74,7 +75,7 @@ class SettingsFragment :
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View = override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View =
FragSettingsBinding.inflate(inflater, container, false).apply { FragSettingsBinding.inflate(inflater, container, false).apply {
if (System.currentTimeMillis() in startDonationTimeMillis until endDonationTimeMillis) { if (DonationUtils.isDonationPeriod()) {
donateButton.visibility= View.VISIBLE donateButton.visibility= View.VISIBLE
settingsDonateLayout.visibility = View.VISIBLE settingsDonateLayout.visibility = View.VISIBLE
donateButton.setOnClickListener { donateButton.setOnClickListener {
...@@ -198,7 +199,7 @@ class SettingsFragment : ...@@ -198,7 +199,7 @@ class SettingsFragment :
childFragmentManager.popBackStackImmediate() childFragmentManager.popBackStackImmediate()
if (childFragmentManager.backStackEntryCount == 0) { if (childFragmentManager.backStackEntryCount == 0) {
val binding = binding ?: return val binding = binding ?: return
binding.donateButton.isVisible = true binding.donateButton.isVisible = DonationUtils.isDonationPeriod()
onAppBarScrollTargetViewChanged(binding.scrollview) onAppBarScrollTargetViewChanged(binding.scrollview)
onToolbarTitleChanged(getString(R.string.menu_item_advanced_settings)) onToolbarTitleChanged(getString(R.string.menu_item_advanced_settings))
backPressedCallback.isEnabled = false backPressedCallback.isEnabled = false
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment