Merge pull request #563 from HackIllinois/aditya/fixes

fixed bugs with profile UI and taskbar UI shrinking

Author: AdityaK2905

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)