diff --git a/app/build.gradle b/app/build.gradle
index d8c7bad4..2f320be7 100644
--- a/app/build.gradle
+++ b/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
diff --git a/app/src/main/java/org/hackillinois/android/view/home/EventProgressManager.kt b/app/src/main/java/org/hackillinois/android/view/home/EventProgressManager.kt
index 36e6fb75..f502796d 100644
--- a/app/src/main/java/org/hackillinois/android/view/home/EventProgressManager.kt
+++ b/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
diff --git a/app/src/main/java/org/hackillinois/android/view/profile/ProfileFragment.kt b/app/src/main/java/org/hackillinois/android/view/profile/ProfileFragment.kt
index 9ddc4a8b..e7f7adea 100644
--- a/app/src/main/java/org/hackillinois/android/view/profile/ProfileFragment.kt
+++ b/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) {
diff --git a/app/src/main/java/org/hackillinois/android/view/scanner/ScannerFragment.kt b/app/src/main/java/org/hackillinois/android/view/scanner/ScannerFragment.kt
index e9f3cca9..4404252d 100644
--- a/app/src/main/java/org/hackillinois/android/view/scanner/ScannerFragment.kt
+++ b/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))
}
diff --git a/app/src/main/java/org/hackillinois/android/view/shop/RedeemFragment.kt b/app/src/main/java/org/hackillinois/android/view/shop/RedeemFragment.kt
index a3baa0cb..f4ccd2f8 100644
--- a/app/src/main/java/org/hackillinois/android/view/shop/RedeemFragment.kt
+++ b/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) {
diff --git a/app/src/main/java/org/hackillinois/android/view/shop/ShopFragment.kt b/app/src/main/java/org/hackillinois/android/view/shop/ShopFragment.kt
index af276b0f..5c44f991 100644
--- a/app/src/main/java/org/hackillinois/android/view/shop/ShopFragment.kt
+++ b/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)
}
}
diff --git a/app/src/main/java/org/hackillinois/android/viewmodel/RedeemViewModel.kt b/app/src/main/java/org/hackillinois/android/viewmodel/RedeemViewModel.kt
index 354389e1..9cdb51de 100644
--- a/app/src/main/java/org/hackillinois/android/viewmodel/RedeemViewModel.kt
+++ b/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")
diff --git a/app/src/main/java/org/hackillinois/android/viewmodel/ScheduleViewModel.kt b/app/src/main/java/org/hackillinois/android/viewmodel/ScheduleViewModel.kt
index 00daaedc..838e138c 100644
--- a/app/src/main/java/org/hackillinois/android/viewmodel/ScheduleViewModel.kt
+++ b/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)
diff --git a/app/src/main/res/drawable/home_stage1.png b/app/src/main/res/drawable/home_stage1.png
new file mode 100644
index 00000000..b6cfa316
Binary files /dev/null and b/app/src/main/res/drawable/home_stage1.png differ
diff --git a/app/src/main/res/drawable/home_stage2.png b/app/src/main/res/drawable/home_stage2.png
new file mode 100644
index 00000000..38de6d43
Binary files /dev/null and b/app/src/main/res/drawable/home_stage2.png differ
diff --git a/app/src/main/res/drawable/home_stage3.png b/app/src/main/res/drawable/home_stage3.png
new file mode 100644
index 00000000..663e6f65
Binary files /dev/null and b/app/src/main/res/drawable/home_stage3.png differ
diff --git a/app/src/main/res/drawable/home_stage4.png b/app/src/main/res/drawable/home_stage4.png
new file mode 100644
index 00000000..8243428e
Binary files /dev/null and b/app/src/main/res/drawable/home_stage4.png differ
diff --git a/app/src/main/res/drawable/home_stage5.png b/app/src/main/res/drawable/home_stage5.png
new file mode 100644
index 00000000..3ecf00a1
Binary files /dev/null and b/app/src/main/res/drawable/home_stage5.png differ
diff --git a/app/src/main/res/drawable/home_stage6.png b/app/src/main/res/drawable/home_stage6.png
new file mode 100644
index 00000000..3eb946d4
Binary files /dev/null and b/app/src/main/res/drawable/home_stage6.png differ
diff --git a/app/src/main/res/drawable/home_stage7.png b/app/src/main/res/drawable/home_stage7.png
new file mode 100644
index 00000000..f7ea73b1
Binary files /dev/null and b/app/src/main/res/drawable/home_stage7.png differ
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 70680363..bd99d97e 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -2,7 +2,6 @@
@@ -31,7 +30,7 @@
android:layout_height="match_parent"
android:paddingTop="8dp">
-
+
@@ -59,14 +59,16 @@
@@ -84,21 +86,26 @@
@@ -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" />
diff --git a/app/src/main/res/layout/fragment_home_2025.xml b/app/src/main/res/layout/fragment_home_2025.xml
index db40a613..b2bd23c1 100644
--- a/app/src/main/res/layout/fragment_home_2025.xml
+++ b/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" />
+
+
+
+
@@ -267,13 +275,15 @@