diff options
3 files changed, 21 insertions, 4 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 f79769d..bd3ddb1 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 @@ -83,6 +83,8 @@ 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) } @@ -186,6 +188,9 @@ class ActivityAddPost : AppCompatActivity() { var bundle=data!!.extras 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/ActivityCapturePost.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityCapturePost.kt index 9a36c2f..7f2c264 100644 --- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityCapturePost.kt +++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityCapturePost.kt @@ -11,10 +11,7 @@ import android.os.Bundle import android.provider.MediaStore import android.util.Log import android.view.View -import android.widget.Button -import android.widget.EditText -import android.widget.ImageView -import android.widget.Toast +import android.widget.* import androidx.activity.result.contract.ActivityResultContracts import androidx.appcompat.app.AppCompatActivity import androidx.core.app.ActivityCompat @@ -120,6 +117,8 @@ class ActivityCapturePost : AppCompatActivity() { 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) } @@ -173,6 +172,9 @@ class ActivityCapturePost : AppCompatActivity() { var bundle=data!!.extras 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) } } var f:File?=null 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 1ac8bd2..1ff07f6 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 @@ -15,6 +15,7 @@ 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 androidx.appcompat.app.AppCompatActivity import androidx.core.app.ActivityCompat @@ -90,6 +91,13 @@ class MapsActivity : AppCompatActivity() { } false }) + val extras = intent.extras + if (extras != null) { + val value = extras.getString("search") + Log.d("Main",value!!) + searchBar.setText(value,TextView.BufferType.EDITABLE) + searchMap() + } @@ -99,6 +107,8 @@ class MapsActivity : AppCompatActivity() { val bundle = Bundle() bundle.putDouble("longitude", locLongitude!!) bundle.putDouble("latitude", locLatitude!!) + if(searchBar.text!=null && !searchBar.text.toString().equals("")) + bundle.putString("name", searchBar.text.toString()) intent.putExtras(bundle) setResult(RESULT_OK, intent) finish() |