remove from adapters, api

pennlabs · Oct 8, 2023 · 795ef8f · 795ef8f
1 parent b2c8954
commit 795ef8f
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 46 deletions.
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/AboutAdapter.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/AboutAdapter.kt
@@ -43,9 +43,7 @@ class AboutAdapter(private var members: ArrayList<String>)
             "Aaron Mei" -> R.drawable.aaron
             else -> null
         }
-        if (android.os.Build.VERSION.SDK_INT >=  android.os.Build.VERSION_CODES.M){
-            if (imageId != null) holder.view.person_iv?.setImageResource(imageId)
-        }
+        if (imageId != null) holder.view.person_iv?.setImageResource(imageId)
 
     }
 

diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/DiningInsightsCardAdapter.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/DiningInsightsCardAdapter.kt
@@ -74,7 +74,6 @@ class DiningInsightsCardAdapter(private var cells: ArrayList<DiningInsightCell>)
         }
     }
 
-    @RequiresApi(Build.VERSION_CODES.O)
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
         val cell = cells[position]
         when (cell.type) {
@@ -109,23 +108,20 @@ class DiningInsightsCardAdapter(private var cells: ArrayList<DiningInsightCell>)
         // Populate dining dollars spent card
 
     }
-    @RequiresApi(Build.VERSION_CODES.O)
     private fun bindDiningDollarsPredictions(holder: ViewHolder, cell: DiningInsightCell) {
         val v = holder.view
         val tvPredictionsTitle = (v.findViewById<View>(R.id.predictions_title) as TextView)
         tvPredictionsTitle.text = mContext.getString(R.string.dining_dollars_predictions)
         bindPredictions(holder, cell, DINING_DOLLARS_PREDICTIONS)
     }
 
-    @RequiresApi(Build.VERSION_CODES.O)
     private fun bindDiningSwipesPredictions(holder: ViewHolder, cell: DiningInsightCell) {
         val v = holder.view
         val tvPredictionsTitle = (v.findViewById<View>(R.id.predictions_title) as TextView)
         tvPredictionsTitle.text = mContext.getString(R.string.dining_swipes_predictions)
         bindPredictions(holder, cell, DINING_SWIPES_PREDICTIONS)
     }
 
-    @RequiresApi(Build.VERSION_CODES.O)
     private fun bindPredictions(holder: ViewHolder, cell: DiningInsightCell, typeId: Int) {
         // Populate dining dollars predictions card
         if (cell.diningBalancesList == null) {
@@ -205,7 +201,6 @@ class DiningInsightsCardAdapter(private var cells: ArrayList<DiningInsightCell>)
         }
     }
 
-    @RequiresApi(Build.VERSION_CODES.M)
     private fun setData(amounts: List<Float>, diningDollarsGraph: LineChart, holder: ViewHolder, typeId: Int) {
         val values: ArrayList<Entry> = ArrayList()
         amounts.forEachIndexed { index, amount ->

diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/DiningPagerAdapter.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/DiningPagerAdapter.kt
@@ -9,10 +9,10 @@ import com.pennapps.labs.pennmobile.DiningInsightsFragment
 
 class DiningPagerAdapter(fragmentManager: FragmentManager, lifecycle: Lifecycle?) : FragmentStateAdapter(fragmentManager, lifecycle!!) {
     override fun createFragment(position: Int): Fragment {
-        if (position == 0) {
-            return DiningFragment()
+        return if (position == 0) {
+            DiningFragment()
         } else {
-            return DiningInsightsFragment()
+            DiningInsightsFragment()
         }
     }
 

diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/GsrRoomAdapter.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/GsrRoomAdapter.kt
@@ -28,25 +28,6 @@ class GsrRoomAdapter(internal var timeRanges: ArrayList<String>, internal var id
             if (duration > 0) {
                 val startTime = starts[position]
                 val endTime = ends[position]
-                /*if (gsrLocationCode == "JMHH") {
-                    val huntsmanGSRLogin = HuntsmanGSRLogin.newInstance(localGSRID, gsrLocationCode, startTime, endTime,
-                        gid, roomName)
-                    val fragmentManager = (context as MainActivity).supportFragmentManager
-                    fragmentManager.beginTransaction()
-                            .replace(R.id.content_frame, huntsmanGSRLogin)
-                            .addToBackStack("GSR Fragment")
-                            .setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN)
-                            .commit()
-                } else {
-                    val bookGsrFragment = BookGsrFragment.newInstance(localGSRID, gsrLocationCode, startTime, endTime,
-                            gid, localGSRID.toInt(), roomName)
-                    val fragmentManager = (context as MainActivity).supportFragmentManager
-                    fragmentManager.beginTransaction()
-                            .replace(R.id.content_frame, bookGsrFragment)
-                            .addToBackStack("GSR Fragment")
-                            .setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN)
-                            .commit()
-                }*/
                 val bookGsrFragment = BookGsrFragment.newInstance(localGSRID, gsrLocationCode, startTime, endTime,
                     gid, localGSRID.toInt(), roomName)
                 val fragmentManager = (context as MainActivity).supportFragmentManager

diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/HomeAdapter.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/HomeAdapter.kt
@@ -265,16 +265,11 @@ class HomeAdapter(private var cells: ArrayList<HomeCell>) :
         }
 
         /** Sets up blur view on news card */
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
-            holder.itemView.blurView.setupWith(holder.itemView.news_card_container)
-                .setFrameClearDrawable(ColorDrawable(getColor(mContext, R.color.white)))
-                .setBlurAlgorithm(RenderScriptBlur(mContext))
-                .setBlurRadius(25f)
-                .setHasFixedTransformationMatrix(true)
-        } else {
-            holder.itemView.blurView.setBackgroundColor(ColorUtils
-                .setAlphaComponent(getColor(mContext, R.color.black), 225))
-        }
+        holder.itemView.blurView.setupWith(holder.itemView.news_card_container)
+            .setFrameClearDrawable(ColorDrawable(getColor(mContext, R.color.white)))
+            .setBlurAlgorithm(RenderScriptBlur(mContext))
+            .setBlurRadius(25f)
+            .setHasFixedTransformationMatrix(true)
 
         holder.itemView.button.setOnClickListener {
 
@@ -344,9 +339,7 @@ class HomeAdapter(private var cells: ArrayList<HomeCell>) :
         val params : ConstraintLayout.LayoutParams =
             holder.itemView.home_card_rv.layoutParams as ConstraintLayout.LayoutParams
         params.setMargins(0, 0, 0, 0)
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
-            params.marginStart = 0
-        }
+        params.marginStart = 0
 
         holder.itemView.home_card_rv.layoutParams = params
 

diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/LaundryRoomAdapter.java b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/LaundryRoomAdapter.java
@@ -76,9 +76,7 @@ public void onBindViewHolder(LaundryRoomAdapter.CustomViewHolder holder, int pos
             holder.layout.setBackgroundResource(0);
             LinearLayout.LayoutParams layoutParams = (LinearLayout.LayoutParams) holder.layout.getLayoutParams();
             layoutParams.setMargins(0, 0, 0, 0);
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
-                layoutParams.setMarginStart(0);
-            }
+            layoutParams.setMarginStart(0);
             holder.layout.setLayoutParams(layoutParams);
             CardView container = (CardView) holder.dryerRecyclerView.getParent();
             ConstraintLayout.LayoutParams params = (ConstraintLayout.LayoutParams) container.getLayoutParams();