updates to ui + delete sublet

pennlabs · Mar 10, 2024 · c99cb5b · c99cb5b
1 parent 58f0b3d
commit c99cb5b
Show file tree

Hide file tree

Showing 9 changed files with 67 additions and 8 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
@@ -5,15 +5,24 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
+import androidx.viewpager2.widget.ViewPager2
+import com.pennapps.labs.pennmobile.MainActivity
+import com.pennapps.labs.pennmobile.api.StudentLife
 import com.pennapps.labs.pennmobile.classes.Sublet
 import com.pennapps.labs.pennmobile.classes.SublettingViewModel
 import com.pennapps.labs.pennmobile.databinding.FragmentSubletDetailsBinding
 
 class SubletDetailsFragment(private val dataModel: SublettingViewModel, private val subletNumber: Int) : Fragment() {
     private var _binding: FragmentSubletDetailsBinding? = null
     private val binding get() = _binding!!
+    private lateinit var mActivity: MainActivity
+    private lateinit var mStudentLife : StudentLife
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        mActivity = activity as MainActivity
+        mStudentLife = MainActivity.studentLifeInstance
+
+
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
@@ -28,6 +37,10 @@ class SubletDetailsFragment(private val dataModel: SublettingViewModel, private
         binding.datesText.text = sublet.startDate + " to " + sublet.endDate
         binding.descriptionText.text = sublet.description
 
+        binding.availableButton.setOnClickListener{
+            dataModel.deleteSublet(mActivity, subletNumber)
+        }
+
 
 
 

diff --git a/...bile/src/main/java/com/pennapps/labs/pennmobile/Subletting/SubletDetailsHolderFragment.kt b/...bile/src/main/java/com/pennapps/labs/pennmobile/Subletting/SubletDetailsHolderFragment.kt
@@ -10,7 +10,6 @@ import androidx.viewpager2.widget.ViewPager2
 import com.pennapps.labs.pennmobile.MainActivity
 import com.pennapps.labs.pennmobile.R
 import com.pennapps.labs.pennmobile.adapters.SubletDetailsPagerAdapter
-import com.pennapps.labs.pennmobile.adapters.SubletterPagerAdapter
 import com.pennapps.labs.pennmobile.api.StudentLife
 import com.pennapps.labs.pennmobile.classes.SublettingViewModel
 import com.pennapps.labs.pennmobile.components.collapsingtoolbar.ToolbarBehavior

diff --git a/.../src/main/java/com/pennapps/labs/pennmobile/Subletting/SubletterPostedListingsFragment.kt b/.../src/main/java/com/pennapps/labs/pennmobile/Subletting/SubletterPostedListingsFragment.kt
@@ -18,7 +18,7 @@ import com.pennapps.labs.pennmobile.classes.Sublet
 import com.pennapps.labs.pennmobile.classes.SublettingViewModel
 import com.pennapps.labs.pennmobile.databinding.FragmentSubletterPostedListingsBinding
 
-class SubletterPostedListingsFragment(private val dataModel: SublettingViewModel) : Fragment() {
+class SubletterPostedListingsFragment() : Fragment() {
     private var _binding: FragmentSubletterPostedListingsBinding? = null
     private val binding get() = _binding!!
 
@@ -27,6 +27,7 @@ class SubletterPostedListingsFragment(private val dataModel: SublettingViewModel
     lateinit var newLayoutManager: GridLayoutManager
     lateinit var sublettingList: ArrayList<Sublet>
     lateinit var myAdapter: PostedSubletsListAdapter
+    lateinit var dataModel: SublettingViewModel
 
     //api manager
     private lateinit var mStudentLife: StudentLife
@@ -38,6 +39,7 @@ class SubletterPostedListingsFragment(private val dataModel: SublettingViewModel
         mStudentLife = MainActivity.studentLifeInstance
         mActivity = activity as MainActivity
         mActivity.closeKeyboard()
+        dataModel = SublettingViewModel(mActivity, mStudentLife)
 
         val bundle = Bundle()
     }

diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/SublettingHolderFragment.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/SublettingHolderFragment.kt
@@ -45,9 +45,14 @@ class SublettingFragment : Fragment() {
         viewPager.adapter = sublettingPagerAdapter
         val tabLayout : TabLayout = view.findViewById(R.id.subletting_tab_layout)
         TabLayoutMediator(tabLayout, viewPager) { tab, position ->
-            tab.text = "OBJECT ${(position + 1)}"
+            if(position == 0) {
+                tab.text = "Subletter"
+            } else {
+                tab.text = "Sublessee"
+            }
         }.attach()
 
+
     }
 
 

diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/SublesseeSavedPagerAdapter.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/SublesseeSavedPagerAdapter.kt
@@ -4,13 +4,13 @@ import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
 import androidx.viewpager2.adapter.FragmentStateAdapter
 import com.pennapps.labs.pennmobile.SubletteeFragment
-import com.pennapps.labs.pennmobile.SubletterFragment
+import com.pennapps.labs.pennmobile.Subletting.SubletterPostedListingsFragment
 
 class SublesseeSavedPagerAdapter(fragment: Fragment) : FragmentStateAdapter(fragment) {
     override fun getItemCount(): Int = 2
     override fun createFragment(position: Int): Fragment {
         return if (position == 0) {
-            SubletterFragment()
+            SubletterPostedListingsFragment()
         } else {
             SubletteeFragment()
         }

diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/SubletterPagerAdapter.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/SubletterPagerAdapter.kt
@@ -11,7 +11,7 @@ class SubletterPagerAdapter(fragment: Fragment, private val dataModel: Sublettin
     override fun getItemCount(): Int = 2
     override fun createFragment(position: Int): Fragment {
         return if (position == 0) {
-            SubletterPostedListingsFragment(dataModel)
+            SubletterPostedListingsFragment()
         } else {
             SubletterDraftListingsFragment(dataModel)
         }

diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/SublettingPagerAdapter.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/SublettingPagerAdapter.kt
@@ -3,13 +3,13 @@ package com.pennapps.labs.pennmobile.adapters
 import androidx.fragment.app.Fragment
 import androidx.viewpager2.adapter.FragmentStateAdapter
 import com.pennapps.labs.pennmobile.SubletteeFragment
-import com.pennapps.labs.pennmobile.Subletting.SubletterFragment
+import com.pennapps.labs.pennmobile.Subletting.SubletterPostedListingsFragment
 
 class SublettingPagerAdapter(fragment: Fragment) : FragmentStateAdapter(fragment) {
     override fun getItemCount(): Int = 2
     override fun createFragment(position: Int): Fragment {
         return if (position == 0) {
-            SubletterFragment()
+            SubletterPostedListingsFragment()
         } else {
             SubletteeFragment()
         }

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
@@ -34,6 +34,7 @@
 import retrofit.Callback;
 import retrofit.client.Response;
 import retrofit.http.Body;
+import retrofit.http.DELETE;
 import retrofit.http.Field;
 import retrofit.http.FormUrlEncoded;
 import retrofit.http.GET;
@@ -231,4 +232,12 @@ Observable<List<Offer>> getSubletOffers(
             @Path("sublet_id") int id
     );
 
+    @Headers({"Content-Type: application/json"})
+    @DELETE("/sublet/properties/{sublet_id}")
+    void deleteSublet(
+            @Header("Authorization") String bearerToken,
+            @Path("sublet_id") int id);
+
+
+
 }
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
@@ -86,6 +86,37 @@ class SublettingViewModel (private val activity: Activity, private val studentLi
         }
     }
 
+    /*
+    fun deleteSublet(mActivity: MainActivity, id: Int) {
+        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.deleteSublet(bearerToken, id).subscribe({ sublets ->
+                mActivity.runOnUiThread {
+                    postedSubletsList.value = sublets as ArrayList<Sublet>
+                }
+            }, { throwable ->
+                mActivity.runOnUiThread {
+                    Log.e(
+                        "Posted Sublet Fragment",
+                        "Could not load Posted Sublets",
+                        throwable
+                    )
+                }
+            })
+        }
+    }
+
+     */
+
+
     fun getSublet(position : Int) : Sublet {
         return postedSubletsList.value?.get(position) ?: Sublet() // Provide a default value if needed
     }