From 686a69f22c3524fb72ddd080eaac45fe45721237 Mon Sep 17 00:00:00 2001
From: Aditya Kshirsagar <aditya29@icloud.com>
Date: Tue, 25 Feb 2025 23:23:57 -0600
Subject: [PATCH] fixed navbar not scaling with android buttons, countdown
 timer,  and also home screen info/icons

---
 app/build.gradle                              |   4 +--
 .../hackillinois/android/view/MainActivity.kt |  24 ++++++++++++++++++
 .../android/view/home/CountdownManager.kt     |  12 ++++-----
 .../android/view/home/HomeFragment.kt         |   8 +++---
 app/src/main/res/drawable/home_tags.png       | Bin 0 -> 11865 bytes
 app/src/main/res/layout/activity_main.xml     |   6 +++--
 .../main/res/layout/fragment_home_2025.xml    |   6 ++---
 7 files changed, 43 insertions(+), 17 deletions(-)
 create mode 100644 app/src/main/res/drawable/home_tags.png

diff --git a/app/build.gradle b/app/build.gradle
index 2f320be7..9544bd99 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -24,8 +24,8 @@ android {
         applicationId "org.hackillinois.android"
         minSdkVersion 23
         targetSdkVersion 34
-        versionCode 66
-        versionName "2025.01.1"
+        versionCode 67
+        versionName "2025.01.2"
         multiDexEnabled true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
diff --git a/app/src/main/java/org/hackillinois/android/view/MainActivity.kt b/app/src/main/java/org/hackillinois/android/view/MainActivity.kt
index 150ccd8c..59cc3bba 100644
--- a/app/src/main/java/org/hackillinois/android/view/MainActivity.kt
+++ b/app/src/main/java/org/hackillinois/android/view/MainActivity.kt
@@ -7,8 +7,13 @@ import android.util.Log
 import android.widget.ImageButton
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
+import androidx.coordinatorlayout.widget.CoordinatorLayout
 import androidx.core.content.ContextCompat
+import androidx.core.view.ViewCompat
 import androidx.core.view.WindowCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.updateLayoutParams
+import androidx.core.view.updatePadding
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentTransaction
 import androidx.lifecycle.ViewModelProvider
@@ -39,9 +44,28 @@ class MainActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+
         WindowCompat.setDecorFitsSystemWindows(window, false)
         setContentView(R.layout.activity_main)
 
+        ViewCompat.setOnApplyWindowInsetsListener(bottomAppBar) { view, insets ->
+            val systemBarsInsets = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+            // Convert 16dp to pixels (you can change this value as needed)
+            val extraMargin = (0 * resources.displayMetrics.density).toInt()
+            view.updateLayoutParams<CoordinatorLayout.LayoutParams> {
+                bottomMargin = systemBarsInsets.bottom + extraMargin
+            }
+            insets
+        }
+
+        ViewCompat.setOnApplyWindowInsetsListener(contentFrame) { view, insets ->
+            val systemBarsInsets = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+            // Your BottomAppBar has a fixed height of 72dp.
+            val bottomAppBarHeightPx = (36 * resources.displayMetrics.density).toInt()
+            view.updatePadding(bottom = bottomAppBarHeightPx + systemBarsInsets.bottom)
+            insets
+        }
+
         setupBottomAppBar()
         setupScannerButton()
 
diff --git a/app/src/main/java/org/hackillinois/android/view/home/CountdownManager.kt b/app/src/main/java/org/hackillinois/android/view/home/CountdownManager.kt
index 0be73391..df61029b 100644
--- a/app/src/main/java/org/hackillinois/android/view/home/CountdownManager.kt
+++ b/app/src/main/java/org/hackillinois/android/view/home/CountdownManager.kt
@@ -7,22 +7,22 @@ import java.util.*
 
 class CountdownManager(val listener: CountDownListener) {
 
-    // 02-23-2024 15:30:00
+    // 02-28-2025 : 14:30
     private val eventStartTime: Calendar = Calendar.getInstance().apply {
         timeZone = TimeZone.getTimeZone("America/Chicago")
-        timeInMillis = 1740722400000 // 1708723800000
+        timeInMillis = 1740774600000 // 1708723800000
     }
 
-    // 02-23-2024 19:00:00
+    // 02-28-2025 : 18:00
     private val hackingStartTime: Calendar = Calendar.getInstance().apply {
         timeZone = TimeZone.getTimeZone("America/Chicago")
-        timeInMillis = 1708736400000
+        timeInMillis = 1740787200000
     }
 
-    // 02-25-2024 7:00:00
+    // 03-02-2025 11:30
     private val hackingEndTime: Calendar = Calendar.getInstance().apply {
         timeZone = TimeZone.getTimeZone("America/Chicago")
-        timeInMillis = 1708866000000
+        timeInMillis = 1740936600000
     }
 
     private var times = listOf(eventStartTime, hackingStartTime, hackingEndTime)
diff --git a/app/src/main/java/org/hackillinois/android/view/home/HomeFragment.kt b/app/src/main/java/org/hackillinois/android/view/home/HomeFragment.kt
index 99bd7449..648b8212 100644
--- a/app/src/main/java/org/hackillinois/android/view/home/HomeFragment.kt
+++ b/app/src/main/java/org/hackillinois/android/view/home/HomeFragment.kt
@@ -62,21 +62,21 @@ class HomeFragment : Fragment(), CountdownManager.CountDownListener, EventProgre
         super.onStart()
         isActive = true
         countDownManager.start()
-//        eventProgressManager.start()
+        eventProgressManager.start()
     }
 
     override fun onPause() {
         super.onPause()
         isActive = false
         countDownManager.onPause()
-//        eventProgressManager.onPause()
+        eventProgressManager.onPause()
     }
 
     override fun onResume() {
         super.onResume()
         isActive = true
         countDownManager.onResume()
-//        eventProgressManager.onResume()
+        eventProgressManager.onResume()
     }
 
     override fun onStop() {
@@ -102,7 +102,7 @@ class HomeFragment : Fragment(), CountdownManager.CountDownListener, EventProgre
 
     override fun updateBackground(newBackgroundResource: Int) {
         if (isActive) {
-//            homeBackgroundImageView.setImageResource(newBackgroundResource)
+            homeBackgroundImageView.setImageResource(newBackgroundResource)
         }
     }
 
diff --git a/app/src/main/res/drawable/home_tags.png b/app/src/main/res/drawable/home_tags.png
new file mode 100644
index 0000000000000000000000000000000000000000..a97e4b8fe40066c876a1e63de36132ad6eeab969
GIT binary patch
literal 11865
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index bd99d97e..f65a10c4 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -3,8 +3,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:paddingBottom="16dp">
+    android:layout_height="match_parent">
 
     <!-- Main Content -->
     <androidx.fragment.app.FragmentContainerView
@@ -132,4 +131,7 @@
         app:fabCustomSize="60dp"
         app:srcCompat="@drawable/camera_png" />
 
+<!--    android:layout_alignParentBottom="true"-->
+<!--    android:layout_alignParentEnd="true"-->
+
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_home_2025.xml b/app/src/main/res/layout/fragment_home_2025.xml
index b2bd23c1..a547ef66 100644
--- a/app/src/main/res/layout/fragment_home_2025.xml
+++ b/app/src/main/res/layout/fragment_home_2025.xml
@@ -5,7 +5,7 @@
     android:id="@+id/home_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/witchyPurple">
+    android:background="@color/cream">
 
 
 <!--    <ImageView-->
@@ -48,8 +48,8 @@
             android:layout_marginHorizontal="0dp"
             android:layout_marginTop="0dp"
             android:adjustViewBounds="false"
-            android:scaleType="centerInside"
-            android:src="@drawable/home_tags_svg_flipped"
+            android:scaleType="fitXY"
+            android:src="@drawable/home_tags"
             android:visibility="invisible"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toRightOf="parent" />