From 4957c04c82f54b9e477e0604af40cc43c4b45bdb Mon Sep 17 00:00:00 2001
From: Jorel A Setiabudi <jorel8055@gmail.com>
Date: Sun, 17 Nov 2024 02:45:33 +0700
Subject: [PATCH] Working split bill only need firebase

---
 .idea/deploymentTargetSelector.xml            |   4 +-
 .idea/misc.xml                                |   1 +
 app/build.gradle.kts                          |   1 +
 .../java/com/example/jlaja/AddBillActivity.kt | 175 +++++++++++++++---
 .../java/com/example/jlaja/BillAdapter.kt     |  71 +++++--
 .../java/com/example/jlaja/MainActivity.kt    |   3 +
 .../java/com/example/jlaja/MemberAdapter.kt   |  23 +--
 .../com/example/jlaja/MemberDetailAdapter.kt  |  35 ++++
 .../com/example/jlaja/TripDetailActivity.kt   | 127 ++++++++-----
 .../java/com/example/jlaja/itemAdapter.kt     |  31 ++++
 app/src/main/res/layout/activity_add_bill.xml |  96 ++++++----
 .../main/res/layout/activity_trip_detail.xml  |  65 +++----
 app/src/main/res/layout/dialog_bill_name.xml  |  15 ++
 app/src/main/res/layout/dialog_item.xml       |  23 +++
 .../res/layout/dialog_portion_assignment.xml  |  30 +++
 app/src/main/res/layout/item_bill.xml         |  52 +++++-
 app/src/main/res/layout/item_member_share.xml |  22 +++
 app/src/main/res/layout/item_view.xml         |  26 +++
 app/src/main/res/layout/member_item.xml       |  16 +-
 app/src/main/res/layout/portion_item.xml      |  22 +++
 gradle/libs.versions.toml                     |   1 +
 21 files changed, 645 insertions(+), 194 deletions(-)
 create mode 100644 app/src/main/java/com/example/jlaja/MemberDetailAdapter.kt
 create mode 100644 app/src/main/java/com/example/jlaja/itemAdapter.kt
 create mode 100644 app/src/main/res/layout/dialog_bill_name.xml
 create mode 100644 app/src/main/res/layout/dialog_item.xml
 create mode 100644 app/src/main/res/layout/dialog_portion_assignment.xml
 create mode 100644 app/src/main/res/layout/item_member_share.xml
 create mode 100644 app/src/main/res/layout/item_view.xml
 create mode 100644 app/src/main/res/layout/portion_item.xml

diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index ea1e981..e059739 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -4,10 +4,10 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2024-10-13T08:32:23.601439700Z">
+        <DropdownSelection timestamp="2024-11-12T07:53:41.552113500Z">
           <Target type="DEFAULT_BOOT">
             <handle>
-              <DeviceId pluginId="LocalEmulator" identifier="path=C:\Users\kreas\.android\avd\Pixel_8a_API_35.avd" />
+              <DeviceId pluginId="LocalEmulator" identifier="path=C:\Users\Jorel A Setiabudi\.android\avd\Pixel_8_API_35.avd" />
             </handle>
           </Target>
         </DropdownSelection>
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 8978d23..0ad17cb 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
   <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index afa638b..4b674d4 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -61,6 +61,7 @@ dependencies {
     implementation(libs.androidx.material3)
     implementation(libs.androidx.appcompat)
     implementation(libs.androidx.recyclerview)
+    implementation(libs.androidx.cardview)
     testImplementation(libs.junit)
     androidTestImplementation(libs.androidx.junit)
     androidTestImplementation(libs.androidx.espresso.core)
diff --git a/app/src/main/java/com/example/jlaja/AddBillActivity.kt b/app/src/main/java/com/example/jlaja/AddBillActivity.kt
index c027ce3..f9ba112 100644
--- a/app/src/main/java/com/example/jlaja/AddBillActivity.kt
+++ b/app/src/main/java/com/example/jlaja/AddBillActivity.kt
@@ -4,74 +4,201 @@ import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
 import android.view.LayoutInflater
-import android.widget.ArrayAdapter
-import android.widget.Button
-import android.widget.EditText
-import android.widget.Spinner
+import android.widget.*
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
+import java.io.Serializable
+
+data class Item(val name: String, val unitPrice: Double, val memberPortions: MutableMap<String, Int> = mutableMapOf()) : Serializable
 
 class AddBillActivity : AppCompatActivity() {
 
-    private lateinit var billNameEditText: EditText
-    private lateinit var billAmountEditText: EditText
+    private lateinit var billNameTextView: TextView
+    private lateinit var billAmountTextView: TextView
     private lateinit var paidBySpinner: Spinner
     private lateinit var membersRecyclerView: RecyclerView
     private lateinit var membersAdapter: MembersAdapter
     private lateinit var saveBillButton: Button
+    private lateinit var addItemButton: Button
+    private lateinit var itemsRecyclerView: RecyclerView
+    private lateinit var itemsAdapter: ItemsAdapter
     private lateinit var spinnerAdapter: ArrayAdapter<String>
 
     private val membersList = mutableListOf<String>()
+    private val memberAmounts = mutableMapOf<String, Double>() // Track each member's current amount
+    private val itemsList = mutableListOf<Item>()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_add_bill)
 
-        // Initialize views
-        billNameEditText = findViewById(R.id.bill_name_edittext)
-        billAmountEditText = findViewById(R.id.bill_amount_edittext)
+        billNameTextView = findViewById(R.id.bill_name_textview)
+        billAmountTextView = findViewById(R.id.bill_amount_textview)
         paidBySpinner = findViewById(R.id.paid_by_spinner)
         membersRecyclerView = findViewById(R.id.members_recycler_view)
         saveBillButton = findViewById(R.id.save_bill_button)
+        addItemButton = findViewById(R.id.add_item_button)
+        itemsRecyclerView = findViewById(R.id.items_recycler_view)
 
-        // Set up RecyclerView
         membersRecyclerView.layoutManager = LinearLayoutManager(this)
-        membersAdapter = MembersAdapter(membersList)
+        membersAdapter = MembersAdapter(membersList, memberAmounts)
         membersRecyclerView.adapter = membersAdapter
 
-        // Initialize Spinner adapter with an empty list (since no members are added yet)
+        itemsRecyclerView.layoutManager = LinearLayoutManager(this)
+        itemsAdapter = ItemsAdapter(itemsList)
+        itemsRecyclerView.adapter = itemsAdapter
+
         spinnerAdapter = ArrayAdapter(this@AddBillActivity, android.R.layout.simple_spinner_item, membersList)
         spinnerAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
         paidBySpinner.adapter = spinnerAdapter
 
-        // Button to add members
+        val billName = intent.getStringExtra("bill_name")
+        billNameTextView.text = billName ?: "Unknown Bill"
+
+
+
         val addMembersButton: Button = findViewById(R.id.button2)
         addMembersButton.setOnClickListener {
             showAddMemberDialog()
         }
 
-        // Set up save button click listener
+        addItemButton.setOnClickListener {
+            showAddItemDialog()
+        }
+
         saveBillButton.setOnClickListener {
             saveBill()
         }
     }
 
+    private fun calculateTotalAmount(): Double {
+        // Calculate the total amount based on all items
+        return itemsList.sumOf { it.unitPrice }
+    }
+
+    private fun calculateMemberShare(member: String): Double {
+        var totalShare = 0.0
+
+        // Calculate how much this member should pay based on portions
+        for (item in itemsList) {
+            val totalPortions = item.memberPortions.values.sum()  // Total portions for this item
+            val memberPortion = item.memberPortions[member] ?: 0   // Portion for the current member
+
+            // Calculate member's share for this item
+            if (totalPortions > 0) {
+                totalShare += (memberPortion.toDouble() / totalPortions) * item.unitPrice
+            }
+        }
+
+        return totalShare
+    }
+
+    private fun updateMemberAmounts() {
+        // Recalculate each member's amount and update the display
+        membersList.forEach { member ->
+            memberAmounts[member] = calculateMemberShare(member)
+        }
+        membersAdapter.notifyDataSetChanged() // Refresh the members display
+    }
+
+    private fun showAddItemDialog() {
+        val dialogView = LayoutInflater.from(this).inflate(R.layout.dialog_item, null)
+        val itemNameEditText = dialogView.findViewById<EditText>(R.id.item_name_edittext)
+        val itemPriceEditText = dialogView.findViewById<EditText>(R.id.item_price_edittext)
+
+        AlertDialog.Builder(this)
+            .setTitle("Enter Item Details")
+            .setView(dialogView)
+            .setPositiveButton("Add") { dialog, _ ->
+                val itemName = itemNameEditText.text.toString().trim()
+                val itemPrice = itemPriceEditText.text.toString().toDoubleOrNull() ?: 0.0
+
+                if (itemName.isNotEmpty() && itemPrice > 0) {
+                    val item = Item(itemName, itemPrice)
+                    itemsList.add(item)
+                    itemsAdapter.notifyItemInserted(itemsList.size - 1)
+
+                    // Show the portion assignment dialog for the newly added item
+                    assignPortionsDialog(item)
+
+                    // Update the total amount displayed and member amounts
+                    updateTotalAmountDisplay()
+                    updateMemberAmounts()
+                }
+                dialog.dismiss()
+            }
+            .setNegativeButton("Cancel") { dialog, _ -> dialog.dismiss() }
+            .show()
+    }
+
+    private fun updateTotalAmountDisplay() {
+        val totalAmount = calculateTotalAmount()
+        billAmountTextView.text = String.format("%.2f", totalAmount)
+    }
+
+    private fun assignPortionsDialog(item: Item) {
+        val dialogView = LayoutInflater.from(this).inflate(R.layout.dialog_portion_assignment, null)
+        val portionsContainer = dialogView.findViewById<LinearLayout>(R.id.portions_container)
+
+        // Dynamically add portion input for each member
+        membersList.forEach { member ->
+            val memberRow = LayoutInflater.from(this).inflate(R.layout.portion_item, portionsContainer, false)
+            val memberNameText = memberRow.findViewById<TextView>(R.id.member_name_textview)
+            val portionEditText = memberRow.findViewById<EditText>(R.id.portion_edittext)
+
+            memberNameText.text = member
+            portionsContainer.addView(memberRow)
+        }
+
+        AlertDialog.Builder(this)
+            .setTitle("Assign Portions for ${item.name}")
+            .setView(dialogView)
+            .setPositiveButton("Save") { dialog, _ ->
+                for (i in 0 until portionsContainer.childCount) {
+                    val row = portionsContainer.getChildAt(i)
+                    val memberName = membersList[i]
+                    val portionText = row.findViewById<EditText>(R.id.portion_edittext).text.toString()
+                    val portion = portionText.toIntOrNull() ?: 0
+
+                    item.memberPortions[memberName] = portion
+                }
+                itemsAdapter.notifyDataSetChanged()
+
+                // Update member amounts after assigning portions
+                updateMemberAmounts()
+                dialog.dismiss()
+            }
+            .setNegativeButton("Cancel") { dialog, _ -> dialog.dismiss() }
+            .show()
+    }
+
     private fun saveBill() {
-        val billName = billNameEditText.text.toString().trim()
-        val billAmount = billAmountEditText.text.toString().trim()
+        //fix this nanti
+        val billName = billNameTextView.text.toString().trim()
         val paidBy = paidBySpinner.selectedItem?.toString() ?: ""
 
-        if (billName.isNotEmpty() && billAmount.isNotEmpty()) {
+        if (billName.isNotEmpty()) {
+            val totalAmount = calculateTotalAmount()
+            val memberShares = membersList.associateWith { member ->
+                calculateMemberShare(member)
+            }
+
+            val bill = Bill(
+                name = billName,
+                amount = totalAmount,
+                totalAmount = totalAmount,
+                paidBy = paidBy,
+                memberShares = memberShares,
+                itemsList = itemsList
+            )
+
             // Return the bill details to TripDetailsActivity
             val resultIntent = Intent()
-            resultIntent.putExtra("bill_name", billName)
-            resultIntent.putExtra("bill_amount", billAmount)
-            resultIntent.putExtra("paid_by", paidBy)
-            resultIntent.putStringArrayListExtra("members", ArrayList(membersList))
+            resultIntent.putExtra("bill", bill) // Serialize the Bill object
             setResult(Activity.RESULT_OK, resultIntent)
-            finish() // Close the activity
+            finish()
         }
     }
 
@@ -85,11 +212,11 @@ class AddBillActivity : AppCompatActivity() {
             .setPositiveButton("Add") { dialog, _ ->
                 val memberName = memberNameEditText.text.toString().trim()
                 if (memberName.isNotEmpty()) {
-                    // Add the new member to the list
                     membersList.add(memberName)
+                    memberAmounts[memberName] = 0.0 // Initialize member's share to zero
                     membersAdapter.notifyItemInserted(membersList.size - 1)
 
-                    // Update the Spinner to reflect the new member added
+                    // Update PaidBy Spinner
                     spinnerAdapter.notifyDataSetChanged()
                 }
                 dialog.dismiss()
diff --git a/app/src/main/java/com/example/jlaja/BillAdapter.kt b/app/src/main/java/com/example/jlaja/BillAdapter.kt
index 369b0d9..b4c123b 100644
--- a/app/src/main/java/com/example/jlaja/BillAdapter.kt
+++ b/app/src/main/java/com/example/jlaja/BillAdapter.kt
@@ -3,28 +3,73 @@ package com.example.jlaja
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
+import java.io.Serializable
 
-// Adapter class for RecyclerView to display the list of bills
-class BillsAdapter(private val billsList: List<String>) : RecyclerView.Adapter<BillsAdapter.BillViewHolder>() {
+// Updated Bill data class with memberShares as a Map
+data class Bill(
+    val name: String = "default bill",
+    val amount: Double = 0.0,
+    val totalAmount: Double = 0.0,
+    val paidBy: String = "ye",
+    val memberShares: Map<String, Double> = emptyMap(), // Member shares map
+    val itemsList: List<Item> = emptyList()
+) : Serializable
 
+class BillsAdapter(private val bills: List<Bill>) : RecyclerView.Adapter<BillsAdapter.BillViewHolder>() {
+
+    // ViewHolder class to hold references to the views for each item
+    class BillViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+        private val billNameTextView: TextView = itemView.findViewById(R.id.bill_name_textview)
+        private val totalAmountTextView: TextView = itemView.findViewById(R.id.total_amount_textview)
+        private val paidByTextView: TextView = itemView.findViewById(R.id.paid_by_textview)
+        private val membersSharesContainer: LinearLayout = itemView.findViewById(R.id.members_shares_container)
+
+        // Bind the bill details to the views
+        fun bind(bill: Bill) {
+            // Set the bill information
+            billNameTextView.text = bill.name
+            totalAmountTextView.text = "Total amount: $${"%.2f".format(bill.amount)}"
+            paidByTextView.text = "Paid By: ${bill.paidBy}"
+
+            // Clear any previous member share views to avoid duplication
+            membersSharesContainer.removeAllViews()
+
+            // Dynamically create and add views for each member's share
+            bill.memberShares.forEach { (memberName, shareAmount) ->
+                val memberShareView = LayoutInflater.from(itemView.context)
+                    .inflate(R.layout.item_member_share, membersSharesContainer, false)
+
+                // Find the TextViews in the member share view and set the data
+                val memberNameTextView = memberShareView.findViewById<TextView>(R.id.member_name_textview)
+                val memberShareTextView = memberShareView.findViewById<TextView>(R.id.member_share_textview)
+
+                // Set the member's name and share amount
+                memberNameTextView.text = memberName
+                memberShareTextView.text = "Owes: $${"%.2f".format(shareAmount)}"
+
+
+
+
+                // Add the view to the members' container layout
+                membersSharesContainer.addView(memberShareView)
+            }
+        }
+    }
+
+    // Create a new view for each item
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): BillViewHolder {
         val view = LayoutInflater.from(parent.context).inflate(R.layout.item_bill, parent, false)
         return BillViewHolder(view)
     }
 
+    // Bind the data to each view item
     override fun onBindViewHolder(holder: BillViewHolder, position: Int) {
-        holder.bind(billsList[position])
+        holder.bind(bills[position])
     }
 
-    override fun getItemCount(): Int = billsList.size
-
-    class BillViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        private val billTextView: TextView = itemView.findViewById(R.id.bill_textview)
-
-        fun bind(billDetails: String) {
-            billTextView.text = billDetails
-        }
-    }
-}
\ No newline at end of file
+    // Return the total number of items
+    override fun getItemCount(): Int = bills.size
+}
diff --git a/app/src/main/java/com/example/jlaja/MainActivity.kt b/app/src/main/java/com/example/jlaja/MainActivity.kt
index 257bf64..1795962 100644
--- a/app/src/main/java/com/example/jlaja/MainActivity.kt
+++ b/app/src/main/java/com/example/jlaja/MainActivity.kt
@@ -8,6 +8,7 @@ import android.view.View
 import android.widget.Button
 import android.widget.EditText
 import android.widget.LinearLayout
+import android.widget.Toast
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
@@ -60,6 +61,8 @@ class MainActivity : AppCompatActivity() {
                 val tripName = tripNameEditText.text.toString().trim()
                 if (tripName.isNotEmpty()) {
                     addNewTrip(tripName) // Add the trip with the user-defined name
+                } else {
+                    Toast.makeText(this, "Trip name cannot be empty", Toast.LENGTH_SHORT).show()
                 }
                 dialog.dismiss()
             }
diff --git a/app/src/main/java/com/example/jlaja/MemberAdapter.kt b/app/src/main/java/com/example/jlaja/MemberAdapter.kt
index f7a4423..a954816 100644
--- a/app/src/main/java/com/example/jlaja/MemberAdapter.kt
+++ b/app/src/main/java/com/example/jlaja/MemberAdapter.kt
@@ -6,29 +6,30 @@ import android.view.ViewGroup
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 
-class MembersAdapter(private val members: MutableList<String>) : RecyclerView.Adapter<MembersAdapter.MemberViewHolder>() {
+class MembersAdapter(
+    private val members: List<String>,            // List of member names
+    private val memberAmounts: Map<String, Double> // Map to track each member's owed amount
+) : RecyclerView.Adapter<MembersAdapter.MemberViewHolder>() {
 
-    // ViewHolder class
     class MemberViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        val memberNameTextView: TextView = itemView.findViewById(R.id.member_name_text_view) // Assuming this TextView is in member_item.xml
+        private val memberShareTextView: TextView = itemView.findViewById(R.id.member_share_textview)
 
-        // Binds the member name to the TextView
-        fun bind(memberName: String) {
-            memberNameTextView.text = memberName
+        // Bind member name and their current owed amount
+        fun bind(memberName: String, amountOwed: Double) {
+            memberShareTextView.text = "$memberName's current bill: $${"%.2f".format(amountOwed)}"
         }
     }
 
-    // Inflates the item view for each member
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): MemberViewHolder {
-        val view = LayoutInflater.from(parent.context).inflate(R.layout.member_item, parent, false) // Make sure this is the correct layout
+        val view = LayoutInflater.from(parent.context).inflate(R.layout.member_item, parent, false)
         return MemberViewHolder(view)
     }
 
-    // Binds the data to the ViewHolder
     override fun onBindViewHolder(holder: MemberViewHolder, position: Int) {
-        holder.bind(members[position])
+        val memberName = members[position]
+        val amountOwed = memberAmounts[memberName] ?: 0.0 // Get the current owed amount, default to 0.0 if not found
+        holder.bind(memberName, amountOwed)
     }
 
-    // Returns the size of the member list
     override fun getItemCount(): Int = members.size
 }
diff --git a/app/src/main/java/com/example/jlaja/MemberDetailAdapter.kt b/app/src/main/java/com/example/jlaja/MemberDetailAdapter.kt
new file mode 100644
index 0000000..5ad325f
--- /dev/null
+++ b/app/src/main/java/com/example/jlaja/MemberDetailAdapter.kt
@@ -0,0 +1,35 @@
+package com.example.jlaja
+
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView
+
+class MemberDetailsAdapter {
+    class MemberDetailsAdapter(private val memberShares: Map<String, Double>) : RecyclerView.Adapter<MemberDetailsAdapter.MemberDetailViewHolder>() {
+
+        class MemberDetailViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+            private val memberNameTextView: TextView = itemView.findViewById(R.id.member_name_textview)
+            private val memberShareTextView: TextView = itemView.findViewById(R.id.member_share_textview)
+
+            fun bind(memberName: String, shareAmount: Double) {
+                memberNameTextView.text = memberName
+                memberShareTextView.text = "Owes: $${"%.2f".format(shareAmount)}"
+            }
+        }
+
+        override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): MemberDetailViewHolder {
+            val view = LayoutInflater.from(parent.context).inflate(R.layout.item_member_share, parent, false)
+            return MemberDetailViewHolder(view)
+        }
+
+        override fun onBindViewHolder(holder: MemberDetailViewHolder, position: Int) {
+            val memberName = memberShares.keys.toList()[position]
+            val shareAmount = memberShares[memberName] ?: 0.0
+            holder.bind(memberName, shareAmount)
+        }
+
+        override fun getItemCount(): Int = memberShares.size
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/jlaja/TripDetailActivity.kt b/app/src/main/java/com/example/jlaja/TripDetailActivity.kt
index 11c26b6..ac7a5ae 100644
--- a/app/src/main/java/com/example/jlaja/TripDetailActivity.kt
+++ b/app/src/main/java/com/example/jlaja/TripDetailActivity.kt
@@ -3,90 +3,115 @@ package com.example.jlaja
 import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
-import android.view.View
+import android.view.LayoutInflater
 import android.widget.Button
+import android.widget.EditText
+import android.widget.LinearLayout
 import android.widget.TextView
+import android.widget.Toast
+import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 
 class TripDetailsActivity : AppCompatActivity() {
 
-    private lateinit var tripNameTextView: TextView
     private lateinit var billsRecyclerView: RecyclerView
     private lateinit var addBillButton: Button
-    private var billsList = mutableListOf<String>() // For simplicity, we're using a string list for bills
+    private lateinit var tripNameTextView: TextView
+    private lateinit var totalBillsTextView: TextView
+    private lateinit var tripDetailButtonContainer: LinearLayout // Initialize this container
+
+
+
+    private val billsList = mutableListOf<Bill>()
+    private var totalBillsCount = 0
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_trip_detail)
 
+
+
         // Initialize views
-        tripNameTextView = findViewById(R.id.bills_header)
-        billsRecyclerView = findViewById(R.id.bills_recycler_view)
-        addBillButton = findViewById(R.id.add_bill_button)
+        tripNameTextView= findViewById(R.id.bills_header)
+        val addBillButton : Button = findViewById(R.id.add_bill_button)
+        totalBillsTextView = findViewById(R.id.total_bills_textview)
+        tripDetailButtonContainer = findViewById(R.id.tripDetail_button_container) // Add initialization
 
-        // Get the trip name from the Intent and set it in the header
         val tripName = intent.getStringExtra("trip_name")
-        tripNameTextView.text = tripName ?: "Trip Details: "
+        tripNameTextView.text = tripName ?:"Trip Details: "
+
+        val newBill = Bill() // Creating a new Bill instance with the bill name
+        billsList.add(newBill)
 
-        // Set up RecyclerView for the bills
-        billsRecyclerView.layoutManager = LinearLayoutManager(this)
-        val billsAdapter = BillsAdapter(billsList)
-        billsRecyclerView.adapter = billsAdapter
 
-        // Add a new bill button click
         addBillButton.setOnClickListener {
-            val intent = Intent(this, AddBillActivity::class.java)
-            intent.putExtra("trip_name", tripName) // Pass trip name to the AddBillActivity
-            startActivityForResult(intent, ADD_BILL_REQUEST_CODE)
+            showBillNameDialog()
         }
     }
 
-    // Handle result from AddBillActivity
-    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-        super.onActivityResult(requestCode, resultCode, data)
-
-        if (requestCode == ADD_BILL_REQUEST_CODE && resultCode == Activity.RESULT_OK && data != null) {
-            val billName = data.getStringExtra("bill_name")
-            val billAmount = data.getStringExtra("bill_amount")
-            val paidBy = data.getStringExtra("paid_by")
-            val membersList = data.getStringArrayListExtra("members")
-            val billDetails = "Bill Name: $billName, Amount: $billAmount, Paid By: $paidBy, Members: ${membersList?.joinToString()}"
-            billsList.add(billDetails)
-
-            // Update the UI to display the bill summary
-            updateBillSummary(billName, billAmount, paidBy, membersList)
-
-            billsRecyclerView.adapter?.notifyDataSetChanged()
-        }
+    private fun showBillNameDialog() {
+        // Inflate the dialog view
+        val dialogView = LayoutInflater.from(this).inflate(R.layout.dialog_bill_name, null)
+        val billNameEditText = dialogView.findViewById<EditText>(R.id.bill_name_edittext)
+
+        // Build the AlertDialog
+        AlertDialog.Builder(this)
+            .setTitle("Enter Bill Name")
+            .setView(dialogView)
+            .setPositiveButton("Add") { dialog, _ ->
+                val billName = billNameEditText.text.toString().trim()
+                if (billName.isNotEmpty()) {
+                    createBillButton(billName)
+                } else {
+                    Toast.makeText(this, "Bill name cannot be empty", Toast.LENGTH_SHORT).show()
+                }
+                dialog.dismiss()
+            }
+            .setNegativeButton("Cancel") { dialog, _ -> dialog.dismiss() }
+            .show()
     }
 
-    private fun updateBillSummary(billName: String?, billAmount: String?, paidBy: String?, membersList: ArrayList<String>?) {
-        // Update the TextViews with the bill data and make them visible
-        findViewById<TextView>(R.id.bill_name_textview).apply {
-            text = "Bill Name: $billName"
-            visibility = View.VISIBLE
+    private fun createBillButton(billName: String) {
+        // Create a new button for the bill
+        val newButton = Button(this)
+        newButton.text = billName
+        newButton.layoutParams = LinearLayout.LayoutParams(
+            LinearLayout.LayoutParams.MATCH_PARENT,
+            LinearLayout.LayoutParams.WRAP_CONTENT
+        )
+
+        // OnClick: Open AddBillActivity for the selected bill
+        newButton.setOnClickListener {
+            val intent = Intent(this, AddBillActivity::class.java)
+            intent.putExtra("bill_name", billName)
+            startActivityForResult(intent, REQUEST_ADD_BILL)
         }
 
-        findViewById<TextView>(R.id.bill_amount_textview).apply {
-            text = "Bill Amount: $billAmount"
-            visibility = View.VISIBLE
-        }
+        // Add the button to the scrollable container
+        tripDetailButtonContainer.addView(newButton)
 
-        findViewById<TextView>(R.id.paid_by_textview).apply {
-            text = "Paid By: $paidBy"
-            visibility = View.VISIBLE
+        totalBillsCount++
+        updateTotalBillsDisplay()
+    }
+
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(requestCode, resultCode, data)
+        if (requestCode == REQUEST_ADD_BILL && resultCode == Activity.RESULT_OK && data != null) {
+            val bill = data.getSerializableExtra("bill") as? Bill
+            bill?.let {
+                billsList.add(it) // Add the bill to the bills list
+                updateTotalBillsDisplay() // Update the total bills count
+            }
         }
+    }
 
-        // Update RecyclerView for members and make it visible
-        val membersRecyclerView: RecyclerView = findViewById(R.id.members_recycler_view)
-        val membersAdapter = MembersAdapter(membersList ?: arrayListOf())
-        membersRecyclerView.adapter = membersAdapter
-        membersRecyclerView.visibility = View.VISIBLE
+    private fun updateTotalBillsDisplay() {
+        totalBillsTextView.text = "Total bills: $totalBillsCount"
     }
 
     companion object {
-        const val ADD_BILL_REQUEST_CODE = 1
+        private const val REQUEST_ADD_BILL = 1
     }
 }
diff --git a/app/src/main/java/com/example/jlaja/itemAdapter.kt b/app/src/main/java/com/example/jlaja/itemAdapter.kt
new file mode 100644
index 0000000..db51c92
--- /dev/null
+++ b/app/src/main/java/com/example/jlaja/itemAdapter.kt
@@ -0,0 +1,31 @@
+package com.example.jlaja
+
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView
+
+class ItemsAdapter(private val items: List<Item>) : RecyclerView.Adapter<ItemsAdapter.ItemViewHolder>() {
+
+    class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+        val itemNameTextView: TextView = itemView.findViewById(R.id.item_name_textview)
+        val itemPriceTextView: TextView = itemView.findViewById(R.id.item_price_textview)
+
+        fun bind(item: Item) {
+            itemNameTextView.text = item.name
+            itemPriceTextView.text = "$${"%.2f".format(item.unitPrice)}"
+        }
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder {
+        val view = LayoutInflater.from(parent.context).inflate(R.layout.item_view, parent, false)
+        return ItemViewHolder(view)
+    }
+
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        holder.bind(items[position])
+    }
+
+    override fun getItemCount(): Int = items.size
+}
diff --git a/app/src/main/res/layout/activity_add_bill.xml b/app/src/main/res/layout/activity_add_bill.xml
index dafec0d..eb1aefb 100644
--- a/app/src/main/res/layout/activity_add_bill.xml
+++ b/app/src/main/res/layout/activity_add_bill.xml
@@ -12,81 +12,101 @@
         android:layout_height="wrap_content"
         android:text="Bill Name"
         android:textSize="16sp"
-        android:paddingBottom="4dp" />
+        android:textStyle="bold" />
 
-    <EditText
-        android:id="@+id/bill_name_edittext"
+    <TextView
+        android:id="@+id/bill_name_textview"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:hint="Enter bill name"
-        android:inputType="text" />
+        android:text="Bill Name will appear here"
+        android:textSize="18sp"
+        android:textColor="@android:color/holo_blue_dark" />
 
-    <!-- Bill Amount Input -->
+    <!-- Paid By Selector -->
     <TextView
-        android:id="@+id/bill_amount_label"
+        android:id="@+id/paid_by_label"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="Bill Amount"
+        android:layout_marginTop="16dp"
+        android:text="Paid By"
         android:textSize="16sp"
-        android:paddingTop="16dp"
-        android:paddingBottom="4dp" />
+        android:textStyle="bold" />
 
-    <EditText
-        android:id="@+id/bill_amount_edittext"
+    <Spinner
+        android:id="@+id/paid_by_spinner"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:hint="Enter bill amount"
-        android:inputType="numberDecimal" />
+        android:layout_height="wrap_content" />
 
-    <!-- Paid By Section (who paid) -->
+    <!-- Total Bill Amount Display -->
     <TextView
-        android:id="@+id/paid_by_label"
+        android:id="@+id/bill_amount_label"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="Paid By"
+        android:layout_marginTop="16dp"
+        android:text="Total Bill Amount"
         android:textSize="16sp"
-        android:paddingTop="16dp"
-        android:paddingBottom="4dp" />
+        android:textStyle="bold" />
 
-    <Spinner
-        android:id="@+id/paid_by_spinner"
+    <TextView
+        android:id="@+id/bill_amount_textview"
         android:layout_width="match_parent"
-        android:layout_height="54dp"
-        android:spinnerMode="dropdown" />
+        android:layout_height="wrap_content"
+        android:text="0.00"
+        android:textSize="18sp"
+        android:textColor="@android:color/holo_blue_dark" />
 
-    <!-- Split Between Section -->
+    <!-- Members List -->
     <TextView
-        android:id="@+id/split_between_label"
+        android:id="@+id/members_label"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="Split Between"
+        android:layout_marginTop="16dp"
+        android:text="Members"
         android:textSize="16sp"
-        android:paddingTop="16dp"
-        android:paddingBottom="4dp" />
+        android:textStyle="bold" />
 
-    <!-- RecyclerView for Members to Split the Bill Between -->
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/members_recycler_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:scrollbars="vertical" />
-
-    <!-- Save Bill Button -->
+        android:layout_marginTop="8dp" />
 
     <Button
         android:id="@+id/button2"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="ADD MEMBERS" />
+        android:layout_marginTop="8dp"
+        android:text="1) Add Member" />
 
+    <!-- Items List -->
+    <TextView
+        android:id="@+id/items_label"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:text="Items"
+        android:textSize="16sp"
+        android:textStyle="bold" />
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/items_recycler_view"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp" />
+
+    <Button
+        android:id="@+id/add_item_button"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:text="2) Add Item" />
+
+    <!-- Save Bill Button -->
     <Button
         android:id="@+id/save_bill_button"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
-        android:padding="12dp"
-        android:text="Save Bill"
-        android:textSize="16sp" />
+        android:text="Save Bill" />
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/activity_trip_detail.xml b/app/src/main/res/layout/activity_trip_detail.xml
index 9a5e380..da7fc24 100644
--- a/app/src/main/res/layout/activity_trip_detail.xml
+++ b/app/src/main/res/layout/activity_trip_detail.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<!-- activity_trip_detail.xml -->
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
@@ -6,61 +6,44 @@
     android:orientation="vertical"
     android:padding="16dp">
 
-    <!-- Header for Bills List -->
+    <!-- Trip Name Header -->
     <TextView
         android:id="@+id/bills_header"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="Bills"
-        android:textSize="18sp"
-        android:textStyle="bold"
-        android:paddingBottom="8dp" />
+        android:text="Trip Details"
+        android:textSize="20sp"
+        android:textStyle="bold"/>
 
-    <!-- Bill Summary Section (Displayed below header) -->
+    <!-- Total Bills Count -->
     <TextView
-        android:id="@+id/bill_name_textview"
+        android:id="@+id/total_bills_textview"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="Bill Name"
-        android:visibility="gone" /> <!-- Initially hidden, will show when bill is saved -->
+        android:text="Total bills: 0"
+        android:textSize="16sp"
+        android:layout_marginTop="8dp"/>
 
-    <TextView
-        android:id="@+id/bill_amount_textview"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Bill Amount"
-        android:visibility="gone" /> <!-- Initially hidden -->
-
-    <TextView
-        android:id="@+id/paid_by_textview"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Paid By"
-        android:visibility="gone" /> <!-- Initially hidden -->
-
-    <!-- RecyclerView for members list -->
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/members_recycler_view"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:visibility="gone" /> <!-- Initially hidden -->
-
-    <!-- RecyclerView for the list of bills (below the bill summary) -->
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/bills_recycler_view"
+    <!-- ScrollView to hold dynamic buttons for trips -->
+    <ScrollView
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:layout_weight="1"
-        android:scrollbars="vertical" />
+        android:layout_weight="1">
+
+        <LinearLayout
+            android:id="@+id/tripDetail_button_container"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"/>
+
+    </ScrollView>
 
-    <!-- Button to add a new bill -->
+    <!-- Add Bill Button -->
     <Button
         android:id="@+id/add_bill_button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="center"
         android:text="Add Bill"
-        android:padding="8dp"
-        android:textSize="16sp" />
+        android:layout_gravity="center"/>
 
-</LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_bill_name.xml b/app/src/main/res/layout/dialog_bill_name.xml
new file mode 100644
index 0000000..6236715
--- /dev/null
+++ b/app/src/main/res/layout/dialog_bill_name.xml
@@ -0,0 +1,15 @@
+<!-- res/layout/dialog_bill_name.xml -->
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:padding="16dp">
+
+    <EditText
+        android:id="@+id/bill_name_edittext"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:hint="Enter Bill Name"
+        android:inputType="text"/>
+</LinearLayout>
diff --git a/app/src/main/res/layout/dialog_item.xml b/app/src/main/res/layout/dialog_item.xml
new file mode 100644
index 0000000..e376c89
--- /dev/null
+++ b/app/src/main/res/layout/dialog_item.xml
@@ -0,0 +1,23 @@
+<!-- dialog_item.xml -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:padding="16dp">
+
+    <EditText
+        android:id="@+id/item_name_edittext"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:hint="Item Name"
+        android:inputType="text" />
+
+    <EditText
+        android:id="@+id/item_price_edittext"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:hint="Item Price"
+        android:inputType="numberDecimal"
+        android:layout_marginTop="8dp" />
+</LinearLayout>
diff --git a/app/src/main/res/layout/dialog_portion_assignment.xml b/app/src/main/res/layout/dialog_portion_assignment.xml
new file mode 100644
index 0000000..0345a21
--- /dev/null
+++ b/app/src/main/res/layout/dialog_portion_assignment.xml
@@ -0,0 +1,30 @@
+<!-- dialog_portion_assignment.xml -->
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:padding="16dp">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Assign Portions"
+            android:textSize="18sp"
+            android:textStyle="bold"
+            android:layout_gravity="center_horizontal"
+            android:paddingBottom="8dp" />
+
+        <LinearLayout
+            android:id="@+id/portions_container"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+            <!-- Dynamically added member portion rows will go here -->
+        </LinearLayout>
+
+    </LinearLayout>
+</ScrollView>
diff --git a/app/src/main/res/layout/item_bill.xml b/app/src/main/res/layout/item_bill.xml
index 994d968..0f62a70 100644
--- a/app/src/main/res/layout/item_bill.xml
+++ b/app/src/main/res/layout/item_bill.xml
@@ -1,14 +1,50 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<!-- res/layout/item_bill.xml -->
+<androidx.cardview.widget.CardView
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical"
+    android:layout_margin="8dp"
+    android:elevation="4dp"
     android:padding="8dp">
 
-    <TextView
-        android:id="@+id/bill_textview"
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:padding="16dp"
-        android:textSize="16sp" />
-</LinearLayout>
\ No newline at end of file
+        android:orientation="vertical">
+
+        <!-- Bill Name -->
+        <TextView
+            android:id="@+id/bill_name_textview"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Bill Name"
+            android:textStyle="bold"
+            android:textSize="18sp" />
+
+        <!-- Total Amount -->
+        <TextView
+            android:id="@+id/total_amount_textview"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Total amount: $0.00"
+            android:layout_marginTop="4dp" />
+
+        <!-- Paid By -->
+        <TextView
+            android:id="@+id/paid_by_textview"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Paid by: "
+            android:layout_marginTop="4dp" />
+
+        <!-- Members' shares container -->
+        <LinearLayout
+            android:id="@+id/members_shares_container"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:layout_marginTop="8dp">
+        </LinearLayout>
+
+    </LinearLayout>
+</androidx.cardview.widget.CardView>
diff --git a/app/src/main/res/layout/item_member_share.xml b/app/src/main/res/layout/item_member_share.xml
new file mode 100644
index 0000000..53f0355
--- /dev/null
+++ b/app/src/main/res/layout/item_member_share.xml
@@ -0,0 +1,22 @@
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    android:padding="4dp">
+
+    <TextView
+        android:id="@+id/member_name_textview"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:text="User 1"
+        android:textSize="14sp" />
+
+    <TextView
+        android:id="@+id/member_share_textview"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Owes: $0.00"
+        android:textSize="14sp" />
+</LinearLayout>
diff --git a/app/src/main/res/layout/item_view.xml b/app/src/main/res/layout/item_view.xml
new file mode 100644
index 0000000..f0731f9
--- /dev/null
+++ b/app/src/main/res/layout/item_view.xml
@@ -0,0 +1,26 @@
+<!-- item_view.xml -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    android:padding="8dp">
+
+    <TextView
+        android:id="@+id/item_name_textview"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:text="Item Name"
+        android:textSize="16sp"
+        android:textColor="#000000" />
+
+    <TextView
+        android:id="@+id/item_price_textview"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Price"
+        android:textSize="16sp"
+        android:textColor="#000000"
+        android:layout_gravity="end" />
+
+</LinearLayout>
diff --git a/app/src/main/res/layout/member_item.xml b/app/src/main/res/layout/member_item.xml
index 86d9d77..3802192 100644
--- a/app/src/main/res/layout/member_item.xml
+++ b/app/src/main/res/layout/member_item.xml
@@ -1,13 +1,17 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<!-- member_item.xml -->
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical"
+    android:orientation="horizontal"
     android:padding="8dp">
 
+    <!-- Member Share -->
     <TextView
-        android:id="@+id/member_name_text_view"
+        android:id="@+id/member_share_textview"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textSize="16sp" />
-</LinearLayout>
+        android:text="Member Name: $Amount"
+        android:textSize="16sp"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/portion_item.xml b/app/src/main/res/layout/portion_item.xml
new file mode 100644
index 0000000..ed5b1d1
--- /dev/null
+++ b/app/src/main/res/layout/portion_item.xml
@@ -0,0 +1,22 @@
+<!-- portion_item.xml -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    android:padding="8dp">
+
+    <TextView
+        android:id="@+id/member_name_textview"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:text="Member Name"
+        android:textSize="16sp" />
+
+    <EditText
+        android:id="@+id/portion_edittext"
+        android:layout_width="100dp"
+        android:layout_height="wrap_content"
+        android:hint="Portion"
+        android:inputType="number" />
+</LinearLayout>
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index e55d285..a09f0ad 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -28,6 +28,7 @@ androidx-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit
 androidx-material3 = { group = "androidx.compose.material3", name = "material3" }
 androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
 androidx-recyclerview = { group = "androidx.recyclerview", name = "recyclerview", version.ref = "recyclerview" }
+androidx-cardview = { module = "androidx.cardview:cardview", version = "1.0.0" }
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }