From 9b059bc69abaa01b76827d3d57cf94f8885a99c1 Mon Sep 17 00:00:00 2001
From: Ognjen Cirkovic <ciraboxkg@gmail.com>
Date: Sun, 13 Nov 2022 21:51:58 +0100
Subject: Promenjen izgled search bar-a. Omoguceno ukoliko korisnik pritisne
 enter da se odmah izvrsi pretraga.

---
 .../Activities/NavigationActivity.kt               |  1 +
 .../brzodolokacije/Fragments/FragmentBrowse.kt     | 24 ++++++--
 .../app/src/main/res/layout/fragment_browse.xml    | 64 +++++++++++++---------
 3 files changed, 57 insertions(+), 32 deletions(-)

(limited to 'Client')

diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/NavigationActivity.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/NavigationActivity.kt
index ce8cdb2..604b373 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/NavigationActivity.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/NavigationActivity.kt
@@ -7,6 +7,7 @@ import android.view.View
 import android.widget.Button
 import android.widget.ImageButton
 import android.widget.Toast
+import androidx.appcompat.app.AppCompatDelegate
 import androidx.fragment.app.Fragment
 import com.example.brzodolokacije.Fragments.*
 import com.example.brzodolokacije.R
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentBrowse.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentBrowse.kt
index 8012583..9d8a68a 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentBrowse.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentBrowse.kt
@@ -12,10 +12,11 @@ import android.os.StrictMode
 import android.os.StrictMode.ThreadPolicy
 import android.preference.PreferenceManager
 import android.util.DisplayMetrics
+import android.view.KeyEvent
 import android.view.LayoutInflater
 import android.view.View
+import android.view.View.OnKeyListener
 import android.view.ViewGroup
-import android.widget.EditText
 import android.widget.Toast
 import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
@@ -23,7 +24,9 @@ import androidx.fragment.app.Fragment
 import com.example.brzodolokacije.R
 import com.example.brzodolokacije.Services.GeocoderHelper
 import com.google.android.gms.location.*
+import com.google.android.material.button.MaterialButton
 import com.google.android.material.floatingactionbutton.FloatingActionButton
+import com.google.android.material.textfield.TextInputEditText
 import org.osmdroid.config.Configuration
 import org.osmdroid.tileprovider.tilesource.TileSourceFactory
 import org.osmdroid.util.GeoPoint
@@ -44,9 +47,9 @@ class FragmentBrowse : Fragment(R.layout.fragment_browse) {
     var mScaleBarOverlay: ScaleBarOverlay?=null
     var mCompassOverlay:CompassOverlay?=null
     private lateinit var locationManager: LocationManager
-    private lateinit var searchButton:FloatingActionButton
+    private lateinit var searchButton: MaterialButton
     private lateinit var gpsButton:FloatingActionButton
-    private lateinit var searchBar: EditText
+    private lateinit var searchBar: TextInputEditText
     var client: FusedLocationProviderClient? = null
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -64,9 +67,9 @@ class FragmentBrowse : Fragment(R.layout.fragment_browse) {
         map=v.findViewById(R.id.FragmentBrowseMapView) as MapView
         map!!.setTileSource(TileSourceFactory.MAPNIK);
         setUpMap()
-        searchButton=v.findViewById<View>(R.id.FragmentBrowseSearchButton) as FloatingActionButton
+        searchButton=v.findViewById<View>(R.id.FragmentBrowseSearchButton) as MaterialButton
         gpsButton=v.findViewById<View>(R.id.FragmentBrowseMyLocation) as FloatingActionButton
-        searchBar=v.findViewById<View>(R.id.FragmentBrowseSearchBar) as EditText
+        searchBar=v.findViewById<View>(R.id.FragmentBrowseSearchBar) as TextInputEditText
         client=LocationServices.getFusedLocationProviderClient(requireActivity())
         searchButton.setOnClickListener{
             searchMap()
@@ -75,6 +78,17 @@ class FragmentBrowse : Fragment(R.layout.fragment_browse) {
         gpsButton.setOnClickListener{
             getLocation()
         }
+        searchBar.setOnKeyListener(OnKeyListener { v1, keyCode, event -> // If the event is a key-down event on the "enter" button
+            if (event.action === KeyEvent.ACTION_DOWN &&
+                keyCode == KeyEvent.KEYCODE_ENTER
+            ) {
+                // Perform action on key press
+                searchMap()
+                return@OnKeyListener true
+            }
+            false
+        })
+
         return v
     }
 
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_browse.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_browse.xml
index 5f20c5f..9e6dd9d 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_browse.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_browse.xml
@@ -15,35 +15,9 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/FragmentBrowseSearchBar" />
+         />
 
-    <com.google.android.material.textfield.TextInputEditText
-        android:id="@+id/FragmentBrowseSearchBar"
-        android:layout_width="250dp"
-        android:layout_height="55dp"
-        android:layout_marginTop="40dp"
-        android:background="@drawable/rounded_white_button_login"
-        android:ems="10"
-        android:hint="  Pretraga"
-        android:inputType="textPersonName"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
 
-    <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/FragmentBrowseSearchButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentStart="true"
-        android:backgroundTint="#FFFFFF"
-        android:clickable="true"
-        android:focusable="true"
-        android:tint="#FFFFFF"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/FragmentBrowseSearchBar"
-        app:layout_constraintTop_toTopOf="@+id/FragmentBrowseSearchBar"
-        app:rippleColor="#FFFFFF"
-        app:srcCompat="@android:drawable/ic_search_category_default" />
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/FragmentBrowseMyLocation"
@@ -60,5 +34,41 @@
         app:rippleColor="#FFFFFF"
         app:srcCompat="@android:drawable/ic_menu_mylocation" />
 
+    <androidx.cardview.widget.CardView
+        android:id="@+id/FragmentBrowseCardViewSearch"
+        android:layout_width="0dp"
+        android:layout_marginTop="60dp"
+        android:layout_height="40dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="16dp"
+        android:elevation="0dp"
+        app:cardCornerRadius="20dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/FragmentBrowseSearchBar"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@drawable/rounded_white_button_login"
+            android:hint="  Pretraga"
+            android:inputType="textPersonName"
+            android:paddingLeft="15dp" />
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/FragmentBrowseSearchButton"
+            android:layout_width="49dp"
+            android:layout_height="match_parent"
+            android:layout_gravity="right"
+            android:background="#00FFFFFF"
+            app:backgroundTint="#00FFFFFF"
+            app:cornerRadius="16dp"
+            app:icon="@drawable/ic_baseline_search_24"
+            app:iconTint="#333D70" />
+
+    </androidx.cardview.widget.CardView>
+
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
-- 
cgit v1.2.3