Release: Teacher 1.38.0 (75)

Author: kristofnemere

apps/buildSrc/src/main/java/GlobalDependencies.kt

@@ -161,7 +161,6 @@ object Libs {
     const val EVENTBUS = "org.greenrobot:eventbus:3.3.1"
     const val JW_THREETEN_BP = "com.jakewharton.threetenabp:threetenabp:1.4.6"
     const val PROCESS_PHOENIX = "com.jakewharton:process-phoenix:2.1.2"
-    const val PAPERDB = "io.github.pilgr:paperdb:2.7.2"
     const val KEYBOARD_VISIBILITY_LISTENER = "net.yslibrary.keyboardvisibilityevent:keyboardvisibilityevent:2.2.1"
     const val APACHE_COMMONS_TEXT = "org.apache.commons:commons-text:1.12.0"
     const val CAMERA_VIEW = "com.otaliastudios:cameraview:2.7.2"

apps/flutter_parent/lib/screens/alert_thresholds/alert_thresholds_percentage_dialog.dart

@@ -44,7 +44,7 @@ class AlertThresholdsPercentageDialogState extends State<AlertThresholdsPercenta
   String? maxValue;
   String? minValue;
 
-  final int _disabledAlpha = 80;
+  final int _disabledAlpha = 90;
 
   static final UniqueKey okButtonKey = UniqueKey(); // For testing
 
@@ -173,13 +173,13 @@ class AlertThresholdsPercentageDialogState extends State<AlertThresholdsPercenta
           actions: <Widget>[
             TextButton(
                 child: Text(L10n(context).cancel.toUpperCase()),
-                style: TextButton.styleFrom(disabledBackgroundColor: ParentColors.parentApp.withAlpha(_disabledAlpha)),
+                style: TextButton.styleFrom(disabledForegroundColor: ParentColors.parentApp.withAlpha(_disabledAlpha)),
                 onPressed: () {
                   Navigator.of(context).pop(null);
                 }),
             TextButton(
                 child: Text(L10n(context).never.toUpperCase()),
-                style: TextButton.styleFrom(disabledBackgroundColor: ParentColors.parentApp.withAlpha(_disabledAlpha)),
+                style: TextButton.styleFrom(disabledForegroundColor: ParentColors.parentApp.withAlpha(_disabledAlpha)),
                 onPressed: () async {
                   if (_threshold == null) {
                     // Threshold is already disabled
@@ -194,7 +194,7 @@ class AlertThresholdsPercentageDialogState extends State<AlertThresholdsPercenta
             TextButton(
               key: okButtonKey,
               child: Text(L10n(context).ok),
-              style: TextButton.styleFrom(disabledBackgroundColor: ParentColors.parentApp.withAlpha(_disabledAlpha)),
+              style: TextButton.styleFrom(disabledForegroundColor: ParentColors.parentApp.withAlpha(_disabledAlpha)),
               onPressed: _disableButtons
                   ? null
                   : () async {

apps/flutter_parent/lib/screens/assignments/assignment_details_screen.dart

@@ -368,10 +368,23 @@ class _AssignmentDetailsScreenState extends State<AssignmentDetailsScreen> {
         initialDate: initialDate,
         firstDate: now,
         lastDate: initialDate.add(Duration(days: 365)),
+        builder: (context, child) {
+          return Theme(
+            data: ParentTheme.of(context)?.defaultLightTheme ?? ThemeData.light(),
+            child: child!,
+          );
+        },
       );
 
       if (date != null) {
-        time = await showTimePicker(context: context, initialTime: TimeOfDay.fromDateTime(initialDate));
+        time = await showTimePicker(context: context, initialTime: TimeOfDay.fromDateTime(initialDate),
+          builder: (context, child) {
+            return Theme(
+              data: ParentTheme.of(context)?.defaultLightTheme ?? ThemeData.light(),
+              child: child!,
+            );
+          },
+        );
       }
 
       if (date != null && time != null) {

apps/flutter_parent/lib/utils/design/parent_theme.dart

@@ -175,10 +175,13 @@ class _ParentThemeState extends State<ParentTheme> {
   bool get isDarkHC => isDarkMode && isHC;
 
   /// Returns a Parent App theme that ignores student color
-  ThemeData get defaultTheme => _buildTheme(getColorVariantForCurrentState(StudentColorSet.electric));
+  ThemeData get defaultTheme => _buildTheme(getColorVariantForCurrentState(StudentColorSet.electric), isDarkMode);
+
+  /// Returns a light Parent App theme that ignores student color
+  ThemeData get defaultLightTheme => _buildTheme(getColorVariantForCurrentState(StudentColorSet.electric), false);
 
   /// Returns a Parent App theme styled with the color of the currently selected student
-  ThemeData get studentTheme => _buildTheme(studentColor);
+  ThemeData get studentTheme => _buildTheme(studentColor, isDarkMode);
 
   /// Create a preferred size divider that can be used as the bottom of an app bar
   PreferredSize _appBarDivider(Color color) => PreferredSize(
@@ -238,7 +241,7 @@ class _ParentThemeState extends State<ParentTheme> {
   /// The green 'success' color appropriate for the current light/dark/HC mode
   Color get successColor => getColorVariantForCurrentState(StudentColorSet.shamrock);
 
-  ThemeData _buildTheme(Color themeColor) {
+  ThemeData _buildTheme(Color themeColor, bool isDarkMode) {
     var textTheme = _buildTextTheme(onSurfaceColor);
 
     // Use single text color for all styles in high-contrast mode
@@ -270,7 +273,7 @@ class _ParentThemeState extends State<ParentTheme> {
         : IconThemeData(color: ParentColors.licorice);
     var dividerColor = isHC ? onSurfaceColor : isDarkMode ? ParentColors
         .licorice : ParentColors.tiara;
-    var dialogBackgroundColor = isDarkMode ? Colors.black : Colors.white;
+    var dialogBackgroundColor = isDarkMode ? ParentColors.licorice : ParentColors.tiara;
 
     var swatch = ParentColors.makeSwatch(themeColor);
 
@@ -293,10 +296,6 @@ class _ParentThemeState extends State<ParentTheme> {
       buttonTheme: ButtonThemeData(
           height: 48, minWidth: 120, textTheme: ButtonTextTheme.primary),
       fontFamily: 'Lato',
-      dialogTheme: DialogTheme(
-        backgroundColor: dialogBackgroundColor,
-        surfaceTintColor: Colors.white,
-      ),
       tabBarTheme: TabBarTheme(
         labelStyle: primaryTextTheme.titleMedium?.copyWith(fontSize: 14),
         labelColor: primaryTextTheme.titleMedium?.color,

apps/flutter_parent/pubspec.yaml

@@ -25,7 +25,7 @@ description: Canvas Parent
 # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-version: 3.14.0+54
+version: 3.15.0+55
 
 module:
   androidX: true

apps/parent/build.gradle

@@ -41,7 +41,7 @@ android {
         applicationId "com.instructure.parentapp"
         minSdkVersion Versions.MIN_SDK
         targetSdkVersion Versions.TARGET_SDK
-        versionCode 55
+        versionCode 56
         versionName "4.0.0"
 
         buildConfigField "boolean", "IS_TESTING", "false"
@@ -113,7 +113,7 @@ android {
         release {
             minifyEnabled true
             shrinkResources true
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
 
             buildConfigField "String", "HEAP_APP_ID", "\"$heapProductionId\""
         }

apps/parent/flank_e2e.yml

@@ -0,0 +1,26 @@
+gcloud:
+  project: delta-essence-114723
+  # Use the next two lines to run locally
+  #  app: ./build/outputs/apk/qa/debug/student-qa-debug.apk
+  #  test: ./build/outputs/apk/androidTest/qa/debug/student-qa-debug-androidTest.apk
+  app: ./apps/parent/build/outputs/apk/qa/debug/parent-qa-debug.apk
+  test: ./apps/parent/build/outputs/apk/androidTest/qa/debug/parent-qa-debug-androidTest.apk
+  results-bucket: android-parent
+  auto-google-login: true
+  use-orchestrator: true
+  performance-metrics: false
+  record-video: true
+  timeout: 60m
+  test-targets:
+    - annotation com.instructure.canvas.espresso.E2E
+    - notAnnotation com.instructure.canvas.espresso.Stub, com.instructure.canvas.espresso.FlakyE2E, com.instructure.canvas.espresso.KnownBug, com.instructure.canvas.espresso.OfflineE2E
+  device:
+    - model: Pixel2.arm
+      version: 29
+      locale: en_US
+      orientation: portrait
+
+flank:
+  testShards: 10
+  testRuns: 1
+

apps/parent/src/androidTest/java/com/instructure/parentapp/ui/compose/alerts/list/AlertsScreenTest.kt

@@ -25,6 +25,7 @@ import androidx.compose.ui.test.hasText
 import androidx.compose.ui.test.junit4.createComposeRule
 import androidx.compose.ui.test.onNodeWithTag
 import androidx.compose.ui.test.onNodeWithText
+import androidx.compose.ui.test.performScrollToNode
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.instructure.canvasapi2.models.AlertType
 import com.instructure.parentapp.features.alerts.list.AlertsItemUiState
@@ -202,6 +203,7 @@ class AlertsScreenTest {
         }
 
         items.forEach {
+            composeTestRule.onNodeWithTag("alertsList").performScrollToNode(hasText(it.title))
             composeTestRule.onNodeWithText(it.title).assertIsDisplayed()
             composeTestRule.onNodeWithText(parseAlertType(it.alertType, it.observerAlertThreshold)).assertIsDisplayed()
             composeTestRule.onNodeWithText(parseDate(it.date!!)).assertIsDisplayed()

apps/parent/src/androidTest/java/com/instructure/parentapp/ui/compose/alerts/settings/AlertSettingsScreenTest.kt

@@ -29,7 +29,7 @@ import com.instructure.canvasapi2.models.ThresholdWorkflowState
 import com.instructure.canvasapi2.models.User
 import com.instructure.parentapp.features.alerts.settings.AlertSettingsScreen
 import com.instructure.parentapp.features.alerts.settings.AlertSettingsUiState
-import com.instructure.parentapp.ui.pages.AlertSettingsPage
+import com.instructure.parentapp.ui.pages.StudentAlertSettingsPage
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -40,7 +40,7 @@ class AlertSettingsScreenTest {
     @get:Rule
     val composeTestRule = createComposeRule()
 
-    private val page = AlertSettingsPage(composeTestRule)
+    private val page = StudentAlertSettingsPage(composeTestRule)
 
     @Test
     fun assertLoading() {
@@ -268,19 +268,7 @@ class AlertSettingsScreenTest {
 
         page.clickOverflowMenu()
         page.clickDeleteStudent()
-        composeTestRule.onNodeWithTag("deleteDialogTitle")
-            .assertExists()
-            .assertTextEquals("Delete")
-        composeTestRule.onNodeWithText("This will unpair and remove all enrollments for this student from you account.")
-            .assertExists()
-        composeTestRule.onNodeWithTag("deleteConfirmButton")
-            .assertTextEquals("Delete")
-            .assertExists()
-            .assertHasClickAction()
-        composeTestRule.onNodeWithTag("deleteCancelButton")
-            .assertTextEquals("Cancel")
-            .assertExists()
-            .assertHasClickAction()
+        page.assertDeleteStudentDialogDetails()
     }
 
     @Test

apps/parent/src/androidTest/java/com/instructure/parentapp/ui/compose/login/createaccount/CreateAccountScreenTest.kt

@@ -18,10 +18,12 @@
 package com.instructure.parentapp.ui.compose.login.createaccount
 
 import androidx.compose.ui.test.assertIsDisplayed
+import androidx.compose.ui.test.hasText
 import androidx.compose.ui.test.junit4.createComposeRule
 import androidx.compose.ui.test.onNodeWithTag
 import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.performClick
+import androidx.compose.ui.test.performScrollToNode
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.instructure.canvasapi2.models.TermsOfService
 import com.instructure.parentapp.features.login.createaccount.CreateAccountScreen
@@ -47,9 +49,13 @@ class CreateAccountScreenTest {
             )
         }
 
+        scrollToText("Full Name")
         composeTestRule.onNodeWithText("Full Name").assertIsDisplayed()
+        scrollToText("Email Address")
         composeTestRule.onNodeWithText("Email Address").assertIsDisplayed()
+        scrollToText("Password")
         composeTestRule.onNodeWithText("Password").assertIsDisplayed()
+        scrollToText("Create Account")
         composeTestRule.onNodeWithText("Create Account").assertIsDisplayed()
         composeTestRule.onNodeWithText("By tapping \'Create Account\', you agree to the Terms of Service and acknowledge the Privacy Policy")
             .assertIsDisplayed()
@@ -70,9 +76,13 @@ class CreateAccountScreenTest {
             )
         }
 
+        scrollToText("Full Name")
         composeTestRule.onNodeWithText("Full Name").assertIsDisplayed()
+        scrollToText("Email Address")
         composeTestRule.onNodeWithText("Email Address").assertIsDisplayed()
+        scrollToText("Password")
         composeTestRule.onNodeWithText("Password").assertIsDisplayed()
+        scrollToText("Create Account")
         composeTestRule.onNodeWithText("Create Account").assertIsDisplayed()
         composeTestRule.onNodeWithText("View the Privacy Policy").assertIsDisplayed()
     }
@@ -120,9 +130,18 @@ class CreateAccountScreenTest {
             )
         }
 
+        scrollToText("Create Account")
         composeTestRule.onNodeWithText("Create Account").performClick()
+        scrollToText("Full Name")
         composeTestRule.onNodeWithText("Please enter full name").assertIsDisplayed()
+        scrollToText("Email Address")
         composeTestRule.onNodeWithText("Please enter an email address").assertIsDisplayed()
+        scrollToText("Password")
         composeTestRule.onNodeWithText("Password is required").assertIsDisplayed()
     }
+
+    private fun scrollToText(text: String) {
+        composeTestRule.onNodeWithTag("CreateAccountScreen")
+            .performScrollToNode(hasText(text))
+    }
 }