Skip to content

Commit

Permalink
nav updates etc
Browse files Browse the repository at this point in the history
  • Loading branch information
vavali08 committed Jan 14, 2024
1 parent d8fd41d commit 5ed178c
Show file tree
Hide file tree
Showing 6 changed files with 100 additions and 51 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
package com.pennapps.labs.pennmobile

import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.fragment.app.Fragment

class NewListingsFragment : Fragment() {

override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
}

override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
savedInstanceState: Bundle?): View? {
// Inflate the layout for this fragment
return inflater.inflate(R.layout.fragment_new_listings, container, false)
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,36 @@ import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.fragment.app.Fragment
import androidx.fragment.app.FragmentTransaction
import com.pennapps.labs.pennmobile.databinding.FragmentSubletterPostedListingsBinding

class SubletterPostedListingsFragment : Fragment() {
private var _binding: FragmentSubletterPostedListingsBinding? = null
private val binding get() = _binding!!
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
}

override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
savedInstanceState: Bundle?): View? {
// Inflate the layout for this fragment
return inflater.inflate(R.layout.fragment_subletter_posted_listings, container, false)
_binding = FragmentSubletterPostedListingsBinding.inflate(inflater, container, false)
binding.postedAddListingButton.setOnClickListener{
navigateCreateNewListing()
}
return binding.root
}


private fun navigateCreateNewListing() {
val mainActivity = activity as MainActivity
val fragment = NewListingsFragment()

val fragmentManager = mainActivity.supportFragmentManager
fragmentManager.beginTransaction()
.replace(R.id.content_frame, fragment, "NEW_LISTING_FRAGMENT")
.addToBackStack(null)
.commitAllowingStateLoss()

}
}
93 changes: 46 additions & 47 deletions PennMobile/src/main/res/layout/fragment_new_listings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="25sp"
android:fontFamily="@font/sf_pro_display_regular"
android:text="New Listings"
android:text="@string/new_listings"
android:textSize="16sp"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
Expand All @@ -20,15 +20,15 @@

<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="wrap_content"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/new_listings_text"
app:layout_constraintVertical_bias="1.0">
app:layout_constraintTop_toBottomOf="@id/new_listings_text">

<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:background="@color/windowBackground">

<TextView
android:id="@+id/new_listing_text"
Expand All @@ -37,7 +37,6 @@
android:layout_marginStart="26sp"
android:layout_marginTop="50sp"
android:fontFamily="@font/sf_pro_display_bold"
android:paddingTop="50sp"
android:text="@string/new_listing"
android:textSize="26sp"
app:layout_constraintStart_toStartOf="parent"
Expand Down Expand Up @@ -83,7 +82,7 @@
android:layout_marginStart="26sp"
android:layout_marginTop="25sp"
android:fontFamily="@font/sf_pro_display_regular"
android:text="Listing Name"
android:text="@string/listing_name"
android:textSize="16sp"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
Expand All @@ -106,7 +105,7 @@
android:layout_marginStart="26sp"
android:layout_marginTop="15sp"
android:fontFamily="@font/sf_pro_display_regular"
android:text="Price/month"
android:text="@string/price_month"
android:textSize="16sp"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
Expand All @@ -127,7 +126,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="15sp"
android:fontFamily="@font/sf_pro_display_regular"
android:text="Negotiable?"
android:text="@string/negotiable"
android:textSize="16sp"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="@id/negotiable_input"
Expand All @@ -148,7 +147,7 @@
android:layout_marginStart="26sp"
android:layout_marginTop="15sp"
android:fontFamily="@font/sf_pro_display_regular"
android:text="Location"
android:text="@string/location"
android:textSize="16sp"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
Expand All @@ -160,7 +159,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="26sp"
android:layout_marginEnd="26sp"
android:hint="Street Address"
android:hint="@string/street_address"
android:textColorHint="#8A8A8D"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
Expand All @@ -172,7 +171,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="26sp"
android:layout_marginEnd="26sp"
android:hint="Apartment, suite, etc (optional)"
android:hint="@string/apartment_suite_etc_optional"
android:textColorHint="#8A8A8D"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
Expand All @@ -184,7 +183,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="26sp"
android:layout_marginEnd="26sp"
android:hint="Postal code"
android:hint="@string/postal_code"
android:inputType="number"
android:textColorHint="#8A8A8D"
app:layout_constraintEnd_toEndOf="parent"
Expand All @@ -198,7 +197,7 @@
android:layout_marginStart="26sp"
android:layout_marginTop="15sp"
android:fontFamily="@font/sf_pro_display_regular"
android:text="Date"
android:text="@string/date"
android:textSize="16sp"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
Expand All @@ -210,7 +209,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="26sp"
android:layout_marginEnd="10sp"
android:hint="Start"
android:hint="@string/start"
android:inputType="date"
android:textColorHint="#8A8A8D"
app:layout_constraintStart_toStartOf="parent"
Expand All @@ -219,7 +218,7 @@
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="5sp"
android:layout_marginStart="5sp"
android:layout_marginBottom="5sp"
app:layout_constraintBottom_toBottomOf="@id/start_date_input"
app:layout_constraintEnd_toEndOf="@id/start_date_input"
Expand All @@ -232,7 +231,7 @@
android:layout_width="165sp"
android:layout_height="wrap_content"
android:layout_marginStart="30sp"
android:hint="End"
android:hint="@string/end"
android:inputType="date"
android:textColorHint="#8A8A8D"
app:layout_constraintStart_toEndOf="@id/start_date_input"
Expand Down Expand Up @@ -341,26 +340,26 @@
android:id="@+id/laundry_check"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@id/amenities_text"
app:layout_constraintStart_toEndOf="@id/bathroom_check"
android:layout_marginTop="10sp"
android:layout_marginStart="10sp"
android:layout_marginTop="10sp"
android:fontFamily="@font/sf_pro_display_regular"
android:text="In-unit laundry"
android:textSize="16sp"
android:fontFamily="@font/sf_pro_display_regular"
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"
app:layout_constraintTop_toBottomOf="@id/bathroom_check"
app:layout_constraintStart_toStartOf="parent"
android:layout_marginStart="26sp"
android:fontFamily="@font/sf_pro_display_regular"
android:text="Gym"
android:textSize="16sp"
android:fontFamily="@font/sf_pro_display_regular"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/bathroom_check"

/>

Expand Down Expand Up @@ -390,12 +389,12 @@
android:id="@+id/furnished_check"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@id/gym_check"
app:layout_constraintStart_toStartOf="parent"
android:layout_marginStart="26sp"
android:fontFamily="@font/sf_pro_display_regular"
android:text="Furnished"
android:textSize="16sp"
android:fontFamily="@font/sf_pro_display_regular"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/gym_check"

/>

Expand All @@ -414,12 +413,12 @@
android:id="@+id/pool_check"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@id/furnished_check"
app:layout_constraintStart_toStartOf="parent"
android:layout_marginStart="26sp"
android:fontFamily="@font/sf_pro_display_regular"
android:text="Swimming Pool"
android:textSize="16sp"
android:fontFamily="@font/sf_pro_display_regular"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/furnished_check"

/>

Expand All @@ -438,12 +437,12 @@
android:id="@+id/parking_check"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@id/pool_check"
app:layout_constraintStart_toStartOf="parent"
android:layout_marginStart="26sp"
android:fontFamily="@font/sf_pro_display_regular"
android:text="Parking"
android:textSize="16sp"
android:fontFamily="@font/sf_pro_display_regular"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/pool_check"

/>

Expand All @@ -458,6 +457,7 @@
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"
Expand All @@ -468,16 +468,17 @@
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"
app:layout_constraintTop_toBottomOf="@id/parking_check"
app:layout_constraintStart_toStartOf="parent"
android:layout_marginStart="26sp"
android:fontFamily="@font/sf_pro_display_regular"
android:text="Dog-friendly"
android:textSize="16sp"
android:fontFamily="@font/sf_pro_display_regular"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/parking_check"

/>

Expand Down Expand Up @@ -508,27 +509,27 @@

<EditText
android:id="@+id/description_input"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/description_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="textMultiLine"
android:gravity="top|start"
android:layout_gravity="top|start"
android:layout_marginStart="26sp"
android:layout_marginEnd="26sp"
android:gravity="top|start"
android:hint="Enter text (up to 300 characters)"
android:inputType="textMultiLine"
android:lines="5"
android:maxLength="300"
android:maxLines="10"
android:minLines="1"
android:maxLength="300"
android:hint="Enter text (up to 300 characters)"
android:layout_marginStart="26sp"
android:layout_marginEnd="26sp"/>
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/description_text" />

<Button
android:id="@+id/draft_button"
android:layout_width="165sp"
android:layout_marginTop="30sp"
android:layout_height="wrap_content"
android:layout_marginStart="26sp"
android:layout_marginTop="30sp"
android:backgroundTint="@color/white"
android:text="Save Draft"
android:textSize="16sp"
Expand All @@ -549,12 +550,10 @@
app:layout_constraintTop_toBottomOf="@id/description_input" />



</androidx.constraintlayout.widget.ConstraintLayout>


</ScrollView>



</androidx.constraintlayout.widget.ConstraintLayout>
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
android:layout_height="wrap_content"
android:layout_margin="5sp"
android:fontFamily="@font/sf_pro_display_regular"
android:text="@string/you_currently_have_no_listings"
android:text="@string/you_currently_have_no_draft_listings"
android:textColor="#8A8A8D"
android:textSize="14sp"
app:layout_constraintEnd_toEndOf="parent"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@
android:layout_height="wrap_content"
android:layout_margin="5sp"
android:fontFamily="@font/sf_pro_display_regular"
android:text="@string/you_currently_have_no_draft_listings"
android:text="@string/you_currently_have_no_listings"
android:textColor="#8A8A8D"
android:textSize="14sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/posted_house_image" />

<Button
android:id="@+id/draft_add_listing_button"
android:id="@+id/posted_add_listing_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="5sp"
Expand Down
9 changes: 9 additions & 0 deletions PennMobile/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -245,4 +245,13 @@
<string name="new_listing">New Listing</string>
<string name="add_photo">Add Photo</string>
<string name="add_photos">Add Photos</string>
<string name="new_listings">New Listings</string>
<string name="listing_name">Listing Name</string>
<string name="price_month">Price/month</string>
<string name="negotiable">Negotiable?</string>
<string name="street_address">Street Address</string>
<string name="apartment_suite_etc_optional">Apartment, suite, etc (optional)</string>
<string name="postal_code">Postal code</string>
<string name="start">Start</string>
<string name="end">End</string>
</resources>

0 comments on commit 5ed178c

Please sign in to comment.