Merge branch 'master' into MBL-19803-Implement-E2E-test-for-send-message-from-All-Submissions-page

Author: adam1014-ai

apps/parent/src/androidTest/java/com/instructure/parentapp/ui/e2e/compose/LoginE2ETest.kt

@@ -16,8 +16,11 @@
  */
 package com.instructure.parentapp.ui.e2e.compose
 
+import android.app.Instrumentation
 import android.util.Log
 import androidx.test.espresso.Espresso
+import androidx.test.espresso.intent.Intents
+import androidx.test.espresso.intent.matcher.IntentMatchers
 import com.instructure.canvas.espresso.FeatureCategory
 import com.instructure.canvas.espresso.Priority
 import com.instructure.canvas.espresso.SecondaryFeatureCategory
@@ -449,4 +452,34 @@ class LoginE2ETest : ParentComposeTest() {
         loginSignInPage.assertPageObjects()
     }
 
+    @E2E
+    @Test
+    @TestMetaData(Priority.NICE_TO_HAVE, FeatureCategory.LOGIN, TestCategory.E2E)
+    fun testLoginHowDoIFindMySchoolE2E() {
+
+        Log.d(STEP_TAG, "Click 'Find My School' button.")
+        loginLandingPage.clickFindMySchoolButton()
+
+        Log.d(STEP_TAG, "Enter and invalid domain to trigger the 'Tap here for login help.' link to be displayed.")
+        loginFindSchoolPage.enterDomain("invalid-domain")
+
+        Log.d(ASSERTION_TAG, "Assert that the 'Tap here for login help.' link is displayed.")
+        loginFindSchoolPage.assertHowDoIFindMySchoolLinkDisplayed()
+
+        val expectedUrl = "https://community.instructure.com/en/kb/articles/662717-where-do-i-find-my-institutions-url-to-access-canvas"
+        val expectedIntent = IntentMatchers.hasData(expectedUrl)
+        Intents.init()
+        try {
+            Intents.intending(expectedIntent).respondWith(Instrumentation.ActivityResult(0, null))
+
+            Log.d(STEP_TAG, "Click on the 'Tap here for login help.' link.")
+            loginFindSchoolPage.clickOnHowDoIFindMySchoolLink()
+
+            Log.d(ASSERTION_TAG, "Assert that an intent with the correct URL was fired.")
+            Intents.intended(expectedIntent)
+        } finally {
+            Intents.release()
+        }
+    }
+
 }

apps/parent/src/main/java/com/instructure/parentapp/features/alerts/list/AlertsScreen.kt

@@ -23,7 +23,6 @@ import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
@@ -39,6 +38,7 @@ import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.ExperimentalMaterialApi
 import androidx.compose.material.Icon
 import androidx.compose.material.IconButton
+import androidx.compose.material.Scaffold
 import androidx.compose.material.Text
 import androidx.compose.material.pullrefresh.PullRefreshIndicator
 import androidx.compose.material.pullrefresh.pullRefresh
@@ -66,7 +66,6 @@ import com.instructure.canvasapi2.utils.ContextKeeper
 import com.instructure.canvasapi2.utils.DateHelper
 import com.instructure.pandautils.R
 import com.instructure.pandautils.compose.CanvasTheme
-import com.instructure.pandautils.compose.composables.CanvasScaffold
 import com.instructure.pandautils.compose.composables.EmptyContent
 import com.instructure.pandautils.compose.composables.ErrorContent
 import com.instructure.pandautils.compose.composables.Loading
@@ -83,7 +82,7 @@ fun AlertsScreen(
     lazyListState: LazyListState = LazyListState()
 ) {
     CanvasTheme {
-        CanvasScaffold(
+        Scaffold(
             backgroundColor = colorResource(id = R.color.backgroundLightest),
             content = { padding ->
                 val pullRefreshState = rememberPullRefreshState(
@@ -129,8 +128,9 @@ fun AlertsScreen(
                                 uiState = uiState,
                                 actionHandler = actionHandler,
                                 lazyListState = lazyListState,
-                                scaffoldPadding = padding,
-                                modifier = Modifier.fillMaxSize()
+                                modifier = Modifier
+                                    .padding(padding)
+                                    .fillMaxSize()
                             )
                         }
                     }
@@ -155,13 +155,11 @@ fun AlertsListContent(
     uiState: AlertsUiState,
     actionHandler: (AlertsAction) -> Unit,
     lazyListState: LazyListState,
-    modifier: Modifier = Modifier,
-    scaffoldPadding: PaddingValues = PaddingValues(0.dp)
+    modifier: Modifier = Modifier
 ) {
     LazyColumn(
         state = lazyListState,
-        modifier = modifier.testTag("alertsList"),
-        contentPadding = scaffoldPadding
+        modifier = modifier.testTag("alertsList")
     ) {
         items(uiState.alerts, key = { it.alertId }) { alert ->
             AlertsListItem(

apps/parent/src/main/java/com/instructure/parentapp/features/alerts/settings/AlertSettingsScreen.kt

@@ -76,9 +76,9 @@ import com.instructure.canvasapi2.models.ThresholdWorkflowState
 import com.instructure.canvasapi2.models.User
 import com.instructure.canvasapi2.utils.ContextKeeper
 import com.instructure.pandautils.compose.CanvasTheme
-import com.instructure.pandautils.compose.composables.CanvasAppBar
 import com.instructure.pandautils.compose.composables.CanvasScaffold
 import com.instructure.pandautils.compose.composables.CanvasSwitch
+import com.instructure.pandautils.compose.composables.CanvasThemedAppBar
 import com.instructure.pandautils.compose.composables.ErrorContent
 import com.instructure.pandautils.compose.composables.Loading
 import com.instructure.pandautils.compose.composables.OverflowMenu
@@ -103,13 +103,13 @@ fun AlertSettingsScreen(
         CanvasScaffold(
             backgroundColor = colorResource(id = R.color.backgroundLightest),
             topBar = {
-                CanvasAppBar(
+                CanvasThemedAppBar(
                     title = stringResource(id = R.string.alertSettingsTitle),
                     navIconRes = R.drawable.ic_back_arrow,
                     navIconContentDescription = stringResource(id = R.string.back),
                     navigationActionClick = navigationActionClick,
                     backgroundColor = Color(uiState.userColor),
-                    textColor = colorResource(id = R.color.textLightest),
+                    contentColor = colorResource(id = R.color.textLightest),
                     actions = {
                         var showMenu by rememberSaveable { mutableStateOf(false) }
                         var showConfirmationDialog by rememberSaveable { mutableStateOf(false) }

apps/parent/src/main/java/com/instructure/parentapp/features/courses/details/grades/ParentGradesScreen.kt

@@ -47,5 +47,5 @@ internal fun ParentGradesScreen(
         }
     }
 
-    GradesScreen(gradesUiState, gradesViewModel::handleAction, ParentPrefs.currentStudent.studentColor)
+    GradesScreen(gradesUiState, gradesViewModel::handleAction, ParentPrefs.currentStudent.studentColor, applyInsets = false)
 }

apps/parent/src/main/java/com/instructure/parentapp/features/courses/list/CoursesScreen.kt

@@ -29,6 +29,7 @@ import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.ExperimentalMaterialApi
+import androidx.compose.material.Scaffold
 import androidx.compose.material.Text
 import androidx.compose.material.pullrefresh.PullRefreshIndicator
 import androidx.compose.material.pullrefresh.pullRefresh
@@ -48,7 +49,6 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.instructure.pandautils.R
 import com.instructure.pandautils.compose.CanvasTheme
-import com.instructure.pandautils.compose.composables.CanvasScaffold
 import com.instructure.pandautils.compose.composables.EmptyContent
 import com.instructure.pandautils.compose.composables.ErrorContent
 
@@ -62,7 +62,7 @@ internal fun CoursesScreen(
     lazyListState: LazyListState = LazyListState()
 ) {
     CanvasTheme {
-        CanvasScaffold(
+        Scaffold(
             backgroundColor = colorResource(id = R.color.backgroundLightest),
             content = { padding ->
                 val pullRefreshState = rememberPullRefreshState(

apps/parent/src/main/java/com/instructure/parentapp/features/main/MainActivity.kt

@@ -27,6 +27,7 @@ import android.os.Build
 import android.os.Bundle
 import android.util.Log
 import androidx.activity.result.contract.ActivityResultContracts
+import androidx.core.graphics.Insets
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
 import androidx.lifecycle.lifecycleScope
@@ -114,7 +115,28 @@ class MainActivity : BaseCanvasActivity(), OnUnreadCountInvalidated, Masqueradin
                 rightPadding,
                 0
             )
-            insets
+
+            // Consume horizontal insets so child ComposeViews don't apply them again
+            WindowInsetsCompat.Builder(insets)
+                .setInsets(
+                    WindowInsetsCompat.Type.navigationBars(),
+                    Insets.of(
+                        0, // Consume left
+                        navigationBars.top,
+                        0, // Consume right
+                        navigationBars.bottom
+                    )
+                )
+                .setInsets(
+                    WindowInsetsCompat.Type.displayCutout(),
+                    Insets.of(
+                        0, // Consume left
+                        displayCutout.top,
+                        0, // Consume right
+                        displayCutout.bottom
+                    )
+                )
+                .build()
         }
     }
 

apps/student/build.gradle

@@ -38,8 +38,8 @@ android {
         applicationId "com.instructure.candroid"
         minSdkVersion Versions.MIN_SDK
         targetSdkVersion Versions.TARGET_SDK
-        versionCode = 287
-        versionName = '8.5.0'
+        versionCode = 289
+        versionName = '8.6.1'
 
         vectorDrawables.useSupportLibrary = true
         testInstrumentationRunner 'com.instructure.student.espresso.StudentHiltTestRunner'

apps/student/src/androidTest/java/com/instructure/student/ui/e2e/classic/LoginE2ETest.kt

@@ -16,8 +16,11 @@
  */
 package com.instructure.student.ui.e2e.classic
 
+import android.app.Instrumentation
 import android.util.Log
 import androidx.test.espresso.Espresso
+import androidx.test.espresso.intent.Intents
+import androidx.test.espresso.intent.matcher.IntentMatchers
 import com.instructure.canvas.espresso.FeatureCategory
 import com.instructure.canvas.espresso.Priority
 import com.instructure.canvas.espresso.SecondaryFeatureCategory
@@ -37,6 +40,7 @@ import com.instructure.dataseeding.model.EnrollmentTypes.STUDENT_ENROLLMENT
 import com.instructure.dataseeding.model.EnrollmentTypes.TEACHER_ENROLLMENT
 import com.instructure.dataseeding.util.CanvasNetworkAdapter
 import com.instructure.espresso.withIdlingResourceDisabled
+import com.instructure.student.R
 import com.instructure.student.ui.utils.StudentTest
 import com.instructure.student.ui.utils.extensions.enterDomain
 import com.instructure.student.ui.utils.extensions.seedData
@@ -416,6 +420,58 @@ class LoginE2ETest : StudentTest() {
         loginSignInPage.assertPageObjects()
     }
 
+    @E2E
+    @Test
+    @TestMetaData(Priority.NICE_TO_HAVE, FeatureCategory.LOGIN, TestCategory.E2E)
+    fun testLoginHowDoIFindMySchoolE2E() {
+
+        Log.d(STEP_TAG, "Click 'Find My School' button.")
+        loginLandingPage.clickFindMySchoolButton()
+
+        Log.d(STEP_TAG, "Enter and invalid domain to trigger the 'Tap here for login help.' link to be displayed.")
+        loginFindSchoolPage.enterDomain("invalid-domain")
+
+        Log.d(ASSERTION_TAG, "Assert that the 'Tap here for login help.' link is displayed.")
+        loginFindSchoolPage.assertHowDoIFindMySchoolLinkDisplayed()
+
+        val expectedUrl = "https://community.instructure.com/en/kb/articles/662717-where-do-i-find-my-institutions-url-to-access-canvas"
+        val expectedIntent = IntentMatchers.hasData(expectedUrl)
+        Intents.init()
+        try {
+            Intents.intending(expectedIntent).respondWith(Instrumentation.ActivityResult(0, null))
+
+            Log.d(STEP_TAG, "Click on the 'Tap here for login help.' link.")
+            loginFindSchoolPage.clickOnHowDoIFindMySchoolLink()
+
+            Log.d(ASSERTION_TAG, "Assert that an intent with the correct URL was fired.")
+            Intents.intended(expectedIntent)
+        } finally {
+            Intents.release()
+        }
+    }
+
+    @E2E
+    @Test
+    @TestMetaData(Priority.MANDATORY, FeatureCategory.LOGIN, TestCategory.E2E)
+    fun testLoginCanFindSchoolE2E() {
+
+        Log.d(STEP_TAG, "Click 'Find My School' button.")
+        loginLandingPage.clickFindMySchoolButton()
+
+        Log.d(ASSERTION_TAG, "Assert that the Find School Page has been displayed properly.")
+        loginFindSchoolPage.assertPageObjects()
+
+        Log.d(ASSERTION_TAG, "Assert that the hint text is correct based on the device type.")
+        if(isTabletDevice()) loginFindSchoolPage.assertHintText(R.string.schoolInstructureCom)
+        else loginFindSchoolPage.assertHintText(R.string.loginHint)
+
+        Log.d(STEP_TAG, "Enter domain: 'harvest'.")
+        loginFindSchoolPage.enterDomain("harvest")
+
+        Log.d(ASSERTION_TAG, "Assert that the 'City Harvest Church (Singapore)' school is displayed among the search results.")
+        loginFindSchoolPage.assertSchoolSearchResults("City Harvest Church (Singapore)")
+    }
+
     private fun loginWithUser(user: CanvasUserApiModel, lastSchoolSaved: Boolean = false) {
 
         Thread.sleep(5100) //Need to wait > 5 seconds before each login attempt because of new 'too many attempts' login policy on web.

apps/student/src/androidTest/java/com/instructure/student/ui/interaction/LoginInteractionTest.kt

@@ -19,7 +19,6 @@ import com.instructure.canvas.espresso.FeatureCategory
 import com.instructure.canvas.espresso.Priority
 import com.instructure.canvas.espresso.TestCategory
 import com.instructure.canvas.espresso.TestMetaData
-import com.instructure.student.R
 import com.instructure.student.ui.utils.StudentTest
 import dagger.hilt.android.testing.HiltAndroidTest
 import org.junit.Test
@@ -29,19 +28,6 @@ class LoginInteractionTest : StudentTest() {
 
     override fun displaysPageObjects() = Unit // Not used for interaction tests
 
-    @Test
-    @TestMetaData(Priority.MANDATORY, FeatureCategory.LOGIN, TestCategory.INTERACTION)
-    fun testLogin_canFindSchool() {
-        loginLandingPage.clickFindMySchoolButton()
-        loginFindSchoolPage.assertPageObjects()
-
-        if(isTabletDevice()) loginFindSchoolPage.assertHintText(R.string.schoolInstructureCom)
-        else loginFindSchoolPage.assertHintText(R.string.loginHint)
-
-        loginFindSchoolPage.enterDomain("harvest")
-        loginFindSchoolPage.assertSchoolSearchResults("City Harvest Church (Singapore)")
-    }
-
     @Test
     @TestMetaData(Priority.MANDATORY, FeatureCategory.LOGIN, TestCategory.INTERACTION)
     fun testLogin_qrTutorialPageLoads() {

apps/student/src/main/java/com/instructure/student/AnnotationComments/AnnotationCommentListFragment.kt

@@ -15,6 +15,7 @@
  *
  */    package com.instructure.student.AnnotationComments
 
+import android.content.res.Configuration
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -146,6 +147,11 @@ class AnnotationCommentListFragment : ParentFragment() {
                 assigneeId))
     }
 
+    override fun onConfigurationChanged(newConfig: Configuration) {
+        super.onConfigurationChanged(newConfig)
+        ViewStyler.setStatusBarLightDelayed(requireActivity())
+    }
+
     fun configureRecyclerView() {
         val layoutManager = LinearLayoutManager(requireContext())
         layoutManager.orientation = RecyclerView.VERTICAL