Rename

pennlabs · Jan 26, 2025 · cb233ac · cb233ac
1 parent 0d59e7b
commit cb233ac
Show file tree

Hide file tree

Showing 26 changed files with 105 additions and 107 deletions.
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/MainActivity.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/MainActivity.kt
@@ -1,6 +1,6 @@
 package com.pennapps.labs.pennmobile
 
-import StudentLifeRf2
+import StudentLife
 import android.content.Context
 import android.content.SharedPreferences
 import android.content.pm.PackageManager
@@ -313,7 +313,7 @@ class MainActivity : AppCompatActivity() {
         val GSR_ID = R.id.nav_gsr
         val DINING_ID = R.id.nav_dining
 
-        private var mStudentLifeRf2: StudentLifeRf2? = null
+        private var mStudentLife: StudentLife? = null
         private var mPlatform: Platform? = null
         private var mCampusExpress: CampusExpress? = null
 
@@ -355,9 +355,9 @@ class MainActivity : AppCompatActivity() {
                 return mPlatform!!
             }
 
-        val studentLifeInstanceRf2: StudentLifeRf2
+        val studentLifeInstance: StudentLife
             get() {
-                if (mStudentLifeRf2 == null) {
+                if (mStudentLife == null) {
                     val gsonBuilder = GsonBuilder()
 
                     gsonBuilder.registerTypeAdapter(
@@ -428,9 +428,9 @@ class MainActivity : AppCompatActivity() {
                             .addConverterFactory(GsonConverterFactory.create(gson))
                             .addCallAdapterFactory(RxJavaCallAdapterFactory.create())
                             .build()
-                    mStudentLifeRf2 = retrofit.create(StudentLifeRf2::class.java)
+                    mStudentLife = retrofit.create(StudentLife::class.java)
                 }
-                return mStudentLifeRf2!!
+                return mStudentLife!!
             }
 
     }

diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/HuntsmanGSRLogin.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/HuntsmanGSRLogin.kt
@@ -1,6 +1,6 @@
 package com.pennapps.labs.pennmobile.api
 
-import StudentLifeRf2
+import StudentLife
 import android.os.Bundle
 import android.util.Log
 import android.view.LayoutInflater
@@ -29,15 +29,15 @@ class HuntsmanGSRLogin : Fragment() {
     private lateinit var roomName: String
     private var gid: Int = 0
 
-    private lateinit var mStudentLifeRf2: StudentLifeRf2
+    private lateinit var mStudentLife: StudentLife
     private lateinit var mActivity: MainActivity
 
     private var _binding: FragmentHuntsmanGsrloginBinding? = null
     val binding get() = _binding!!
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        mStudentLifeRf2= MainActivity.studentLifeInstanceRf2
+        mStudentLife = MainActivity.studentLifeInstance
         mActivity = activity as MainActivity
         arguments?.let { arguments ->
             gsrID = arguments.getString("gsrID") ?: ""
@@ -125,7 +125,7 @@ class HuntsmanGSRLogin : Fragment() {
         (activity as MainActivity).mNetworkManager.getAccessToken {
             viewLifecycleOwner.lifecycleScope.launch {
                 try {
-                    val response = mStudentLifeRf2.bookGSR(
+                    val response = mStudentLife.bookGSR(
                             // Passing the values
                             bearerToken,
                             startTime,

diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/OAuth2NetworkManager.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/OAuth2NetworkManager.kt
@@ -19,7 +19,7 @@ import java.util.Calendar
 class OAuth2NetworkManager(
     private var mActivity: MainActivity,
 ) {
-    private var mStudentLifeRf2 = MainActivity.studentLifeInstanceRf2
+    private var mStudentLife = MainActivity.studentLifeInstance
     private val sp = PreferenceManager.getDefaultSharedPreferences(mActivity)
     val editor = sp?.edit()
 
@@ -71,7 +71,7 @@ class OAuth2NetworkManager(
         val clientID = BuildConfig.PLATFORM_CLIENT_ID
 
         try {
-            val response = mStudentLifeRf2.refreshAccessToken(
+            val response = mStudentLife.refreshAccessToken(
                 refreshToken,
                 "refresh_token",
                 clientID,

diff --git a/...pps/labs/pennmobile/api/StudentLifeRf2.kt → ...nnapps/labs/pennmobile/api/StudentLife.kt b/...pps/labs/pennmobile/api/StudentLifeRf2.kt → ...nnapps/labs/pennmobile/api/StudentLife.kt
@@ -35,7 +35,7 @@ import retrofit2.http.Path
 import retrofit2.http.Query
 import rx.Observable
 
-interface StudentLifeRf2 {
+interface StudentLife {
     @FormUrlEncoded
     @POST("accounts/token/")
     suspend fun getAccessToken(

diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/fragments/LoginWebviewFragment.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/fragments/LoginWebviewFragment.kt
@@ -1,6 +1,6 @@
 package com.pennapps.labs.pennmobile.api.fragments
 
-import StudentLifeRf2
+import StudentLife
 import android.content.SharedPreferences
 import android.os.Bundle
 import android.security.keystore.KeyGenParameterSpec
@@ -48,7 +48,7 @@ class LoginWebviewFragment : Fragment() {
     lateinit var headerLayout: LinearLayout
     lateinit var cancelButton: Button
     lateinit var user: Account
-    private lateinit var mStudentLifeRf2: StudentLifeRf2
+    private lateinit var mStudentLife: StudentLife
     private var mPlatform: Platform? = null
     private lateinit var mActivity: MainActivity
     lateinit var sp: SharedPreferences
@@ -66,7 +66,7 @@ class LoginWebviewFragment : Fragment() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        mStudentLifeRf2 = MainActivity.studentLifeInstanceRf2
+        mStudentLife = MainActivity.studentLifeInstance
         mPlatform = MainActivity.platformInstance
         arguments?.let {
             user = arguments?.getSerializable("user") as Account
@@ -184,7 +184,7 @@ class LoginWebviewFragment : Fragment() {
     private fun initiateAuthentication(authCode: String) {
         mActivity.lifecycleScope.launch {
             try {
-                val response = mStudentLifeRf2.getAccessToken(
+                val response = mStudentLife.getAccessToken(
                     authCode,
                     "authorization_code",
                     clientID,

diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/adapters/DiningAdapter.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/adapters/DiningAdapter.kt
@@ -1,6 +1,6 @@
 package com.pennapps.labs.pennmobile.dining.adapters
 
-import StudentLifeRf2
+import StudentLife
 import android.content.Context
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -27,7 +27,7 @@ import java.util.Collections
 class DiningAdapter(
     private var diningHalls: List<DiningHall>,
 ) : RecyclerView.Adapter<DiningAdapter.DiningViewHolder>() {
-    private lateinit var mStudentLifeRf2: StudentLifeRf2
+    private lateinit var mStudentLife: StudentLife
     private lateinit var loaded: BooleanArray
     private lateinit var sortBy: String
     private lateinit var context: Context
@@ -37,7 +37,7 @@ class DiningAdapter(
         viewType: Int,
     ): DiningViewHolder {
         val itemBinding = DiningListItemBinding.inflate(LayoutInflater.from(parent.context), parent, false)
-        mStudentLifeRf2 = MainActivity.studentLifeInstanceRf2
+        mStudentLife = MainActivity.studentLifeInstance
         loaded = BooleanArray(diningHalls.size)
         context = parent.context
         val sp = PreferenceManager.getDefaultSharedPreferences(context)
@@ -86,7 +86,7 @@ class DiningAdapter(
             if (diningHall.isResidential && !loaded[position]) {
                 holder.progressBar.visibility = View.VISIBLE
                 try {
-                    mStudentLifeRf2
+                    mStudentLife
                         .daily_menu(diningHall.id)
                         .subscribeOn(Schedulers.io())
                         .observeOn(AndroidSchedulers.mainThread())

diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/adapters/DiningCardAdapter.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/adapters/DiningCardAdapter.kt
@@ -1,6 +1,6 @@
 package com.pennapps.labs.pennmobile.dining.adapters
 
-import StudentLifeRf2
+import StudentLife
 import android.content.Context
 import android.os.Bundle
 import android.util.Log
@@ -33,15 +33,15 @@ class DiningCardAdapter(
 
     private lateinit var mContext: Context
     private lateinit var mActivity: MainActivity
-    private lateinit var mStudentLifeRf2: StudentLifeRf2
+    private lateinit var mStudentLife: StudentLife
 
     override fun onCreateViewHolder(
         parent: ViewGroup,
         viewType: Int,
     ): ViewHolder {
         mContext = parent.context
         mActivity = mContext as MainActivity
-        mStudentLifeRf2 = MainActivity.studentLifeInstanceRf2
+        mStudentLife = MainActivity.studentLifeInstance
         val itemBinding = DiningListItemBinding.inflate(LayoutInflater.from(mContext), parent, false)
         itemBinding.diningProgress.visibility = GONE
         return ViewHolder(itemBinding)
@@ -90,7 +90,7 @@ class DiningCardAdapter(
         // Load the menu for each dining hall
         if (currentHall.isResidential) {
             try {
-                mStudentLifeRf2
+                mStudentLife
                     .daily_menu(currentHall.id)
                     .subscribeOn(Schedulers.io())
                     .observeOn(AndroidSchedulers.mainThread())

diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/fragments/DiningFragment.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/fragments/DiningFragment.kt
@@ -1,6 +1,6 @@
 package com.pennapps.labs.pennmobile.dining.fragments
 
-import StudentLifeRf2
+import StudentLife
 import android.annotation.SuppressLint
 import android.os.Bundle
 import android.util.Log
@@ -30,14 +30,14 @@ import java.time.format.DateTimeFormatter
 
 class DiningFragment : Fragment() {
     private lateinit var mActivity: MainActivity
-    private lateinit var mStudentLifeRf2: StudentLifeRf2
+    private lateinit var mStudentLife: StudentLife
 
     private var _binding: FragmentDiningBinding? = null
     val binding get() = _binding!!
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        mStudentLifeRf2 = MainActivity.studentLifeInstanceRf2
+        mStudentLife = MainActivity.studentLifeInstance
         mActivity = activity as MainActivity
         mActivity.closeKeyboard()
         setHasOptionsMenu(true)
@@ -156,7 +156,7 @@ class DiningFragment : Fragment() {
 
         // Map each item in the list of venues to a Venue Observable, then map each Venue to a DiningHall Observable
         try {
-            mStudentLifeRf2
+            mStudentLife
                 .venues()
                 .subscribeOn(Schedulers.io())
                 .flatMap { venues -> Observable.from(venues) }
@@ -236,7 +236,7 @@ class DiningFragment : Fragment() {
                 val current = LocalDateTime.now()
                 val formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd")
                 val formatted = current.format(formatter)
-                val studentLife = MainActivity.studentLifeInstanceRf2
+                val studentLife = MainActivity.studentLifeInstance
                 studentLife.getMenus(formatted)
                     .subscribeOn(Schedulers.io())
                     .subscribe({ menus ->

diff --git a/...ile/src/main/java/com/pennapps/labs/pennmobile/dining/fragments/DiningSettingsFragment.kt b/...ile/src/main/java/com/pennapps/labs/pennmobile/dining/fragments/DiningSettingsFragment.kt
@@ -1,6 +1,6 @@
 package com.pennapps.labs.pennmobile.dining.fragments
 
-import StudentLifeRf2
+import StudentLife
 import android.os.Bundle
 import android.util.Log
 import android.view.LayoutInflater
@@ -32,7 +32,7 @@ class DiningSettingsFragment(
     private val dataModel: HomepageDataModel,
 ) : Fragment() {
     private lateinit var mActivity: MainActivity
-    private lateinit var mStudentLifeRf2: StudentLifeRf2
+    private lateinit var mStudentLife: StudentLife
 
     private lateinit var halls: List<DiningHall>
     private lateinit var toolbar: Toolbar
@@ -47,7 +47,7 @@ class DiningSettingsFragment(
         super.onCreate(savedInstanceState)
         setHasOptionsMenu(true)
         mActivity = activity as MainActivity
-        mStudentLifeRf2 = MainActivity.studentLifeInstanceRf2
+        mStudentLife = MainActivity.studentLifeInstance
     }
 
     override fun onCreateView(
@@ -106,7 +106,7 @@ class DiningSettingsFragment(
         // Map each item in the list of venues to a Venue Observable, then map each Venue to a DiningHall Observable
         originalPreferences = dataModel.getDiningHallPrefs()
         try {
-            mStudentLifeRf2
+            mStudentLife
                 .venues()
                 .subscribeOn(Schedulers.io())
                 .flatMap { venues -> Observable.from(venues) }
@@ -169,7 +169,7 @@ class DiningSettingsFragment(
 
             viewLifecycleOwner.lifecycleScope.launch {
                 try {
-                    val response = mStudentLifeRf2.sendDiningPref(
+                    val response = mStudentLife.sendDiningPref(
                         bearerToken,
                         DiningRequest(favoriteDiningHalls),
                     )

diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/fitness/FitnessPreferenceViewModel.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/fitness/FitnessPreferenceViewModel.kt
@@ -1,6 +1,6 @@
 package com.pennapps.labs.pennmobile.fitness
 
-import StudentLifeRf2
+import StudentLife
 import android.util.Log
 import androidx.preference.PreferenceManager
 import com.pennapps.labs.pennmobile.MainActivity
@@ -14,7 +14,7 @@ import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 
 class FitnessPreferenceViewModel(
-    private val studentLifeRf2: StudentLifeRf2,
+    private val studentLife: StudentLife,
     private val roomList: List<FitnessRoom>,
 ) : FitnessAdapterDataModel {
     private val roomTot = roomList.size
@@ -103,7 +103,7 @@ class FitnessPreferenceViewModel(
             @OptIn(DelicateCoroutinesApi::class)
             GlobalScope.launch(Dispatchers.IO) {
                 try {
-                    val response = studentLifeRf2.sendFitnessPref(
+                    val response = studentLife.sendFitnessPref(
                         bearerToken,
                         FitnessRequest(ArrayList(favoriteRooms))
                     )

diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/fitness/adapters/FitnessAdapter.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/fitness/adapters/FitnessAdapter.kt
@@ -1,6 +1,6 @@
 package com.pennapps.labs.pennmobile.fitness.adapters
 
-import StudentLifeRf2
+import StudentLife
 import android.app.Activity
 import android.content.Context
 import android.graphics.Color
@@ -48,7 +48,7 @@ class FitnessAdapter(
 ) : RecyclerView.Adapter<FitnessAdapter.ViewHolder>() {
     private lateinit var mActivity: Activity
     private lateinit var mContext: Context
-    private lateinit var mStudentLifeRf2: StudentLifeRf2
+    private lateinit var mStudentLife: StudentLife
 
     class ViewHolder(
         val view: View,
@@ -76,13 +76,13 @@ class FitnessAdapter(
         fun getExtraData(
             context: Context,
             activity: Activity,
-            studentLifeRf2: StudentLifeRf2,
+            studentLife: StudentLife,
             room: FitnessRoom,
         ) {
             if (hasExtraData) return
             room.roomId?.let {
                 try {
-                    studentLifeRf2.getFitnessRoomUsage(it, 3, "week")
+                    studentLife.getFitnessRoomUsage(it, 3, "week")
                         .subscribeOn(Schedulers.io())
                         .subscribe(
                         { roomUsage ->
@@ -228,7 +228,7 @@ class FitnessAdapter(
     ): ViewHolder {
         mContext = parent.context
         mActivity = mContext as MainActivity
-        mStudentLifeRf2 = MainActivity.studentLifeInstanceRf2
+        mStudentLife = MainActivity.studentLifeInstance
 
         val view =
             LayoutInflater
@@ -399,7 +399,7 @@ class FitnessAdapter(
             if (holder.hasExtraData) {
                 holder.showExtra()
             } else {
-                holder.getExtraData(mContext, mActivity, mStudentLifeRf2, room)
+                holder.getExtraData(mContext, mActivity, mStudentLife, room)
             }
         }
     }

diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/fling/fragments/FlingFragment.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/fling/fragments/FlingFragment.kt
@@ -66,7 +66,7 @@ class FlingFragment : Fragment() {
         // Inflate the layout for this fragment
         _binding = FragmentFlingBinding.inflate(inflater, container, false)
         val view = binding.root
-        val labs = MainActivity.studentLifeInstanceRf2
+        val labs = MainActivity.studentLifeInstance
         try {
             labs.getFlingEvents()
                 .subscribeOn(Schedulers.io())

diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/gsr/adapters/GsrReservationsAdapter.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/gsr/adapters/GsrReservationsAdapter.kt
@@ -88,7 +88,7 @@ class GsrReservationsAdapter(
                         }
 
                     (mContext as MainActivity).lifecycleScope.launch {
-                        val labs = MainActivity.studentLifeInstanceRf2
+                        val labs = MainActivity.studentLifeInstance
                         val bearerToken =
                             "Bearer " + sp.getString(mContext.getString(R.string.access_token), " ")