empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Stick buttons to bottom of subscription page.

Browse source
This commit is contained in:
Alex Hart 2022-07-29 14:20:46 -03:00 • committed by Greyson Parrelli
parent cb9a219c4b
commit ef950bdbb5
2 changed files with 112 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/subscribe/SubscribeFragment.kt
View file

@ -30,6 +30,7 @@ import org.thoughtcrime.securesms.components.settings.app.subscription.models.Cu
import org.thoughtcrime.securesms.components.settings.app.subscription.models.GooglePayButton
import org.thoughtcrime.securesms.components.settings.app.subscription.models.NetworkFailure
import org.thoughtcrime.securesms.components.settings.configure
import org.thoughtcrime.securesms.components.settings.models.Button
import org.thoughtcrime.securesms.components.settings.models.Progress
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
import org.thoughtcrime.securesms.payments.FiatMoneyUtil
@ -38,6 +39,7 @@ import org.thoughtcrime.securesms.util.LifecycleDisposable
import org.thoughtcrime.securesms.util.SpanUtil
import org.thoughtcrime.securesms.util.fragments.requireListener
import org.thoughtcrime.securesms.util.navigation.safeNavigate
import org.thoughtcrime.securesms.util.visible
import java.util.Currency
import java.util.concurrent.TimeUnit
@ -63,6 +65,10 @@ class SubscribeFragment : DSLSettingsFragment(
private lateinit var processingDonationPaymentDialog: AlertDialog
private lateinit var donationPaymentComponent: DonationPaymentComponent
private lateinit var googlePayButtonViewHolder: GooglePayButton.ViewHolder
private lateinit var updateSubscriptionButtonViewHolder: Button.ViewHolder<Button.Model.Primary>
private lateinit var cancelSubscriptionButtonViewHolder: Button.ViewHolder<Button.Model.SecondaryNoOutline>
private var errorDialog: DialogInterface? = null
private val viewModel: SubscribeViewModel by viewModels(
@ -83,16 +89,20 @@ class SubscribeFragment : DSLSettingsFragment(
BadgePreview.register(adapter)
CurrencySelection.register(adapter)
Subscription.register(adapter)
GooglePayButton.register(adapter)
Progress.register(adapter)
NetworkFailure.register(adapter)
googlePayButtonViewHolder = GooglePayButton.ViewHolder(requireView().findViewById(R.id.pay_button_wrapper))
updateSubscriptionButtonViewHolder = Button.ViewHolder(requireView().findViewById(R.id.update_button_wrapper))
cancelSubscriptionButtonViewHolder = Button.ViewHolder(requireView().findViewById(R.id.cancel_button_wrapper))
processingDonationPaymentDialog = MaterialAlertDialogBuilder(requireContext())
.setView(R.layout.processing_payment_dialog)
.setCancelable(false)
.create()
viewModel.state.observe(viewLifecycleOwner) { state ->
bindFixedButtons(state)
adapter.submitList(getConfiguration(state).toMappingModelList())
}
@ -202,18 +212,22 @@ class SubscribeFragment : DSLSettingsFragment(
)
}
}
}
}
private fun bindFixedButtons(state: SubscribeState) {
val areFieldsEnabled = state.stage == SubscribeState.Stage.READY && !state.hasInProgressSubscriptionTransaction
if (state.activeSubscription?.isActive == true) {
space(DimensionUnit.DP.toPixels(16f).toInt())
val activeAndSameLevel = state.activeSubscription.isActive &&
state.selectedSubscription?.level == state.activeSubscription.activeSubscription?.level
primaryButton(
text = DSLSettingsText.from(R.string.SubscribeFragment__update_subscription),
val updateModel = Button.Model.Primary(
title = DSLSettingsText.from(R.string.SubscribeFragment__update_subscription),
icon = null,
isEnabled = areFieldsEnabled && (!activeAndSameLevel || state.isSubscriptionExpiring()),
onClick = {
val price = viewModel.getPriceOfSelectedSubscription() ?: return@primaryButton
val price = viewModel.getPriceOfSelectedSubscription() ?: return@Primary
MaterialAlertDialogBuilder(requireContext())
.setTitle(R.string.SubscribeFragment__update_subscription_question)
@ -238,8 +252,11 @@ class SubscribeFragment : DSLSettingsFragment(
}
)
secondaryButtonNoOutline(
text = DSLSettingsText.from(R.string.SubscribeFragment__cancel_subscription),
updateSubscriptionButtonViewHolder.bind(updateModel)
val cancelModel = Button.Model.SecondaryNoOutline(
title = DSLSettingsText.from(R.string.SubscribeFragment__cancel_subscription),
icon = null,
isEnabled = areFieldsEnabled,
onClick = {
MaterialAlertDialogBuilder(requireContext())
@ -255,18 +272,23 @@ class SubscribeFragment : DSLSettingsFragment(
.show()
}
)
} else {
space(DimensionUnit.DP.toPixels(16f).toInt())
customPref(
GooglePayButton.Model(
cancelSubscriptionButtonViewHolder.bind(cancelModel)
updateSubscriptionButtonViewHolder.itemView.visible = true
cancelSubscriptionButtonViewHolder.itemView.visible = true
googlePayButtonViewHolder.itemView.visible = false
} else {
val googlePayModel = GooglePayButton.Model(
onClick = this@SubscribeFragment::onGooglePayButtonClicked,
isEnabled = areFieldsEnabled && state.selectedSubscription != null
)
)
space(DimensionUnit.DP.toPixels(8f).toInt())
}
googlePayButtonViewHolder.bind(googlePayModel)
updateSubscriptionButtonViewHolder.itemView.visible = false
cancelSubscriptionButtonViewHolder.itemView.visible = false
googlePayButtonViewHolder.itemView.visible = true
}
}

34
app/src/main/res/layout/subscribe_fragment.xml
View file

@ -10,11 +10,43 @@
android:id="@+id/recycler"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginBottom="16dp"
android:orientation="vertical"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintBottom_toTopOf="@id/fixed_button_container"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/toolbar" />
<LinearLayout
android:id="@+id/fixed_button_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent">
<FrameLayout
android:id="@+id/update_button_wrapper"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<include layout="@layout/dsl_button_primary" />
</FrameLayout>
<FrameLayout
android:id="@+id/cancel_button_wrapper"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<include layout="@layout/dsl_button_secondary" />
</FrameLayout>
<include
android:id="@+id/pay_button_wrapper"
layout="@layout/google_pay_button_pref" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>