From cb233acfc9d760f4c0ea0ff92a95861efafb9946 Mon Sep 17 00:00:00 2001 From: meiron03 Date: Sun, 26 Jan 2025 03:31:52 -0500 Subject: [PATCH] Rename --- .../pennapps/labs/pennmobile/MainActivity.kt | 12 +++--- .../labs/pennmobile/api/HuntsmanGSRLogin.kt | 8 ++-- .../pennmobile/api/OAuth2NetworkManager.kt | 4 +- .../api/{StudentLifeRf2.kt => StudentLife.kt} | 2 +- .../api/fragments/LoginWebviewFragment.kt | 8 ++-- .../dining/adapters/DiningAdapter.kt | 8 ++-- .../dining/adapters/DiningCardAdapter.kt | 8 ++-- .../dining/fragments/DiningFragment.kt | 10 ++--- .../fragments/DiningSettingsFragment.kt | 10 ++--- .../fitness/FitnessPreferenceViewModel.kt | 6 +-- .../fitness/adapters/FitnessAdapter.kt | 12 +++--- .../fling/fragments/FlingFragment.kt | 2 +- .../gsr/adapters/GsrReservationsAdapter.kt | 2 +- .../gsr/fragments/BookGsrFragment.kt | 8 ++-- .../pennmobile/gsr/fragments/GsrFragment.kt | 12 +++--- .../gsr/fragments/GsrReservationsFragment.kt | 2 +- .../gsr/fragments/PottruckFragment.kt | 12 +++--- .../labs/pennmobile/home/HomepageViewModel.kt | 40 +++++++++---------- .../pennmobile/home/adapters/HomeAdapter.kt | 12 +++--- .../pennmobile/home/fragments/HomeFragment.kt | 6 +-- .../pennmobile/laundry/LaundryViewModel.kt | 12 +++--- .../laundry/adapters/LaundryRoomAdapter.java | 1 - .../laundry/fragments/LaundryFragment.kt | 6 +-- .../fragments/LaundrySettingsFragment.kt | 6 +-- .../src/main/res/layout/fragment_laundry.xml | 2 +- .../src/main/res/layout/laundry_room_item.xml | 1 - 26 files changed, 105 insertions(+), 107 deletions(-) rename PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/{StudentLifeRf2.kt => StudentLife.kt} (99%) diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/MainActivity.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/MainActivity.kt index ce157cb60..f245e4670 100644 --- 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 index fd3056cd8..131e7f8ef 100644 --- 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,7 +29,7 @@ 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 @@ -37,7 +37,7 @@ class HuntsmanGSRLogin : Fragment() { 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 index 25fa80cfb..86e8a18e8 100644 --- 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/PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/StudentLifeRf2.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/StudentLife.kt similarity index 99% rename from PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/StudentLifeRf2.kt rename to PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/StudentLife.kt index 176feb3cd..5d771d000 100644 --- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/StudentLifeRf2.kt +++ b/PennMobile/src/main/java/com/pennapps/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 index e8d784cbb..bcbd8b868 100644 --- 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 index f69866581..341979871 100644 --- 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, ) : RecyclerView.Adapter() { - 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 index 64f11e1c1..7aada0101 100644 --- 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,7 +33,7 @@ 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, @@ -41,7 +41,7 @@ class DiningCardAdapter( ): 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 index e20b9e127..9cd139d30 100644 --- 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/PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/fragments/DiningSettingsFragment.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/fragments/DiningSettingsFragment.kt index f96059be6..6b1e4742a 100644 --- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/dining/fragments/DiningSettingsFragment.kt +++ b/PennMobile/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 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 index 552a2e710..2b6e9e3c6 100644 --- 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, ) : 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 index 8c50ddfb2..9c697f87c 100644 --- 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() { 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 index 59bb52b82..492633893 100644 --- 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 index e3a88fce3..7c96b3841 100644 --- 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), " ") diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/gsr/fragments/BookGsrFragment.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/gsr/fragments/BookGsrFragment.kt index 12a45b682..e73b8cf3d 100644 --- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/gsr/fragments/BookGsrFragment.kt +++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/gsr/fragments/BookGsrFragment.kt @@ -1,6 +1,6 @@ package com.pennapps.labs.pennmobile.gsr.fragments -import StudentLifeRf2 +import StudentLife import android.graphics.Color import android.graphics.PorterDuff import android.os.Bundle @@ -33,7 +33,7 @@ class BookGsrFragment : Fragment() { // submit button private lateinit var submit: Button - private lateinit var mStudentLifeRf2: StudentLifeRf2 + private lateinit var mStudentLife: StudentLife // gsr details private lateinit var gsrID: String @@ -56,7 +56,7 @@ class BookGsrFragment : Fragment() { roomId = arguments.getInt("id") roomName = arguments.getString("roomName") ?: "" } - mStudentLifeRf2 = MainActivity.studentLifeInstanceRf2 + mStudentLife = MainActivity.studentLifeInstance mActivity = activity as MainActivity mActivity.setTitle(R.string.gsr) @@ -148,7 +148,7 @@ class BookGsrFragment : Fragment() { 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/gsr/fragments/GsrFragment.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/gsr/fragments/GsrFragment.kt index 4c37ef9a5..17ce26d12 100644 --- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/gsr/fragments/GsrFragment.kt +++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/gsr/fragments/GsrFragment.kt @@ -1,6 +1,6 @@ package com.pennapps.labs.pennmobile.gsr.fragments -import StudentLifeRf2 +import StudentLife import android.app.DatePickerDialog import android.app.TimePickerDialog import android.content.Context @@ -50,7 +50,7 @@ class GsrFragment : Fragment() { val binding get() = _binding!! // api manager - private lateinit var mStudentLifeRf2: StudentLifeRf2 + private lateinit var mStudentLife: StudentLife // list that holds all GSR rooms private val gsrHashMap = HashMap() @@ -82,7 +82,7 @@ class GsrFragment : Fragment() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - mStudentLifeRf2 = MainActivity.studentLifeInstanceRf2 + mStudentLife = MainActivity.studentLifeInstance mActivity = activity as MainActivity sharedPreferences = PreferenceManager.getDefaultSharedPreferences(mActivity) mActivity.closeKeyboard() @@ -256,7 +256,7 @@ class GsrFragment : Fragment() { Toast.makeText(activity, "You are not logged in!", Toast.LENGTH_LONG).show() } else { try { - mStudentLifeRf2 + mStudentLife .isWharton( "Bearer $bearerToken", ) @@ -348,7 +348,7 @@ class GsrFragment : Fragment() { Log.i("GsrFragment", "Wharton Status: $isWharton") try { - mStudentLifeRf2 + mStudentLife .gsrRoom( "Bearer $bearerToken", location, @@ -493,7 +493,7 @@ class GsrFragment : Fragment() { private fun populateDropDownGSR() { try { - mStudentLifeRf2 + mStudentLife .location() .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/gsr/fragments/GsrReservationsFragment.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/gsr/fragments/GsrReservationsFragment.kt index dd6753c61..5e73148e2 100644 --- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/gsr/fragments/GsrReservationsFragment.kt +++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/gsr/fragments/GsrReservationsFragment.kt @@ -98,7 +98,7 @@ class GsrReservationsFragment : Fragment() { } // get email and session id from shared preferences - val labs = MainActivity.studentLifeInstanceRf2 + val labs = MainActivity.studentLifeInstance mActivity.mNetworkManager.getAccessToken { val sp = PreferenceManager.getDefaultSharedPreferences(mActivity) diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/gsr/fragments/PottruckFragment.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/gsr/fragments/PottruckFragment.kt index c8c0f41d3..e4fbe62b2 100644 --- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/gsr/fragments/PottruckFragment.kt +++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/gsr/fragments/PottruckFragment.kt @@ -1,6 +1,6 @@ package com.pennapps.labs.pennmobile.gsr.fragments -import StudentLifeRf2 +import StudentLife import android.os.Bundle import android.util.Log import android.view.LayoutInflater @@ -33,7 +33,7 @@ import rx.schedulers.Schedulers class PottruckFragment : Fragment() { private lateinit var mActivity: MainActivity - private lateinit var mStudentLifeRf2: StudentLifeRf2 + private lateinit var mStudentLife: StudentLife private lateinit var mView: View private lateinit var swipeRefresh: SwipeRefreshLayout @@ -50,7 +50,7 @@ class PottruckFragment : Fragment() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - mStudentLifeRf2 = MainActivity.studentLifeInstanceRf2 + mStudentLife = MainActivity.studentLifeInstance mActivity = activity as MainActivity } @@ -97,7 +97,7 @@ class PottruckFragment : Fragment() { try { - mStudentLifeRf2.getFitnessRooms().subscribeOn(Schedulers.io()).subscribe({ fitnessRooms -> + mStudentLife.getFitnessRooms().subscribeOn(Schedulers.io()).subscribe({ fitnessRooms -> val rooms = fitnessRooms?.filterNotNull().orEmpty() for (room in rooms) { Log.i("Fitness Room${room.roomId}", "${room.roomName}") @@ -105,7 +105,7 @@ class PottruckFragment : Fragment() { val sortedRooms = rooms.sortedBy { it.roomName } - dataModel = FitnessPreferenceViewModel(mStudentLifeRf2, sortedRooms) + dataModel = FitnessPreferenceViewModel(mStudentLife, sortedRooms) mActivity.mNetworkManager.getAccessToken { val sp = PreferenceManager.getDefaultSharedPreferences(mActivity) @@ -113,7 +113,7 @@ class PottruckFragment : Fragment() { val bearerToken = "Bearer " + sp.getString(context.getString(R.string.access_token), "").toString() - mStudentLifeRf2.getFitnessPreferences(bearerToken) + mStudentLife.getFitnessPreferences(bearerToken) .subscribeOn(Schedulers.io()) .subscribe({ favorites -> diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/home/HomepageViewModel.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/home/HomepageViewModel.kt index db6ec72fb..84726e1d6 100644 --- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/home/HomepageViewModel.kt +++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/home/HomepageViewModel.kt @@ -1,6 +1,6 @@ package com.pennapps.labs.pennmobile.home -import StudentLifeRf2 +import StudentLife import android.util.Log import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData @@ -118,13 +118,13 @@ class HomepageViewModel : */ @Synchronized fun updateHomePageCells( - studentLifeRf2: StudentLifeRf2, + studentLife: StudentLife, isLoggedIn: Boolean, bearerToken: String, deviceID: String, ): List { val prevList = homepageCells.toList() - populateHomePageCells(studentLifeRf2, isLoggedIn, bearerToken, deviceID) + populateHomePageCells(studentLife, isLoggedIn, bearerToken, deviceID) val updatedIndices = mutableListOf() @@ -146,27 +146,27 @@ class HomepageViewModel : */ @Synchronized fun populateHomePageCells( - studentLifeRf2: StudentLifeRf2, + studentLife: StudentLife, isLoggedIn: Boolean, bearerToken: String, deviceID: String, ) { if (isLoggedIn) { val latch = CountDownLatch(NUM_CELLS_LOGGED_IN) - getPolls(studentLifeRf2, bearerToken, deviceID, latch) - getNews(studentLifeRf2, latch) - getCalendar(studentLifeRf2, latch) - getLaundry(studentLifeRf2, bearerToken, latch) - getPosts(studentLifeRf2, bearerToken, latch) - getDiningPrefs(studentLifeRf2, bearerToken, latch) - getGSRReservations(studentLifeRf2, bearerToken, latch) + getPolls(studentLife, bearerToken, deviceID, latch) + getNews(studentLife, latch) + getCalendar(studentLife, latch) + getLaundry(studentLife, bearerToken, latch) + getPosts(studentLife, bearerToken, latch) + getDiningPrefs(studentLife, bearerToken, latch) + getGSRReservations(studentLife, bearerToken, latch) // waits until all of the network calls are processed latch.await() } else { val latch = CountDownLatch(NUM_CELLS_GUEST) clearLoggedIn() - getCalendar(studentLifeRf2, latch) - getNews(studentLifeRf2, latch) + getCalendar(studentLife, latch) + getNews(studentLife, latch) latch.await() } } @@ -197,7 +197,7 @@ class HomepageViewModel : } private fun getPolls( - studentLife: StudentLifeRf2, + studentLife: StudentLife, bearerToken: String, deviceID: String, latch: CountDownLatch, @@ -228,7 +228,7 @@ class HomepageViewModel : } private fun getNews( - studentLife: StudentLifeRf2, + studentLife: StudentLife, latch: CountDownLatch, ) { try { @@ -254,7 +254,7 @@ class HomepageViewModel : } private fun getCalendar( - studentLife: StudentLifeRf2, + studentLife: StudentLife, latch: CountDownLatch, ) { try { @@ -279,7 +279,7 @@ class HomepageViewModel : } private fun getLaundry( - studentLife: StudentLifeRf2, + studentLife: StudentLife, bearerToken: String, latch: CountDownLatch, ) { @@ -310,7 +310,7 @@ class HomepageViewModel : } private fun getPosts( - studentLife: StudentLifeRf2, + studentLife: StudentLife, bearerToken: String, latch: CountDownLatch, ) { @@ -342,7 +342,7 @@ class HomepageViewModel : } private fun getDiningPrefs( - studentLife: StudentLifeRf2, + studentLife: StudentLife, bearerToken: String, latch: CountDownLatch, ) { @@ -372,7 +372,7 @@ class HomepageViewModel : } private fun getGSRReservations( - studentLife: StudentLifeRf2, + studentLife: StudentLife, bearerToken: String, latch: CountDownLatch, ) { diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/home/adapters/HomeAdapter.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/home/adapters/HomeAdapter.kt index b7584d3e8..5bafbf451 100644 --- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/home/adapters/HomeAdapter.kt +++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/home/adapters/HomeAdapter.kt @@ -1,6 +1,6 @@ package com.pennapps.labs.pennmobile.home.adapters -import StudentLifeRf2 +import StudentLife import android.app.PendingIntent import android.content.ComponentName import android.content.Context @@ -81,7 +81,7 @@ class HomeAdapter( ) : RecyclerView.Adapter() { private lateinit var mContext: Context private lateinit var mActivity: MainActivity - private lateinit var mStudentLifeRf2: StudentLifeRf2 + private lateinit var mStudentLife: StudentLife private var mCustomTabsClient: CustomTabsClient? = null private var customTabsIntent: CustomTabsIntent? = null @@ -111,7 +111,7 @@ class HomeAdapter( viewType: Int, ): RecyclerView.ViewHolder { mContext = parent.context - mStudentLifeRf2 = MainActivity.studentLifeInstanceRf2 + mStudentLife = MainActivity.studentLifeInstance mActivity = mContext as MainActivity return when (viewType) { @@ -251,7 +251,7 @@ class HomeAdapter( holder.homeRv.layoutParams = params try { - mStudentLifeRf2.roomObservable(roomID).subscribeOn(Schedulers.io()).subscribe({ room -> + mStudentLife.roomObservable(roomID).subscribeOn(Schedulers.io()).subscribe({ room -> mActivity.runOnUiThread { holder.homeTitle.text = room?.name ?: "" val rooms = room?.let { arrayListOf(it) } ?: arrayListOf() @@ -285,7 +285,7 @@ class HomeAdapter( .commit() } try { - mStudentLifeRf2 + mStudentLife .venues() .subscribeOn(Schedulers.io()) .flatMap { venues -> Observable.from(venues) } @@ -522,7 +522,7 @@ class HomeAdapter( (mContext as MainActivity).lifecycleScope.launch { try { - val response = mStudentLifeRf2.createPollVote( + val response = mStudentLife.createPollVote( bearerToken, idHash, selectedOptions, diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/home/fragments/HomeFragment.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/home/fragments/HomeFragment.kt index d0879966d..556c0f978 100644 --- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/home/fragments/HomeFragment.kt +++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/home/fragments/HomeFragment.kt @@ -149,7 +149,7 @@ class HomeFragment : Fragment() { return } - val studentLifeRf2 = MainActivity.studentLifeInstanceRf2 + val studentLife = MainActivity.studentLifeInstance mActivity.mNetworkManager.getAccessToken { val sp = sharedPreferences val deviceID = OAuth2NetworkManager(mActivity).getDeviceId() @@ -161,7 +161,7 @@ class HomeFragment : Fragment() { // set adapter if it is null if (binding.homeCellsRv.adapter == null) { homepageViewModel.populateHomePageCells( - studentLifeRf2, + studentLife, isLoggedIn, bearerToken, deviceID @@ -175,7 +175,7 @@ class HomeFragment : Fragment() { } else { // otherwise, call updateHomePageCells which only updates the cells that are changed val updatedIndices = homepageViewModel.updateHomePageCells( - studentLifeRf2, + studentLife, isLoggedIn, bearerToken, deviceID, diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/laundry/LaundryViewModel.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/laundry/LaundryViewModel.kt index 840ba0d10..be84d8bb5 100644 --- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/laundry/LaundryViewModel.kt +++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/laundry/LaundryViewModel.kt @@ -1,6 +1,6 @@ package com.pennapps.labs.pennmobile.laundry -import StudentLifeRf2 +import StudentLife import android.util.Log import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData @@ -60,7 +60,7 @@ class LaundryViewModel : ViewModel() { private suspend fun populateFavorites( context: CoroutineContext, - studentLife: StudentLifeRf2, + studentLife: StudentLife, favoriteIdList: List, ) { val rooms = ArrayList() @@ -120,7 +120,7 @@ class LaundryViewModel : ViewModel() { } fun getFavorites( - studentLife: StudentLifeRf2, + studentLife: StudentLife, bearerToken: String, ) { CoroutineScope(Dispatchers.IO).launch { @@ -142,7 +142,7 @@ class LaundryViewModel : ViewModel() { } } - fun getHalls(studentLife: StudentLifeRf2) { + fun getHalls(studentLife: StudentLife) { if (_loadedRooms.value!!) { return } @@ -220,7 +220,7 @@ class LaundryViewModel : ViewModel() { } private suspend fun sendPreferences( - studentLife: StudentLifeRf2, + studentLife: StudentLife, bearerToken: String, favoriteIdList: List, ) { @@ -238,7 +238,7 @@ class LaundryViewModel : ViewModel() { } fun setFavoritesFromToggled( - studentLife: StudentLifeRf2, + studentLife: StudentLife, bearerToken: String, ) { CoroutineScope(Dispatchers.IO).launch { diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/laundry/adapters/LaundryRoomAdapter.java b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/laundry/adapters/LaundryRoomAdapter.java index 7679fd4d2..f50c33813 100644 --- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/laundry/adapters/LaundryRoomAdapter.java +++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/laundry/adapters/LaundryRoomAdapter.java @@ -249,7 +249,6 @@ public CustomViewHolder(View view, Context context, ArrayList rooms params.setMargins(0,0,0,0); container.setLayoutParams(params); } - washerRecyclerView.setHasFixedSize(true); dryerRecyclerView.setHasFixedSize(true); } diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/laundry/fragments/LaundryFragment.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/laundry/fragments/LaundryFragment.kt index 74b2d5e01..03c2bd55b 100644 --- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/laundry/fragments/LaundryFragment.kt +++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/laundry/fragments/LaundryFragment.kt @@ -1,6 +1,6 @@ package com.pennapps.labs.pennmobile.laundry.fragments -import StudentLifeRf2 +import StudentLife import android.content.Context import android.content.SharedPreferences import android.os.Bundle @@ -28,7 +28,7 @@ import com.pennapps.labs.pennmobile.utils.Utils class LaundryFragment : Fragment() { private lateinit var mActivity: MainActivity - private lateinit var mStudentLife: StudentLifeRf2 + private lateinit var mStudentLife: StudentLife private lateinit var mContext: Context private lateinit var sharedPreferences: SharedPreferences @@ -49,7 +49,7 @@ class LaundryFragment : Fragment() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - mStudentLife = MainActivity.studentLifeInstanceRf2 + mStudentLife = MainActivity.studentLifeInstance mActivity = activity as MainActivity mContext = mActivity sharedPreferences = PreferenceManager.getDefaultSharedPreferences(mActivity) diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/laundry/fragments/LaundrySettingsFragment.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/laundry/fragments/LaundrySettingsFragment.kt index 0f345d568..be1d163b5 100644 --- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/laundry/fragments/LaundrySettingsFragment.kt +++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/laundry/fragments/LaundrySettingsFragment.kt @@ -1,6 +1,6 @@ package com.pennapps.labs.pennmobile.laundry.fragments -import StudentLifeRf2 +import StudentLife import android.content.Context import android.content.SharedPreferences import android.os.Bundle @@ -20,7 +20,7 @@ import com.pennapps.labs.pennmobile.laundry.adapters.LaundrySettingsAdapter class LaundrySettingsFragment : Fragment() { private lateinit var mActivity: MainActivity - private lateinit var mStudentLife: StudentLifeRf2 + private lateinit var mStudentLife: StudentLife private lateinit var mContext: Context private lateinit var toolbar: Toolbar @@ -32,7 +32,7 @@ class LaundrySettingsFragment : Fragment() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - mStudentLife = MainActivity.studentLifeInstanceRf2 + mStudentLife = MainActivity.studentLifeInstance mActivity = activity as MainActivity sharedPreferences = PreferenceManager.getDefaultSharedPreferences(mActivity) diff --git a/PennMobile/src/main/res/layout/fragment_laundry.xml b/PennMobile/src/main/res/layout/fragment_laundry.xml index 2650bbe13..b4009f8e6 100644 --- a/PennMobile/src/main/res/layout/fragment_laundry.xml +++ b/PennMobile/src/main/res/layout/fragment_laundry.xml @@ -101,7 +101,7 @@ + android:layout_height="match_parent">