Merge pull request #12 from Diversion2k22/modification

UI modification

app/src/main/java/com/hazard/samarpan/UserLoginFragment.kt

@@ -6,7 +6,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.Button
-import android.widget.TextView
+import android.widget.LinearLayout
 import android.widget.Toast
 import androidx.fragment.app.Fragment
 import com.google.android.material.textfield.TextInputEditText
@@ -17,8 +17,7 @@ import com.google.firebase.ktx.Firebase
 
 class UserLoginFragment: Fragment() {
     private var itemView: View?=null
-
-    private var userSignUp: TextView?=null
+    private var userSignUp: LinearLayout?=null
     private var email: TextInputEditText?=null
     private var password: TextInputEditText?=null
     private var btnLogin: Button?=null
@@ -55,10 +54,10 @@ class UserLoginFragment: Fragment() {
 
                     if(task.isSuccessful){
                         // logic for navigating to the dashboard
-                        Toast.makeText(activity,"Logged in Successfully", Toast.LENGTH_LONG).show()
+                        Toast.makeText(activity,"Logged in Successfully", Toast.LENGTH_SHORT).show()
                     }
                     else{
-                        Toast.makeText(activity,task.exception!!.message.toString(), Toast.LENGTH_LONG).show()
+                        Toast.makeText(activity,task.exception!!.message.toString(), Toast.LENGTH_SHORT).show()
                     }
                 }
             }

app/src/main/java/com/hazard/samarpan/UserRegisterFragment.kt

@@ -51,8 +51,10 @@ class UserRegisterFragment: Fragment(){
         btnRegister?.setOnClickListener{
             val mail=email?.text.toString().trim()
             val pass=password?.text.toString().trim()
-            if(TextUtils.isEmpty(mail) || TextUtils.isEmpty(pass)){
+            if(TextUtils.isEmpty(mail)){
                 email?.error = "Email cannot be empty"
+            }
+            if(TextUtils.isEmpty(pass)){
                 password?.error = "Password cannot be empty"
             }
             if (!(mail.matches(emailPattern.toRegex()))) {
@@ -68,7 +70,7 @@ class UserRegisterFragment: Fragment(){
 
                         //if registration is done successfully
                         if(task.isSuccessful){
-                            Toast.makeText(activity,"You were registered successfully.", Toast.LENGTH_LONG).show()
+                            Toast.makeText(activity,"You were registered successfully.", Toast.LENGTH_SHORT).show()
                             /* add the intent to go to the main dashboard of the application and also add finish() so that
                                if the user presses back after registration they don't go back to the registration page
                                it basically clears all the previous activities

app/src/main/res/drawable/login_button.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <corners android:radius="20dp"/>
-    <solid android:color="@color/yellow"/>
+    <solid android:color="@color/theme_button_color"/>
 </shape>

app/src/main/res/font/roboto.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<font-family xmlns:app="http://schemas.android.com/apk/res-auto"
+        app:fontProviderAuthority="com.google.android.gms.fonts"
+        app:fontProviderPackage="com.google.android.gms"
+        app:fontProviderQuery="Roboto"
+        app:fontProviderCerts="@array/com_google_android_gms_fonts_certs">
+</font-family>