diff options
5 files changed, 33 insertions, 0 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 c084623..746d8b0 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 @@ -53,6 +53,7 @@ class ActivityAddPost : AppCompatActivity() { private lateinit var tagText: EditText private lateinit var tagButtonAdd:Button private lateinit var tagList: MutableList<String> + private lateinit var locText: EditText private var tagidcounter:Int = 0 val LOCATIONREQCODE=123 var locationId:String?=null @@ -81,6 +82,7 @@ class ActivityAddPost : AppCompatActivity() { tagText =findViewById<View>(R.id.acTags) as EditText tagButtonAdd = findViewById<View>(R.id.btnActivityAddPostAddTag) as Button tagLayout = findViewById<View>(R.id.llTags) as LinearLayout + locText=findViewById<View>(R.id.etActivityAddPostLocationText) as EditText addDescription=findViewById<View>(R.id.tvActivityAddPostDescriptiontext)as Button @@ -257,6 +259,10 @@ class ActivityAddPost : AppCompatActivity() { if(requestCode==LOCATIONREQCODE && resultCode== RESULT_OK){ var bundle=data!!.extras locationId=bundle!!.getString("locationId") + var name=bundle!!.getString("name") + locText.isGone=false + locText.isVisible=true + locText.setText(name,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 701d8e8..79062c9 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 @@ -54,6 +54,7 @@ class ActivityCapturePost : AppCompatActivity() { private lateinit var tagList: MutableList<String> private var tagidcounter:Int = 0 private lateinit var addDescription:Button + private lateinit var locText: EditText val LOCATIONREQCODE=123 @@ -78,6 +79,7 @@ class ActivityCapturePost : AppCompatActivity() { tagLayout = findViewById<View>(R.id.llTagsCap) as LinearLayout addDescription=findViewById<View>(R.id.tvActivityCapturePostDescriptiontext)as Button + locText=findViewById<View>(R.id.etActivityAddPostLocationText) as EditText progressDialog= ProgressDialog(this) @@ -243,6 +245,10 @@ class ActivityCapturePost : AppCompatActivity() { if(requestCode==LOCATIONREQCODE && resultCode== RESULT_OK){ var bundle=data!!.extras locationId=bundle!!.getString("locationId") + var name=bundle!!.getString("name") + locText.isGone=false + locText.isVisible=true + locText.setText(name,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 25a2b4b..238c7e8 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 @@ -248,6 +248,7 @@ class MapsActivity : AppCompatActivity() { return } bundle.putString("locationId",selectedLocation!!._id) + bundle.putString("name",selectedLocation!!.name) intent.putExtras(bundle) setResult(RESULT_OK, intent) finish() diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_add_post.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_add_post.xml index 8e3fbb4..405c221 100644 --- a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_add_post.xml +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_add_post.xml @@ -73,6 +73,16 @@ app:layout_constraintHorizontal_bias="0.074" app:layout_constraintStart_toStartOf="parent" /> + <EditText + android:id="@+id/etActivityAddPostLocationText" + android:layout_width="wrap_content" + android:layout_height="50dp" + android:ems="10" + android:enabled="false" + android:visibility="gone" + app:layout_constraintBottom_toBottomOf="@+id/btnActivityAddPostAddLocation" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toEndOf="@+id/btnActivityAddPostAddLocation" /> <Button android:id="@+id/tvActivityAddPostDescriptiontext" android:layout_width="wrap_content" diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_capture_post.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_capture_post.xml index e93fd54..cb2c8dc 100644 --- a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_capture_post.xml +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_capture_post.xml @@ -50,6 +50,16 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.092" app:layout_constraintStart_toStartOf="parent" /> + <EditText + android:id="@+id/etActivityAddPostLocationText" + android:layout_width="wrap_content" + android:layout_height="50dp" + android:ems="10" + android:enabled="false" + android:visibility="gone" + app:layout_constraintBottom_toBottomOf="@+id/btnActivityCapturePostAddLocation" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toEndOf="@+id/btnActivityCapturePostAddLocation" /> <Button android:id="@+id/tvActivityCapturePostDescriptiontext" |