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

Add new styling for active subscription pref item.

Browse source
This commit is contained in:
Alex Hart 2023-10-12 14:39:56 -03:00 • committed by Cody Henthorne
parent 5150564fe2
commit b14209d5cf
5 changed files with 26 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/manage/ManageDonationsFragment.kt
View file

@ -131,6 +131,7 @@ class ManageDonationsFragment :
if (state.transactionState is ManageDonationsState.TransactionState.NotInTransaction) {
val activeSubscription = state.transactionState.activeSubscription.activeSubscription
if (activeSubscription != null) {
val subscription: Subscription? = state.availableSubscriptions.firstOrNull { it.level == activeSubscription.level }
if (subscription != null) {

2
app/src/main/java/org/thoughtcrime/securesms/contacts/paged/ContactSearchViewModel.kt
View file

@ -55,7 +55,7 @@ class ContactSearchViewModel(
val selectionState: LiveData<Set<ContactSearchKey>> = selectionStore.stateLiveData
val errorEventsStream: Observable<ContactSearchError> = errorEvents
private var selectionSize = 0;
private var selectionSize = 0
override fun onCleared() {
disposables.clear()
}

39
app/src/main/res/layout/my_support_preference.xml
View file

@ -4,20 +4,18 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dsl_settings_gutter"
android:layout_marginStart="@dimen/active_subscription_gutter_start"
android:layout_marginEnd="@dimen/dsl_settings_gutter"
tools:viewBindingIgnore="true">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/subscription_row_item_background">
android:layout_height="wrap_content">
<org.thoughtcrime.securesms.badges.BadgeImageView
android:id="@+id/my_support_badge"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_marginStart="16dp"
android:layout_width="28dp"
android:layout_height="28dp"
app:badge_size="xlarge"
app:layout_constraintBottom_toBottomOf="@id/my_support_expiry"
app:layout_constraintStart_toStartOf="parent"
@ -27,25 +25,26 @@
<com.google.android.material.progressindicator.CircularProgressIndicator
android:id="@+id/my_support_progress"
style="?circularProgressIndicatorStyle"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_width="24dp"
android:layout_height="24dp"
android:indeterminate="true"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@id/my_support_badge"
app:layout_constraintEnd_toEndOf="@id/my_support_badge"
app:layout_constraintStart_toStartOf="@id/my_support_badge"
app:layout_constraintTop_toTopOf="@id/my_support_badge"
app:indicatorColor="@color/signal_colorOnSurfaceVariant"
app:indicatorSize="24dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:visibility="visible" />
<TextView
android:id="@+id/my_support_title"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="12dp"
android:layout_marginStart="22dp"
android:layout_marginTop="11dp"
android:layout_marginEnd="12dp"
android:textAppearance="@style/TextAppearance.Signal.Body1.Bold"
app:layout_constraintEnd_toEndOf="parent"
android:layout_marginEnd="22dp"
android:textAppearance="@style/Signal.Text.BodyLarge"
app:layout_constraintEnd_toStartOf="@id/my_support_progress"
app:layout_constraintStart_toEndOf="@id/my_support_badge"
app:layout_constraintTop_toTopOf="parent"
tools:text="Subscription Name" />
@ -54,13 +53,13 @@
android:id="@+id/my_support_expiry"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="12dp"
android:layout_marginEnd="12dp"
android:layout_marginStart="22dp"
android:layout_marginEnd="22dp"
android:layout_marginBottom="11dp"
android:textAppearance="@style/TextAppearance.Signal.Body2"
android:textAppearance="@style/Signal.Text.BodyMedium"
android:textColor="@color/signal_text_secondary"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintEnd_toStartOf="@id/my_support_progress"
app:layout_constraintStart_toEndOf="@id/my_support_badge"
app:layout_constraintTop_toBottomOf="@id/my_support_title"
tools:text="$400.00" />

1
app/src/main/res/values-sw360dp/dimens.xml
View file

@ -17,6 +17,7 @@
<dimen name="media_bubble_gif_width">260dp</dimen>
<dimen name="dsl_settings_gutter">24dp</dimen>
<dimen name="active_subscription_gutter_start">22dp</dimen>
<dimen name="media_overview_toggle_gutter">10dp</dimen>
<dimen name="wallpaper_selection_gutter">16dp</dimen>
<dimen name="safety_number_recipient_row_item_gutter">12dp</dimen>

1
app/src/main/res/values/dimens.xml
View file

@ -171,6 +171,7 @@
<dimen name="payment_recovery_phrase_outline_margin">32dp</dimen>
<dimen name="dsl_settings_gutter">16dp</dimen>
<dimen name="active_subscription_gutter_start">14dp</dimen>
<dimen name="media_overview_toggle_gutter">2dp</dimen>
<dimen name="wallpaper_selection_gutter">8dp</dimen>
<dimen name="safety_number_recipient_row_item_gutter">4dp</dimen>