diff options
Diffstat (limited to 'Client')
3 files changed, 34 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..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,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).show() + } + if(uploadedImages==null ||uploadedImages!!.size<=0) + { + 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 aafed60..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 @@ -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).show() + } + if(locationId==null || locationId!!.trim()=="") + { + 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/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()){ |