From 9879e3eeb64b58e65c66f8c12f0e7ed96a9bcbf3 Mon Sep 17 00:00:00 2001 From: Ognjen Cirkovic Date: Mon, 12 Dec 2022 17:55:07 +0100 Subject: Dodate toast poruke prilikom dodavanja objave. --- .../com/example/brzodolokacije/Activities/ActivityAddPost.kt | 6 +++++- .../example/brzodolokacije/Activities/ActivityCapturePost.kt | 12 +++++++++++- 2 files changed, 16 insertions(+), 2 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 99bb4f1..d2c865c 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 @@ -184,7 +184,11 @@ class ActivityAddPost : AppCompatActivity() { description.setHintTextColor(Color.RED) } if(locationId==null || locationId!!.trim()==""){ - Toast.makeText(this,"Unesite lokaciju klikom na dugme",Toast.LENGTH_LONG) + Toast.makeText(this@ActivityAddPost,"Unesite lokaciju klikom na dugme",Toast.LENGTH_LONG) + } + if(uploadedImages==null ||uploadedImages!!.size<=0) + { + Toast.makeText(this@ActivityAddPost,"Unesite fotografije",Toast.LENGTH_LONG) } if(!descriptionString.isEmpty() && uploadedImages!!.size>0){ 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 aafed60..b49caf1 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 @@ -200,13 +200,23 @@ class ActivityCapturePost : AppCompatActivity() { } post.setOnClickListener { + Log.d("tsdadasdsa","dsadasdas") // locationString = location.text.toString().trim() descriptionString = description.text.toString().trim() //prazan unos? if (descriptionString.isEmpty()) { description.hint = "Unesite opis" description.setHintTextColor(Color.RED) - }else if(f!=null && locationId!=null && locationId!!.trim()!=""){ + } + if(f==null) + { + Toast.makeText(this@ActivityCapturePost,"Unesite fotografije",Toast.LENGTH_LONG) + } + if(locationId==null || locationId!!.trim()=="") + { + Toast.makeText(this@ActivityCapturePost,"Unesite lokaciju klikom na dugme",Toast.LENGTH_LONG) + } + if(f!=null && locationId!=null && locationId!!.trim()!="" &&!descriptionString.isEmpty()){ uploadLocation() } -- cgit v1.2.3 From 337f57bd9645e369674af388bf17832de11dc680 Mon Sep 17 00:00:00 2001 From: Ognjen Cirkovic Date: Mon, 12 Dec 2022 18:00:49 +0100 Subject: Ispravljeni toastovi. --- .../java/com/example/brzodolokacije/Activities/ActivityAddPost.kt | 4 ++-- .../com/example/brzodolokacije/Activities/ActivityCapturePost.kt | 4 ++-- .../java/com/example/brzodolokacije/Activities/NavigationActivity.kt | 5 +---- 3 files changed, 5 insertions(+), 8 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 d2c865c..23fc5c2 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 @@ -184,11 +184,11 @@ class ActivityAddPost : AppCompatActivity() { description.setHintTextColor(Color.RED) } if(locationId==null || locationId!!.trim()==""){ - Toast.makeText(this@ActivityAddPost,"Unesite lokaciju klikom na dugme",Toast.LENGTH_LONG) + Toast.makeText(this@ActivityAddPost,"Unesite lokaciju klikom na dugme",Toast.LENGTH_LONG).show() } if(uploadedImages==null ||uploadedImages!!.size<=0) { - Toast.makeText(this@ActivityAddPost,"Unesite fotografije",Toast.LENGTH_LONG) + Toast.makeText(this@ActivityAddPost,"Unesite fotografije",Toast.LENGTH_LONG).show() } if(!descriptionString.isEmpty() && uploadedImages!!.size>0){ 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 b49caf1..ccccc0e 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 @@ -210,11 +210,11 @@ class ActivityCapturePost : AppCompatActivity() { } if(f==null) { - Toast.makeText(this@ActivityCapturePost,"Unesite fotografije",Toast.LENGTH_LONG) + Toast.makeText(this@ActivityCapturePost,"Unesite fotografije",Toast.LENGTH_LONG).show() } if(locationId==null || locationId!!.trim()=="") { - Toast.makeText(this@ActivityCapturePost,"Unesite lokaciju klikom na dugme",Toast.LENGTH_LONG) + Toast.makeText(this@ActivityCapturePost,"Unesite lokaciju klikom na dugme",Toast.LENGTH_LONG).show() } if(f!=null && locationId!=null && locationId!!.trim()!="" &&!descriptionString.isEmpty()){ uploadLocation() 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 61c69a0..bac5a3a 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 @@ -63,7 +63,6 @@ class NavigationActivity : AppCompatActivity() { bottomSheetDialog2.setContentView(R.layout.bottom_sheet_add_new_post) bottomSheetDialog2.show() - var close=bottomSheetDialog2.findViewById(R.id.btnBottomSheetAddNewPostClose) as ImageButton var openAddPost=bottomSheetDialog2.findViewById(R.id.btnBottomSheetAddNewPostOpenAddPost) as Button var capturePost=bottomSheetDialog2.findViewById(R.id.btnBottomSheetAddNewPostOpenCapturePost) as Button @@ -77,9 +76,7 @@ class NavigationActivity : AppCompatActivity() { val intent = Intent (this, ActivityCapturePost::class.java) startActivity(intent) } - close.setOnClickListener { - bottomSheetDialog2.dismiss() - } + } private fun showBottomSheetAddNew(){ -- cgit v1.2.3 From b673740ec1eb777bf439aab37e7b058b5bb9e14f Mon Sep 17 00:00:00 2001 From: Ognjen Cirkovic Date: Mon, 12 Dec 2022 18:18:29 +0100 Subject: Dodata obavestenja za korisnika prilikom promene lozinke. --- .../Activities/ActivityChangePassword.kt | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityChangePassword.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityChangePassword.kt index d403609..dc732ee 100644 --- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityChangePassword.kt +++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityChangePassword.kt @@ -58,6 +58,24 @@ class ActivityChangePassword : AppCompatActivity() { oldPassError.isVisible=false newPassError.isVisible=false confirmPassError.isVisible=false + if(oldPass.text.toString().trim().isEmpty()) + { + oldPassError.isVisible=true + oldPassError.text="Unesite trenutnu lozinku." + oldPassError.setTextColor(Color.RED) + } + if(newPass.text.toString().trim().isEmpty()) + { + newPassError.isVisible=true + newPassError.text="Unesite novu lozinku." + newPassError.setTextColor(Color.RED) + } + if(confirmPass.text.toString().trim().isEmpty()) + { + confirmPassError.isVisible=true + confirmPassError.text="Potvrdite novu lozinku." + confirmPassError.setTextColor(Color.RED) + } if(oldPass.text.toString().trim().isNotEmpty()&&newPass.text.toString().trim().isNotEmpty() &&confirmPass.text.toString().trim().isNotEmpty()){ -- cgit v1.2.3