Skip to content

Commit 7a75919

Browse files
vavali08vavali08
committed
create sublet set up but has errors
1 parent 4f5439b commit 7a75919

File tree

5 files changed

+86
-13
lines changed

5 files changed

+86
-13
lines changed

‎PennMobile/src/main/java/com/pennapps/labs/pennmobile/NewListingsFragment.kt‎

Lines changed: 66 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import android.os.Bundle
44
import android.view.LayoutInflater
55
import android.view.View
66
import android.view.ViewGroup
7+
import android.widget.CheckBox
78
import android.widget.EditText
89
import android.widget.Spinner
910
import android.widget.Toast
@@ -31,9 +32,30 @@ class NewListingsFragment(private val dataModel: SublettingViewModel) : Fragment
3132
internal lateinit var zipCodeEt : EditText
3233
internal lateinit var startEt : EditText
3334
internal lateinit var endEt : EditText
34-
internal lateinit var bedsEt : Spinner
35-
internal lateinit var bathsEt : Spinner
35+
internal lateinit var bedsSpinner : Spinner
36+
internal lateinit var bathsSpinner : Spinner
3637
internal lateinit var descriptionEt : EditText
38+
internal lateinit var bathroomCheck : CheckBox
39+
internal lateinit var laundryCheck : CheckBox
40+
internal lateinit var gymCheck : CheckBox
41+
internal lateinit var wifiCheck : CheckBox
42+
internal lateinit var furnishedCheck : CheckBox
43+
internal lateinit var closetCheck : CheckBox
44+
internal lateinit var utilitiesCheck : CheckBox
45+
internal lateinit var poolCheck : CheckBox
46+
internal lateinit var loungeCheck : CheckBox
47+
internal lateinit var parkingCheck : CheckBox
48+
internal lateinit var patioCheck : CheckBox
49+
internal lateinit var kitchenCheck : CheckBox
50+
internal lateinit var dogCheck : CheckBox
51+
internal lateinit var catCheck : CheckBox
52+
53+
54+
55+
56+
57+
58+
3759

3860
//Sublet variables
3961
private lateinit var title : String
@@ -55,7 +77,7 @@ class NewListingsFragment(private val dataModel: SublettingViewModel) : Fragment
5577
override fun onCreate(savedInstanceState: Bundle?) {
5678
super.onCreate(savedInstanceState)
5779
mStudentLife = MainActivity.studentLifeInstance
58-
val mActivity : MainActivity = activity as MainActivity
80+
mActivity = activity as MainActivity
5981
mActivity.hideBottomBar()
6082
}
6183

@@ -72,9 +94,25 @@ class NewListingsFragment(private val dataModel: SublettingViewModel) : Fragment
7294
zipCodeEt = binding.postalCodeInput
7395
startEt = binding.startDateInput
7496
endEt = binding.endDateInput
75-
bedsEt = binding.bedInput
76-
bathsEt = binding.bathInput
97+
bedsSpinner = binding.bedInput
98+
bathsSpinner = binding.bathInput
7799
descriptionEt = binding.descriptionInput
100+
bathroomCheck = binding.bathroomCheck
101+
laundryCheck = binding.laundryCheck
102+
gymCheck = binding.gymCheck
103+
wifiCheck = binding.wifiCheck
104+
furnishedCheck = binding.furnishedCheck
105+
closetCheck = binding.closetCheck
106+
utilitiesCheck = binding.utilitiesCheck
107+
poolCheck = binding.poolCheck
108+
loungeCheck = binding.loungeCheck
109+
parkingCheck = binding.parkingCheck
110+
patioCheck = binding.patioCheck
111+
kitchenCheck = binding.kitchenCheck
112+
dogCheck = binding.dogCheck
113+
catCheck = binding.catCheck
114+
115+
78116

79117
binding.postButton.setOnClickListener{
80118
if (titleEt.text.toString().matches("".toRegex())
@@ -93,13 +131,32 @@ class NewListingsFragment(private val dataModel: SublettingViewModel) : Fragment
93131
}
94132
startDate = startEt.text.toString()
95133
endDate = endEt.text.toString()
96-
//do beds, baths
134+
135+
beds = bedsSpinner.selectedItemPosition + 1
136+
baths = bathsSpinner.selectedItemPosition + 1
137+
138+
val amenitiesList = mutableListOf<String>()
139+
if(bathroomCheck.isChecked) { amenitiesList.add("Private Bathroom") }
140+
if(laundryCheck.isChecked) { amenitiesList.add("In-Unit Laundry") }
141+
if(gymCheck.isChecked) { amenitiesList.add("Gym") }
142+
if(wifiCheck.isChecked) { amenitiesList.add("Wifi") }
143+
if(furnishedCheck.isChecked) { amenitiesList.add("Furnished") }
144+
if(closetCheck.isChecked) { amenitiesList.add("Walk-in Closet") }
145+
if(utilitiesCheck.isChecked) { amenitiesList.add("Utilities Included") }
146+
if(poolCheck.isChecked) { amenitiesList.add("Swimming Pool") }
147+
if(loungeCheck.isChecked) { amenitiesList.add("Resident Lounge") }
148+
if(parkingCheck.isChecked) { amenitiesList.add("Parking") }
149+
if(patioCheck.isChecked) { amenitiesList.add("Patio") }
150+
if(kitchenCheck.isChecked) { amenitiesList.add("Kitchen") }
151+
if(dogCheck.isChecked) { amenitiesList.add("Dog-Friendly") }
152+
if(catCheck.isChecked) { amenitiesList.add("Cat-Friendly") }
153+
97154
description = descriptionEt.text.toString()
98155
if (description.equals("")) {
99156
description = null;
100157
}
101158
postSublet(title, Integer.parseInt(price), streetAddress, startDate, endDate, beds,
102-
baths, amenities, description)
159+
baths, amenitiesList, description)
103160

104161
}
105162

@@ -108,7 +165,7 @@ class NewListingsFragment(private val dataModel: SublettingViewModel) : Fragment
108165
}
109166

110167
private fun postSublet(title : String, price : Int, address : String?, startDate: String,
111-
endDate : String, beds: Int?, baths: Int?, amenities: List<AmenitiesItem>,
168+
endDate : String, beds: Int?, baths: Int?, amenities: List<String>,
112169
description: String?) {
113170

114171
val newSublet = Sublet(
@@ -122,7 +179,7 @@ class NewListingsFragment(private val dataModel: SublettingViewModel) : Fragment
122179
description = description,
123180
title = title,
124181
beds = beds,
125-
externalLink = " ", // fix
182+
externalLink = "test.com", // fix
126183
startDate = startDate
127184
)
128185

‎PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/StudentLife.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,7 @@ void sendFitnessPref(
221221
@POST("/sublet/properties/")
222222
void createSublet(
223223
@Header("Authorization") String bearerToken,
224-
@Body Sublet sublet);
224+
@Body Sublet sublet,
225+
Callback<Response> callback);
225226

226227
}

‎PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/Sublet.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import com.google.gson.annotations.SerializedName
55
data class Sublet(@SerializedName("end_date")
66
val endDate: String = "",
77
@SerializedName("amenities")
8-
val amenities: List<AmenitiesItem>??,
8+
val amenities: List<String>?,
99
@SerializedName("baths")
1010
val baths: Int? = 0,
1111
@SerializedName("address")

‎PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/SublettingViewModel.kt‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
11
package com.pennapps.labs.pennmobile.classes
22

33
import android.app.Activity
4+
import android.util.Log
45
import androidx.preference.PreferenceManager
56
import com.pennapps.labs.pennmobile.MainActivity
67
import com.pennapps.labs.pennmobile.R
78
import com.pennapps.labs.pennmobile.api.OAuth2NetworkManager
89
import com.pennapps.labs.pennmobile.api.StudentLife
10+
import retrofit.ResponseCallback
11+
import retrofit.RetrofitError
12+
import retrofit.client.Response
913

1014
class SublettingViewModel (private val activity: Activity, private val studentLife: StudentLife) {
1115

@@ -21,7 +25,18 @@ class SublettingViewModel (private val activity: Activity, private val studentLi
2125
"Bearer " + sp.getString(context.getString(R.string.access_token), "").toString()
2226

2327

24-
studentLife.createSublet(bearerToken, sublet)
28+
studentLife.createSublet(bearerToken, sublet, object : ResponseCallback() {
29+
override fun success(response: Response) {
30+
Log.i("Subletting View Model", "Sublet succesfully posted")
31+
}
32+
33+
override fun failure(error: RetrofitError) {
34+
Log.e(
35+
"Subletting View Model", "Error posting sublet " +
36+
" $error", error
37+
)
38+
}
39+
})
2540
}
2641

2742

‎PennMobile/src/main/res/layout/fragment_new_listings.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -507,7 +507,7 @@
507507
android:layout_marginStart="10sp"
508508
android:fontFamily="@font/sf_pro_display_regular"
509509
android:shadowColor="@color/black"
510-
android:text="@string/wifi"
510+
android:text="Patio"
511511
android:textSize="16sp"
512512
app:layout_constraintStart_toEndOf="@id/parking_check"
513513
app:layout_constraintTop_toBottomOf="@id/pool_check" />

0 commit comments

Comments
 (0)