diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/SubletterDraftListingsFragment.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/SubletterDraftListingsFragment.kt new file mode 100644 index 000000000..55ada6780 --- /dev/null +++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/SubletterDraftListingsFragment.kt @@ -0,0 +1,19 @@ +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 SubletterDraftListingsFragment : 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_subletter_draft_listings, container, false) + } +} \ No newline at end of file diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/SubletterFragment.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/SubletterFragment.kt index 2b86c5939..17348d4a9 100644 --- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/SubletterFragment.kt +++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/SubletterFragment.kt @@ -5,6 +5,8 @@ import androidx.fragment.app.Fragment import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import androidx.viewpager2.widget.ViewPager2 +import com.pennapps.labs.pennmobile.adapters.SubletterPagerAdapter // TODO: Rename parameter arguments, choose names that match // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER @@ -17,10 +19,14 @@ private const val ARG_PARAM2 = "param2" * create an instance of this fragment. */ class SubletterFragment : Fragment() { - + lateinit var subletterPagerAdapter: SubletterPagerAdapter + private lateinit var mActivity: MainActivity + private lateinit var viewPager: ViewPager2 override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) + mActivity = activity as MainActivity + mActivity.closeKeyboard() } override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, @@ -31,4 +37,6 @@ class SubletterFragment : Fragment() { + + } \ No newline at end of file diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/SubletterHolderFragment.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/SubletterHolderFragment.kt new file mode 100644 index 000000000..6e75c397c --- /dev/null +++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/SubletterHolderFragment.kt @@ -0,0 +1,48 @@ +package com.pennapps.labs.pennmobile + +import android.os.Bundle +import android.view.LayoutInflater +import android.view.View +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.adapters.SubletterPagerAdapter +import com.pennapps.labs.pennmobile.adapters.SublettingPagerAdapter +import com.pennapps.labs.pennmobile.components.collapsingtoolbar.ToolbarBehavior +import kotlinx.android.synthetic.main.fragment_dining_holder.view.appbar_home_holder + +class SubletterHolderFragment : Fragment() { + lateinit var subletterPagerAdapter: SubletterPagerAdapter + private lateinit var mActivity: MainActivity + private lateinit var viewPager: ViewPager2 + + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + mActivity = activity as MainActivity + mActivity.closeKeyboard() + } + + override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, + savedInstanceState: Bundle?): View? { + return inflater.inflate(R.layout.fragment_subletting, container, false) + } + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + subletterPagerAdapter = SubletterPagerAdapter(this) + viewPager = view.findViewById(R.id.viewPager2) + viewPager.adapter = subletterPagerAdapter + val tabLayout : TabLayout = view.findViewById(R.id.subletting_tab_layout) + TabLayoutMediator(tabLayout, viewPager) { tab, position -> + tab.text = "OBJECT ${(position + 1)}" + }.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/SubletterPostedListingsFragment.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/SubletterPostedListingsFragment.kt new file mode 100644 index 000000000..58c6ecc90 --- /dev/null +++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/SubletterPostedListingsFragment.kt @@ -0,0 +1,19 @@ +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 SubletterPostedListingsFragment : 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_subletter_posted_listings, container, false) + } +} \ No newline at end of file diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/MainPagerAdapter.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/MainPagerAdapter.kt index a3877776c..36d0f170d 100644 --- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/MainPagerAdapter.kt +++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/MainPagerAdapter.kt @@ -8,6 +8,7 @@ import com.pennapps.labs.pennmobile.DiningHolderFragment import com.pennapps.labs.pennmobile.GsrTabbedFragment import com.pennapps.labs.pennmobile.HomeFragment import com.pennapps.labs.pennmobile.LaundryFragment +import com.pennapps.labs.pennmobile.SublettingFragment import com.pennapps.labs.pennmobile.more_fragments.MoreFragment class MainPagerAdapter(fragmentManager: FragmentManager, lifecycle: Lifecycle?) : FragmentStateAdapter(fragmentManager, lifecycle!!) { @@ -16,7 +17,7 @@ class MainPagerAdapter(fragmentManager: FragmentManager, lifecycle: Lifecycle?) HOME_POSITION-> HomeFragment() DINING_POSITION-> DiningHolderFragment() GSR_POSITION-> GsrTabbedFragment() - LAUNDRY_POSITION-> LaundryFragment() + LAUNDRY_POSITION-> SublettingFragment() MORE_POSITION-> MoreFragment() else -> HomeFragment() } 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 new file mode 100644 index 000000000..3475088ca --- /dev/null +++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/SubletterPagerAdapter.kt @@ -0,0 +1,18 @@ +package com.pennapps.labs.pennmobile.adapters + +import androidx.fragment.app.Fragment +import androidx.viewpager2.adapter.FragmentStateAdapter +import com.pennapps.labs.pennmobile.SubletterDraftListingsFragment +import com.pennapps.labs.pennmobile.SubletterPostedListingsFragment + +class SubletterPagerAdapter(fragment: Fragment) : FragmentStateAdapter(fragment) { + override fun getItemCount(): Int = 2 + override fun createFragment(position: Int): Fragment { + return if (position == 0) { + SubletterPostedListingsFragment() + } else { + SubletterDraftListingsFragment() + } + } + +} \ No newline at end of file diff --git a/PennMobile/src/main/res/layout/fragment_subletter_draft_listings.xml b/PennMobile/src/main/res/layout/fragment_subletter_draft_listings.xml new file mode 100644 index 000000000..997af6eb1 --- /dev/null +++ b/PennMobile/src/main/res/layout/fragment_subletter_draft_listings.xml @@ -0,0 +1,16 @@ + + + + + \ No newline at end of file diff --git a/PennMobile/src/main/res/layout/fragment_subletter_posted_listings.xml b/PennMobile/src/main/res/layout/fragment_subletter_posted_listings.xml new file mode 100644 index 000000000..52cc3558d --- /dev/null +++ b/PennMobile/src/main/res/layout/fragment_subletter_posted_listings.xml @@ -0,0 +1,16 @@ + + + + + \ No newline at end of file diff --git a/PennMobile/src/main/res/layout/fragment_subletter_view.xml b/PennMobile/src/main/res/layout/fragment_subletter_view.xml index 423a1191e..ab3431b58 100644 --- a/PennMobile/src/main/res/layout/fragment_subletter_view.xml +++ b/PennMobile/src/main/res/layout/fragment_subletter_view.xml @@ -2,19 +2,48 @@ + + + + + + + + \ No newline at end of file diff --git a/PennMobile/src/main/res/layout/fragment_subletting.xml b/PennMobile/src/main/res/layout/fragment_subletting.xml index c9eb03501..567c298c9 100644 --- a/PennMobile/src/main/res/layout/fragment_subletting.xml +++ b/PennMobile/src/main/res/layout/fragment_subletting.xml @@ -3,7 +3,7 @@ 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:layout_height="wrap_content" tools:context=".MainActivity"> + app:layout_constraintTop_toBottomOf="@id/subletting_tab_layout" + android:layout_height="wrap_content"/> \ No newline at end of file diff --git a/PennMobile/src/main/res/values/strings.xml b/PennMobile/src/main/res/values/strings.xml index c7f190f92..617fca216 100644 --- a/PennMobile/src/main/res/values/strings.xml +++ b/PennMobile/src/main/res/values/strings.xml @@ -238,4 +238,5 @@ Room Hello blank fragment + My Listings