diff options
Diffstat (limited to 'app/src/main/res/layout')
18 files changed, 208 insertions, 123 deletions
diff --git a/app/src/main/res/layout/drawer_account.xml b/app/src/main/res/layout/drawer_account.xml index 75a4731a8..449c8befc 100644 --- a/app/src/main/res/layout/drawer_account.xml +++ b/app/src/main/res/layout/drawer_account.xml @@ -14,16 +14,21 @@ You should have received a copy of the GNU General Public License along with Fedilab; if not, see <http://www.gnu.org/licenses> --> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" +<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" - + android:id="@+id/cardview_container" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginHorizontal="6dp" - android:layout_marginTop="6dp"> + android:layout_marginTop="6dp" + android:clipChildren="false" + android:clipToPadding="false" + app:cardElevation="0dp" + app:strokeWidth="0dp"> <View + android:id="@+id/divider_card" android:layout_width="match_parent" android:layout_height="1px" android:background="?colorOutline" /> @@ -154,4 +159,4 @@ </androidx.constraintlayout.widget.ConstraintLayout> -</RelativeLayout> +</com.google.android.material.card.MaterialCardView> diff --git a/app/src/main/res/layout/drawer_account_list.xml b/app/src/main/res/layout/drawer_account_list.xml index 06c946949..78b1b0af8 100644 --- a/app/src/main/res/layout/drawer_account_list.xml +++ b/app/src/main/res/layout/drawer_account_list.xml @@ -14,15 +14,21 @@ You should have received a copy of the GNU General Public License along with Fedilab; if not, see <http://www.gnu.org/licenses> --> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" +<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" + android:id="@+id/cardview_container" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginHorizontal="12dp" - android:layout_marginTop="12dp"> + android:layout_marginHorizontal="6dp" + android:layout_marginTop="6dp" + android:clipChildren="false" + android:clipToPadding="false" + app:cardElevation="0dp" + app:strokeWidth="0dp"> <View + android:id="@+id/divider_card" android:layout_width="match_parent" android:layout_height="1px" android:background="?colorOutline" /> @@ -71,14 +77,14 @@ <com.google.android.material.button.MaterialButton android:id="@+id/list_action" - style="@style/Widget.AppCompat.Button.Colored" + style="@style/Widget.Material3.Button.Icon" android:layout_width="36dp" android:layout_height="36dp" android:layout_marginStart="12dp" android:layout_marginTop="6dp" - android:insetTop="0dp" - android:insetBottom="0dp" - android:padding="6dp" + android:padding="0dp" + app:iconGravity="textStart" + app:iconPadding="0dp" app:icon="@drawable/ic_baseline_person_add_alt_1_24" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" @@ -86,4 +92,4 @@ </androidx.constraintlayout.widget.ConstraintLayout> -</RelativeLayout> +</com.google.android.material.card.MaterialCardView> diff --git a/app/src/main/res/layout/drawer_admin_account.xml b/app/src/main/res/layout/drawer_admin_account.xml index 11be13127..2b5152947 100644 --- a/app/src/main/res/layout/drawer_admin_account.xml +++ b/app/src/main/res/layout/drawer_admin_account.xml @@ -1,16 +1,23 @@ <?xml version="1.0" encoding="utf-8"?> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/admin_account_container" +<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + android:id="@+id/cardview_container" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginHorizontal="6dp" - android:layout_marginTop="6dp"> + android:layout_marginTop="6dp" + android:clipChildren="false" + android:clipToPadding="false" + app:cardElevation="0dp" + app:strokeWidth="0dp"> <View + android:id="@+id/divider_card" android:layout_width="match_parent" android:layout_height="1px" android:background="?colorOutline" /> + <androidx.appcompat.widget.LinearLayoutCompat android:layout_width="match_parent" android:layout_height="wrap_content" @@ -140,5 +147,5 @@ </androidx.appcompat.widget.LinearLayoutCompat> </androidx.appcompat.widget.LinearLayoutCompat> </androidx.appcompat.widget.LinearLayoutCompat> -</RelativeLayout> +</com.google.android.material.card.MaterialCardView> diff --git a/app/src/main/res/layout/drawer_announcement.xml b/app/src/main/res/layout/drawer_announcement.xml index b7fe36219..4825a7be3 100644 --- a/app/src/main/res/layout/drawer_announcement.xml +++ b/app/src/main/res/layout/drawer_announcement.xml @@ -14,19 +14,21 @@ You should have received a copy of the GNU General Public License along with Fedilab; if not, see <http://www.gnu.org/licenses> --> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" +<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:id="@+id/cardview_container" android:layout_width="match_parent" android:layout_height="wrap_content" - + android:clipChildren="false" + android:clipToPadding="false" android:layout_marginHorizontal="@dimen/card_margin" android:layout_marginTop="@dimen/card_margin" - android:clipChildren="false" - android:clipToPadding="false"> + app:cardElevation="0dp" + app:strokeWidth="0dp"> <View + android:id="@+id/divider_card" android:layout_width="match_parent" android:layout_height="1px" android:background="?colorOutline" /> @@ -96,4 +98,4 @@ </androidx.appcompat.widget.LinearLayoutCompat> </androidx.constraintlayout.widget.ConstraintLayout> -</RelativeLayout> +</com.google.android.material.card.MaterialCardView> diff --git a/app/src/main/res/layout/drawer_conversation.xml b/app/src/main/res/layout/drawer_conversation.xml index 3fa599d23..8da244c4b 100644 --- a/app/src/main/res/layout/drawer_conversation.xml +++ b/app/src/main/res/layout/drawer_conversation.xml @@ -14,17 +14,21 @@ You should have received a copy of the GNU General Public License along with Fedilab; if not, see <http://www.gnu.org/licenses> --> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" +<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" - android:id="@+id/container" + android:id="@+id/cardview_container" android:layout_marginHorizontal="@dimen/card_margin" android:layout_width="match_parent" android:layout_height="wrap_content" - - android:layout_marginTop="6dp"> + android:layout_marginTop="6dp" + android:clipChildren="false" + android:clipToPadding="false" + app:cardElevation="0dp" + app:strokeWidth="0dp"> <View + android:id="@+id/divider_card" android:layout_width="match_parent" android:layout_height="1px" android:background="?colorOutline" /> @@ -115,4 +119,4 @@ tools:visibility="visible" /> </androidx.appcompat.widget.LinearLayoutCompat> -</RelativeLayout> +</com.google.android.material.card.MaterialCardView> diff --git a/app/src/main/res/layout/drawer_domain_block.xml b/app/src/main/res/layout/drawer_domain_block.xml index 81edbc780..653b54c49 100644 --- a/app/src/main/res/layout/drawer_domain_block.xml +++ b/app/src/main/res/layout/drawer_domain_block.xml @@ -14,13 +14,20 @@ You should have received a copy of the GNU General Public License along with Fedilab; if not, see <http://www.gnu.org/licenses>. --> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" +<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" + android:id="@+id/cardview_container" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_margin="12dp"> + android:layout_marginHorizontal="6dp" + android:layout_marginTop="6dp" + android:clipChildren="false" + android:clipToPadding="false" + app:cardElevation="0dp" + app:strokeWidth="0dp"> <View + android:id="@+id/divider_card" android:layout_width="match_parent" android:layout_height="1px" android:background="?colorOutline" /> @@ -51,4 +58,4 @@ android:padding="6dp" app:icon="@drawable/ic_baseline_delete_24" /> </androidx.appcompat.widget.LinearLayoutCompat> -</RelativeLayout>
\ No newline at end of file +</com.google.android.material.card.MaterialCardView>
\ No newline at end of file diff --git a/app/src/main/res/layout/drawer_follow.xml b/app/src/main/res/layout/drawer_follow.xml index 0fcc8e74a..a3cf42829 100644 --- a/app/src/main/res/layout/drawer_follow.xml +++ b/app/src/main/res/layout/drawer_follow.xml @@ -14,15 +14,21 @@ You should have received a copy of the GNU General Public License along with Fedilab; if not, see <http://www.gnu.org/licenses> --> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" +<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" + android:id="@+id/cardview_container" + android:layout_marginTop="@dimen/card_margin" + android:clipChildren="false" android:layout_marginHorizontal="@dimen/card_margin" - android:layout_marginTop="@dimen/card_margin"> + android:clipToPadding="false" + app:cardElevation="0dp" + app:strokeWidth="0dp"> <View + android:id="@+id/divider_card" android:layout_width="match_parent" android:layout_height="1px" android:background="?colorOutline" /> @@ -48,6 +54,7 @@ tools:text="User asked to follow you" /> <androidx.appcompat.widget.AppCompatImageView + android:id="@+id/icon" android:layout_width="20dp" android:layout_height="20dp" android:layout_gravity="center" @@ -128,4 +135,4 @@ </androidx.appcompat.widget.LinearLayoutCompat> -</RelativeLayout> +</com.google.android.material.card.MaterialCardView> diff --git a/app/src/main/res/layout/drawer_instance_reg.xml b/app/src/main/res/layout/drawer_instance_reg.xml index 0f97003ab..7eea23d17 100644 --- a/app/src/main/res/layout/drawer_instance_reg.xml +++ b/app/src/main/res/layout/drawer_instance_reg.xml @@ -14,14 +14,21 @@ You should have received a copy of the GNU General Public License along with Fedilab; if not, see <http://www.gnu.org/licenses>. --> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" +<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_margin="12dp"> + android:id="@+id/cardview_container" + android:layout_marginHorizontal="@dimen/card_margin" + android:layout_marginTop="@dimen/card_margin" + android:clipChildren="false" + android:clipToPadding="false" + app:cardElevation="0dp" + app:strokeWidth="0dp"> <View + android:id="@+id/divider_card" android:layout_width="match_parent" android:layout_height="1px" android:background="?colorOutline" /> @@ -49,7 +56,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginStart="6dp" - android:textAppearance="@style/TextAppearance.Material3.HeadlineMedium" + android:textAppearance="@style/TextAppearance.Material3.TitleMedium" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/instance_pp" app:layout_constraintTop_toTopOf="parent" @@ -99,4 +106,4 @@ </androidx.constraintlayout.widget.ConstraintLayout> -</RelativeLayout>
\ No newline at end of file +</com.google.android.material.card.MaterialCardView>
\ No newline at end of file diff --git a/app/src/main/res/layout/drawer_status.xml b/app/src/main/res/layout/drawer_status.xml index 3a741fe3f..23a237402 100644 --- a/app/src/main/res/layout/drawer_status.xml +++ b/app/src/main/res/layout/drawer_status.xml @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with Fedilab; if not, see <http://www.gnu.org/licenses> --> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" +<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:id="@+id/cardview_container" @@ -22,13 +22,10 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="@dimen/card_margin" android:layout_marginTop="@dimen/card_margin" + android:clipChildren="false" android:clipToPadding="false" - android:clipChildren="false"> - - <View - android:layout_width="match_parent" - android:layout_height="1px" - android:background="?colorOutline" /> + app:cardElevation="0dp" + app:strokeWidth="0dp"> <androidx.appcompat.widget.LinearLayoutCompat android:id="@+id/main_container" @@ -39,6 +36,16 @@ android:clipToPadding="false" android:orientation="vertical"> + <androidx.appcompat.widget.LinearLayoutCompat + android:id="@+id/fetch_more_container_top" + android:layout_width="match_parent" + android:layout_height="wrap_content" /> + + <View + android:id="@+id/divider_card" + android:layout_width="match_parent" + android:layout_height="1px" + android:background="?colorOutline" /> <androidx.appcompat.widget.LinearLayoutCompat android:id="@+id/status_booster_info" @@ -576,30 +583,30 @@ android:layout_height="48dp" android:layout_marginStart="48dp" android:layout_marginTop="6dp" - android:layout_marginEnd="6dp" android:clipChildren="false" android:clipToPadding="false"> <androidx.appcompat.widget.LinearLayoutCompat android:id="@+id/action_button_reply_container" android:layout_width="wrap_content" - android:layout_height="wrap_content" + android:layout_height="48dp" android:orientation="horizontal" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent"> + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintVertical_bias="0.0"> - <androidx.appcompat.widget.AppCompatImageView + <androidx.appcompat.widget.AppCompatImageButton android:id="@+id/action_button_reply" - android:layout_width="28dp" - android:layout_height="28dp" + style="@style/Widget.Material3.Button.IconButton" + android:layout_width="48dp" + android:layout_height="48dp" android:layout_gravity="center" - android:layout_marginStart="6dp" android:adjustViewBounds="true" android:clickable="true" android:contentDescription="@string/reply" android:focusable="true" - app:srcCompat="@drawable/ic_reply" /> + app:srcCompat="@drawable/ic_round_reply_24" /> <androidx.appcompat.widget.AppCompatTextView android:id="@+id/reply_count" @@ -607,6 +614,7 @@ android:layout_height="wrap_content" android:layout_gravity="bottom" android:text="+" + tools:visibility="visible" android:textColor="?colorControlNormal" android:textSize="12sp" android:visibility="gone" @@ -619,16 +627,14 @@ app:layout_constraintEnd_toStartOf="@+id/action_button_favorite" app:layout_constraintStart_toEndOf="@+id/action_button_reply_container" app:layout_constraintTop_toTopOf="parent" - android:layout_width="28dp" - android:layout_height="28dp" - android:layout_marginStart="12dp" - android:layout_marginTop="2dp" + android:layout_width="48dp" + android:layout_height="48dp" android:adjustViewBounds="true" android:contentDescription="@string/reblog_add" - app:sparkbutton_activeImage="@drawable/ic_repeat" + app:sparkbutton_activeImage="@drawable/ic_round_repeat_24" app:sparkbutton_animationSpeed="1.5" - app:sparkbutton_iconSize="28dp" - app:sparkbutton_inActiveImage="@drawable/ic_repeat" + app:sparkbutton_iconSize="24dp" + app:sparkbutton_inActiveImage="@drawable/ic_round_repeat_24" app:sparkbutton_primaryColor="@color/boost_icon" app:sparkbutton_secondaryColor="@color/boost_icon" /> @@ -638,17 +644,15 @@ app:layout_constraintEnd_toStartOf="@+id/action_button_bookmark" app:layout_constraintStart_toEndOf="@+id/action_button_boost" app:layout_constraintTop_toTopOf="parent" - android:layout_width="28dp" - android:layout_height="28dp" + android:layout_width="48dp" + android:layout_height="48dp" android:layout_gravity="center" - android:layout_marginStart="12dp" - android:layout_marginTop="2dp" android:adjustViewBounds="true" android:contentDescription="@string/favourite_add" - app:sparkbutton_activeImage="@drawable/ic_baseline_star_24" + app:sparkbutton_activeImage="@drawable/ic_round_star_24" app:sparkbutton_animationSpeed="1.5" - app:sparkbutton_iconSize="28dp" - app:sparkbutton_inActiveImage="@drawable/ic_star_outline" + app:sparkbutton_iconSize="24dp" + app:sparkbutton_inActiveImage="@drawable/ic_round_star_border_24" app:sparkbutton_primaryColor="@color/marked_icon" app:sparkbutton_secondaryColor="@color/marked_icon" /> @@ -658,31 +662,29 @@ app:layout_constraintEnd_toStartOf="@+id/status_add_custom_emoji" app:layout_constraintStart_toEndOf="@+id/action_button_favorite" app:layout_constraintTop_toTopOf="parent" - android:layout_width="28dp" - android:layout_height="28dp" + android:layout_width="48dp" + android:layout_height="48dp" android:layout_gravity="center" - android:layout_marginStart="12dp" - android:adjustViewBounds="true" android:contentDescription="@string/bookmark_add" - app:sparkbutton_activeImage="@drawable/ic_baseline_bookmark_24" + app:sparkbutton_activeImage="@drawable/ic_round_bookmark_24" app:sparkbutton_animationSpeed="1.5" app:sparkbutton_iconSize="24dp" - app:sparkbutton_inActiveImage="@drawable/ic_baseline_bookmark_border_24" + app:sparkbutton_inActiveImage="@drawable/ic_round_bookmark_border_24" app:sparkbutton_primaryColor="@color/marked_icon" app:sparkbutton_secondaryColor="@color/marked_icon" /> - <androidx.appcompat.widget.AppCompatImageView + <androidx.appcompat.widget.AppCompatImageButton android:id="@+id/status_add_custom_emoji" + style="@style/Widget.Material3.Button.IconButton" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@+id/status_emoji" app:layout_constraintStart_toEndOf="@+id/action_button_bookmark" app:layout_constraintTop_toTopOf="parent" - android:layout_width="28dp" - android:layout_height="28dp" + android:layout_width="48dp" + android:layout_height="48dp" android:contentDescription="@string/add_reaction" - android:padding="3dp" android:src="@drawable/ic_baseline_emoji_emotions_24" android:layout_gravity="center" android:adjustViewBounds="true" @@ -691,17 +693,16 @@ android:visibility="gone" tools:visibility="visible" /> - <androidx.appcompat.widget.AppCompatImageView + <androidx.appcompat.widget.AppCompatImageButton android:id="@+id/status_emoji" + style="@style/Widget.Material3.Button.IconButton" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@+id/action_button_more" app:layout_constraintStart_toEndOf="@+id/status_add_custom_emoji" app:layout_constraintTop_toTopOf="parent" - android:layout_width="28dp" - android:layout_height="28dp" - android:layout_marginStart="6dp" + android:layout_width="48dp" + android:layout_height="48dp" android:contentDescription="@string/add_reaction" - android:padding="3dp" android:layout_gravity="center" android:adjustViewBounds="true" android:clickable="true" @@ -710,28 +711,28 @@ android:visibility="gone" tools:visibility="visible" /> - <androidx.appcompat.widget.AppCompatImageView + <androidx.appcompat.widget.AppCompatImageButton android:id="@+id/action_button_more" + style="@style/Widget.Material3.Button.IconButton" android:layout_gravity="center|end" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" android:contentDescription="@string/display_options" - android:layout_width="28dp" - android:layout_height="28dp" + android:layout_width="48dp" + android:layout_height="48dp" app:layout_constraintTop_toTopOf="parent" android:clickable="true" android:adjustViewBounds="true" android:focusable="true" - app:srcCompat="@drawable/ic_more_horiz" /> + app:srcCompat="@drawable/ic_round_more_horiz_24" /> </androidx.constraintlayout.widget.ConstraintLayout> - <include - android:id="@+id/layout_fetch_more" - layout="@layout/drawer_fetch_more" - android:visibility="gone" - tools:visibility="visible" /> + <androidx.appcompat.widget.LinearLayoutCompat + android:id="@+id/fetch_more_container_bottom" + android:layout_width="match_parent" + android:layout_height="wrap_content" /> </androidx.appcompat.widget.LinearLayoutCompat> -</RelativeLayout> +</com.google.android.material.card.MaterialCardView> diff --git a/app/src/main/res/layout/drawer_status_draft.xml b/app/src/main/res/layout/drawer_status_draft.xml index 1eb24ce4b..20d4c9efa 100644 --- a/app/src/main/res/layout/drawer_status_draft.xml +++ b/app/src/main/res/layout/drawer_status_draft.xml @@ -14,15 +14,21 @@ You should have received a copy of the GNU General Public License along with Fedilab; if not, see <http://www.gnu.org/licenses> --> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" +<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" - android:id="@+id/container" + android:id="@+id/cardview_container" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_margin="12dp"> + android:layout_marginHorizontal="@dimen/card_margin" + android:layout_marginTop="@dimen/card_margin" + android:clipChildren="false" + android:clipToPadding="false" + app:cardElevation="0dp" + app:strokeWidth="0dp"> <View + android:id="@+id/divider_card" android:layout_width="match_parent" android:layout_height="1px" android:background="?colorOutline" /> @@ -106,4 +112,4 @@ </HorizontalScrollView> </androidx.appcompat.widget.LinearLayoutCompat> -</RelativeLayout> +</com.google.android.material.card.MaterialCardView> diff --git a/app/src/main/res/layout/drawer_status_filtered.xml b/app/src/main/res/layout/drawer_status_filtered.xml index 69154e28a..ad55cf66c 100644 --- a/app/src/main/res/layout/drawer_status_filtered.xml +++ b/app/src/main/res/layout/drawer_status_filtered.xml @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with Fedilab; if not, see <http://www.gnu.org/licenses> --> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" +<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:id="@+id/cardview_container" @@ -23,9 +23,12 @@ android:layout_marginHorizontal="@dimen/card_margin" android:layout_marginTop="@dimen/card_margin" android:clipChildren="false" - android:clipToPadding="false"> + android:clipToPadding="false" + app:cardElevation="0dp" + app:strokeWidth="0dp"> <View + android:id="@+id/divider_card" android:layout_width="match_parent" android:layout_height="1px" android:background="?colorOutline" /> @@ -78,4 +81,4 @@ tools:visibility="visible" /> </androidx.appcompat.widget.LinearLayoutCompat> </androidx.constraintlayout.widget.ConstraintLayout> -</RelativeLayout>
\ No newline at end of file +</com.google.android.material.card.MaterialCardView>
\ No newline at end of file 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 4b7b32232..a4b85bdf4 100644 --- a/app/src/main/res/layout/drawer_status_filtered_hide.xml +++ b/app/src/main/res/layout/drawer_status_filtered_hide.xml @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with Fedilab; if not, see <http://www.gnu.org/licenses> --> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" +<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:id="@+id/cardview_container" @@ -23,9 +23,12 @@ android:layout_marginHorizontal="@dimen/card_margin" android:layout_marginTop="@dimen/card_margin" android:clipChildren="false" - android:clipToPadding="false"> + android:clipToPadding="false" + app:cardElevation="0dp" + app:strokeWidth="0dp"> <View + android:id="@+id/divider_card" android:layout_width="match_parent" android:layout_height="1px" android:background="?colorOutline" /> @@ -47,4 +50,4 @@ app:layout_constraintTop_toTopOf="parent" tools:visibility="visible" /> </androidx.appcompat.widget.LinearLayoutCompat> -</RelativeLayout>
\ No newline at end of file +</com.google.android.material.card.MaterialCardView>
\ No newline at end of file diff --git a/app/src/main/res/layout/drawer_status_history.xml b/app/src/main/res/layout/drawer_status_history.xml index 0522d2c66..9bdee310b 100644 --- a/app/src/main/res/layout/drawer_status_history.xml +++ b/app/src/main/res/layout/drawer_status_history.xml @@ -14,17 +14,21 @@ You should have received a copy of the GNU General Public License along with Fedilab; if not, see <http://www.gnu.org/licenses> --> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" +<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" + xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/cardview_container" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginHorizontal="12dp" - android:layout_marginTop="12dp" + android:layout_marginHorizontal="@dimen/card_margin" + android:layout_marginTop="@dimen/card_margin" android:clipChildren="false" - android:clipToPadding="false"> + android:clipToPadding="false" + app:cardElevation="0dp" + app:strokeWidth="0dp"> <View + android:id="@+id/divider_card" android:layout_width="match_parent" android:layout_height="1px" android:background="?colorOutline" /> @@ -100,4 +104,4 @@ tools:text="@tools:sample/lorem/random" /> </androidx.appcompat.widget.LinearLayoutCompat> -</RelativeLayout>
\ No newline at end of file +</com.google.android.material.card.MaterialCardView>
\ No newline at end of file diff --git a/app/src/main/res/layout/drawer_status_scheduled.xml b/app/src/main/res/layout/drawer_status_scheduled.xml index b22296a2c..d2c36eb97 100644 --- a/app/src/main/res/layout/drawer_status_scheduled.xml +++ b/app/src/main/res/layout/drawer_status_scheduled.xml @@ -14,15 +14,21 @@ You should have received a copy of the GNU General Public License along with Fedilab; if not, see <http://www.gnu.org/licenses> --> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" +<com.google.android.material.card.MaterialCardView xmlns:android="http://sc |