Omogucen prikaz autocompleta kada korisnik trazi lokacije ili da doda novu lokaciju.

3 files changed, 83 insertions, 10 deletions

diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityAddPost.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityAddPost.kt
index 995ef4d..f29db17 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityAddPost.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityAddPost.kt
@@ -107,8 +107,6 @@ class ActivityAddPost : AppCompatActivity() {
             imgView}
         addLocation.setOnClickListener {
             val myIntent = Intent(this, MapsActivity::class.java)
-            if(location.text!=null && !location.text.trim().equals(""))
-                myIntent.putExtra("search",location.text.toString())
             startActivityForResult(myIntent,LOCATIONREQCODE)
         }
         addDescription.setOnClickListener {
@@ -254,8 +252,6 @@ class ActivityAddPost : AppCompatActivity() {
             longitude=bundle!!.getDouble("longitude",incorectCoord)
             latitude=bundle!!.getDouble("latitude",incorectCoord)
             var locName=bundle!!.getString("name")
-            if(location.text.toString().trim().equals("") && locName!=null && !locName.toString().trim().equals(""))
-                location.setText(locName,TextView.BufferType.EDITABLE)
         }
     }
     private fun sendPost(){
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/MapsActivity.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/MapsActivity.kt
index 1ff07f6..af3384d 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/MapsActivity.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/MapsActivity.kt
@@ -3,6 +3,7 @@ package com.example.brzodolokacije.Activities
 import android.Manifest
 import android.content.Context
 import android.content.pm.PackageManager
+import android.graphics.Color
 import android.location.Location
 import android.location.LocationManager
 import android.os.Build
@@ -15,17 +16,17 @@ import android.util.Log
 import android.view.KeyEvent
 import android.view.MotionEvent
 import android.view.View
-import android.widget.TextView
-import android.widget.Toast
+import android.widget.*
+import android.widget.AdapterView.OnItemClickListener
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
+import androidx.core.widget.addTextChangedListener
 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
@@ -40,6 +41,8 @@ import org.osmdroid.views.overlay.compass.InternalCompassOrientationProvider
 import org.osmdroid.views.overlay.gestures.RotationGestureOverlay
 import org.osmdroid.views.overlay.mylocation.GpsMyLocationProvider
 import org.osmdroid.views.overlay.mylocation.MyLocationNewOverlay
+import java.util.*
+import kotlin.collections.ArrayList
 
 
 class MapsActivity : AppCompatActivity() {
@@ -52,7 +55,9 @@ class MapsActivity : AppCompatActivity() {
     private lateinit var searchButton: MaterialButton
     private lateinit var gpsButton: FloatingActionButton
     private lateinit var confirmButton: FloatingActionButton
-    private lateinit var searchBar: TextInputEditText
+    private lateinit var searchBar: AutoCompleteTextView
+    //private lateinit var seachSpinner:Spinner
+    //private lateinit var autoText:AutoCompleteTextView
     var client: FusedLocationProviderClient? = null
     var locLongitude:Double?=null
     var locLatitude:Double?=null
@@ -68,7 +73,8 @@ class MapsActivity : AppCompatActivity() {
         searchButton=findViewById<View>(R.id.ActivityMapsSearchButton) as MaterialButton
         gpsButton=findViewById<View>(R.id.ActivityMapsMyLocation) as FloatingActionButton
         confirmButton=findViewById<View>(R.id.ActivityMapsConfirmLocation) as FloatingActionButton
-        searchBar=findViewById<View>(R.id.ActivityMapsSearchBar) as TextInputEditText
+        searchBar=findViewById<View>(R.id.ActivityMapsSearchBar) as AutoCompleteTextView
+        //autoText=findViewById<View>(R.id.ActivityMapsAutoCompleteTextView) as AutoCompleteTextView
         client= LocationServices.getFusedLocationProviderClient(this)
         searchButton.setOnClickListener{
             searchMap()
@@ -91,6 +97,9 @@ class MapsActivity : AppCompatActivity() {
             }
             false
         })
+        searchBar.addTextChangedListener{
+            onTextEnter()
+        }
         val extras = intent.extras
         if (extras != null) {
             val value = extras.getString("search")
@@ -98,10 +107,59 @@ class MapsActivity : AppCompatActivity() {
             searchBar.setText(value,TextView.BufferType.EDITABLE)
             searchMap()
         }
+        setUpSpinner()
+
+
+
+    }
+    var arraySpinner :MutableList<String>?=null
+    var spinnerAdapter: ArrayAdapter<String>?=null
 
+    fun setUpSpinner() {
+        arraySpinner=mutableListOf<String>()
+        arraySpinner!!.add("test")
 
+//    spinnerAdapter= ArrayAdapter<String>(
+//        this,
+//        android.R.layout.simple_list_item_1, arraySpinner!!)
+        spinnerAdapter= ArrayAdapter<String>(
+        this,
+        android.R.layout.simple_list_item_1, arraySpinner!!)
+        searchBar.threshold=1
+        searchBar.setAdapter(spinnerAdapter)
+        searchBar.setOnItemClickListener(OnItemClickListener { parent, view, position, id ->
+            val selected = parent.getItemAtPosition(position) as String
+            Log.d("Main",selected)
+        })
+
+
+        //spinnerAdapter!!.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
+//        seachSpinner.setAdapter(spinnerAdapter)
+//        seachSpinner.setOnItemSelectedListener(object : OnItemSelectedListener {
+//            override fun onItemSelected(
+//                arg0: AdapterView<*>?,
+//                arg1: View,
+//                position: Int,
+//                id: Long
+//            ) {
+//                // TODO Auto-generated method stub
+//                Toast.makeText(baseContext, arraySpinner!!.get(position), Toast.LENGTH_SHORT).show()
+//            }
+//
+//            override fun onNothingSelected(arg0: AdapterView<*>?) {
+//                // TODO Auto-generated method stub
+//            }
+//        })
 
     }
+    var test=1
+    fun onTextEnter(){
+        test++
+        spinnerAdapter!!.add("test"+test)
+        spinnerAdapter!!.notifyDataSetChanged()
+        Log.d("Main","test123")
+        //seachSpinner.performClick()
+    }
     fun returnValue(){
         val intent = intent
         val bundle = Bundle()
@@ -224,6 +282,7 @@ class MapsActivity : AppCompatActivity() {
         }
     }
     fun searchMap(){
+
         var geocoder= GeocoderHelper.getInstance()
         //Log.d("Main",geocoder!!.getFromLocationName("Paris",1)[0].countryName)
         var locString=searchBar.text.toString().trim()
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_maps.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_maps.xml
index 8d37c29..0051893 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_maps.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_maps.xml
@@ -33,6 +33,7 @@
         app:rippleColor="#FFFFFF"
         app:srcCompat="@android:drawable/ic_menu_mylocation" />
 
+
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/ActivityMapsConfirmLocation"
         android:layout_width="wrap_content"
@@ -64,7 +65,7 @@
         app:layout_constraintTop_toTopOf="parent">
 
 
-        <com.google.android.material.textfield.TextInputEditText
+        <AutoCompleteTextView
             android:id="@+id/ActivityMapsSearchBar"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -86,4 +87,21 @@
 
     </androidx.cardview.widget.CardView>
 
+<!--    <Spinner-->
+<!--        android:id="@+id/MapsActivitySpinner"-->
+<!--        android:layout_width="match_parent"-->
+<!--        android:layout_height="40dp"-->
+<!--        android:background="@null"-->
+<!--        app:layout_constraintEnd_toEndOf="parent"-->
+<!--        app:layout_constraintStart_toStartOf="parent"-->
+<!--        app:layout_constraintTop_toBottomOf="@+id/ActivityMapsCardViewSearch" />-->
+
+<!--    <AutoCompleteTextView-->
+<!--        android:id="@+id/ActivityMapsAutoCompleteTextView"-->
+<!--        android:layout_width="match_parent"-->
+<!--        android:layout_height="40dp"-->
+<!--        app:layout_constraintEnd_toEndOf="parent"-->
+<!--        app:layout_constraintStart_toStartOf="parent"-->
+<!--        app:layout_constraintTop_toBottomOf="@+id/ActivityMapsCardViewSearch" />-->
+
   </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file