mirror
/
Signal-Android
kopia lustrzana https://github.com/ryukoposting/Signal-Android
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Convert registration button to Tonal colorway.

main
Nicholas 2022-11-29 16:39:56 -05:00 zatwierdzone przez Cody Henthorne
rodzic 23804046c6
commit c68859c606
6 zmienionych plików z 10 dodań i 7 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

4
app/src/main/res/layout/account_locked_fragment.xml
Wyświetl plik

@ -36,15 +36,13 @@
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
android:id="@+id/account_locked_next" android:id="@+id/account_locked_next"
style="@style/Signal.Widget.Button.Large.Primary" style="@style/Signal.Widget.Button.Large.Tonal"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="32dp" android:layout_marginStart="32dp"
android:layout_marginEnd="32dp" android:layout_marginEnd="32dp"
android:layout_marginBottom="16dp" android:layout_marginBottom="16dp"
android:background="@drawable/cta_button_background"
android:text="@string/AccountLockedFragment__next" android:text="@string/AccountLockedFragment__next"
android:textColor="@color/core_white"
app:layout_constraintBottom_toTopOf="@id/account_locked_learn_more" app:layout_constraintBottom_toTopOf="@id/account_locked_learn_more"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" /> app:layout_constraintStart_toStartOf="parent" />

2
app/src/main/res/layout/base_kbs_pin_fragment.xml
Wyświetl plik

@ -103,7 +103,7 @@
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
android:id="@+id/edit_kbs_pin_confirm" android:id="@+id/edit_kbs_pin_confirm"
style="@style/Signal.Widget.Button.Large.Primary" style="@style/Signal.Widget.Button.Large.Tonal"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="32dp" android:layout_marginStart="32dp"

2
app/src/main/res/layout/fragment_registration_enter_phone_number.xml
Wyświetl plik

@ -126,7 +126,7 @@
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:layout_marginEnd="32dp" android:layout_marginEnd="32dp"
android:layout_marginBottom="16dp" android:layout_marginBottom="16dp"
app:materialThemeOverlay="@style/ThemeOverlay.Signal.CircularProgressIndicator.Primary" app:materialThemeOverlay="@style/ThemeOverlay.Signal.CircularProgressIndicator.Tonal"
app:circularProgressMaterialButton__label="@string/RegistrationActivity_next" app:circularProgressMaterialButton__label="@string/RegistrationActivity_next"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"

2
app/src/main/res/layout/fragment_registration_welcome.xml
Wyświetl plik

@ -55,7 +55,7 @@
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_goneMarginBottom="@dimen/registration_button_bottom_margin" app:layout_goneMarginBottom="@dimen/registration_button_bottom_margin"
app:materialThemeOverlay="@style/ThemeOverlay.Signal.CircularProgressIndicator.Primary" /> app:materialThemeOverlay="@style/ThemeOverlay.Signal.CircularProgressIndicator.Tonal" />
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
android:id="@+id/welcome_transfer_or_restore" android:id="@+id/welcome_transfer_or_restore"

2
app/src/main/res/layout/profile_create_fragment.xml
Wyświetl plik

@ -273,7 +273,7 @@
android:layout_marginBottom="16dp" android:layout_marginBottom="16dp"
android:enabled="false" android:enabled="false"
app:circularProgressMaterialButton__label="@string/CreateProfileActivity_next" app:circularProgressMaterialButton__label="@string/CreateProfileActivity_next"
app:materialThemeOverlay="@style/ThemeOverlay.Signal.CircularProgressIndicator.Primary" /> app:materialThemeOverlay="@style/ThemeOverlay.Signal.CircularProgressIndicator.Tonal" />
</LinearLayout> </LinearLayout>

5
app/src/main/res/values/signal_styles.xml
Wyświetl plik

@ -273,6 +273,11 @@
<item name="circularProgressIndicatorStyle">@style/Widget.Signal.CircularProgressIndicator.Medium.Indeterminate</item> <item name="circularProgressIndicatorStyle">@style/Widget.Signal.CircularProgressIndicator.Medium.Indeterminate</item>
</style> </style>
<style name="ThemeOverlay.Signal.CircularProgressIndicator.Tonal" parent="ThemeOverlay.Material3">
<item name="circularProgressMaterialButtonStyle">@style/Signal.Widget.Button.Large.Tonal</item>
<item name="circularProgressIndicatorStyle">@style/Widget.Signal.CircularProgressIndicator.Medium.Indeterminate</item>
</style>
<style name="Widget.Signal.CircularProgressIndicator.Medium.Indeterminate" parent="Widget.Material3.CircularProgressIndicator.Medium"> <style name="Widget.Signal.CircularProgressIndicator.Medium.Indeterminate" parent="Widget.Material3.CircularProgressIndicator.Medium">
<item name="android:indeterminate">true</item> <item name="android:indeterminate">true</item>
</style> </style>