Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-09-28 07:51:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix donation pill wrapping and overflow at large font scales.

Browse Source
This commit is contained in:
Alex Hart
2026-09-23 16:12:24 -04:00
committed by Michelle Tang
parent 359807ccf5
commit 68639b6e79
4 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/DonationPillToggle.kt
+1 -1
View File
@@ -46,7 +46,7 @@ object DonationPillToggle {
notSelected.setOnClickListener { model.onClick() }
selected.isSelected = true
notSelected.isSelected = false
selected.setIconResource(R.drawable.ic_check_24)
selected.setIconResource(R.drawable.ic_check_20)
notSelected.icon = null
}
}
app/src/main/res/layout/donation_pill_toggle.xml
+20 -4
View File
@@ -18,7 +18,7 @@
style="@style/Signal.Widget.Button.Medium.Primary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxWidth="@dimen/donation_pill_max_width"
android:maxLines="1"
android:text="@string/DonationPillToggle__one_time"
android:textAppearance="@style/Signal.Text.LabelLarge"
android:textColor="@color/signal_colorOnSurface"
@@ -28,9 +28,11 @@
app:iconGravity="textStart"
app:iconSize="20dp"
app:iconTint="@color/signal_colorOnSurface"
app:layout_constrainedWidth="true"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/center_guide"
app:layout_constraintHorizontal_bias="1"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Signal.DonationTogglePill.Start" />
@@ -39,13 +41,19 @@
style="@style/Signal.Widget.Button.Medium.Primary"
android:layout_width="0dp"
android:layout_height="0dp"
android:ellipsize="end"
android:maxLines="1"
android:text="@string/DonationPillToggle__one_time"
android:textAppearance="@style/Signal.Text.LabelLarge"
android:textColor="@color/signal_colorOnSurface"
android:visibility="visible"
app:autoSizeMaxTextSize="14sp"
app:autoSizeMinTextSize="10dp"
app:autoSizeStepGranularity="1sp"
app:autoSizeTextType="uniform"
app:backgroundTint="@color/donation_pill_toggle_background_tint"
app:iconGravity="textStart"
app:iconSize="20dp"
android:visibility="visible"
app:iconTint="@color/signal_colorOnSurface"
app:layout_constraintBottom_toBottomOf="@id/one_time_start_invisible"
app:layout_constraintEnd_toStartOf="@id/center_guide"
@@ -58,10 +66,16 @@
style="@style/Signal.Widget.Button.Medium.Primary"
android:layout_width="0dp"
android:layout_height="0dp"
android:ellipsize="end"
android:maxLines="1"
android:text="@string/DonationPillToggle__monthly"
android:textAppearance="@style/Signal.Text.LabelLarge"
android:textColor="@color/signal_colorOnSurface"
android:visibility="visible"
app:autoSizeMaxTextSize="14sp"
app:autoSizeMinTextSize="10dp"
app:autoSizeStepGranularity="1sp"
app:autoSizeTextType="uniform"
app:backgroundTint="@color/donation_pill_toggle_background_tint"
app:iconGravity="textStart"
app:iconSize="20dp"
@@ -78,7 +92,7 @@
style="@style/Signal.Widget.Button.Medium.Primary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxWidth="@dimen/donation_pill_max_width"
android:maxLines="1"
android:text="@string/DonationPillToggle__monthly"
android:textAppearance="@style/Signal.Text.LabelLarge"
android:textColor="@color/signal_colorOnSurface"
@@ -88,10 +102,12 @@
app:iconGravity="textStart"
app:iconSize="20dp"
app:iconTint="@color/signal_colorOnSurface"
app:layout_constrainedWidth="true"
app:layout_constraintBottom_toBottomOf="@id/one_time_start_invisible"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0"
app:layout_constraintStart_toEndOf="@id/center_guide"
app:layout_constraintTop_toTopOf="@id/one_time_start_invisible"
app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Signal.DonationTogglePill.End" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
app/src/main/res/values-land/dimens.xml
+1 -3
View File
@@ -14,6 +14,4 @@
<dimen name="CallScreenParticipantItem__margin_end">0dp</dimen>
<dimen name="CallScreenParticipantItem__margin_bottom">4dp</dimen>
<dimen name="donation_pill_max_width">250dp</dimen>
</resources>
</resources>
app/src/main/res/values/dimens.xml
-3
View File
@@ -243,9 +243,6 @@
<dimen name="chat_folder_row_height">64dp</dimen>
<dimen name="donation_pill_max_width">180dp</dimen>
<dimen name="call_screen_overflow_item_size">72dp</dimen>
</resources>