Merge pull request #26 from Diversion2k22/HazArdDonationInfo

Rearranged the kotlin files in packages

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'

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>

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)
+
+
+    }
+}
+

app/src/main/java/com/hazard/samarpan/LoginFragment.kt → 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)
             }
         }

app/src/main/java/com/hazard/samarpan/Main2Activity.kt → 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()
     }
 }

app/src/main/java/com/hazard/samarpan/MainActivity.kt → 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()
     }
 }

app/src/main/java/com/hazard/samarpan/NgoSignup1Fragment.kt → app/src/main/java/com/hazard/samarpan/ngo/NgoSignup1Fragment.kt

@@ -1,11 +1,12 @@
-package com.hazard.samarpan
+package com.hazard.samarpan.ngo
 
 import android.os.Bundle
 import android.view.LayoutInflater
 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()
         }

app/src/main/java/com/hazard/samarpan/NgoSignup2Fragment.java → 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

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
+    }
+}

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
+
+    }
+}

app/src/main/java/com/hazard/samarpan/UserRegisterFragment.kt → 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() {