diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/GsrReservationsFragment.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/GsrReservationsFragment.kt
index b7ae60fe..a1bb5604 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/GsrReservationsFragment.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/GsrReservationsFragment.kt
@@ -5,7 +5,7 @@ import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
 import android.os.Bundle
-import android.preference.PreferenceManager
+import androidx.preference.PreferenceManager
 import android.util.Log
 import androidx.fragment.app.Fragment
 import androidx.localbroadcastmanager.content.LocalBroadcastManager
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/HuntsmanGSRLogin.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/HuntsmanGSRLogin.kt
index 2ac1fce0..39b9bf86 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/HuntsmanGSRLogin.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/HuntsmanGSRLogin.kt
@@ -2,7 +2,7 @@ package com.pennapps.labs.pennmobile
 
 
 import android.os.Bundle
-import android.preference.PreferenceManager
+import androidx.preference.PreferenceManager
 import android.util.Log
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentTransaction
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/LaundryFragment.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/LaundryFragment.kt
index e44bdee0..67e790d4 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/LaundryFragment.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/LaundryFragment.kt
@@ -3,7 +3,7 @@ package com.pennapps.labs.pennmobile
 import android.content.Context
 import android.content.SharedPreferences
 import android.os.Bundle
-import android.preference.PreferenceManager
+import androidx.preference.PreferenceManager
 import android.util.Log
 import android.view.*
 import androidx.coordinatorlayout.widget.CoordinatorLayout
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/GsrReservationsAdapter.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/GsrReservationsAdapter.kt
index 4767accd..49121070 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/GsrReservationsAdapter.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/GsrReservationsAdapter.kt
@@ -1,7 +1,7 @@
 package com.pennapps.labs.pennmobile.adapters
 
 import android.content.Context
-import android.preference.PreferenceManager
+import androidx.preference.PreferenceManager
 import androidx.appcompat.app.AlertDialog
 import androidx.recyclerview.widget.RecyclerView
 import android.view.LayoutInflater
@@ -22,7 +22,6 @@ import android.content.Intent
 import android.util.Log
 import androidx.localbroadcastmanager.content.LocalBroadcastManager
 import android.widget.Toast.LENGTH_SHORT
-import com.pennapps.labs.pennmobile.api.OAuth2NetworkManager
 
 
 class GsrReservationsAdapter(private var reservations: ArrayList<GSRReservation>)
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
index 2b8eb4ae..e11af8a7 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/HomeAdapter.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/HomeAdapter.kt
@@ -8,7 +8,7 @@ import android.graphics.Bitmap
 import android.graphics.drawable.BitmapDrawable
 import android.graphics.drawable.ColorDrawable
 import android.net.Uri
-import android.preference.PreferenceManager
+import androidx.preference.PreferenceManager
 import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
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
index 4dbd5d83..bf56c46d 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/LaundryRoomAdapter.java
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/LaundryRoomAdapter.java
@@ -2,7 +2,7 @@
 
 import android.content.Context;
 import android.content.SharedPreferences;
-import android.preference.PreferenceManager;
+import androidx.preference.PreferenceManager;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/LaundrySettingsAdapter.java b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/LaundrySettingsAdapter.java
index f261ddca..0635520c 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/LaundrySettingsAdapter.java
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/LaundrySettingsAdapter.java
@@ -2,7 +2,7 @@
 
 import android.content.Context;
 import android.content.SharedPreferences;
-import android.preference.PreferenceManager;
+import androidx.preference.PreferenceManager;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/CampusExpressNetworkManager.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/CampusExpressNetworkManager.kt
index f78849e0..1d0e66e4 100644
--- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/CampusExpressNetworkManager.kt
+++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/CampusExpressNetworkManager.kt
@@ -1,6 +1,6 @@
 package com.pennapps.labs.pennmobile.api
 
-import android.preference.PreferenceManager
+import androidx.preference.PreferenceManager
 import com.pennapps.labs.pennmobile.MainActivity
 import com.pennapps.labs.pennmobile.R
 import java.util.*
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 72aa78ae..c655456f 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
@@ -1,6 +1,6 @@
 package com.pennapps.labs.pennmobile.api
 
-import android.preference.PreferenceManager
+import androidx.preference.PreferenceManager
 import android.provider.Settings
 import android.util.Log
 import androidx.lifecycle.lifecycleScope