diff options
| author | Stefan Niedermann <info@niedermann.it> | 2021-03-28 18:08:51 +0300 |
|---|---|---|
| committer | Niedermann IT-Dienstleistungen <stefan-niedermann@users.noreply.github.com> | 2021-03-28 20:00:49 +0300 |
| commit | e41a7b8b946af28ea24ef139e4ea449e779790cf (patch) | |
| tree | b3750697a1c97fd61e73ea22392ae99a649de918 /app/src/main | |
| parent | f2e7e9a131955249827cf1ec49972ba740338b2e (diff) | |
#630 Search - UI
Signed-off-by: Stefan Niedermann <info@niedermann.it>
Diffstat (limited to 'app/src/main')
| -rw-r--r-- | app/src/main/java/it/niedermann/nextcloud/deck/ui/MainActivity.java | 2 | ||||
| -rw-r--r-- | app/src/main/res/layout/activity_main.xml | 27 | ||||
| -rw-r--r-- | app/src/main/res/values/strings.xml | 1 |
3 files changed, 19 insertions, 11 deletions
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/MainActivity.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/MainActivity.java index 1f65043d6..e167e82ca 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/MainActivity.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/MainActivity.java @@ -936,7 +936,7 @@ public class MainActivity extends BrandedActivity implements DeleteStackListener } else if(binding.currentBoardName.hasFocus()) { binding.currentBoardName.setText(null); binding.currentBoardName.clearFocus(); - binding.toolbar.requestFocus(); + // TODO focus goes now to viewPager:first-child (recyclerview) } else { super.onBackPressed(); } diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index b4e771185..3df953318 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -126,24 +126,25 @@ <EditText android:id="@+id/currentBoardName" android:layout_width="0dp" - android:background="@android:color/transparent" android:layout_height="wrap_content" + android:background="@android:color/transparent" + android:inputType="text" + android:maxLines="1" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/archivedCards" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" - android:inputType="text"> - - </EditText> + tools:hint="@string/app_name_short" /> <ImageView android:id="@+id/archivedCards" android:layout_width="wrap_content" - android:layout_height="wrap_content" + android:layout_height="match_parent" android:layout_gravity="center_vertical|end" android:background="?attr/selectableItemBackgroundBorderless" android:contentDescription="@string/action_archived_cards" - android:padding="12dp" + android:paddingStart="@dimen/spacer_1x" + android:paddingEnd="@dimen/spacer_1x" android:tooltipText="@string/action_archived_cards" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" @@ -170,7 +171,10 @@ android:layout_height="wrap_content" android:background="?attr/selectableItemBackgroundBorderless" android:contentDescription="@string/simple_filter" - android:padding="12dp" + android:paddingTop="12dp" + android:paddingBottom="12dp" + android:paddingStart="@dimen/spacer_1x" + android:paddingEnd="@dimen/spacer_1x" android:tooltipText="@string/simple_filter" app:srcCompat="@drawable/ic_filter_list_white_24dp" app:tint="?attr/colorAccent" @@ -181,7 +185,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="bottom|end" - android:layout_marginEnd="12dp" + android:layout_marginEnd="@dimen/spacer_1x" android:layout_marginBottom="12dp" android:contentDescription="@null" android:src="@drawable/circle_grey600_8dp" @@ -192,12 +196,15 @@ <ImageView android:id="@+id/accountSwitcher" - android:layout_width="?attr/actionBarSize" + android:layout_width="48dp" android:layout_height="?attr/actionBarSize" android:layout_gravity="center_vertical|end" android:background="?attr/selectableItemBackgroundBorderless" android:contentDescription="@string/choose_account" - android:padding="12dp" + android:paddingTop="12dp" + android:paddingBottom="12dp" + android:paddingStart="0dp" + android:paddingEnd="@dimen/spacer_1hx" 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 56e96734a..f25cfcdbc 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -149,6 +149,7 @@ <string name="settings_etags_summary">Speeds up synchronization</string> <string name="settings_background_sync">Background synchronization</string> <string name="settings_compress_image_attachments">Compress images on upload</string> + <string name="search_in">Search in %1$s</string> <string name="settings_compress_image_attachments_summary">Faster upload, less quality</string> <string name="pref_value_wifi_and_mobile">Sync on Wi-Fi and mobile data</string> <string name="pref_value_wifi_only">Sync only on Wi-Fi</string> |