diff options
Diffstat (limited to 'app/src/main/res/layouts')
4 files changed, 111 insertions, 32 deletions
diff --git a/app/src/main/res/layouts/mastodon/layout/activity_about.xml b/app/src/main/res/layouts/mastodon/layout/activity_about.xml index bc940ac2e..4d7114ad6 100644 --- a/app/src/main/res/layouts/mastodon/layout/activity_about.xml +++ b/app/src/main/res/layouts/mastodon/layout/activity_about.xml @@ -35,14 +35,32 @@ android:text="@string/app_name" android:textSize="20sp" /> <!-- About version --> - <androidx.appcompat.widget.AppCompatTextView - android:id="@+id/about_version" + <androidx.appcompat.widget.LinearLayoutCompat android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_gravity="center_horizontal" android:layout_marginTop="10dp" - android:gravity="center_horizontal" - android:textSize="16sp" /> + android:gravity="center" + android:orientation="horizontal"> + <androidx.appcompat.widget.AppCompatTextView + android:id="@+id/about_version" + tools:text="x.y.z" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:gravity="center_horizontal" + android:textSize="16sp" /> + <com.google.android.material.button.MaterialButton + android:id="@+id/about_version_copy" + style="@style/Widget.Material3.Button.OutlinedButton" + android:layout_width="36dp" + android:layout_height="36dp" + app:iconGravity="textStart" + app:iconPadding="0dp" + android:layout_marginStart="10dp" + android:contentDescription="@string/copy_version" + app:icon="@drawable/ic_copy_link"/> + </androidx.appcompat.widget.LinearLayoutCompat> + <!-- About developer --> <androidx.appcompat.widget.AppCompatTextView diff --git a/app/src/main/res/layouts/mastodon/layout/custom_emoji_picker.xml b/app/src/main/res/layouts/mastodon/layout/custom_emoji_picker.xml new file mode 100644 index 000000000..46d565c30 --- /dev/null +++ b/app/src/main/res/layouts/mastodon/layout/custom_emoji_picker.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<androidx.appcompat.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + xmlns:app="http://schemas.android.com/apk/res-auto" + android:padding="15dp" + android:orientation="vertical"> + <androidx.appcompat.widget.SearchView + android:id="@+id/toolbar_search" + android:layout_width="match_parent" + android:layout_height="wrap_content" + app:iconifiedByDefault="false" + android:layout_gravity="center_vertical" + android:gravity="center" /> + <GridView + android:id="@+id/gridview" + android:layout_width="match_parent" + android:numColumns="5" + android:layout_height="0dp" + android:layout_weight="1"/> +</androidx.appcompat.widget.LinearLayoutCompat>
\ No newline at end of file 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 1f27d35fc..d331c73d4 100644 --- a/app/src/main/res/layouts/mastodon/layout/drawer_status.xml +++ b/app/src/main/res/layouts/mastodon/layout/drawer_status.xml @@ -657,32 +657,53 @@ <androidx.appcompat.widget.AppCompatTextView android:id="@+id/reply_count" + android:layout_marginStart="10dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="bottom" android:text="+" android:textColor="?colorControlNormal" - android:textSize="12sp" android:visibility="gone" tools:ignore="HardcodedText" tools:visibility="visible" /> </androidx.appcompat.widget.LinearLayoutCompat> - <com.varunest.sparkbutton.SparkButton - android:id="@+id/action_button_boost" - android:layout_width="48dp" + + <androidx.appcompat.widget.LinearLayoutCompat + android:id="@+id/action_button_boost_container" + android:layout_width="wrap_content" android:layout_height="48dp" - android:adjustViewBounds="true" - android:contentDescription="@string/reblog_add" - app:activeImage="@drawable/ic_round_repeat_active_24" - app:iconSize="28dp" - app:inactiveImage="@drawable/ic_round_repeat_24" + android:orientation="horizontal" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@+id/action_button_quote" app:layout_constraintStart_toEndOf="@+id/action_button_reply_container" app:layout_constraintTop_toTopOf="parent" - app:primaryColor="@color/boost_icon" - app:secondaryColor="@color/boost_icon" /> + app:layout_constraintVertical_bias="0.0"> + + <com.varunest.sparkbutton.SparkButton + android:id="@+id/action_button_boost" + android:layout_width="48dp" + android:layout_height="48dp" + android:adjustViewBounds="true" + android:layout_gravity="center" + android:contentDescription="@string/reblog_add" + app:activeImage="@drawable/ic_round_repeat_active_24" + app:iconSize="28dp" + app:inactiveImage="@drawable/ic_round_repeat_24" + app:primaryColor="@color/boost_icon" + app:secondaryColor="@color/boost_icon" /> + + <androidx.appcompat.widget.AppCompatTextView + android:id="@+id/boost_count" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="bottom" + android:textColor="?colorControlNormal" + android:visibility="gone" + tools:ignore="HardcodedText" + tools:visibility="visible" /> + + </androidx.appcompat.widget.LinearLayoutCompat> <androidx.appcompat.widget.AppCompatImageView android:id="@+id/action_button_quote" @@ -697,28 +718,44 @@ 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_constraintEnd_toStartOf="@+id/action_button_favorite_container" + app:layout_constraintStart_toEndOf="@+id/action_button_boost_container" app:layout_constraintTop_toTopOf="parent" tools:visibility="visible" /> - <com.varunest.sparkbutton.SparkButton - android:id="@+id/action_button_favorite" - android:layout_width="48dp" + <androidx.appcompat.widget.LinearLayoutCompat + android:id="@+id/action_button_favorite_container" + android:layout_width="wrap_content" android:layout_height="48dp" - android:layout_gravity="center" - android:adjustViewBounds="true" - android:contentDescription="@string/favourite_add" - app:activeImage="@drawable/ic_round_star_24" - app:animationSpeed="1.5" - app:inactiveImage="@drawable/ic_round_star_border_24" + android:orientation="horizontal" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@+id/action_button_bookmark" app:layout_constraintStart_toEndOf="@+id/action_button_quote" app:layout_constraintTop_toTopOf="parent" - app:primaryColor="@color/marked_icon" - app:secondaryColor="@color/marked_icon" - sparkbutton:iconSize="28dp" /> + app:layout_constraintVertical_bias="0.0"> + <com.varunest.sparkbutton.SparkButton + android:id="@+id/action_button_favorite" + android:layout_width="48dp" + android:layout_height="48dp" + android:layout_gravity="center" + android:adjustViewBounds="true" + android:contentDescription="@string/favourite_add" + app:activeImage="@drawable/ic_round_star_24" + app:animationSpeed="1.5" + app:inactiveImage="@drawable/ic_round_star_border_24" + app:primaryColor="@color/marked_icon" + app:secondaryColor="@color/marked_icon" + sparkbutton:iconSize="28dp" /> + <androidx.appcompat.widget.AppCompatTextView + android:id="@+id/favorite_count" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="bottom" + android:textColor="?colorControlNormal" + android:visibility="gone" + tools:ignore="HardcodedText" + tools:visibility="visible" /> + </androidx.appcompat.widget.LinearLayoutCompat> <com.varunest.sparkbutton.SparkButton android:id="@+id/action_button_bookmark" @@ -732,7 +769,7 @@ app:inactiveImage="@drawable/ic_round_bookmark_border_24" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@+id/action_button_translate" - app:layout_constraintStart_toEndOf="@+id/action_button_favorite" + app:layout_constraintStart_toEndOf="@+id/action_button_favorite_container" app:layout_constraintTop_toTopOf="parent" app:primaryColor="@color/marked_icon" app:secondaryColor="@color/marked_icon" diff --git a/app/src/main/res/layouts/mastodon/layout/fragment_pagination.xml b/app/src/main/res/layouts/mastodon/layout/fragment_pagination.xml index 6801a9698..eaef53569 100644 --- a/app/src/main/res/layouts/mastodon/layout/fragment_pagination.xml +++ b/app/src/main/res/layouts/mastodon/layout/fragment_pagination.xml @@ -38,7 +38,10 @@ android:layout_height="wrap_content" android:clipToPadding="false" android:paddingBottom="6dp" - android:scrollbars="none" /> + android:fastScrollEnabled="true" + android:scrollbarSize="5dp" + android:scrollbarThumbVertical="?colorPrimary" + android:scrollbars="vertical" /> </androidx.swiperefreshlayout.widget.SwipeRefreshLayout> |