Reorganized Kotlin Files into folders

PennMobile/build 2/intermediates/bundle_manifest/debug/bundle-manifest/AndroidManifest.xml

@@ -64,7 +64,7 @@
             android:resource="@array/preloaded_fonts" />
 
         <receiver
-            android:name="com.pennapps.labs.pennmobile.LaundryBroadcastReceiver"
+            android:name="com.pennapps.labs.pennmobile.laundry.LaundryBroadcastReceiver"
             android:enabled="true"
             android:exported="true" /> <!-- receiver for laundry -->
         <uses-library

PennMobile/build 2/intermediates/instant_app_manifest/debug/AndroidManifest.xml

@@ -65,7 +65,7 @@
             android:resource="@array/preloaded_fonts" />
 
         <receiver
-            android:name="com.pennapps.labs.pennmobile.LaundryBroadcastReceiver"
+            android:name="com.pennapps.labs.pennmobile.laundry.LaundryBroadcastReceiver"
             android:enabled="true"
             android:exported="true" /> <!-- receiver for laundry -->
         <uses-library

PennMobile/build 2/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt

@@ -125,7 +125,7 @@
 65
 66        <receiver
 66-->/Users/lumumba/Desktop/penn-mobile-android/PennMobile/src/main/AndroidManifest.xml:39:7-42:39
-67            android:name="com.pennapps.labs.pennmobile.LaundryBroadcastReceiver"
+67            android:name="com.pennapps.labs.pennmobile.laundry.LaundryBroadcastReceiver"
 67-->/Users/lumumba/Desktop/penn-mobile-android/PennMobile/src/main/AndroidManifest.xml:40:13-53
 68            android:enabled="true"
 68-->/Users/lumumba/Desktop/penn-mobile-android/PennMobile/src/main/AndroidManifest.xml:41:13-35

PennMobile/build 2/intermediates/merged_manifests/debug/AndroidManifest.xml

@@ -64,7 +64,7 @@
             android:resource="@array/preloaded_fonts" />
 
         <receiver
-            android:name="com.pennapps.labs.pennmobile.LaundryBroadcastReceiver"
+            android:name="com.pennapps.labs.pennmobile.laundry.LaundryBroadcastReceiver"
             android:enabled="true"
             android:exported="true" /> <!-- receiver for laundry -->
         <uses-library

PennMobile/src/main/AndroidManifest.xml

@@ -28,7 +28,7 @@
         android:usesCleartextTraffic="true"
         tools:targetApi="m">
         <receiver
-            android:name="com.pennapps.labs.pennmobile.DiningHallWidget"
+            android:name="com.pennapps.labs.pennmobile.dining.widget.DiningHallWidget"
             android:exported="false">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
@@ -53,7 +53,7 @@
                 <action android:name="android.intent.action.VIEW" />
             </intent-filter>
         </activity>
-        <service android:name=".adapters.DiningHallWidgetAdapter"
+        <service android:name=".dining.widget.DiningHallWidgetAdapter"
             android:permission="android.permission.BIND_REMOTEVIEWS" />
 
         <meta-data
@@ -67,7 +67,7 @@
             android:resource="@array/preloaded_fonts" />
 
         <receiver
-            android:name=".LaundryBroadcastReceiver"
+            android:name=".laundry.LaundryBroadcastReceiver"
             android:enabled="true"
             android:exported="true" /> <!-- receiver for laundry -->
         <uses-library

PennMobile/src/main/java/com/pennapps/labs/pennmobile/MainActivity.kt

@@ -34,23 +34,24 @@ import com.google.android.material.tabs.TabLayout
 import com.google.firebase.analytics.FirebaseAnalytics
 import com.google.gson.GsonBuilder
 import com.google.gson.reflect.TypeToken
-import com.pennapps.labs.pennmobile.adapters.MainPagerAdapter
 import com.pennapps.labs.pennmobile.api.CampusExpress
 import com.pennapps.labs.pennmobile.api.OAuth2NetworkManager
 import com.pennapps.labs.pennmobile.api.Platform
 import com.pennapps.labs.pennmobile.api.Serializer
 import com.pennapps.labs.pennmobile.api.StudentLife
-import com.pennapps.labs.pennmobile.classes.Account
-import com.pennapps.labs.pennmobile.classes.Contact
-import com.pennapps.labs.pennmobile.classes.DiningHall
-import com.pennapps.labs.pennmobile.classes.FlingEvent
-import com.pennapps.labs.pennmobile.classes.GSRLocation
-import com.pennapps.labs.pennmobile.classes.GSRReservation
-import com.pennapps.labs.pennmobile.classes.LaundryRoom
-import com.pennapps.labs.pennmobile.classes.Post
-import com.pennapps.labs.pennmobile.classes.Venue
+import com.pennapps.labs.pennmobile.api.classes.Account
+import com.pennapps.labs.pennmobile.api.fragments.LoginFragment
 import com.pennapps.labs.pennmobile.components.sneaker.Sneaker
 import com.pennapps.labs.pennmobile.databinding.ActivityMainBinding
+import com.pennapps.labs.pennmobile.dining.classes.DiningHall
+import com.pennapps.labs.pennmobile.dining.classes.Venue
+import com.pennapps.labs.pennmobile.fling.classes.FlingEvent
+import com.pennapps.labs.pennmobile.gsr.classes.GSRLocation
+import com.pennapps.labs.pennmobile.gsr.classes.GSRReservation
+import com.pennapps.labs.pennmobile.home.classes.Post
+import com.pennapps.labs.pennmobile.laundry.classes.LaundryRoom
+import com.pennapps.labs.pennmobile.more.classes.Contact
+import com.pennapps.labs.pennmobile.more.fragments.SaveContactsFragment
 import com.pennapps.labs.pennmobile.utils.Utils
 import eightbitlab.com.blurview.BlurView
 import kotlinx.coroutines.sync.Mutex

PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/MainPagerAdapter.kt → PennMobile/src/main/java/com/pennapps/labs/pennmobile/MainPagerAdapter.kt

@@ -1,14 +1,14 @@
-package com.pennapps.labs.pennmobile.adapters
+package com.pennapps.labs.pennmobile
 
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
 import androidx.lifecycle.Lifecycle
 import androidx.viewpager2.adapter.FragmentStateAdapter
-import com.pennapps.labs.pennmobile.DiningHolderFragment
-import com.pennapps.labs.pennmobile.GsrTabbedFragment
-import com.pennapps.labs.pennmobile.HomeFragment
-import com.pennapps.labs.pennmobile.LaundryFragment
-import com.pennapps.labs.pennmobile.morefragments.MoreFragment
+import com.pennapps.labs.pennmobile.dining.fragments.DiningHolderFragment
+import com.pennapps.labs.pennmobile.gsr.fragments.GsrTabbedFragment
+import com.pennapps.labs.pennmobile.home.fragments.HomeFragment
+import com.pennapps.labs.pennmobile.laundry.fragments.LaundryFragment
+import com.pennapps.labs.pennmobile.more.fragments.MoreFragment
 
 class MainPagerAdapter(
     fragmentManager: FragmentManager,

PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/CampusExpress.kt

@@ -1,8 +1,8 @@
 package com.pennapps.labs.pennmobile.api
 
-import com.pennapps.labs.pennmobile.classes.CampusExpressAccessTokenResponse
-import com.pennapps.labs.pennmobile.classes.DiningBalances
-import com.pennapps.labs.pennmobile.classes.DiningBalancesList
+import com.pennapps.labs.pennmobile.api.classes.CampusExpressAccessTokenResponse
+import com.pennapps.labs.pennmobile.dining.classes.DiningBalances
+import com.pennapps.labs.pennmobile.dining.classes.DiningBalancesList
 import retrofit.Callback
 import retrofit.http.GET
 import retrofit.http.Header

PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/DiningRequest.java

@@ -1,6 +1,6 @@
 package com.pennapps.labs.pennmobile.api;
 
-import com.pennapps.labs.pennmobile.classes.Venue;
+import com.pennapps.labs.pennmobile.dining.classes.Venue;
 
 import java.util.List;
 

PennMobile/src/main/java/com/pennapps/labs/pennmobile/HuntsmanGSRLogin.kt → PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/HuntsmanGSRLogin.kt

@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile
+package com.pennapps.labs.pennmobile.api
 
 import android.os.Bundle
 import android.util.Log
@@ -12,9 +12,11 @@ import android.widget.Toast
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentTransaction
 import androidx.preference.PreferenceManager
-import com.pennapps.labs.pennmobile.api.StudentLife
-import com.pennapps.labs.pennmobile.classes.GSRBookingResult
+import com.pennapps.labs.pennmobile.MainActivity
+import com.pennapps.labs.pennmobile.R
 import com.pennapps.labs.pennmobile.databinding.FragmentHuntsmanGsrloginBinding
+import com.pennapps.labs.pennmobile.gsr.classes.GSRBookingResult
+import com.pennapps.labs.pennmobile.gsr.fragments.GsrTabbedFragment
 import retrofit.Callback
 import retrofit.RetrofitError
 import retrofit.client.Response

PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/OAuth2NetworkManager.kt

@@ -8,7 +8,7 @@ import com.google.firebase.crashlytics.FirebaseCrashlytics
 import com.pennapps.labs.pennmobile.BuildConfig
 import com.pennapps.labs.pennmobile.MainActivity
 import com.pennapps.labs.pennmobile.R
-import com.pennapps.labs.pennmobile.classes.AccessTokenResponse
+import com.pennapps.labs.pennmobile.api.classes.AccessTokenResponse
 import kotlinx.coroutines.launch
 import retrofit.Callback
 import retrofit.RetrofitError

PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/PennCourseAlertApiService.kt

@@ -1,12 +1,12 @@
 package com.pennapps.labs.pennmobile.api
 
-import com.pennapps.labs.pennmobile.classes.Course
-import com.pennapps.labs.pennmobile.classes.PCARegistrationBody
-import com.pennapps.labs.pennmobile.classes.PennCourseAlertRegistration
-import com.pennapps.labs.pennmobile.classes.PennCourseAlertUpdateBody
-import com.pennapps.labs.pennmobile.classes.Profile
-import com.pennapps.labs.pennmobile.classes.Section
-import com.pennapps.labs.pennmobile.classes.UserInfo
+import com.pennapps.labs.pennmobile.coursealert.classes.Course
+import com.pennapps.labs.pennmobile.coursealert.classes.PCARegistrationBody
+import com.pennapps.labs.pennmobile.coursealert.classes.PennCourseAlertRegistration
+import com.pennapps.labs.pennmobile.coursealert.classes.PennCourseAlertUpdateBody
+import com.pennapps.labs.pennmobile.coursealert.classes.Profile
+import com.pennapps.labs.pennmobile.coursealert.classes.Section
+import com.pennapps.labs.pennmobile.coursealert.classes.UserInfo
 import okhttp3.OkHttpClient
 import retrofit2.Call
 import retrofit2.Retrofit

PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/Platform.java

@@ -1,7 +1,6 @@
 package com.pennapps.labs.pennmobile.api;
 
-import com.pennapps.labs.pennmobile.classes.AccessTokenResponse;
-import com.pennapps.labs.pennmobile.classes.GetUserResponse;
+import com.pennapps.labs.pennmobile.api.classes.GetUserResponse;
 
 import retrofit.Callback;
 import retrofit.http.Field;

PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/Serializer.java

@@ -8,15 +8,15 @@
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
 import com.google.gson.reflect.TypeToken;
-import com.pennapps.labs.pennmobile.classes.Account;
-import com.pennapps.labs.pennmobile.classes.DiningHall;
-import com.pennapps.labs.pennmobile.classes.FlingEvent;
-import com.pennapps.labs.pennmobile.classes.GSRLocation;
-import com.pennapps.labs.pennmobile.classes.GSRReservation;
-import com.pennapps.labs.pennmobile.classes.LaundryRoom;
-import com.pennapps.labs.pennmobile.classes.Post;
-import com.pennapps.labs.pennmobile.classes.Venue;
-import com.pennapps.labs.pennmobile.classes.VenueInterval;
+import com.pennapps.labs.pennmobile.api.classes.Account;
+import com.pennapps.labs.pennmobile.dining.classes.DiningHall;
+import com.pennapps.labs.pennmobile.fling.classes.FlingEvent;
+import com.pennapps.labs.pennmobile.gsr.classes.GSRLocation;
+import com.pennapps.labs.pennmobile.gsr.classes.GSRReservation;
+import com.pennapps.labs.pennmobile.laundry.classes.LaundryRoom;
+import com.pennapps.labs.pennmobile.home.classes.Post;
+import com.pennapps.labs.pennmobile.dining.classes.Venue;
+import com.pennapps.labs.pennmobile.dining.classes.VenueInterval;
 
 import java.lang.reflect.Type;
 import java.text.Format;

PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/StudentLife.java

@@ -1,26 +1,26 @@
 package com.pennapps.labs.pennmobile.api;
 
-import com.pennapps.labs.pennmobile.classes.AccessTokenResponse;
-import com.pennapps.labs.pennmobile.classes.Account;
-import com.pennapps.labs.pennmobile.classes.Article;
-import com.pennapps.labs.pennmobile.classes.CalendarEvent;
-import com.pennapps.labs.pennmobile.classes.DiningHall;
-import com.pennapps.labs.pennmobile.classes.DiningPreferences;
-import com.pennapps.labs.pennmobile.classes.DiningRequest;
-import com.pennapps.labs.pennmobile.classes.FitnessRequest;
-import com.pennapps.labs.pennmobile.classes.FitnessRoom;
-import com.pennapps.labs.pennmobile.classes.FitnessRoomUsage;
-import com.pennapps.labs.pennmobile.classes.FlingEvent;
-import com.pennapps.labs.pennmobile.classes.GSR;
-import com.pennapps.labs.pennmobile.classes.GSRBookingResult;
-import com.pennapps.labs.pennmobile.classes.GSRLocation;
-import com.pennapps.labs.pennmobile.classes.GSRReservation;
-import com.pennapps.labs.pennmobile.classes.LaundryRoom;
-import com.pennapps.labs.pennmobile.classes.Poll;
-import com.pennapps.labs.pennmobile.classes.Post;
-import com.pennapps.labs.pennmobile.classes.SaveAccountResponse;
-import com.pennapps.labs.pennmobile.classes.Venue;
-import com.pennapps.labs.pennmobile.classes.WhartonStatus;
+import com.pennapps.labs.pennmobile.api.classes.AccessTokenResponse;
+import com.pennapps.labs.pennmobile.api.classes.Account;
+import com.pennapps.labs.pennmobile.home.classes.Article;
+import com.pennapps.labs.pennmobile.home.classes.CalendarEvent;
+import com.pennapps.labs.pennmobile.dining.classes.DiningHall;
+import com.pennapps.labs.pennmobile.dining.classes.DiningPreferences;
+import com.pennapps.labs.pennmobile.dining.classes.DiningRequest;
+import com.pennapps.labs.pennmobile.fitness.classes.FitnessRequest;
+import com.pennapps.labs.pennmobile.fitness.classes.FitnessRoom;
+import com.pennapps.labs.pennmobile.fitness.classes.FitnessRoomUsage;
+import com.pennapps.labs.pennmobile.fling.classes.FlingEvent;
+import com.pennapps.labs.pennmobile.gsr.classes.GSR;
+import com.pennapps.labs.pennmobile.gsr.classes.GSRBookingResult;
+import com.pennapps.labs.pennmobile.gsr.classes.GSRLocation;
+import com.pennapps.labs.pennmobile.gsr.classes.GSRReservation;
+import com.pennapps.labs.pennmobile.laundry.classes.LaundryRoom;
+import com.pennapps.labs.pennmobile.home.classes.Poll;
+import com.pennapps.labs.pennmobile.home.classes.Post;
+import com.pennapps.labs.pennmobile.api.classes.SaveAccountResponse;
+import com.pennapps.labs.pennmobile.dining.classes.Venue;
+import com.pennapps.labs.pennmobile.gsr.classes.WhartonStatus;
 
 import java.util.ArrayList;
 import java.util.List;

PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/StudentLifeRf2.kt

@@ -1,8 +1,8 @@
-import com.pennapps.labs.pennmobile.classes.LaundryPreferences
-import com.pennapps.labs.pennmobile.classes.LaundryRequest
-import com.pennapps.labs.pennmobile.classes.LaundryRoom
-import com.pennapps.labs.pennmobile.classes.LaundryRoomSimple
-import com.pennapps.labs.pennmobile.classes.LaundryUsage
+import com.pennapps.labs.pennmobile.laundry.classes.LaundryPreferences
+import com.pennapps.labs.pennmobile.laundry.classes.LaundryRequest
+import com.pennapps.labs.pennmobile.laundry.classes.LaundryRoom
+import com.pennapps.labs.pennmobile.laundry.classes.LaundryRoomSimple
+import com.pennapps.labs.pennmobile.laundry.classes.LaundryUsage
 import okhttp3.ResponseBody
 import retrofit2.Response
 import retrofit2.http.Body

PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/AccessTokenResponse.kt → PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/classes/AccessTokenResponse.kt

@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.classes
+package com.pennapps.labs.pennmobile.api.classes
 
 import com.google.gson.annotations.Expose
 import com.google.gson.annotations.SerializedName

PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/Account.kt → PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/classes/Account.kt

@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.classes
+package com.pennapps.labs.pennmobile.api.classes
 
 class Account(
     firstName: String?,

PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/CampusExpressAccessTokenResponse.kt → PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/classes/CampusExpressAccessTokenResponse.kt

@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.classes
+package com.pennapps.labs.pennmobile.api.classes
 
 import com.google.gson.annotations.Expose
 import com.google.gson.annotations.SerializedName

PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/GetUserResponse.kt → PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/classes/GetUserResponse.kt

@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.classes
+package com.pennapps.labs.pennmobile.api.classes
 
 import com.google.gson.annotations.Expose
 import com.google.gson.annotations.SerializedName

PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/OAuthUser.kt → PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/classes/OAuthUser.kt

@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.classes
+package com.pennapps.labs.pennmobile.api.classes
 
 import com.google.gson.annotations.Expose
 import com.google.gson.annotations.SerializedName

PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/SaveAccountResponse.kt → PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/classes/SaveAccountResponse.kt

@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.classes
+package com.pennapps.labs.pennmobile.api.classes
 
 import com.google.gson.annotations.Expose
 import com.google.gson.annotations.SerializedName

PennMobile/src/main/java/com/pennapps/labs/pennmobile/CampusExpressLoginFragment.kt → PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/fragments/CampusExpressLoginFragment.kt

@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile
+package com.pennapps.labs.pennmobile.api.fragments
 
 import android.content.SharedPreferences
 import android.net.Uri
@@ -17,9 +17,12 @@ import android.widget.Toast
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentTransaction
 import androidx.preference.PreferenceManager
+import com.pennapps.labs.pennmobile.MainActivity
+import com.pennapps.labs.pennmobile.R
 import com.pennapps.labs.pennmobile.api.CampusExpress
-import com.pennapps.labs.pennmobile.classes.Account
-import com.pennapps.labs.pennmobile.classes.CampusExpressAccessTokenResponse
+import com.pennapps.labs.pennmobile.api.classes.Account
+import com.pennapps.labs.pennmobile.api.classes.CampusExpressAccessTokenResponse
+import com.pennapps.labs.pennmobile.dining.fragments.DiningInsightsFragment
 import org.apache.commons.lang3.RandomStringUtils
 import retrofit.Callback
 import retrofit.RetrofitError
@@ -28,11 +31,6 @@ import java.security.MessageDigest
 import java.util.Base64
 import java.util.Date
 
-// TODO: Rename parameter arguments, choose names that match
-// the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
-private const val ARG_PARAM1 = "param1"
-private const val ARG_PARAM2 = "param2"
-
 /**
  * A simple [Fragment] subclass.
  * Use the [CampusExpressLoginFragment.newInstance] factory method to
@@ -177,7 +175,12 @@ class CampusExpressLoginFragment : Fragment() {
 
                 override fun failure(error: RetrofitError) {
                     Log.e("Campus Webview", "Error fetching access token $error")
-                    Toast.makeText(context, "Error getting campus express authorization", Toast.LENGTH_SHORT).show()
+                    Toast
+                        .makeText(
+                            context,
+                            "Error getting campus express authorization",
+                            Toast.LENGTH_SHORT,
+                        ).show()
                     goToDiningInsights(false)
                 }
             },

PennMobile/src/main/java/com/pennapps/labs/pennmobile/LoginFragment.kt → PennMobile/src/main/java/com/pennapps/labs/pennmobile/api/fragments/LoginFragment.kt

@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile
+package com.pennapps.labs.pennmobile.api.fragments
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -12,6 +12,8 @@ import com.bumptech.glide.load.DataSource
 import com.bumptech.glide.load.engine.GlideException
 import com.bumptech.glide.load.resource.gif.GifDrawable
 import com.bumptech.glide.request.RequestListener
+import com.pennapps.labs.pennmobile.MainActivity
+import com.pennapps.labs.pennmobile.R
 import com.pennapps.labs.pennmobile.databinding.FragmentLoginBinding
 
 class LoginFragment : Fragment() {