Dodati fragmenti za login i registraciju. Dodate neke grafičke komponente.

13 files changed, 536 insertions, 3 deletions

diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityLoginRegister.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityLoginRegister.kt
new file mode 100644
index 0000000..fdfd0e2
--- /dev/null
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityLoginRegister.kt
@@ -0,0 +1,12 @@
+package com.example.brzodolokacije.Activities
+
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import com.example.brzodolokacije.R
+
+class ActivityLoginRegister : AppCompatActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_login_register)
+    }
+}
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentLogin.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentLogin.kt
new file mode 100644
index 0000000..d47a16e
--- /dev/null
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentLogin.kt
@@ -0,0 +1,107 @@
+package com.example.brzodolokacije.Fragments
+
+import android.graphics.Color
+import android.os.Bundle
+import androidx.fragment.app.Fragment
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.Button
+import android.widget.EditText
+import android.widget.TextView
+import android.widget.Toast
+import com.example.brzodolokacije.R
+
+
+class FragmentLogin : Fragment() {
+    // TODO: Rename and change types of parameters
+    private lateinit var password: EditText
+    private lateinit var email: EditText
+    private lateinit var forgottenPassword: TextView
+    private lateinit var login: Button
+    private lateinit var passwordString:String
+    private lateinit var emailString:String
+
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        // Inflate the layout for this fragment
+        val view:View=inflater.inflate(R.layout.fragment_login, container, false)
+
+
+        email = view.findViewById<View>(R.id.etFragmentLoginEmail) as EditText
+        password = view.findViewById<View>(R.id.etFragmentLoginPassword) as EditText
+        forgottenPassword = view.findViewById<View>(R.id.tvFragmentLoginForgottenPassword) as TextView
+        login=view.findViewById<View>(R.id.btnFragmentLoginLogin) as Button
+
+        //osluskivanje unosa
+
+        login.setOnClickListener{
+            emailString=email.text.toString().trim()
+            passwordString=password.text.toString().trim()
+
+            //prazan unos?
+            if(emailString.isEmpty())
+            {
+                email.hint="Unesite Email adresu"
+                email.setHintTextColor(Color.RED)
+            }
+            if(passwordString.isEmpty())
+            {
+                password.hint = "Unesite lozinku"
+                password.setHintTextColor(Color.RED)
+            }
+            if(!emailString.isEmpty() && !passwordString.isEmpty()) {
+
+
+                //proveri da li postoji u bazi
+
+                //UPIT BAZI - ako postoji - idi na pocetnu stranu za logovanog
+
+
+                //UPIT BAZI - ako ne postoji ili je pogresan unos - ispisi poruku
+
+                //DODATI da li postoji korisnicko ime i da li je tacna lozinka
+
+                Toast.makeText(
+                    activity, "Korisnik sa unetim podacima nije pronađen. " + "\n" +
+                            "Proverite podatke i pokušajte ponovo", Toast.LENGTH_LONG
+                ).show();
+
+            }
+        }
+
+
+        return view
+
+    }
+/*
+    companion object {
+        /**
+         * Use this factory method to create a new instance of
+         * this fragment using the provided parameters.
+         *
+         * @param param1 Parameter 1.
+         * @param param2 Parameter 2.
+         * @return A new instance of fragment fragmentLogin.
+         */
+        // TODO: Rename and change types and number of parameters
+        @JvmStatic
+        fun newInstance(param1: String, param2: String) =
+            fragmentLogin().apply {
+                arguments = Bundle().apply {
+                    putString(ARG_PARAM1, param1)
+                    putString(ARG_PARAM2, param2)
+                }
+            }
+    }
+
+ */
+}
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentRegister.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentRegister.kt
new file mode 100644
index 0000000..05348a2
--- /dev/null
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentRegister.kt
@@ -0,0 +1,110 @@
+package com.example.brzodolokacije.Fragments
+
+import android.graphics.Color
+import android.os.Bundle
+import androidx.fragment.app.Fragment
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.Button
+import android.widget.EditText
+import android.widget.Toast
+import com.example.brzodolokacije.R
+
+class FragmentRegister : Fragment() {
+    // TODO: Rename and change types of parameters
+    private lateinit var password: EditText
+    private lateinit var email: EditText
+    private lateinit var username: EditText
+    private lateinit var name: EditText
+    private lateinit var register: Button
+    private lateinit var usernameString:String
+    private lateinit var nameString:String
+    private lateinit var passwordString:String
+    private lateinit var emailString:String
+
+
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        // Inflate the layout for this fragment
+        val view:View=inflater.inflate(R.layout.fragment_register, container, false)
+
+        email = view.findViewById<View>(R.id.etFragmentRegisterEmail) as EditText
+        password = view.findViewById<View>(R.id.etFragmentRegisterPassword) as EditText
+        username = view.findViewById<View>(R.id.etFragmentRegisterUser) as EditText
+        name = view.findViewById<View>(R.id.etFragmentRegisterName) as EditText
+        register=view.findViewById<View>(R.id.btnFragmentRegisterRegister) as Button
+
+        //osluskivanje unosa
+
+        register.setOnClickListener{
+            emailString=email.text.toString().trim()
+            usernameString=username.text.toString().trim()
+            nameString=name.text.toString().trim()
+            passwordString=password.text.toString().trim()
+
+            //prazan unos? neispravan email
+            if(emailString.isEmpty())
+            {
+                email.hint="Unesite Email adresu"
+                email.setHintTextColor(Color.RED)
+            }
+            if(passwordString.isEmpty())
+            {
+                password.hint = "Unesite lozinku"
+                password.setHintTextColor(Color.RED)
+            }
+            if(usernameString.isEmpty())
+            {
+                username.hint = "Unesite korisničko ime"
+                username.setHintTextColor(Color.RED)
+            }
+            if(nameString.isEmpty())
+            {
+                name.hint = "Unesite ime i prezime"
+                name.setHintTextColor(Color.RED)
+            }
+            if(!emailString.isEmpty() && !passwordString.isEmpty() && !nameString.isEmpty() && !usernameString.isEmpty()) {
+
+
+                //proveri da li postoji u bazi
+
+                //UPIT BAZI - ako postoji - greska korisnik je registrovan
+                Toast.makeText(
+                    activity, "Korisnik sa unetim podacima već postoji. " + "\n" +
+                            "Da li želite da se prijavite?", Toast.LENGTH_LONG
+                ).show();
+
+                //UPIT BAZI - ako ne postoji dodaj u bazu
+
+                //***DODATI broj karaktera lozinke, provera da li je email sa @ i .com
+
+            }
+        }
+
+
+        return view
+    }
+/*
+    companion object {
+        /**
+         * Use this factory method to create a new instance of
+         * this fragment using the provided parameters.
+         *
+         * @param param1 Parameter 1.
+         * @param param2 Parameter 2.
+         * @return A new instance of fragment fragmentRegister.
+         */
+        // TODO: Rename and change types and number of parameters
+        @JvmStatic
+        fun newInstance(param1: String, param2: String) =
+            fragmentRegister().apply {
+                arguments = Bundle().apply {
+                    putString(ARG_PARAM1, param1)
+                    putString(ARG_PARAM2, param2)
+                }
+            }
+    }*/
+}
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/res/drawable/b3.jpg b/Client/BrzoDoLokacije/app/src/main/res/drawable/b3.jpg
new file mode 100644
index 0000000..f04899d
--- /dev/null
+++ b/Client/BrzoDoLokacije/app/src/main/res/drawable/b3.jpg
diff --git a/Client/BrzoDoLokacije/app/src/main/res/drawable/rounded_cyan_button.xml b/Client/BrzoDoLokacije/app/src/main/res/drawable/rounded_cyan_button.xml
new file mode 100644
index 0000000..c2c005d
--- /dev/null
+++ b/Client/BrzoDoLokacije/app/src/main/res/drawable/rounded_cyan_button.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners  android:radius="100dp"/>
+    <solid android:color="#FF1C789A"></solid>
+</shape>
diff --git a/Client/BrzoDoLokacije/app/src/main/res/drawable/rounded_white_button_login.xml b/Client/BrzoDoLokacije/app/src/main/res/drawable/rounded_white_button_login.xml
new file mode 100644
index 0000000..60f4b4d
--- /dev/null
+++ b/Client/BrzoDoLokacije/app/src/main/res/drawable/rounded_white_button_login.xml
@@ -0,0 +1,16 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="250dp"
+    android:height="45dp"
+    android:viewportWidth="251"
+    android:viewportHeight="36">
+
+
+        <path
+            android:fillColor="#FFFFFFFF"
+            android:strokeColor="#FF1C789A"
+            android:strokeWidth="1"
+            android:pathData="M0.5 18c0-9.66 7.84-17.5 17.5-17.5h215c9.66 0 17.5 7.84 17.5 17.5v0c0 9.66-7.84 17.5-17.5 17.5h-215c-9.66 0-17.5-7.84-17.5-17.5z"/>
+        <path
+            android:fillColor="#FF1C789A"
+            android:pathData="M54.2 24V13.1h3.89c0.85 0 1.55 0.15 2.1 0.45 0.56 0.31 0.98 0.74 1.26 1.27s0.41 1.13 0.41 1.8c0 0.67-0.14 1.28-0.42 1.81-0.27 0.54-0.7 0.96-1.25 1.27-0.56 0.31-1.26 0.46-2.1 0.46H55.4v-1.4h2.52c0.54 0 0.97-0.08 1.3-0.27 0.34-0.19 0.59-0.44 0.74-0.76 0.16-0.33 0.24-0.7 0.24-1.1 0-0.42-0.08-0.79-0.24-1.1-0.15-0.32-0.4-0.57-0.74-0.76-0.33-0.18-0.77-0.27-1.32-0.27h-2.07V24H54.2Zm9.6 0V13.1h3.88c0.85 0 1.55 0.14 2.1 0.43 0.57 0.29 0.99 0.7 1.26 1.2 0.28 0.52 0.42 1.1 0.42 1.78 0 0.67-0.14 1.26-0.42 1.76-0.28 0.5-0.7 0.9-1.26 1.18-0.56 0.28-1.26 0.42-2.1 0.42h-2.95v-1.42h2.8c0.53 0 0.96-0.07 1.3-0.22 0.33-0.16 0.58-0.38 0.74-0.67 0.15-0.3 0.23-0.64 0.23-1.05 0-0.41-0.08-0.77-0.24-1.07-0.15-0.3-0.4-0.53-0.74-0.7-0.33-0.16-0.77-0.24-1.31-0.24h-2.07V24h-1.65Zm5.38-4.92l2.7 4.92H70l-2.64-4.92h1.82Zm5.93-5.99V24h-1.65V13.1h1.65Zm6.63 0h1.64v7.74c0 0.7-0.13 1.3-0.41 1.79-0.27 0.5-0.66 0.88-1.16 1.14-0.5 0.26-1.08 0.39-1.74 0.39-0.62 0-1.17-0.11-1.66-0.34-0.49-0.22-0.87-0.55-1.16-0.97-0.28-0.43-0.42-0.95-0.42-1.57h1.64c0 0.3 0.07 0.57 0.2 0.79 0.15 0.22 0.34 0.39 0.59 0.51 0.25 0.12 0.53 0.18 0.85 0.18 0.35 0 0.64-0.07 0.88-0.21 0.25-0.15 0.43-0.37 0.56-0.66 0.13-0.29 0.2-0.64 0.2-1.05v-7.74ZM86.7 24h-1.75l3.93-10.9h1.9L94.71 24h-1.75l-3.08-8.93h-0.09L86.7 24Zm0.3-4.27h5.66v1.38H87v-1.38Zm9.1-6.64l3.03 8.89h0.12l3.04-8.89h1.78L100.14 24h-1.9l-3.92-10.9h1.77Zm11.19 0V24h-1.65V13.1h1.65Zm12.32 2.87c-0.06-0.5-0.3-0.9-0.7-1.18-0.42-0.28-0.94-0.42-1.56-0.42-0.45 0-0.84 0.08-1.16 0.22-0.33 0.14-0.58 0.33-0.77 0.57-0.17 0.24-0.26 0.52-0.26 0.83 0 0.26 0.06 0.48 0.18 0.67 0.12 0.19 0.29 0.35 0.48 0.47 0.2 0.13 0.42 0.23 0.65 0.32 0.23 0.08 0.46 0.15 0.67 0.2l1.07 0.28c0.34 0.08 0.7 0.2 1.07 0.34 0.36 0.15 0.7 0.34 1.01 0.58 0.32 0.24 0.57 0.53 0.76 0.88 0.2 0.35 0.3 0.78 0.3 1.27 0 0.61-0.17 1.16-0.49 1.64-0.31 0.48-0.77 0.86-1.38 1.14-0.6 0.27-1.32 0.41-2.17 0.41-0.82 0-1.53-0.13-2.13-0.39-0.6-0.26-1.06-0.62-1.4-1.1-0.33-0.48-0.52-1.05-0.56-1.7h1.66c0.03 0.39 0.16 0.72 0.38 0.98 0.23 0.26 0.52 0.45 0.87 0.58 0.35 0.13 0.74 0.19 1.17 0.19 0.46 0 0.87-0.08 1.24-0.22 0.36-0.15 0.65-0.36 0.86-0.62 0.2-0.27 0.31-0.58 0.31-0.93 0-0.32-0.09-0.59-0.27-0.8-0.19-0.2-0.43-0.37-0.74-0.5-0.31-0.14-0.66-0.26-1.05-0.36l-1.3-0.35c-0.87-0.24-1.56-0.6-2.07-1.05-0.5-0.47-0.76-1.08-0.76-1.84 0-0.62 0.17-1.17 0.5-1.64 0.35-0.47 0.81-0.83 1.4-1.1 0.58-0.26 1.23-0.39 1.97-0.39 0.73 0 1.39 0.13 1.95 0.4 0.57 0.25 1.02 0.6 1.34 1.06 0.33 0.45 0.5 0.97 0.51 1.56h-1.58Zm3.7 8.04V13.1h6.84v1.4h-5.2v3.33h4.84v1.41h-4.83v3.34h5.25V24h-6.9Z"/>
+    </vector>
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/res/drawable/switch_login_register_on.xml b/Client/BrzoDoLokacije/app/src/main/res/drawable/switch_login_register_on.xml
new file mode 100644
index 0000000..6bf62c6
--- /dev/null
+++ b/Client/BrzoDoLokacije/app/src/main/res/drawable/switch_login_register_on.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners  android:radius="100dp"/>
+    <solid android:color="#FFFFFF"></solid>
+    <stroke android:width="2dp" android:color="#FF1C789A"/>
+</shape>
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
new file mode 100644
index 0000000..d276a63
--- /dev/null
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_login_register.xml
@@ -0,0 +1,28 @@
+<?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"
+    android:foreground="@drawable/b3"
+    android:foregroundGravity="fill"
+    android:foregroundTint="#5E010F13"
+    android:foregroundTintMode="add"
+    tools:context=".Activities.ActivityLoginRegister" >
+
+    <androidx.viewpager2.widget.ViewPager2
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:layout_marginStart="50dp"
+        android:layout_marginTop="150dp"
+        android:layout_marginEnd="50dp"
+        android:layout_marginBottom="150dp"
+        android:background="#FFFFFF"
+        android:backgroundTint="#F1EDED"
+        android:foregroundGravity="center"
+        android:foregroundTint="#FFFFFF"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_login.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_login.xml
new file mode 100644
index 0000000..0cefaa3
--- /dev/null
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_login.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout 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=".Fragments.fragmentLogin">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="400dp"
+        android:layout_height="352dp"
+        android:layout_gravity="center_horizontal"
+
+        >
+
+        <TextView
+            android:id="@+id/tvFragimentLoginEmail"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="28dp"
+            android:backgroundTint="#00B8D4"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:text="Email" />
+
+        <EditText
+            android:id="@+id/etFragmentLoginEmail"
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:layout_marginTop="8dp"
+            android:ems="10"
+            android:hint="primer@gmail.com"
+            android:inputType="textEmailAddress"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/tvFragimentLoginEmail" />
+
+        <TextView
+            android:id="@+id/tvFragmentLoginPassword"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="24dp"
+            android:text="TextView"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/etFragmentLoginEmail"
+            tools:text="Lozinka" />
+
+        <EditText
+            android:id="@+id/etFragmentLoginPassword"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:ems="10"
+            android:hint="*********"
+            android:inputType="textPassword"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/tvFragmentLoginPassword" />
+
+        <Button
+            android:id="@+id/btnFragmentLoginLogin"
+            android:layout_width="200dp"
+            android:layout_height="40dp"
+            android:layout_marginTop="40dp"
+            android:background="@drawable/rounded_cyan_button"
+            android:backgroundTint="#1C789A"
+            android:text="Prijavi se"
+            app:layout_constraintDimensionRatio="w,1:1"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/tvFragmentLoginForgottenPassword" />
+
+        <TextView
+            android:id="@+id/tvFragmentLoginForgottenPassword"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="20dp"
+            android:clickable="true"
+            android:text="Zaboravljena lozinka?"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.498"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/etFragmentLoginPassword" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</FrameLayout>
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_register.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_register.xml
new file mode 100644
index 0000000..4eade84
--- /dev/null
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_register.xml
@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout 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=".Fragments.fragmentRegister">
+
+    <!-- TODO: Update blank fragment layout -->
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="400dp"
+        android:layout_height="521dp"
+        android:layout_gravity="center_horizontal">
+
+        <EditText
+            android:id="@+id/etFragmentRegisterPassword"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:ems="10"
+            android:hint="*********"
+            android:inputType="textPassword"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/tvFragmentRegisterPassword" />
+
+        <EditText
+            android:id="@+id/etFragmentRegisterEmail"
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:ems="10"
+            android:hint="primer@gmail.com"
+            android:inputType="textEmailAddress"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/tvFragmentRegisterEmail" />
+
+        <TextView
+            android:id="@+id/tvFragmentRegisterPassword"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:text="Lozinka
+"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/etFragmentRegisterEmail"
+            tools:text="Lozinka" />
+
+        <TextView
+            android:id="@+id/tvFragmentRegisterEmail"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:backgroundTint="#00B8D4"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/etFragmentRegisterName"
+            tools:text="Email" />
+
+        <EditText
+            android:id="@+id/etFragmentRegisterUser"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:ems="10"
+            android:hint="korisnik123
+"
+            android:inputType="textPersonName"
+            app:layout_constraintTop_toBottomOf="@+id/tvFragmentRegisterUser"
+            tools:layout_editor_absoluteX="-16dp" />
+
+        <EditText
+            android:id="@+id/etFragmentRegisterName"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:ems="10"
+            android:hint="Petar Petrovic"
+            android:inputType="textPersonName"
+
+            app:layout_constraintTop_toBottomOf="@+id/tvFragmentRegisterName"
+            tools:layout_editor_absoluteX="0dp" />
+
+        <TextView
+            android:id="@+id/tvFragmentRegisterName"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:text="Ime i prezime"
+            app:layout_constraintTop_toBottomOf="@+id/etFragmentRegisterUser"
+            tools:layout_editor_absoluteX="0dp" />
+
+        <TextView
+            android:id="@+id/tvFragmentRegisterUser"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="88dp"
+            android:text="Korisničko ime"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:layout_editor_absoluteX="0dp" />
+
+        <Button
+            android:id="@+id/btnFragmentRegisterRegister"
+            android:layout_width="200dp"
+            android:layout_height="45dp"
+            android:layout_marginTop="48dp"
+            android:background="@drawable/rounded_cyan_button"
+            android:text="Registruj se"
+            android:textSize="16dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/etFragmentRegisterPassword" />
+
+        <TextView
+            android:id="@+id/textView4"
+            android:layout_width="200dp"
+            android:layout_height="45dp"
+            android:layout_marginStart="176dp"
+            android:background="@drawable/rounded_cyan_button"
+            android:gravity="center"
+            android:text="REGISTRUJ SE"
+            android:textColor="#ffffff"
+            android:textSize="16dp"
+            android:translationZ="50dp"
+            app:layout_constraintBottom_toTopOf="@+id/tvFragmentRegisterUser"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.058"
+            app:layout_constraintStart_toStartOf="@+id/button2"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <Button
+            android:id="@+id/button2"
+            android:layout_width="230dp"
+            android:layout_height="45dp"
+            android:layout_marginStart="16dp"
+            android:background="@drawable/switch_login_register_on"
+            android:backgroundTint="#D1BCBC"
+            android:foreground="@drawable/rounded_white_button_login"
+
+            android:text="Registruj se"
+            android:textColor="#00B8D4"
+            android:translationZ="1dp"
+            app:layout_constraintBottom_toTopOf="@+id/tvFragmentRegisterUser"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="0.511" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+    />
+</FrameLayout>
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/res/values-night/themes.xml b/Client/BrzoDoLokacije/app/src/main/res/values-night/themes.xml
index 2fa4285..dabe4b8 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/values-night/themes.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/values-night/themes.xml
@@ -2,7 +2,7 @@
     <!-- Base application theme. -->
     <style name="Theme.BrzoDoLokacije" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
         <!-- Primary brand color. -->
-        <item name="colorPrimary">@color/purple_200</item>
+        <item name="colorPrimary">@color/white</item>
         <item name="colorPrimaryVariant">@color/purple_700</item>
         <item name="colorOnPrimary">#071935</item>
         <!-- Secondary brand color. -->
diff --git a/Client/BrzoDoLokacije/app/src/main/res/values/colors.xml b/Client/BrzoDoLokacije/app/src/main/res/values/colors.xml
index f8c6127..250df8e 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/values/colors.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/values/colors.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <color name="purple_200">#FFBB86FC</color>
-    <color name="purple_500">#FF6200EE</color>
-    <color name="purple_700">#FF3700B3</color>
+    <color name="purple_500">#1C789A</color>
+    <color name="purple_700">#1C789A</color>
     <color name="teal_200">#FF03DAC5</color>
     <color name="teal_700">#FF018786</color>
     <color name="black">#FF000000</color>
diff --git a/Client/BrzoDoLokacije/app/src/main/res/values/strings.xml b/Client/BrzoDoLokacije/app/src/main/res/values/strings.xml
index bd12106..d7b376c 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/values/strings.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/values/strings.xml
@@ -1,3 +1,6 @@
 <resources>
     <string name="app_name">Brzo Do Lokacije</string>
+    <!-- TODO: Remove or change this placeholder text -->
+    <string name="hello_blank_fragment">Hello blank fragment</string>
+    <string name="dim">16dp</string>
 </resources>
\ No newline at end of file