Release Student 7.10.1 (274)

Author: kristofnemere

apps/student/build.gradle

@@ -39,8 +39,8 @@ android {
         applicationId "com.instructure.candroid"
         minSdkVersion Versions.MIN_SDK
         targetSdkVersion Versions.TARGET_SDK
-        versionCode = 273
-        versionName = '7.10.0'
+        versionCode = 274
+        versionName = '7.10.1'
 
         vectorDrawables.useSupportLibrary = true
         testInstrumentationRunner 'com.instructure.student.espresso.StudentHiltTestRunner'

libs/pandautils/src/main/java/com/instructure/pandautils/base/PageViewFragmentDelegate.kt

@@ -33,16 +33,15 @@ class PageViewFragmentDelegate<T>(
 
     private val visibilityTracker = PageViewVisibilityTracker()
     private val pageViewAnnotationProcessor by lazy {
-        val pageViewUtils = EarlyEntryPoints.get(
-            fragment.requireActivity().applicationContext,
-            PageViewEntryPoint::class.java
-        ).pageViewUtils()
-        PageViewAnnotationProcessor(fragment::class.java, fragment, pageViewUtils)
+        fragment.activity?.applicationContext?.let {
+            val pageViewUtils = EarlyEntryPoints.get(it, PageViewEntryPoint::class.java).pageViewUtils()
+            PageViewAnnotationProcessor(fragment::class.java, fragment, pageViewUtils)
+        }
     }
 
     fun completePageViewPrerequisite(prerequisite: String) {
         if (visibilityTracker.trackCustom(prerequisite, true, fragment)) {
-            pageViewAnnotationProcessor.startEvent()
+            pageViewAnnotationProcessor?.startEvent()
         }
     }
 
@@ -63,39 +62,39 @@ class PageViewFragmentDelegate<T>(
 
     fun onHiddenChanged(hidden: Boolean) {
         if (visibilityTracker.trackHidden(hidden, fragment)) {
-            pageViewAnnotationProcessor.startEvent()
+            pageViewAnnotationProcessor?.startEvent()
         } else {
-            pageViewAnnotationProcessor.stopEvent()
+            pageViewAnnotationProcessor?.stopEvent()
         }
     }
 
     @Deprecated("See description in superclass")
     fun setUserVisibleHint(isVisibleToUser: Boolean) {
         if (fragment.isAdded) {
             if (visibilityTracker.trackUserHint(isVisibleToUser, fragment)) {
-                pageViewAnnotationProcessor.startEvent()
+                pageViewAnnotationProcessor?.startEvent()
             } else {
-                pageViewAnnotationProcessor.stopEvent()
+                pageViewAnnotationProcessor?.stopEvent()
             }
         }
     }
 
     fun onResume() {
         if (visibilityTracker.trackResume(true, fragment)) {
-            pageViewAnnotationProcessor.startEvent()
+            pageViewAnnotationProcessor?.startEvent()
         }
     }
 
     fun onPause() {
         visibilityTracker.trackResume(false, fragment)
-        pageViewAnnotationProcessor.stopEvent()
+        pageViewAnnotationProcessor?.stopEvent()
     }
 
     fun onPageViewWindowFocusChanged(hasFocus: Boolean) {
         if (visibilityTracker.trackCustom("windowFocus", hasFocus, fragment)) {
-            pageViewAnnotationProcessor.startEvent()
+            pageViewAnnotationProcessor?.startEvent()
         } else {
-            pageViewAnnotationProcessor.stopEvent()
+            pageViewAnnotationProcessor?.stopEvent()
         }
     }
-}
+}

libs/pandautils/src/main/java/com/instructure/pandautils/features/calendar/composables/CalendarScreen.kt

@@ -101,15 +101,6 @@ fun CalendarScreen(
                 }
             }
         }
-        val todayTapped = calendarScreenUiState.calendarUiState.todayTapped
-        LaunchedEffect(todayTapped) {
-            if (todayTapped) {
-                focusManager.clearFocus(true)
-                delay(200)
-                todayFocusRequester.requestFocus()
-                actionHandler(CalendarAction.TodayTapHandled)
-            }
-        }
         Scaffold(
             backgroundColor = colorResource(id = R.color.backgroundLightest),
             topBar = {
@@ -170,6 +161,15 @@ fun CalendarScreen(
                         Calendar(calendarScreenUiState.calendarUiState, actionHandler, Modifier.fillMaxWidth(), todayFocusRequester)
                         CalendarEvents(calendarScreenUiState.calendarEventsUiState, actionHandler, Modifier.testTag("calendarEvents"))
                     }
+                    val todayTapped = calendarScreenUiState.calendarUiState.todayTapped
+                    LaunchedEffect(todayTapped) {
+                        if (todayTapped) {
+                            focusManager.clearFocus(true)
+                            delay(200)
+                            todayFocusRequester.requestFocus()
+                            actionHandler(CalendarAction.TodayTapHandled)
+                        }
+                    }
                 }
             },
             floatingActionButton = {