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 { + 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 00000000..a97e4b8f Binary files /dev/null and b/app/src/main/res/drawable/home_tags.png differ 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"> + + + 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"> @@ -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" />