Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-21 17:29:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Finalize credit card copy.

Browse Source
This commit is contained in:
Alex Hart
2022-11-11 11:35:55 -04:00
committed by GitHub
parent ed2edc1ebb
commit 0e3a9a3130
7 changed files with 98 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/card/CreditCardFragment.kt
View File

@@ -6,6 +6,7 @@ import android.view.View
import android.view.WindowManager
import android.view.inputmethod.EditorInfo
import androidx.annotation.StringRes
import androidx.core.content.ContextCompat
import androidx.core.os.bundleOf
import androidx.core.widget.addTextChangedListener
import androidx.fragment.app.Fragment
@@ -22,6 +23,7 @@ import org.thoughtcrime.securesms.payments.FiatMoneyUtil
import org.thoughtcrime.securesms.util.LifecycleDisposable
import org.thoughtcrime.securesms.util.TextSecurePreferences
import org.thoughtcrime.securesms.util.ViewUtil
import org.thoughtcrime.securesms.util.navigation.safeNavigate
class CreditCardFragment : Fragment(R.layout.credit_card_fragment) {
@@ -40,6 +42,12 @@ class CreditCardFragment : Fragment(R.layout.credit_card_fragment) {
getString(R.string.CreditCardFragment__donation_amount_s, FiatMoneyUtil.format(resources, args.request.fiat))
}
binding.description.setLinkColor(ContextCompat.getColor(requireContext(), R.color.signal_colorPrimary))
binding.description.setLearnMoreVisible(true)
binding.description.setOnLinkClickListener {
findNavController().safeNavigate(CreditCardFragmentDirections.actionCreditCardFragmentToYourInformationIsPrivateBottomSheet())
}
binding.cardNumber.addTextChangedListener(afterTextChanged = {
viewModel.onNumberChanged(it?.toString()?.filter { it != ' ' } ?: "")
})

72
app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/card/YourInformationIsPrivateBottomSheet.kt Normal file
View File

@@ -0,0 +1,72 @@
package org.thoughtcrime.securesms.components.settings.app.subscription.donate.card
import org.signal.core.util.dp
import org.thoughtcrime.securesms.R
import org.thoughtcrime.securesms.components.settings.DSLConfiguration
import org.thoughtcrime.securesms.components.settings.DSLSettingsAdapter
import org.thoughtcrime.securesms.components.settings.DSLSettingsBottomSheetFragment
import org.thoughtcrime.securesms.components.settings.DSLSettingsText
import org.thoughtcrime.securesms.components.settings.configure
/**
* Displays information about how Signal keeps card details private and how
* Signal does not link donation information to your Signal account.
*/
class YourInformationIsPrivateBottomSheet : DSLSettingsBottomSheetFragment() {
override fun bindAdapter(adapter: DSLSettingsAdapter) {
adapter.submitList(getConfiguration().toMappingModelList())
}
private fun getConfiguration(): DSLConfiguration {
return configure {
space(10.dp)
noPadTextPref(
title = DSLSettingsText.from(
R.string.YourInformationIsPrivateBottomSheet__your_information_is_private,
DSLSettingsText.CenterModifier,
DSLSettingsText.TextAppearanceModifier(R.style.Signal_Text_HeadlineMedium)
)
)
space(24.dp)
noPadTextPref(
title = DSLSettingsText.from(
R.string.YourInformationIsPrivateBottomSheet__signal_does_not_collect,
DSLSettingsText.BodyLargeModifier
)
)
space(24.dp)
noPadTextPref(
title = DSLSettingsText.from(
R.string.YourInformationIsPrivateBottomSheet__we_use_stripe,
DSLSettingsText.BodyLargeModifier
)
)
space(24.dp)
noPadTextPref(
title = DSLSettingsText.from(
R.string.YourInformationIsPrivateBottomSheet__signal_does_not_and_cannot,
DSLSettingsText.BodyLargeModifier
)
)
space(24.dp)
noPadTextPref(
title = DSLSettingsText.from(
R.string.YourInformationIsPrivateBottomSheet__thank_you,
DSLSettingsText.BodyLargeModifier
)
)
space(56.dp)
}
}
}