From 15e5e94915b45119938553e2c79df36db4494719 Mon Sep 17 00:00:00 2001
From: vavali08 <vavali@seas.upenn.edu>
Date: Thu, 18 Apr 2024 12:25:50 -0400
Subject: [PATCH 1/5] minor ui stuff

---
 .../Subletting/SubletDetailsFragment.kt       |   2 +-
 .../adapters/PostedSubletsListAdapter.kt      |   6 +-
 .../pennmobile/classes/SublettingViewModel.kt |   2 +-
 .../res/layout/fragment_sublet_details.xml    | 365 ++++++++++--------
 4 files changed, 202 insertions(+), 173 deletions(-)

diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/Subletting/SubletDetailsFragment.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/Subletting/SubletDetailsFragment.kt
index 3a8f5976e..6d18cb990 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/Subletting/SubletDetailsFragment.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/Subletting/SubletDetailsFragment.kt
@@ -34,7 +34,7 @@ class SubletDetailsFragment(private val dataModel: SublettingViewModel, private
 
         val sublet : Sublet = dataModel.getSublet(subletNumber)
         binding.titleText.text = sublet.title
-        binding.priceText.text = sublet.price.toString()
+        binding.priceText.text = "$" + sublet.price.toString()
         binding.addressText.text = sublet.address
         binding.datesText.text = sublet.startDate + " to " + sublet.endDate
         binding.descriptionText.text = sublet.description ?: "None"
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/PostedSubletsListAdapter.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/PostedSubletsListAdapter.kt
index 233192612..78c39490b 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/PostedSubletsListAdapter.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/PostedSubletsListAdapter.kt
@@ -51,11 +51,12 @@ class PostedSubletsListAdapter(private val dataModel: SublettingViewModel):
         var mSublettingCard: Sublet = dataModel.getSublet(position) // dataModel.getSblet(position)
         //holder.listingImage.setImageResource(mSublettingCard.listingImage!!)
 
-        /* Glide.with(mContext) // Use mContext here instead of context
+        Glide.with(mContext) // Use mContext here instead of context
             .load(mSublettingCard.images?.get(0)?.imageUrl) // Access the first image URL from the list
             .centerCrop() // optional - adjust as needed
             .transition(DrawableTransitionOptions.withCrossFade())
-            .into(holder.listingImage) */
+            .into(holder.listingImage)
+
 
         holder.listingTitle.text = mSublettingCard.title
 
@@ -74,6 +75,7 @@ class PostedSubletsListAdapter(private val dataModel: SublettingViewModel):
                     .addToBackStack(null)
                     .commit()
         }
+        holder.listingDates.text = mSublettingCard.startDate + " to " + mSublettingCard.endDate
     }
 
 
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/SublettingViewModel.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/SublettingViewModel.kt
index c0e584cc0..3e11839bf 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/SublettingViewModel.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/SublettingViewModel.kt
@@ -99,7 +99,7 @@ class SublettingViewModel (private val activity: Activity, private val studentLi
                 "Bearer " + sp.getString(context.getString(R.string.access_token), "").toString()
 
 
-            studentLife.getPostedSublets(bearerToken, true).subscribe({ sublets ->
+            studentLife.getPostedSublets(bearerToken, false).subscribe({ sublets ->
                 mActivity.runOnUiThread {
                     postedSubletsList.value = sublets as ArrayList<Sublet>
                 }
diff --git a/PennMobile/src/main/res/layout/fragment_sublet_details.xml b/PennMobile/src/main/res/layout/fragment_sublet_details.xml
index 0c8f2c2a7..951e31036 100644
--- a/PennMobile/src/main/res/layout/fragment_sublet_details.xml
+++ b/PennMobile/src/main/res/layout/fragment_sublet_details.xml
@@ -1,181 +1,208 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/color_background">
-
-    <TextView
-        android:id="@+id/amenities_text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="26sp"
-        android:layout_marginTop="10sp"
-        android:text="TextView"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/amenties_title" />
-
-    <TextView
-        android:id="@+id/amenties_title"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="26sp"
-        android:layout_marginTop="10sp"
-        android:fontFamily="@font/sf_pro_display_bold"
-        android:text="Amenities"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/divider4" />
-
-    <View
-        android:id="@+id/divider4"
-        android:layout_width="match_parent"
-        android:layout_height="0.5sp"
-        android:layout_marginHorizontal="26sp"
-        android:background="?android:attr/listDivider"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/description_text" />
-
-    <TextView
-        android:id="@+id/title_text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="26dp"
-        android:fontFamily="@font/sf_pro_display_bold"
-        android:text="@string/title"
-        android:textSize="26sp"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <TextView
-        android:id="@+id/edit_text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="26sp"
-        android:fontFamily="@font/sf_pro_display_bold"
-        android:text="Edit"
-        android:textColor="@color/pennmobile_blue"
-        app:layout_constraintBottom_toBottomOf="@id/title_text"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <ImageView
-        android:id="@+id/sublet_image"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="26sp"
-        android:layout_marginTop="10sp"
-        android:layout_marginEnd="26sp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/title_text"
-        app:srcCompat="@drawable/subletting_house" />
-
-    <TextView
-        android:id="@+id/price_text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="26sp"
-        android:layout_marginTop="10sp"
-        android:fontFamily="@font/sf_pro_display_regular"
-        android:text="price"
-        android:textColor="@color/dark_gray"
-        android:textSize="14sp"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/sublet_image" />
-
-    <TextView
-        android:id="@+id/address_text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="26sp"
-        android:layout_marginTop="5sp"
-        android:fontFamily="@font/sf_pro_display_regular"
-        android:text="address"
-        android:textColor="@color/dark_gray"
-        android:textSize="12sp"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/price_text" />
-
-    <Button
-        android:id="@+id/available_button"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginHorizontal="26sp"
-        android:layout_marginTop="6dp"
-        android:backgroundTint="#639AFF"
-        android:text="Mark as claimed"
-        android:textAllCaps="false"
-        android:textColor="@color/white"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/address_text" />
-
-    <View
-        android:id="@+id/divider2"
+    <ScrollView
+        android:id="@+id/new_listing_scrollview"
         android:layout_width="match_parent"
-        android:layout_height="0.5sp"
-        android:layout_marginHorizontal="26sp"
-        android:layout_marginTop="20dp"
-        android:background="?android:attr/listDivider"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/available_button" />
-
-    <TextView
-        android:id="@+id/availability_text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="26sp"
-        android:layout_marginTop="10sp"
-        android:fontFamily="@font/sf_pro_display_bold"
-        android:text="Availability"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/divider2" />
-
-    <TextView
-        android:id="@+id/dates_text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="26sp"
-        android:layout_marginTop="10sp"
-        android:fontFamily="@font/sf_pro_display_medium"
-        android:text="dates"
-        android:textSize="14sp"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/availability_text" />
-
-    <View
-        android:id="@+id/divider3"
-        android:layout_width="match_parent"
-        android:layout_height="0.5sp"
-        android:layout_marginHorizontal="26sp"
-        android:layout_marginTop="20sp"
-        android:background="?android:attr/listDivider"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/dates_text" />
-
-    <TextView
-        android:id="@+id/description_title_text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="26sp"
-        android:layout_marginTop="10sp"
-        android:fontFamily="@font/sf_pro_display_bold"
-        android:text="Description"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/divider3" />
-
-    <TextView
-        android:id="@+id/description_text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="26sp"
-        android:layout_marginTop="10sp"
-        android:text="TextView"
+        android:layout_height="0dp"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/description_title_text" />
+        app:layout_constraintTop_toTopOf="parent">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="0dp">
+
+
+
+            <TextView
+                android:id="@+id/title_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="26dp"
+                android:fontFamily="@font/sf_pro_display_bold"
+                android:text="@string/title"
+                android:textSize="26sp"
+                android:layout_marginEnd="36dp"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <TextView
+                android:id="@+id/edit_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="26sp"
+                android:fontFamily="@font/sf_pro_display_bold"
+                android:text="Edit"
+                android:textColor="@color/pennmobile_blue"
+                app:layout_constraintBottom_toBottomOf="@id/title_text"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <ImageView
+                android:id="@+id/sublet_image"
+                android:layout_width="0dp"
+                android:layout_height="250sp"
+                android:layout_marginStart="26sp"
+                android:layout_marginTop="10sp"
+                android:layout_marginEnd="26sp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/title_text"
+                app:srcCompat="@drawable/subletting_house" />
+
+            <TextView
+                android:id="@+id/price_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="26sp"
+                android:layout_marginTop="10sp"
+                android:fontFamily="@font/sf_pro_display_regular"
+                android:text="price"
+                android:textColor="@color/dark_gray"
+                android:textSize="14sp"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/sublet_image" />
+
+            <TextView
+                android:id="@+id/address_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="26sp"
+                android:layout_marginTop="5sp"
+                android:fontFamily="@font/sf_pro_display_regular"
+                android:text="address"
+                android:textColor="@color/dark_gray"
+                android:textSize="12sp"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/price_text" />
+
+            <Button
+                android:id="@+id/available_button"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="26sp"
+                android:layout_marginTop="6dp"
+                android:backgroundTint="#639AFF"
+                android:text="Mark as claimed"
+                android:textAllCaps="false"
+                android:textColor="@color/white"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/address_text" />
+
+            <View
+                android:id="@+id/divider2"
+                android:layout_width="match_parent"
+                android:layout_height="0.5sp"
+                android:layout_marginHorizontal="26sp"
+                android:layout_marginTop="20dp"
+                android:background="?android:attr/listDivider"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/available_button" />
+
+            <TextView
+                android:id="@+id/availability_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="26sp"
+                android:layout_marginTop="10sp"
+                android:fontFamily="@font/sf_pro_display_bold"
+                android:text="Availability"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/divider2" />
+
+            <TextView
+                android:id="@+id/dates_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="26sp"
+                android:layout_marginTop="10sp"
+                android:fontFamily="@font/sf_pro_display_medium"
+                android:text="dates"
+                android:textSize="14sp"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/availability_text" />
+
+            <View
+                android:id="@+id/divider3"
+                android:layout_width="match_parent"
+                android:layout_height="0.5sp"
+                android:layout_marginHorizontal="26sp"
+                android:layout_marginTop="20sp"
+                android:background="?android:attr/listDivider"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/dates_text" />
+
+            <TextView
+                android:id="@+id/description_title_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="26sp"
+                android:layout_marginTop="10sp"
+                android:fontFamily="@font/sf_pro_display_bold"
+                android:text="Description"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/divider3" />
+
+            <TextView
+                android:id="@+id/description_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="26sp"
+                android:layout_marginTop="10sp"
+                android:text="TextView"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/description_title_text" />
+
+            <View
+                android:id="@+id/divider4"
+                android:layout_width="match_parent"
+                android:layout_height="0.5sp"
+                android:layout_marginHorizontal="26sp"
+                android:background="?android:attr/listDivider"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/description_text" />
+
+
+            <TextView
+                android:id="@+id/amenties_title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="26sp"
+                android:layout_marginTop="10sp"
+                android:fontFamily="@font/sf_pro_display_bold"
+                android:text="Amenities"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/divider4" />
+            <TextView
+                android:id="@+id/amenities_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="26sp"
+                android:layout_marginTop="10sp"
+                android:text="TextView"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/amenties_title" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                app:layout_constraintTop_toBottomOf="@id/amenities_text"
+                app:layout_constraintStart_toStartOf="parent"
+                android:text=" "
+                android:textSize="75dp"/>
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+    </ScrollView>
 
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From f59a022e4f8cfb2feabc3a30551b04f08c5d816c Mon Sep 17 00:00:00 2001
From: vavali08 <vavali@seas.upenn.edu>
Date: Sun, 21 Apr 2024 13:17:15 -0400
Subject: [PATCH 2/5] at tab titles

---
 .../Subletting/SubletDetailsHolderFragment.kt        | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/Subletting/SubletDetailsHolderFragment.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/Subletting/SubletDetailsHolderFragment.kt
index c09ff7ff9..1b7f9cb3a 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/Subletting/SubletDetailsHolderFragment.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/Subletting/SubletDetailsHolderFragment.kt
@@ -7,6 +7,8 @@ import android.view.ViewGroup
 import androidx.coordinatorlayout.widget.CoordinatorLayout
 import androidx.fragment.app.Fragment
 import androidx.viewpager2.widget.ViewPager2
+import com.google.android.material.tabs.TabLayout
+import com.google.android.material.tabs.TabLayoutMediator
 import com.pennapps.labs.pennmobile.MainActivity
 import com.pennapps.labs.pennmobile.R
 import com.pennapps.labs.pennmobile.adapters.SubletDetailsPagerAdapter
@@ -41,6 +43,16 @@ class SubletDetailsHolderFragment(private val dataModel: SublettingViewModel, pr
         subletDetailsPagerAdapter = SubletDetailsPagerAdapter(this, dataModel, subletNumber)
         viewPager = view.findViewById(R.id.listing_view_pager)
         viewPager.adapter = subletDetailsPagerAdapter
+        val tabLayout : TabLayout = view.findViewById(R.id.listing_tab_layout)
+        TabLayoutMediator(tabLayout, viewPager) { tab, position ->
+            if(position == 0) {
+                tab.text = "Details"
+            } else {
+                tab.text = "Candidates"
+            }
+        }.attach()
+
+
 
 
     }

From 64a84856e74f6428cdce320104434ffb2c0b4ee8 Mon Sep 17 00:00:00 2001
From: vavali08 <vavali@seas.upenn.edu>
Date: Sun, 21 Apr 2024 13:54:29 -0400
Subject: [PATCH 3/5] cardview ui fix

---
 .../com/pennapps/labs/pennmobile/NewListingsFragment.kt     | 1 +
 .../labs/pennmobile/adapters/PostedSubletsListAdapter.kt    | 3 ++-
 PennMobile/src/main/res/layout/subletting_cardview.xml      | 6 +++---
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/NewListingsFragment.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/NewListingsFragment.kt
index e781df4db..fce861c26 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/NewListingsFragment.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/NewListingsFragment.kt
@@ -260,6 +260,7 @@ class NewListingsFragment(private val dataModel: SublettingViewModel) : Fragment
 
 
 
+
     }
 
     private fun convertToYYYYMMDD(mmddyy: String): String {
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/PostedSubletsListAdapter.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/PostedSubletsListAdapter.kt
index 78c39490b..e88127623 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/PostedSubletsListAdapter.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/PostedSubletsListAdapter.kt
@@ -75,7 +75,8 @@ class PostedSubletsListAdapter(private val dataModel: SublettingViewModel):
                     .addToBackStack(null)
                     .commit()
         }
-        holder.listingDates.text = mSublettingCard.startDate + " to " + mSublettingCard.endDate
+        holder.listingDates.setSingleLine(false);
+        holder.listingDates.text = mSublettingCard.startDate + " to \n" + mSublettingCard.endDate
     }
 
 
diff --git a/PennMobile/src/main/res/layout/subletting_cardview.xml b/PennMobile/src/main/res/layout/subletting_cardview.xml
index 42aa1d4b2..d739681a2 100644
--- a/PennMobile/src/main/res/layout/subletting_cardview.xml
+++ b/PennMobile/src/main/res/layout/subletting_cardview.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/subletting_cardview_item"
     android:layout_width="200dp"
-    android:layout_height="300dp"
+    android:layout_height="340dp"
     app:cardCornerRadius="8dp"
     app:cardElevation="5dp"
     app:cardPreventCornerOverlap="true"
@@ -26,12 +26,12 @@
 
         <TextView
             android:id="@+id/subletting_cardview_title"
-            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:fontFamily="@font/gilroy_bold"
             android:text="Title"
             android:textSize="20dp"
-            android:layout_marginTop="10dp"
+            android:layout_width="fill_parent"
+            android:layout_marginHorizontal="15dp"
             app:layout_constraintTop_toBottomOf="@id/subletting_cardview_image"
             app:layout_constraintStart_toStartOf="@id/subletting_cardview_image" />
 

From f648ac29fc352dec4a3c2f24b7c8f0020ad1550a Mon Sep 17 00:00:00 2001
From: meiron03 <meiaaron99@gmail.com>
Date: Sun, 21 Apr 2024 15:59:39 -0400
Subject: [PATCH 4/5] Code cleanup, ui fixes, and added padding to end of rv
 for fragment_subletter_posted_listings.xml to fix the cutoff issue (needs
 more investigation tho).

---
 .../SubletterPostedListingsFragment.kt        | 34 +++++++++++++------
 .../pennmobile/SublettingHolderFragment.kt    | 12 -------
 .../adapters/PostedSubletsListAdapter.kt      | 25 +++++---------
 .../fragment_subletter_posted_listings.xml    | 20 ++++++-----
 .../main/res/layout/subletting_cardview.xml   |  2 +-
 5 files changed, 45 insertions(+), 48 deletions(-)

diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/Subletting/SubletterPostedListingsFragment.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/Subletting/SubletterPostedListingsFragment.kt
index c34f974be..6684f8c53 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/Subletting/SubletterPostedListingsFragment.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/Subletting/SubletterPostedListingsFragment.kt
@@ -31,7 +31,6 @@ class SubletterPostedListingsFragment() : Fragment() {
 
     //api manager
     private lateinit var mStudentLife: StudentLife
-
     private lateinit var mActivity: MainActivity
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -40,17 +39,12 @@ class SubletterPostedListingsFragment() : Fragment() {
         mActivity = activity as MainActivity
         mActivity.closeKeyboard()
         dataModel = SublettingViewModel(mActivity, mStudentLife)
-
-        val bundle = Bundle()
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
                               savedInstanceState: Bundle?): View? {
         // Inflate the layout for this fragment
         _binding = FragmentSubletterPostedListingsBinding.inflate(inflater, container, false)
-        binding.postedAddListingButton.setOnClickListener{
-            navigateCreateNewListing()
-        }
         return binding.root
     }
 
@@ -60,17 +54,33 @@ class SubletterPostedListingsFragment() : Fragment() {
         newLayoutManager = GridLayoutManager(context, 2, LinearLayoutManager.VERTICAL, false)
         sublettingRecyclerView.layoutManager = newLayoutManager
 
-
         dataModel.getPostedSublets(mActivity)
         myAdapter = PostedSubletsListAdapter(dataModel)
-        dataModel.postedSubletsList.observe(viewLifecycleOwner, { sublets ->
+        dataModel.postedSubletsList.observe(viewLifecycleOwner) { sublets ->
+            binding.listingsRefreshLayout.isRefreshing = false
+
             sublettingList = sublets
             myAdapter.notifyDataSetChanged()
-        })
+
+            if (sublets.size > 0) {
+                binding.postedHouseImage.visibility =  View.GONE
+                binding.postedNoListingsText.visibility =  View.GONE
+            } else {
+                binding.postedHouseImage.visibility =  View.VISIBLE
+                binding.postedNoListingsText.visibility =  View.VISIBLE
+            }
+        }
+
         sublettingRecyclerView.adapter = myAdapter
 
-    }
+        binding.listingsRefreshLayout.setOnRefreshListener {
+            dataModel.getPostedSublets(mActivity)
+        }
 
+        binding.postedAddListingButton.setOnClickListener{
+            navigateCreateNewListing()
+        }
+    }
 
     private fun navigateCreateNewListing() {
         val mainActivity = context as MainActivity
@@ -85,4 +95,8 @@ class SubletterPostedListingsFragment() : Fragment() {
                 .commitAllowingStateLoss()
     }
 
+    override fun onDestroy() {
+        super.onDestroy()
+        _binding = null
+    }
 }
\ No newline at end of file
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/SublettingHolderFragment.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/SublettingHolderFragment.kt
index 8a55bb243..5df6ab725 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/SublettingHolderFragment.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/SublettingHolderFragment.kt
@@ -51,17 +51,5 @@ class SublettingFragment : Fragment() {
                 tab.text = "Sublessee"
             }
         }.attach()
-
-
-    }
-
-
-    private fun initAppBar(view: View) {
-        (view.appbar_home_holder.layoutParams as CoordinatorLayout.LayoutParams).behavior = ToolbarBehavior()
     }
-
-
-
-
-
 }
\ No newline at end of file
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/PostedSubletsListAdapter.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/PostedSubletsListAdapter.kt
index e88127623..cab0c3e26 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/PostedSubletsListAdapter.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/PostedSubletsListAdapter.kt
@@ -29,14 +29,11 @@ class PostedSubletsListAdapter(private val dataModel: SublettingViewModel):
     private lateinit var mActivity: MainActivity
 
     class SublettingCardViewHolder(itemView: View): RecyclerView.ViewHolder(itemView) {
-
-        var listingImage = itemView.findViewById<ImageView>(R.id.subletting_cardview_image)
-        var listingTitle = itemView.findViewById<TextView>(R.id.subletting_cardview_title)
-        var listingPrice = itemView.findViewById<TextView>(R.id.subletting_cardview_price)
-        var listingRooms = itemView.findViewById<TextView>(R.id.subletting_cardview_rooms)
-        var listingDates = itemView.findViewById<TextView>(R.id.subletting_cardview_dates)
-
-
+        var listingImage: ImageView = itemView.findViewById(R.id.subletting_cardview_image)
+        var listingTitle: TextView = itemView.findViewById(R.id.subletting_cardview_title)
+        var listingPrice: TextView = itemView.findViewById(R.id.subletting_cardview_price)
+        var listingRooms: TextView = itemView.findViewById(R.id.subletting_cardview_rooms)
+        var listingDates: TextView = itemView.findViewById(R.id.subletting_cardview_dates)
     }
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): SublettingCardViewHolder {
@@ -47,9 +44,7 @@ class PostedSubletsListAdapter(private val dataModel: SublettingViewModel):
     }
 
     override fun onBindViewHolder(holder: SublettingCardViewHolder, position: Int) {
-
-        var mSublettingCard: Sublet = dataModel.getSublet(position) // dataModel.getSblet(position)
-        //holder.listingImage.setImageResource(mSublettingCard.listingImage!!)
+        val mSublettingCard: Sublet = dataModel.getSublet(position) // dataModel.getSublet(position)
 
         Glide.with(mContext) // Use mContext here instead of context
             .load(mSublettingCard.images?.get(0)?.imageUrl) // Access the first image URL from the list
@@ -57,11 +52,9 @@ class PostedSubletsListAdapter(private val dataModel: SublettingViewModel):
             .transition(DrawableTransitionOptions.withCrossFade())
             .into(holder.listingImage)
 
-
         holder.listingTitle.text = mSublettingCard.title
 
-        var price = "$" + mSublettingCard.price.toString()
-
+        val price = "$" + mSublettingCard.price.toString()
         holder.listingPrice.text = price
 
         val rooms = mSublettingCard.beds.toString() + " bd | " +
@@ -75,11 +68,11 @@ class PostedSubletsListAdapter(private val dataModel: SublettingViewModel):
                     .addToBackStack(null)
                     .commit()
         }
-        holder.listingDates.setSingleLine(false);
+
+        holder.listingDates.isSingleLine = false;
         holder.listingDates.text = mSublettingCard.startDate + " to \n" + mSublettingCard.endDate
     }
 
-
     override fun getItemCount(): Int {
         return dataModel.postedSubletsList.value?.size ?: 0
     }
diff --git a/PennMobile/src/main/res/layout/fragment_subletter_posted_listings.xml b/PennMobile/src/main/res/layout/fragment_subletter_posted_listings.xml
index d00f58aa6..0c031ff89 100644
--- a/PennMobile/src/main/res/layout/fragment_subletter_posted_listings.xml
+++ b/PennMobile/src/main/res/layout/fragment_subletter_posted_listings.xml
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-
     <ImageView
         android:id="@+id/posted_house_image"
         android:layout_width="wrap_content"
@@ -38,19 +36,20 @@
         android:radius="30sp"
         android:text="@string/add_listing"
         android:textColor="@color/white"
-        app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
         android:id="@+id/listings_refresh_layout"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="1.0"
+        app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/posted_add_listing_button"
-        app:layout_constraintVertical_bias="1.0">
+        app:layout_constraintTop_toBottomOf="@+id/posted_add_listing_button"
+        app:layout_constraintVertical_bias="0.0">
 
 
         <androidx.recyclerview.widget.RecyclerView
@@ -58,9 +57,12 @@
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:scrollbars="none"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="parent"/>
-
+            app:layout_constraintTop_toTopOf="@+id/posted_add_listing_button"
+            android:paddingBottom="50dp"/>
 
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/PennMobile/src/main/res/layout/subletting_cardview.xml b/PennMobile/src/main/res/layout/subletting_cardview.xml
index d739681a2..18def14c1 100644
--- a/PennMobile/src/main/res/layout/subletting_cardview.xml
+++ b/PennMobile/src/main/res/layout/subletting_cardview.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/subletting_cardview_item"
     android:layout_width="200dp"
-    android:layout_height="340dp"
+    android:layout_height="wrap_content"
     app:cardCornerRadius="8dp"
     app:cardElevation="5dp"
     app:cardPreventCornerOverlap="true"

From d92cbacbf05d848eace3ce576ca6ea4305f8a738 Mon Sep 17 00:00:00 2001
From: vavali08 <vavali@seas.upenn.edu>
Date: Thu, 25 Apr 2024 12:55:54 -0400
Subject: [PATCH 5/5] edit sublet route

---
 .../{ => Subletting}/NewListingsFragment.kt   |  18 +-
 .../Subletting/SubletDetailsFragment.kt       |  19 +
 .../Subletting/SubletEditFragment.kt          | 316 +++++++++
 .../SubletterDraftListingsFragment.kt         |   1 -
 .../SubletterPostedListingsFragment.kt        |   1 -
 .../labs/pennmobile/api/StudentLife.java      |  10 +
 .../pennmobile/classes/SublettingViewModel.kt |  34 +
 ...ml => fragment_subletter_edit_listing.xml} |   0
 .../layout/fragment_subletter_new_listing.xml | 665 ++++++++++++++++++
 9 files changed, 1053 insertions(+), 11 deletions(-)
 rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/{ => Subletting}/NewListingsFragment.kt (95%)
 create mode 100644 PennMobile/src/main/java/com/pennapps/labs/pennmobile/Subletting/SubletEditFragment.kt
 rename PennMobile/src/main/res/layout/{fragment_new_listings.xml => fragment_subletter_edit_listing.xml} (100%)
 create mode 100644 PennMobile/src/main/res/layout/fragment_subletter_new_listing.xml

diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/NewListingsFragment.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/Subletting/NewListingsFragment.kt
similarity index 95%
rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/NewListingsFragment.kt
rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/Subletting/NewListingsFragment.kt
index fce861c26..776429e04 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/NewListingsFragment.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/Subletting/NewListingsFragment.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile
+package com.pennapps.labs.pennmobile.Subletting
 
 import android.graphics.BitmapFactory
 import android.os.Bundle
@@ -15,20 +15,19 @@ import android.widget.Toast
 import androidx.activity.result.PickVisualMediaRequest
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.fragment.app.Fragment
+import com.pennapps.labs.pennmobile.MainActivity
 import com.pennapps.labs.pennmobile.api.StudentLife
 import com.pennapps.labs.pennmobile.classes.AmenitiesItem
 import com.pennapps.labs.pennmobile.classes.MultipartUtil
 import com.pennapps.labs.pennmobile.classes.Sublet
 import com.pennapps.labs.pennmobile.classes.SublettingViewModel
-import com.pennapps.labs.pennmobile.databinding.FragmentNewListingsBinding
-import okhttp3.MediaType.Companion.toMediaType
+import com.pennapps.labs.pennmobile.databinding.FragmentSubletterNewListingBinding
 import okhttp3.MultipartBody
-import okhttp3.RequestBody.Companion.toRequestBody
 import java.io.IOException
 
 
 class NewListingsFragment(private val dataModel: SublettingViewModel) : Fragment() {
-    private var _binding: FragmentNewListingsBinding? = null
+    private var _binding: FragmentSubletterNewListingBinding? = null
     private val binding get() = _binding!!
 
     private lateinit var mStudentLife: StudentLife
@@ -100,7 +99,7 @@ class NewListingsFragment(private val dataModel: SublettingViewModel) : Fragment
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
                               savedInstanceState: Bundle?): View? {
-        _binding = FragmentNewListingsBinding.inflate(inflater, container, false)
+        _binding = FragmentSubletterNewListingBinding.inflate(inflater, container, false)
         val view = binding.root
         super.onViewCreated(view, savedInstanceState)
 
@@ -253,9 +252,10 @@ class NewListingsFragment(private val dataModel: SublettingViewModel) : Fragment
             }
         }
 
-        val subletPart = MultipartUtil.createSubletPart(subletId)
-
-
+        if (multipartImage != null) {
+            val subletPart = MultipartUtil.createSubletPart(subletId)
+            dataModel.postImage(mActivity, subletId,  subletPart, multipartImage!!)
+        }
 
 
 
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/Subletting/SubletDetailsFragment.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/Subletting/SubletDetailsFragment.kt
index 6d18cb990..6c8656571 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/Subletting/SubletDetailsFragment.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/Subletting/SubletDetailsFragment.kt
@@ -5,10 +5,12 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentTransaction
 import androidx.viewpager2.widget.ViewPager2
 import com.bumptech.glide.Glide
 import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions
 import com.pennapps.labs.pennmobile.MainActivity
+import com.pennapps.labs.pennmobile.R
 import com.pennapps.labs.pennmobile.api.StudentLife
 import com.pennapps.labs.pennmobile.classes.Sublet
 import com.pennapps.labs.pennmobile.classes.SublettingViewModel
@@ -51,9 +53,26 @@ class SubletDetailsFragment(private val dataModel: SublettingViewModel, private
             dataModel.deleteSublet(mActivity, subletNumber)
         }
 
+        binding.editText.setOnClickListener(){
+            navigateEditListing()
+        }
+
 
 
 
         return binding.root
     }
+
+    private fun navigateEditListing() {
+        val mainActivity = context as MainActivity
+
+        val fragment = SubletEditFragment(dataModel, subletNumber)
+
+        val fragmentManager = mainActivity.supportFragmentManager
+        fragmentManager.beginTransaction()
+            .replace(R.id.content_frame, fragment, "NEW_LISTING_FRAGMENT")
+            .setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN)
+            .addToBackStack(null)
+            .commitAllowingStateLoss()
+    }
 }
\ No newline at end of file
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/Subletting/SubletEditFragment.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/Subletting/SubletEditFragment.kt
new file mode 100644
index 000000000..56e6c8af3
--- /dev/null
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/Subletting/SubletEditFragment.kt
@@ -0,0 +1,316 @@
+package com.pennapps.labs.pennmobile.Subletting
+
+import android.graphics.BitmapFactory
+import android.os.Bundle
+import android.util.Log
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.CheckBox
+import android.widget.EditText
+import android.widget.ImageView
+import android.widget.Spinner
+import android.widget.TextView
+import android.widget.Toast
+import androidx.activity.result.PickVisualMediaRequest
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.fragment.app.Fragment
+import com.bumptech.glide.Glide
+import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions
+import com.pennapps.labs.pennmobile.MainActivity
+import com.pennapps.labs.pennmobile.api.StudentLife
+import com.pennapps.labs.pennmobile.classes.AmenitiesItem
+import com.pennapps.labs.pennmobile.classes.MultipartUtil
+import com.pennapps.labs.pennmobile.classes.Sublet
+import com.pennapps.labs.pennmobile.classes.SublettingViewModel
+import com.pennapps.labs.pennmobile.databinding.FragmentSubletterEditListingBinding
+import com.pennapps.labs.pennmobile.databinding.FragmentSubletterNewListingBinding
+import okhttp3.MultipartBody
+import java.io.IOException
+
+class SubletEditFragment (private val dataModel: SublettingViewModel, private val subletNumber: Int) : Fragment() {
+    private var _binding: FragmentSubletterEditListingBinding? = null
+    private val binding get() = _binding!!
+
+    private lateinit var mStudentLife: StudentLife
+
+    internal lateinit var titleEt : EditText
+    internal lateinit var priceEt : EditText
+    internal lateinit var streetAddressEt : EditText
+    internal lateinit var apartmentEt : EditText
+    internal lateinit var zipCodeEt : EditText
+    internal lateinit var startEt : EditText
+    internal lateinit var endEt : EditText
+    internal lateinit var bedsSpinner : Spinner
+    internal lateinit var bathsSpinner : Spinner
+    internal lateinit var descriptionEt : EditText
+    internal lateinit var bathroomCheck : CheckBox
+    internal lateinit var laundryCheck : CheckBox
+    internal lateinit var gymCheck : CheckBox
+    internal lateinit var wifiCheck : CheckBox
+    internal lateinit var furnishedCheck : CheckBox
+    internal lateinit var closetCheck : CheckBox
+    internal lateinit var utilitiesCheck : CheckBox
+    internal lateinit var poolCheck : CheckBox
+    internal lateinit var loungeCheck : CheckBox
+    internal lateinit var parkingCheck : CheckBox
+    internal lateinit var patioCheck : CheckBox
+    internal lateinit var kitchenCheck : CheckBox
+    internal lateinit var dogCheck : CheckBox
+    internal lateinit var catCheck : CheckBox
+    internal lateinit var imageView: ImageView
+    internal lateinit var imageIcon: ImageView
+    internal lateinit var imageText: TextView
+
+    //Sublet variables
+    private lateinit var title : String
+    private lateinit var price : String
+    private var streetAddress : String? = null
+    private var apartment : String? = null
+    private var zipCode : String? = null
+    private lateinit var startDate : String
+    private lateinit var endDate : String
+    private var beds : Int? = null
+    private var baths : Int? = null
+    private var description: String?  = null
+    private lateinit var amenities: List<AmenitiesItem>
+
+    private var image: String? = null
+    var multipartImage: MultipartBody.Part? = null
+
+    private lateinit var mActivity: MainActivity
+
+
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        mStudentLife = MainActivity.studentLifeInstance
+        mActivity = activity as MainActivity
+        mActivity.hideBottomBar()
+    }
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
+                              savedInstanceState: Bundle?): View? {
+        _binding = FragmentSubletterEditListingBinding.inflate(inflater, container, false)
+        val view = binding.root
+        super.onViewCreated(view, savedInstanceState)
+
+        titleEt = binding.listingNameInput
+        priceEt = binding.priceInput
+        streetAddressEt = binding.streetAddressInput
+        apartmentEt = binding.apartmentInput
+        zipCodeEt = binding.postalCodeInput
+        startEt = binding.startDateInput
+        endEt = binding.endDateInput
+        bedsSpinner = binding.bedInput
+        bathsSpinner = binding.bathInput
+        descriptionEt = binding.descriptionInput
+        bathroomCheck = binding.bathroomCheck
+        laundryCheck = binding.laundryCheck
+        gymCheck = binding.gymCheck
+        wifiCheck = binding.wifiCheck
+        furnishedCheck = binding.furnishedCheck
+        closetCheck = binding.closetCheck
+        utilitiesCheck = binding.utilitiesCheck
+        poolCheck = binding.poolCheck
+        loungeCheck = binding.loungeCheck
+        parkingCheck = binding.parkingCheck
+        patioCheck = binding.patioCheck
+        kitchenCheck = binding.kitchenCheck
+        dogCheck = binding.dogCheck
+        catCheck = binding.catCheck
+        imageView = binding.mainImage
+        imageIcon = binding.mainImageIcon
+        imageText = binding.addPhotosText
+
+        val sublet : Sublet = dataModel.getSublet(subletNumber)
+        titleEt.setText(sublet.title)
+        priceEt.setText(sublet.price.toString())
+
+        if (sublet.address != null) {
+            val addressComponents = sublet.address.split(", ")
+            streetAddressEt.setText(addressComponents.getOrElse(0) { "" })
+            apartmentEt.setText(addressComponents.getOrElse(1) { "" })
+            zipCodeEt.setText(addressComponents.getOrElse(2) { "" })
+        }
+
+        startEt.setText(sublet.startDate)
+        endEt.setText(sublet.endDate)
+        descriptionEt.setText(sublet.description)
+
+
+        context?.let {
+            Glide.with(it)
+                .load(sublet.images?.get(0)?.imageUrl)
+                .centerCrop() // optional - adjust as needed
+                .transition(DrawableTransitionOptions.withCrossFade())
+                .into(binding.mainImage)
+        }
+
+        val amenitiesList = sublet.amenities ?: emptyList()
+
+        for (amenity in amenitiesList) {
+            when (amenity) {
+                "Private Bathroom" -> bathroomCheck.isChecked = true
+                "In-unit Laundry" -> laundryCheck.isChecked = true
+                "In-Unit Laundry" -> laundryCheck.isChecked = true
+                "Gym" -> gymCheck.isChecked = true
+                "Wifi" -> wifiCheck.isChecked = true
+                "Furnished" -> furnishedCheck.isChecked = true
+                "Walk-in Closet" -> closetCheck.isChecked = true
+                "Utilities Included" -> utilitiesCheck.isChecked = true
+                "Swimming Pool" -> poolCheck.isChecked = true
+                "Resident Lounge" -> loungeCheck.isChecked = true
+                "Parking" -> parkingCheck.isChecked = true
+                "Patio" -> patioCheck.isChecked = true
+                "Kitchen" -> kitchenCheck.isChecked = true
+                "Dog-Friendly" -> dogCheck.isChecked = true
+                "Cat-Friendly" -> catCheck.isChecked = true
+            }
+        }
+
+
+        val pickMedia = registerForActivityResult(ActivityResultContracts.PickVisualMedia()) { uri ->
+            // Callback is invoked after the user selects a media item or closes the
+            // photo picker.
+            if (uri != null) {
+                Log.d("PhotoPicker", "Selected URI: $uri")
+                try {
+                    // Load the selected image into the ImageView
+                    val inputStream = context?.contentResolver?.openInputStream(uri)
+                    val bitmap = BitmapFactory.decodeStream(inputStream)
+                    image = bitmap.toString()
+                    imageView.setImageBitmap(bitmap)
+                    imageIcon.visibility = View.GONE
+                    imageText.visibility = View.GONE
+                    multipartImage = MultipartUtil.createPartFromBitmap(bitmap)
+
+
+
+                    inputStream?.close()
+                } catch (e: IOException) {
+                    e.printStackTrace()
+                    Toast.makeText(context, "Failed to load image", Toast.LENGTH_SHORT).show()
+                }
+            } else {
+                Log.d("PhotoPicker", "No media selected")
+            }
+        }
+
+        imageView.setOnClickListener{
+            pickMedia.launch(PickVisualMediaRequest(ActivityResultContracts.PickVisualMedia.ImageOnly))
+        }
+
+
+        val dateRegex = Regex("""^(0[1-9]|1[0-2])/(0[1-9]|[1-2][0-9]|3[0-1])/\d{2}$""")
+
+        binding.postButton.setOnClickListener{
+            if (titleEt.text.toString().matches("".toRegex())
+                || priceEt.text.toString().matches("".toRegex())
+                || startEt.text.toString().matches("".toRegex())
+                || endEt.text.toString().matches("".toRegex())) {
+                Toast.makeText(activity, "Please fill in all required fields",
+                    Toast.LENGTH_LONG).show()
+            } else if (!startEt.text.toString().matches(dateRegex) || !endEt.text.toString().matches(dateRegex)) {
+                Toast.makeText(activity, "Please follow formatting instructions for date",
+                    Toast.LENGTH_LONG).show()
+            } else {
+                title = titleEt.text.toString()
+                price = priceEt.text.toString()
+                streetAddress = streetAddressEt.text.toString() + ", " + apartmentEt.text.toString() +
+                        ", " + zipCodeEt.text.toString()
+                if (streetAddress.equals(", , ")) {
+                    streetAddress = null
+                }
+                startDate = startEt.text.toString()
+                endDate = endEt.text.toString()
+
+                beds = bedsSpinner.selectedItemPosition + 1
+                baths = bathsSpinner.selectedItemPosition + 1
+
+                val amenitiesList = mutableListOf<String>()
+                if(bathroomCheck.isChecked) { amenitiesList.add("Private Bathroom") }
+                if(laundryCheck.isChecked) { amenitiesList.add("In-Unit Laundry") }
+                if(gymCheck.isChecked) { amenitiesList.add("Gym") }
+                if(wifiCheck.isChecked) { amenitiesList.add("Wifi") }
+                if(furnishedCheck.isChecked) { amenitiesList.add("Furnished") }
+                if(closetCheck.isChecked) { amenitiesList.add("Walk-in Closet") }
+                if(utilitiesCheck.isChecked) { amenitiesList.add("Utilities Included") }
+                if(poolCheck.isChecked) { amenitiesList.add("Swimming Pool") }
+                if(loungeCheck.isChecked) { amenitiesList.add("Resident Lounge") }
+                if(parkingCheck.isChecked) { amenitiesList.add("Parking") }
+                if(patioCheck.isChecked) { amenitiesList.add("Patio") }
+                if(kitchenCheck.isChecked) { amenitiesList.add("Kitchen") }
+                if(dogCheck.isChecked) { amenitiesList.add("Dog-Friendly") }
+                if(catCheck.isChecked) { amenitiesList.add("Cat-Friendly") }
+
+                description = descriptionEt.text.toString()
+                if (description.equals("")) {
+                    description = null;
+                }
+
+                editSublet(title, Integer.parseInt(price), streetAddress, startDate, endDate, beds,
+                    baths, amenitiesList, description)
+
+            }
+
+        }
+        return view
+    }
+
+    private fun editSublet(title : String, price : Int, address : String?, startDate: String,
+                           endDate : String, beds: Int?, baths: Int?, amenities: List<String>?,
+                           description: String?) {
+        val convertedEnd = convertToYYYYMMDD(endDate)
+        val convertedStart = convertToYYYYMMDD(startDate)
+        var subletId = -1
+
+
+        val newSublet = Sublet(
+            endDate = convertedEnd,
+            baths = baths,
+            address = address,
+            price = price,//fix
+            expiresAt = "3000-02-01T10:48:02-05:00", //?
+            description = description,
+            title = title,
+            beds = beds,
+            amenities = amenities,
+            externalLink = "https://pennlabs.org/", // fix
+            startDate = convertedStart
+        )
+
+        dataModel.editSublet(mActivity, newSublet, subletNumber) { postedSublet ->
+            if (postedSublet != null) {
+                Log.i("MainActivity", "Posted sublet ID: ${postedSublet.id}")
+                subletId = postedSublet.id!!
+            } else {
+                // Handle failure to post sublet
+                Log.e("MainActivity", "Failed to post sublet")
+            }
+        }
+
+        if (multipartImage != null) {
+            val subletPart = MultipartUtil.createSubletPart(subletId)
+            dataModel.postImage(mActivity, subletId,  subletPart, multipartImage!!)
+        }
+
+
+
+
+
+    }
+
+    private fun convertToYYYYMMDD(mmddyy: String): String {
+        val components = mmddyy.split("/")
+        val month = components[0].toInt()
+        val day = components[1].toInt()
+        val year = components[2].toInt() + 2000
+
+        return String.format("%04d-%02d-%02d", year, month, day)
+    }
+
+
+
+
+}
\ No newline at end of file
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/Subletting/SubletterDraftListingsFragment.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/Subletting/SubletterDraftListingsFragment.kt
index abd9a7c13..713f823a6 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/Subletting/SubletterDraftListingsFragment.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/Subletting/SubletterDraftListingsFragment.kt
@@ -6,7 +6,6 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import com.pennapps.labs.pennmobile.MainActivity
-import com.pennapps.labs.pennmobile.NewListingsFragment
 import com.pennapps.labs.pennmobile.R
 import com.pennapps.labs.pennmobile.classes.SublettingViewModel
 import com.pennapps.labs.pennmobile.databinding.FragmentSubletterDraftListingsBinding
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/Subletting/SubletterPostedListingsFragment.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/Subletting/SubletterPostedListingsFragment.kt
index 6684f8c53..f1cd43069 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/Subletting/SubletterPostedListingsFragment.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/Subletting/SubletterPostedListingsFragment.kt
@@ -10,7 +10,6 @@ import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.pennapps.labs.pennmobile.MainActivity
-import com.pennapps.labs.pennmobile.NewListingsFragment
 import com.pennapps.labs.pennmobile.R
 import com.pennapps.labs.pennmobile.adapters.PostedSubletsListAdapter
 import com.pennapps.labs.pennmobile.api.StudentLife
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/StudentLife.java b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/StudentLife.java
index 6410c0b75..af5a10811 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/StudentLife.java
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/StudentLife.java
@@ -41,6 +41,7 @@
 import retrofit.http.Header;
 import retrofit.http.Headers;
 import retrofit.http.POST;
+import retrofit.http.PUT;
 import retrofit.http.Part;
 import retrofit.http.Path;
 import retrofit.http.Query;
@@ -253,6 +254,15 @@ void deleteSublet(
             @Path("sublet_id") int id,
             Callback<Sublet> callback);
 
+    @Headers({"Content-Type: application/json"})
+    @PUT("/sublet/properties/{sublet_id}")
+    void editSublet(
+            @Header("Authorization") String bearerToken,
+            @Path("sublet_id") int id,
+            @Body Sublet sublet,
+            Callback<Sublet> callback
+    );
+
     @Headers({"Content-Type: application/json"})
     @GET("/sublet/properties/")
     Observable<List<Sublet>> getSublets(
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/SublettingViewModel.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/SublettingViewModel.kt
index 3e11839bf..be4f0fe3b 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/SublettingViewModel.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/SublettingViewModel.kt
@@ -140,6 +140,40 @@ class SublettingViewModel (private val activity: Activity, private val studentLi
         }
     }
 
+    fun editSublet(mActivity : MainActivity, sublet : Sublet, id: Int, callback: (Sublet?) -> Unit) {
+
+        val context = activity.applicationContext
+        val sp = PreferenceManager.getDefaultSharedPreferences(activity)
+
+
+        OAuth2NetworkManager(mActivity).getAccessToken {
+
+            val bearerToken =
+                "Bearer " + sp.getString(context.getString(R.string.access_token), "").toString()
+
+
+            studentLife.editSublet(bearerToken, id, sublet,
+                object : Callback<Sublet> {
+                    override fun success(t: Sublet?, response: Response?) {
+                        Log.i("Subletting View Model", "sublet edited")
+                        callback(sublet)
+                    }
+
+                    override fun failure(error: RetrofitError?) {
+                        Log.e("Subletting View Model", "Error editing sublet " +
+                                "$error", error
+                        )
+                        Toast.makeText(activity, "An error has occurred. Please try again.", Toast.LENGTH_LONG).show()
+
+
+                    }
+
+                })
+        }
+
+
+    }
+
 
 
 
diff --git a/PennMobile/src/main/res/layout/fragment_new_listings.xml b/PennMobile/src/main/res/layout/fragment_subletter_edit_listing.xml
similarity index 100%
rename from PennMobile/src/main/res/layout/fragment_new_listings.xml
rename to PennMobile/src/main/res/layout/fragment_subletter_edit_listing.xml
diff --git a/PennMobile/src/main/res/layout/fragment_subletter_new_listing.xml b/PennMobile/src/main/res/layout/fragment_subletter_new_listing.xml
new file mode 100644
index 000000000..83cc8f582
--- /dev/null
+++ b/PennMobile/src/main/res/layout/fragment_subletter_new_listing.xml
@@ -0,0 +1,665 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/windowBackground">
+
+    <TextView
+        android:id="@+id/new_listings_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="25sp"
+        android:fontFamily="@font/sf_pro_display_regular"
+        android:text="@string/new_listing"
+        android:textSize="16sp"
+        android:textStyle="bold"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <ScrollView
+        android:id="@+id/new_listing_scrollview"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/new_listings_text">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="0dp">
+
+            <TextView
+                android:id="@+id/new_listing_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="26sp"
+                android:layout_marginTop="50sp"
+                android:fontFamily="@font/sf_pro_display_bold"
+                android:text="@string/new_listing"
+                android:textSize="26sp"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <ImageView
+                android:id="@+id/main_image"
+                android:layout_width="match_parent"
+                android:layout_height="161sp"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/new_listing_text"
+                app:srcCompat="@drawable/subletting_rectangle" />
+
+            <ImageView
+                android:id="@+id/main_image_icon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:contentDescription="@string/add_photo"
+                app:layout_constraintBottom_toTopOf="@+id/add_photos_text"
+                app:layout_constraintEnd_toEndOf="@id/main_image"
+                app:layout_constraintStart_toStartOf="@id/main_image"
+                app:srcCompat="@drawable/add_photo" />
+
+            <TextView
+                android:id="@+id/add_photos_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10sp"
+                android:fontFamily="@font/sf_pro_display_regular"
+                android:text="@string/add_photos"
+                android:textColor="#8A8A8D"
+                android:textSize="12sp"
+                app:layout_constraintBottom_toBottomOf="@id/main_image"
+                app:layout_constraintEnd_toEndOf="@id/main_image"
+                app:layout_constraintStart_toStartOf="@id/main_image"
+                app:layout_constraintTop_toTopOf="@id/main_image" />
+
+
+            <TextView
+                android:id="@+id/listing_name_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="26sp"
+                android:layout_marginTop="25sp"
+                android:fontFamily="@font/sf_pro_display_regular"
+                android:text="@string/listing_name"
+                android:textSize="16sp"
+                android:textStyle="bold"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/main_image" />
+
+            <EditText
+                android:id="@+id/listing_name_input"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="26sp"
+                android:layout_marginEnd="26sp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/listing_name_text" />
+
+            <LinearLayout
+                android:id="@+id/price_negotiable_layout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:layout_marginTop="15sp"
+                android:layout_marginStart="26sp"
+                android:layout_marginEnd="26sp"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/listing_name_input">
+
+                <TextView
+                    android:id="@+id/price_text"
+                    android:layout_width="0dp"
+                    android:layout_marginEnd="10sp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:fontFamily="@font/sf_pro_display_regular"
+                    android:text="@string/price_month"
+                    android:textSize="16sp"
+                    android:textStyle="bold"/>
+
+                <TextView
+                    android:id="@+id/negotiable_text"
+                    android:layout_width="0dp"
+                    android:layout_marginStart="10sp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:fontFamily="@font/sf_pro_display_regular"
+                    android:text="@string/negotiable"
+                    android:textSize="16sp"
+                    android:textStyle="bold"
+                    app:layout_constraintStart_toEndOf="@id/price_text"/>
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/price_negotiable_input_layout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:layout_marginStart="26sp"
+                android:layout_marginEnd="26sp"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/price_negotiable_layout">
+
+                <EditText
+                    android:id="@+id/price_input"
+                    android:layout_width="0dp"
+                    android:layout_marginEnd="10sp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:inputType="number"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/price_text" />
+
+                <Spinner
+                    android:id="@+id/negotiable_input"
+                    android:layout_width="0dp"
+                    android:layout_marginStart="10sp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    app:layout_constraintStart_toEndOf="@id/price_input"
+                    app:layout_constraintTop_toBottomOf="@id/price_text"
+                    android:entries="@array/yes_no_options"/>
+
+            </LinearLayout>
+
+
+            <TextView
+                android:id="@+id/location_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="26sp"
+                android:layout_marginTop="15sp"
+                android:fontFamily="@font/sf_pro_display_regular"
+                android:text="@string/location"
+                android:textSize="16sp"
+                android:textStyle="bold"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/price_negotiable_input_layout" />
+
+            <EditText
+                android:id="@+id/street_address_input"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="26sp"
+                android:layout_marginEnd="26sp"
+                android:hint="@string/street_address"
+                android:textColorHint="#8A8A8D"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/location_text" />
+
+            <EditText
+                android:id="@+id/apartment_input"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="26sp"
+                android:layout_marginEnd="26sp"
+                android:hint="@string/apartment_suite_etc_optional"
+                android:textColorHint="#8A8A8D"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/street_address_input" />
+
+            <EditText
+                android:id="@+id/postal_code_input"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="26sp"
+                android:layout_marginEnd="26sp"
+                android:hint="@string/postal_code"
+                android:inputType="number"
+                android:textColorHint="#8A8A8D"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/apartment_input" />
+
+            <LinearLayout
+                android:id="@+id/date_text_layout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:layout_marginStart="26sp"
+                android:layout_marginEnd="26sp"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/postal_code_input">
+
+                <TextView
+                    android:id="@+id/start_date_text"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="10sp"
+                    android:layout_weight="1"
+                    android:fontFamily="@font/sf_pro_display_regular"
+                    android:text="Start Date"
+                    android:textSize="16sp"
+                    android:textStyle="bold"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/postal_code_input" />
+
+                <TextView
+                    android:id="@+id/end_date_text"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="10sp"
+                    android:layout_weight="1"
+                    android:fontFamily="@font/sf_pro_display_regular"
+                    android:text="End Date"
+                    android:textSize="16sp"
+                    android:textStyle="bold"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/postal_code_input" />
+            </LinearLayout>
+
+
+            <LinearLayout
+                android:id="@+id/date_layout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:layout_marginStart="26sp"
+                android:layout_marginEnd="26sp"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/date_text_layout">
+
+                <EditText
+                    android:id="@+id/start_date_input"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="10sp"
+                    android:layout_weight="1"
+                    android:hint="mm/dd/yy"
+                    android:inputType="date"
+                    android:textColorHint="#8A8A8D"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/date_text_layout" />
+
+                <EditText
+                    android:id="@+id/end_date_input"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="10sp"
+                    android:layout_weight="1"
+                    android:hint="mm/dd/yy"
+                    android:inputType="date"
+                    android:textColorHint="#8A8A8D"
+                    app:layout_constraintStart_toEndOf="@id/start_date_input"
+                    app:layout_constraintTop_toBottomOf="@id/date_text_layout" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/bed_bath_layout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:layout_marginStart="26sp"
+                android:layout_marginTop="15sp"
+                android:layout_marginEnd="26sp"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/date_layout">
+
+                <TextView
+                    android:id="@+id/bed_text"
+                    android:layout_width="0dp"
+                    android:layout_weight="1"
+                    android:layout_height="wrap_content"
+                    android:fontFamily="@font/sf_pro_display_regular"
+                    android:text="@string/bed"
+                    android:textSize="16sp"
+                    android:textStyle="bold"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/date_layout" />
+
+                <TextView
+                    android:id="@+id/bath_text"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:fontFamily="@font/sf_pro_display_regular"
+                    android:text="@string/bath"
+                    android:textSize="16sp"
+                    android:textStyle="bold"
+                    app:layout_constraintStart_toStartOf="@id/bath_input"
+                    app:layout_constraintTop_toBottomOf="@id/date_layout" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/bed_bath_input_layout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:layout_marginStart="26sp"
+                android:layout_marginTop="15sp"
+                android:layout_marginEnd="26sp"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/bed_bath_layout">
+
+                <Spinner
+                    android:id="@+id/bed_input"
+                    android:layout_width="0sp"
+                    android:layout_weight="1"
+                    android:layout_height="45sp"
+                    android:layout_marginEnd="10sp"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/bed_bath_layout"
+                    android:entries="@array/num_options"/>
+
+
+                <Spinner
+                    android:id="@+id/bath_input"
+                    android:layout_width="0sp"
+                    android:layout_weight="1"
+                    android:layout_height="45sp"
+                    android:layout_marginStart="10sp"
+                    app:layout_constraintStart_toEndOf="@id/bed_input"
+                    app:layout_constraintTop_toBottomOf="@id/bed_bath_layout"
+                    android:entries="@array/num_options"/>
+
+
+            </LinearLayout>
+
+
+
+
+
+
+
+            <TextView
+                android:id="@+id/roommates_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="26sp"
+                android:layout_marginTop="15sp"
+                android:fontFamily="@font/sf_pro_display_regular"
+                android:text="@string/roommates"
+                android:textSize="16sp"
+                android:textStyle="bold"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/bed_bath_input_layout" />
+
+            <EditText
+                android:id="@+id/roommates_input"
+                android:layout_width="165sp"
+                android:layout_height="45sp"
+                android:layout_marginStart="26sp"
+                android:inputType="number"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/roommates_text" />
+
+            <TextView
+                android:id="@+id/amenities_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="26sp"
+                android:layout_marginTop="15sp"
+                android:fontFamily="@font/sf_pro_display_regular"
+                android:text="@string/amenities"
+                android:textSize="16sp"
+                android:textStyle="bold"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/roommates_input" />
+
+            <CheckBox
+                android:id="@+id/bathroom_check"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="26sp"
+                android:layout_marginTop="10sp"
+                android:fontFamily="@font/sf_pro_display_regular"
+                android:text="@string/private_bathroom"
+                android:textSize="16sp"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/amenities_text" />
+
+            <CheckBox
+                android:id="@+id/laundry_check"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="10sp"
+                android:layout_marginTop="10sp"
+                android:fontFamily="@font/sf_pro_display_regular"
+                android:text="@string/in_unit_laundry"
+                android:textSize="16sp"
+                app:layout_constraintStart_toEndOf="@id/bathroom_check"
+                app:layout_constraintTop_toBottomOf="@id/amenities_text"
+
+                />
+
+            <CheckBox
+                android:id="@+id/gym_check"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="26sp"
+                android:fontFamily="@font/sf_pro_display_regular"
+                android:text="@string/gym"
+                android:textSize="16sp"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/bathroom_check"
+
+                />
+
+            <CheckBox
+                android:id="@+id/wifi_check"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="10sp"
+                android:fontFamily="@font/sf_pro_display_regular"
+                android:text="@string/wifi"
+                android:textSize="16sp"
+                app:layout_constraintStart_toEndOf="@id/gym_check"
+                app:layout_constraintTop_toBottomOf="@id/bathroom_check" />
+
+            <CheckBox
+                android:id="@+id/closet_check"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="10sp"
+                android:fontFamily="@font/sf_pro_display_regular"
+                android:text="@string/walk_in_closet"
+                android:textSize="16sp"
+                app:layout_constraintStart_toEndOf="@id/wifi_check"
+                app:layout_constraintTop_toBottomOf="@id/bathroom_check" />
+
+            <CheckBox
+                android:id="@+id/furnished_check"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="26sp"
+                android:fontFamily="@font/sf_pro_display_regular"
+                android:text="@string/furnished"
+                android:textSize="16sp"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/gym_check"
+
+                />
+
+            <CheckBox
+                android:id="@+id/utilities_check"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="10sp"
+                android:fontFamily="@font/sf_pro_display_regular"
+                android:text="@string/utilities_included"
+                android:textSize="16sp"
+                app:layout_constraintStart_toEndOf="@id/furnished_check"
+                app:layout_constraintTop_toBottomOf="@id/gym_check" />
+
+            <CheckBox
+                android:id="@+id/pool_check"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="26sp"
+                android:fontFamily="@font/sf_pro_display_regular"
+                android:text="@string/swimming_pool"
+                android:textSize="16sp"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/furnished_check"
+
+                />
+
+            <CheckBox
+                android:id="@+id/lounge_check"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="10sp"
+                android:fontFamily="@font/sf_pro_display_regular"
+                android:text="@string/resident_lounge"
+                android:textSize="16sp"
+                app:layout_constraintStart_toEndOf="@id/pool_check"
+                app:layout_constraintTop_toBottomOf="@id/furnished_check" />
+
+            <CheckBox
+                android:id="@+id/parking_check"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="26sp"
+                android:fontFamily="@font/sf_pro_display_regular"
+                android:text="@string/parking"
+                android:textSize="16sp"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/pool_check"
+
+                />
+
+            <CheckBox
+                android:id="@+id/patio_check"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="10sp"
+                android:fontFamily="@font/sf_pro_display_regular"
+                android:shadowColor="@color/black"
+                android:text="Patio"
+                android:textSize="16sp"
+                app:layout_constraintStart_toEndOf="@id/parking_check"
+                app:layout_constraintTop_toBottomOf="@id/pool_check" />
+
+            <CheckBox
+                android:id="@+id/kitchen_check"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="10sp"
+                android:fontFamily="@font/sf_pro_display_regular"
+                android:text="@string/kitchen"
+                android:textSize="16sp"
+                app:layout_constraintStart_toEndOf="@id/patio_check"
+                app:layout_constraintTop_toBottomOf="@id/pool_check" />
+
+            <CheckBox
+                android:id="@+id/dog_check"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="26sp"
+                android:fontFamily="@font/sf_pro_display_regular"
+                android:text="@string/dog_friendly"
+                android:textSize="16sp"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/parking_check"
+
+                />
+
+            <CheckBox
+                android:id="@+id/cat_check"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="10sp"
+                android:fontFamily="@font/sf_pro_display_regular"
+                android:text="@string/cat_friendly"
+                android:textSize="16sp"
+                app:layout_constraintStart_toEndOf="@id/dog_check"
+                app:layout_constraintTop_toBottomOf="@id/parking_check" />
+
+
+            <TextView
+                android:id="@+id/description_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="26sp"
+                android:layout_marginTop="26sp"
+                android:fontFamily="@font/sf_pro_display_regular"
+                android:text="@string/description_optional"
+                android:textSize="16sp"
+                android:textStyle="bold"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/dog_check" />
+
+            <EditText
+                android:id="@+id/description_input"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="top|start"
+                android:layout_marginStart="26sp"
+                android:layout_marginEnd="26sp"
+                android:gravity="top|start"
+                android:hint="@string/enter_text_up_to_300_characters"
+                android:inputType="textMultiLine"
+                android:lines="5"
+                android:maxLength="300"
+                android:maxLines="10"
+                android:minLines="1"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/description_text" />
+
+            <LinearLayout
+                android:id="@+id/button_layout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:layout_marginStart="26sp"
+                android:layout_marginTop="30sp"
+                android:layout_marginEnd="26sp"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/description_input">
+
+
+                <Button
+                    android:id="@+id/draft_button"
+                    android:layout_width="0dp"
+                    android:layout_weight="1"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="10dp"
+                    android:backgroundTint="@color/white"
+                    android:text="@string/save_draft"
+                    android:textSize="16sp"
+                    app:layout_constraintStart_toStartOf="parent" />
+
+
+                <Button
+                    android:id="@+id/post_button"
+                    android:layout_width="0dp"
+                    android:layout_weight="1"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="10sp"
+                    android:backgroundTint="#639AFF"
+                    android:text="@string/post"
+                    android:textColor="@color/white"
+                    android:textSize="16sp"
+                    app:layout_constraintTop_toBottomOf="@id/description_input" />
+
+
+            </LinearLayout>
+
+
+
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                app:layout_constraintTop_toBottomOf="@id/button_layout"
+                app:layout_constraintStart_toStartOf="parent"
+                android:text=""
+                android:textSize="75dp"/>
+
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+    </ScrollView>
+
+
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file