owen/moshidon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(restriction-confirmation-sheet): make secondary button appear on top of primary button

Browse Source 
This is the first part of the chore to readd the mute timer thing
This commit is contained in:
LucasGGamerM
2024-04-07 08:42:24 -03:00
parent da3c19cdd0
commit 24be1c68ad
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mastodon/src/main/res/layout/sheet_restrict_account.xml
View File

@@ -69,14 +69,14 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="8dp"> android:layout_marginBottom="8dp">
<org.joinmastodon.android.ui.views.ProgressBarButton <org.joinmastodon.android.ui.views.ProgressBarButton
android:id="@+id/btn_confirm" android:id="@+id/btn_secondary"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="40dp" android:layout_height="40dp"
style="@style/Widget.Mastodon.M3.Button.Filled" style="@style/Widget.Mastodon.M3.Button.Tonal"
app:progressBar="@id/confirm_progress" app:progressBar="@id/secondary_progress"
tools:text="@string/got_it"/> tools:text="@string/got_it"/>
<ProgressBar <ProgressBar
android:id="@+id/confirm_progress" android:id="@+id/secondary_progress"
style="?android:progressBarStyleSmall" style="?android:progressBarStyleSmall"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@@ -93,14 +93,14 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="8dp"> android:layout_marginBottom="8dp">
<org.joinmastodon.android.ui.views.ProgressBarButton <org.joinmastodon.android.ui.views.ProgressBarButton
android:id="@+id/btn_secondary" android:id="@+id/btn_confirm"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="40dp" android:layout_height="40dp"
style="@style/Widget.Mastodon.M3.Button.Tonal" style="@style/Widget.Mastodon.M3.Button.Filled"
app:progressBar="@id/secondary_progress" app:progressBar="@id/confirm_progress"
tools:text="@string/got_it"/> tools:text="@string/got_it"/>
<ProgressBar <ProgressBar
android:id="@+id/secondary_progress" android:id="@+id/confirm_progress"
style="?android:progressBarStyleSmall" style="?android:progressBarStyleSmall"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"