Merge pull request #172 from cuappdev/justin/playstore-publish

Justin/playstore publish
cuappdev · Oct 28, 2024 · 0dae6ee · 0dae6ee
2 parents 098ccc7 + 77f104a
commit 0dae6ee
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -23,8 +23,8 @@ android {
         applicationId "com.cornellappdev.android.eatery"
         minSdk 28
         targetSdk 34
-        versionCode 71
-        versionName "1.1-compare-menus"
+        versionCode 72
+        versionName "1.2-compare-menus"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {

diff --git a/app/src/main/java/com/cornellappdev/android/eatery/ui/screens/EateryDetailScreen.kt b/app/src/main/java/com/cornellappdev/android/eatery/ui/screens/EateryDetailScreen.kt
@@ -228,7 +228,8 @@ fun EateryDetailScreen(
                     val mealTypeIndex = remember {
                         derivedStateOf {
                             eatery.getTypeMeal(weekDayIndex.fromOffsetToDayOfWeek())
-                                ?.indexOfFirst { it.first == nextEvent?.description } ?: 0
+                                ?.indexOfFirst { it.first == nextEvent?.description }
+                                ?.coerceAtLeast(0) ?: 0
                         }
                     }
 

diff --git a/whatsnew/whatsnew-en-US b/whatsnew/whatsnew-en-US
@@ -1,4 +1,7 @@
 We're working hard to bring you the latest fixes and features to Eatery! Here's what we've been working on:
+* Fixed a crash on opening certain eatery detail screens related to menu selection.
+
+Previous Notes:
 * Compare Menus - Click the Compare Menus button on the main menu or eatery detail screen to compare menus across several eateries!
 * Home Screen UI Reorganization - Eateries nearest to you are now more intuitive to find.
-* Menu Selection - Select the top bar on a eatery menu to swap from breakfast, lunch, and dinner!
+* Menu Selection - Select the top bar on a eatery menu to swap from breakfast, lunch, and dinner