diff options
Diffstat (limited to 'Client')
4 files changed, 33 insertions, 4 deletions
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityForgottenPassword.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityForgottenPassword.kt index b0b7f5e..6dfbeb0 100644 --- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityForgottenPassword.kt +++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityForgottenPassword.kt @@ -46,13 +46,19 @@ class ActivityForgottenPassword : AppCompatActivity() { val intent = Intent(cont, ActivityForgottenPasswordVerify::class.java) intent.putExtra("email", emailString) startActivity(intent) + }else{ + Toast.makeText(this@ActivityForgottenPassword,"Email ne postoji",Toast.LENGTH_LONG).show() } } override fun onFailure(call: Call<ResponseBody?>, t: Throwable) { + Toast.makeText(this@ActivityForgottenPassword,"Email ne postoji",Toast.LENGTH_LONG).show() } }) } + else{ + Toast.makeText(this@ActivityForgottenPassword,"Unesite validan email",Toast.LENGTH_LONG).show() + } } } diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityForgottenPasswordVerify.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityForgottenPasswordVerify.kt index a1db97f..a519a32 100644 --- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityForgottenPasswordVerify.kt +++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityForgottenPasswordVerify.kt @@ -1,6 +1,7 @@ package com.example.brzodolokacije.Activities import android.content.Intent +import android.graphics.Color import androidx.appcompat.app.AppCompatActivity import android.os.Bundle import android.view.View @@ -36,6 +37,19 @@ class ActivityForgottenPasswordVerify : AppCompatActivity() { var pwstr=pw.text.toString().trim() var pwchkstr=pwchk.text.toString().trim() var kodstr=kod.text.toString().trim() + if(kodstr.isEmpty()) + { + kod.hint = "Unesite kod" + kod.setHintTextColor(Color.RED) + } + if(pwstr.isEmpty()){ + pw.hint = "Unesite novu lozinku" + pw.setHintTextColor(Color.RED) + } + if(pwchkstr.isEmpty()){ + pwchk.hint = "Potvrdite novu lozinku" + pwchk.setHintTextColor(Color.RED) + } if(!kodstr.isEmpty() && checkPassword(pwstr,pwchkstr)){ var resetData= ResetPass(email!!,kodstr,pwstr) @@ -47,6 +61,8 @@ class ActivityForgottenPasswordVerify : AppCompatActivity() { if(response.code()==200){ intent = Intent(cont, ActivityLoginRegister::class.java) startActivity(intent) + }else{ + Toast.makeText(this@ActivityForgottenPasswordVerify,"Nevalidan kod",Toast.LENGTH_LONG).show() } } override fun onFailure(call: Call<ResponseBody?>, t: Throwable) { diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_forgotten_password.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_forgotten_password.xml index 5841b49..95545c2 100644 --- a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_forgotten_password.xml +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_forgotten_password.xml @@ -5,10 +5,12 @@ android:layout_width="match_parent" android:layout_height="match_parent" tools:context=".Activities.ActivityForgottenPassword"> - +<androidx.constraintlayout.widget.ConstraintLayout + android:layout_width="match_parent" + android:layout_height="match_parent"> <LinearLayout - android:layout_width="399dp" - android:layout_height="556dp" + android:layout_width="350dp" + android:layout_height="570dp" android:orientation="vertical" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" @@ -71,5 +73,6 @@ android:layout_height="30dp" /> </LinearLayout> +</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_forgotten_password_verify.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_forgotten_password_verify.xml index c652469..0b8b7f0 100644 --- a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_forgotten_password_verify.xml +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_forgotten_password_verify.xml @@ -6,8 +6,11 @@ android:layout_height="match_parent" tools:context=".Activities.ActivityForgottenPassword"> + <androidx.constraintlayout.widget.ConstraintLayout + android:layout_width="match_parent" + android:layout_height="match_parent"> <LinearLayout - android:layout_width="398dp" + android:layout_width="350dp" android:layout_height="match_parent" android:orientation="vertical" app:layout_constraintBottom_toBottomOf="parent" @@ -102,5 +105,6 @@ android:layout_height="30dp" /> </LinearLayout> + </androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file |