Merge branch 'main' into test-scanning-n-joining

CMPUT301F24cooked0 · Dec 2, 2024 · e7a6a64 · e7a6a64
2 parents 26fe93b + 6bad38a
commit e7a6a64
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 23 deletions.
diff --git a/src/app/src/main/AndroidManifest.xml b/src/app/src/main/AndroidManifest.xml
@@ -14,7 +14,7 @@
         android:theme="@style/Theme.MyApplication."
         tools:targetApi="31">
         <activity
-            android:name=".EditProfileActivity"
+            android:name=".ui.profile.EditProfileActivity"
             android:exported="false" />
 
         <activity

diff --git a/src/app/src/main/java/com/example/myapplication/ui/facility/WaitingListFragment.java b/src/app/src/main/java/com/example/myapplication/ui/facility/WaitingListFragment.java
@@ -40,8 +40,8 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
         recyclerView = view.findViewById(R.id.recyclerView);
         recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
 
-        // Initialize Mock EntrantPool with mock data
-        entrantPool = new MockEntrantPool();
+
+        entrantPool = new EntrantPool();
         ArrayList<User> waitingListUsers = entrantPool.getEntrants();
 
         // Set up Adapter for RecyclerView

diff --git a/...le/myapplication/EditProfileActivity.java → ...ation/ui/profile/EditProfileActivity.java b/...le/myapplication/EditProfileActivity.java → ...ation/ui/profile/EditProfileActivity.java
@@ -1,16 +1,11 @@
-package com.example.myapplication;
+package com.example.myapplication.ui.profile;
 
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.Paint;
-import android.graphics.Rect;
 import android.net.Uri;
 import android.os.Bundle;
 import android.provider.Settings;
-import android.util.Base64;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ImageView;
@@ -24,7 +19,12 @@
 import androidx.core.view.ViewCompat;
 import androidx.core.view.WindowInsetsCompat;
 
-import java.io.ByteArrayOutputStream;
+import com.example.myapplication.DatabaseManager;
+import com.example.myapplication.MainActivity;
+import com.example.myapplication.OnUserFetchListener;
+import com.example.myapplication.ProfilePictureGenerator;
+import com.example.myapplication.R;
+import com.example.myapplication.User;
 
 /**
  * This class is used currently as an Activity for the User to edit details of their profile.

diff --git a/src/app/src/main/java/com/example/myapplication/ui/profile/ProfileFragment.java b/src/app/src/main/java/com/example/myapplication/ui/profile/ProfileFragment.java
@@ -1,29 +1,17 @@
 package com.example.myapplication.ui.profile;
 
 import android.content.Intent;
-import android.content.SharedPreferences;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
 import android.os.Bundle;
-import android.util.Base64;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.ImageButton;
-import android.widget.ImageView;
-import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.ViewModelProvider;
 
 import com.example.myapplication.AdminHomePage;
-import com.example.myapplication.EditProfileActivity;
-import com.example.myapplication.MainActivity;
-import com.example.myapplication.R;
-import com.example.myapplication.User;
 import com.example.myapplication.databinding.ProfileScreenFragmentBinding;
 
 public class ProfileFragment extends Fragment {

diff --git a/src/app/src/main/res/layout/activity_edit_profile.xml b/src/app/src/main/res/layout/activity_edit_profile.xml
@@ -8,7 +8,7 @@
     android:gravity="center_horizontal"
     android:id="@+id/main"
     android:padding="15dp"
-    tools:context=".EditProfileActivity">
+    tools:context=".ui.profile.EditProfileActivity">
 
     <TextView
         android:layout_width="wrap_content"