fixed bugs with profile UI and taskbar UI shrinking

app/build.gradle

@@ -24,8 +24,8 @@ android {
         applicationId "org.hackillinois.android"
         minSdkVersion 23
         targetSdkVersion 34
-        versionCode 65
-        versionName "2024.11.1"
+        versionCode 66
+        versionName "2025.01.1"
         multiDexEnabled true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true

app/src/main/java/org/hackillinois/android/view/home/EventProgressManager.kt

@@ -52,7 +52,7 @@ class EventProgressManager(val listener: CountDownListener) {
     }
 
     private var times = listOf(checkInTime, scavengerHuntTime, openingCeremonyTime, hackingTime, projectShowcaseTime, closingCeremonyTime, afterHackathonTime)
-    private var backgrounds = listOf(R.drawable.home_background1_svg, R.drawable.home_background2_svg, R.drawable.home_background3_svg, R.drawable.home_background3_svg, R.drawable.home_background4_svg, R.drawable.home_background5_svg, R.drawable.home_background6_svg, R.drawable.home_background6_svg)
+    private var backgrounds = listOf(R.drawable.home_stage1, R.drawable.home_stage2, R.drawable.home_stage3, R.drawable.home_stage3, R.drawable.home_stage4, R.drawable.home_stage5, R.drawable.home_stage6, R.drawable.home_stage7)
     private var timer: CountDownTimer? = null
     private var state = 0
 

app/src/main/java/org/hackillinois/android/view/profile/ProfileFragment.kt

@@ -155,7 +155,7 @@ class ProfileFragment : Fragment() {
     }
 
     private fun updateProTag() {
-        attendeeTypeText.text = if (pro) "Knight" else "General"
+        attendeeTypeText.text = if (pro) "Olympian" else "General"
     }
     private fun updateQrView(qr: QR?) = qr?.let { it ->
         if (qrCodeImage.width > 0 && qrCodeImage.height > 0) {

app/src/main/java/org/hackillinois/android/view/scanner/ScannerFragment.kt

@@ -138,7 +138,7 @@ class ScannerFragment : Fragment(), SimpleScanDialogFragment.OnSimpleOKButtonSel
                             }
                             "point-shop" -> {
                                 Log.d("Shop Raw Text: ", "" + it.text)
-                                val QRCode: String = it.text
+                                val QRCode: String = extractUserToken(it.text)
                                 Log.d("Point Text: ", QRCode)
                                 viewModel.redeemAttendeeCart(QRCode(QRCode))
                             }

app/src/main/java/org/hackillinois/android/view/shop/RedeemFragment.kt

@@ -51,6 +51,8 @@ class RedeemFragment : Fragment() {
             }
         )
 
+        Toast.makeText(requireContext(), "Go to the Point Shop front desk to redeem!", Toast.LENGTH_LONG).show()
+
         redeemViewModel.errorLiveData.observe(viewLifecycleOwner) { errorMessage ->
             Toast.makeText(requireContext(), errorMessage, Toast.LENGTH_SHORT).show()
         }
@@ -77,7 +79,7 @@ class RedeemFragment : Fragment() {
 
         try {
             val bitMatrix = multiFormatWriter.encode(text, BarcodeFormat.QR_CODE, width, height, hints)
-            val clear = Color.TRANSPARENT
+            val clear = Color.WHITE
             val solid = Color.BLACK
             for (x in 0 until width) {
                 for (y in 0 until height) {

app/src/main/java/org/hackillinois/android/view/shop/ShopFragment.kt

@@ -287,7 +287,7 @@ class ShopFragment : Fragment(), ShopAdapter.OnBuyItemListener {
 
     private fun updateCoinTotalUI(newProfile: Profile?) {
         if (newProfile != null) {
-            number_of_coins_textview.text = String.format("%,d", newProfile.pointsAccumulated)
+            number_of_coins_textview.text = String.format("%,d", newProfile.points)
         }
     }
 

app/src/main/java/org/hackillinois/android/viewmodel/RedeemViewModel.kt

@@ -27,8 +27,8 @@ class RedeemViewModel : ViewModel() {
         viewModelScope.launch(Dispatchers.IO) {
             try {
                 val response: QRResponse = App.getAPI().getCartQRCode()
-                val extractedQRCode = extractQRString(response.QRCode)
-                _qrCodeLiveData.postValue(extractedQRCode)
+//                val extractedQRCode = extractQRString(response.QRCode)
+                _qrCodeLiveData.postValue(response.QRCode)
             } catch (e: HttpException) {
                 val errorMessage = extractErrorMessage(e.response()?.errorBody())
                 _errorLiveData.postValue("Error: $errorMessage")

app/src/main/java/org/hackillinois/android/viewmodel/ScheduleViewModel.kt

@@ -21,19 +21,19 @@ class ScheduleViewModel : ViewModel() {
     // 2/28/25 23:59:59
     val fridayEnd = Calendar.getInstance().apply {
         timeZone = TimeZone.getTimeZone("America/Chicago")
-        timeInMillis = 1740808799000
+        timeInMillis = 1740812400000
     }.timeInMillis
 
-    // 2/29/25 23:59:59
+    // 3/1/25 23:59:59
     val saturdayEnd = Calendar.getInstance().apply {
         timeZone = TimeZone.getTimeZone("America/Chicago")
         timeInMillis = 1740895199000
     }.timeInMillis
 
-    // 2/30/25 23:59:59
+    // 3/2/25 23:59:59
     val sundayEnd = Calendar.getInstance().apply {
         timeZone = TimeZone.getTimeZone("America/Chicago")
-        timeInMillis = 1740895199000
+        timeInMillis = 1740981599000
     }.timeInMillis
 
     var fridayEventsLiveData = eventRepository.fetchEventsHappeningBetweenTimes(fridayStart, fridayEnd)

app/src/main/res/layout/activity_main.xml

@@ -2,7 +2,6 @@
 <androidx.coordinatorlayout.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:paddingBottom="16dp">
@@ -31,7 +30,7 @@
             android:layout_height="match_parent"
             android:paddingTop="8dp">
 
-            <!-- Guideline to position icons higher -->
+            <!-- Guideline to position icons slightly higher -->
             <androidx.constraintlayout.widget.Guideline
                 android:id="@+id/guidelineIcons"
                 android:layout_width="wrap_content"
@@ -43,30 +42,33 @@
             <androidx.appcompat.widget.AppCompatImageButton
                 android:id="@+id/homeButton"
                 android:layout_width="40dp"
-                android:layout_height="40dp"
+                android:layout_height="wrap_content"
+                android:minHeight="40dp"
+                android:paddingTop="8dp"
+                android:paddingBottom="8dp"
                 android:layout_marginBottom="5dp"
                 android:background="@color/cream"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toStartOf="@+id/scheduleButton"
-                app:layout_constraintHorizontal_chainStyle="spread"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/guidelineIcons"
-                app:maxImageSize="24dp"
                 app:srcCompat="@drawable/battle_png"
                 app:tint="@color/black" />
 
             <!-- Schedule Button -->
             <androidx.appcompat.widget.AppCompatImageButton
                 android:id="@+id/scheduleButton"
                 android:layout_width="40dp"
-                android:layout_height="40dp"
+                android:layout_height="wrap_content"
+                android:minHeight="40dp"
+                android:paddingTop="8dp"
+                android:paddingBottom="8dp"
                 android:layout_marginBottom="5dp"
                 android:background="@color/cream"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toStartOf="@+id/placeholder"
                 app:layout_constraintStart_toEndOf="@+id/homeButton"
                 app:layout_constraintTop_toBottomOf="@id/guidelineIcons"
-                app:maxImageSize="24dp"
                 app:srcCompat="@drawable/schedule_png" />
 
             <!-- Invisible Spacer for FAB notch -->
@@ -84,29 +86,33 @@
             <androidx.appcompat.widget.AppCompatImageButton
                 android:id="@+id/shopButton"
                 android:layout_width="40dp"
-                android:layout_height="40dp"
+                android:layout_height="wrap_content"
+                android:minHeight="40dp"
+                android:paddingTop="8dp"
+                android:paddingBottom="8dp"
                 android:layout_marginBottom="5dp"
                 android:background="@color/cream"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toStartOf="@+id/profileButton"
                 app:layout_constraintStart_toEndOf="@+id/placeholder"
                 app:layout_constraintTop_toBottomOf="@id/guidelineIcons"
-                app:maxImageSize="24dp"
                 app:srcCompat="@drawable/shop_png" />
 
             <!-- Profile Button -->
             <androidx.appcompat.widget.AppCompatImageButton
                 android:id="@+id/profileButton"
                 android:layout_width="40dp"
-                android:layout_height="40dp"
+                android:layout_height="wrap_content"
+                android:minHeight="40dp"
+                android:paddingTop="8dp"
+                android:paddingBottom="8dp"
                 android:layout_marginEnd="16dp"
                 android:layout_marginBottom="5dp"
                 android:background="@color/cream"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toEndOf="@+id/shopButton"
                 app:layout_constraintTop_toBottomOf="@id/guidelineIcons"
-                app:maxImageSize="24dp"
                 app:srcCompat="@drawable/profile_png" />
 
         </androidx.constraintlayout.widget.ConstraintLayout>
@@ -119,12 +125,11 @@
         android:layout_width="60dp"
         android:layout_height="60dp"
         app:layout_anchor="@id/bottomAppBar"
-        app:layout_anchorGravity="center"
+        app:layout_anchorGravity="bottom|center"
         app:backgroundTint="@color/cream"
         android:layout_marginBottom="15dp"
         android:layout_marginTop="20dp"
         app:fabCustomSize="60dp"
-        app:maxImageSize="30dp"
         app:srcCompat="@drawable/camera_png" />
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>

app/src/main/res/layout/fragment_home_2025.xml

@@ -39,7 +39,7 @@
             android:layout_marginTop="0dp"
             android:adjustViewBounds="false"
             android:scaleType="fitXY"
-            android:src="@drawable/home_background1_svg" />
+            android:src="@drawable/home_stage1" />
 
         <ImageView
             android:id="@+id/homeBackgroundTagsImageView"

app/src/main/res/layout/fragment_point_shop_redeem.xml

@@ -49,6 +49,22 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5" />
 
+    <TextView
+        android:id="@+id/pointShopHelpDesk_textview"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:fontFamily="@font/montserrat_bold"
+        android:gravity="center"
+        android:text="Go to the Point Shop front desk to redeem!"
+        android:textColor="@color/black"
+        android:textSize="24sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.504"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.895" />
+
     <ImageView
         android:id="@+id/qr_code_placeholder"
         android:layout_width="243dp"

app/src/main/res/layout/fragment_profile.xml

@@ -28,6 +28,13 @@
         android:orientation="horizontal"
         app:layout_constraintGuide_percent="0.85" />
 
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/partitionGuideline"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        app:layout_constraintGuide_percent="0.70" />
+
     <ImageView
         android:id="@+id/profileBackground"
         android:layout_width="0dp"
@@ -73,7 +80,7 @@
         android:layout_width="350dp"
         android:layout_height="410dp"
         android:layout_marginHorizontal="26dp"
-        app:layout_constraintBottom_toBottomOf="@id/guidelineBottom"
+        app:layout_constraintBottom_toTopOf="@id/partitionGuideline"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.403"
         app:layout_constraintStart_toStartOf="parent"
@@ -170,6 +177,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.495"
         app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
         android:layout_marginTop="-10dp"
         app:layout_constraintTop_toBottomOf="@id/blueStand">
 
@@ -267,13 +275,15 @@
         <ImageView
             android:id="@+id/greekDesign"
             android:layout_width="match_parent"
-            android:layout_height="184dp"
+            android:layout_height="match_parent"
             android:elevation="5dp"
             android:scaleType="fitXY"
             android:src="@drawable/greek_squares"
-            android:paddingBottom="18dp"
+            android:layout_gravity="bottom|center"
+            android:paddingBottom="0dp"
             app:layout_constraintTop_toTopOf="@id/rankSection"
             app:layout_constraintBottom_toBottomOf="@id/rankSection"
+            app:layout_constraintTop_toBottomOf="@id/partitionGuideline"
             app:layout_constraintEnd_toEndOf="parent" />
 
     </FrameLayout>