diff options
author | Thomas <tschneider.ac@gmail.com> | 2022-11-28 15:29:54 +0100 |
---|---|---|
committer | Thomas <tschneider.ac@gmail.com> | 2022-11-28 15:29:54 +0100 |
commit | 0ab66d34c17b38a8117d46624a38c34dab13cbcf (patch) | |
tree | 3e1254dcc2aa9065973206d25d423ef8b333865d | |
parent | ee22181a9197f1da3b0c8ede0f55fcc769c6a796 (diff) |
Replacements
21 files changed, 48 insertions, 30 deletions
diff --git a/app/src/main/res/layout/activity_instance_profile.xml b/app/src/main/res/layout/activity_instance_profile.xml index 445dae09a..57a9eaeb7 100644 --- a/app/src/main/res/layout/activity_instance_profile.xml +++ b/app/src/main/res/layout/activity_instance_profile.xml @@ -166,9 +166,9 @@ android:scrollbars="none" app:layout_constraintTop_toBottomOf="@id/barrier_software_version_bottom" /> - <androidx.appcompat.widget.AppCompatButton + <com.google.android.material.button.MaterialButton android:id="@+id/close" - style="@style/Widget.AppCompat.Button.Colored" + style="@style/Widget.Material3.Button.OutlinedButton" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" diff --git a/app/src/main/res/layout/activity_instance_social.xml b/app/src/main/res/layout/activity_instance_social.xml index eb2e2140d..4534fb847 100644 --- a/app/src/main/res/layout/activity_instance_social.xml +++ b/app/src/main/res/layout/activity_instance_social.xml @@ -101,9 +101,9 @@ android:textSize="16sp" android:visibility="gone" /> - <androidx.appcompat.widget.AppCompatButton + <com.google.android.material.button.MaterialButton android:id="@+id/close" - style="@style/Widget.AppCompat.Button.Colored" + style="@style/Widget.Material3.Button.OutlinedButton" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" diff --git a/app/src/main/res/layout/activity_report.xml b/app/src/main/res/layout/activity_report.xml index df6ff85a1..d8a3a4f44 100644 --- a/app/src/main/res/layout/activity_report.xml +++ b/app/src/main/res/layout/activity_report.xml @@ -191,9 +191,9 @@ android:text="@string/report_1_unfollow" android:textSize="16sp" /> - <androidx.appcompat.widget.AppCompatButton + <com.google.android.material.button.MaterialButton android:id="@+id/action_unfollow" - style="@style/Widget.AppCompat.Button.Colored" + style="@style/Widget.Material3.Button.OutlinedButton" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_alignParentBottom="true" @@ -223,9 +223,9 @@ android:text="@string/report_1_mute" android:textSize="16sp" /> - <androidx.appcompat.widget.AppCompatButton + <com.google.android.material.button.MaterialButton android:id="@+id/action_mute" - style="@style/Widget.AppCompat.Button.Colored" + style="@style/Widget.Material3.Button.OutlinedButton" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_alignParentBottom="true" @@ -255,9 +255,9 @@ android:text="@string/report_1_block" android:textSize="16sp" /> - <androidx.appcompat.widget.AppCompatButton + <com.google.android.material.button.MaterialButton android:id="@+id/action_block" - style="@style/Widget.AppCompat.Button.Colored" + style="@style/Widget.Material3.Button.OutlinedButton" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_alignParentBottom="true" @@ -416,9 +416,9 @@ </androidx.appcompat.widget.LinearLayoutCompat> - <androidx.appcompat.widget.AppCompatButton + <com.google.android.material.button.MaterialButton android:id="@+id/action_button" - style="@style/Widget.AppCompat.Button.Colored" + style="@style/Widget.Material3.Button.OutlinedButton" android:layout_width="match_parent" android:layout_height="wrap_content" android:enabled="false" diff --git a/app/src/main/res/layout/drawer_account.xml b/app/src/main/res/layout/drawer_account.xml index 5dca860be..0029e5b96 100644 --- a/app/src/main/res/layout/drawer_account.xml +++ b/app/src/main/res/layout/drawer_account.xml @@ -21,7 +21,8 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="6dp" android:layout_marginTop="6dp" - app:cardElevation="1dp"> + app:cardElevation="5dp" + app:strokeWidth="0dp"> <androidx.constraintlayout.widget.ConstraintLayout android:layout_width="match_parent" diff --git a/app/src/main/res/layout/drawer_account_list.xml b/app/src/main/res/layout/drawer_account_list.xml index d486cc2eb..dfaf05976 100644 --- a/app/src/main/res/layout/drawer_account_list.xml +++ b/app/src/main/res/layout/drawer_account_list.xml @@ -21,7 +21,8 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="12dp" android:layout_marginTop="12dp" - app:cardElevation="2dp"> + app:cardElevation="5dp" + app:strokeWidth="0dp"> <androidx.constraintlayout.widget.ConstraintLayout android:layout_width="match_parent" diff --git a/app/src/main/res/layout/drawer_admin_account.xml b/app/src/main/res/layout/drawer_admin_account.xml index df3dc75ef..7faf4ef50 100644 --- a/app/src/main/res/layout/drawer_admin_account.xml +++ b/app/src/main/res/layout/drawer_admin_account.xml @@ -6,7 +6,8 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="6dp" android:layout_marginTop="6dp" - app:cardElevation="0dp"> + app:cardElevation="5dp" + app:strokeWidth="0dp"> <androidx.appcompat.widget.LinearLayoutCompat android:layout_width="match_parent" diff --git a/app/src/main/res/layout/drawer_announcement.xml b/app/src/main/res/layout/drawer_announcement.xml index a25b64d72..1fc49a079 100644 --- a/app/src/main/res/layout/drawer_announcement.xml +++ b/app/src/main/res/layout/drawer_announcement.xml @@ -24,7 +24,8 @@ android:layout_marginTop="@dimen/card_margin" android:clipChildren="false" android:clipToPadding="false" - app:cardElevation="0dp"> + app:cardElevation="5dp" + app:strokeWidth="0dp"> <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/card_status_container" diff --git a/app/src/main/res/layout/drawer_conversation.xml b/app/src/main/res/layout/drawer_conversation.xml index a4848935a..9f50cb230 100644 --- a/app/src/main/res/layout/drawer_conversation.xml +++ b/app/src/main/res/layout/drawer_conversation.xml @@ -21,7 +21,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="12dp" - app:cardElevation="2dp"> + app:cardElevation="5dp" + app:strokeWidth="0dp"> <androidx.appcompat.widget.LinearLayoutCompat android:layout_width="match_parent" diff --git a/app/src/main/res/layout/drawer_domain_block.xml b/app/src/main/res/layout/drawer_domain_block.xml index b6c8815eb..aabe1bd2e 100644 --- a/app/src/main/res/layout/drawer_domain_block.xml +++ b/app/src/main/res/layout/drawer_domain_block.xml @@ -19,7 +19,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="12dp" - app:cardElevation="0dp"> + app:cardElevation="5dp" + app:strokeWidth="0dp"> <androidx.appcompat.widget.LinearLayoutCompat android:layout_width="match_parent" diff --git a/app/src/main/res/layout/drawer_follow.xml b/app/src/main/res/layout/drawer_follow.xml index cf6fc94e1..cfc1d1b4a 100644 --- a/app/src/main/res/layout/drawer_follow.xml +++ b/app/src/main/res/layout/drawer_follow.xml @@ -20,7 +20,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="6dp" - app:cardElevation="0dp"> + app:cardElevation="5dp" + app:strokeWidth="0dp"> <androidx.appcompat.widget.LinearLayoutCompat android:layout_width="match_parent" diff --git a/app/src/main/res/layout/drawer_instance_reg.xml b/app/src/main/res/layout/drawer_instance_reg.xml index abbfac519..447b178d9 100644 --- a/app/src/main/res/layout/drawer_instance_reg.xml +++ b/app/src/main/res/layout/drawer_instance_reg.xml @@ -20,7 +20,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="12dp" - android:elevation="2dp"> + app:cardElevation="5dp" + app:strokeWidth="0dp"> <androidx.constraintlayout.widget.ConstraintLayout android:layout_width="match_parent" diff --git a/app/src/main/res/layout/drawer_status_compose.xml b/app/src/main/res/layout/drawer_status_compose.xml index d731c5f75..a6c359a2e 100644 --- a/app/src/main/res/layout/drawer_status_compose.xml +++ b/app/src/main/res/layout/drawer_status_compose.xml @@ -24,7 +24,8 @@ android:layout_marginTop="12dp" android:clipChildren="false" android:clipToPadding="false" - app:cardElevation="0dp"> + app:cardElevation="5dp" + app:strokeWidth="0dp"> <androidx.constraintlayout.widget.ConstraintLayout android:layout_width="match_parent" diff --git a/app/src/main/res/layout/drawer_status_draft.xml b/app/src/main/res/layout/drawer_status_draft.xml index 5889a576b..c2b796b53 100644 --- a/app/src/main/res/layout/drawer_status_draft.xml +++ b/app/src/main/res/layout/drawer_status_draft.xml @@ -21,7 +21,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="12dp" - app:cardElevation="0dp"> + app:cardElevation="5dp" + app:strokeWidth="0dp"> <androidx.appcompat.widget.LinearLayoutCompat android:layout_width="match_parent" diff --git a/app/src/main/res/layout/drawer_status_filtered.xml b/app/src/main/res/layout/drawer_status_filtered.xml index 3fa543155..e60b9cdac 100644 --- a/app/src/main/res/layout/drawer_status_filtered.xml +++ b/app/src/main/res/layout/drawer_status_filtered.xml @@ -24,7 +24,8 @@ android:layout_marginTop="@dimen/card_margin" android:clipChildren="false" android:clipToPadding="false" - app:cardElevation="0dp"> + app:cardElevation="5dp" + app:strokeWidth="0dp"> <androidx.constraintlayout.widget.ConstraintLayout android:layout_width="match_parent" diff --git a/app/src/main/res/layout/drawer_status_filtered_hide.xml b/app/src/main/res/layout/drawer_status_filtered_hide.xml index 0cf9ff4e0..b9a26decd 100644 --- a/app/src/main/res/layout/drawer_status_filtered_hide.xml +++ b/app/src/main/res/layout/drawer_status_filtered_hide.xml @@ -24,7 +24,8 @@ android:layout_marginTop="@dimen/card_margin" android:clipChildren="false" android:clipToPadding="false" - app:cardElevation="0dp"> + app:cardElevation="5dp" + app:strokeWidth="0dp"> <androidx.appcompat.widget.LinearLayoutCompat android:id="@+id/container_fetchmore" diff --git a/app/src/main/res/layout/drawer_status_history.xml b/app/src/main/res/layout/drawer_status_history.xml index 23423a8c7..8990fd27f 100644 --- a/app/src/main/res/layout/drawer_status_history.xml +++ b/app/src/main/res/layout/drawer_status_history.xml @@ -24,7 +24,8 @@ android:layout_marginTop="12dp" android:clipChildren="false" android:clipToPadding="false" - app:cardElevation="2dp"> + app:cardElevation="5dp" + app:strokeWidth="0dp"> <androidx.appcompat.widget.LinearLayoutCompat android:layout_width="match_parent" diff --git a/app/src/main/res/layout/drawer_status_scheduled.xml b/app/src/main/res/layout/drawer_status_scheduled.xml index 19ab41c19..97f8f46de 100644 --- a/app/src/main/res/layout/drawer_status_scheduled.xml +++ b/app/src/main/res/layout/drawer_status_scheduled.xml @@ -21,7 +21,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="12dp" - app:cardElevation="2dp"> + app:cardElevation="5dp" + app:strokeWidth="0dp"> <androidx.appcompat.widget.LinearLayoutCompat android:layout_width="match_parent" diff --git a/app/src/main/res/layout/drawer_status_simple.xml b/app/src/main/res/layout/drawer_status_simple.xml index 7d0328c24..f44c62cba 100644 --- a/app/src/main/res/layout/drawer_status_simple.xml +++ b/app/src/main/res/layout/drawer_status_simple.xml @@ -24,7 +24,8 @@ android:layout_marginTop="12dp" android:clipChildren="false" android:clipToPadding="false" - app:cardElevation="2dp"> + app:cardElevation="5dp" + app:strokeWidth="0dp"> <androidx.appcompat.widget.LinearLayoutCompat android:layout_width="match_parent" diff --git a/app/src/main/res/layout/drawer_suggestion.xml b/app/src/main/res/layout/drawer_suggestion.xml index b494351c6..2a3a91ff8 100644 --- a/app/src/main/res/layout/drawer_suggestion.xml +++ b/app/src/main/res/layout/drawer_suggestion.xml @@ -21,7 +21,8 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="6dp" android:layout_marginTop="6dp" - app:cardElevation="0dp"> + app:cardElevation="5dp" + app:strokeWidth="0dp"> <androidx.constraintlayout.widget.ConstraintLayout android:layout_width="match_parent" diff --git a/app/src/main/res/layout/drawer_tag.xml b/app/src/main/res/layout/drawer_tag.xml index 3534e93d8..7b8c93cd1 100644 --- a/app/src/main/res/layout/drawer_tag.xml +++ b/app/src/main/res/layout/drawer_tag.xml @@ -19,7 +19,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="12dp" - app:cardElevation="0dp"> + app:cardElevation="5dp" + app:strokeWidth="0dp"> <androidx.appcompat.widget.LinearLayoutCompat android:layout_width="match_parent" diff --git a/app/src/main/res/layout/layout_poll.xml b/app/src/main/res/layout/layout_poll.xml index b3dae5356..83d7065f8 100644 --- a/app/src/main/res/layout/layout_poll.xml +++ b/app/src/main/res/layout/layout_poll.xml @@ -78,8 +78,9 @@ </androidx.appcompat.widget.LinearLayoutCompat> - <androidx.appcompat.widget.AppCompatButton + <com.google.android.material.button.MaterialButton android:id="@+id/submit_vote" + style="@style/Widget.Material3.Button.OutlinedButton" android:layout_width="wrap_content" android:layout_height="wrap_content" android:gravity="center" |