From a483bfa93cc8e313fa6bde028828f1b132d30a35 Mon Sep 17 00:00:00 2001 From: TAMARA JERINIC Date: Fri, 28 Oct 2022 11:58:38 +0200 Subject: Dodati fragmenti za login i registraciju. Dodate neke grafičke komponente. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Activities/ActivityLoginRegister.kt | 12 ++ .../brzodolokacije/Fragments/FragmentLogin.kt | 107 ++++++++++++++ .../brzodolokacije/Fragments/FragmentRegister.kt | 110 +++++++++++++++ .../app/src/main/res/drawable/b3.jpg | Bin 0 -> 6089791 bytes .../src/main/res/drawable/rounded_cyan_button.xml | 5 + .../res/drawable/rounded_white_button_login.xml | 16 +++ .../main/res/drawable/switch_login_register_on.xml | 6 + .../main/res/layout/activity_login_register.xml | 28 ++++ .../app/src/main/res/layout/fragment_login.xml | 92 ++++++++++++ .../app/src/main/res/layout/fragment_register.xml | 154 +++++++++++++++++++++ .../app/src/main/res/values-night/themes.xml | 2 +- .../app/src/main/res/values/colors.xml | 4 +- .../app/src/main/res/values/strings.xml | 3 + 13 files changed, 536 insertions(+), 3 deletions(-) create mode 100644 Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityLoginRegister.kt create mode 100644 Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentLogin.kt create mode 100644 Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentRegister.kt create mode 100644 Client/BrzoDoLokacije/app/src/main/res/drawable/b3.jpg create mode 100644 Client/BrzoDoLokacije/app/src/main/res/drawable/rounded_cyan_button.xml create mode 100644 Client/BrzoDoLokacije/app/src/main/res/drawable/rounded_white_button_login.xml create mode 100644 Client/BrzoDoLokacije/app/src/main/res/drawable/switch_login_register_on.xml create mode 100644 Client/BrzoDoLokacije/app/src/main/res/layout/activity_login_register.xml create mode 100644 Client/BrzoDoLokacije/app/src/main/res/layout/fragment_login.xml create mode 100644 Client/BrzoDoLokacije/app/src/main/res/layout/fragment_register.xml 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(R.id.etFragmentLoginEmail) as EditText + password = view.findViewById(R.id.etFragmentLoginPassword) as EditText + forgottenPassword = view.findViewById(R.id.tvFragmentLoginForgottenPassword) as TextView + login=view.findViewById(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(R.id.etFragmentRegisterEmail) as EditText + password = view.findViewById(R.id.etFragmentRegisterPassword) as EditText + username = view.findViewById(R.id.etFragmentRegisterUser) as EditText + name = view.findViewById(R.id.etFragmentRegisterName) as EditText + register=view.findViewById(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 Binary files /dev/null and b/Client/BrzoDoLokacije/app/src/main/res/drawable/b3.jpg differ 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 @@ + + + + + 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 @@ + + + + + + \ 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 @@ + + + + + + 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 @@ + + + + + \ 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 @@ + + + + + + + + + + + + + +