From 1b5793f5897e20277523d1f20f8e2274048b9483 Mon Sep 17 00:00:00 2001
From: 1HazArd1 <aakashgoingto99@gmail.com>
Date: Fri, 18 Mar 2022 13:18:23 +0530
Subject: [PATCH] Rearranged the kotlin files in packages

---
 .idea/misc.xml                                |  19 +-
 app/build.gradle                              |   1 +
 app/src/main/AndroidManifest.xml              |   4 +-
 .../java/com/hazard/samarpan/ClothAdapter.kt  |  32 ---
 .../com/hazard/samarpan/DashboardFragment.kt  |  36 ---
 .../hazard/samarpan/adapters/ClothAdapter.kt  |  32 +++
 .../samarpan/{ => common}/LoginFragment.kt    |   9 +-
 .../samarpan/{ => common}/Main2Activity.kt    |  26 +-
 .../samarpan/{ => common}/MainActivity.kt     |   5 +-
 .../samarpan/{ => ngo}/NgoSignup1Fragment.kt  |   6 +-
 .../{ => ngo}/NgoSignup2Fragment.java         |   4 +-
 .../samarpan/user/DonationInfoFragment.kt     |  23 ++
 .../samarpan/user/UserDashboardFragment.kt    |  46 ++++
 .../{ => user}/UserRegisterFragment.kt        |   7 +-
 .../ic_baseline_account_circle_24.xml         |   5 +
 app/src/main/res/layout/activity_main.xml     |   2 +-
 app/src/main/res/layout/activity_main2.xml    |   2 +-
 .../res/layout/category_list_fragment.xml     |  15 ++
 .../res/layout/clothing_item_dashboard.xml    |  10 +-
 .../res/layout/donation_info_fragment.xml     |  83 +++++++
 app/src/main/res/layout/login_fragment.xml    |   3 +-
 .../main/res/layout/ngo_signup1_fragment.xml  |   3 +-
 .../main/res/layout/ngo_signup2_fragment.xml  |   3 +-
 ...agment.xml => user_dashboard_fragment.xml} | 225 ++++++++++--------
 .../res/layout/user_registration_fragment.xml |   3 +-
 app/src/main/res/values/colors.xml            |   5 +-
 build.gradle                                  |   2 +-
 27 files changed, 395 insertions(+), 216 deletions(-)
 delete mode 100644 app/src/main/java/com/hazard/samarpan/ClothAdapter.kt
 delete mode 100644 app/src/main/java/com/hazard/samarpan/DashboardFragment.kt
 create mode 100644 app/src/main/java/com/hazard/samarpan/adapters/ClothAdapter.kt
 rename app/src/main/java/com/hazard/samarpan/{ => common}/LoginFragment.kt (93%)
 rename app/src/main/java/com/hazard/samarpan/{ => common}/Main2Activity.kt (56%)
 rename app/src/main/java/com/hazard/samarpan/{ => common}/MainActivity.kt (86%)
 rename app/src/main/java/com/hazard/samarpan/{ => ngo}/NgoSignup1Fragment.kt (85%)
 rename app/src/main/java/com/hazard/samarpan/{ => ngo}/NgoSignup2Fragment.java (94%)
 create mode 100644 app/src/main/java/com/hazard/samarpan/user/DonationInfoFragment.kt
 create mode 100644 app/src/main/java/com/hazard/samarpan/user/UserDashboardFragment.kt
 rename app/src/main/java/com/hazard/samarpan/{ => user}/UserRegisterFragment.kt (98%)
 create mode 100644 app/src/main/res/drawable/ic_baseline_account_circle_24.xml
 create mode 100644 app/src/main/res/layout/category_list_fragment.xml
 create mode 100644 app/src/main/res/layout/donation_info_fragment.xml
 rename app/src/main/res/layout/{dashboard_fragment.xml => user_dashboard_fragment.xml} (75%)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 2c56264..3e08bde 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,21 +3,10 @@
   <component name="DesignSurface">
     <option name="filePathToZoomLevelMap">
       <map>
-        <entry key="..\:/Projects/diversion/Samarpan/app/src/main/res/drawable/ic_baseline_add_24.xml" value="0.21614583333333334" />
-        <entry key="..\:/Projects/diversion/Samarpan/app/src/main/res/drawable/ic_baseline_perm_identity_24.xml" value="0.21614583333333334" />
-        <entry key="..\:/Projects/diversion/Samarpan/app/src/main/res/drawable/ic_uploadimage.xml" value="0.21614583333333334" />
-        <entry key="..\:/Projects/diversion/Samarpan/app/src/main/res/layout/activity_main.xml" value="0.20416666666666666" />
-        <entry key="..\:/Projects/diversion/Samarpan/app/src/main/res/layout/activity_main2.xml" value="0.20416666666666666" />
-        <entry key="..\:/Projects/diversion/Samarpan/app/src/main/res/layout/clothing_item_dashboard.xml" value="0.2" />
-        <entry key="..\:/Projects/diversion/Samarpan/app/src/main/res/layout/dashboard_fragment.xml" value="0.2" />
-        <entry key="..\:/Projects/diversion/Samarpan/app/src/main/res/layout/fragment_dashboard.xml" value="0.20416666666666666" />
-        <entry key="..\:/Projects/diversion/Samarpan/app/src/main/res/layout/login_fragment.xml" value="0.20416666666666666" />
-        <entry key="..\:/Projects/diversion/Samarpan/app/src/main/res/layout/ngo_signup1_fragment.xml" value="0.25" />
-        <entry key="..\:/Projects/diversion/Samarpan/app/src/main/res/layout/ngo_signup2_fragment.xml" value="0.20416666666666666" />
-        <entry key="..\:/Samarpan/app/src/main/res/layout/dashboard_fragment.xml" value="0.1859375" />
         <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" />
+        <entry key="..\:/Users/Sunny/AndroidStudioProjects/Samarpan/app/src/main/res/drawable/ic_baseline_account_circle_24.xml" value="0.2135" />
         <entry key="..\:/Users/Sunny/AndroidStudioProjects/Samarpan/app/src/main/res/drawable/ic_launcher_background.xml" value="0.2135" />
         <entry key="..\:/Users/Sunny/AndroidStudioProjects/Samarpan/app/src/main/res/drawable/ic_uploadimage.xml" value="0.2135" />
         <entry key="..\:/Users/Sunny/AndroidStudioProjects/Samarpan/app/src/main/res/drawable/login_background.xml" value="0.2203125" />
@@ -26,10 +15,16 @@
         <entry key="..\:/Users/Sunny/AndroidStudioProjects/Samarpan/app/src/main/res/font/roboto.xml" value="0.23958333333333334" />
         <entry key="..\:/Users/Sunny/AndroidStudioProjects/Samarpan/app/src/main/res/font/roboto_bold.xml" value="0.23958333333333334" />
         <entry key="..\:/Users/Sunny/AndroidStudioProjects/Samarpan/app/src/main/res/layout/activity_main.xml" value="0.25" />
+        <entry key="..\:/Users/Sunny/AndroidStudioProjects/Samarpan/app/src/main/res/layout/activity_main2.xml" value="0.209375" />
+        <entry key="..\:/Users/Sunny/AndroidStudioProjects/Samarpan/app/src/main/res/layout/category_list_fragment.xml" value="0.209375" />
+        <entry key="..\:/Users/Sunny/AndroidStudioProjects/Samarpan/app/src/main/res/layout/clothing_item_dashboard.xml" value="0.209375" />
+        <entry key="..\:/Users/Sunny/AndroidStudioProjects/Samarpan/app/src/main/res/layout/donation_info_fragment.xml" value="0.209375" />
+        <entry key="..\:/Users/Sunny/AndroidStudioProjects/Samarpan/app/src/main/res/layout/donor_fragment.xml" value="0.25" />
         <entry key="..\:/Users/Sunny/AndroidStudioProjects/Samarpan/app/src/main/res/layout/dropdown_menu_popup_item.xml" value="0.209375" />
         <entry key="..\:/Users/Sunny/AndroidStudioProjects/Samarpan/app/src/main/res/layout/login_fragment.xml" value="0.209375" />
         <entry key="..\:/Users/Sunny/AndroidStudioProjects/Samarpan/app/src/main/res/layout/ngo_signup1_fragment.xml" value="0.25" />
         <entry key="..\:/Users/Sunny/AndroidStudioProjects/Samarpan/app/src/main/res/layout/ngo_signup2_fragment.xml" value="0.25" />
+        <entry key="..\:/Users/Sunny/AndroidStudioProjects/Samarpan/app/src/main/res/layout/user_dashboard_fragment.xml" value="0.22" />
         <entry key="..\:/Users/Sunny/AndroidStudioProjects/Samarpan/app/src/main/res/layout/user_login_fragment.xml" value="0.25" />
         <entry key="..\:/Users/Sunny/AndroidStudioProjects/Samarpan/app/src/main/res/layout/user_registration_fragment.xml" value="0.25" />
         <entry key="..\:/Users/Sunny/AndroidStudioProjects/SamarpanDiversion/app/src/main/res/layout/user_login_fragment.xml" value="0.25" />
diff --git a/app/build.gradle b/app/build.gradle
index 1e84156..3740a7f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -43,6 +43,7 @@ dependencies {
     implementation 'com.google.firebase:firebase-auth-ktx:21.0.1'
     implementation 'com.google.firebase:firebase-firestore-ktx:24.0.1'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation 'androidx.cardview:cardview:1.0.0'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 535759b..b66ec6b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -10,12 +10,12 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.Samarpan">
         <activity
-            android:name=".Main2Activity"
+            android:name=".common.Main2Activity"
             android:exported="false" />
         <!-- android:theme="@style/splashScreenTheme" -->
         <!-- this is the logic for the splash screen place it inside the activity tag -->
         <activity
-            android:name=".MainActivity"
+            android:name=".common.MainActivity"
             android:exported="true"
             android:theme="@style/splashScreenTheme">
             <intent-filter>
diff --git a/app/src/main/java/com/hazard/samarpan/ClothAdapter.kt b/app/src/main/java/com/hazard/samarpan/ClothAdapter.kt
deleted file mode 100644
index d57ea46..0000000
--- a/app/src/main/java/com/hazard/samarpan/ClothAdapter.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.hazard.samarpan
-
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.ImageView
-import androidx.recyclerview.widget.RecyclerView
-
-class ClothAdapter(var clothList: ArrayList<Int>) :
-    RecyclerView.Adapter<ClothAdapter.ViewHolder>() {
-
-    override fun getItemCount() =clothList.size
-
-    override fun onBindViewHolder(holder: ClothAdapter.ViewHolder, position: Int) {
-        holder.clothImage.setImageDrawable(holder.itemView.context.getDrawable(clothList[position]))
-
-    }
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ClothAdapter.ViewHolder {
-        val view: View=LayoutInflater.from(parent.context).inflate(R.layout.clothing_item_dashboard,parent,false)
-        return ViewHolder(view)
-    }
-
-
-
-    class ViewHolder(itemView: View):RecyclerView.ViewHolder(itemView){
-        var clothImage: ImageView=itemView.findViewById(R.id.cloth_image)
-
-
-    }
-}
-
diff --git a/app/src/main/java/com/hazard/samarpan/DashboardFragment.kt b/app/src/main/java/com/hazard/samarpan/DashboardFragment.kt
deleted file mode 100644
index 8566a5c..0000000
--- a/app/src/main/java/com/hazard/samarpan/DashboardFragment.kt
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.hazard.samarpan
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.fragment.app.Fragment
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-
-class DashboardFragment : Fragment() {
-
-    public lateinit var clothRecycler: RecyclerView
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-
-        val v = layoutInflater.inflate(R.layout.dashboard_fragment, container, false)
-
-        var clothList: ArrayList<Int> = ArrayList()
-        for(i in 1..15){
-            clothList.add(R.drawable.ic_uploadimage)
-        }
-
-
-        clothRecycler = v.findViewById(R.id.clothing_recycler)
-        clothRecycler.layoutManager=LinearLayoutManager(activity,LinearLayoutManager.HORIZONTAL,false)
-        clothRecycler.adapter=ClothAdapter(clothList)
-
-
-        return v
-
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/hazard/samarpan/adapters/ClothAdapter.kt b/app/src/main/java/com/hazard/samarpan/adapters/ClothAdapter.kt
new file mode 100644
index 0000000..21b9161
--- /dev/null
+++ b/app/src/main/java/com/hazard/samarpan/adapters/ClothAdapter.kt
@@ -0,0 +1,32 @@
+package com.hazard.samarpan.adapters
+
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ImageView
+import androidx.recyclerview.widget.RecyclerView
+import com.hazard.samarpan.R
+
+class ClothAdapter(private var clothList: ArrayList<Int>) :
+    RecyclerView.Adapter<ClothAdapter.ViewHolder>() {
+
+    override fun getItemCount() = clothList.size
+
+    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
+        holder.clothImage.setImageDrawable(holder.itemView.context.getDrawable(clothList[position]))
+
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
+        val view: View = LayoutInflater.from(parent.context)
+            .inflate(R.layout.clothing_item_dashboard, parent, false)
+        return ViewHolder(view)
+    }
+
+    class ViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+        var clothImage: ImageView = itemView.findViewById(R.id.cloth_image)
+
+
+    }
+}
+
diff --git a/app/src/main/java/com/hazard/samarpan/LoginFragment.kt b/app/src/main/java/com/hazard/samarpan/common/LoginFragment.kt
similarity index 93%
rename from app/src/main/java/com/hazard/samarpan/LoginFragment.kt
rename to app/src/main/java/com/hazard/samarpan/common/LoginFragment.kt
index 4a066fb..f34d730 100644
--- a/app/src/main/java/com/hazard/samarpan/LoginFragment.kt
+++ b/app/src/main/java/com/hazard/samarpan/common/LoginFragment.kt
@@ -1,4 +1,4 @@
-package com.hazard.samarpan
+package com.hazard.samarpan.common
 
 import android.content.Intent
 import android.os.Bundle
@@ -14,6 +14,9 @@ import com.google.android.material.textfield.TextInputEditText
 import com.google.firebase.auth.FirebaseAuth
 import com.google.firebase.auth.ktx.auth
 import com.google.firebase.ktx.Firebase
+import com.hazard.samarpan.ngo.NgoSignup1Fragment
+import com.hazard.samarpan.R
+import com.hazard.samarpan.user.UserRegisterFragment
 
 
 class LoginFragment: Fragment() {
@@ -44,7 +47,7 @@ class LoginFragment: Fragment() {
         }
 
         userSignUp?.setOnClickListener {
-              val userRegistrationPage=UserRegisterFragment()
+              val userRegistrationPage= UserRegisterFragment()
               activity?.supportFragmentManager?.beginTransaction()?.replace(R.id.fragment_container1,userRegistrationPage)
                   ?.commit()
         }
@@ -103,7 +106,7 @@ class LoginFragment: Fragment() {
         if (currentUser != null) {
             // write logic to send to the main dashboard of the application
             activity?.let{
-                val intent =Intent(it,Main2Activity::class.java)
+                val intent =Intent(it, Main2Activity::class.java)
                 startActivity(intent)
             }
         }
diff --git a/app/src/main/java/com/hazard/samarpan/Main2Activity.kt b/app/src/main/java/com/hazard/samarpan/common/Main2Activity.kt
similarity index 56%
rename from app/src/main/java/com/hazard/samarpan/Main2Activity.kt
rename to app/src/main/java/com/hazard/samarpan/common/Main2Activity.kt
index 739bdbd..798a44a 100644
--- a/app/src/main/java/com/hazard/samarpan/Main2Activity.kt
+++ b/app/src/main/java/com/hazard/samarpan/common/Main2Activity.kt
@@ -1,11 +1,9 @@
-package com.hazard.samarpan
+package com.hazard.samarpan.common
 
-import android.content.Intent
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
-import android.widget.Button
-import com.google.firebase.auth.ktx.auth
-import com.google.firebase.ktx.Firebase
+import com.hazard.samarpan.R
+import com.hazard.samarpan.user.UserDashboardFragment
 
 class Main2Activity : AppCompatActivity() {
 //    private var btnLogout: Button? =null
@@ -17,18 +15,18 @@ class Main2Activity : AppCompatActivity() {
         addFragment()
 
         //this is just for testing the logout functionality remove this while adding the dashboard fragment
-//        btnLogout=findViewById(R.id.btnLogout)
-//
-//        btnLogout?.setOnClickListener{
-//            Firebase.auth.signOut()
-//            val intent=Intent(this,MainActivity::class.java)
-//            startActivity(intent)
-//            finish()
-//        }
+/*        btnLogout=findViewById(R.id.btnLogout)
+
+        btnLogout?.setOnClickListener{
+            Firebase.auth.signOut()
+            val intent=Intent(this,MainActivity::class.java)
+            startActivity(intent)
+           finish()
+     }   */
 
     }
     private fun addFragment() {
-        val dashboard=DashboardFragment()
+        val dashboard= UserDashboardFragment()
         supportFragmentManager.beginTransaction().add(R.id.fragment_container2,dashboard).commit()
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/hazard/samarpan/MainActivity.kt b/app/src/main/java/com/hazard/samarpan/common/MainActivity.kt
similarity index 86%
rename from app/src/main/java/com/hazard/samarpan/MainActivity.kt
rename to app/src/main/java/com/hazard/samarpan/common/MainActivity.kt
index bd1a0ad..0872200 100644
--- a/app/src/main/java/com/hazard/samarpan/MainActivity.kt
+++ b/app/src/main/java/com/hazard/samarpan/common/MainActivity.kt
@@ -1,7 +1,8 @@
-package com.hazard.samarpan
+package com.hazard.samarpan.common
 
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
+import com.hazard.samarpan.R
 
 class MainActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -15,7 +16,7 @@ class MainActivity : AppCompatActivity() {
     }
 
     private fun addFragment() {
-        val userSignInLayout=LoginFragment()
+        val userSignInLayout= LoginFragment()
         supportFragmentManager.beginTransaction().add(R.id.fragment_container1,userSignInLayout).commit()
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/hazard/samarpan/NgoSignup1Fragment.kt b/app/src/main/java/com/hazard/samarpan/ngo/NgoSignup1Fragment.kt
similarity index 85%
rename from app/src/main/java/com/hazard/samarpan/NgoSignup1Fragment.kt
rename to app/src/main/java/com/hazard/samarpan/ngo/NgoSignup1Fragment.kt
index ef39a02..18a2f21 100644
--- a/app/src/main/java/com/hazard/samarpan/NgoSignup1Fragment.kt
+++ b/app/src/main/java/com/hazard/samarpan/ngo/NgoSignup1Fragment.kt
@@ -1,4 +1,4 @@
-package com.hazard.samarpan
+package com.hazard.samarpan.ngo
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -6,6 +6,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.Button
 import androidx.fragment.app.Fragment
+import com.hazard.samarpan.R
 
 class NgoSignup1Fragment : Fragment() {
 
@@ -21,7 +22,8 @@ class NgoSignup1Fragment : Fragment() {
         nextBtn = v.findViewById(R.id.btn_ngosignup1_next)
         nextBtn.setOnClickListener {
             activity?.supportFragmentManager?.beginTransaction()
-                ?.replace(R.id.fragment_container1,
+                ?.replace(
+                    R.id.fragment_container1,
                     NgoSignup2Fragment()
                 )?.addToBackStack(null)?.commit()
         }
diff --git a/app/src/main/java/com/hazard/samarpan/NgoSignup2Fragment.java b/app/src/main/java/com/hazard/samarpan/ngo/NgoSignup2Fragment.java
similarity index 94%
rename from app/src/main/java/com/hazard/samarpan/NgoSignup2Fragment.java
rename to app/src/main/java/com/hazard/samarpan/ngo/NgoSignup2Fragment.java
index d5bb857..4c49ea5 100644
--- a/app/src/main/java/com/hazard/samarpan/NgoSignup2Fragment.java
+++ b/app/src/main/java/com/hazard/samarpan/ngo/NgoSignup2Fragment.java
@@ -1,4 +1,4 @@
-package com.hazard.samarpan;
+package com.hazard.samarpan.ngo;
 
 import android.os.Bundle;
 import android.view.LayoutInflater;
@@ -11,6 +11,8 @@
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 
+import com.hazard.samarpan.R;
+
 public class NgoSignup2Fragment extends Fragment {
 
     @Nullable
diff --git a/app/src/main/java/com/hazard/samarpan/user/DonationInfoFragment.kt b/app/src/main/java/com/hazard/samarpan/user/DonationInfoFragment.kt
new file mode 100644
index 0000000..26bb185
--- /dev/null
+++ b/app/src/main/java/com/hazard/samarpan/user/DonationInfoFragment.kt
@@ -0,0 +1,23 @@
+package com.hazard.samarpan.user
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import com.hazard.samarpan.R
+
+class DonationInfoFragment: Fragment() {
+
+    private var itemView: View? = null
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        itemView=layoutInflater.inflate(R.layout.donation_info_fragment,container,false)
+
+        return itemView
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/hazard/samarpan/user/UserDashboardFragment.kt b/app/src/main/java/com/hazard/samarpan/user/UserDashboardFragment.kt
new file mode 100644
index 0000000..e88b3b5
--- /dev/null
+++ b/app/src/main/java/com/hazard/samarpan/user/UserDashboardFragment.kt
@@ -0,0 +1,46 @@
+package com.hazard.samarpan.user
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import com.google.android.material.floatingactionbutton.FloatingActionButton
+import com.hazard.samarpan.adapters.ClothAdapter
+import com.hazard.samarpan.R
+
+class UserDashboardFragment : Fragment() {
+
+    private lateinit var clothRecycler: RecyclerView
+    private var donate: FloatingActionButton?= null
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+
+        val v = layoutInflater.inflate(R.layout.user_dashboard_fragment, container, false)
+
+        donate = v.findViewById(R.id.btnDonate)
+
+        var clothList: ArrayList<Int> = ArrayList()
+        for (i in 1..15) {
+            clothList.add(R.drawable.ic_uploadimage)
+        }
+        clothRecycler = v.findViewById(R.id.clothing_recycler)
+        clothRecycler.layoutManager =
+            LinearLayoutManager(activity, LinearLayoutManager.HORIZONTAL, false)
+        clothRecycler.adapter = ClothAdapter(clothList)
+
+
+        donate?.setOnClickListener {
+            val donationInfo= DonationInfoFragment()
+            activity?.supportFragmentManager?.beginTransaction()?.replace(R.id.fragment_container2,donationInfo)?.commit()
+        }
+        return v
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/hazard/samarpan/UserRegisterFragment.kt b/app/src/main/java/com/hazard/samarpan/user/UserRegisterFragment.kt
similarity index 98%
rename from app/src/main/java/com/hazard/samarpan/UserRegisterFragment.kt
rename to app/src/main/java/com/hazard/samarpan/user/UserRegisterFragment.kt
index 1b1fc6d..3493a54 100644
--- a/app/src/main/java/com/hazard/samarpan/UserRegisterFragment.kt
+++ b/app/src/main/java/com/hazard/samarpan/user/UserRegisterFragment.kt
@@ -1,10 +1,8 @@
-package com.hazard.samarpan
+package com.hazard.samarpan.user
 
-import android.app.Activity
 import android.content.ContentValues.TAG
 import android.content.Intent
 import android.os.Bundle
-import android.text.TextUtils
 import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
@@ -20,6 +18,9 @@ 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.common.LoginFragment
+import com.hazard.samarpan.common.Main2Activity
+import com.hazard.samarpan.R
 import java.util.regex.Pattern
 
 class UserRegisterFragment : Fragment() {
diff --git a/app/src/main/res/drawable/ic_baseline_account_circle_24.xml b/app/src/main/res/drawable/ic_baseline_account_circle_24.xml
new file mode 100644
index 0000000..1e5f44d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_baseline_account_circle_24.xml
@@ -0,0 +1,5 @@
+<vector android:height="40dp" android:tint="#E0D0D0"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="40dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,5c1.66,0 3,1.34 3,3s-1.34,3 -3,3 -3,-1.34 -3,-3 1.34,-3 3,-3zM12,19.2c-2.5,0 -4.71,-1.28 -6,-3.22 0.03,-1.99 4,-3.08 6,-3.08 1.99,0 5.97,1.09 6,3.08 -1.29,1.94 -3.5,3.22 -6,3.22z"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index d5de26a..2b232a1 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    tools:context=".MainActivity">
+    tools:context=".common.MainActivity">
 
     <FrameLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_main2.xml b/app/src/main/res/layout/activity_main2.xml
index 74a186b..2b8e549 100644
--- a/app/src/main/res/layout/activity_main2.xml
+++ b/app/src/main/res/layout/activity_main2.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".Main2Activity"
+    tools:context=".common.Main2Activity"
     android:orientation="vertical">
 
 <!--    <Button-->
diff --git a/app/src/main/res/layout/category_list_fragment.xml b/app/src/main/res/layout/category_list_fragment.xml
new file mode 100644
index 0000000..42d91aa
--- /dev/null
+++ b/app/src/main/res/layout/category_list_fragment.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:contentDescription="category"
+    android:background="@color/theme_background"
+    >
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+    </LinearLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/clothing_item_dashboard.xml b/app/src/main/res/layout/clothing_item_dashboard.xml
index d15bf4c..0fdc86a 100644
--- a/app/src/main/res/layout/clothing_item_dashboard.xml
+++ b/app/src/main/res/layout/clothing_item_dashboard.xml
@@ -1,21 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_marginStart="17dp"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="horizontal">
+
     <androidx.cardview.widget.CardView
+        android:id="@+id/clothing_card"
         android:layout_width="130dp"
         android:layout_height="130dp"
-        android:id="@+id/clothing_card"
         app:cardBackgroundColor="@color/purple_200"
         app:cardCornerRadius="20dp">
+
         <ImageView
+            android:id="@+id/cloth_image"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:id="@+id/cloth_image"
-            android:src="@drawable/ic_uploadimage"/>
+            android:src="@drawable/ic_uploadimage" />
     </androidx.cardview.widget.CardView>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/donation_info_fragment.xml b/app/src/main/res/layout/donation_info_fragment.xml
new file mode 100644
index 0000000..c2ccf2c
--- /dev/null
+++ b/app/src/main/res/layout/donation_info_fragment.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:overScrollMode="never"
+    android:background="@color/theme_background">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:padding="30dp">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="20dp"
+            android:fontFamily="@font/righteous"
+            android:text="What have you got ?"
+            android:textColor="@color/theme_text_color_heading"
+            android:textSize="28dp" />
+
+        <Button
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="35dp"
+            android:background="@drawable/button_design"
+            android:text="Category"
+            android:textAllCaps="false"
+            android:textColor="@color/theme_button_text" />
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="20dp" />
+
+        <com.google.android.material.textfield.TextInputLayout
+            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:hint="What the item is?"
+            android:layout_marginTop="20dp"
+            app:hintTextColor="@color/theme_text_color_body">
+
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/registerName"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textCursorDrawable="@null" />
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <com.google.android.material.textfield.TextInputLayout
+            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="15dp"
+            android:hint="Description"
+            app:counterEnabled="true"
+            app:counterMaxLength="150"
+            app:hintTextColor="@color/theme_text_color_body">
+
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/registerAddress"
+                android:layout_width="match_parent"
+                android:layout_height="100dp"
+                android:inputType="textLongMessage"
+                android:textCursorDrawable="@null"/>
+
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <Button
+            android:layout_width="200dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="50dp"
+            android:background="@drawable/button_design"
+            android:text="Upload Image"
+            android:textColor="@color/theme_button_text"
+            android:textAllCaps="false"
+            android:layout_gravity="center" />
+
+    </LinearLayout>
+</androidx.core.widget.NestedScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/login_fragment.xml b/app/src/main/res/layout/login_fragment.xml
index dd80b90..06e04e8 100644
--- a/app/src/main/res/layout/login_fragment.xml
+++ b/app/src/main/res/layout/login_fragment.xml
@@ -3,7 +3,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    android:background="@color/theme_background">
 
     <!--Logo of the application will be added here-->
     <ImageView
diff --git a/app/src/main/res/layout/ngo_signup1_fragment.xml b/app/src/main/res/layout/ngo_signup1_fragment.xml
index 84c36be..050e9d3 100644
--- a/app/src/main/res/layout/ngo_signup1_fragment.xml
+++ b/app/src/main/res/layout/ngo_signup1_fragment.xml
@@ -3,7 +3,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:overScrollMode="never">
+    android:overScrollMode="never"
+    android:background="@color/theme_background">
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/ngo_signup2_fragment.xml b/app/src/main/res/layout/ngo_signup2_fragment.xml
index 17a135e..9b21132 100644
--- a/app/src/main/res/layout/ngo_signup2_fragment.xml
+++ b/app/src/main/res/layout/ngo_signup2_fragment.xml
@@ -3,7 +3,8 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:overScrollMode="never">
+    android:overScrollMode="never"
+    android:background="@color/theme_background">
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/dashboard_fragment.xml b/app/src/main/res/layout/user_dashboard_fragment.xml
similarity index 75%
rename from app/src/main/res/layout/dashboard_fragment.xml
rename to app/src/main/res/layout/user_dashboard_fragment.xml
index 6f522d8..b334525 100644
--- a/app/src/main/res/layout/dashboard_fragment.xml
+++ b/app/src/main/res/layout/user_dashboard_fragment.xml
@@ -2,137 +2,157 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="@color/theme_background">
+
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
+        android:background="@color/white"
         android:paddingHorizontal="20dp"
         android:paddingTop="10dp"
-        android:background="@color/white">
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:orientation="vertical">
-            <LinearLayout
+
+            <RelativeLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:weightSum="2">
+                android:layout_height="?actionBarSize">
+
+
                 <TextView
-                    android:layout_width="0dp"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1.7"
-                    android:text="@string/app_name"
-                    android:textSize="20sp"
                     android:fontFamily="@font/righteous"
-                    android:textColor="@color/theme_text_color_heading"/>
+                    android:text="@string/app_name"
+                    android:padding="15dp"
+                    android:layout_centerVertical="true"
+                    android:textColor="@color/theme_text_color_heading"
+                    android:textSize="22sp" />
+
                 <ImageButton
-                    android:layout_width="0dp"
-                    android:layout_height="50dp"
-                    android:layout_weight="0.3"
-                    android:backgroundTint="@color/theme_transparent_button"
-                    android:src="@drawable/ic_baseline_perm_identity_24"
                     android:id="@+id/profile_button"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+                    android:backgroundTint="@color/theme_transparent_button"
+                    android:contentDescription="Profile"
+                    android:padding="15dp"
+                    android:src="@drawable/ic_baseline_account_circle_24"
                     app:tint="@color/profile_button_color" />
-            </LinearLayout>
+            </RelativeLayout>
+
             <ImageView
+                android:id="@+id/banner"
                 android:layout_width="match_parent"
                 android:layout_height="150dp"
-                android:src="@color/theme_color_light"
 
-                android:id="@+id/banner"
-                android:layout_marginTop="25dp"/>
+                android:layout_marginTop="25dp"
+                android:src="@color/theme_color_light" />
+
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="horizontal"
                 android:layout_marginTop="25dp"
+                android:orientation="horizontal"
                 android:weightSum="2">
+
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textSize="22sp"
+                    android:layout_weight="1.5"
+                    android:fontFamily="@font/righteous"
                     android:text="@string/categories"
                     android:textColor="@color/theme_text_color_heading"
-                    android:layout_weight="1.5"
-                    android:fontFamily="@font/righteous"/>
+                    android:textSize="22sp" />
+
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@string/view_more"
                     android:layout_weight=".5"
-                    android:textSize="14sp"
-                    android:textColor="@color/theme_text_color_heading"
-                    android:gravity="center"
                     android:fontFamily="@font/righteous"
-                    />
+                    android:gravity="center"
+                    android:text="@string/view_more"
+                    android:textColor="@color/theme_text_color_body"
+                    android:textSize="12sp" />
             </LinearLayout>
+
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="30dp">
+
                 <androidx.cardview.widget.CardView
+                    android:id="@+id/cat_1"
                     android:layout_width="60dp"
                     android:layout_height="60dp"
-                    android:id="@+id/cat_1"
-                    app:layout_constraintTop_toTopOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
                     android:backgroundTint="@color/theme_color_light"
                     app:cardCornerRadius="30dp"
-                    app:layout_constraintEnd_toStartOf="@id/cat_2">
+                    app:layout_constraintEnd_toStartOf="@id/cat_2"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent">
+
                     <ImageView
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
-                        android:src="@drawable/ic_uploadimage"
-                        android:padding="13dp"/>
+                        android:padding="13dp"
+                        android:src="@drawable/ic_uploadimage" />
                 </androidx.cardview.widget.CardView>
 
                 <androidx.cardview.widget.CardView
+                    android:id="@+id/cat_2"
                     android:layout_width="60dp"
                     android:layout_height="60dp"
-                    android:id="@+id/cat_2"
-                    app:layout_constraintTop_toTopOf="parent"
-                    app:layout_constraintStart_toEndOf="@id/cat_1"
                     android:backgroundTint="@color/theme_color_light"
                     app:cardCornerRadius="30dp"
-                    app:layout_constraintEnd_toStartOf="@id/cat_3">
+                    app:layout_constraintEnd_toStartOf="@id/cat_3"
+                    app:layout_constraintStart_toEndOf="@id/cat_1"
+                    app:layout_constraintTop_toTopOf="parent">
+
                     <ImageView
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
-                        android:src="@drawable/ic_uploadimage"
-                        android:padding="13dp"/>
+                        android:padding="13dp"
+                        android:src="@drawable/ic_uploadimage" />
                 </androidx.cardview.widget.CardView>
+
                 <androidx.cardview.widget.CardView
+                    android:id="@+id/cat_3"
                     android:layout_width="60dp"
                     android:layout_height="60dp"
-                    android:id="@+id/cat_3"
-                    app:layout_constraintTop_toTopOf="parent"
-                    app:layout_constraintStart_toEndOf="@id/cat_2"
                     android:backgroundTint="@color/theme_color_light"
                     app:cardCornerRadius="30dp"
-                    app:layout_constraintEnd_toStartOf="@id/cat_4">
+                    app:layout_constraintEnd_toStartOf="@id/cat_4"
+                    app:layout_constraintStart_toEndOf="@id/cat_2"
+                    app:layout_constraintTop_toTopOf="parent">
+
                     <ImageView
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
-                        android:src="@drawable/ic_uploadimage"
-                        android:padding="13dp"/>
+                        android:padding="13dp"
+                        android:src="@drawable/ic_uploadimage" />
                 </androidx.cardview.widget.CardView>
+
                 <androidx.cardview.widget.CardView
+                    android:id="@+id/cat_4"
                     android:layout_width="60dp"
                     android:layout_height="60dp"
-                    android:id="@+id/cat_4"
-                    app:layout_constraintTop_toTopOf="parent"
-                    app:layout_constraintStart_toEndOf="@id/cat_3"
                     android:backgroundTint="@color/theme_color_light"
                     app:cardCornerRadius="30dp"
-                    app:layout_constraintEnd_toEndOf="parent">
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toEndOf="@id/cat_3"
+                    app:layout_constraintTop_toTopOf="parent">
+
                     <ImageView
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
-                        android:src="@drawable/ic_uploadimage"
-                        android:padding="13dp"/>
+                        android:padding="13dp"
+                        android:src="@drawable/ic_uploadimage" />
                 </androidx.cardview.widget.CardView>
 
             </androidx.constraintlayout.widget.ConstraintLayout>
@@ -142,127 +162,140 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="25dp">
+
                 <androidx.cardview.widget.CardView
+                    android:id="@+id/cat_5"
                     android:layout_width="60dp"
                     android:layout_height="60dp"
-                    android:id="@+id/cat_5"
-                    app:layout_constraintTop_toTopOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
                     android:backgroundTint="@color/theme_color_light"
                     app:cardCornerRadius="30dp"
-                    app:layout_constraintEnd_toStartOf="@id/cat_6">
+                    app:layout_constraintEnd_toStartOf="@id/cat_6"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent">
+
                     <ImageView
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
-                        android:src="@drawable/ic_uploadimage"
-                        android:padding="13dp"/>
+                        android:padding="13dp"
+                        android:src="@drawable/ic_uploadimage" />
                 </androidx.cardview.widget.CardView>
 
                 <androidx.cardview.widget.CardView
+                    android:id="@+id/cat_6"
                     android:layout_width="60dp"
                     android:layout_height="60dp"
-                    android:id="@+id/cat_6"
-                    app:layout_constraintTop_toTopOf="parent"
-                    app:layout_constraintStart_toEndOf="@id/cat_5"
                     android:backgroundTint="@color/theme_color_light"
                     app:cardCornerRadius="30dp"
-                    app:layout_constraintEnd_toStartOf="@id/cat_7">
+                    app:layout_constraintEnd_toStartOf="@id/cat_7"
+                    app:layout_constraintStart_toEndOf="@id/cat_5"
+                    app:layout_constraintTop_toTopOf="parent">
+
                     <ImageView
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
-                        android:src="@drawable/ic_uploadimage"
-                        android:padding="13dp"/>
+                        android:padding="13dp"
+                        android:src="@drawable/ic_uploadimage" />
                 </androidx.cardview.widget.CardView>
+
                 <androidx.cardview.widget.CardView
+                    android:id="@+id/cat_7"
                     android:layout_width="60dp"
                     android:layout_height="60dp"
-                    android:id="@+id/cat_7"
-                    app:layout_constraintTop_toTopOf="parent"
-                    app:layout_constraintStart_toEndOf="@id/cat_6"
                     android:backgroundTint="@color/theme_color_light"
                     app:cardCornerRadius="30dp"
-                    app:layout_constraintEnd_toStartOf="@id/cat_8">
+                    app:layout_constraintEnd_toStartOf="@id/cat_8"
+                    app:layout_constraintStart_toEndOf="@id/cat_6"
+                    app:layout_constraintTop_toTopOf="parent">
+
                     <ImageView
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
-                        android:src="@drawable/ic_uploadimage"
-                        android:padding="13dp"/>
+                        android:padding="13dp"
+                        android:src="@drawable/ic_uploadimage" />
                 </androidx.cardview.widget.CardView>
+
                 <androidx.cardview.widget.CardView
+                    android:id="@+id/cat_8"
                     android:layout_width="60dp"
                     android:layout_height="60dp"
-                    android:id="@+id/cat_8"
-                    app:layout_constraintTop_toTopOf="parent"
-                    app:layout_constraintStart_toEndOf="@id/cat_7"
                     android:backgroundTint="@color/theme_color_light"
                     app:cardCornerRadius="30dp"
-                    app:layout_constraintEnd_toEndOf="parent">
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toEndOf="@id/cat_7"
+                    app:layout_constraintTop_toTopOf="parent">
+
                     <ImageView
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
-                        android:src="@drawable/ic_uploadimage"
-                        android:padding="13dp"/>
+                        android:padding="13dp"
+                        android:src="@drawable/ic_uploadimage" />
                 </androidx.cardview.widget.CardView>
 
             </androidx.constraintlayout.widget.ConstraintLayout>
+
             <androidx.cardview.widget.CardView
                 android:layout_width="match_parent"
                 android:layout_height="100dp"
                 android:layout_marginTop="30dp"
 
                 android:backgroundTint="@color/theme_color">
+
                 <TextView
                     android:layout_width="match_parent"
-                    android:fontFamily="@font/roboto"
                     android:layout_height="match_parent"
-                    android:text="@string/book_sharing_text"
-                    android:textSize="24sp"
                     android:layout_marginHorizontal="10dp"
+                    android:layout_marginTop="10dp"
+                    android:fontFamily="@font/roboto"
+                    android:text="@string/book_sharing_text"
                     android:textColor="@color/white"
-                    android:layout_marginTop="10dp"/>
+                    android:textSize="24sp" />
             </androidx.cardview.widget.CardView>
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="horizontal"
                 android:layout_marginTop="30dp"
+                android:orientation="horizontal"
                 android:weightSum="2">
+
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textSize="22sp"
-                    android:text="@string/clothing"
+                    android:layout_weight="1.5"
                     android:fontFamily="@font/righteous"
+                    android:text="@string/clothing"
                     android:textColor="@color/theme_text_color_heading"
-                    android:layout_weight="1.5"/>
+                    android:textSize="22sp" />
+
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@string/view_more"
                     android:layout_weight=".5"
-                    android:gravity="center"
                     android:fontFamily="@font/righteous"
-                    android:textColor="@color/theme_text_color_heading"
-                    android:textSize="14sp" />
+                    android:gravity="center"
+                    android:text="@string/view_more"
+                    android:textColor="@color/theme_text_color_body"
+                    android:textSize="12sp" />
             </LinearLayout>
 
             <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/clothing_recycler"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="25dp"
-                android:orientation="horizontal"
-                android:id="@+id/clothing_recycler"/>
+                android:orientation="horizontal" />
 
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
+
     <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/btnDonate"
+        android:contentDescription="donation icon"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
         android:layout_margin="25dp"
         android:backgroundTint="@color/theme_color"
         android:src="@drawable/ic_baseline_add_24"
-        />
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/user_registration_fragment.xml b/app/src/main/res/layout/user_registration_fragment.xml
index 3101534..2deb4de 100644
--- a/app/src/main/res/layout/user_registration_fragment.xml
+++ b/app/src/main/res/layout/user_registration_fragment.xml
@@ -3,7 +3,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:overScrollMode="never">
+    android:overScrollMode="never"
+    android:background="@color/theme_background">
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index b9bc7f5..4a0401f 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="theme_color">#f6c23f</color>
+    <color name="theme_color">#ffbf00</color>
     <color name="theme_color_light">#f6e592</color>
-    <color name="theme_button_color">#f6c23f</color>
+    <color name="theme_button_color">#ffbf00</color>
     <color name="theme_button_text">#f5f5f5</color>
+    <color name="theme_background">#f5f5f5</color>
     <color name="theme_text_color_heading">#1a1110</color>
     <color name="theme_text_color_body"> #494F55</color>
     <color name="theme_text_color_bold">#333333</color>
diff --git a/build.gradle b/build.gradle
index 844d2c5..c06fba7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.1'
+        classpath 'com.android.tools.build:gradle:7.1.1'
         classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10'
         classpath 'com.google.gms:google-services:4.3.10'