diff options
Diffstat (limited to 'app/src/main/res/layout')
| -rw-r--r-- | app/src/main/res/layout/drawer_status.xml | 28 | ||||
| -rw-r--r-- | app/src/main/res/layout/drawer_status_compose.xml | 12 | ||||
| -rw-r--r-- | app/src/main/res/layout/drawer_status_simple.xml | 1 | ||||
| -rw-r--r-- | app/src/main/res/layout/popup_links.xml | 59 |
4 files changed, 61 insertions, 39 deletions
diff --git a/app/src/main/res/layout/drawer_status.xml b/app/src/main/res/layout/drawer_status.xml index a265701af..7dcc0a61d 100644 --- a/app/src/main/res/layout/drawer_status.xml +++ b/app/src/main/res/layout/drawer_status.xml @@ -394,6 +394,12 @@ </com.google.android.material.card.MaterialCardView> + <include + android:id="@+id/quoted_message" + layout="@layout/drawer_status_simple" + android:visibility="gone" + tools:visibility="visible" /> + <com.google.android.material.button.MaterialButton android:id="@+id/display_media" android:layout_width="wrap_content" @@ -628,7 +634,7 @@ <com.varunest.sparkbutton.SparkButton android:id="@+id/action_button_boost" app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toStartOf="@+id/action_button_favorite" + app:layout_constraintEnd_toStartOf="@+id/action_button_quote" app:layout_constraintStart_toEndOf="@+id/action_button_reply_container" app:layout_constraintTop_toTopOf="parent" android:layout_width="48dp" @@ -642,11 +648,29 @@ app:sparkbutton_primaryColor="@color/boost_icon" app:sparkbutton_secondaryColor="@color/boost_icon" /> + <androidx.appcompat.widget.AppCompatImageButton + android:id="@+id/action_button_quote" + android:layout_width="48dp" + android:layout_height="48dp" + android:layout_gravity="center" + android:adjustViewBounds="true" + android:background="@color/transparent" + android:clickable="true" + android:contentDescription="@string/translate" + android:focusable="true" + android:src="@drawable/ic_baseline_format_quote_24" + android:visibility="gone" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toStartOf="@+id/action_button_favorite" + app:layout_constraintStart_toEndOf="@+id/action_button_boost" + app:layout_constraintTop_toTopOf="parent" + tools:visibility="visible" /> + <com.varunest.sparkbutton.SparkButton android:id="@+id/action_button_favorite" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@+id/action_button_bookmark" - app:layout_constraintStart_toEndOf="@+id/action_button_boost" + app:layout_constraintStart_toEndOf="@+id/action_button_quote" app:layout_constraintTop_toTopOf="parent" android:layout_width="48dp" android:layout_height="48dp" diff --git a/app/src/main/res/layout/drawer_status_compose.xml b/app/src/main/res/layout/drawer_status_compose.xml index ca778b769..11e6c1bf7 100644 --- a/app/src/main/res/layout/drawer_status_compose.xml +++ b/app/src/main/res/layout/drawer_status_compose.xml @@ -91,6 +91,18 @@ app:layout_constraintTop_toBottomOf="@id/button_emoji" tools:visibility="visible" /> + + <com.google.android.material.button.MaterialButton + android:id="@+id/button_text_format" + style="@style/Fedilab.SmallIconButton" + android:layout_marginEnd="6dp" + android:contentDescription="@string/post_format" + android:visibility="gone" + app:icon="@drawable/ic_baseline_format_size_24" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toBottomOf="@id/button_emoji_one" + tools:visibility="visible" /> + <com.google.android.material.checkbox.MaterialCheckBox android:id="@+id/sensitive_media" android:layout_width="0dp" diff --git a/app/src/main/res/layout/drawer_status_simple.xml b/app/src/main/res/layout/drawer_status_simple.xml index baa53c424..33ee579fb 100644 --- a/app/src/main/res/layout/drawer_status_simple.xml +++ b/app/src/main/res/layout/drawer_status_simple.xml @@ -34,6 +34,7 @@ android:background="?colorOutline" /> <androidx.appcompat.widget.LinearLayoutCompat + android:id="@+id/main_container" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="6dp" diff --git a/app/src/main/res/layout/popup_links.xml b/app/src/main/res/layout/popup_links.xml index 994ef23e6..1ddeb8ef1 100644 --- a/app/src/main/res/layout/popup_links.xml +++ b/app/src/main/res/layout/popup_links.xml @@ -3,67 +3,52 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_margin="@dimen/fab_margin" android:orientation="vertical" - android:padding="@dimen/fab_margin"> + android:padding="12dp"> - <androidx.appcompat.widget.AppCompatTextView + <com.google.android.material.button.MaterialButton android:id="@+id/display_full_link" + style="@style/Widget.Material3.Button.TextButton" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="10dp" - android:layout_marginBottom="10dp" - android:drawableEnd="@drawable/ic_baseline_navigate_next_24" android:text="@string/display_full_link" - android:textColor="?colorPrimary" - android:textSize="16sp" - app:drawableTint="?colorPrimary" /> + android:textAlignment="textStart" + app:icon="@drawable/ic_full_link" /> - <androidx.appcompat.widget.AppCompatTextView + <com.google.android.material.button.MaterialButton android:id="@+id/share_link" + style="@style/Widget.Material3.Button.TextButton" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="10dp" - android:layout_marginBottom="10dp" - android:drawableEnd="@drawable/ic_baseline_navigate_next_24" android:text="@string/share_link" - android:textColor="?colorPrimary" - android:textSize="16sp" - app:drawableTint="?colorPrimary" /> + android:textAlignment="textStart" + app:icon="@drawable/ic_share_link" /> - <androidx.appcompat.widget.AppCompatTextView + <com.google.android.material.button.MaterialButton android:id="@+id/open_other_app" + style="@style/Widget.Material3.Button.TextButton" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="10dp" - android:layout_marginBottom="10dp" - android:drawableEnd="@drawable/ic_baseline_navigate_next_24" android:text="@string/open_other_app" - android:textColor="?colorPrimary" - android:textSize="16sp" - app:drawableTint="?colorPrimary" /> + android:textAlignment="textStart" + app:icon="@drawable/ic_open_external" /> - <androidx.appcompat.widget.AppCompatTextView + <com.google.android.material.button.MaterialButton android:id="@+id/copy_link" + style="@style/Widget.Material3.Button.TextButton" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="10dp" - android:layout_marginBottom="10dp" - android:drawableEnd="@drawable/ic_baseline_navigate_next_24" android:text="@string/copy_link" - android:textColor="?colorPrimary" - android:textSize="16sp" - app:drawableTint="?colorPrimary" /> + android:textAlignment="textStart" + app:icon="@drawable/ic_copy_link" /> - <androidx.appcompat.widget.AppCompatTextView + <com.google.android.material.button.MaterialButton android:id="@+id/check_redirect" + style="@style/Widget.Material3.Button.TextButton" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="10dp" - android:layout_marginBottom="10dp" - android:drawableEnd="@drawable/ic_baseline_navigate_next_24" android:text="@string/check_redirect" - android:textColor="?colorPrimary" - android:textSize="16sp" - app:drawableTint="?colorPrimary" /> + android:textAlignment="textStart" + app:icon="@drawable/ic_check_redirect" /> + </LinearLayout> |