From aba7ad315b57e97e126d499bff302137a16fae6c Mon Sep 17 00:00:00 2001
From: 1HazArd1 <aakashgoingto99@gmail.com>
Date: Fri, 16 Sep 2022 01:22:35 +0530
Subject: [PATCH] Collecting NGO sign up info to the database from both the
 registration pages

---
 .idea/misc.xml                                |   1 +
 .../hazard/samarpan/common/LoginFragment.kt   |   2 +
 .../hazard/samarpan/common/Main2Activity.kt   |   1 +
 .../hazard/samarpan/common/MainActivity.kt    |  26 +++-
 .../com/hazard/samarpan/ngo/Communicator.kt   |   5 +
 .../hazard/samarpan/ngo/NgoSignup1Fragment.kt | 115 +++++++++++++++---
 .../hazard/samarpan/ngo/NgoSignup2Fragment.kt |  83 ++++++++++++-
 .../samarpan/user/UserRegisterFragment.kt     |   6 +
 .../main/res/layout/ngo_signup1_fragment.xml  |  16 +--
 .../main/res/layout/ngo_signup2_fragment.xml  |   9 ++
 app/src/main/res/values/colors.xml            |   1 +
 11 files changed, 230 insertions(+), 35 deletions(-)
 create mode 100644 app/src/main/java/com/hazard/samarpan/ngo/Communicator.kt

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 2aa6e3d..d8f4b39 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,6 +3,7 @@
   <component name="DesignSurface">
     <option name="filePathToZoomLevelMap">
       <map>
+        <entry key="..\:/Users/Sunny/AndroidStudioProjects/Samarpan/app/src/main/res/drawable/button_design.xml" value="0.2155" />
         <entry key="..\:/Users/Sunny/AndroidStudioProjects/Samarpan/app/src/main/res/drawable/facebook_icon.xml" value="0.2203125" />
         <entry key="..\:/Users/Sunny/AndroidStudioProjects/Samarpan/app/src/main/res/drawable/google_icon.xml" value="0.2203125" />
         <entry key="..\:/Users/Sunny/AndroidStudioProjects/Samarpan/app/src/main/res/drawable/google_logo.xml" value="0.2203125" />
diff --git a/app/src/main/java/com/hazard/samarpan/common/LoginFragment.kt b/app/src/main/java/com/hazard/samarpan/common/LoginFragment.kt
index f34d730..6996825 100644
--- a/app/src/main/java/com/hazard/samarpan/common/LoginFragment.kt
+++ b/app/src/main/java/com/hazard/samarpan/common/LoginFragment.kt
@@ -77,6 +77,8 @@ class LoginFragment: Fragment() {
                                 ).show()
                                 activity?.let{
                                     val intent = Intent (it, Main2Activity::class.java)
+                                    // here send the data of the received user type from the database and according to the
+                                    //0 or 1 populate the respective fragment in the activity
                                     it.startActivity(intent)
                                 }
                                 activity?.finish()
diff --git a/app/src/main/java/com/hazard/samarpan/common/Main2Activity.kt b/app/src/main/java/com/hazard/samarpan/common/Main2Activity.kt
index 798a44a..6402a51 100644
--- a/app/src/main/java/com/hazard/samarpan/common/Main2Activity.kt
+++ b/app/src/main/java/com/hazard/samarpan/common/Main2Activity.kt
@@ -25,6 +25,7 @@ class Main2Activity : AppCompatActivity() {
      }   */
 
     }
+    //create one more function that will be responsible to open the ngo dashboard
     private fun addFragment() {
         val dashboard= UserDashboardFragment()
         supportFragmentManager.beginTransaction().add(R.id.fragment_container2,dashboard).commit()
diff --git a/app/src/main/java/com/hazard/samarpan/common/MainActivity.kt b/app/src/main/java/com/hazard/samarpan/common/MainActivity.kt
index 0872200..5c081ec 100644
--- a/app/src/main/java/com/hazard/samarpan/common/MainActivity.kt
+++ b/app/src/main/java/com/hazard/samarpan/common/MainActivity.kt
@@ -3,8 +3,10 @@ package com.hazard.samarpan.common
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import com.hazard.samarpan.R
+import com.hazard.samarpan.ngo.Communicator
+import com.hazard.samarpan.ngo.NgoSignup2Fragment
 
-class MainActivity : AppCompatActivity() {
+class MainActivity : AppCompatActivity(),Communicator {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         /*This part of the code is used to set the default theme as the theme was set to the splash screen before setting the main activity layout
@@ -19,4 +21,26 @@ class MainActivity : AppCompatActivity() {
         val userSignInLayout= LoginFragment()
         supportFragmentManager.beginTransaction().add(R.id.fragment_container1,userSignInLayout).commit()
     }
+
+    override fun passDataCom(
+        orgName: String,
+        orgMail: String,
+        orgPhone: String,
+        officeAdd: String,
+        orgPin: String,
+        orgPass: String
+    ) {
+        val bundle=Bundle()
+        bundle.putString("Name",orgName)
+        bundle.putString("Mail",orgMail)
+        bundle.putString("Phone",orgPhone)
+        bundle.putString("Address",officeAdd)
+        bundle.putString("PinCode",orgPin)
+        bundle.putString("Password",orgPass)
+
+        val transaction=this.supportFragmentManager.beginTransaction()
+        val ngoSignUp2 = NgoSignup2Fragment()
+        ngoSignUp2.arguments = bundle
+        transaction.commit()
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/hazard/samarpan/ngo/Communicator.kt b/app/src/main/java/com/hazard/samarpan/ngo/Communicator.kt
new file mode 100644
index 0000000..16ed939
--- /dev/null
+++ b/app/src/main/java/com/hazard/samarpan/ngo/Communicator.kt
@@ -0,0 +1,5 @@
+package com.hazard.samarpan.ngo
+
+interface Communicator {
+    fun passDataCom(orgName :String,orgMail :String ,orgPhone :String ,officeAdd :String,orgPin :String,orgPass:String)
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/hazard/samarpan/ngo/NgoSignup1Fragment.kt b/app/src/main/java/com/hazard/samarpan/ngo/NgoSignup1Fragment.kt
index 78d7463..ce77efb 100644
--- a/app/src/main/java/com/hazard/samarpan/ngo/NgoSignup1Fragment.kt
+++ b/app/src/main/java/com/hazard/samarpan/ngo/NgoSignup1Fragment.kt
@@ -6,20 +6,24 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.Button
 import androidx.fragment.app.Fragment
-import com.google.android.material.textfield.TextInputLayout
+import com.google.android.material.textfield.TextInputEditText
 import com.hazard.samarpan.R
+import java.util.regex.Pattern
 
 class NgoSignup1Fragment : Fragment() {
 
+    private lateinit var communicator: Communicator
     private lateinit var nextBtn: Button
 
-    private var orgName : TextInputLayout ?=null
-    private var orgMail : TextInputLayout ?=null
-    private var orgPhone : TextInputLayout ?=null
-    private var officeAdd :TextInputLayout ?=null
-    private var orgPinCode :TextInputLayout ?=null
-    private var pass :TextInputLayout ?=null
-    private var confirmPass :TextInputLayout ?=null
+    private var name : TextInputEditText ?=null
+    private var mail : TextInputEditText ?=null
+    private var phone : TextInputEditText ?=null
+    private var add :TextInputEditText ?=null
+    private var pinCode :TextInputEditText ?=null
+    private var password :TextInputEditText ?=null
+    private var confirmPassword :TextInputEditText ?=null
+
+    private val emailPattern = "[a-zA-Z0-9._-]+@[a-z]+\\.+[a-z]+"
 
     override fun onCreateView(
         inflater: LayoutInflater,
@@ -28,25 +32,96 @@ class NgoSignup1Fragment : Fragment() {
     ): View? {
         val v = layoutInflater.inflate(R.layout.ngo_signup1_fragment, container, false)
 
+        communicator = activity as Communicator
+
         nextBtn = v.findViewById(R.id.btn_ngosignup1_next)
+
+        name = v?.findViewById(R.id.et_ngosignup_name)
+        mail = v?.findViewById(R.id.et_ngosignup_mail)
+        phone = v?.findViewById(R.id.et_ngosignup_phone)
+        add = v?.findViewById(R.id.et_ngosignup_address)
+        pinCode = v?.findViewById(R.id.et_ngosignup_pincode)
+        password =v?.findViewById(R.id.et_ngosignup_password)
+        confirmPassword =v?.findViewById(R.id.et_ngosignup_confirmpassword)
+
         nextBtn.setOnClickListener {
 
-            orgName = v?.findViewById(R.id.et_ngosignup_name)
-            orgMail = v?.findViewById(R.id.et_ngosignup_mail)
-            orgPhone = v?.findViewById(R.id.et_ngosignup_phone)
-            officeAdd = v?.findViewById(R.id.et_ngosignup_address)
-            orgPinCode = v?.findViewById(R.id.et_ngosignup_pincode)
-            pass =v?.findViewById(R.id.et_ngosignup_password)
-            confirmPass =v?.findViewById(R.id.et_ngosignup_confirmpassword)
+
+            val orgName = name?.text.toString().trim()
+            val orgMail = mail?.text.toString().trim()
+            val orgPhone = phone?.text.toString().trim()
+            val officeAdd = add?.text.toString().trim()
+            val orgPinCode = pinCode?.text.toString().trim()
+            val pass = password?.text.toString().trim()
+            val confirmPass=confirmPassword?.text.toString().trim()
+
+
+            if (orgName.isEmpty()) {
+                name?.error = "Please provide organisation's name"
+                markButtonDisable(nextBtn)
+            }
+            if (orgMail.isEmpty()) {
+                mail?.error = "Mail cannot be empty"
+                markButtonDisable(nextBtn)
+            }
+            if (orgPhone.isEmpty()) {
+                phone?.error = "Enter your phone number"
+                markButtonDisable(nextBtn)
+            }
+            if (officeAdd.isEmpty()) {
+                add?.error = "Address cannot be empty"
+                markButtonDisable(nextBtn)
+            }
+            if (orgPinCode.isEmpty()) {
+                name?.error = "Name cannot be empty"
+                markButtonDisable(nextBtn)
+            }
+            if (pass.isEmpty()){
+                password?.error = "Password cannot be empty"
+                markButtonDisable(nextBtn)
+            }
+            if (!(orgMail.matches(emailPattern.toRegex()))) {
+                mail?.error = "Invalid email"
+                markButtonDisable(nextBtn)
+            }
+            if (!(isValidPassword(pass))) {
+                password?.error = "Password format is invalid"
+                markButtonDisable(nextBtn)
+            }
+            if(pass != confirmPass){
+                confirmPassword?.error = "Passwords doesn't match"
+                markButtonDisable(nextBtn)
+            }else{
+                communicator.passDataCom(orgName,orgMail,orgPhone,officeAdd,orgPinCode,pass)
+                activity?.supportFragmentManager?.beginTransaction()
+                    ?.replace(
+                        R.id.fragment_container1,
+                        NgoSignup2Fragment()
+                    )?.addToBackStack(null)?.commit()
+            }
 
             //this opens up the sign up 2 page
-            activity?.supportFragmentManager?.beginTransaction()
-                ?.replace(
-                    R.id.fragment_container1,
-                    NgoSignup2Fragment()
-                )?.addToBackStack(null)?.commit()
+
         }
 
         return v
     }
+    private fun isValidPassword(password: String): Boolean {
+        val passwordREGEX = Pattern.compile(
+            "^" +
+                    "(?=.*[0-9])" +         //at least 1 digit
+                    "(?=.*[a-z])" +         //at least 1 lower case letter
+                    "(?=.*[A-Z])" +         //at least 1 upper case letter
+                    "(?=.*[a-zA-Z])" +      //any letter
+                    "(?=.*[@#$%^&+=])" +    //at least 1 special character
+                    "(?=\\S+$)" +           //no white spaces
+                    ".{8,}" +               //at least 8 characters
+                    "$"
+        )
+        return passwordREGEX.matcher(password).matches()
+    }
+    private fun markButtonDisable(b:Button){
+        b.isEnabled =false
+        b.setBackgroundColor(resources.getColor(R.color.theme_button_disabled))
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/hazard/samarpan/ngo/NgoSignup2Fragment.kt b/app/src/main/java/com/hazard/samarpan/ngo/NgoSignup2Fragment.kt
index c748d14..d3e0092 100644
--- a/app/src/main/java/com/hazard/samarpan/ngo/NgoSignup2Fragment.kt
+++ b/app/src/main/java/com/hazard/samarpan/ngo/NgoSignup2Fragment.kt
@@ -1,16 +1,36 @@
 package com.hazard.samarpan.ngo
 
+import android.content.ContentValues
 import android.os.Bundle
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.ArrayAdapter
-import android.widget.AutoCompleteTextView
+import android.widget.*
 import androidx.fragment.app.Fragment
+import com.google.firebase.auth.FirebaseAuth
+import com.google.firebase.auth.FirebaseUser
+import com.google.firebase.auth.ktx.auth
+import com.google.firebase.firestore.DocumentReference
+import com.google.firebase.firestore.FirebaseFirestore
+import com.google.firebase.ktx.Firebase
 import com.hazard.samarpan.R
 
 class NgoSignup2Fragment : Fragment(){
+
     private var v : View?=null
+    private var btnNgoRegister: Button?=null
+    private var tvSample :TextView?=null
+
+    private var orgName:String =""
+    private var orgMail:String =""
+    private var orgPhone:String =""
+    private var officeAdd:String =""
+    private var orgPin:String =""
+    private var pass:String =""
+    private lateinit var registerAuth: FirebaseAuth
+
+
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
@@ -18,11 +38,66 @@ class NgoSignup2Fragment : Fragment(){
     ): View? {
         v = layoutInflater.inflate(R.layout.ngo_signup2_fragment,container,false)
 
-        val types = resources.getStringArray(R.array.organisation_type)
-        val arrayAdapter = ArrayAdapter(requireContext(),R.layout.dropdown_item,types)
+        btnNgoRegister=v?.findViewById(R.id.btnNgoRegister)
+        tvSample=v?.findViewById(R.id.tv_Sample)
+
+        val organisationTypes = resources.getStringArray(R.array.organisation_type)
+        val arrayAdapter = ArrayAdapter(requireContext(),R.layout.dropdown_item,organisationTypes)
         val autoCompleteTV= v?.findViewById<AutoCompleteTextView>(R.id.ngosignup_select_orgtype_items)
         autoCompleteTV?.setAdapter(arrayAdapter)
 
+
+
+        registerAuth= Firebase.auth
+
+        orgName=arguments?.getString("Name").toString()
+        orgMail= arguments?.getString("Mail").toString()
+        orgPhone=arguments?.getString("Phone").toString()
+        officeAdd=arguments?.getString("Address").toString()
+        orgPin=arguments?.getString("PinCode").toString()
+        pass=arguments?.getString("Password").toString()
+
+        btnNgoRegister?.setOnClickListener {
+            val db = FirebaseFirestore.getInstance()
+            try{
+                registerAuth.createUserWithEmailAndPassword(orgMail,pass)
+                    .addOnCompleteListener{ task->
+                        if(task.isSuccessful){
+                         val ngo: FirebaseUser? =registerAuth.currentUser
+                            Toast.makeText(
+                                activity,
+                                "Thank You! for choosing us",
+                                Toast.LENGTH_SHORT
+                             ).show()
+                            val documentReference : DocumentReference =db.collection("users").document(
+                                ngo?.uid ?: ""
+                         )
+                            val ngoInfo :MutableMap<String,Any> = HashMap()
+                            ngoInfo["OrgName"]= orgName
+                            ngoInfo["OrgMail"]= orgMail
+                            ngoInfo["OrgPhone"]=orgPhone
+                            ngoInfo["OfficeAdd"]=officeAdd
+                            ngoInfo["OrgPinCode"]=orgPin
+                            ngoInfo["isDonor"]=0
+                            // add the value of the org type from the dropdown and upload document work
+                            documentReference.set(ngoInfo).addOnSuccessListener {
+                                Log.d(ContentValues.TAG, "User data for $orgName was collected successfully ")
+                            }.addOnFailureListener{ e ->
+                                Log.w(ContentValues.TAG, "Error adding data", e)
+                            }
+                    }else{
+                            Toast.makeText(
+                                activity,
+                                task.exception!!.message.toString(),
+                                Toast.LENGTH_SHORT
+                            ).show()
+                        }
+                }
+        }
+        catch(e :Exception){
+            Toast.makeText(context, "Fields cannot be empty $e", Toast.LENGTH_SHORT).show()
+        }
+        }
         return v
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/hazard/samarpan/user/UserRegisterFragment.kt b/app/src/main/java/com/hazard/samarpan/user/UserRegisterFragment.kt
index 3493a54..e0d15a9 100644
--- a/app/src/main/java/com/hazard/samarpan/user/UserRegisterFragment.kt
+++ b/app/src/main/java/com/hazard/samarpan/user/UserRegisterFragment.kt
@@ -10,6 +10,7 @@ import android.view.ViewGroup
 import android.widget.Button
 import android.widget.LinearLayout
 import android.widget.Toast
+import androidx.core.content.ContextCompat
 import androidx.fragment.app.Fragment
 import com.google.android.material.textfield.TextInputEditText
 import com.google.firebase.auth.FirebaseAuth
@@ -101,6 +102,7 @@ class UserRegisterFragment : Fragment() {
                 password?.error = "Password format is invalid"
             } else {
                 //user registration
+                btnRegister?.isEnabled=true
                 try {
 
                     registerAuth.createUserWithEmailAndPassword(mail, pass)
@@ -178,4 +180,8 @@ class UserRegisterFragment : Fragment() {
         )
         return passwordREGEX.matcher(password).matches()
     }
+    private fun markButtonDisable(b:Button){
+        b.isEnabled =false
+        b.setBackgroundColor(resources.getColor(R.color.theme_button_disabled))
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/ngo_signup1_fragment.xml b/app/src/main/res/layout/ngo_signup1_fragment.xml
index 050e9d3..51296c2 100644
--- a/app/src/main/res/layout/ngo_signup1_fragment.xml
+++ b/app/src/main/res/layout/ngo_signup1_fragment.xml
@@ -24,7 +24,7 @@
         <RelativeLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="30dp">
+            android:layout_marginTop="40dp">
 
             <ImageView
                 android:id="@+id/img_ngosignup_uploadimage"
@@ -51,7 +51,7 @@
             style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="20dp"
+            android:layout_marginTop="25dp"
             android:hint="Organization name"
             app:hintTextColor="@color/theme_text_color_body">
 
@@ -92,7 +92,7 @@
                 style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="15dp"
+                android:layout_marginTop="7dp"
                 android:layout_marginBottom="10dp"
                 android:layout_weight="3"
                 android:hint="@string/ngosignup1_phone_number"
@@ -111,7 +111,7 @@
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_marginLeft="10dp"
-                android:layout_marginTop="15dp"
+                android:layout_marginTop="7dp"
                 android:layout_marginBottom="6dp"
                 android:layout_weight="1"
                 android:textAllCaps="false"
@@ -144,7 +144,7 @@
             style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="15dp"
+            android:layout_marginTop="7dp"
             android:hint="Pincode"
             app:hintTextColor="@color/theme_text_color_body"
             app:counterEnabled="true"
@@ -204,11 +204,7 @@
             android:layout_gravity="center"
             android:layout_marginTop="25dp"
             android:layout_marginBottom="25dp"
-            android:enabled="true"
-            android:paddingLeft="50dp"
-            android:paddingTop="15dp"
-            android:paddingRight="50dp"
-            android:paddingBottom="15dp"
+            android:background="@drawable/button_design"
             android:textAllCaps="false"
             android:text="@string/next" />
 
diff --git a/app/src/main/res/layout/ngo_signup2_fragment.xml b/app/src/main/res/layout/ngo_signup2_fragment.xml
index 10a9f08..c2e38b0 100644
--- a/app/src/main/res/layout/ngo_signup2_fragment.xml
+++ b/app/src/main/res/layout/ngo_signup2_fragment.xml
@@ -180,6 +180,7 @@
         </LinearLayout>
 
         <Button
+            android:id="@+id/btnNgoRegister"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
@@ -191,6 +192,14 @@
             android:textColor="@color/theme_button_text"
             android:text="@string/get_started" />
 
+        <TextView
+            android:id="@+id/tv_Sample"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="Sample"
+            android:layout_marginTop="10dp"
+            />
+
     </LinearLayout>
 
 </androidx.core.widget.NestedScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 4a0401f..9fd621e 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -4,6 +4,7 @@
     <color name="theme_color_light">#f6e592</color>
     <color name="theme_button_color">#ffbf00</color>
     <color name="theme_button_text">#f5f5f5</color>
+    <color name="theme_button_disabled">#70785E</color>
     <color name="theme_background">#f5f5f5</color>
     <color name="theme_text_color_heading">#1a1110</color>
     <color name="theme_text_color_body"> #494F55</color>