diff options
Diffstat (limited to 'app/src/main/res')
20 files changed, 583 insertions, 485 deletions
diff --git a/app/src/main/res/drawable/empty_custom_emoji.xml b/app/src/main/res/drawable/empty_custom_emoji.xml new file mode 100644 index 000000000..7934ee66d --- /dev/null +++ b/app/src/main/res/drawable/empty_custom_emoji.xml @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="utf-8"?> +<shape />
\ No newline at end of file diff --git a/app/src/main/res/drawable/ic_baseline_insert_emoticon_24.xml b/app/src/main/res/drawable/ic_baseline_insert_emoticon_24.xml new file mode 100644 index 000000000..51f988778 --- /dev/null +++ b/app/src/main/res/drawable/ic_baseline_insert_emoticon_24.xml @@ -0,0 +1,10 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:tint="#FFFFFF" + android:viewportWidth="24" + android:viewportHeight="24"> + <path + android:fillColor="@android:color/white" + android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8zM15.5,11c0.83,0 1.5,-0.67 1.5,-1.5S16.33,8 15.5,8 14,8.67 14,9.5s0.67,1.5 1.5,1.5zM8.5,11c0.83,0 1.5,-0.67 1.5,-1.5S9.33,8 8.5,8 7,8.67 7,9.5 7.67,11 8.5,11zM12,17.5c2.33,0 4.31,-1.46 5.11,-3.5L6.89,14c0.8,2.04 2.78,3.5 5.11,3.5z" /> +</vector> diff --git a/app/src/main/res/drawable/ic_baseline_language_24.xml b/app/src/main/res/drawable/ic_baseline_language_24.xml new file mode 100644 index 000000000..b0fd1af38 --- /dev/null +++ b/app/src/main/res/drawable/ic_baseline_language_24.xml @@ -0,0 +1,10 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:tint="#FFFFFF" + android:viewportWidth="24" + android:viewportHeight="24"> + <path + android:fillColor="@android:color/white" + android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM18.92,8h-2.95c-0.32,-1.25 -0.78,-2.45 -1.38,-3.56 1.84,0.63 3.37,1.91 4.33,3.56zM12,4.04c0.83,1.2 1.48,2.53 1.91,3.96h-3.82c0.43,-1.43 1.08,-2.76 1.91,-3.96zM4.26,14C4.1,13.36 4,12.69 4,12s0.1,-1.36 0.26,-2h3.38c-0.08,0.66 -0.14,1.32 -0.14,2 0,0.68 0.06,1.34 0.14,2L4.26,14zM5.08,16h2.95c0.32,1.25 0.78,2.45 1.38,3.56 -1.84,-0.63 -3.37,-1.9 -4.33,-3.56zM8.03,8L5.08,8c0.96,-1.66 2.49,-2.93 4.33,-3.56C8.81,5.55 8.35,6.75 8.03,8zM12,19.96c-0.83,-1.2 -1.48,-2.53 -1.91,-3.96h3.82c-0.43,1.43 -1.08,2.76 -1.91,3.96zM14.34,14L9.66,14c-0.09,-0.66 -0.16,-1.32 -0.16,-2 0,-0.68 0.07,-1.35 0.16,-2h4.68c0.09,0.65 0.16,1.32 0.16,2 0,0.68 -0.07,1.34 -0.16,2zM14.59,19.56c0.6,-1.11 1.06,-2.31 1.38,-3.56h2.95c-0.96,1.65 -2.49,2.93 -4.33,3.56zM16.36,14c0.08,-0.66 0.14,-1.32 0.14,-2 0,-0.68 -0.06,-1.34 -0.14,-2h3.38c0.16,0.64 0.26,1.31 0.26,2s-0.1,1.36 -0.26,2h-3.38z" /> +</vector> diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index d3169a5bf..117b1cf75 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -17,11 +17,26 @@ android:padding="24dp"> <com.google.android.material.button.MaterialButton + android:id="@+id/set_account" + style="@style/Widget.MaterialComponents.Button.OutlinedButton" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingVertical="12dp" + android:text="@string/account" + android:textAlignment="textStart" + android:textColor="@color/cyanea_accent_dark_reference" + app:icon="@drawable/ic_baseline_navigate_next_24" + app:iconGravity="end" + app:iconTint="@color/cyanea_accent_dark_reference" + app:strokeColor="@color/cyanea_accent_dark_reference" /> + + <com.google.android.material.button.MaterialButton android:id="@+id/set_timelines" style="@style/Widget.MaterialComponents.Button.OutlinedButton" android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingVertical="12dp" + android:layout_marginTop="24dp" android:text="@string/settings_category_label_timelines" android:textAlignment="textStart" android:textColor="@color/cyanea_accent_dark_reference" diff --git a/app/src/main/res/layout/drawer_announcement.xml b/app/src/main/res/layout/drawer_announcement.xml index fdb2d27e0..c0c408076 100644 --- a/app/src/main/res/layout/drawer_announcement.xml +++ b/app/src/main/res/layout/drawer_announcement.xml @@ -59,64 +59,9 @@ tools:maxLines="10" tools:text="@tools:sample/lorem/random" /> - <androidx.appcompat.widget.LinearLayoutCompat - android:id="@+id/status_reactions" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="center" - android:layout_marginTop="10dp" - android:layout_marginBottom="10dp" - android:paddingBottom="10dp" - android:orientation="horizontal" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/content"> - - <androidx.recyclerview.widget.RecyclerView - android:id="@+id/reactions_view" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_weight="1" /> - - <androidx.appcompat.widget.AppCompatImageView - android:id="@+id/status_add_custom_emoji" - android:layout_width="30dp" - android:layout_height="30dp" - android:layout_marginStart="10dp" - android:layout_marginEnd="5dp" - android:contentDescription="@string/add_reaction" - android:src="@drawable/ic_baseline_emoji_emotions_24" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" - app:tint="?attr/iconColor" /> - - <androidx.appcompat.widget.AppCompatImageView - android:id="@+id/status_emoji" - android:layout_width="30dp" - android:layout_height="30dp" - android:layout_marginStart="10dp" - android:layout_marginEnd="5dp" - android:contentDescription="@string/add_reaction" - android:src="@drawable/ic_baseline_add_reaction_24" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" - app:tint="?attr/iconColor" /> - - <LinearLayout - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:visibility="gone"> - - <app.fedilab.android.helper.FedilabAutoCompleteTextView - android:id="@+id/fake_edittext" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:importantForAutofill="noExcludeDescendants" - android:inputType="text" /> - </LinearLayout> - </androidx.appcompat.widget.LinearLayoutCompat> + <include + android:id="@+id/layout_reactions" + layout="@layout/layout_reactions" /> </androidx.constraintlayout.widget.ConstraintLayout> </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 93808fc2a..b6caece7a 100644 --- a/app/src/main/res/layout/drawer_status.xml +++ b/app/src/main/res/layout/drawer_status.xml @@ -24,7 +24,7 @@ android:layout_marginTop="@dimen/card_margin" android:clipChildren="false" android:clipToPadding="false" - app:cardElevation="2dp"> + app:cardElevation="0dp"> <androidx.appcompat.widget.LinearLayoutCompat android:layout_width="match_parent" @@ -34,6 +34,9 @@ android:clipChildren="false" android:clipToPadding="false" android:orientation="vertical"> + <com.google.android.material.divider.MaterialDivider + android:layout_width="match_parent" + android:layout_height="1dp" /> <androidx.appcompat.widget.LinearLayoutCompat android:id="@+id/status_booster_info" @@ -77,10 +80,6 @@ tools:text="@tools:sample/full_names" /> </androidx.appcompat.widget.LinearLayoutCompat> - <com.google.android.material.divider.MaterialDivider - android:id="@+id/booster_divider" - android:layout_width="match_parent" - android:layout_height="1dp" /> <androidx.appcompat.widget.LinearLayoutCompat android:id="@+id/header_container" @@ -151,12 +150,19 @@ android:maxLines="1" tools:text="@tools:sample/full_names" /> + <androidx.appcompat.widget.AppCompatImageView + android:id="@+id/visibility_small" + android:layout_width="20dp" + android:layout_height="20dp" + android:layout_marginEnd="5dp" + android:src="@drawable/ic_baseline_public_24" /> + <TextView android:id="@+id/date_short" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" - android:layout_marginEnd="10dp" /> + tools:text="2m" /> </androidx.appcompat.widget.LinearLayoutCompat> @@ -196,9 +202,6 @@ </androidx.appcompat.widget.LinearLayoutCompat> - <com.google.android.material.divider.MaterialDivider - android:layout_width="match_parent" - android:layout_height="1dp" /> <androidx.appcompat.widget.AppCompatTextView android:id="@+id/spoiler" @@ -493,6 +496,27 @@ </androidx.appcompat.widget.LinearLayoutCompat> <androidx.appcompat.widget.LinearLayoutCompat + android:id="@+id/action_share_container" + android:layout_width="match_parent" + android:layout_height="28dp" + android:layout_marginStart="48dp" + android:layout_marginTop="6dp" + android:layout_marginEnd="6dp" + android:clipChildren="false" + android:clipToPadding="false" + android:gravity="end" + android:visibility="gone"> + + <androidx.appcompat.widget.AppCompatImageButton + android:id="@+id/action_share" + style="@style/Widget.AppCompat.Button.Borderless" + android:layout_width="28dp" + android:layout_height="28dp" + android:adjustViewBounds="true" + app:srcCompat="@drawable/ic_baseline_share_24" /> + </androidx.appcompat.widget.LinearLayoutCompat> + + <androidx.appcompat.widget.LinearLayoutCompat android:id="@+id/action_buttons" android:layout_width="match_parent" android:layout_height="28dp" @@ -577,6 +601,12 @@ </androidx.appcompat.widget.LinearLayoutCompat> + <include + android:id="@+id/layout_reactions" + layout="@layout/layout_reactions" + android:visibility="gone" + tools:visibility="visible" /> + </androidx.appcompat.widget.LinearLayoutCompat> </com.google.android.material.card.MaterialCardView> diff --git a/app/src/main/res/layout/drawer_status_compose.xml b/app/src/main/res/layout/drawer_status_compose.xml index c2f8ea26e..550c1e21a 100644 --- a/app/src/main/res/layout/drawer_status_compose.xml +++ b/app/src/main/res/layout/drawer_status_compose.xml @@ -19,12 +19,12 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" + android:id="@+id/cardview_container" android:layout_marginHorizontal="12dp" - android:backgroundTint="?backgroundColorLight" android:layout_marginTop="12dp" android:clipChildren="false" android:clipToPadding="false" - app:cardElevation="2dp"> + app:cardElevation="0dp"> <androidx.constraintlayout.widget.ConstraintLayout 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 afa741a57..701be2ad5 100644 --- a/app/src/main/res/layout/drawer_status_simple.xml +++ b/app/src/main/res/layout/drawer_status_simple.xml @@ -19,6 +19,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" + android:id="@+id/cardview_container" android:layout_marginHorizontal="12dp" android:layout_marginTop="12dp" android:clipChildren="false" diff --git a/app/src/main/res/layout/fragment_login_join.xml b/app/src/main/res/layout/fragment_login_join.xml index 53cd1df89..352349dfd 100644 --- a/app/src/main/res/layout/fragment_login_join.xml +++ b/app/src/main/res/layout/fragment_login_join.xml @@ -86,6 +86,7 @@ <com.google.android.material.button.MaterialButton android:id="@+id/join_mastodon" + style="@style/MyButtonColored" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="12dp" diff --git a/app/src/main/res/layout/fragment_login_register_mastodon.xml b/app/src/main/res/layout/fragment_login_register_mastodon.xml index 4d2e32cc4..40adeb0f1 100644 --- a/app/src/main/res/layout/fragment_login_register_mastodon.xml +++ b/app/src/main/res/layout/fragment_login_register_mastodon.xml @@ -151,6 +151,7 @@ <com.google.android.material.button.MaterialButton android:id="@+id/signup" + style="@style/MyButtonColored" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/sign_up" /> diff --git a/app/src/main/res/layout/layout_reactions.xml b/app/src/main/res/layout/layout_reactions.xml new file mode 100644 index 000000000..46e4b1a0a --- /dev/null +++ b/app/src/main/res/layout/layout_reactions.xml @@ -0,0 +1,60 @@ +<?xml version="1.0" encoding="utf-8"?> +<androidx.appcompat.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + android:id="@+id/status_reactions" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:layout_marginTop="10dp" + android:layout_marginBottom="10dp" + android:orientation="horizontal" + android:paddingBottom="10dp" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/content"> + + <androidx.recyclerview.widget.RecyclerView + android:id="@+id/reactions_view" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" /> + + <androidx.appcompat.widget.AppCompatImageView + android:id="@+id/status_add_custom_emoji" + android:layout_width="30dp" + android:layout_height="30dp" + android:layout_marginStart="10dp" + android:layout_marginEnd="5dp" + android:contentDescription="@string/add_reaction" + android:src="@drawable/ic_baseline_emoji_emotions_24" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + app:tint="?attr/iconColor" /> + + <androidx.appcompat.widget.AppCompatImageView + android:id="@+id/status_emoji" + android:layout_width="30dp" + android:layout_height="30dp" + android:layout_marginStart="10dp" + android:layout_marginEnd="5dp" + android:contentDescription="@string/add_reaction" + android:src="@drawable/ic_baseline_add_reaction_24" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + app:tint="?attr/iconColor" /> + + <LinearLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:visibility="gone"> + + <app.fedilab.android.helper.FedilabAutoCompleteTextView + android:id="@+id/fake_edittext" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:importantForAutofill="noExcludeDescendants" + android:inputType="text" /> + </LinearLayout> +</androidx.appcompat.widget.LinearLayoutCompat>
\ No newline at end of file diff --git a/app/src/main/res/layout/nav_header_main.xml b/app/src/main/res/layout/nav_header_main.xml index 3676b0ce0..efe0f42a5 100644 --- a/app/src/main/res/layout/nav_header_main.xml +++ b/app/src/main/res/layout/nav_header_main.xml @@ -45,8 +45,8 @@ android:layout_gravity="center_vertical" android:contentDescription="@string/profile_picture" android:paddingTop="@dimen/nav_header_vertical_spacing" - tools:src="@tools:sample/avatars" - android:scaleType="fitCenter" /> + android:scaleType="fitCenter" + tools:src="@tools:sample/avatars" /> <androidx.appcompat.widget.LinearLayoutCompat android:id="@+id/change_account" diff --git a/app/src/main/res/layout/popup_status_theme.xml b/app/src/main/res/layout/popup_status_theme.xml index a3fb6a7c6..2d52bcfb4 100644 --- a/app/src/main/res/layout/popup_status_theme.xml +++ b/app/src/main/res/layout/popup_status_theme.xml @@ -1,450 +1,452 @@ <?xml version="1.0" encoding="utf-8"?> -<androidx.appcompat.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android" +<ScrollView 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:id="@+id/popup_container" - android:layout_height="match_parent" - - android:orientation="vertical"> + android:layout_height="match_parent"> <androidx.appcompat.widget.LinearLayoutCompat - android:id="@+id/background" + android:id="@+id/popup_container" android:layout_width="match_parent" android:layout_height="wrap_content" - android:paddingStart="@dimen/fab_margin" - android:paddingTop="20dp" - android:paddingEnd="@dimen/fab_margin" - android:paddingBottom="20dp"> - - <com.google.android.material.card.MaterialCardView - - android:id="@+id/cardview_container" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginHorizontal="@dimen/card_margin" - android:layout_marginTop="@dimen/card_margin" - android:clipChildren="false" - android:clipToPadding="false" - app:cardElevation="2dp"> + android:orientation="vertical"> - <androidx.appcompat.widget.LinearLayoutCompat + <androidx.appcompat.widget.LinearLayoutCompat + android:id="@+id/background" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginBottom="6dp" - android:clipChildren="false" - android:clipToPadding="false" - android:orientation="vertical"> - - <androidx.appcompat.widget.LinearLayoutCompat - android:id="@+id/header_container" - android:layout_width="match_parent" - android:layout_height="wrap_content"> - - <androidx.appcompat.widget.LinearLayoutCompat - android:id="@+id/status_user_info" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_weight="1" - android:orientation="horizontal" - android:padding="6dp"> - - <androidx.appcompat.widget.AppCompatImageView - android:id="@+id/avatar" - android:layout_width="20dp" - android:layout_height="20dp" - android:scaleType="centerInside" - tools:src="@drawable/ic_person" /> - - <androidx.appcompat.widget.AppCompatTextView - android:id="@+id/display_name" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginStart="6dp" - android:ellipsize="end" - android:maxLines="1" - tools:text="Display Name" /> - - <androidx.appcompat.widget.AppCompatTextView - android:id="@+id/username" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginStart="6dp" - android:alpha="0.7" - android:ellipsize="end" - android:maxLines="1" - tools:text="\@username\@instance.test" /> - </androidx.appcompat.widget.LinearLayoutCompat> - - <androidx.appcompat.widget.LinearLayoutCompat - android:id="@+id/status_booster_info" - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:padding="6dp"> - - <androidx.appcompat.widget.AppCompatImageView - android:id="@+id/status_boost_icon" - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:scaleType="centerInside" - android:src="@drawable/ic_repeat" /> - - <androidx.appcompat.widget.AppCompatImageView - android:id="@+id/status_booster_avatar" - android:layout_width="20dp" - android:layout_height="20dp" - android:scaleType="centerInside" - android:src="@drawable/ic_person" /> - - </androidx.appcompat.widget.LinearLayoutCompat> - - </androidx.appcompat.widget.LinearLayoutCompat> - - <com.google.android.material.divider.MaterialDivider - android:layout_width="match_parent" - android:layout_height="1dp" /> - - <androidx.appcompat.widget.AppCompatTextView - android:id="@+id/spoiler" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginHorizontal="6dp" - android:layout_marginTop="6dp" - android:text="Warning: Lorem Ipsum below" - tools:ignore="HardcodedText" /> - - <androidx.appcompat.widget.AppCompatTextView - android:id="@+id/spoiler_expand" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginHorizontal="6dp" - android:layout_marginTop="6dp" - android:text="@string/show_content" - android:textAppearance="@style/TextAppearance.AppCompat.Body2" - android:textColor="?colorAccent" /> - - <androidx.appcompat.widget.AppCompatTextView - android:id="@+id/status_content" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginHorizontal="6dp" - android:layout_marginTop="6dp" - android:text="@string/lorem_ipsum_text" - android:textIsSelectable="true" - tools:maxLines="10" /> - - <com.google.android.material.button.MaterialButton - android:id="@+id/toggle_truncate" - style="@style/Widget.MaterialComponents.Button.OutlinedButton" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center" - android:paddingTop="1dp" - android:paddingBottom="1dp" - android:text="@string/display_toot_truncate" - android:textAllCaps="false" - android:textSize="14sp" - android:visibility="gone" - app:strokeColor="@color/cyanea_accent_dark_reference" /> - - <androidx.constraintlayout.widget.ConstraintLayout - android:id="@+id/container_trans" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_margin="5dp" - android:orientation="vertical" - android:visibility="gone"> - - <View - android:id="@+id/translation_border_view" - android:layout_width="match_parent" - android:layout_height="0dp" - android:background="@drawable/translation_border" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintTop_toBottomOf="@id/translation_border_top" /> - - <androidx.constraintlayout.widget.Placeholder - android:id="@+id/translation_border_top" - android:layout_width="wrap_content" - android:layout_height="1dp" - app:layout_constraintBottom_toBottomOf="@id/translation_label" - app:layout_constraintEnd_toEndOf="@id/translation_label" - app:layout_constraintTop_toTopOf="@id/translation_label" /> - - <TextView - android:id="@+id/translation_label" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginStart="10dp" - android:background="?backgroundColorLight" - android:paddingStart="2dp" - android:paddingEnd="2dp" - android:text="@string/translation" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" /> - - <TextView - android:id="@+id/status_content_translated" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginStart="8dp" - android:layout_marginTop="4dp" - android:layout_marginEnd="8dp" - android:layout_marginBottom="4dp" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintTop_toBottomOf="@id/translation_label" - app:layout_goneMarginBottom="8dp" /> - - </androidx.constraintlayout.widget.ConstraintLayout> + android:paddingStart="@dimen/fab_margin" + android:paddingTop="20dp" + android:paddingEnd="@dimen/fab_margin" + android:paddingBottom="20dp"> <com.google.android.material.card.MaterialCardView - android:id="@+id/card" + + android:id="@+id/cardview_container" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginHorizontal="6dp" - android:layout_marginTop="6dp" - app:cardCornerRadius="8dp" + android:layout_marginHorizontal="@dimen/card_margin" + android:layout_marginTop="@dimen/card_margin" + android:clipChildren="false" + android:clipToPadding="false" app:cardElevation="2dp"> <androidx.appcompat.widget.LinearLayoutCompat android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_marginBottom="6dp" + android:clipChildren="false" + android:clipToPadding="false" android:orientation="vertical"> - <androidx.appcompat.widget.AppCompatImageView - android:id="@+id/card_image_horizontal" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:adjustViewBounds="true" - android:visibility="gone" - tools:src="@tools:sample/backgrounds/scenic" /> - <androidx.appcompat.widget.LinearLayoutCompat + android:id="@+id/header_container" android:layout_width="match_parent" android:layout_height="wrap_content"> - <androidx.appcompat.widget.AppCompatImageView - android:id="@+id/card_image_vertical" - android:layout_width="0dp" - android:layout_height="match_parent" - android:layout_weight="1" - android:adjustViewBounds="true" - android:scaleType="centerCrop" - android:src="@drawable/fedilab_logo_bubbles" /> |