karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 2 Activity

Predictive back: for everything except import/export.

Browse Source 
Fixes #1708.
This commit is contained in:
Dennis Guse
2024-05-25 23:43:20 +02:00
parent a90c7deb32
commit 151c3a79de
9 changed files with 49 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/res/layout/marker_list.xml
+12 -2
View File
@@ -22,14 +22,24 @@ limitations under the License.
android:layout_width="match_parent"
android:layout_height="wrap_content">
<com.google.android.material.appbar.MaterialToolbar
<com.google.android.material.search.SearchBar
android:id="@+id/marker_list_toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
app:navigationIcon="@drawable/ic_marker_show_24dp"
app:title="@string/menu_markers" />
app:layout_behavior="@string/searchbar_scrolling_view_behavior"
app:menu="@menu/marker_list" />
</com.google.android.material.appbar.AppBarLayout>
<com.google.android.material.search.SearchView
android:id="@+id/marker_list_search_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:hint="@string/menu_search"
app:layout_anchor="@id/marker_list_toolbar">
<!-- Search suggestions/results go here (ScrollView, RecyclerView, etc.). -->
</com.google.android.material.search.SearchView>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
src/main/res/layout/track_list.xml
+11 -2
View File
@@ -22,15 +22,24 @@ limitations under the License.
android:layout_width="match_parent"
android:layout_height="wrap_content">
<com.google.android.material.appbar.MaterialToolbar
<com.google.android.material.search.SearchBar
android:id="@+id/track_list_toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
app:navigationIcon="@drawable/ic_logo_color_24dp"
app:title="@string/app_name"
app:layout_behavior="@string/searchbar_scrolling_view_behavior"
app:menu="@menu/track_list" />
</com.google.android.material.appbar.AppBarLayout>
<com.google.android.material.search.SearchView
android:id="@+id/track_list_search_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:hint="@string/menu_search"
app:layout_anchor="@id/track_list_toolbar">
<!-- Search suggestions/results go here (ScrollView, RecyclerView, etc.). -->
</com.google.android.material.search.SearchView>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
src/main/res/menu/marker_list.xml
+1 -6
View File
@@ -17,12 +17,7 @@ limitations under the License.
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/marker_list_insert_marker"
android:icon="@drawable/ic_marker_show_24dp"
android:icon="@drawable/ic_marker_add_24dp"
android:title="@string/menu_insert_marker"
app:showAsAction="ifRoom" />
<item
android:id="@+id/marker_list_search"
android:title="@string/menu_search"
app:actionViewClass="androidx.appcompat.widget.SearchView"
app:showAsAction="ifRoom" />
</menu>
src/main/res/menu/track_list.xml
+2 -7
View File
@@ -15,12 +15,6 @@ limitations under the License.
-->
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<!-- TODO SearchAction is only working if it is shown as action. However, only two slots are available. See #757. -->
<item
android:id="@+id/track_list_search"
android:title="@string/menu_search"
app:actionViewClass="androidx.appcompat.widget.SearchView"
app:showAsAction="ifRoom" />
<item
android:id="@+id/track_list_markers"
android:icon="@drawable/ic_marker_show_24dp"
@@ -29,7 +23,8 @@ limitations under the License.
<item
android:id="@+id/track_list_settings"
android:icon="@drawable/ic_settings_24dp"
android:title="@string/menu_settings" />
android:title="@string/menu_settings"
app:showAsAction="ifRoom" />
<item
android:id="@+id/track_list_help"
android:icon="@drawable/ic_help_24dp"