diff options
Diffstat (limited to 'app/src/main/res/layouts/mastodon/layout/drawer_status.xml')
| -rw-r--r-- | app/src/main/res/layouts/mastodon/layout/drawer_status.xml | 177 |
1 files changed, 93 insertions, 84 deletions
diff --git a/app/src/main/res/layouts/mastodon/layout/drawer_status.xml b/app/src/main/res/layouts/mastodon/layout/drawer_status.xml index 13f4d8714..f61e869cf 100644 --- a/app/src/main/res/layouts/mastodon/layout/drawer_status.xml +++ b/app/src/main/res/layouts/mastodon/layout/drawer_status.xml @@ -632,6 +632,7 @@ android:clipChildren="false" android:clipToPadding="false"> + <com.varunest.sparkbutton.SparkButton android:id="@+id/action_button_reply" android:layout_width="48dp" @@ -733,111 +734,119 @@ app:animationSpeed="1.5" app:inactiveImage="@drawable/ic_round_bookmark_border_24" app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toStartOf="@+id/action_button_extra" + app:layout_constraintEnd_toStartOf="@+id/action_button_extra_container" app:layout_constraintStart_toEndOf="@+id/action_button_favorite" app:layout_constraintTop_toTopOf="parent" app:primaryColor="@color/marked_icon" app:secondaryColor="@color/marked_icon" sparkbutton:iconSize="28dp" /> - <com.varunest.sparkbutton.SparkButton - android:id="@+id/action_button_extra" - android:layout_width="48dp" - android:layout_height="48dp" - android:layout_gravity="center" - android:adjustViewBounds="true" - android:contentDescription="@string/set_extand_extra_features_title" - app:activeImage="@drawable/baseline_more_actions" - app:inactiveImage="@drawable/baseline_more_actions" + <HorizontalScrollView + android:id="@+id/action_button_extra_container" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:fillViewport="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@+id/action_button_more" app:layout_constraintStart_toEndOf="@+id/action_button_bookmark" - app:layout_constraintTop_toTopOf="parent" - sparkbutton:iconSize="28dp" /> - - - <androidx.constraintlayout.helper.widget.Flow - android:id="@+id/extra_features_panel" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:background="@drawable/bg_compose_panels" - android:padding="6dp" - android:visibility="gone" - app:constraint_referenced_ids="button_close_extra_features_panel, action_button_quote, action_button_translate, action_button_maths, status_add_custom_emoji, status_emoji, action_button_markdown" - app:flow_horizontalGap="10dp" - app:flow_horizontalStyle="spread_inside" - app:flow_maxElementsWrap="10" - app:flow_wrapMode="aligned" - app:layout_constraintBottom_toBottomOf="@id/action_buttons" - app:layout_constraintEnd_toEndOf="@id/action_button_extra" /> - + app:layout_constraintTop_toTopOf="parent"> - <com.google.android.material.button.MaterialButton - android:id="@+id/button_close_extra_features_panel" - style="@style/Widget.Material3.Button.IconButton.Outlined" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - app:icon="@drawable/ic_baseline_close_24" /> - - <com.google.android.material.button.MaterialButton - android:id="@+id/action_button_quote" - style="@style/Widget.Material3.Button.IconButton" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - app:icon="@drawable/ic_baseline_format_quote_24" /> - - <com.google.android.material.button.MaterialButton - android:id="@+id/action_button_translate" - style="@style/Widget.Material3.Button.IconButton" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - app:icon="@drawable/ic_baseline_translate_24" /> - - - <com.google.android.material.button.MaterialButton - android:id="@+id/action_button_maths" - style="@style/Widget.Material3.Button.IconButton" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - app:icon="@drawable/ic_baseline_functions_24" /> - - <com.google.android.material.button.MaterialButton - android:id="@+id/action_button_markdown" - style="@style/Widget.Material3.Button.IconButton" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - app:icon="@drawable/baseline_code_24" /> + <androidx.appcompat.widget.LinearLayoutCompat + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:orientation="horizontal"> + <com.varunest.sparkbutton.SparkButton + android:id="@+id/action_button_quote" + android:layout_width="48dp" + android:layout_height="48dp" + android:layout_gravity="center" + android:adjustViewBounds="true" + android:contentDescription="@string/quote" + app:activeImage="@drawable/ic_baseline_format_quote_24" + app:animationSpeed="1.5" + app:inactiveImage="@drawable/ic_baseline_format_quote_24" + sparkbutton:iconSize="28dp" /> + + <com.varunest.sparkbutton.SparkButton + android:id="@+id/action_button_translate" + android:layout_width="48dp" + android:layout_height="48dp" + android:layout_gravity="center" + android:adjustViewBounds="true" + android:contentDescription="@string/translate" + app:activeImage="@drawable/ic_baseline_translate_24" + app:animationSpeed="1.5" + app:inactiveImage="@drawable/ic_baseline_translate_24" + sparkbutton:iconSize="28dp" /> + + <com.varunest.sparkbutton.SparkButton + android:id="@+id/action_button_maths" + android:layout_width="48dp" + android:layout_height="48dp" + android:layout_gravity="center" + android:adjustViewBounds="true" + android:contentDescription="@string/formula" + app:activeImage="@drawable/ic_baseline_functions_24" + app:animationSpeed="1.5" + app:inactiveImage="@drawable/ic_baseline_functions_24" + sparkbutton:iconSize="28dp" /> + + <com.varunest.sparkbutton.SparkButton + android:id="@+id/action_button_markdown" + android:layout_width="48dp" + android:layout_height="48dp" + android:layout_gravity="center" + android:adjustViewBounds="true" + android:contentDescription="@string/markdown" + app:activeImage="@drawable/baseline_code_24" + app:animationSpeed="1.5" + app:inactiveImage="@drawable/baseline_code_24" + sparkbutton:iconSize="28dp" /> + + <com.varunest.sparkbutton.SparkButton + android:id="@+id/status_add_custom_emoji" + android:layout_width="48dp" + android:layout_height="48dp" + android:layout_gravity="center" + android:adjustViewBounds="true" + android:contentDescription="@string/add_reaction" + app:activeImage="@drawable/ic_baseline_emoji_emotions_24" + app:animationSpeed="1.5" + app:inactiveImage="@drawable/ic_baseline_emoji_emotions_24" + sparkbutton:iconSize="28dp" /> + + <com.varunest.sparkbutton.SparkButton + android:id="@+id/status_emoji" + android:layout_width="48dp" + android:layout_height="48dp" + android:layout_gravity="center" + android:adjustViewBounds="true" + android:contentDescription="@string/add_reaction" + app:activeImage="@drawable/ic_baseline_add_reaction_24" + app:animationSpeed="1.5" + app:inactiveImage="@drawable/ic_baseline_add_reaction_24" + sparkbutton:iconSize="28dp" /> - <com.google.android.material.button.MaterialButton - android:id="@+id/status_add_custom_emoji" - style="@style/Widget.Material3.Button.IconButton" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - app:icon="@drawable/ic_baseline_emoji_emotions_24" /> + </androidx.appcompat.widget.LinearLayoutCompat> - <com.google.android.material.button.MaterialButton - android:id="@+id/status_emoji" - style="@style/Widget.Material3.Button.IconButton" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - app:icon="@drawable/ic_baseline_add_reaction_24" /> + </HorizontalScrollView> - <androidx.appcompat.widget.AppCompatImageView + <com.varunest.sparkbutton.SparkButton android:id="@+id/action_button_more" - android:layout_width="28dp" - android:layout_height="28dp" - android:layout_gravity="center|end" + 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/display_options" - android:focusable="true" + app:activeImage="@drawable/ic_round_more_horiz_24" + app:inactiveImage="@drawable/ic_round_more_horiz_24" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" - app:srcCompat="@drawable/ic_round_more_horiz_24" /> + sparkbutton:iconSize="28dp" /> + </androidx.constraintlayout.widget.ConstraintLayout> |