From 55cdd5a31e9da8c50d1971861dca75fadfb63dc4 Mon Sep 17 00:00:00 2001
From: TAMARA JERINIC <tamara.jerinic@gmail.com>
Date: Tue, 1 Nov 2022 14:02:38 +0100
Subject: Dodat ActivityForgottenPassword. Povezane aktivnosti za promenu
 zaboravljene lozinke.

---
 .../app/src/main/AndroidManifest.xml               |   6 +-
 .../Activities/ActivityForgottenPassword.kt        |  15 +++
 .../Activities/ActivityForgottenPasswordVerify.kt  |  28 ++++++
 .../res/layout/activity_forgotten_password.xml     |   9 +-
 .../layout/activity_forgotten_password_verify.xml  | 106 +++++++++++++++++++++
 .../main/res/layout/activity_login_register.xml    |   2 +-
 6 files changed, 157 insertions(+), 9 deletions(-)
 create mode 100644 Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityForgottenPasswordVerify.kt
 create mode 100644 Client/BrzoDoLokacije/app/src/main/res/layout/activity_forgotten_password_verify.xml

diff --git a/Client/BrzoDoLokacije/app/src/main/AndroidManifest.xml b/Client/BrzoDoLokacije/app/src/main/AndroidManifest.xml
index fd5bdfb..edf65a2 100644
--- a/Client/BrzoDoLokacije/app/src/main/AndroidManifest.xml
+++ b/Client/BrzoDoLokacije/app/src/main/AndroidManifest.xml
@@ -15,10 +15,10 @@
         android:theme="@style/Theme.BrzoDoLokacije"
         android:usesCleartextTraffic="true"
         tools:targetApi="31">
-        <activity android:name=".Activities.ActivityForgottenPassword"/>
+        <activity android:name=".Activities.ActivityForgottenPasswordVerify" />
+        <activity android:name=".Activities.ActivityForgottenPassword" />
         <activity android:name=".Activities.ActivityLoginRegister" />
-        <activity android:name=".Activities.NavigationActivity"/>
-
+        <activity android:name=".Activities.NavigationActivity" />
         <activity
             android:name=".MainActivity"
             android:exported="true">
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 a77ef97..e7c9836 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
@@ -1,12 +1,27 @@
 package com.example.brzodolokacije.Activities
 
+import android.content.Intent
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
+import android.view.View
+import android.widget.Button
+import android.widget.Toast
 import com.example.brzodolokacije.R
 
 class ActivityForgottenPassword : AppCompatActivity() {
+    private lateinit var sendCode: Button
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_forgotten_password)
+
+        sendCode=findViewById<View>(R.id.forgottenPasswordSendCode) as Button
+
+        sendCode.setOnClickListener{
+            intent= Intent(this, ActivityForgottenPasswordVerify::class.java)
+            startActivity(intent)
+        }
+
     }
+
+
 }
\ No newline at end of file
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
new file mode 100644
index 0000000..6533237
--- /dev/null
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityForgottenPasswordVerify.kt
@@ -0,0 +1,28 @@
+package com.example.brzodolokacije.Activities
+
+import android.content.Intent
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import android.view.View
+import android.widget.Button
+import android.widget.Toast
+import com.example.brzodolokacije.MainActivity
+import com.example.brzodolokacije.R
+
+class ActivityForgottenPasswordVerify : AppCompatActivity() {
+    private lateinit var changePassword: Button
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_forgotten_password_verify)
+
+        changePassword=findViewById<View>(R.id.btnChangePassword) as Button
+        changePassword.setOnClickListener{
+            Toast.makeText(
+                this, "Lozinka je uspešno promenjena.", Toast.LENGTH_LONG
+            ).show();
+
+            intent= Intent(this, ActivityLoginRegister::class.java)
+            startActivity(intent)
+        }
+    }
+}
\ No newline at end of file
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 8688a6f..5841b49 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
@@ -29,15 +29,12 @@
             android:text="Zaboravljena lozinka?"
             android:textSize="25dp" />
 
-        <Space
-            android:layout_width="match_parent"
-            android:layout_height="30dp" />
 
         <TextView
             android:id="@+id/textView2"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="Unesi Email adresu na koju ćemo ti poslati link za resetovanje." />
+            android:text="Unesi Email adresu na koju ćemo ti poslati kod za resetovanje." />
 
         <Space
             android:layout_width="match_parent"
@@ -62,9 +59,11 @@
             android:layout_height="30dp" />
 
         <Button
-            android:id="@+id/button"
+            android:id="@+id/forgottenPasswordSendCode"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:background="@drawable/rounded_cyan_button"
+            android:gravity="center"
             android:text="Pošalji Email za promenu lozinke" />
 
         <Space
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
new file mode 100644
index 0000000..c652469
--- /dev/null
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_forgotten_password_verify.xml
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".Activities.ActivityForgottenPassword">
+
+    <LinearLayout
+        android:layout_width="398dp"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.154">
+
+        <ImageView
+            android:id="@+id/imageView"
+            android:layout_width="match_parent"
+            android:layout_height="300dp"
+            app:srcCompat="@mipmap/ic_launcher_foreground" />
+
+        <TextView
+            android:id="@+id/tvActivityForgottenPasswordText"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="Verifikuj novu lozinku"
+            android:textSize="25dp" />
+
+        <Space
+            android:layout_width="match_parent"
+            android:layout_height="20dp" />
+
+        <TextView
+            android:id="@+id/textView2"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="Unesi kod koji je poslat na email." />
+
+
+        <EditText
+            android:id="@+id/editTextTextPersonName"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:ems="10"
+            android:hint="Unesi kod"
+            android:inputType="textPersonName" />
+
+        <Space
+            android:layout_width="match_parent"
+            android:layout_height="20dp" />
+
+        <TextView
+            android:id="@+id/textViewoldpass"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="Nova lozinka" />
+
+        <EditText
+            android:hint="*********"
+            android:id="@+id/editTextoldPassword"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:ems="10"
+            android:inputType="textPassword" />
+
+        <Space
+            android:layout_width="match_parent"
+            android:layout_height="20dp" />
+
+        <TextView
+            android:id="@+id/textViewnewpass"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+
+            android:text="Potvrdi novu lozinku" />
+
+        <EditText
+            android:hint="*********"
+            android:id="@+id/editTextTextPassword"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:ems="10"
+            android:inputType="textPassword" />
+
+        <Space
+            android:layout_width="match_parent"
+            android:layout_height="20dp" />
+
+        <Button
+            android:id="@+id/btnChangePassword"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@drawable/rounded_cyan_button"
+            android:gravity="center"
+            android:text="Promeni lozinku" />
+
+        <Space
+            android:layout_width="match_parent"
+            android:layout_height="30dp" />
+
+    </LinearLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_login_register.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_login_register.xml
index 92b84a0..0f82285 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_login_register.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_login_register.xml
@@ -25,7 +25,7 @@
 
         android:id="@+id/linearLayout"
         android:layout_width="0dp"
-        android:layout_height="55dp"
+        android:layout_height="65dp"
         android:layout_marginStart="50dp"
         android:layout_marginEnd="50dp"
         android:gravity="center|center_horizontal"
-- 
cgit v1.2.3