Search in settings

OsmAnd-java/src/test/java/net/osmand/router/RouteResultPreparationNativeTest.java

@@ -1,6 +1,5 @@
 package net.osmand.router;
 
-
 public class RouteResultPreparationNativeTest extends RouteResultPreparationTest {
 
     public RouteResultPreparationNativeTest(String name, TestEntry te) {

OsmAnd-java/src/test/java/net/osmand/router/RouteResultPreparationTest.java

@@ -5,6 +5,22 @@
 import static net.osmand.util.RouterUtilTest.getRoadId;
 import static net.osmand.util.RouterUtilTest.getRoadStartPoint;
 
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+
+import net.osmand.NativeLibrary;
+import net.osmand.PlatformUtil;
+import net.osmand.binary.BinaryMapIndexReader;
+import net.osmand.router.RoutingConfiguration.RoutingMemoryLimits;
+import net.osmand.util.Algorithms;
+
+import org.apache.commons.logging.Log;
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStreamReader;
@@ -20,22 +36,6 @@
 import java.util.Set;
 import java.util.TreeSet;
 
-import org.apache.commons.logging.Log;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-
-import net.osmand.NativeLibrary;
-import net.osmand.PlatformUtil;
-import net.osmand.binary.BinaryMapIndexReader;
-import net.osmand.router.RoutingConfiguration.RoutingMemoryLimits;
-import net.osmand.util.Algorithms;
-
 /**
  * Created by yurkiss on 04.03.16.
  */

OsmAnd-java/src/test/java/net/osmand/router/RouteTestingTest.java

@@ -2,6 +2,20 @@
 
 import static net.osmand.util.RouterUtilTest.getNativeLibPath;
 
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+
+import net.osmand.NativeLibrary;
+import net.osmand.binary.BinaryMapIndexReader;
+import net.osmand.router.RoutingConfiguration.RoutingMemoryLimits;
+import net.osmand.util.RouterUtilTest;
+
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStreamReader;
@@ -15,20 +29,6 @@
 import java.util.Set;
 import java.util.TreeSet;
 
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-
-import net.osmand.NativeLibrary;
-import net.osmand.binary.BinaryMapIndexReader;
-import net.osmand.router.RoutingConfiguration.RoutingMemoryLimits;
-import net.osmand.util.RouterUtilTest;
-
 @RunWith(Parameterized.class)
 public class RouteTestingTest {
 	private final TestEntry te;

OsmAnd/build-common.gradle

@@ -350,7 +350,7 @@ dependencies {
 	implementation 'androidx.appcompat:appcompat:1.6.1'
 	implementation 'com.google.android.material:material:1.9.0'
 	implementation 'androidx.browser:browser:1.0.0'
-	implementation 'androidx.preference:preference:1.1.0'
+	implementation 'androidx.preference:preference:1.2.1'
 	implementation 'androidx.lifecycle:lifecycle-process:2.6.0'
 	implementation fileTree(include: ['gnu-trove-osmand.jar', 'icu4j-49_1_patched.jar'], dir: 'libs')
 
@@ -394,6 +394,9 @@ dependencies {
 	implementation "androidx.car.app:app-projected:1.4.0"
 
 	implementation 'com.google.android.gms:play-services-location:21.3.0'
+	implementation 'com.github.KnollFrank:SettingsSearch:dd7b5520db'
+	// https://mvnrepository.com/artifact/com.google.guava/guava
+	implementation 'com.google.guava:guava:33.3.1-android'
 
 	//implementation "androidx.tracing:tracing:1.1.0"
 	//debugImplementation 'androidx.test:monitor:1.6.1'

OsmAnd/res/layout-land/map_hud_top.xml

@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:app="http://schemas.android.com/apk/res-auto"
-	xmlns:tools="http://schemas.android.com/tools"
-	android:layout_width="match_parent"
-	android:layout_height="match_parent"
-	android:orientation="vertical">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
 
 	<!-- Container for top widgets: Coordinates, Map markers bar, Street name, Lanes -->
 	<net.osmand.plus.views.controls.VerticalWidgetPanel

OsmAnd/res/layout/custom_searchpreference_fragment.xml

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="?android:attr/windowBackground"
+    android:clipToPadding="false"
+    android:paddingTop="?android:attr/actionBarSize">
+
+    <include
+        android:id="@+id/searchView"
+        layout="@layout/searchpreference_searchbar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintBottom_toTopOf="@+id/searchResultsFragmentContainerView"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <androidx.fragment.app.FragmentContainerView
+        android:id="@+id/searchResultsFragmentContainerView"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/searchView" />
+
+    <include
+        android:id="@+id/progressContainerCustom"
+        layout="@layout/progress_container"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:translationZ="2dp"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="@+id/searchResultsFragmentContainerView"
+        app:layout_constraintEnd_toEndOf="@+id/searchResultsFragmentContainerView"
+        app:layout_constraintStart_toStartOf="@+id/searchResultsFragmentContainerView"
+        app:layout_constraintTop_toTopOf="@+id/searchResultsFragmentContainerView" />
+</androidx.constraintlayout.widget.ConstraintLayout>

OsmAnd/res/layout/custom_searchresults_fragment.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/searchResultsCustom"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+</androidx.constraintlayout.widget.ConstraintLayout>
+

OsmAnd/res/layout/distance_during_navigation_bottom_sheet.xml

@@ -7,6 +7,7 @@
 	android:orientation="vertical">
 
 	<net.osmand.plus.widgets.TextViewEx
+		android:id="@+id/title"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:layout_marginStart="@dimen/content_padding"

OsmAnd/res/layout/make_better_title.xml

@@ -14,6 +14,7 @@
 		app:srcCompat="@drawable/img_feedback" />
 
 	<net.osmand.plus.widgets.TextViewEx
+		android:id="@+id/titleTop"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:gravity="center"
@@ -28,6 +29,7 @@
 		android:paddingEnd="@dimen/content_padding" />
 
 	<TextView
+		android:id="@+id/titleMiddle"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:paddingLeft="@dimen/content_padding"
@@ -39,6 +41,7 @@
 		android:paddingEnd="@dimen/content_padding" />
 
 	<net.osmand.plus.widgets.TextViewEx
+		android:id="@+id/titleBottom"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:layout_marginTop="@dimen/dialog_content_margin"

OsmAnd/res/layout/preference_button.xml

@@ -1,67 +1,69 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:app="http://schemas.android.com/apk/res-auto"
-	xmlns:tools="http://schemas.android.com/tools"
-	android:layout_width="match_parent"
-	android:layout_height="wrap_content"
-	android:background="?attr/list_background_color"
-	android:gravity="center_vertical">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?attr/list_background_color"
+    android:gravity="center_vertical">
 
-	<LinearLayout
-		android:id="@+id/selectable_list_item"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:minHeight="@dimen/bottom_sheet_list_item_height"
-		tools:background="?android:attr/selectableItemBackground">
+    <LinearLayout
+        android:id="@+id/selectable_list_item"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:minHeight="@dimen/bottom_sheet_list_item_height"
+        tools:background="?android:attr/selectableItemBackground">
 
-		<androidx.appcompat.widget.AppCompatImageView
-			android:id="@android:id/icon"
-			android:layout_width="@dimen/standard_icon_size"
-			android:layout_height="@dimen/standard_icon_size"
-			android:layout_gravity="center"
-			android:layout_marginLeft="@dimen/content_padding"
-			android:layout_marginRight="@dimen/content_padding"
-			tools:src="@drawable/ic_action_car_dark"
-			tools:tint="?colorAccent"
-			android:layout_marginEnd="@dimen/content_padding"
-			android:layout_marginStart="@dimen/content_padding" />
+        <androidx.appcompat.widget.AppCompatImageView
+            android:id="@android:id/icon"
+            android:layout_width="@dimen/standard_icon_size"
+            android:layout_height="@dimen/standard_icon_size"
+            android:layout_gravity="center"
+            android:layout_marginStart="@dimen/content_padding"
+            android:layout_marginLeft="@dimen/content_padding"
+            android:layout_marginEnd="@dimen/content_padding"
+            android:layout_marginRight="@dimen/content_padding"
+            tools:src="@drawable/ic_action_car_dark"
+            tools:tint="?colorAccent" />
 
-		<LinearLayout
-			android:layout_width="0dp"
-			android:layout_height="match_parent"
-			android:layout_gravity="center_vertical"
-			android:layout_weight="1"
-			android:layout_marginLeft="@dimen/content_padding"
-			android:layout_marginStart="@dimen/content_padding"
-			android:orientation="vertical">
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginStart="@dimen/content_padding"
+            android:layout_marginLeft="@dimen/content_padding"
+            android:layout_weight="1"
+            android:orientation="vertical">
 
-				<net.osmand.plus.widgets.TextViewEx
-					android:id="@android:id/title"
-					android:layout_width="match_parent"
-					android:layout_height="0dp"
-					android:layout_weight="1"
-					android:layout_gravity="center_vertical"
-					android:gravity="center_vertical"
-					android:ellipsize="marquee"
-					android:singleLine="true"
-					android:textColor="?colorAccent"
-					android:paddingStart="0dp"
-					android:paddingLeft="0dp"
-					android:paddingEnd="@dimen/content_padding"
-					android:paddingRight="@dimen/content_padding"
-					android:textSize="@dimen/default_list_text_size"
-					app:typefaceWeight="medium"
-					tools:text="Button text" />
+            <net.osmand.plus.widgets.TextViewEx
+                android:id="@android:id/title"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_gravity="center_vertical"
+                android:layout_weight="1"
+                android:ellipsize="marquee"
+                android:gravity="center_vertical"
+                android:paddingStart="0dp"
+                android:paddingLeft="0dp"
+                android:paddingEnd="@dimen/content_padding"
+                android:paddingRight="@dimen/content_padding"
+                android:singleLine="true"
+                android:textColor="?colorAccent"
+                android:textSize="@dimen/default_list_text_size"
+                app:typefaceWeight="medium"
+                tools:text="Button text" />
 
-			<View
-				android:id="@+id/divider"
-				android:layout_width="match_parent"
-				android:layout_height="1dp"
-				android:visibility="gone"
-				android:background="?attr/dashboard_divider" />
+            <include layout="@layout/searchable_info_and_preference_path" />
 
-		</LinearLayout>
+            <View
+                android:id="@+id/divider"
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:background="?attr/dashboard_divider"
+                android:visibility="gone" />
 
-	</LinearLayout>
+        </LinearLayout>
+
+    </LinearLayout>
 
 </LinearLayout>