Skip to content

Commit

Permalink
Merge pull request #573 from pennlabs/dining-settings-fix
Browse files Browse the repository at this point in the history
Fixed bug with dining settings
  • Loading branch information
JSnipes29 authored Oct 2, 2023
2 parents 7975c1e + 7e146aa commit d0058aa
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import androidx.core.content.ContextCompat.getColor
import androidx.core.content.ContextCompat.startActivity
import androidx.core.graphics.ColorUtils
import androidx.core.graphics.drawable.DrawableCompat
import androidx.fragment.app.FragmentTransaction
import androidx.palette.graphics.Palette
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
Expand All @@ -51,7 +52,6 @@ import kotlinx.android.synthetic.main.home_post_card.view.*
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.launch
import retrofit.Callback
import retrofit.ResponseCallback
import retrofit.RetrofitError
import retrofit.client.Response
Expand Down Expand Up @@ -172,7 +172,11 @@ class HomeAdapter(private var cells: ArrayList<HomeCell>) :
holder.itemView.home_card_subtitle.text = "DINING HALLS"
holder.itemView.dining_prefs_btn.visibility = View.VISIBLE
holder.itemView.dining_prefs_btn.setOnClickListener {
mActivity.fragmentTransact(DiningSettingsFragment(), false)
mActivity.supportFragmentManager.beginTransaction()
.replace(R.id.content_frame, DiningSettingsFragment())
.addToBackStack(null)
.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN)
.commit()
}

mStudentLife.venues()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:background="@color/white">

<Switch
android:id="@+id/laundry_favorite_switch"
Expand Down

0 comments on commit d0058aa

Please sign in to comment.