diff options
| author | Stefan Niedermann <info@niedermann.it> | 2021-03-28 19:21:19 +0300 |
|---|---|---|
| committer | Niedermann IT-Dienstleistungen <stefan-niedermann@users.noreply.github.com> | 2021-03-28 20:00:49 +0300 |
| commit | f01326fd1920d8b98da11d3101e651c5d796057f (patch) | |
| tree | e17c0ae9443d700aefa466f4c0124c9883654ff8 | |
| parent | d15914a41deb0059cd180528fb6e22ff6a9dae7b (diff) | |
#630 Search - Adjust toolbar buttons
Signed-off-by: Stefan Niedermann <info@niedermann.it>
| -rw-r--r-- | app/src/main/res/layout/activity_main.xml | 35 | ||||
| -rw-r--r-- | app/src/main/res/values/strings.xml | 1 |
2 files changed, 18 insertions, 18 deletions
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index b8c19b2e8..4bccf9adf 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -104,19 +104,19 @@ <com.google.android.material.card.MaterialCardView android:layout_width="match_parent" - android:layout_height="wrap_content" + android:layout_height="?attr/actionBarSize" android:layout_marginStart="@dimen/spacer_2x" android:layout_marginTop="@dimen/spacer_1x" android:layout_marginEnd="@dimen/spacer_2x" android:layout_marginBottom="@dimen/spacer_1hx" android:elevation="2dp" - app:strokeWidth="0dp" - app:cardCornerRadius="@dimen/spacer_1x"> + app:cardCornerRadius="@dimen/spacer_1x" + app:strokeWidth="0dp"> <androidx.constraintlayout.widget.ConstraintLayout android:layout_width="match_parent" - android:layout_height="?attr/actionBarSize" + android:layout_height="wrap_content" tools:title="Deck"> <androidx.appcompat.widget.Toolbar @@ -151,16 +151,16 @@ tools:hint="@string/app_name_short" /> </androidx.appcompat.widget.Toolbar> - <ImageView + <ImageButton android:id="@+id/enableSearch" android:layout_width="wrap_content" - android:layout_height="match_parent" + android:layout_height="0dp" android:layout_gravity="center_vertical|end" - android:background="?attr/selectableItemBackgroundBorderless" - android:contentDescription="@string/action_archived_cards" - android:paddingStart="@dimen/spacer_1x" - android:paddingEnd="@dimen/spacer_1x" - android:tooltipText="@string/action_archived_cards" + android:background="@null" + android:contentDescription="@string/simple_search" + android:paddingStart="@dimen/spacer_1hx" + android:paddingEnd="@dimen/spacer_1hx" + android:tooltipText="@string/simple_search" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/filterWrapper" app:layout_constraintTop_toTopOf="parent" @@ -177,7 +177,7 @@ app:layout_constraintEnd_toStartOf="@id/accountSwitcher" app:layout_constraintTop_toTopOf="parent"> - <ImageView + <ImageButton android:id="@+id/filter" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -208,15 +208,14 @@ <ImageView android:id="@+id/accountSwitcher" - android:layout_width="48dp" - android:layout_height="?attr/actionBarSize" + android:layout_width="44dp" + android:layout_height="0dp" android:layout_gravity="center_vertical|end" android:background="?attr/selectableItemBackgroundBorderless" android:contentDescription="@string/choose_account" - android:paddingStart="0dp" - android:paddingTop="12dp" - android:paddingEnd="@dimen/spacer_1hx" - android:paddingBottom="12dp" + android:padding="@dimen/spacer_1hx" + android:paddingStart="@dimen/spacer_1hx" + android:paddingEnd="@dimen/spacer_1x" android:tooltipText="@string/choose_account" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index f25cfcdbc..27315dda9 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -336,4 +336,5 @@ <string name="log_file">Log file</string> <string name="copying_logs_to_file">Copying logs to file…</string> <string name="account_imported">Account imported</string> + <string name="simple_search">Search</string> </resources> |