From df0b883ccbeb7b3f20ed4d73dca1bb74dcbd8f3a Mon Sep 17 00:00:00 2001
From: Kristof Nemere <109959688+kristofnemere@users.noreply.github.com>
Date: Fri, 11 Aug 2023 10:50:57 +0200
Subject: [PATCH 01/22] [MBL-16956][Student] Rubric LGO

refs: MBL-16956
affects: Student
release note: none

* Rubric LGO

* fixed tests

* fixed pr comment
---
 .../SubmissionDetailsEffectHandler.kt         | 17 +++++-
 .../SubmissionDetailsModels.kt                |  6 ++-
 .../SubmissionDetailsPresenter.kt             |  3 +-
 .../SubmissionDetailsUpdate.kt                |  3 +-
 .../drawer/rubric/SubmissionRubricModels.kt   |  1 +
 .../rubric/SubmissionRubricPresenter.kt       | 12 ++---
 .../rubric/ui/SubmissionRubricFragment.kt     |  8 ++-
 .../ui/SubmissionDetailsViewState.kt          |  3 +-
 .../ui/gradeCell/GradeCellViewState.kt        | 28 +++++++---
 .../assignment/details/GradeCellStateTest.kt  | 52 +++++++++++++++++++
 .../SubmissionDetailsEffectHandlerTest.kt     |  4 ++
 .../SubmissionRubricPresenterTest.kt          | 21 ++++++++
 12 files changed, 137 insertions(+), 21 deletions(-)

diff --git a/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submissionDetails/SubmissionDetailsEffectHandler.kt b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submissionDetails/SubmissionDetailsEffectHandler.kt
index 1c7bb33fc3..bd88b91d10 100644
--- a/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submissionDetails/SubmissionDetailsEffectHandler.kt
+++ b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submissionDetails/SubmissionDetailsEffectHandler.kt
@@ -122,7 +122,22 @@ class SubmissionDetailsEffectHandler : EffectHandler<SubmissionDetailsView, Subm
             val featureFlags = FeaturesManager.getEnabledFeaturesForCourseAsync(effect.courseId, true).await().dataOrNull
             val assignmentEnhancementsEnabled = featureFlags?.contains("assignments_2_student").orDefault()
 
-            consumer.accept(SubmissionDetailsEvent.DataLoaded(assignmentResult, submissionResult, ltiTool, isStudioEnabled, quizResult, studioLTIToolResult, effect.isObserver, assignmentEnhancementsEnabled))
+            val restrictQuantitativeData = CourseManager.getCourseSettingsAsync(effect.courseId, true)
+                .await().dataOrNull?.restrictQuantitativeData.orDefault()
+
+            consumer.accept(
+                SubmissionDetailsEvent.DataLoaded(
+                    assignmentResult,
+                    submissionResult,
+                    ltiTool,
+                    isStudioEnabled,
+                    quizResult,
+                    studioLTIToolResult,
+                    effect.isObserver,
+                    assignmentEnhancementsEnabled,
+                    restrictQuantitativeData
+                )
+            )
         }
     }
 
diff --git a/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submissionDetails/SubmissionDetailsModels.kt b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submissionDetails/SubmissionDetailsModels.kt
index 5078979981..1538308c69 100644
--- a/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submissionDetails/SubmissionDetailsModels.kt
+++ b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submissionDetails/SubmissionDetailsModels.kt
@@ -41,7 +41,8 @@ sealed class SubmissionDetailsEvent {
         val quizResult: DataResult<Quiz>?,
         val studioLTIToolResult: DataResult<LTITool>?,
         val isObserver: Boolean = false,
-        val assignmentEnhancementsEnabled: Boolean
+        val assignmentEnhancementsEnabled: Boolean,
+        val restrictQuantitativeData: Boolean = false
     ) : SubmissionDetailsEvent()
     data class SubmissionCommentsUpdated(val submissionComments: List<SubmissionComment>) : SubmissionDetailsEvent()
 }
@@ -74,7 +75,8 @@ data class SubmissionDetailsModel(
     val ltiTool: DataResult<LTITool>? = null,
     val initialSelectedSubmissionAttempt: Long? = null,
     val submissionComments: List<SubmissionComment>? = null,
-    val assignmentEnhancementsEnabled: Boolean = false
+    val assignmentEnhancementsEnabled: Boolean = false,
+    val restrictQuantitativeData: Boolean = false
 )
 
 sealed class SubmissionDetailsContentType {
diff --git a/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submissionDetails/SubmissionDetailsPresenter.kt b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submissionDetails/SubmissionDetailsPresenter.kt
index 3bd581fc50..cade1dc24a 100644
--- a/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submissionDetails/SubmissionDetailsPresenter.kt
+++ b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submissionDetails/SubmissionDetailsPresenter.kt
@@ -80,7 +80,8 @@ object SubmissionDetailsPresenter : Presenter<SubmissionDetailsModel, Submission
         tabData += SubmissionDetailsTabData.RubricData(
             name = context.getString(R.string.rubric),
             assignment = assignment,
-            submission = rootSubmission
+            submission = rootSubmission,
+            restrictQuantitativeData = model.restrictQuantitativeData
         )
 
         return SubmissionDetailsViewState.Loaded(
diff --git a/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submissionDetails/SubmissionDetailsUpdate.kt b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submissionDetails/SubmissionDetailsUpdate.kt
index 7950f4aa32..e721630d69 100644
--- a/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submissionDetails/SubmissionDetailsUpdate.kt
+++ b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submissionDetails/SubmissionDetailsUpdate.kt
@@ -89,7 +89,8 @@ class SubmissionDetailsUpdate : UpdateInit<SubmissionDetailsModel, SubmissionDet
                         rootSubmissionResult = event.rootSubmissionResult,
                         selectedSubmissionAttempt = selectedSubmission?.attempt,
                         quizResult = event.quizResult,
-                        assignmentEnhancementsEnabled = event.assignmentEnhancementsEnabled
+                        assignmentEnhancementsEnabled = event.assignmentEnhancementsEnabled,
+                        restrictQuantitativeData = event.restrictQuantitativeData
                     ), setOf(SubmissionDetailsEffect.ShowSubmissionContentType(submissionType))
                 )
             }
diff --git a/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submissionDetails/drawer/rubric/SubmissionRubricModels.kt b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submissionDetails/drawer/rubric/SubmissionRubricModels.kt
index 6042b59f81..e4a4c36fef 100644
--- a/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submissionDetails/drawer/rubric/SubmissionRubricModels.kt
+++ b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submissionDetails/drawer/rubric/SubmissionRubricModels.kt
@@ -34,5 +34,6 @@ sealed class SubmissionRubricEffect {
 data class SubmissionRubricModel(
     val assignment: Assignment,
     val submission: Submission,
+    val restrictQuantitativeData: Boolean = false,
     val selectedRatingMap: Map<String, String> = emptyMap()
 )
diff --git a/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submissionDetails/drawer/rubric/SubmissionRubricPresenter.kt b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submissionDetails/drawer/rubric/SubmissionRubricPresenter.kt
index 0cad9f9bb6..a16d2f8595 100644
--- a/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submissionDetails/drawer/rubric/SubmissionRubricPresenter.kt
+++ b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submissionDetails/drawer/rubric/SubmissionRubricPresenter.kt
@@ -24,12 +24,10 @@ import com.instructure.canvasapi2.models.RubricCriterionRating
 import com.instructure.canvasapi2.utils.NumberHelper
 import com.instructure.canvasapi2.utils.isValid
 import com.instructure.canvasapi2.utils.validOrNull
-import com.instructure.pandautils.utils.ColorKeeper
 import com.instructure.pandautils.utils.textAndIconColor
 import com.instructure.student.R
 import com.instructure.student.mobius.assignmentDetails.ui.gradeCell.GradeCellViewState
 import com.instructure.student.mobius.common.ui.Presenter
-import java.util.HashMap
 
 object SubmissionRubricPresenter : Presenter<SubmissionRubricModel, SubmissionRubricViewState> {
 
@@ -46,7 +44,7 @@ object SubmissionRubricPresenter : Presenter<SubmissionRubricModel, SubmissionRu
 
         // Show the grade cell only if the submission is graded and the rubric is used for grading
         if (model.submission.isGraded && model.assignment.isUseRubricForGrading) {
-            val gradeState = GradeCellViewState.fromSubmission(context, model.assignment, model.submission)
+            val gradeState = GradeCellViewState.fromSubmission(context, model.assignment, model.submission, model.restrictQuantitativeData)
             items += RubricListData.Grade(gradeState)
         }
 
@@ -104,16 +102,16 @@ object SubmissionRubricPresenter : Presenter<SubmissionRubricModel, SubmissionRu
 
         val selectedRatingId = model.selectedRatingMap[criterion.id] ?: assessedRating?.id
 
+        // If points are hidden, show the rating title instead of points
+        val hidePoints = model.assignment.rubricSettings?.hidePoints == true || model.restrictQuantitativeData
+
         // Free-form assessments should only show the assessment comments and the matching assessment rating
         if (model.assignment.freeFormCriterionComments) {
             ratings = ratings
-                .filter { it.id == assessment?.ratingId && model.assignment.rubricSettings?.hidePoints != true}
+                .filter { it.id == assessment?.ratingId && !hidePoints}
                 .map { it.copy(description = null) }
         }
 
-        // If points are hidden, show the rating title instead of points
-        val hidePoints = model.assignment.rubricSettings?.hidePoints == true
-
         // Map criterion ratings to view state data
         var ratingData = ratings.map { rating ->
             RatingData(
diff --git a/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submissionDetails/drawer/rubric/ui/SubmissionRubricFragment.kt b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submissionDetails/drawer/rubric/ui/SubmissionRubricFragment.kt
index 053e9241ce..a8268a84c0 100644
--- a/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submissionDetails/drawer/rubric/ui/SubmissionRubricFragment.kt
+++ b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submissionDetails/drawer/rubric/ui/SubmissionRubricFragment.kt
@@ -22,6 +22,7 @@ import com.instructure.canvasapi2.models.Assignment
 import com.instructure.canvasapi2.models.Submission
 import com.instructure.pandautils.analytics.SCREEN_VIEW_SUBMISSION_RUBRIC
 import com.instructure.pandautils.analytics.ScreenView
+import com.instructure.pandautils.utils.BooleanArg
 import com.instructure.pandautils.utils.Const
 import com.instructure.pandautils.utils.ParcelableArg
 import com.instructure.student.databinding.FragmentSubmissionRubricBinding
@@ -29,11 +30,14 @@ import com.instructure.student.mobius.assignmentDetails.submissionDetails.drawer
 import com.instructure.student.mobius.assignmentDetails.submissionDetails.ui.SubmissionDetailsTabData
 import com.instructure.student.mobius.common.ui.MobiusFragment
 
+private const val RESTRICT_QUANTITATIVE_DATA = "restrictQuantitativeData"
+
 @ScreenView(SCREEN_VIEW_SUBMISSION_RUBRIC)
 class SubmissionRubricFragment :
     MobiusFragment<SubmissionRubricModel, SubmissionRubricEvent, SubmissionRubricEffect, SubmissionRubricView, SubmissionRubricViewState, FragmentSubmissionRubricBinding>() {
     private var submission by ParcelableArg<Submission>(key = Const.SUBMISSION)
     private var assignment by ParcelableArg<Assignment>(key = Const.ASSIGNMENT)
+    private var restrictQuantitativeData by BooleanArg(key = RESTRICT_QUANTITATIVE_DATA)
 
     override fun makeEffectHandler() = SubmissionRubricEffectHandler()
 
@@ -43,13 +47,13 @@ class SubmissionRubricFragment :
 
     override fun makePresenter() = SubmissionRubricPresenter
 
-    override fun makeInitModel() = SubmissionRubricModel(assignment, submission)
+    override fun makeInitModel() = SubmissionRubricModel(assignment, submission, restrictQuantitativeData)
 
     companion object {
         fun newInstance(data: SubmissionDetailsTabData.RubricData) = SubmissionRubricFragment().apply {
             submission = data.submission
             assignment = data.assignment
+            restrictQuantitativeData = data.restrictQuantitativeData
         }
     }
-
 }
diff --git a/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submissionDetails/ui/SubmissionDetailsViewState.kt b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submissionDetails/ui/SubmissionDetailsViewState.kt
index 2fb7cfcd08..a956c7e85f 100644
--- a/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submissionDetails/ui/SubmissionDetailsViewState.kt
+++ b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submissionDetails/ui/SubmissionDetailsViewState.kt
@@ -50,7 +50,8 @@ sealed class SubmissionDetailsTabData(val tabName: String) {
     data class RubricData(
         val name: String,
         val assignment: Assignment,
-        val submission: Submission
+        val submission: Submission,
+        val restrictQuantitativeData: Boolean = false
     ) : SubmissionDetailsTabData(name)
 }
 
diff --git a/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/ui/gradeCell/GradeCellViewState.kt b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/ui/gradeCell/GradeCellViewState.kt
index 0f0bc8b7e9..42cf48e75c 100644
--- a/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/ui/gradeCell/GradeCellViewState.kt
+++ b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/ui/gradeCell/GradeCellViewState.kt
@@ -24,7 +24,6 @@ import com.instructure.canvasapi2.models.Assignment
 import com.instructure.canvasapi2.models.CanvasContext
 import com.instructure.canvasapi2.models.Submission
 import com.instructure.canvasapi2.utils.NumberHelper
-import com.instructure.pandautils.utils.ColorKeeper
 import com.instructure.pandautils.utils.getContentDescriptionForMinusGradeString
 import com.instructure.pandautils.utils.textAndIconColor
 import com.instructure.student.R
@@ -69,10 +68,12 @@ sealed class GradeCellViewState {
         fun fromSubmission(
             context: Context,
             assignment: Assignment,
-            submission: Submission?
+            submission: Submission?,
+            restrictQuantitativeData: Boolean = false
         ): GradeCellViewState {
-            // Return empty state if unsubmitted and ungraded, or "Not Graded" grading type
-            if ((submission?.submittedAt == null && submission?.isGraded != true) || assignment.gradingType == Assignment.NOT_GRADED_TYPE) {
+            // Return empty state if unsubmitted and ungraded, or "Not Graded" grading type or quantitative data is restricted
+            val hideGrades = restrictQuantitativeData && assignment.isGradingTypeQuantitative && submission?.excused != true
+            if ((submission?.submittedAt == null && submission?.isGraded != true) || assignment.gradingType == Assignment.NOT_GRADED_TYPE || hideGrades) {
                 return Empty
             }
 
@@ -87,8 +88,8 @@ sealed class GradeCellViewState {
             /* The 'Out of' text abbreviates the word "points" to "pts" which is read as "P T S" by screen readers, so
              * we use a second string with the full word "points" as a content description. */
             val pointsPossibleText = NumberHelper.formatDecimal(assignment.pointsPossible, 2, true)
-            val outOfText = context.getString(R.string.outOfPointsAbbreviatedFormatted, pointsPossibleText)
-            val outOfContentDescriptionText = context.getString(R.string.outOfPointsFormatted, pointsPossibleText)
+            val outOfText = if (restrictQuantitativeData) "" else context.getString(R.string.outOfPointsAbbreviatedFormatted, pointsPossibleText)
+            val outOfContentDescriptionText = if (restrictQuantitativeData) "" else context.getString(R.string.outOfPointsFormatted, pointsPossibleText)
 
             // Excused
             if (submission.excused) {
@@ -116,6 +117,21 @@ sealed class GradeCellViewState {
                 )
             }
 
+            if (restrictQuantitativeData) {
+                val grade = submission.grade.orEmpty()
+                val accessibleGradeString = getContentDescriptionForMinusGradeString(grade, context)
+                val gradeCellContentDescription = context.getString(R.string.a11y_gradeCellContentDescriptionLetterGradeOnly, accessibleGradeString)
+
+                return GradeData(
+                    showCompleteIcon = true,
+                    graphPercent = 1.0f,
+                    accentColor = accentColor,
+                    grade = grade,
+                    gradeContentDescription = accessibleGradeString,
+                    gradeCellContentDescription = gradeCellContentDescription
+                )
+            }
+
             val score = NumberHelper.formatDecimal(submission.enteredScore, 2, true)
             val graphPercent = (submission.enteredScore / assignment.pointsPossible).coerceIn(0.0, 1.0).toFloat()
 
diff --git a/apps/student/src/test/java/com/instructure/student/test/assignment/details/GradeCellStateTest.kt b/apps/student/src/test/java/com/instructure/student/test/assignment/details/GradeCellStateTest.kt
index f2ab5c245c..461a326251 100644
--- a/apps/student/src/test/java/com/instructure/student/test/assignment/details/GradeCellStateTest.kt
+++ b/apps/student/src/test/java/com/instructure/student/test/assignment/details/GradeCellStateTest.kt
@@ -140,6 +140,8 @@ class GradeCellStateTest : Assert() {
             graphPercent = 1.0f,
             showCompleteIcon = true,
             grade = "Excused",
+            outOf = "Out of 100 pts",
+            outOfContentDescription = "Out of 100 points",
             gradeCellContentDescription = ""
         )
         val actual = GradeCellViewState.fromSubmission(context, baseAssignment, submission)
@@ -243,6 +245,8 @@ class GradeCellStateTest : Assert() {
             showPointsLabel = true,
             grade = "B+",
             gradeContentDescription = "B+",
+            outOf = "Out of 100 pts",
+            outOfContentDescription = "Out of 100 points",
             gradeCellContentDescription = "85 Out of 100 points, B+"
         )
         val actual = GradeCellViewState.fromSubmission(context, assignment, submission)
@@ -388,4 +392,52 @@ class GradeCellStateTest : Assert() {
         assertEquals(expected, actual.stats)
     }
 
+    @Test
+    fun `Returns empty state when assignment is quantitative and quantitative data is restricted`() {
+        val assignment = baseAssignment.copy(
+            gradingType = Assignment.POINTS_TYPE
+        )
+        val expected = GradeCellViewState.Empty
+        val actual = GradeCellViewState.fromSubmission(context, assignment, Submission(), true)
+        assertEquals(expected, actual)
+    }
+
+    @Test
+    fun `Create excused grade cell without points when assignment is quantitative and quantitative data is restricted`() {
+        val submission = baseSubmission.copy(
+            excused = true
+        )
+        val expected = baseGradedState.copy(
+            graphPercent = 1.0f,
+            showCompleteIcon = true,
+            grade = "Excused",
+            outOf = "",
+            outOfContentDescription = "",
+            gradeCellContentDescription = ""
+        )
+        val actual = GradeCellViewState.fromSubmission(context, baseAssignment, submission, true)
+        assertEquals(expected, actual)
+    }
+
+    @Test
+    fun `Create letter grade cell without points when quantitative data is restricted`() {
+        val assignment = baseAssignment.copy(
+            gradingType = Assignment.LETTER_GRADE_TYPE
+        )
+        val submission = baseSubmission.copy(
+            grade = "B+"
+        )
+        val expected = baseGradedState.copy(
+            graphPercent = 1.0f,
+            score = "",
+            showCompleteIcon = true,
+            grade = "B+",
+            gradeContentDescription = "B+",
+            outOf = "",
+            outOfContentDescription = "",
+            gradeCellContentDescription = "Grade: B+"
+        )
+        val actual = GradeCellViewState.fromSubmission(context, assignment, submission, true)
+        assertEquals(expected, actual)
+    }
 }
diff --git a/apps/student/src/test/java/com/instructure/student/test/assignment/details/submissionDetails/SubmissionDetailsEffectHandlerTest.kt b/apps/student/src/test/java/com/instructure/student/test/assignment/details/submissionDetails/SubmissionDetailsEffectHandlerTest.kt
index 1ada21d48d..93ea7990e7 100644
--- a/apps/student/src/test/java/com/instructure/student/test/assignment/details/submissionDetails/SubmissionDetailsEffectHandlerTest.kt
+++ b/apps/student/src/test/java/com/instructure/student/test/assignment/details/submissionDetails/SubmissionDetailsEffectHandlerTest.kt
@@ -51,9 +51,13 @@ class SubmissionDetailsEffectHandlerTest : Assert() {
     fun setup() {
         Dispatchers.setMain(Executors.newSingleThreadExecutor().asCoroutineDispatcher())
         mockkObject(FeaturesManager)
+        mockkObject(CourseManager)
         every { FeaturesManager.getEnabledFeaturesForCourseAsync(any(), any()) } returns mockk {
             coEvery { await() } returns DataResult.Success(listOf("assignments_2_student"))
         }
+        every { CourseManager.getCourseSettingsAsync(any(), any()) } returns mockk {
+            coEvery { await() } returns DataResult.Success(CourseSettings())
+        }
     }
 
     @Test
diff --git a/apps/student/src/test/java/com/instructure/student/test/assignment/details/submissionDetails/rubricTab/SubmissionRubricPresenterTest.kt b/apps/student/src/test/java/com/instructure/student/test/assignment/details/submissionDetails/rubricTab/SubmissionRubricPresenterTest.kt
index 3f8690ec89..b6fbee35fb 100644
--- a/apps/student/src/test/java/com/instructure/student/test/assignment/details/submissionDetails/rubricTab/SubmissionRubricPresenterTest.kt
+++ b/apps/student/src/test/java/com/instructure/student/test/assignment/details/submissionDetails/rubricTab/SubmissionRubricPresenterTest.kt
@@ -455,4 +455,25 @@ class SubmissionRubricPresenterTest : Assert() {
         val actualState = SubmissionRubricPresenter.present(model, context)
         assertEquals(expectedState, actualState)
     }
+
+    @Test
+    fun `Returns correct state when quantitative data is restricted`() {
+        val model = modelTemplate.copy(
+            restrictQuantitativeData = true
+        )
+        val expectedState = SubmissionRubricViewState(
+            listOf(
+                RubricListData.Grade(GradeCellViewState.fromSubmission(context, assignmentTemplate, submissionTemplate, true)),
+                criterionTemplate.copy(
+                    ratings = listOf(
+                        RatingData("_id1", "Rating 1 Title", isSelected = false, isAssessed = false, useSmallText = true),
+                        RatingData("_id2", "Rating 2 Title", isSelected = true, isAssessed = true, useSmallText = true),
+                        RatingData("_id3", "Rating 3 Title", isSelected = false, isAssessed = false, useSmallText = true)
+                    )
+                )
+            )
+        )
+        val actualState = SubmissionRubricPresenter.present(model, context)
+        assertEquals(expectedState, actualState)
+    }
 }

From 1709bcf466ea4f849c4110fb06d4900ab57a8d71 Mon Sep 17 00:00:00 2001
From: Kristof Deak <92309696+kdeakinstructure@users.noreply.github.com>
Date: Tue, 15 Aug 2023 14:46:41 +0200
Subject: [PATCH 02/22] [MBL-16941][Student][Teacher] - Introduce
 SearchablePage interface (#2090)

---
 .../student/ui/e2e/AnnouncementsE2ETest.kt    | 10 ++--
 .../student/ui/e2e/AssignmentsE2ETest.kt      |  4 +-
 .../student/ui/e2e/DiscussionsE2ETest.kt      |  6 +--
 .../student/ui/e2e/FilesE2ETest.kt            |  8 ++-
 .../student/ui/e2e/PagesE2ETest.kt            | 20 ++++++++
 .../student/ui/e2e/QuizzesE2ETest.kt          |  1 +
 .../AnnouncementInteractionTest.kt            | 19 +++++--
 .../student/ui/pages/AnnouncementListPage.kt  |  2 +-
 .../student/ui/pages/AssignmentListPage.kt    | 34 +++++++++----
 .../student/ui/pages/DiscussionListPage.kt    | 17 +------
 .../student/ui/pages/FileListPage.kt          | 23 ++-------
 .../student/ui/pages/PageListPage.kt          | 24 ++++++---
 .../student/ui/utils/StudentTest.kt           |  9 ++--
 .../teacher/ui/AnnouncementsListPageTest.kt   |  8 +--
 .../teacher/ui/DiscussionsListPageTest.kt     |  8 +--
 .../teacher/ui/PageListPageTest.kt            |  4 +-
 .../teacher/ui/QuizListPageTest.kt            |  4 +-
 .../teacher/ui/e2e/AnnouncementsE2ETest.kt    |  6 +--
 .../teacher/ui/e2e/DiscussionsE2ETest.kt      | 15 ++++--
 .../teacher/ui/e2e/FilesE2ETest.kt            | 12 ++---
 .../teacher/ui/e2e/PagesE2ETest.kt            |  8 ++-
 .../teacher/ui/e2e/PeopleE2ETest.kt           |  8 +--
 .../teacher/ui/pages/AnnouncementsListPage.kt | 50 +------------------
 .../teacher/ui/pages/DiscussionsListPage.kt   | 25 ++--------
 .../teacher/ui/pages/FileListPage.kt          | 35 +------------
 .../teacher/ui/pages/PageListPage.kt          | 25 +---------
 .../teacher/ui/pages/PeopleListPage.kt        | 27 +---------
 .../teacher/ui/pages/QuizListPage.kt          | 20 +-------
 .../teacher/ui/utils/TeacherTest.kt           | 14 +++---
 .../espresso/CustomViewAssertions.kt          | 20 ++++++++
 .../com/instructure/espresso/Searchable.kt    | 25 ++++++++++
 .../espresso/matchers/WaitForViewMatcher.kt   |  4 +-
 32 files changed, 209 insertions(+), 286 deletions(-)
 create mode 100644 automation/espresso/src/main/kotlin/com/instructure/espresso/Searchable.kt

diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/AnnouncementsE2ETest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/AnnouncementsE2ETest.kt
index d34e9611d7..65b44544cd 100644
--- a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/AnnouncementsE2ETest.kt
+++ b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/AnnouncementsE2ETest.kt
@@ -92,8 +92,8 @@ class AnnouncementsE2ETest : StudentTest() {
 
         Log.d(STEP_TAG,"Click on Search button and type ${announcement.title} to the search input field.")
         Espresso.pressBack()
-        discussionListPage.clickOnSearchButton()
-        discussionListPage.typeToSearchBar(announcement.title)
+        discussionListPage.searchable.clickOnSearchButton()
+        discussionListPage.searchable.typeToSearchBar(announcement.title)
 
         Log.d(STEP_TAG,"Assert that only the matching announcement is displayed on the Discussion List Page.")
         discussionListPage.pullToUpdate()
@@ -101,12 +101,12 @@ class AnnouncementsE2ETest : StudentTest() {
         discussionListPage.assertTopicNotDisplayed(lockedAnnouncement.title)
 
         Log.d(STEP_TAG,"Clear search input field value and assert if all the announcements are displayed again on the Discussion List Page.")
-        discussionListPage.clickOnClearSearchButton()
+        discussionListPage.searchable.clickOnClearSearchButton()
         discussionListPage.waitForDiscussionTopicToDisplay(lockedAnnouncement.title)
         discussionListPage.assertTopicDisplayed(announcement.title)
 
         Log.d(STEP_TAG,"Type a search value to the search input field which does not much with any of the existing announcements.")
-        discussionListPage.typeToSearchBar("Non existing announcement title")
+        discussionListPage.searchable.typeToSearchBar("Non existing announcement title")
         sleep(3000) //We need this wait here to let make sure the search process has finished.
 
         Log.d(STEP_TAG,"Assert that the empty view is displayed and none of the announcements are appearing on the page.")
@@ -115,7 +115,7 @@ class AnnouncementsE2ETest : StudentTest() {
         discussionListPage.assertTopicNotDisplayed(lockedAnnouncement.title)
 
         Log.d(STEP_TAG,"Clear search input field value and assert if all the announcements are displayed again on the Discussion List Page.")
-        discussionListPage.clickOnClearSearchButton()
+        discussionListPage.searchable.clickOnClearSearchButton()
         discussionListPage.waitForDiscussionTopicToDisplay(lockedAnnouncement.title)
         discussionListPage.assertTopicDisplayed(announcement.title)
 
diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/AssignmentsE2ETest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/AssignmentsE2ETest.kt
index 2d98a6a603..018271a8d4 100644
--- a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/AssignmentsE2ETest.kt
+++ b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/AssignmentsE2ETest.kt
@@ -386,10 +386,10 @@ class AssignmentsE2ETest: StudentTest() {
         assignmentListPage.expandCollapseAssignmentGroup("Assignments")
 
         Log.d(STEP_TAG, "Click on the 'Search' (magnifying glass) icon at the toolbar.")
-        assignmentListPage.clickOnSearchButton()
+        assignmentListPage.searchable.clickOnSearchButton()
 
         Log.d(STEP_TAG, "Type the name of the '${missingAssignment.name}' assignment.")
-        assignmentListPage.typeToSearchBar(missingAssignment.name.drop(5))
+        assignmentListPage.searchable.typeToSearchBar(missingAssignment.name.drop(5))
 
         Log.d(STEP_TAG, "Assert that the '${missingAssignment.name}' assignment has been found by previously typed search string.")
         sleep(3000) // Allow the search input to propagate
diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/DiscussionsE2ETest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/DiscussionsE2ETest.kt
index 891abc37ce..85506cb028 100644
--- a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/DiscussionsE2ETest.kt
+++ b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/DiscussionsE2ETest.kt
@@ -88,8 +88,8 @@ class DiscussionsE2ETest: StudentTest() {
         Espresso.pressBack()
 
         Log.d(STEP_TAG,"Click on the 'Search' button and search for ${announcement2.title}. announcement.")
-        discussionListPage.clickOnSearchButton()
-        discussionListPage.typeToSearchBar(announcement2.title)
+        discussionListPage.searchable.clickOnSearchButton()
+        discussionListPage.searchable.typeToSearchBar(announcement2.title)
 
         Log.d(STEP_TAG,"Refresh the page. Assert that the searching method is working well, so ${announcement.title} won't be displayed and ${announcement2.title} is displayed.")
         discussionListPage.pullToUpdate()
@@ -97,7 +97,7 @@ class DiscussionsE2ETest: StudentTest() {
         discussionListPage.assertTopicNotDisplayed(announcement.title)
 
         Log.d(STEP_TAG,"Clear the search input field and assert that both announcements, ${announcement.title} and ${announcement2.title} has been diplayed.")
-        discussionListPage.clickOnClearSearchButton()
+        discussionListPage.searchable.clickOnClearSearchButton()
         discussionListPage.waitForDiscussionTopicToDisplay(announcement.title)
         discussionListPage.assertTopicDisplayed(announcement2.title)
 
diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/FilesE2ETest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/FilesE2ETest.kt
index b7e1f53e7e..794c7dc02b 100644
--- a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/FilesE2ETest.kt
+++ b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/FilesE2ETest.kt
@@ -20,7 +20,6 @@ import android.os.Environment
 import android.util.Log
 import androidx.test.espresso.Espresso
 import com.instructure.canvas.espresso.E2E
-import com.instructure.canvas.espresso.refresh
 import com.instructure.canvasapi2.managers.DiscussionManager
 import com.instructure.canvasapi2.models.CanvasContext
 import com.instructure.canvasapi2.models.DiscussionEntry
@@ -186,14 +185,14 @@ class FilesE2ETest: StudentTest() {
         fileListPage.assertItemDisplayed("unfiled") // Our discussion attachment goes under "unfiled"
 
         Log.d(STEP_TAG, "Click on 'Search' (magnifying glass) icon and type '${discussionAttachmentFile.name}', the file's name to the search input field.")
-        fileListPage.clickSearchButton()
-        fileListPage.typeSearchInput(discussionAttachmentFile.name)
+        fileListPage.searchable.clickOnSearchButton()
+        fileListPage.searchable.typeToSearchBar(discussionAttachmentFile.name)
 
         Log.d(STEP_TAG, "Assert that only 1 file matches for the search text, and it is '${discussionAttachmentFile.name}', and no directories has been shown in the result. Press search back button the quit from search result view.")
         fileListPage.assertSearchResultCount(1)
         fileListPage.assertItemDisplayed(discussionAttachmentFile.name)
         fileListPage.assertItemNotDisplayed("unfiled")
-        fileListPage.pressSearchBackButton()
+        fileListPage.searchable.pressSearchBackButton()
 
         Log.d(STEP_TAG,"Select 'unfiled' directory. Assert that ${discussionAttachmentFile.name} file is displayed on the File List Page.")
         fileListPage.selectItem("unfiled")
@@ -214,7 +213,6 @@ class FilesE2ETest: StudentTest() {
 
         Log.d(STEP_TAG, "Navigate back to global File List Page. Assert that the 'unfiled' folder has 0 items because we deleted the only item in it recently.")
         Espresso.pressBack()
-        refresh() //TODO after this bugfix: https://instructure.atlassian.net/browse/MBL-16937?atlOrigin=eyJpIjoiNWJjODY1MTI4NDE0NGQxM2E3ZjBiYTQzZDdlM2IwOWIiLCJwIjoiaiJ9
         fileListPage.assertFolderSize("unfiled", 0)
 
         val testFolderName = "Krissinho's Test Folder"
diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/PagesE2ETest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/PagesE2ETest.kt
index 1dac3ed502..2f48aaacd3 100644
--- a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/PagesE2ETest.kt
+++ b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/PagesE2ETest.kt
@@ -81,6 +81,26 @@ class PagesE2ETest: StudentTest() {
         Log.d(STEP_TAG,"Assert that '${pageUnpublished.title}' unpublished page is NOT displayed.")
         pageListPage.assertPageNotDisplayed(pageUnpublished)
 
+        Log.d(STEP_TAG, "Click on 'Search' (magnifying glass) icon and type '${pagePublishedFront.title}', the page's name to the search input field.")
+        pageListPage.searchable.clickOnSearchButton()
+        pageListPage.searchable.typeToSearchBar(pagePublishedFront.title)
+
+        Log.d(STEP_TAG,"Assert that '${pagePublished.title}' published page is NOT displayed and there is only one page (the front page) is displayed.")
+        pageListPage.assertPageNotDisplayed(pagePublished)
+        pageListPage.assertPageListItemCount(1)
+
+        Log.d(STEP_TAG, "Click on clear search icon (X).")
+        pageListPage.searchable.clickOnClearSearchButton()
+
+        Log.d(STEP_TAG,"Assert that '${pagePublishedFront.title}' published front page is displayed.")
+        pageListPage.assertFrontPageDisplayed(pagePublishedFront)
+
+        Log.d(STEP_TAG,"Assert that '${pagePublished.title}' published page is displayed.")
+        pageListPage.assertRegularPageDisplayed(pagePublished)
+
+        Log.d(STEP_TAG,"Assert that '${pageUnpublished.title}' unpublished page is NOT displayed.")
+        pageListPage.assertPageNotDisplayed(pageUnpublished)
+
         Log.d(STEP_TAG,"Open '${pagePublishedFront.title}' page. Assert that it is really a front (published) page via web view assertions.")
         pageListPage.selectFrontPage(pagePublishedFront)
         canvasWebViewPage.runTextChecks(WebViewTextCheck(Locator.ID, "header1", "Front Page Text"))
diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/QuizzesE2ETest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/QuizzesE2ETest.kt
index 472584de69..13261cd33e 100644
--- a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/QuizzesE2ETest.kt
+++ b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/QuizzesE2ETest.kt
@@ -248,4 +248,5 @@ class QuizzesE2ETest: StudentTest() {
     //                        answers = listOf()
     //                )
     )
+
 }
\ No newline at end of file
diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/AnnouncementInteractionTest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/AnnouncementInteractionTest.kt
index a857544b3b..187ff93b34 100644
--- a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/AnnouncementInteractionTest.kt
+++ b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/AnnouncementInteractionTest.kt
@@ -17,8 +17,17 @@ package com.instructure.student.ui.interaction
 
 import androidx.test.espresso.Espresso
 import androidx.test.espresso.web.webdriver.Locator
-import com.instructure.canvas.espresso.mockCanvas.*
-import com.instructure.canvasapi2.models.*
+import com.instructure.canvas.espresso.mockCanvas.MockCanvas
+import com.instructure.canvas.espresso.mockCanvas.addCoursePermissions
+import com.instructure.canvas.espresso.mockCanvas.addDiscussionTopicToCourse
+import com.instructure.canvas.espresso.mockCanvas.addGroupToCourse
+import com.instructure.canvas.espresso.mockCanvas.init
+import com.instructure.canvasapi2.models.CanvasContextPermission
+import com.instructure.canvasapi2.models.Course
+import com.instructure.canvasapi2.models.DiscussionTopicHeader
+import com.instructure.canvasapi2.models.Group
+import com.instructure.canvasapi2.models.Tab
+import com.instructure.canvasapi2.models.User
 import com.instructure.panda_annotations.FeatureCategory
 import com.instructure.panda_annotations.Priority
 import com.instructure.panda_annotations.TestCategory
@@ -219,14 +228,14 @@ class AnnouncementInteractionTest : StudentTest() {
         discussionListPage.createAnnouncement(testAnnouncementName, "description")
         discussionListPage.assertAnnouncementCreated(testAnnouncementName)
 
-        discussionListPage.clickOnSearchButton()
-        discussionListPage.typeToSearchBar(testAnnouncementName)
+        discussionListPage.searchable.clickOnSearchButton()
+        discussionListPage.searchable.typeToSearchBar(testAnnouncementName)
 
         discussionListPage.pullToUpdate()
         discussionListPage.assertTopicDisplayed(testAnnouncementName)
         discussionListPage.assertTopicNotDisplayed(existingAnnouncementName)
 
-        discussionListPage.clickOnClearSearchButton()
+        discussionListPage.searchable.clickOnClearSearchButton()
         discussionListPage.waitForDiscussionTopicToDisplay(existingAnnouncementName!!)
         discussionListPage.assertTopicDisplayed(testAnnouncementName)
     }
diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/pages/AnnouncementListPage.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/pages/AnnouncementListPage.kt
index d56e3f34e0..d4986a1d9e 100644
--- a/apps/student/src/androidTest/java/com/instructure/student/ui/pages/AnnouncementListPage.kt
+++ b/apps/student/src/androidTest/java/com/instructure/student/ui/pages/AnnouncementListPage.kt
@@ -26,7 +26,7 @@ import com.instructure.espresso.page.withParent
 import com.instructure.espresso.page.withText
 import com.instructure.student.R
 
-class AnnouncementListPage : BasePage(R.id.discussionListPage) {
+class AnnouncementListPage() : BasePage(R.id.discussionListPage) {
 
     fun assertToolbarTitle() {
         WaitForViewMatcher.waitForView(withParent(R.id.discussionListToolbar) + withText(R.string.announcements)).assertDisplayed()
diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/pages/AssignmentListPage.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/pages/AssignmentListPage.kt
index cb79a791e3..6244425c93 100644
--- a/apps/student/src/androidTest/java/com/instructure/student/ui/pages/AssignmentListPage.kt
+++ b/apps/student/src/androidTest/java/com/instructure/student/ui/pages/AssignmentListPage.kt
@@ -27,14 +27,34 @@ import com.instructure.canvas.espresso.waitForMatcherWithRefreshes
 import com.instructure.canvasapi2.models.Assignment
 import com.instructure.dataseeding.model.AssignmentApiModel
 import com.instructure.dataseeding.model.QuizApiModel
-import com.instructure.espresso.*
-import com.instructure.espresso.page.*
+import com.instructure.espresso.OnViewWithId
+import com.instructure.espresso.RecyclerViewItemCountAssertion
+import com.instructure.espresso.Searchable
+import com.instructure.espresso.WaitForViewWithId
+import com.instructure.espresso.WaitForViewWithText
+import com.instructure.espresso.assertDisplayed
+import com.instructure.espresso.assertHasText
+import com.instructure.espresso.assertNotDisplayed
+import com.instructure.espresso.assertVisible
+import com.instructure.espresso.click
+import com.instructure.espresso.page.BasePage
+import com.instructure.espresso.page.onView
+import com.instructure.espresso.page.plus
+import com.instructure.espresso.page.waitForView
+import com.instructure.espresso.page.waitForViewWithText
+import com.instructure.espresso.page.withAncestor
+import com.instructure.espresso.page.withId
+import com.instructure.espresso.page.withParent
+import com.instructure.espresso.page.withText
+import com.instructure.espresso.scrollTo
+import com.instructure.espresso.swipeDown
+import com.instructure.espresso.waitForCheck
 import com.instructure.student.R
 import org.hamcrest.Matcher
 import org.hamcrest.Matchers.allOf
 import org.hamcrest.Matchers.containsString
 
-class AssignmentListPage : BasePage(pageResId = R.id.assignmentListPage) {
+class AssignmentListPage(val searchable: Searchable) : BasePage(pageResId = R.id.assignmentListPage) {
 
     private val assignmentListToolbar by OnViewWithId(R.id.toolbar)
     private val gradingPeriodHeader by WaitForViewWithId(R.id.termSpinnerLayout)
@@ -84,14 +104,6 @@ class AssignmentListPage : BasePage(pageResId = R.id.assignmentListPage) {
         onView(withId(R.id.points) + withParent(hasSibling(pointsMatcher))).assertNotDisplayed()
     }
 
-    fun clickOnSearchButton() {
-        onView(withId(R.id.search)).click()
-    }
-
-    fun typeToSearchBar(textToType: String) {
-        waitForViewWithId(R.id.search_src_text).replaceText(textToType)
-    }
-
     fun assertAssignmentNotDisplayed(assignmentName: String) {
         onView(withText(assignmentName) + withId(R.id.title) + hasSibling(withId(R.id.description))).check(doesNotExist())
     }
diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/pages/DiscussionListPage.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/pages/DiscussionListPage.kt
index 5e7d5468a3..3e6bebfce7 100644
--- a/apps/student/src/androidTest/java/com/instructure/student/ui/pages/DiscussionListPage.kt
+++ b/apps/student/src/androidTest/java/com/instructure/student/ui/pages/DiscussionListPage.kt
@@ -27,6 +27,7 @@ import com.instructure.canvas.espresso.waitForMatcherWithRefreshes
 import com.instructure.canvasapi2.models.DiscussionTopicHeader
 import com.instructure.espresso.OnViewWithId
 import com.instructure.espresso.RecyclerViewItemCountAssertion
+import com.instructure.espresso.Searchable
 import com.instructure.espresso.assertDisplayed
 import com.instructure.espresso.assertNotDisplayed
 import com.instructure.espresso.click
@@ -35,12 +36,10 @@ import com.instructure.espresso.page.onView
 import com.instructure.espresso.page.onViewWithText
 import com.instructure.espresso.page.plus
 import com.instructure.espresso.page.waitForView
-import com.instructure.espresso.page.waitForViewWithId
 import com.instructure.espresso.page.withAncestor
 import com.instructure.espresso.page.withDescendant
 import com.instructure.espresso.page.withId
 import com.instructure.espresso.page.withText
-import com.instructure.espresso.replaceText
 import com.instructure.espresso.scrollTo
 import com.instructure.espresso.swipeDown
 import com.instructure.espresso.waitForCheck
@@ -50,7 +49,7 @@ import org.hamcrest.Matchers.allOf
 import org.hamcrest.Matchers.anyOf
 import org.hamcrest.Matchers.containsString
 
-class DiscussionListPage : BasePage(R.id.discussionListPage) {
+class DiscussionListPage(val searchable: Searchable) : BasePage(R.id.discussionListPage) {
 
     private val createNewDiscussion by OnViewWithId(R.id.createNewDiscussion)
     private val announcementsRecyclerView by OnViewWithId(R.id.discussionRecyclerView)
@@ -150,18 +149,6 @@ class DiscussionListPage : BasePage(R.id.discussionListPage) {
         onView(withContentDescription("Close")).click()
     }
 
-    fun clickOnSearchButton() {
-        onView(withId(R.id.search)).click()
-    }
-
-    fun typeToSearchBar(textToType: String) {
-        waitForViewWithId(R.id.search_src_text).replaceText(textToType)
-    }
-
-    fun clickOnClearSearchButton() {
-        onView(withId(R.id.search_close_btn)).click()
-    }
-
     fun verifyExitWithoutSavingDialog() {
         onView(withText(R.string.exitWithoutSavingMessage)).check(matches(isDisplayed()))
     }
diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/pages/FileListPage.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/pages/FileListPage.kt
index a3c35dc8e9..7ebf099da4 100644
--- a/apps/student/src/androidTest/java/com/instructure/student/ui/pages/FileListPage.kt
+++ b/apps/student/src/androidTest/java/com/instructure/student/ui/pages/FileListPage.kt
@@ -28,6 +28,7 @@ import com.instructure.canvas.espresso.containsTextCaseInsensitive
 import com.instructure.canvas.espresso.scrollRecyclerView
 import com.instructure.canvas.espresso.withCustomConstraints
 import com.instructure.espresso.OnViewWithId
+import com.instructure.espresso.Searchable
 import com.instructure.espresso.assertDisplayed
 import com.instructure.espresso.assertNotDisplayed
 import com.instructure.espresso.clearText
@@ -39,7 +40,6 @@ import com.instructure.espresso.page.waitForView
 import com.instructure.espresso.page.waitForViewWithId
 import com.instructure.espresso.page.withAncestor
 import com.instructure.espresso.page.withId
-import com.instructure.espresso.replaceText
 import com.instructure.espresso.scrollTo
 import com.instructure.espresso.typeText
 import com.instructure.student.R
@@ -47,7 +47,7 @@ import org.hamcrest.Matchers.allOf
 
 // Tests that files submitted for submissions, submission comments and discussions are
 // properly displayed.
-class FileListPage : BasePage(R.id.fileListPage) {
+class FileListPage(val searchable: Searchable) : BasePage(R.id.fileListPage) {
 
     private val addButton by OnViewWithId(R.id.addFab)
     private val uploadFileButton by OnViewWithId(R.id.addFileFab, autoAssert = false)
@@ -124,19 +124,6 @@ class FileListPage : BasePage(R.id.fileListPage) {
         onView(allOf(withId(R.id.emptyView), isDisplayed())).assertDisplayed()
     }
 
-    fun clickSearchButton() {
-        onView(withId(R.id.search)).click()
-    }
-
-    fun typeSearchInput(searchText: String) {
-        onView(withId(R.id.queryInput)).replaceText(searchText)
-    }
-
-    fun clickResetSearchText() {
-        waitForView(withId(R.id.clearButton)).click()
-        onView(withId(R.id.backButton)).click()
-    }
-
     fun assertSearchResultCount(expectedCount: Int) {
         Thread.sleep(2000)
         onView(withId(R.id.fileSearchRecyclerView) + withAncestor(R.id.container)).check(
@@ -151,11 +138,7 @@ class FileListPage : BasePage(R.id.fileListPage) {
         )
     }
 
-    fun pressSearchBackButton() {
-        onView(withId(R.id.backButton)).click()
-    }
-
     fun assertFolderSize(folderName: String, expectedSize: Int) {
-        onView(allOf(withId(R.id.fileSize), hasSibling(withId(R.id.fileName) + withText(folderName)))).check(matches(containsTextCaseInsensitive("$expectedSize ${if (expectedSize == 1) "item" else "items"}")))
+        waitForView(allOf(withId(R.id.fileSize), hasSibling(withId(R.id.fileName) + withText(folderName)))).check(matches(containsTextCaseInsensitive("$expectedSize ${if (expectedSize == 1) "item" else "items"}")))
     }
 }
\ No newline at end of file
diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/pages/PageListPage.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/pages/PageListPage.kt
index b8f938bf65..71dea6a596 100644
--- a/apps/student/src/androidTest/java/com/instructure/student/ui/pages/PageListPage.kt
+++ b/apps/student/src/androidTest/java/com/instructure/student/ui/pages/PageListPage.kt
@@ -17,22 +17,28 @@
 package com.instructure.student.ui.pages
 
 import android.view.View
-import androidx.test.espresso.Espresso.onView
-import androidx.test.espresso.assertion.ViewAssertions.doesNotExist
+import androidx.test.espresso.matcher.ViewMatchers
 import androidx.test.espresso.matcher.ViewMatchers.hasSibling
-import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.espresso.matcher.ViewMatchers.withText
 import com.instructure.canvas.espresso.scrollRecyclerView
 import com.instructure.canvasapi2.models.Page
 import com.instructure.dataseeding.model.PageApiModel
+import com.instructure.espresso.DoesNotExistAssertion
+import com.instructure.espresso.RecyclerViewItemCountAssertion
+import com.instructure.espresso.Searchable
 import com.instructure.espresso.assertDisplayed
 import com.instructure.espresso.click
 import com.instructure.espresso.page.BasePage
+import com.instructure.espresso.page.onView
+import com.instructure.espresso.page.plus
+import com.instructure.espresso.page.withAncestor
+import com.instructure.espresso.page.withId
+import com.instructure.espresso.waitForCheck
 import com.instructure.student.R
 import org.hamcrest.Matcher
 import org.hamcrest.Matchers.allOf
 
-class PageListPage : BasePage(R.id.pageListPage) {
+class PageListPage(val searchable: Searchable) : BasePage(R.id.pageListPage) {
 
     fun assertFrontPageDisplayed(page: PageApiModel) {
         val matcher = getFrontPageMatcher(page)
@@ -96,9 +102,15 @@ class PageListPage : BasePage(R.id.pageListPage) {
 
     fun assertPageNotDisplayed(page: PageApiModel) {
         // Check for front page
-        onView(allOf(withId(R.id.homeSubLabel), withText(page.title))).check(doesNotExist())
+        onView(allOf(withId(R.id.homeSubLabel), withText(page.title))).check(DoesNotExistAssertion(10000L))
 
         // Check for regular page
-        onView(allOf(withId(R.id.title), withText(page.title))).check(doesNotExist())
+        onView(allOf(withId(R.id.title), withText(page.title))).check(DoesNotExistAssertion(10000L))
+    }
+
+    fun assertPageListItemCount(expectedCount: Int) {
+        onView(allOf(withId(R.id.listView) +
+                ViewMatchers.withParent(withId(R.id.swipeRefreshLayout)) +
+                withAncestor(withId(R.id.pageListPage)))).waitForCheck(RecyclerViewItemCountAssertion(expectedCount))
     }
 }
\ No newline at end of file
diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/utils/StudentTest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/utils/StudentTest.kt
index ad59621f01..2285f6c0ce 100644
--- a/apps/student/src/androidTest/java/com/instructure/student/ui/utils/StudentTest.kt
+++ b/apps/student/src/androidTest/java/com/instructure/student/ui/utils/StudentTest.kt
@@ -34,6 +34,7 @@ import androidx.test.espresso.matcher.ViewMatchers
 import androidx.test.platform.app.InstrumentationRegistry
 import com.instructure.canvas.espresso.CanvasTest
 import com.instructure.espresso.InstructureActivityTestRule
+import com.instructure.espresso.Searchable
 import com.instructure.espresso.swipeRight
 import com.instructure.pandautils.utils.Const
 import com.instructure.student.BuildConfig
@@ -144,7 +145,7 @@ abstract class StudentTest : CanvasTest() {
     val annotationCommentListPage = AnnotationCommentListPage()
     val announcementListPage = AnnouncementListPage()
     val assignmentDetailsPage = AssignmentDetailsPage()
-    val assignmentListPage = AssignmentListPage()
+    val assignmentListPage = AssignmentListPage(Searchable(R.id.search, R.id.search_src_text))
     val bookmarkPage = BookmarkPage()
     val calendarEventPage = CalendarEventPage()
     val canvasWebViewPage = CanvasWebViewPage()
@@ -157,9 +158,9 @@ abstract class StudentTest : CanvasTest() {
     val dashboardPage = DashboardPage()
     val leftSideNavigationDrawerPage = LeftSideNavigationDrawerPage()
     val discussionDetailsPage = DiscussionDetailsPage()
-    val discussionListPage = DiscussionListPage()
+    val discussionListPage = DiscussionListPage(Searchable(R.id.search, R.id.search_src_text, R.id.search_close_btn))
     val editDashboardPage = EditDashboardPage()
-    val fileListPage = FileListPage()
+    val fileListPage = FileListPage(Searchable(R.id.search, R.id.queryInput, R.id.clearButton, R.id.backButton))
     val fileUploadPage = FileUploadPage()
     val helpPage = HelpPage()
     val inboxConversationPage = InboxConversationPage()
@@ -173,7 +174,7 @@ abstract class StudentTest : CanvasTest() {
     val modulesPage = ModulesPage()
     val newMessagePage = NewMessagePage()
     val notificationPage = NotificationPage()
-    val pageListPage = PageListPage()
+    val pageListPage = PageListPage(Searchable(R.id.search, R.id.search_src_text, R.id.search_close_btn))
     val pairObserverPage = PairObserverPage()
     val pandaAvatarPage = PandaAvatarPage()
     val peopleListPage = PeopleListPage()
diff --git a/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/AnnouncementsListPageTest.kt b/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/AnnouncementsListPageTest.kt
index b53c9c5578..64934a2262 100644
--- a/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/AnnouncementsListPageTest.kt
+++ b/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/AnnouncementsListPageTest.kt
@@ -35,8 +35,8 @@ import com.instructure.teacher.R
 import com.instructure.teacher.ui.utils.TeacherTest
 import com.instructure.teacher.ui.utils.tokenLogin
 import dagger.hilt.android.testing.HiltAndroidTest
-import org.hamcrest.Matchers.`is`
 import org.hamcrest.Matchers.allOf
+import org.hamcrest.Matchers.`is`
 import org.junit.Test
 
 @HiltAndroidTest
@@ -76,9 +76,9 @@ class AnnouncementsListPageTest : TeacherTest() {
         val searchAnnouncement = announcements[2]
 
         announcementsListPage.assertAnnouncementCount(announcements.size + 1) // +1 to account for header
-        announcementsListPage.openSearch()
-        announcementsListPage.enterSearchQuery(searchAnnouncement.title!!.take(searchAnnouncement.title!!.length / 2))
-        announcementsListPage.assertAnnouncementCount(2) // header + single search result
+        announcementsListPage.searchable.clickOnSearchButton()
+        announcementsListPage.searchable.typeToSearchBar(searchAnnouncement.title!!.take(searchAnnouncement.title!!.length / 2))
+        announcementsListPage.assertSearchResultCount(1)
         announcementsListPage.assertHasAnnouncement(searchAnnouncement)
     }
 
diff --git a/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/DiscussionsListPageTest.kt b/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/DiscussionsListPageTest.kt
index 80f1b5803d..1f962bc1a0 100644
--- a/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/DiscussionsListPageTest.kt
+++ b/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/DiscussionsListPageTest.kt
@@ -49,10 +49,10 @@ class DiscussionsListPageTest : TeacherTest() {
     fun searchesDiscussions() {
         val discussions = getToDiscussionsListPage(discussionCount = 3).courseDiscussionTopicHeaders[course.id]!!
         val searchDiscussion = discussions[2]
-        discussionsListPage.assertDiscussionCount(discussions.size + 1) // +1 to account for header
-        discussionsListPage.openSearch()
-        discussionsListPage.enterSearchQuery(searchDiscussion.title!!.take(searchDiscussion.title!!.length / 2))
-        discussionsListPage.assertDiscussionCount(2) // header + single search result
+        discussionsListPage.assertDiscussionCount(discussions.size)
+        discussionsListPage.searchable.clickOnSearchButton()
+        discussionsListPage.searchable.typeToSearchBar(searchDiscussion.title!!.take(searchDiscussion.title!!.length / 2))
+        discussionsListPage.assertDiscussionCount(1)
         discussionsListPage.assertHasDiscussion(searchDiscussion)
     }
 
diff --git a/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/PageListPageTest.kt b/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/PageListPageTest.kt
index 5492ddcc65..db39f7c554 100644
--- a/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/PageListPageTest.kt
+++ b/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/PageListPageTest.kt
@@ -41,8 +41,8 @@ class PageListPageTest : TeacherTest() {
         val pages = getToPageListPage(pageCount = 3)
         val searchPage = pages[2]
         pageListPage.assertPageCount(pages.size)
-        pageListPage.openSearch()
-        pageListPage.enterSearchQuery(searchPage.title!!.take(searchPage.title!!.length / 2))
+        pageListPage.searchable.clickOnSearchButton()
+        pageListPage.searchable.typeToSearchBar(searchPage.title!!.take(searchPage.title!!.length / 2))
         pageListPage.assertPageCount(1)
         pageListPage.assertHasPage(searchPage)
     }
diff --git a/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/QuizListPageTest.kt b/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/QuizListPageTest.kt
index 878a911118..f57ccc6c44 100644
--- a/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/QuizListPageTest.kt
+++ b/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/QuizListPageTest.kt
@@ -56,8 +56,8 @@ class QuizListPageTest : TeacherTest() {
         val quizzes = getToQuizzesPage(quizCount = 3)
         val searchQuiz = quizzes[2]
         quizListPage.assertQuizCount(quizzes.size + 1) // +1 to account for header
-        quizListPage.openSearch()
-        quizListPage.enterSearchQuery(searchQuiz.title!!.take(searchQuiz.title!!.length / 2))
+        quizListPage.searchable.clickOnSearchButton()
+        quizListPage.searchable.typeToSearchBar(searchQuiz.title!!.take(searchQuiz.title!!.length / 2))
         quizListPage.assertQuizCount(2) // header + single search result
         quizListPage.assertHasQuiz(searchQuiz)
     }
diff --git a/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/e2e/AnnouncementsE2ETest.kt b/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/e2e/AnnouncementsE2ETest.kt
index 6f8268f398..fb91c72a4a 100644
--- a/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/e2e/AnnouncementsE2ETest.kt
+++ b/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/e2e/AnnouncementsE2ETest.kt
@@ -70,15 +70,15 @@ class AnnouncementsE2ETest : TeacherTest() {
         announcementsListPage.assertHasAnnouncement(announcement)
 
         Log.d(STEP_TAG, "Click on 'Search' (magnifying glass) icon and type '${announcement2.title}', one of the announcements' name to the search input field.")
-        announcementsListPage.clickSearchButton()
-        announcementsListPage.typeSearchInput(announcement2.title)
+        announcementsListPage.searchable.clickOnSearchButton()
+        announcementsListPage.searchable.typeToSearchBar(announcement2.title)
 
         Log.d(STEP_TAG, "Assert that only 1 announcement matches for the search text, and it is '${announcement2.title}'.")
         announcementsListPage.assertSearchResultCount(1)
         announcementsListPage.assertHasAnnouncement(announcement2)
 
         Log.d(STEP_TAG, "Click on 'Reset' search (cross) icon and assert that all the announcements are displayed (2).")
-        announcementsListPage.clickResetSearchText()
+        announcementsListPage.searchable.clickOnClearSearchButton()
         announcementsListPage.assertSearchResultCount(2)
 
         Log.d(STEP_TAG,"Edit ${announcement.title} announcement's name to 'Haha'. Save the modifications.")
diff --git a/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/e2e/DiscussionsE2ETest.kt b/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/e2e/DiscussionsE2ETest.kt
index 676ee37d3d..17132fd6d5 100644
--- a/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/e2e/DiscussionsE2ETest.kt
+++ b/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/e2e/DiscussionsE2ETest.kt
@@ -121,23 +121,28 @@ class DiscussionsE2ETest : TeacherTest() {
         Espresso.pressBack()
 
         Log.d(STEP_TAG,"Click on the Search icon and type some search query string which matches only with the previously created discussion's title.")
-        discussionsListPage.openSearch()
-        discussionsListPage.enterSearchQuery("Test Discussion")
+        discussionsListPage.searchable.clickOnSearchButton()
+        discussionsListPage.searchable.typeToSearchBar("Test Discussion")
 
         Log.d(STEP_TAG,"Assert that the '$newDiscussionTitle' discussion is displayed and it is the only one.")
-        discussionsListPage.assertDiscussionCount(2) // header + single search result
+        discussionsListPage.assertDiscussionCount(1)
         discussionsListPage.assertHasDiscussion(newDiscussionTitle)
         Espresso.pressBack() // need to press back to exit from the search input field
 
         Log.d(STEP_TAG,"Collapse the discussion list and assert that the '$newDiscussionTitle' discussion can NOT be seen.")
         discussionsListPage.toggleCollapseExpandIcon()
-        discussionsListPage.assertDiscussionCount(1) // header only
+        discussionsListPage.assertDiscussionCount(0) // header only
         discussionsListPage.assertDiscussionDoesNotExist(newDiscussionTitle)
 
         Log.d(STEP_TAG,"Expand the discussion list and assert that the '$newDiscussionTitle' discussion can be seen.")
         discussionsListPage.toggleCollapseExpandIcon()
-        discussionsListPage.assertDiscussionCount(2) // header only + single search result
+        discussionsListPage.assertDiscussionCount(1)
         discussionsListPage.assertHasDiscussion(newDiscussionTitle)
 
+        Log.d(STEP_TAG, "Click on the clear search input button (X) on the toolbar. Assert that the default state, so both of the discussions will be displayed.")
+        discussionsListPage.searchable.clickOnClearSearchButton()
+        discussionsListPage.assertHasDiscussion(discussion)
+        discussionsListPage.assertHasDiscussion(discussion2)
+        discussionsListPage.assertDiscussionCount(2)
     }
 }
\ No newline at end of file
diff --git a/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/e2e/FilesE2ETest.kt b/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/e2e/FilesE2ETest.kt
index 0fa4c283b7..71aab3cde4 100644
--- a/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/e2e/FilesE2ETest.kt
+++ b/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/e2e/FilesE2ETest.kt
@@ -166,8 +166,8 @@ class FilesE2ETest: TeacherTest() {
         fileListPage.assertItemDisplayed("unfiled")
 
         Log.d(STEP_TAG, "Click on 'Search' (magnifying glass) icon and type '${discussionAttachmentFile.name}', the file's name to the search input field.")
-        fileListPage.clickSearchButton()
-        fileListPage.typeSearchInput(discussionAttachmentFile.name)
+        fileListPage.searchable.clickOnSearchButton()
+        fileListPage.searchable.typeToSearchBar(discussionAttachmentFile.name)
 
         Log.d(STEP_TAG, "Assert that only 1 file matches for the search text, and it is '${discussionAttachmentFile.name}', and no directories has been shown in the result.")
         fileListPage.assertSearchResultCount(1)
@@ -175,7 +175,7 @@ class FilesE2ETest: TeacherTest() {
         fileListPage.assertItemNotDisplayed("unfiled")
 
         Log.d(STEP_TAG, "Click on 'Reset' search (cross) icon and assert that all the root level directories and files are displayed (1).")
-        fileListPage.clickResetSearchText()
+        fileListPage.searchable.clickOnClearSearchButton()
         fileListPage.assertFileListCount(1)
 
         Log.d(STEP_TAG,"Select 'unfiled' directory. Assert that ${discussionAttachmentFile.name} file is displayed on the File List Page.")
@@ -210,12 +210,12 @@ class FilesE2ETest: TeacherTest() {
         fileListPage.assertItemDisplayed(newFolderName)
 
         Log.d(STEP_TAG, "Click on 'Search' (magnifying glass) icon and type '${newFolderName}', the file's name to the search input field.")
-        fileListPage.clickSearchButton()
-        fileListPage.typeSearchInput(newFolderName)
+        fileListPage.searchable.clickOnSearchButton()
+        fileListPage.searchable.typeToSearchBar(newFolderName)
 
         Log.d(STEP_TAG,"Assert that empty view is displayed after deletion, because no folders will not be displayed in search result. Press back button (top one) to escape from Search 'view'.")
         fileListPage.assertViewEmpty()
-        fileListPage.pressSearchBackButton()
+        fileListPage.searchable.pressSearchBackButton()
 
         Log.d(STEP_TAG, "Select '$newFolderName' folder and delete it. Assert that it has been disappeared from the File List Page.")
         fileListPage.deleteFolder(newFolderName)
diff --git a/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/e2e/PagesE2ETest.kt b/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/e2e/PagesE2ETest.kt
index c54d283d5d..874ddd528b 100644
--- a/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/e2e/PagesE2ETest.kt
+++ b/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/e2e/PagesE2ETest.kt
@@ -147,12 +147,16 @@ class PagesE2ETest : TeacherTest() {
         pageListPage.assertPageIsPublished(newPageTitle)
 
         Log.d(STEP_TAG,"Click on the Search icon and type some search query string which matches only with the previously created page's title.")
-        pageListPage.openSearch()
-        pageListPage.enterSearchQuery("Test")
+        pageListPage.searchable.clickOnSearchButton()
+        pageListPage.searchable.typeToSearchBar("Test")
 
         Log.d(STEP_TAG,"Assert that the '$newPageTitle' titled page is displayed and it is the only one.")
         pageListPage.assertPageIsPublished(newPageTitle)
         pageListPage.assertPageCount(1)
+
+        Log.d(STEP_TAG, "Click on the clear search input button (X) on the toolbar. Assert that the default state, so all the 4 pages will be displayed.")
+        pageListPage.searchable.clickOnClearSearchButton()
+        pageListPage.assertPageCount(4)
     }
 
     private fun createCoursePage(
diff --git a/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/e2e/PeopleE2ETest.kt b/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/e2e/PeopleE2ETest.kt
index 08d0a0f2d5..5baed3c839 100644
--- a/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/e2e/PeopleE2ETest.kt
+++ b/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/e2e/PeopleE2ETest.kt
@@ -139,15 +139,15 @@ class PeopleE2ETest: TeacherTest() {
         Espresso.pressBack()
 
         Log.d(STEP_TAG, "Click on 'Search' (magnifying glass) icon and type '${gradedStudent.name}', the graded student's name to the search input field.")
-        peopleListPage.clickSearchButton()
-        peopleListPage.typeSearchInput(gradedStudent.name)
+        peopleListPage.searchable.clickOnSearchButton()
+        peopleListPage.searchable.typeToSearchBar(gradedStudent.name)
 
         Log.d(STEP_TAG, "Assert that only 1 person matches for the search text, and it is '${gradedStudent.name}', the graded student.")
         peopleListPage.assertSearchResultCount(1)
         peopleListPage.assertPersonListed(gradedStudent)
 
-        Log.d(STEP_TAG, "Click on 'Reset' search (cross) icon and assert that all the poeple are displayed (5).")
-        peopleListPage.clickResetSearchText()
+        Log.d(STEP_TAG, "Click on 'Reset' search (X) icon and assert that all the poeple are displayed (5).")
+        peopleListPage.searchable.clickOnClearSearchButton()
         peopleListPage.assertSearchResultCount(5)
 
         Log.d(STEP_TAG, "Navigate back to Dashboard Page. Click on the Inbox bottom menu. Assert that the 'All' section is empty.")
diff --git a/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/pages/AnnouncementsListPage.kt b/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/pages/AnnouncementsListPage.kt
index be005e6b5e..d8c9ad7b7f 100644
--- a/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/pages/AnnouncementsListPage.kt
+++ b/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/pages/AnnouncementsListPage.kt
@@ -17,14 +17,13 @@
 package com.instructure.teacher.ui.pages
 
 import androidx.test.espresso.Espresso
-import androidx.test.espresso.action.ViewActions
 import androidx.test.espresso.assertion.ViewAssertions
 import androidx.test.espresso.matcher.ViewMatchers
 import com.instructure.canvasapi2.models.DiscussionTopicHeader
 import com.instructure.dataseeding.model.DiscussionApiModel
 import com.instructure.espresso.OnViewWithId
 import com.instructure.espresso.RecyclerViewItemCountAssertion
-import com.instructure.espresso.WaitForViewWithId
+import com.instructure.espresso.Searchable
 import com.instructure.espresso.assertDisplayed
 import com.instructure.espresso.click
 import com.instructure.espresso.page.BasePage
@@ -32,7 +31,6 @@ import com.instructure.espresso.page.onView
 import com.instructure.espresso.page.onViewWithContentDescription
 import com.instructure.espresso.page.onViewWithText
 import com.instructure.espresso.page.plus
-import com.instructure.espresso.page.waitForView
 import com.instructure.espresso.page.waitForViewWithText
 import com.instructure.espresso.page.withAncestor
 import com.instructure.espresso.page.withId
@@ -48,13 +46,11 @@ import com.instructure.teacher.ui.utils.TypeInRCETextEditor
  *
  * @constructor Create empty Announcements list page
  */
-class AnnouncementsListPage : BasePage() {
+class AnnouncementsListPage(val searchable: Searchable) : BasePage() {
 
     private val announcementListToolbar by OnViewWithId(R.id.discussionListToolbar)
     private val announcementsFAB by OnViewWithId(R.id.createNewDiscussion)
     private val announcementsRecyclerView by OnViewWithId(R.id.discussionRecyclerView)
-    private val searchButton by OnViewWithId(R.id.search)
-    private val searchInput by WaitForViewWithId(androidx.appcompat.R.id.search_src_text)
     private val createNewDiscussion by OnViewWithId(R.id.createNewDiscussion)
 
     /**
@@ -110,23 +106,6 @@ class AnnouncementsListPage : BasePage() {
         announcementsFAB.assertDisplayed()
     }
 
-    /**
-     * Click on search button.
-     *
-     */
-    fun openSearch() {
-        searchButton.click()
-    }
-
-    /**
-     * Fill the search input field with the given query string.
-     *
-     * @param query: Query string parameter.
-     */
-    fun enterSearchQuery(query: String) {
-        searchInput.perform(ViewActions.replaceText(query))
-    }
-
     /**
      * Assert that the announcements recyclerview count is equals to the given one.
      *
@@ -206,31 +185,6 @@ class AnnouncementsListPage : BasePage() {
         onViewWithText(R.string.exitUnsaved).click()
     }
 
-    /**
-     * Click search button.
-     *
-     */
-    fun clickSearchButton() {
-        onView(withId(R.id.search)).click()
-    }
-
-    /**
-     * Type the given search text into the search input field.
-     *
-     * @param searchText: The search text query parameter.
-     */
-    fun typeSearchInput(searchText: String) {
-        onView(withId(R.id.search_src_text)).replaceText(searchText.dropLast(1))
-    }
-
-    /**
-     * Click reset search text.
-     *
-     */
-    fun clickResetSearchText() {
-        waitForView(withId(R.id.search_close_btn)).click()
-    }
-
     /**
      * Assert search result count is equals to the expected.
      *
diff --git a/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/pages/DiscussionsListPage.kt b/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/pages/DiscussionsListPage.kt
index 87394c2577..f6f8b9848c 100644
--- a/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/pages/DiscussionsListPage.kt
+++ b/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/pages/DiscussionsListPage.kt
@@ -16,14 +16,13 @@
  */
 package com.instructure.teacher.ui.pages
 
-import androidx.test.espresso.action.ViewActions
 import androidx.test.espresso.assertion.ViewAssertions.doesNotExist
 import androidx.test.espresso.matcher.ViewMatchers
 import com.instructure.canvasapi2.models.DiscussionTopicHeader
 import com.instructure.dataseeding.model.DiscussionApiModel
 import com.instructure.espresso.OnViewWithId
 import com.instructure.espresso.RecyclerViewItemCountAssertion
-import com.instructure.espresso.WaitForViewWithId
+import com.instructure.espresso.Searchable
 import com.instructure.espresso.assertDisplayed
 import com.instructure.espresso.click
 import com.instructure.espresso.page.BasePage
@@ -43,13 +42,11 @@ import com.instructure.teacher.R
 /**
  * Represents the Discussions List page.
  */
-class DiscussionsListPage : BasePage() {
+class DiscussionsListPage(val searchable: Searchable) : BasePage() {
 
     private val discussionListToolbar by OnViewWithId(R.id.discussionListToolbar)
     private val discussionsFAB by OnViewWithId(R.id.createNewDiscussion)
     private val discussionsRecyclerView by OnViewWithId(R.id.discussionRecyclerView)
-    private val searchButton by OnViewWithId(R.id.search)
-    private val searchInput by WaitForViewWithId(androidx.appcompat.R.id.search_src_text)
 
     /**
      * Clicks on the specified [discussion] in the discussions list.
@@ -112,29 +109,13 @@ class DiscussionsListPage : BasePage() {
         waitForViewWithText(discussion.title!!).assertDisplayed()
     }
 
-    /**
-     * Opens the search functionality in the discussions list.
-     */
-    fun openSearch() {
-        searchButton.click()
-    }
-
-    /**
-     * Enters the specified [query] into the search input field.
-     *
-     * @param query The search query to be entered.
-     */
-    fun enterSearchQuery(query: String) {
-        searchInput.perform(ViewActions.replaceText(query))
-    }
-
     /**
      * Asserts the number of discussions in the discussions list.
      *
      * @param count The expected number of discussions.
      */
     fun assertDiscussionCount(count: Int) {
-        discussionsRecyclerView.waitForCheck(RecyclerViewItemCountAssertion(count))
+        discussionsRecyclerView.waitForCheck(RecyclerViewItemCountAssertion(count + 1)) //Because of the header.
     }
 
     /**
diff --git a/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/pages/FileListPage.kt b/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/pages/FileListPage.kt
index 49b03d3e4a..52634c0ee2 100644
--- a/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/pages/FileListPage.kt
+++ b/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/pages/FileListPage.kt
@@ -28,6 +28,7 @@ import com.instructure.canvas.espresso.containsTextCaseInsensitive
 import com.instructure.canvas.espresso.scrollRecyclerView
 import com.instructure.canvas.espresso.withCustomConstraints
 import com.instructure.espresso.OnViewWithId
+import com.instructure.espresso.Searchable
 import com.instructure.espresso.assertDisplayed
 import com.instructure.espresso.clearText
 import com.instructure.espresso.click
@@ -37,7 +38,6 @@ import com.instructure.espresso.page.plus
 import com.instructure.espresso.page.waitForView
 import com.instructure.espresso.page.withAncestor
 import com.instructure.espresso.page.withId
-import com.instructure.espresso.replaceText
 import com.instructure.espresso.scrollTo
 import com.instructure.espresso.typeText
 import com.instructure.teacher.R
@@ -54,7 +54,7 @@ import org.hamcrest.Matchers.allOf
  *
  * @constructor Creates an instance of the FileListPage class.
  */
-class FileListPage : BasePage(R.id.fileListPage) {
+class FileListPage(val searchable: Searchable) : BasePage(R.id.fileListPage) {
 
     private val addButton by OnViewWithId(R.id.addFab)
     private val uploadFileButton by OnViewWithId(R.id.addFileFab, autoAssert = false)
@@ -169,30 +169,6 @@ class FileListPage : BasePage(R.id.fileListPage) {
         onView(allOf(isAssignableFrom(AppCompatButton::class.java), containsTextCaseInsensitive("DELETE"), isDisplayed())).click()
     }
 
-    /**
-     * Clicks the search button.
-     */
-    fun clickSearchButton() {
-        onView(withId(R.id.search)).click()
-    }
-
-    /**
-     * Types the specified search text into the search input field.
-     *
-     * @param searchText The text to be typed in the search input field.
-     */
-    fun typeSearchInput(searchText: String) {
-        onView(withId(R.id.queryInput)).replaceText(searchText)
-    }
-
-    /**
-     * Clicks the reset search text button.
-     */
-    fun clickResetSearchText() {
-        waitForView(withId(R.id.clearButton)).click()
-        onView(withId(R.id.backButton)).click()
-    }
-
     /**
      * Asserts the count of search results matches the expected count.
      *
@@ -216,11 +192,4 @@ class FileListPage : BasePage(R.id.fileListPage) {
             ViewAssertions.matches(hasChildCount(expectedCount))
         )
     }
-
-    /**
-     * Presses the back button in the search view.
-     */
-    fun pressSearchBackButton() {
-        onView(withId(R.id.backButton)).click()
-    }
 }
diff --git a/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/pages/PageListPage.kt b/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/pages/PageListPage.kt
index 6704501117..a42d4c9639 100644
--- a/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/pages/PageListPage.kt
+++ b/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/pages/PageListPage.kt
@@ -17,14 +17,13 @@ package com.instructure.teacher.ui.pages
 
 import android.view.View
 import androidx.test.espresso.Espresso
-import androidx.test.espresso.action.ViewActions
 import androidx.test.espresso.matcher.ViewMatchers.hasSibling
 import androidx.test.espresso.matcher.ViewMatchers.withContentDescription
 import com.instructure.canvas.espresso.scrollRecyclerView
 import com.instructure.canvasapi2.models.Page
 import com.instructure.espresso.OnViewWithId
 import com.instructure.espresso.RecyclerViewItemCountAssertion
-import com.instructure.espresso.WaitForViewWithId
+import com.instructure.espresso.Searchable
 import com.instructure.espresso.assertDisplayed
 import com.instructure.espresso.click
 import com.instructure.espresso.page.BasePage
@@ -44,11 +43,7 @@ import org.hamcrest.Matchers.containsString
  * This page extends the BasePage class and provides functionality for interacting with the elements on the "Page List" page.
  * It contains methods for clicking on the create new page button, opening a page, performing a search, and asserting various page-related conditions.
  */
-class PageListPage : BasePage() {
-
-    private val searchButton by OnViewWithId(R.id.search)
-
-    private val searchInput by WaitForViewWithId(androidx.appcompat.R.id.search_src_text)
+class PageListPage(val searchable: Searchable) : BasePage() {
 
     private val pageRecyclerView by OnViewWithId(R.id.pageRecyclerView)
 
@@ -81,22 +76,6 @@ class PageListPage : BasePage() {
         onView(matcher).click()
     }
 
-    /**
-     * Opens the search bar.
-     */
-    fun openSearch() {
-        searchButton.click()
-    }
-
-    /**
-     * Enters the search query in the search bar.
-     *
-     * @param query The search query to be entered.
-     */
-    fun enterSearchQuery(query: String) {
-        searchInput.perform(ViewActions.replaceText(query))
-    }
-
     /**
      * Asserts the number of pages in the page list.
      *
diff --git a/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/pages/PeopleListPage.kt b/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/pages/PeopleListPage.kt
index 009486633f..a9458e6012 100644
--- a/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/pages/PeopleListPage.kt
+++ b/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/pages/PeopleListPage.kt
@@ -23,6 +23,7 @@ import androidx.test.espresso.matcher.ViewMatchers
 import androidx.test.espresso.matcher.ViewMatchers.hasChildCount
 import androidx.test.espresso.matcher.ViewMatchers.hasSibling
 import com.instructure.dataseeding.model.CanvasUserApiModel
+import com.instructure.espresso.Searchable
 import com.instructure.espresso.assertDisplayed
 import com.instructure.espresso.click
 import com.instructure.espresso.page.BasePage
@@ -33,7 +34,6 @@ import com.instructure.espresso.page.waitForViewWithText
 import com.instructure.espresso.page.withAncestor
 import com.instructure.espresso.page.withId
 import com.instructure.espresso.page.withText
-import com.instructure.espresso.replaceText
 import com.instructure.teacher.R
 import org.hamcrest.Matcher
 import org.hamcrest.Matchers
@@ -45,7 +45,7 @@ import org.hamcrest.Matchers
  * It contains methods for clicking on a person, asserting the presence of a person in the list with optional role filtering, asserting the search result count,
  * scrolling to a specific person, performing search actions, and asserting the visibility of the empty view and person role.
  */
-class PeopleListPage : BasePage(R.id.peopleListPage) {
+class PeopleListPage(val searchable: Searchable) : BasePage(R.id.peopleListPage) {
 
     /**
      * Clicks on a person in the list.
@@ -113,29 +113,6 @@ class PeopleListPage : BasePage(R.id.peopleListPage) {
         )
     }
 
-    /**
-     * Clicks the search button.
-     */
-    fun clickSearchButton() {
-        onView(withId(R.id.search)).click()
-    }
-
-    /**
-     * Enters the search text.
-     *
-     * @param searchText The text to enter in the search input.
-     */
-    fun typeSearchInput(searchText: String) {
-        onView(withId(R.id.search_src_text)).replaceText(searchText)
-    }
-
-    /**
-     * Clicks the reset search text button.
-     */
-    fun clickResetSearchText() {
-        waitForView(withId(R.id.search_close_btn)).click()
-    }
-
     /**
      * Asserts that the empty view is displayed.
      */
diff --git a/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/pages/QuizListPage.kt b/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/pages/QuizListPage.kt
index 1e32f11b1c..1068d36295 100644
--- a/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/pages/QuizListPage.kt
+++ b/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/pages/QuizListPage.kt
@@ -16,10 +16,10 @@
  */
 package com.instructure.teacher.ui.pages
 
-import androidx.test.espresso.action.ViewActions
 import com.instructure.canvasapi2.models.Quiz
 import com.instructure.espresso.OnViewWithId
 import com.instructure.espresso.RecyclerViewItemCountAssertion
+import com.instructure.espresso.Searchable
 import com.instructure.espresso.WaitForViewWithId
 import com.instructure.espresso.assertDisplayed
 import com.instructure.espresso.click
@@ -39,7 +39,7 @@ import com.instructure.teacher.R
  * Additionally, it provides methods for asserting the display of the "No Quizzes" view, checking the presence of a quiz, clicking on a quiz, opening the search bar, entering a search query,
  * asserting the quiz count, and refreshing the page.
  */
-class QuizListPage : BasePage() {
+class QuizListPage(val searchable: Searchable) : BasePage() {
 
     /**
      * The quiz list toolbar view on the page.
@@ -100,22 +100,6 @@ class QuizListPage : BasePage() {
         waitForViewWithText(quizTitle).click()
     }
 
-    /**
-     * Opens the search bar.
-     */
-    fun openSearch() {
-        searchButton.click()
-    }
-
-    /**
-     * Enters a search query in the search input.
-     *
-     * @param query The search query to be entered.
-     */
-    fun enterSearchQuery(query: String) {
-        searchInput.perform(ViewActions.replaceText(query))
-    }
-
     /**
      * Asserts the count of quizzes on the page.
      *
diff --git a/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/utils/TeacherTest.kt b/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/utils/TeacherTest.kt
index d80b8e4783..7dafc5a3ab 100644
--- a/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/utils/TeacherTest.kt
+++ b/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/utils/TeacherTest.kt
@@ -25,7 +25,9 @@ import androidx.test.espresso.ViewAction
 import androidx.test.espresso.matcher.ViewMatchers
 import com.instructure.canvas.espresso.CanvasTest
 import com.instructure.espresso.InstructureActivityTestRule
+import com.instructure.espresso.Searchable
 import com.instructure.teacher.BuildConfig
+import com.instructure.teacher.R
 import com.instructure.teacher.activities.LoginActivity
 import com.instructure.teacher.ui.espresso.TeacherHiltTestApplication_Application
 import com.instructure.teacher.ui.pages.AboutPage
@@ -121,7 +123,7 @@ abstract class TeacherTest : CanvasTest() {
      * Required for auto complete of page objects within tests
      */
     val addMessagePage = AddMessagePage()
-    val announcementsListPage = AnnouncementsListPage()
+    val announcementsListPage = AnnouncementsListPage(Searchable(R.id.search, R.id.search_src_text, R.id.search_close_btn))
     val assigneeListPage = AssigneeListPage()
     val assignmentDetailsPage = AssignmentDetailsPage()
     val assignmentDueDatesPage = AssignmentDueDatesPage()
@@ -144,7 +146,7 @@ abstract class TeacherTest : CanvasTest() {
     val profileSettingsPage = ProfileSettingsPage()
     val editProfileSettingsPage = EditProfileSettingsPage()
     val discussionsDetailsPage = DiscussionsDetailsPage()
-    val discussionsListPage = DiscussionsListPage()
+    val discussionsListPage = DiscussionsListPage(Searchable(R.id.search, R.id.search_src_text, R.id.search_close_btn))
     val editAnnouncementPage = EditAnnouncementPage()
     val editAssignmentDetailsPage = EditAssignmentDetailsPage()
     val editDiscussionsDetailsPage = EditDiscussionsDetailsPage()
@@ -159,10 +161,10 @@ abstract class TeacherTest : CanvasTest() {
     val modulesPage = ModulesPage()
     val navDrawerPage = NavDrawerPage()
     val notATeacherPage = NotATeacherPage()
-    val pageListPage = PageListPage()
-    val peopleListPage = PeopleListPage()
+    val pageListPage = PageListPage(Searchable(R.id.search, R.id.search_src_text, R.id.search_close_btn))
+    val peopleListPage = PeopleListPage(Searchable(R.id.search, R.id.search_src_text, R.id.search_close_btn))
     val quizDetailsPage = QuizDetailsPage()
-    val quizListPage = QuizListPage()
+    val quizListPage = QuizListPage(Searchable(R.id.search, R.id.search_src_text, R.id.clearButton, R.id.backButton))
     val quizSubmissionListPage = QuizSubmissionListPage()
     val speedGraderCommentsPage = SpeedGraderCommentsPage()
     val speedGraderFilesPage = SpeedGraderFilesPage()
@@ -174,7 +176,7 @@ abstract class TeacherTest : CanvasTest() {
     val syllabusPage = SyllabusPage()
     val todoPage = TodoPage()
     val webViewLoginPage = WebViewLoginPage()
-    val fileListPage = FileListPage()
+    val fileListPage = FileListPage(Searchable(R.id.search, R.id.queryInput, R.id.clearButton, R.id.backButton))
 
 }
 
diff --git a/automation/espresso/src/main/kotlin/com/instructure/espresso/CustomViewAssertions.kt b/automation/espresso/src/main/kotlin/com/instructure/espresso/CustomViewAssertions.kt
index a6248e7e21..a9c27b5bc9 100644
--- a/automation/espresso/src/main/kotlin/com/instructure/espresso/CustomViewAssertions.kt
+++ b/automation/espresso/src/main/kotlin/com/instructure/espresso/CustomViewAssertions.kt
@@ -23,9 +23,11 @@ import androidx.annotation.IdRes
 import androidx.recyclerview.widget.RecyclerView
 import androidx.test.espresso.NoMatchingViewException
 import androidx.test.espresso.ViewAssertion
+import androidx.test.espresso.assertion.ViewAssertions.doesNotExist
 import androidx.test.espresso.matcher.ViewMatchers
 import androidx.viewpager.widget.ViewPager
 import com.google.android.material.bottomnavigation.BottomNavigationView
+import junit.framework.AssertionFailedError
 import org.hamcrest.Matchers
 import org.junit.Assert.assertEquals
 
@@ -74,3 +76,21 @@ class NotificationBadgeAssertion(@IdRes private val menuItemId: Int, private val
         assertEquals(badgeCount, expectedCount)
     }
 }
+
+class DoesNotExistAssertion(private val timeout: Long, private val pollInterval: Long = 500L) : ViewAssertion {
+    override fun check(view: View?, noViewFoundException: NoMatchingViewException?) {
+        var elapsedTime = 0L
+
+        while (elapsedTime < timeout) {
+            try {
+                doesNotExist()
+                return
+            } catch (e: AssertionFailedError) {
+                Thread.sleep(pollInterval)
+                elapsedTime += pollInterval
+            }
+        }
+
+        throw AssertionError("View still exists after $timeout milliseconds.")
+    }
+}
\ No newline at end of file
diff --git a/automation/espresso/src/main/kotlin/com/instructure/espresso/Searchable.kt b/automation/espresso/src/main/kotlin/com/instructure/espresso/Searchable.kt
new file mode 100644
index 0000000000..b8d5902141
--- /dev/null
+++ b/automation/espresso/src/main/kotlin/com/instructure/espresso/Searchable.kt
@@ -0,0 +1,25 @@
+package com.instructure.espresso
+
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.action.ViewActions
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import com.instructure.espresso.matchers.WaitForViewMatcher.waitForView
+
+class Searchable(private val searchButtonId: Int? = null, private val queryInputId: Int? = null, private val clearButtonId: Int? = null, private val backButtonId: Int? = null) {
+
+    fun clickOnSearchButton() {
+        onView(searchButtonId?.let { withId(it) }).click()
+    }
+
+    fun typeToSearchBar(textToType: String) {
+        onView(queryInputId?.let { withId(it) }).perform(ViewActions.replaceText(textToType))
+    }
+
+    fun clickOnClearSearchButton() {
+        waitForView(clearButtonId?.let { withId(it) }).click()
+    }
+
+    fun pressSearchBackButton() {
+        onView(backButtonId?.let { withId(it) }).click()
+    }
+}
\ No newline at end of file
diff --git a/automation/espresso/src/main/kotlin/com/instructure/espresso/matchers/WaitForViewMatcher.kt b/automation/espresso/src/main/kotlin/com/instructure/espresso/matchers/WaitForViewMatcher.kt
index c31c9a5dd9..0d543a6b25 100644
--- a/automation/espresso/src/main/kotlin/com/instructure/espresso/matchers/WaitForViewMatcher.kt
+++ b/automation/espresso/src/main/kotlin/com/instructure/espresso/matchers/WaitForViewMatcher.kt
@@ -41,9 +41,9 @@ object WaitForViewMatcher {
     // https://github.com/braintree/braintree_android/blob/25513d76da88fe2ce9f476c4dc51f24cf6e26104/TestUtils/src/main/java/com/braintreepayments/testutils/ui/ViewHelper.java#L30
 
     // The viewMatcher is called on every view to determine what matches. Must be fast!
-    fun waitForView(viewMatcher: Matcher<View>, duration: Long = 10): ViewInteraction {
+    fun waitForView(viewMatcher: Matcher<View>?, duration: Long = 10): ViewInteraction {
         log.i("Wait for View to be visible.")
-        return waitForViewWithCustomMatcher(viewMatcher, duration, withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE))
+        return waitForViewWithCustomMatcher(viewMatcher!!, duration, withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE))
     }
 
     fun waitForViewToBeClickable(viewMatcher: Matcher<View>, duration: Long = 10): ViewInteraction {

From eb0592658766c61e86541d526004afb666873e6a Mon Sep 17 00:00:00 2001
From: Tamas Kozmer <tamas.kozmer@instructure.com>
Date: Tue, 15 Aug 2023 15:06:50 +0200
Subject: [PATCH 03/22] Updated version

---
 apps/student/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/student/build.gradle b/apps/student/build.gradle
index 43afe3bf59..bc4c0c3bec 100644
--- a/apps/student/build.gradle
+++ b/apps/student/build.gradle
@@ -50,8 +50,8 @@ android {
         applicationId "com.instructure.candroid"
         minSdkVersion Versions.MIN_SDK
         targetSdkVersion Versions.TARGET_SDK
-        versionCode = 253
-        versionName = '6.25.1'
+        versionCode = 254
+        versionName = '6.26.0'
 
         vectorDrawables.useSupportLibrary = true
         multiDexEnabled = true

From 61167ca85ce0e8133c822b86c742f70efda61bbb Mon Sep 17 00:00:00 2001
From: Tamas Kozmer <tamas.kozmer@instructure.com>
Date: Wed, 16 Aug 2023 10:03:32 +0200
Subject: [PATCH 04/22] Landscape test fixes.

---
 .../student/ui/pages/AssignmentListPage.kt            |  4 +++-
 .../com/instructure/student/ui/pages/ModulesPage.kt   | 11 +++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/pages/AssignmentListPage.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/pages/AssignmentListPage.kt
index 6244425c93..bb5a6ef6b5 100644
--- a/apps/student/src/androidTest/java/com/instructure/student/ui/pages/AssignmentListPage.kt
+++ b/apps/student/src/androidTest/java/com/instructure/student/ui/pages/AssignmentListPage.kt
@@ -93,7 +93,9 @@ class AssignmentListPage(val searchable: Searchable) : BasePage(pageResId = R.id
     }
 
     fun assertAssignmentDisplayedWithGrade(assignmentName: String, gradeString: String) {
-        onView(withId(R.id.title) + withParent(R.id.textContainer) + withText(assignmentName)).assertDisplayed()
+        val matcher = withId(R.id.title) + withParent(R.id.textContainer) + withText(assignmentName)
+        scrollRecyclerView(R.id.listView, matcher)
+        onView(matcher).assertDisplayed()
         val pointsMatcher = withId(R.id.title) + withText(assignmentName)
         onView(withId(R.id.points) + withParent(hasSibling(pointsMatcher))).assertHasText(gradeString)
     }
diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/pages/ModulesPage.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/pages/ModulesPage.kt
index b6e915e336..0dc2cd51cd 100644
--- a/apps/student/src/androidTest/java/com/instructure/student/ui/pages/ModulesPage.kt
+++ b/apps/student/src/androidTest/java/com/instructure/student/ui/pages/ModulesPage.kt
@@ -19,6 +19,7 @@ package com.instructure.student.ui.pages
 import androidx.test.espresso.NoMatchingViewException
 import androidx.test.espresso.PerformException
 import androidx.test.espresso.action.ViewActions.swipeDown
+import androidx.test.espresso.action.ViewActions.swipeUp
 import androidx.test.espresso.assertion.ViewAssertions.doesNotExist
 import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.matcher.ViewMatchers.*
@@ -87,11 +88,17 @@ class ModulesPage : BasePage(R.id.modulesPage) {
     }
 
     fun assertPossiblePointsDisplayed(points: String) {
-        onView(withId(R.id.points) + withText("$points pts")).assertDisplayed()
+        val matcher = withId(R.id.points) + withText("$points pts")
+
+        scrollRecyclerView(R.id.listView, matcher)
+        onView(matcher).assertDisplayed()
     }
 
     fun assertPossiblePointsNotDisplayed(name: String) {
-        onView(withParent(hasSibling(withChild(withId(R.id.title) + withText(name)))) + withId(R.id.points)).assertNotDisplayed()
+        val matcher = withParent(hasSibling(withChild(withId(R.id.title) + withText(name)))) + withId(R.id.points)
+
+        scrollRecyclerView(R.id.listView, matcher)
+        onView(matcher).assertNotDisplayed()
     }
 
     /**

From 155fab52499cbc9e440d61f178373239e361c4af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81kos=20Hermann?= <akos.hermann@instructure.com>
Date: Wed, 16 Aug 2023 16:23:06 +0200
Subject: [PATCH 05/22] fix foreground notifications

---
 .../file/download/FileDownloadWorker.kt       | 33 +++++++++++++------
 1 file changed, 23 insertions(+), 10 deletions(-)

diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/features/file/download/FileDownloadWorker.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/features/file/download/FileDownloadWorker.kt
index f8fb695dd3..954d39fdd5 100644
--- a/libs/pandautils/src/main/java/com/instructure/pandautils/features/file/download/FileDownloadWorker.kt
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/features/file/download/FileDownloadWorker.kt
@@ -51,11 +51,13 @@ class FileDownloadWorker @AssistedInject constructor(
 
     private val notificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
 
-    override suspend fun doWork(): Result {
-        val fileName = inputData.getString(INPUT_FILE_NAME) ?: ""
-        val fileUrl = inputData.getString(INPUT_FILE_URL) ?: ""
-        val notificationId = Random.nextInt()
+    private val fileName = inputData.getString(INPUT_FILE_NAME) ?: ""
+    private val fileUrl = inputData.getString(INPUT_FILE_URL) ?: ""
+    private val notificationId = Random.nextInt()
+
+    private var foregroundInfo: ForegroundInfo = createForegroundInfo(notificationId, fileName, 0)
 
+    override suspend fun doWork(): Result {
         registerNotificationChannel(context)
 
         val downloadFileName = createDownloadFileName(fileName)
@@ -63,14 +65,21 @@ class FileDownloadWorker @AssistedInject constructor(
         val downloadedFile =
             File(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS), downloadFileName)
 
-        setForeground(createForegroundInfo(notificationId, fileName, 0))
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.S) {
+            setForeground(foregroundInfo)
+        }
         var result = Result.retry()
 
         fileDownloadApi.downloadFile(fileUrl).saveFile(downloadedFile)
             .collect { downloadState ->
                 when (downloadState) {
                     is DownloadState.InProgress -> {
-                        setForeground(createForegroundInfo(notificationId, fileName, downloadState.progress))
+                        foregroundInfo = createForegroundInfo(notificationId, fileName, downloadState.progress)
+                        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.S) {
+                            setForeground(foregroundInfo)
+                        } else {
+                            updateForegroundNotification()
+                        }
                     }
 
                     is DownloadState.Failure -> {
@@ -138,8 +147,6 @@ class FileDownloadWorker @AssistedInject constructor(
 
         val notification = NotificationCompat.Builder(applicationContext, FileUploadWorker.CHANNEL_ID)
             .setSmallIcon(R.drawable.ic_notification_canvas_logo)
-            .setProgress(100, 100, false)
-            .setOngoing(false)
             .setContentTitle(context.getString(R.string.downloadSuccessful))
             .setContentText(fileName)
             .setContentIntent(pendingIntent)
@@ -150,14 +157,20 @@ class FileDownloadWorker @AssistedInject constructor(
     private fun updateNotificationFailed(notificationId: Int, fileName: String) {
         val notification = NotificationCompat.Builder(applicationContext, FileUploadWorker.CHANNEL_ID)
             .setSmallIcon(R.drawable.ic_notification_canvas_logo)
-            .setProgress(100, 100, false)
-            .setOngoing(false)
             .setContentTitle(context.getString(R.string.downloadFailed))
             .setContentText(fileName)
             .build()
         notificationManager.notify(notificationId + 1, notification)
     }
 
+    override suspend fun getForegroundInfo(): ForegroundInfo {
+        return foregroundInfo
+    }
+
+    private fun updateForegroundNotification() {
+        notificationManager.notify(notificationId, foregroundInfo.notification)
+    }
+
     companion object {
         const val INPUT_FILE_NAME = "fileName"
         const val INPUT_FILE_URL = "fileUrl"

From cd575704fa1d6c2a1188574612ef3a052fb03880 Mon Sep 17 00:00:00 2001
From: Kristof Deak <92309696+kdeakinstructure@users.noreply.github.com>
Date: Sat, 19 Aug 2023 20:38:31 +0200
Subject: [PATCH 06/22] [MBL-16737][Student] - Implement not favorited group
 interaction test on dashboard (#2105)

---
 .../interaction/GroupLinksInteractionTest.kt  | 37 ++++++++++++++++++-
 .../student/ui/pages/DashboardPage.kt         |  9 +++++
 2 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/GroupLinksInteractionTest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/GroupLinksInteractionTest.kt
index 79c3f4a137..aa1c84ccdf 100644
--- a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/GroupLinksInteractionTest.kt
+++ b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/GroupLinksInteractionTest.kt
@@ -25,6 +25,7 @@ import com.instructure.canvas.espresso.mockCanvas.addFolderToCourse
 import com.instructure.canvas.espresso.mockCanvas.addGroupToCourse
 import com.instructure.canvas.espresso.mockCanvas.addPageToCourse
 import com.instructure.canvas.espresso.mockCanvas.init
+import com.instructure.canvas.espresso.refresh
 import com.instructure.canvasapi2.models.Course
 import com.instructure.canvasapi2.models.DiscussionTopicHeader
 import com.instructure.canvasapi2.models.Group
@@ -72,6 +73,38 @@ class GroupLinksInteractionTest : StudentTest() {
         dashboardPage.assertDisplaysGroup(group, course)
     }
 
+    // Test not favorite group on dashboard
+    @Test
+    @TestMetaData(Priority.IMPORTANT, FeatureCategory.GROUPS, TestCategory.INTERACTION, false, SecondaryFeatureCategory.GROUPS_DASHBOARD)
+    fun testGroupLink_dashboard_favoriteLogics() {
+        val data = setUpGroupAndSignIn()
+        val user = data.users.values.first()
+        val nonFavoriteGroup = data.addGroupToCourse(
+            course = course,
+            members = listOf(user),
+            isFavorite = false
+        )
+        refresh() //Need to refresh because when we navigated to Dashboard page the nonFavoriteGroup was not existed yet. (However it won't be displayed because it's not favorite)
+        dashboardPage.assertGroupNotDisplayed(nonFavoriteGroup)
+        dashboardPage.assertDisplaysGroup(group, course)
+    }
+
+    // Test that if no groups has selected as favorite then we display all groups
+    @Test
+    @TestMetaData(Priority.IMPORTANT, FeatureCategory.GROUPS, TestCategory.INTERACTION, false, SecondaryFeatureCategory.GROUPS_DASHBOARD)
+    fun testGroupLink_dashboard_not_selected_displays_all() {
+        val data = setUpGroupAndSignIn(isFavorite = false)
+        val user = data.users.values.first()
+        val group2 = data.addGroupToCourse(
+            course = course,
+            members = listOf(user),
+            isFavorite = false
+        )
+        refresh() //Need to refresh because when we navigated to Dashboard page the group2 was not existed yet.
+        dashboardPage.assertDisplaysGroup(group, course)
+        dashboardPage.assertDisplaysGroup(group2, course)
+    }
+
     // Link to file preview opens file - eg: "/groups/:id/files/folder/:id?preview=:id"
     @Test
     @TestMetaData(Priority.MANDATORY, FeatureCategory.GROUPS, TestCategory.INTERACTION, false, SecondaryFeatureCategory.GROUPS_FILES)
@@ -196,7 +229,7 @@ class GroupLinksInteractionTest : StudentTest() {
 
     // Mock a single student and course, mock a group and a number of items associated with the group,
     // sign in, then navigate to the dashboard.
-    private fun setUpGroupAndSignIn(): MockCanvas {
+    private fun setUpGroupAndSignIn(isFavorite: Boolean = true): MockCanvas {
 
         // Basic info
         val data = MockCanvas.init(
@@ -211,7 +244,7 @@ class GroupLinksInteractionTest : StudentTest() {
         group = data.addGroupToCourse(
                 course = course,
                 members = listOf(user),
-                isFavorite = true
+                isFavorite = isFavorite
         )
 
         // Add a discussion
diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/pages/DashboardPage.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/pages/DashboardPage.kt
index 229d1253ee..caa43663b0 100644
--- a/apps/student/src/androidTest/java/com/instructure/student/ui/pages/DashboardPage.kt
+++ b/apps/student/src/androidTest/java/com/instructure/student/ui/pages/DashboardPage.kt
@@ -279,6 +279,15 @@ class DashboardPage : BasePage(R.id.dashboardPage) {
         onView(matcher).check(doesNotExist())
     }
 
+    fun assertGroupNotDisplayed(group: Group) {
+        val matcher = allOf(
+            withText(group.name),
+            withId(R.id.titleTextView),
+            withAncestor(R.id.swipeRefreshLayout)
+        )
+        onView(matcher).check(doesNotExist())
+    }
+
     fun changeCourseNickname(changeTo: String) {
         onView(withId(R.id.newCourseNickname)).replaceText(changeTo)
         onView(withText(android.R.string.ok) + withAncestor(R.id.buttonPanel)).click()

From 02930945abface39174a3a16bf9dd4cd790ac051 Mon Sep 17 00:00:00 2001
From: Tamas Kozmer <72397075+tamaskozmer@users.noreply.github.com>
Date: Tue, 22 Aug 2023 09:52:12 +0200
Subject: [PATCH 07/22] [MBL-16983][Student][Teacher] Login help text change
 #2112

refs: MBL-16983
affects: Teacher, Student
release note: none
---
 libs/login-api-2/src/main/res/layout/adapter_account_footer.xml | 2 +-
 libs/login-api-2/src/main/res/values-ar/strings.xml             | 1 -
 .../login-api-2/src/main/res/values-b+da+DK+instk12/strings.xml | 1 -
 .../login-api-2/src/main/res/values-b+en+AU+unimelb/strings.xml | 1 -
 .../src/main/res/values-b+en+GB+instukhe/strings.xml            | 1 -
 .../login-api-2/src/main/res/values-b+nb+NO+instk12/strings.xml | 1 -
 .../login-api-2/src/main/res/values-b+sv+SE+instk12/strings.xml | 1 -
 libs/login-api-2/src/main/res/values-b+zh+HK/strings.xml        | 1 -
 libs/login-api-2/src/main/res/values-b+zh+Hans/strings.xml      | 1 -
 libs/login-api-2/src/main/res/values-b+zh+Hant/strings.xml      | 1 -
 libs/login-api-2/src/main/res/values-ca/strings.xml             | 1 -
 libs/login-api-2/src/main/res/values-cy/strings.xml             | 1 -
 libs/login-api-2/src/main/res/values-da/strings.xml             | 1 -
 libs/login-api-2/src/main/res/values-de/strings.xml             | 1 -
 libs/login-api-2/src/main/res/values-en-rAU/strings.xml         | 1 -
 libs/login-api-2/src/main/res/values-en-rCA/strings.xml         | 1 -
 libs/login-api-2/src/main/res/values-en-rCY/strings.xml         | 1 -
 libs/login-api-2/src/main/res/values-en-rGB/strings.xml         | 1 -
 libs/login-api-2/src/main/res/values-es-rES/strings.xml         | 1 -
 libs/login-api-2/src/main/res/values-es/strings.xml             | 1 -
 libs/login-api-2/src/main/res/values-fi/strings.xml             | 1 -
 libs/login-api-2/src/main/res/values-fr-rCA/strings.xml         | 1 -
 libs/login-api-2/src/main/res/values-fr/strings.xml             | 1 -
 libs/login-api-2/src/main/res/values-ht/strings.xml             | 1 -
 libs/login-api-2/src/main/res/values-is/strings.xml             | 1 -
 libs/login-api-2/src/main/res/values-it/strings.xml             | 1 -
 libs/login-api-2/src/main/res/values-ja/strings.xml             | 1 -
 libs/login-api-2/src/main/res/values-mi/strings.xml             | 1 -
 libs/login-api-2/src/main/res/values-ms/strings.xml             | 1 -
 libs/login-api-2/src/main/res/values-nb/strings.xml             | 1 -
 libs/login-api-2/src/main/res/values-nl/strings.xml             | 1 -
 libs/login-api-2/src/main/res/values-pl/strings.xml             | 1 -
 libs/login-api-2/src/main/res/values-pt-rBR/strings.xml         | 1 -
 libs/login-api-2/src/main/res/values-pt-rPT/strings.xml         | 1 -
 libs/login-api-2/src/main/res/values-ru/strings.xml             | 1 -
 libs/login-api-2/src/main/res/values-sl/strings.xml             | 1 -
 libs/login-api-2/src/main/res/values-sv/strings.xml             | 1 -
 libs/login-api-2/src/main/res/values-th/strings.xml             | 1 -
 libs/login-api-2/src/main/res/values-vi/strings.xml             | 1 -
 libs/login-api-2/src/main/res/values-zh/strings.xml             | 1 -
 libs/login-api-2/src/main/res/values/strings.xml                | 2 +-
 41 files changed, 2 insertions(+), 41 deletions(-)

diff --git a/libs/login-api-2/src/main/res/layout/adapter_account_footer.xml b/libs/login-api-2/src/main/res/layout/adapter_account_footer.xml
index d42dbae34d..380e298d7c 100644
--- a/libs/login-api-2/src/main/res/layout/adapter_account_footer.xml
+++ b/libs/login-api-2/src/main/res/layout/adapter_account_footer.xml
@@ -44,6 +44,6 @@
         android:textColor="@color/textInfo"
         android:fontFamily="@font/lato_font_family"
         android:textSize="16sp"
-        android:text="@string/accountDomainFooterLink"/>
+        android:text="@string/accountDomainFooterLoginHelp"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/libs/login-api-2/src/main/res/values-ar/strings.xml b/libs/login-api-2/src/main/res/values-ar/strings.xml
index a6dc6fea19..23551097f6 100644
--- a/libs/login-api-2/src/main/res/values-ar/strings.xml
+++ b/libs/login-api-2/src/main/res/values-ar/strings.xml
@@ -109,7 +109,6 @@
     <string name="schoolInstructureCom">school.instructure.com</string>
     <string name="contentDescription_removePreviousUser">حذف المستخدم السابق</string>
     <string name="accountDomainFooter">ألا تستطيع العثور على مدرستك؟ حاول كتابة رابط URL الكامل للمدرسة.</string>
-    <string name="accountDomainFooterLink">اضغط هنا للحصول على المساعدة.</string>
 
     <string name="login_noInternetConnectionTitle">لا يوجد اتصال بالإنترنت</string>
     <string name="login_noInternetConnectionMessage">يتطلب هذا الإجراء اتصالاً بالإنترنت.</string>
diff --git a/libs/login-api-2/src/main/res/values-b+da+DK+instk12/strings.xml b/libs/login-api-2/src/main/res/values-b+da+DK+instk12/strings.xml
index c14f873ae4..2f2c627f22 100644
--- a/libs/login-api-2/src/main/res/values-b+da+DK+instk12/strings.xml
+++ b/libs/login-api-2/src/main/res/values-b+da+DK+instk12/strings.xml
@@ -111,7 +111,6 @@
     <string name="schoolInstructureCom">school.instructure.com</string>
     <string name="contentDescription_removePreviousUser">Fjern forrige bruger</string>
     <string name="accountDomainFooter">Kan du ikke finde din skole? Prøv at indtaste skolens fulde URL.</string>
-    <string name="accountDomainFooterLink">Tryk her for at få hjælp.</string>
 
     <string name="login_noInternetConnectionTitle">Ingen internetforbindelse</string>
     <string name="login_noInternetConnectionMessage">Denne handling kræver en internetforbindelse.</string>
diff --git a/libs/login-api-2/src/main/res/values-b+en+AU+unimelb/strings.xml b/libs/login-api-2/src/main/res/values-b+en+AU+unimelb/strings.xml
index 562a29b642..de85b5f2a0 100644
--- a/libs/login-api-2/src/main/res/values-b+en+AU+unimelb/strings.xml
+++ b/libs/login-api-2/src/main/res/values-b+en+AU+unimelb/strings.xml
@@ -109,7 +109,6 @@
     <string name="schoolInstructureCom">school.instructure.com</string>
     <string name="contentDescription_removePreviousUser">Remove Previous User</string>
     <string name="accountDomainFooter">Can\'t find your school? Try typing the full school URL.</string>
-    <string name="accountDomainFooterLink">Tap here for help.</string>
 
     <string name="login_noInternetConnectionTitle">No Internet Connection</string>
     <string name="login_noInternetConnectionMessage">This action requires an internet connection.</string>
diff --git a/libs/login-api-2/src/main/res/values-b+en+GB+instukhe/strings.xml b/libs/login-api-2/src/main/res/values-b+en+GB+instukhe/strings.xml
index 2008cc1293..9ad8745705 100644
--- a/libs/login-api-2/src/main/res/values-b+en+GB+instukhe/strings.xml
+++ b/libs/login-api-2/src/main/res/values-b+en+GB+instukhe/strings.xml
@@ -111,7 +111,6 @@
     <string name="schoolInstructureCom">school.instructure.com</string>
     <string name="contentDescription_removePreviousUser">Remove Previous User</string>
     <string name="accountDomainFooter">Can\'t find your school? Try typing the full school URL.</string>
-    <string name="accountDomainFooterLink">Tap here for help.</string>
 
     <string name="login_noInternetConnectionTitle">No Internet Connection</string>
     <string name="login_noInternetConnectionMessage">This action requires an internet connection.</string>
diff --git a/libs/login-api-2/src/main/res/values-b+nb+NO+instk12/strings.xml b/libs/login-api-2/src/main/res/values-b+nb+NO+instk12/strings.xml
index ec5a6c20af..527ce5beb1 100644
--- a/libs/login-api-2/src/main/res/values-b+nb+NO+instk12/strings.xml
+++ b/libs/login-api-2/src/main/res/values-b+nb+NO+instk12/strings.xml
@@ -110,7 +110,6 @@
     <string name="schoolInstructureCom">school.instructure.com</string>
     <string name="contentDescription_removePreviousUser">Fjerne forrige bruker</string>
     <string name="accountDomainFooter">Finner du ikke skolen din? Prøv å skrive hele skolens URL.</string>
-    <string name="accountDomainFooterLink">Trykk her for hjelp.</string>
 
     <string name="login_noInternetConnectionTitle">Ingen Internett-tilkobling</string>
     <string name="login_noInternetConnectionMessage">Denne handlingen krever Internett-tilkobling.</string>
diff --git a/libs/login-api-2/src/main/res/values-b+sv+SE+instk12/strings.xml b/libs/login-api-2/src/main/res/values-b+sv+SE+instk12/strings.xml
index 6545349e99..cd28a78c01 100644
--- a/libs/login-api-2/src/main/res/values-b+sv+SE+instk12/strings.xml
+++ b/libs/login-api-2/src/main/res/values-b+sv+SE+instk12/strings.xml
@@ -111,7 +111,6 @@
     <string name="schoolInstructureCom">school.instructure.com</string>
     <string name="contentDescription_removePreviousUser">Ta bort tidigare användare</string>
     <string name="accountDomainFooter">Kan du inte hitta din skola? Försök att skriva in skolans fullständiga URL.</string>
-    <string name="accountDomainFooterLink">Tryck här för hjälp.</string>
 
     <string name="login_noInternetConnectionTitle">Ingen internetanslutning</string>
     <string name="login_noInternetConnectionMessage">Den här åtgärden kräver internetanslutning.</string>
diff --git a/libs/login-api-2/src/main/res/values-b+zh+HK/strings.xml b/libs/login-api-2/src/main/res/values-b+zh+HK/strings.xml
index 7617208253..438733e270 100644
--- a/libs/login-api-2/src/main/res/values-b+zh+HK/strings.xml
+++ b/libs/login-api-2/src/main/res/values-b+zh+HK/strings.xml
@@ -109,7 +109,6 @@
     <string name="schoolInstructureCom">school.instructure.com</string>
     <string name="contentDescription_removePreviousUser">移除先前使用者</string>
     <string name="accountDomainFooter">找不到您的學校？請嘗試輸入學校完整URL。</string>
-    <string name="accountDomainFooterLink">點擊此處獲取支援。</string>
 
     <string name="login_noInternetConnectionTitle">沒有網絡連線</string>
     <string name="login_noInternetConnectionMessage">此動作需要網絡連線。</string>
diff --git a/libs/login-api-2/src/main/res/values-b+zh+Hans/strings.xml b/libs/login-api-2/src/main/res/values-b+zh+Hans/strings.xml
index 871b422f6d..72d0ea9c83 100644
--- a/libs/login-api-2/src/main/res/values-b+zh+Hans/strings.xml
+++ b/libs/login-api-2/src/main/res/values-b+zh+Hans/strings.xml
@@ -109,7 +109,6 @@
     <string name="schoolInstructureCom">school.instructure.com</string>
     <string name="contentDescription_removePreviousUser">删除上一个用户</string>
     <string name="accountDomainFooter">找不到您的学校？尝试键入完整的学校 URL。</string>
-    <string name="accountDomainFooterLink">轻击此处获取帮助。</string>
 
     <string name="login_noInternetConnectionTitle">无互联网连接</string>
     <string name="login_noInternetConnectionMessage">此操作需要互联网连接。</string>
diff --git a/libs/login-api-2/src/main/res/values-b+zh+Hant/strings.xml b/libs/login-api-2/src/main/res/values-b+zh+Hant/strings.xml
index 7617208253..438733e270 100644
--- a/libs/login-api-2/src/main/res/values-b+zh+Hant/strings.xml
+++ b/libs/login-api-2/src/main/res/values-b+zh+Hant/strings.xml
@@ -109,7 +109,6 @@
     <string name="schoolInstructureCom">school.instructure.com</string>
     <string name="contentDescription_removePreviousUser">移除先前使用者</string>
     <string name="accountDomainFooter">找不到您的學校？請嘗試輸入學校完整URL。</string>
-    <string name="accountDomainFooterLink">點擊此處獲取支援。</string>
 
     <string name="login_noInternetConnectionTitle">沒有網絡連線</string>
     <string name="login_noInternetConnectionMessage">此動作需要網絡連線。</string>
diff --git a/libs/login-api-2/src/main/res/values-ca/strings.xml b/libs/login-api-2/src/main/res/values-ca/strings.xml
index 36169a8672..6bbb991bd4 100644
--- a/libs/login-api-2/src/main/res/values-ca/strings.xml
+++ b/libs/login-api-2/src/main/res/values-ca/strings.xml
@@ -111,7 +111,6 @@
     <string name="schoolInstructureCom">school.instructure.com</string>
     <string name="contentDescription_removePreviousUser">Eliminar l\'usuari anterior</string>
     <string name="accountDomainFooter">No trobeu la vostra escola? Proveu d\'escriure l\'URL de l\'escola complet.</string>
-    <string name="accountDomainFooterLink">Toqueu aquí per obtenir ajuda.</string>
 
     <string name="login_noInternetConnectionTitle">No hi ha cap connexió a Internet</string>
     <string name="login_noInternetConnectionMessage">Per dur a terme aquesta acció cal tenir una connexió a Internet.</string>
diff --git a/libs/login-api-2/src/main/res/values-cy/strings.xml b/libs/login-api-2/src/main/res/values-cy/strings.xml
index 0e1d15dd39..11cfe6cf52 100644
--- a/libs/login-api-2/src/main/res/values-cy/strings.xml
+++ b/libs/login-api-2/src/main/res/values-cy/strings.xml
@@ -109,7 +109,6 @@
     <string name="schoolInstructureCom">school.instructure.com</string>
     <string name="contentDescription_removePreviousUser">Tynnu defnyddiwr blaenorol?</string>
     <string name="accountDomainFooter">Methu dod o hyd i’ch ysgol? Ceisiwch deipio URL llawn yr ysgol.</string>
-    <string name="accountDomainFooterLink">Tapiwch yma i gael help.</string>
 
     <string name="login_noInternetConnectionTitle">Dim cysylltiad â\'r rhyngrwyd</string>
     <string name="login_noInternetConnectionMessage">Mae angen cysylltiad â\'r rhyngrwyd i wneud hyn.</string>
diff --git a/libs/login-api-2/src/main/res/values-da/strings.xml b/libs/login-api-2/src/main/res/values-da/strings.xml
index 1faf265adb..8f1838288b 100644
--- a/libs/login-api-2/src/main/res/values-da/strings.xml
+++ b/libs/login-api-2/src/main/res/values-da/strings.xml
@@ -109,7 +109,6 @@
     <string name="schoolInstructureCom">school.instructure.com</string>
     <string name="contentDescription_removePreviousUser">Fjern forrige bruger</string>
     <string name="accountDomainFooter">Kan du ikke finde din skole? Prøv at indtaste skolens fulde URL.</string>
-    <string name="accountDomainFooterLink">Tryk her for at få hjælp.</string>
 
     <string name="login_noInternetConnectionTitle">Ingen internetforbindelse</string>
     <string name="login_noInternetConnectionMessage">Denne handling kræver en internetforbindelse.</string>
diff --git a/libs/login-api-2/src/main/res/values-de/strings.xml b/libs/login-api-2/src/main/res/values-de/strings.xml
index 8389e442df..47261dfc0b 100644
--- a/libs/login-api-2/src/main/res/values-de/strings.xml
+++ b/libs/login-api-2/src/main/res/values-de/strings.xml
@@ -109,7 +109,6 @@
     <string name="schoolInstructureCom">school.instructure.com</string>
     <string name="contentDescription_removePreviousUser">Vorherige/n Benutzer*in entfernen</string>
     <string name="accountDomainFooter">Finden Sie Ihre Schule nicht? Geben Sie den vollständigen URL der Schule ein.</string>
-    <string name="accountDomainFooterLink">Tippen Sie hier, um Hilfe zu erhalten.</string>
 
     <string name="login_noInternetConnectionTitle">Keine Internetverbindung</string>
     <string name="login_noInternetConnectionMessage">Diese Aktion erfordert eine Internetverbindung.</string>
diff --git a/libs/login-api-2/src/main/res/values-en-rAU/strings.xml b/libs/login-api-2/src/main/res/values-en-rAU/strings.xml
index 562a29b642..de85b5f2a0 100644
--- a/libs/login-api-2/src/main/res/values-en-rAU/strings.xml
+++ b/libs/login-api-2/src/main/res/values-en-rAU/strings.xml
@@ -109,7 +109,6 @@
     <string name="schoolInstructureCom">school.instructure.com</string>
     <string name="contentDescription_removePreviousUser">Remove Previous User</string>
     <string name="accountDomainFooter">Can\'t find your school? Try typing the full school URL.</string>
-    <string name="accountDomainFooterLink">Tap here for help.</string>
 
     <string name="login_noInternetConnectionTitle">No Internet Connection</string>
     <string name="login_noInternetConnectionMessage">This action requires an internet connection.</string>
diff --git a/libs/login-api-2/src/main/res/values-en-rCA/strings.xml b/libs/login-api-2/src/main/res/values-en-rCA/strings.xml
index d319e90b16..3727f20dd5 100644
--- a/libs/login-api-2/src/main/res/values-en-rCA/strings.xml
+++ b/libs/login-api-2/src/main/res/values-en-rCA/strings.xml
@@ -112,7 +112,6 @@ F
     <string name="schoolInstructureCom">school.instructure.com</string>
     <string name="contentDescription_removePreviousUser">Remove Previous User</string>
     <string name="accountDomainFooter">Can\'t find your school? Try typing the full school URL.</string>
-    <string name="accountDomainFooterLink">Tap here for help.</string>
 
     <string name="login_noInternetConnectionTitle">No Internet Connection</string>
     <string name="login_noInternetConnectionMessage">This action requires an internet connection.</string>
diff --git a/libs/login-api-2/src/main/res/values-en-rCY/strings.xml b/libs/login-api-2/src/main/res/values-en-rCY/strings.xml
index 2008cc1293..9ad8745705 100644
--- a/libs/login-api-2/src/main/res/values-en-rCY/strings.xml
+++ b/libs/login-api-2/src/main/res/values-en-rCY/strings.xml
@@ -111,7 +111,6 @@
     <string name="schoolInstructureCom">school.instructure.com</string>
     <string name="contentDescription_removePreviousUser">Remove Previous User</string>
     <string name="accountDomainFooter">Can\'t find your school? Try typing the full school URL.</string>
-    <string name="accountDomainFooterLink">Tap here for help.</string>
 
     <string name="login_noInternetConnectionTitle">No Internet Connection</string>
     <string name="login_noInternetConnectionMessage">This action requires an internet connection.</string>
diff --git a/libs/login-api-2/src/main/res/values-en-rGB/strings.xml b/libs/login-api-2/src/main/res/values-en-rGB/strings.xml
index 4efa16bd21..4b3cdd4bcb 100644
--- a/libs/login-api-2/src/main/res/values-en-rGB/strings.xml
+++ b/libs/login-api-2/src/main/res/values-en-rGB/strings.xml
@@ -109,7 +109,6 @@
     <string name="schoolInstructureCom">school.instructure.com</string>
     <string name="contentDescription_removePreviousUser">Remove Previous User</string>
     <string name="accountDomainFooter">Can\'t find your school? Try typing the full school URL.</string>
-    <string name="accountDomainFooterLink">Tap here for help.</string>
 
     <string name="login_noInternetConnectionTitle">No Internet Connection</string>
     <string name="login_noInternetConnectionMessage">This action requires an internet connection.</string>
diff --git a/libs/login-api-2/src/main/res/values-es-rES/strings.xml b/libs/login-api-2/src/main/res/values-es-rES/strings.xml
index 34f0ec1e70..feeaaaa281 100644
--- a/libs/login-api-2/src/main/res/values-es-rES/strings.xml
+++ b/libs/login-api-2/src/main/res/values-es-rES/strings.xml
@@ -110,7 +110,6 @@
     <string name="schoolInstructureCom">school.instructure.com</string>
     <string name="contentDescription_removePreviousUser">Eliminar usuario anterior</string>
     <string name="accountDomainFooter">¿No puedes encontrar tu escuela? Intenta escribir la URL completa de la escuela.</string>
-    <string name="accountDomainFooterLink">Toca aquí para obtener ayuda.</string>
 
     <string name="login_noInternetConnectionTitle">No hay conexión a Internet</string>
     <string name="login_noInternetConnectionMessage">Esta acción requiere conexión a Internet.</string>
diff --git a/libs/login-api-2/src/main/res/values-es/strings.xml b/libs/login-api-2/src/main/res/values-es/strings.xml
index f87d909f6e..3b4c42e957 100644
--- a/libs/login-api-2/src/main/res/values-es/strings.xml
+++ b/libs/login-api-2/src/main/res/values-es/strings.xml
@@ -111,7 +111,6 @@
     <string name="schoolInstructureCom">school.instructure.com</string>
     <string name="contentDescription_removePreviousUser">Eliminar usuario anterior</string>
     <string name="accountDomainFooter">¿No puede encontrar su escuela? Intente escribir la URL completa de la escuela.</string>
-    <string name="accountDomainFooterLink">Presione aquí para obtener ayuda.</string>
 
     <string name="login_noInternetConnectionTitle">Sin conexión a Internet</string>
     <string name="login_noInternetConnectionMessage">Esta acción requiere conexión a Internet.</string>
diff --git a/libs/login-api-2/src/main/res/values-fi/strings.xml b/libs/login-api-2/src/main/res/values-fi/strings.xml
index 4157a60613..f64c603f8d 100644
--- a/libs/login-api-2/src/main/res/values-fi/strings.xml
+++ b/libs/login-api-2/src/main/res/values-fi/strings.xml
@@ -111,7 +111,6 @@
     <string name="schoolInstructureCom">school.instructure.com</string>
     <string name="contentDescription_removePreviousUser">Poista edellinen käyttäjä</string>
     <string name="accountDomainFooter">Etkö löydä kouluasi? Yritä kirjoittaa koko koulun URL</string>
-    <string name="accountDomainFooterLink">Avaa ohje napauttamalla tässä.</string>
 
     <string name="login_noInternetConnectionTitle">Ei Internet-yhteyttä</string>
     <string name="login_noInternetConnectionMessage">Tähän toimintoon vaaditaan Internet-yhteys.</string>
diff --git a/libs/login-api-2/src/main/res/values-fr-rCA/strings.xml b/libs/login-api-2/src/main/res/values-fr-rCA/strings.xml
index 060153b513..3ca2376d4b 100644
--- a/libs/login-api-2/src/main/res/values-fr-rCA/strings.xml
+++ b/libs/login-api-2/src/main/res/values-fr-rCA/strings.xml
@@ -109,7 +109,6 @@
     <string name="schoolInstructureCom">school.instructure.com</string>
     <string name="contentDescription_removePreviousUser">Retirer l\'utilisateur précédent</string>
     <string name="accountDomainFooter">Vous ne trouvez pas votre école? Essayez de saisir l\'URL complète de l’école.</string>
-    <string name="accountDomainFooterLink">Appuyer ici pour obtenir de l\'aide.</string>
 
     <string name="login_noInternetConnectionTitle">Aucune connexion Internet</string>
     <string name="login_noInternetConnectionMessage">Cette action nécessite une connexion Internet.</string>
diff --git a/libs/login-api-2/src/main/res/values-fr/strings.xml b/libs/login-api-2/src/main/res/values-fr/strings.xml
index d2a7dedb52..538a698666 100644
--- a/libs/login-api-2/src/main/res/values-fr/strings.xml
+++ b/libs/login-api-2/src/main/res/values-fr/strings.xml
@@ -109,7 +109,6 @@
     <string name="schoolInstructureCom">school.instructure.com</string>
     <string name="contentDescription_removePreviousUser">Supprimer utilisateur précédent</string>
     <string name="accountDomainFooter">Vous ne trouvez pas votre école ? Essayez d’entrer l’URL complète de l’école</string>
-    <string name="accountDomainFooterLink">Appuyez ici pour obtenir de l’aide.</string>
 
     <string name="login_noInternetConnectionTitle">Aucune connexion internet</string>
     <string name="login_noInternetConnectionMessage">Cette action nécessite une connexion Internet.</string>
diff --git a/libs/login-api-2/src/main/res/values-ht/strings.xml b/libs/login-api-2/src/main/res/values-ht/strings.xml
index 2eea2ac773..4303be39f4 100644
--- a/libs/login-api-2/src/main/res/values-ht/strings.xml
+++ b/libs/login-api-2/src/main/res/values-ht/strings.xml
@@ -109,7 +109,6 @@
     <string name="schoolInstructureCom">school.instructure.com</string>
     <string name="contentDescription_removePreviousUser">Elimine Ansyen Itilizatè</string>
     <string name="accountDomainFooter">Ou paka jwenn lekòl ou a? Eseye tape tout URL lekòl la</string>
-    <string name="accountDomainFooterLink">Tape la pou èd.</string>
 
     <string name="login_noInternetConnectionTitle">Pa gen Koneksyon Internet</string>
     <string name="login_noInternetConnectionMessage">Pou aksyon sa a ou bezwen konekte sou entènèt.</string>
diff --git a/libs/login-api-2/src/main/res/values-is/strings.xml b/libs/login-api-2/src/main/res/values-is/strings.xml
index ab6760cb70..4ac89d3b60 100644
--- a/libs/login-api-2/src/main/res/values-is/strings.xml
+++ b/libs/login-api-2/src/main/res/values-is/strings.xml
@@ -111,7 +111,6 @@
     <string name="schoolInstructureCom">school.instructure.com</string>
     <string name="contentDescription_removePreviousUser">Fjarlægja fyrri notanda</string>
     <string name="accountDomainFooter">Finnurðu ekki skólann þinn? Prufaðu að slá inn alla vefslóð skólans.</string>
-    <string name="accountDomainFooterLink">Smelltu hér til að fá hjálp.</string>
 
     <string name="login_noInternetConnectionTitle">Engin nettenging</string>
     <string name="login_noInternetConnectionMessage">Þessi aðgerð krefst nettengingar.</string>
diff --git a/libs/login-api-2/src/main/res/values-it/strings.xml b/libs/login-api-2/src/main/res/values-it/strings.xml
index 541ff2dc4e..675781a920 100644
--- a/libs/login-api-2/src/main/res/values-it/strings.xml
+++ b/libs/login-api-2/src/main/res/values-it/strings.xml
@@ -111,7 +111,6 @@
     <string name="schoolInstructureCom">school.instructure.com</string>
     <string name="contentDescription_removePreviousUser">Rimuovi utente precedente</string>
     <string name="accountDomainFooter">Non riesci a trova la tua scuola? Prova a digitare l’URL della scuola per intero.</string>
-    <string name="accountDomainFooterLink">Tocca qui per assistenza.</string>
 
     <string name="login_noInternetConnectionTitle">Nessuna connessione a Internet</string>
     <string name="login_noInternetConnectionMessage">Questa azione richiede una connessione a Internet.</string>
diff --git a/libs/login-api-2/src/main/res/values-ja/strings.xml b/libs/login-api-2/src/main/res/values-ja/strings.xml
index 01da4c3a5d..13acaf4ee3 100644
--- a/libs/login-api-2/src/main/res/values-ja/strings.xml
+++ b/libs/login-api-2/src/main/res/values-ja/strings.xml
@@ -109,7 +109,6 @@
     <string name="schoolInstructureCom">school.instructure.com</string>
     <string name="contentDescription_removePreviousUser">以前のユーザーを削除</string>
     <string name="accountDomainFooter">学校が見つかりませんか？学校の完全なURLを入力してみてください。</string>
-    <string name="accountDomainFooterLink">ここをタップしてヘルプを表示します。</string>
 
     <string name="login_noInternetConnectionTitle">インターネット接続なし</string>
     <string name="login_noInternetConnectionMessage">この操作にはインターネット接続が必要です。</string>
diff --git a/libs/login-api-2/src/main/res/values-mi/strings.xml b/libs/login-api-2/src/main/res/values-mi/strings.xml
index 772695e3af..59b0fc3de9 100644
--- a/libs/login-api-2/src/main/res/values-mi/strings.xml
+++ b/libs/login-api-2/src/main/res/values-mi/strings.xml
@@ -111,7 +111,6 @@
     <string name="schoolInstructureCom">school.instructure.com</string>
     <string name="contentDescription_removePreviousUser">Tango Kaiwhakmahi o mua</string>
     <string name="accountDomainFooter">Kaore e kitea tō kura? Ngana ki te pātō te nuinga o te kura url</string>
-    <string name="accountDomainFooterLink">Pātō ki kōnei mo te awhina</string>
 
     <string name="login_noInternetConnectionTitle">Kaore he hononga ipurangi</string>
     <string name="login_noInternetConnectionMessage">Tēnei mahi ka mahi he hononga ipurangi</string>
diff --git a/libs/login-api-2/src/main/res/values-ms/strings.xml b/libs/login-api-2/src/main/res/values-ms/strings.xml
index b8be733a44..4229891bcc 100644
--- a/libs/login-api-2/src/main/res/values-ms/strings.xml
+++ b/libs/login-api-2/src/main/res/values-ms/strings.xml
@@ -110,7 +110,6 @@
     <string name="schoolInstructureCom">school.instructure.com</string>
     <string name="contentDescription_removePreviousUser">Alih Keluar Pengguna Sebelumnya</string>
     <string name="accountDomainFooter">Tidak menemui sekolah anda? Cuba taip URL sekolah yang penuh.</string>
-    <string name="accountDomainFooterLink">Ketik di sini untuk mendapatkan bantuan.</string>
 
     <string name="login_noInternetConnectionTitle">Tiada Sambungan Internet</string>
     <string name="login_noInternetConnectionMessage">Tindakan ini memerlukan sambungan Internet</string>
diff --git a/libs/login-api-2/src/main/res/values-nb/strings.xml b/libs/login-api-2/src/main/res/values-nb/strings.xml
index 1d7d7e6851..e062fe3ba6 100644
--- a/libs/login-api-2/src/main/res/values-nb/strings.xml
+++ b/libs/login-api-2/src/main/res/values-nb/strings.xml
@@ -111,7 +111,6 @@
     <string name="schoolInstructureCom">school.instructure.com</string>
     <string name="contentDescription_removePreviousUser">Fjerne forrige bruker</string>
     <string name="accountDomainFooter">Finner du ikke skolen din? Prøv å skrive hele skolens URL.</string>
-    <string name="accountDomainFooterLink">Trykk her for hjelp.</string>
 
     <string name="login_noInternetConnectionTitle">Ingen Internett-tilkobling</string>
     <string name="login_noInternetConnectionMessage">Denne handlingen krever Internett-tilkobling.</string>
diff --git a/libs/login-api-2/src/main/res/values-nl/strings.xml b/libs/login-api-2/src/main/res/values-nl/strings.xml
index 0e4ae4a8f3..5b4e4a596b 100644
--- a/libs/login-api-2/src/main/res/values-nl/strings.xml
+++ b/libs/login-api-2/src/main/res/values-nl/strings.xml
@@ -109,7 +109,6 @@
     <string name="schoolInstructureCom">school.instructure.com</string>
     <string name="contentDescription_removePreviousUser">Vorige gebruiker verwijderen</string>
     <string name="accountDomainFooter">Kun je je school niet vinden? Typ de volledige URL van de school.</string>
-    <string name="accountDomainFooterLink">Tik hier voor hulp.</string>
 
     <string name="login_noInternetConnectionTitle">Geen internetverbinding</string>
     <string name="login_noInternetConnectionMessage">Voor deze actie is een internetverbinding vereist.</string>
diff --git a/libs/login-api-2/src/main/res/values-pl/strings.xml b/libs/login-api-2/src/main/res/values-pl/strings.xml
index 552807641f..64e3193940 100644
--- a/libs/login-api-2/src/main/res/values-pl/strings.xml
+++ b/libs/login-api-2/src/main/res/values-pl/strings.xml
@@ -109,7 +109,6 @@
     <string name="schoolInstructureCom">school.instructure.com</string>
     <string name="contentDescription_removePreviousUser">Usuń poprzedniego użytkownika</string>
     <string name="accountDomainFooter">Nie możesz znaleźć swojej szkoły? Spróbuj wprowadzić pełen adres URL szkoły.</string>
-    <string name="accountDomainFooterLink">Stuknij tutaj, aby uzyskać pomoc.</string>
 
     <string name="login_noInternetConnectionTitle">Brak połączenia internetowego</string>
     <string name="login_noInternetConnectionMessage">To działanie wymaga połączenia internetowego.</string>
diff --git a/libs/login-api-2/src/main/res/values-pt-rBR/strings.xml b/libs/login-api-2/src/main/res/values-pt-rBR/strings.xml
index 24542db009..21fd1ffc8e 100644
--- a/libs/login-api-2/src/main/res/values-pt-rBR/strings.xml
+++ b/libs/login-api-2/src/main/res/values-pt-rBR/strings.xml
@@ -111,7 +111,6 @@
     <string name="schoolInstructureCom">school.instructure.com</string>
     <string name="contentDescription_removePreviousUser">Remover usuário anterior</string>
     <string name="accountDomainFooter">Não consegue localizar a sua escola? Tente digitar a URL completa da escola.</string>
-    <string name="accountDomainFooterLink">Toque aqui para ajuda.</string>
 
     <string name="login_noInternetConnectionTitle">Sem conexão à internet</string>
     <string name="login_noInternetConnectionMessage">Esta ação exige conexão à internet.</string>
diff --git a/libs/login-api-2/src/main/res/values-pt-rPT/strings.xml b/libs/login-api-2/src/main/res/values-pt-rPT/strings.xml
index e6147e54df..549dc0523c 100644
--- a/libs/login-api-2/src/main/res/values-pt-rPT/strings.xml
+++ b/libs/login-api-2/src/main/res/values-pt-rPT/strings.xml
@@ -109,7 +109,6 @@
     <string name="schoolInstructureCom">school.instructure.com</string>
     <string name="contentDescription_removePreviousUser">Remover utilizador anterior?</string>
     <string name="accountDomainFooter">Não vê sua escola? Tente digitar o URL completo da escola.</string>
-    <string name="accountDomainFooterLink">Toque aqui para ajuda.</string>
 
     <string name="login_noInternetConnectionTitle">Sem ligação à Internet</string>
     <string name="login_noInternetConnectionMessage">Esta ação requer uma conexão com a internet.</string>
diff --git a/libs/login-api-2/src/main/res/values-ru/strings.xml b/libs/login-api-2/src/main/res/values-ru/strings.xml
index b2730ba446..ecaff5b7c8 100644
--- a/libs/login-api-2/src/main/res/values-ru/strings.xml
+++ b/libs/login-api-2/src/main/res/values-ru/strings.xml
@@ -109,7 +109,6 @@
     <string name="schoolInstructureCom">school.instructure.com</string>
     <string name="contentDescription_removePreviousUser">Удалить предыдущего пользователя</string>
     <string name="accountDomainFooter">Не удается найти свое учебное заведение? Попробуйте набрать полный адрес URL учебного заведения.</string>
-    <string name="accountDomainFooterLink">Прикоснитесь здесь для получения помощи.</string>
 
     <string name="login_noInternetConnectionTitle">Нет интернет-соединения</string>
     <string name="login_noInternetConnectionMessage">Для выполнения этого действия необходимо интернет-соединение.</string>
diff --git a/libs/login-api-2/src/main/res/values-sl/strings.xml b/libs/login-api-2/src/main/res/values-sl/strings.xml
index 22206a77c5..9501e8172f 100644
--- a/libs/login-api-2/src/main/res/values-sl/strings.xml
+++ b/libs/login-api-2/src/main/res/values-sl/strings.xml
@@ -111,7 +111,6 @@
     <string name="schoolInstructureCom">school.instructure.com</string>
     <string name="contentDescription_removePreviousUser">Odstrani predhodnega uporabnika</string>
     <string name="accountDomainFooter">Ali svoje šole ne najdete? Poskusite vnesti poln naslov URL šole.</string>
-    <string name="accountDomainFooterLink">Za pomoč tapnite tukaj.</string>
 
     <string name="login_noInternetConnectionTitle">Brez internetne povezave.</string>
     <string name="login_noInternetConnectionMessage">Pri tem dejanju je potrebna internetna povezava.</string>
diff --git a/libs/login-api-2/src/main/res/values-sv/strings.xml b/libs/login-api-2/src/main/res/values-sv/strings.xml
index 6545349e99..cd28a78c01 100644
--- a/libs/login-api-2/src/main/res/values-sv/strings.xml
+++ b/libs/login-api-2/src/main/res/values-sv/strings.xml
@@ -111,7 +111,6 @@
     <string name="schoolInstructureCom">school.instructure.com</string>
     <string name="contentDescription_removePreviousUser">Ta bort tidigare användare</string>
     <string name="accountDomainFooter">Kan du inte hitta din skola? Försök att skriva in skolans fullständiga URL.</string>
-    <string name="accountDomainFooterLink">Tryck här för hjälp.</string>
 
     <string name="login_noInternetConnectionTitle">Ingen internetanslutning</string>
     <string name="login_noInternetConnectionMessage">Den här åtgärden kräver internetanslutning.</string>
diff --git a/libs/login-api-2/src/main/res/values-th/strings.xml b/libs/login-api-2/src/main/res/values-th/strings.xml
index 5ca4798884..fe43425e2e 100644
--- a/libs/login-api-2/src/main/res/values-th/strings.xml
+++ b/libs/login-api-2/src/main/res/values-th/strings.xml
@@ -110,7 +110,6 @@
     <string name="schoolInstructureCom">school.instructure.com</string>
     <string name="contentDescription_removePreviousUser">ลบผู้ใช้ก่อนหน้า</string>
     <string name="accountDomainFooter">ไม่พบโรงเรียนของคุณ ลองพิมพ์ URL เต็มของสถานศึกษา</string>
-    <string name="accountDomainFooterLink">กดเลือกที่นี่เพื่อรับความช่วยเหลือ</string>
 
     <string name="login_noInternetConnectionTitle">ไม่มีการเชื่อมต่ออินเทอร์เน็ต</string>
     <string name="login_noInternetConnectionMessage">การดำเนินการนี้ต้องมีการเชื่อมต่ออินเทอร์เน็ต</string>
diff --git a/libs/login-api-2/src/main/res/values-vi/strings.xml b/libs/login-api-2/src/main/res/values-vi/strings.xml
index 0b1ef97420..301d0f6c50 100644
--- a/libs/login-api-2/src/main/res/values-vi/strings.xml
+++ b/libs/login-api-2/src/main/res/values-vi/strings.xml
@@ -110,7 +110,6 @@
     <string name="schoolInstructureCom">school.instructure.com</string>
     <string name="contentDescription_removePreviousUser">Loại Bỏ Người Dùng Trước</string>
     <string name="accountDomainFooter">Không tìm được trường của bạn? Hãy thử nhập URL đầy đủ của trường</string>
-    <string name="accountDomainFooterLink">Nhấn vào đây để được trợ giúp.</string>
 
     <string name="login_noInternetConnectionTitle">Không Có Kết Nối Internet</string>
     <string name="login_noInternetConnectionMessage">Thao tác này bắt buộc phải có kết nối internet.</string>
diff --git a/libs/login-api-2/src/main/res/values-zh/strings.xml b/libs/login-api-2/src/main/res/values-zh/strings.xml
index 871b422f6d..72d0ea9c83 100644
--- a/libs/login-api-2/src/main/res/values-zh/strings.xml
+++ b/libs/login-api-2/src/main/res/values-zh/strings.xml
@@ -109,7 +109,6 @@
     <string name="schoolInstructureCom">school.instructure.com</string>
     <string name="contentDescription_removePreviousUser">删除上一个用户</string>
     <string name="accountDomainFooter">找不到您的学校？尝试键入完整的学校 URL。</string>
-    <string name="accountDomainFooterLink">轻击此处获取帮助。</string>
 
     <string name="login_noInternetConnectionTitle">无互联网连接</string>
     <string name="login_noInternetConnectionMessage">此操作需要互联网连接。</string>
diff --git a/libs/login-api-2/src/main/res/values/strings.xml b/libs/login-api-2/src/main/res/values/strings.xml
index 4acc7c102b..493fa8837d 100644
--- a/libs/login-api-2/src/main/res/values/strings.xml
+++ b/libs/login-api-2/src/main/res/values/strings.xml
@@ -112,7 +112,7 @@ F
     <string name="schoolInstructureCom">school.instructure.com</string>
     <string name="contentDescription_removePreviousUser">Remove Previous User</string>
     <string name="accountDomainFooter">Can\'t find your school? Try typing the full school URL.</string>
-    <string name="accountDomainFooterLink">Tap here for help.</string>
+    <string name="accountDomainFooterLoginHelp">Tap here for login help.</string>
 
     <string name="login_noInternetConnectionTitle">No Internet Connection</string>
     <string name="login_noInternetConnectionMessage">This action requires an internet connection.</string>

From a9f5c02a82e2073c4912fd8a4732e130da6752a0 Mon Sep 17 00:00:00 2001
From: Kristof Nemere <109959688+kristofnemere@users.noreply.github.com>
Date: Tue, 22 Aug 2023 09:53:22 +0200
Subject: [PATCH 08/22] [MBL-16972][All] Add alt text to the "Instructure"
 image at the bottom of the "About" dialog in Androids User Settings

refs: MBL-16972
affects: Student, Teacher, Parent
release note: none
---
 apps/flutter_parent/lib/l10n/app_localizations.dart            | 3 +++
 .../lib/screens/settings/settings_interactor.dart              | 1 +
 libs/pandares/src/main/res/values/strings.xml                  | 1 +
 libs/pandautils/src/main/res/layout/fragment_about.xml         | 2 +-
 4 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/apps/flutter_parent/lib/l10n/app_localizations.dart b/apps/flutter_parent/lib/l10n/app_localizations.dart
index 26fa996e0b..4872b5fe70 100644
--- a/apps/flutter_parent/lib/l10n/app_localizations.dart
+++ b/apps/flutter_parent/lib/l10n/app_localizations.dart
@@ -1705,4 +1705,7 @@ class AppLocalizations {
 
   String get aboutVersionTitle =>
       Intl.message('Version', desc: 'Title for Version field on about page');
+
+  String get aboutLogoSemanticsLabel =>
+      Intl.message('Instructure logo', desc: 'Semantics label for the Instructure logo on the about page');
 }
diff --git a/apps/flutter_parent/lib/screens/settings/settings_interactor.dart b/apps/flutter_parent/lib/screens/settings/settings_interactor.dart
index 74dffb7968..652a26fc44 100644
--- a/apps/flutter_parent/lib/screens/settings/settings_interactor.dart
+++ b/apps/flutter_parent/lib/screens/settings/settings_interactor.dart
@@ -96,6 +96,7 @@ class SettingsInteractor {
                       SvgPicture.asset(
                         'assets/svg/ic_instructure_logo.svg',
                         alignment: Alignment.bottomCenter,
+                        semanticsLabel: L10n(context).aboutLogoSemanticsLabel,
                       )
                     ],
                   ),
diff --git a/libs/pandares/src/main/res/values/strings.xml b/libs/pandares/src/main/res/values/strings.xml
index c1648b020a..01f7f5f4cd 100644
--- a/libs/pandares/src/main/res/values/strings.xml
+++ b/libs/pandares/src/main/res/values/strings.xml
@@ -1400,4 +1400,5 @@
     <string name="aboutEmailTitle">Email</string>
     <string name="aboutVersionTitle">Version</string>
     <string name="assignmentRefreshError">There was a problem reloading this assignment. Please check your connection and try again.</string>
+    <string name="instructure_logo">Instructure logo</string>
 </resources>
diff --git a/libs/pandautils/src/main/res/layout/fragment_about.xml b/libs/pandautils/src/main/res/layout/fragment_about.xml
index 5d26338930..12b2463385 100644
--- a/libs/pandautils/src/main/res/layout/fragment_about.xml
+++ b/libs/pandautils/src/main/res/layout/fragment_about.xml
@@ -139,7 +139,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="32dp"
-                android:importantForAccessibility="no"
+                android:contentDescription="@string/instructure_logo"
                 android:src="@drawable/ic_instructure_logo"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"

From 67e0bf4cfc0066a72850c2c6f5d77b84a4c3835b Mon Sep 17 00:00:00 2001
From: Tamas Kozmer <72397075+tamaskozmer@users.noreply.github.com>
Date: Tue, 22 Aug 2023 09:53:51 +0200
Subject: [PATCH 09/22] [All] Fixed accessibility issues (#2109)

refs: MBL-16982, MBL-16975, MBL-16977, MBL-16984, MBL-16971, MBL-16978, MBL-16985
affects: All
release note: Fixed accessibility issues

* MBL-16982 Changed green and red colors to have 4.5:1 contrast with the background.

* MBL-16975 Fixed file submission icon contrast.

* MBL-16977 Fixed course name and home page contrast.

* MBL-16984 Fixed info color contrast

* MBL-16971 Fixed syllabus contrast.

* MBL-16978 Redesigned rating dialog.

* MBL-16985 Fixed contrast and content description for Canvas text on the login screen.

* Test fixes
---
 .../svg/canvas-parent-login-logo-dark.svg     | 10 ++++++++
 .../assets/svg/canvas-parent-login-logo.svg   | 12 +++++-----
 .../lib/screens/login_landing_screen.dart     |  8 ++-----
 .../AssignmentDetailsViewModel.kt             |  6 ++---
 .../src/main/res/layout/fragment_syllabus.xml |  4 +++-
 .../layout/fragment_unsupported_file_type.xml |  2 +-
 .../AssignmentDetailsViewModelTest.kt         |  8 +++----
 .../src/main/res/layout/fragment_syllabus.xml |  4 +++-
 .../layout/fragment_unsupported_file_type.xml |  2 +-
 .../res/layout/view_edit_course_homepage.xml  |  2 +-
 .../main/res/layout/view_rename_course.xml    |  2 +-
 .../layout/activity_login_landing_page.xml    |  4 ++--
 .../src/main/res/drawable/ic_rating_star.xml  |  5 ++++
 .../res/drawable/ic_rating_star_outline.xml   |  5 ++++
 libs/pandares/src/main/res/values/colors.xml  | 24 +++++++++----------
 .../pandautils/dialogs/RatingDialog.kt        |  7 ++----
 .../src/main/res/layout/dialog_rating.xml     | 20 ++++++++--------
 .../src/main/res/values/font_styles.xml       |  4 ++++
 18 files changed, 75 insertions(+), 54 deletions(-)
 create mode 100644 apps/flutter_parent/assets/svg/canvas-parent-login-logo-dark.svg
 create mode 100644 libs/pandares/src/main/res/drawable/ic_rating_star.xml
 create mode 100644 libs/pandares/src/main/res/drawable/ic_rating_star_outline.xml

diff --git a/apps/flutter_parent/assets/svg/canvas-parent-login-logo-dark.svg b/apps/flutter_parent/assets/svg/canvas-parent-login-logo-dark.svg
new file mode 100644
index 0000000000..cfc8e0bc77
--- /dev/null
+++ b/apps/flutter_parent/assets/svg/canvas-parent-login-logo-dark.svg
@@ -0,0 +1,10 @@
+<svg width="164" height="148" viewBox="0 0 164 148" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M82 55C86.5433 55 90.3004 58.3665 90.9127 62.7411C88.0828 63.5613 85.0926 64 82 64C78.9074 64 75.9172 63.5613 73.0884 62.7427C73.6996 58.3665 77.4567 55 82 55ZM65.7365 48.2635C68.9487 51.4756 69.2252 56.5117 66.5661 60.0379C61.2664 57.1152 56.8848 52.7336 53.9617 47.4348C57.4883 44.7748 62.5244 45.0513 65.7365 48.2635ZM110.038 47.4339L109.959 47.5784C107.036 52.8128 102.686 57.1416 97.4348 60.0383C94.7748 56.5117 95.0513 51.4756 98.2635 48.2635C101.476 45.0513 106.512 44.7748 110.038 47.4339ZM82 46C83.6569 46 85 47.3431 85 49C85 50.6569 83.6569 52 82 52C80.3431 52 79 50.6569 79 49C79 47.3431 80.3431 46 82 46ZM96.1421 41.8995C97.3137 43.0711 97.3137 44.9706 96.1421 46.1421C94.9706 47.3137 93.0711 47.3137 91.8995 46.1421C90.7279 44.9706 90.7279 43.0711 91.8995 41.8995C93.0711 40.7279 94.9706 40.7279 96.1421 41.8995ZM72.1005 41.8995C73.2721 43.0711 73.2721 44.9706 72.1005 46.1421C70.9289 47.3137 69.0294 47.3137 67.8579 46.1421C66.6863 44.9706 66.6863 43.0711 67.8579 41.8995C69.0294 40.7279 70.9289 40.7279 72.1005 41.8995ZM59 32C59 36.5433 55.6335 40.3004 51.2589 40.9127C50.4387 38.0828 50 35.0926 50 32C50 28.9074 50.4387 25.9172 51.2573 23.0884C55.6335 23.6996 59 27.4567 59 32ZM112.743 23.0884C113.561 25.9172 114 28.9074 114 32C114 35.0926 113.561 38.0828 112.743 40.9116C108.367 40.3004 105 36.5433 105 32C105 27.4732 108.342 23.727 112.693 23.0942L112.743 23.0884ZM99 29C100.657 29 102 30.3431 102 32C102 33.6569 100.657 35 99 35C97.3431 35 96 33.6569 96 32C96 30.3431 97.3431 29 99 29ZM65 29C66.6569 29 68 30.3431 68 32C68 33.6569 66.6569 35 65 35C63.3431 35 62 33.6569 62 32C62 30.3431 63.3431 29 65 29ZM96.1421 17.8579C97.3137 19.0294 97.3137 20.9289 96.1421 22.1005C94.9706 23.2721 93.0711 23.2721 91.8995 22.1005C90.7279 20.9289 90.7279 19.0294 91.8995 17.8579C93.0711 16.6863 94.9706 16.6863 96.1421 17.8579ZM72.1005 17.8579C73.2721 19.0294 73.2721 20.9289 72.1005 22.1005C70.9289 23.2721 69.0294 23.2721 67.8579 22.1005C66.6863 20.9289 66.6863 19.0294 67.8579 17.8579C69.0294 16.6863 70.9289 16.6863 72.1005 17.8579ZM97.4348 3.96169C102.734 6.88484 107.115 11.2664 110.038 16.5652C106.512 19.2252 101.476 18.9487 98.2635 15.7365C95.0933 12.5664 94.7825 7.6197 97.3311 4.10122L97.4348 3.96169ZM65.7365 15.7365C62.5244 18.9487 57.4883 19.2252 53.9621 16.5661C56.8848 11.2664 61.2664 6.88484 66.5652 3.96169C69.2252 7.48827 68.9487 12.5244 65.7365 15.7365ZM82 12C83.6569 12 85 13.3431 85 15C85 16.6569 83.6569 18 82 18C80.3431 18 79 16.6569 79 15C79 13.3431 80.3431 12 82 12ZM82 0C85.0926 0 88.0828 0.438709 90.9116 1.25729C90.3004 5.63346 86.5433 9 82 9C77.4567 9 73.6996 5.63346 73.0873 1.25885C75.9172 0.438709 78.9074 0 82 0Z" fill="#008EE2"/>
+<path d="M20 119C20 125.003 15.9217 128 9.98369 128H9.85318C3.91517 128 0 125.847 0 119.713V96.2871C0 90.4796 3.91517 88 9.85318 88H9.98369C15.9217 88 20 90.6925 20 96.5V101H14V97C14 94.2594 12.0065 93.677 9.98369 93.677C7.96085 93.677 6 94.2594 6 97V119C6 121.741 7.96085 122.258 9.98369 122.258C12.0065 122.258 14 121.741 14 119V114H20V119Z" fill="#FFFFFF"/>
+<path d="M43 118H35L34 127H27.5L34.9045 88H43L50.5 127H44L43 118ZM42 113L39 96L36.1415 113.002L42 113Z" fill="#FFFFFF"/>
+<path d="M129 118H121L120 127H113.5L120.904 88H129L136.5 127H130L129 118ZM128 113L125 96L122.142 113.002L128 113Z" fill="#FFFFFF"/>
+<path d="M59 127V88H65.349L74 112V88H80V127H73.5L65 102V127H59Z" fill="#FFFFFF"/>
+<path d="M102 127H96L88 88H95L99 117L103 88H109L102 127Z" fill="#FFFFFF"/>
+<path d="M157 97C157 94.5123 155.588 93.5646 153.689 93.5646C151.791 93.5646 150 94.0777 150 96.5V99.5C150 101.529 151.07 102.468 152.903 103.581L157.486 106.134C161.218 108.295 164 110.81 164 115V119C164 125.023 159.957 128 154 128C148.043 128 144 126.088 144 120V116H150V119C150 121.422 151.536 122.5 153.5 122.5C155.464 122.5 157.093 121.388 157.093 118.966V115.889C157.093 113.859 156.504 112.877 154.54 111.83L150.023 109.277C146.226 107.116 144 105.059 144 101V96C144 90.1735 148.632 88 154 88C159.368 88 163 90.1735 163 96V100H157V97Z" fill="#FFFFFF"/>
+<path d="M59.62 142.12C59.62 142.616 59.528 143.034 59.344 143.374C59.16 143.714 58.912 143.988 58.6 144.196C58.288 144.404 57.928 144.556 57.52 144.652C57.112 144.748 56.688 144.796 56.248 144.796H55.228V148H53.176V139.504H56.296C56.76 139.504 57.194 139.55 57.598 139.642C58.002 139.734 58.354 139.882 58.654 140.086C58.954 140.29 59.19 140.558 59.362 140.89C59.534 141.222 59.62 141.632 59.62 142.12ZM57.568 142.132C57.568 141.932 57.528 141.768 57.448 141.64C57.368 141.512 57.26 141.412 57.124 141.34C56.988 141.268 56.834 141.22 56.662 141.196C56.49 141.172 56.312 141.16 56.128 141.16H55.228V143.164H56.092C56.284 143.164 56.468 143.148 56.644 143.116C56.82 143.084 56.978 143.028 57.118 142.948C57.258 142.868 57.368 142.762 57.448 142.63C57.528 142.498 57.568 142.332 57.568 142.132ZM67.896 148L67.236 146.332H63.948L63.324 148H61.092L64.656 139.504H66.648L70.176 148H67.896ZM65.616 141.772L64.536 144.688H66.672L65.616 141.772ZM77.432 148L75.596 144.628H74.9V148H72.884V139.504H76.124C76.532 139.504 76.93 139.546 77.318 139.63C77.706 139.714 78.054 139.856 78.362 140.056C78.67 140.256 78.916 140.52 79.1 140.848C79.284 141.176 79.376 141.584 79.376 142.072C79.376 142.648 79.22 143.132 78.908 143.524C78.596 143.916 78.164 144.196 77.612 144.364L79.832 148H77.432ZM77.348 142.108C77.348 141.908 77.306 141.746 77.222 141.622C77.138 141.498 77.03 141.402 76.898 141.334C76.766 141.266 76.618 141.22 76.454 141.196C76.29 141.172 76.132 141.16 75.98 141.16H74.888V143.14H75.86C76.028 143.14 76.2 143.126 76.376 143.098C76.552 143.07 76.712 143.02 76.856 142.948C77 142.876 77.118 142.772 77.21 142.636C77.302 142.5 77.348 142.324 77.348 142.108ZM82.84 148V139.504H88.552V141.244H84.82V142.84H88.348V144.484H84.82V146.248H88.768V148H82.84ZM97.524 148L94.104 142.444H94.068L94.116 148H92.124V139.504H94.464L97.872 145.048H97.908L97.86 139.504H99.852V148H97.524ZM107.24 141.256V148H105.188V141.256H102.788V139.504H109.64V141.256H107.24Z" fill="#008EE2"/>
+</svg>
\ No newline at end of file
diff --git a/apps/flutter_parent/assets/svg/canvas-parent-login-logo.svg b/apps/flutter_parent/assets/svg/canvas-parent-login-logo.svg
index a6413426ae..a7729978ef 100644
--- a/apps/flutter_parent/assets/svg/canvas-parent-login-logo.svg
+++ b/apps/flutter_parent/assets/svg/canvas-parent-login-logo.svg
@@ -1,10 +1,10 @@
 <svg width="164" height="148" viewBox="0 0 164 148" fill="none" xmlns="http://www.w3.org/2000/svg">
 <path fill-rule="evenodd" clip-rule="evenodd" d="M82 55C86.5433 55 90.3004 58.3665 90.9127 62.7411C88.0828 63.5613 85.0926 64 82 64C78.9074 64 75.9172 63.5613 73.0884 62.7427C73.6996 58.3665 77.4567 55 82 55ZM65.7365 48.2635C68.9487 51.4756 69.2252 56.5117 66.5661 60.0379C61.2664 57.1152 56.8848 52.7336 53.9617 47.4348C57.4883 44.7748 62.5244 45.0513 65.7365 48.2635ZM110.038 47.4339L109.959 47.5784C107.036 52.8128 102.686 57.1416 97.4348 60.0383C94.7748 56.5117 95.0513 51.4756 98.2635 48.2635C101.476 45.0513 106.512 44.7748 110.038 47.4339ZM82 46C83.6569 46 85 47.3431 85 49C85 50.6569 83.6569 52 82 52C80.3431 52 79 50.6569 79 49C79 47.3431 80.3431 46 82 46ZM96.1421 41.8995C97.3137 43.0711 97.3137 44.9706 96.1421 46.1421C94.9706 47.3137 93.0711 47.3137 91.8995 46.1421C90.7279 44.9706 90.7279 43.0711 91.8995 41.8995C93.0711 40.7279 94.9706 40.7279 96.1421 41.8995ZM72.1005 41.8995C73.2721 43.0711 73.2721 44.9706 72.1005 46.1421C70.9289 47.3137 69.0294 47.3137 67.8579 46.1421C66.6863 44.9706 66.6863 43.0711 67.8579 41.8995C69.0294 40.7279 70.9289 40.7279 72.1005 41.8995ZM59 32C59 36.5433 55.6335 40.3004 51.2589 40.9127C50.4387 38.0828 50 35.0926 50 32C50 28.9074 50.4387 25.9172 51.2573 23.0884C55.6335 23.6996 59 27.4567 59 32ZM112.743 23.0884C113.561 25.9172 114 28.9074 114 32C114 35.0926 113.561 38.0828 112.743 40.9116C108.367 40.3004 105 36.5433 105 32C105 27.4732 108.342 23.727 112.693 23.0942L112.743 23.0884ZM99 29C100.657 29 102 30.3431 102 32C102 33.6569 100.657 35 99 35C97.3431 35 96 33.6569 96 32C96 30.3431 97.3431 29 99 29ZM65 29C66.6569 29 68 30.3431 68 32C68 33.6569 66.6569 35 65 35C63.3431 35 62 33.6569 62 32C62 30.3431 63.3431 29 65 29ZM96.1421 17.8579C97.3137 19.0294 97.3137 20.9289 96.1421 22.1005C94.9706 23.2721 93.0711 23.2721 91.8995 22.1005C90.7279 20.9289 90.7279 19.0294 91.8995 17.8579C93.0711 16.6863 94.9706 16.6863 96.1421 17.8579ZM72.1005 17.8579C73.2721 19.0294 73.2721 20.9289 72.1005 22.1005C70.9289 23.2721 69.0294 23.2721 67.8579 22.1005C66.6863 20.9289 66.6863 19.0294 67.8579 17.8579C69.0294 16.6863 70.9289 16.6863 72.1005 17.8579ZM97.4348 3.96169C102.734 6.88484 107.115 11.2664 110.038 16.5652C106.512 19.2252 101.476 18.9487 98.2635 15.7365C95.0933 12.5664 94.7825 7.6197 97.3311 4.10122L97.4348 3.96169ZM65.7365 15.7365C62.5244 18.9487 57.4883 19.2252 53.9621 16.5661C56.8848 11.2664 61.2664 6.88484 66.5652 3.96169C69.2252 7.48827 68.9487 12.5244 65.7365 15.7365ZM82 12C83.6569 12 85 13.3431 85 15C85 16.6569 83.6569 18 82 18C80.3431 18 79 16.6569 79 15C79 13.3431 80.3431 12 82 12ZM82 0C85.0926 0 88.0828 0.438709 90.9116 1.25729C90.3004 5.63346 86.5433 9 82 9C77.4567 9 73.6996 5.63346 73.0873 1.25885C75.9172 0.438709 78.9074 0 82 0Z" fill="#008EE2"/>
-<path d="M20 119C20 125.003 15.9217 128 9.98369 128H9.85318C3.91517 128 0 125.847 0 119.713V96.2871C0 90.4796 3.91517 88 9.85318 88H9.98369C15.9217 88 20 90.6925 20 96.5V101H14V97C14 94.2594 12.0065 93.677 9.98369 93.677C7.96085 93.677 6 94.2594 6 97V119C6 121.741 7.96085 122.258 9.98369 122.258C12.0065 122.258 14 121.741 14 119V114H20V119Z" fill="#C7CDD1"/>
-<path d="M43 118H35L34 127H27.5L34.9045 88H43L50.5 127H44L43 118ZM42 113L39 96L36.1415 113.002L42 113Z" fill="#C7CDD1"/>
-<path d="M129 118H121L120 127H113.5L120.904 88H129L136.5 127H130L129 118ZM128 113L125 96L122.142 113.002L128 113Z" fill="#C7CDD1"/>
-<path d="M59 127V88H65.349L74 112V88H80V127H73.5L65 102V127H59Z" fill="#C7CDD1"/>
-<path d="M102 127H96L88 88H95L99 117L103 88H109L102 127Z" fill="#C7CDD1"/>
-<path d="M157 97C157 94.5123 155.588 93.5646 153.689 93.5646C151.791 93.5646 150 94.0777 150 96.5V99.5C150 101.529 151.07 102.468 152.903 103.581L157.486 106.134C161.218 108.295 164 110.81 164 115V119C164 125.023 159.957 128 154 128C148.043 128 144 126.088 144 120V116H150V119C150 121.422 151.536 122.5 153.5 122.5C155.464 122.5 157.093 121.388 157.093 118.966V115.889C157.093 113.859 156.504 112.877 154.54 111.83L150.023 109.277C146.226 107.116 144 105.059 144 101V96C144 90.1735 148.632 88 154 88C159.368 88 163 90.1735 163 96V100H157V97Z" fill="#C7CDD1"/>
+<path d="M20 119C20 125.003 15.9217 128 9.98369 128H9.85318C3.91517 128 0 125.847 0 119.713V96.2871C0 90.4796 3.91517 88 9.85318 88H9.98369C15.9217 88 20 90.6925 20 96.5V101H14V97C14 94.2594 12.0065 93.677 9.98369 93.677C7.96085 93.677 6 94.2594 6 97V119C6 121.741 7.96085 122.258 9.98369 122.258C12.0065 122.258 14 121.741 14 119V114H20V119Z" fill="#2D3B45"/>
+<path d="M43 118H35L34 127H27.5L34.9045 88H43L50.5 127H44L43 118ZM42 113L39 96L36.1415 113.002L42 113Z" fill="#2D3B45"/>
+<path d="M129 118H121L120 127H113.5L120.904 88H129L136.5 127H130L129 118ZM128 113L125 96L122.142 113.002L128 113Z" fill="#2D3B45"/>
+<path d="M59 127V88H65.349L74 112V88H80V127H73.5L65 102V127H59Z" fill="#2D3B45"/>
+<path d="M102 127H96L88 88H95L99 117L103 88H109L102 127Z" fill="#2D3B45"/>
+<path d="M157 97C157 94.5123 155.588 93.5646 153.689 93.5646C151.791 93.5646 150 94.0777 150 96.5V99.5C150 101.529 151.07 102.468 152.903 103.581L157.486 106.134C161.218 108.295 164 110.81 164 115V119C164 125.023 159.957 128 154 128C148.043 128 144 126.088 144 120V116H150V119C150 121.422 151.536 122.5 153.5 122.5C155.464 122.5 157.093 121.388 157.093 118.966V115.889C157.093 113.859 156.504 112.877 154.54 111.83L150.023 109.277C146.226 107.116 144 105.059 144 101V96C144 90.1735 148.632 88 154 88C159.368 88 163 90.1735 163 96V100H157V97Z" fill="#2D3B45"/>
 <path d="M59.62 142.12C59.62 142.616 59.528 143.034 59.344 143.374C59.16 143.714 58.912 143.988 58.6 144.196C58.288 144.404 57.928 144.556 57.52 144.652C57.112 144.748 56.688 144.796 56.248 144.796H55.228V148H53.176V139.504H56.296C56.76 139.504 57.194 139.55 57.598 139.642C58.002 139.734 58.354 139.882 58.654 140.086C58.954 140.29 59.19 140.558 59.362 140.89C59.534 141.222 59.62 141.632 59.62 142.12ZM57.568 142.132C57.568 141.932 57.528 141.768 57.448 141.64C57.368 141.512 57.26 141.412 57.124 141.34C56.988 141.268 56.834 141.22 56.662 141.196C56.49 141.172 56.312 141.16 56.128 141.16H55.228V143.164H56.092C56.284 143.164 56.468 143.148 56.644 143.116C56.82 143.084 56.978 143.028 57.118 142.948C57.258 142.868 57.368 142.762 57.448 142.63C57.528 142.498 57.568 142.332 57.568 142.132ZM67.896 148L67.236 146.332H63.948L63.324 148H61.092L64.656 139.504H66.648L70.176 148H67.896ZM65.616 141.772L64.536 144.688H66.672L65.616 141.772ZM77.432 148L75.596 144.628H74.9V148H72.884V139.504H76.124C76.532 139.504 76.93 139.546 77.318 139.63C77.706 139.714 78.054 139.856 78.362 140.056C78.67 140.256 78.916 140.52 79.1 140.848C79.284 141.176 79.376 141.584 79.376 142.072C79.376 142.648 79.22 143.132 78.908 143.524C78.596 143.916 78.164 144.196 77.612 144.364L79.832 148H77.432ZM77.348 142.108C77.348 141.908 77.306 141.746 77.222 141.622C77.138 141.498 77.03 141.402 76.898 141.334C76.766 141.266 76.618 141.22 76.454 141.196C76.29 141.172 76.132 141.16 75.98 141.16H74.888V143.14H75.86C76.028 143.14 76.2 143.126 76.376 143.098C76.552 143.07 76.712 143.02 76.856 142.948C77 142.876 77.118 142.772 77.21 142.636C77.302 142.5 77.348 142.324 77.348 142.108ZM82.84 148V139.504H88.552V141.244H84.82V142.84H88.348V144.484H84.82V146.248H88.768V148H82.84ZM97.524 148L94.104 142.444H94.068L94.116 148H92.124V139.504H94.464L97.872 145.048H97.908L97.86 139.504H99.852V148H97.524ZM107.24 141.256V148H105.188V141.256H102.788V139.504H109.64V141.256H107.24Z" fill="#008EE2"/>
 </svg>
diff --git a/apps/flutter_parent/lib/screens/login_landing_screen.dart b/apps/flutter_parent/lib/screens/login_landing_screen.dart
index 7c66ea9cf9..af81ff724f 100644
--- a/apps/flutter_parent/lib/screens/login_landing_screen.dart
+++ b/apps/flutter_parent/lib/screens/login_landing_screen.dart
@@ -18,19 +18,14 @@ import 'package:flutter/material.dart';
 import 'package:flutter_parent/l10n/app_localizations.dart';
 import 'package:flutter_parent/models/login.dart';
 import 'package:flutter_parent/models/school_domain.dart';
-import 'package:flutter_parent/network/utils/analytics.dart';
 import 'package:flutter_parent/network/utils/api_prefs.dart';
 import 'package:flutter_parent/router/panda_router.dart';
 import 'package:flutter_parent/screens/qr_login/qr_login_util.dart';
 import 'package:flutter_parent/screens/web_login/web_login_screen.dart';
 import 'package:flutter_parent/utils/common_widgets/avatar.dart';
-import 'package:flutter_parent/utils/common_widgets/error_report/error_report_dialog.dart';
-import 'package:flutter_parent/utils/common_widgets/error_report/error_report_interactor.dart';
-import 'package:flutter_parent/utils/common_widgets/full_screen_scroll_container.dart';
 import 'package:flutter_parent/utils/common_widgets/two_finger_double_tap_gesture_detector.dart';
 import 'package:flutter_parent/utils/common_widgets/user_name.dart';
 import 'package:flutter_parent/utils/debug_flags.dart';
-import 'package:flutter_parent/utils/design/canvas_icons.dart';
 import 'package:flutter_parent/utils/design/canvas_icons_solid.dart';
 import 'package:flutter_parent/utils/design/parent_colors.dart';
 import 'package:flutter_parent/utils/design/parent_theme.dart';
@@ -93,13 +88,14 @@ class LoginLandingScreen extends StatelessWidget {
 
   Widget _body(BuildContext context) {
     final lastLoginAccount = ApiPrefs.getLastAccount();
+    final assetString = ParentTheme.of(context).isDarkMode ? 'assets/svg/canvas-parent-login-logo-dark.svg' : 'assets/svg/canvas-parent-login-logo.svg';
     return Center(
       child: Column(
         mainAxisAlignment: MainAxisAlignment.center,
         children: <Widget>[
           Spacer(),
           SvgPicture.asset(
-            'assets/svg/canvas-parent-login-logo.svg',
+            assetString,
             semanticsLabel: L10n(context).canvasLogoLabel,
           ),
           Spacer(),
diff --git a/apps/student/src/main/java/com/instructure/student/features/assignmentdetails/AssignmentDetailsViewModel.kt b/apps/student/src/main/java/com/instructure/student/features/assignmentdetails/AssignmentDetailsViewModel.kt
index 0a7f57a4ac..1155fdcead 100644
--- a/apps/student/src/main/java/com/instructure/student/features/assignmentdetails/AssignmentDetailsViewModel.kt
+++ b/apps/student/src/main/java/com/instructure/student/features/assignmentdetails/AssignmentDetailsViewModel.kt
@@ -268,11 +268,11 @@ class AssignmentDetailsViewModel @Inject constructor(
         )
 
         val submissionStatusTint = if (assignment.isSubmitted) {
-            R.color.backgroundSuccess
+            R.color.textSuccess
         } else if (isMissing) {
-            R.color.backgroundDanger
+            R.color.textDanger
         } else {
-            R.color.backgroundDark
+            R.color.textDark
         }
 
         val submittedStatusIcon = if (assignment.isSubmitted) R.drawable.ic_complete_solid else R.drawable.ic_no
diff --git a/apps/student/src/main/res/layout/fragment_syllabus.xml b/apps/student/src/main/res/layout/fragment_syllabus.xml
index f9baf996b6..cb801b5f90 100644
--- a/apps/student/src/main/res/layout/fragment_syllabus.xml
+++ b/apps/student/src/main/res/layout/fragment_syllabus.xml
@@ -46,7 +46,9 @@
         app:tabPaddingEnd="4dp"
         app:tabPaddingStart="4dp"
         app:tabSelectedTextColor="@color/white"
-        app:tabTextColor="@color/transparentWhite"
+        app:tabTextColor="@color/white"
+        app:tabTextAppearance="@style/TextAppearance.Design.Tab"
+        app:tabSelectedTextAppearance="@style/NavigationTabTextAppeareance"
         tools:background="#00bcd5"
         tools:visibility="visible">
 
diff --git a/apps/student/src/main/res/layout/fragment_unsupported_file_type.xml b/apps/student/src/main/res/layout/fragment_unsupported_file_type.xml
index 202c4d34cd..eb03f71252 100644
--- a/apps/student/src/main/res/layout/fragment_unsupported_file_type.xml
+++ b/apps/student/src/main/res/layout/fragment_unsupported_file_type.xml
@@ -48,7 +48,7 @@
                 android:layout_height="64dp"
                 android:importantForAccessibility="no"
                 android:scaleType="fitCenter"
-                android:tint="@color/textLight"
+                app:tint="@color/textDark"
                 app:srcCompat="@drawable/ic_canvas_logo_red"/>
 
             <TextView
diff --git a/apps/student/src/test/java/com/instructure/student/features/assignmentdetail/AssignmentDetailsViewModelTest.kt b/apps/student/src/test/java/com/instructure/student/features/assignmentdetail/AssignmentDetailsViewModelTest.kt
index d840f2c106..fb6ca1074a 100644
--- a/apps/student/src/test/java/com/instructure/student/features/assignmentdetail/AssignmentDetailsViewModelTest.kt
+++ b/apps/student/src/test/java/com/instructure/student/features/assignmentdetail/AssignmentDetailsViewModelTest.kt
@@ -307,7 +307,7 @@ class AssignmentDetailsViewModelTest {
     @Test
     fun `Missing submission`() {
         val expectedLabelText = "Missing"
-        val expectedTint = R.color.backgroundDanger
+        val expectedTint = R.color.textDanger
         val expectedIcon = R.drawable.ic_no
 
         every { resources.getString(R.string.missingAssignment) } returns expectedLabelText
@@ -336,7 +336,7 @@ class AssignmentDetailsViewModelTest {
     @Test
     fun `Not submitted submission`() {
         val expectedLabelText = "Not submitted"
-        val expectedTint = R.color.backgroundDark
+        val expectedTint = R.color.textDark
         val expectedIcon = R.drawable.ic_no
 
         every { resources.getString(R.string.notSubmitted) } returns expectedLabelText
@@ -360,7 +360,7 @@ class AssignmentDetailsViewModelTest {
     @Test
     fun `Graded submission`() {
         val expectedLabelText = "Graded"
-        val expectedTint = R.color.backgroundSuccess
+        val expectedTint = R.color.textSuccess
         val expectedIcon = R.drawable.ic_complete_solid
 
         every { resources.getString(R.string.gradedSubmissionLabel) } returns expectedLabelText
@@ -392,7 +392,7 @@ class AssignmentDetailsViewModelTest {
     @Test
     fun `Submitted submission`() {
         val expectedLabelText = "Submitted"
-        val expectedTint = R.color.backgroundSuccess
+        val expectedTint = R.color.textSuccess
         val expectedIcon = R.drawable.ic_complete_solid
 
         every { resources.getString(R.string.submitted) } returns expectedLabelText
diff --git a/apps/teacher/src/main/res/layout/fragment_syllabus.xml b/apps/teacher/src/main/res/layout/fragment_syllabus.xml
index 6b052d1fd8..6eb21796ac 100644
--- a/apps/teacher/src/main/res/layout/fragment_syllabus.xml
+++ b/apps/teacher/src/main/res/layout/fragment_syllabus.xml
@@ -46,7 +46,9 @@
         app:tabPaddingEnd="4dp"
         app:tabPaddingStart="4dp"
         app:tabSelectedTextColor="@color/white"
-        app:tabTextColor="@color/transparentWhite"
+        app:tabTextColor="@color/white"
+        app:tabTextAppearance="@style/TextAppearance.Design.Tab"
+        app:tabSelectedTextAppearance="@style/NavigationTabTextAppeareance"
         tools:background="#00bcd5"
         tools:visibility="visible">
 
diff --git a/apps/teacher/src/main/res/layout/fragment_unsupported_file_type.xml b/apps/teacher/src/main/res/layout/fragment_unsupported_file_type.xml
index 568c075201..fb0542d8bf 100644
--- a/apps/teacher/src/main/res/layout/fragment_unsupported_file_type.xml
+++ b/apps/teacher/src/main/res/layout/fragment_unsupported_file_type.xml
@@ -47,7 +47,7 @@
                 android:layout_height="64dp"
                 android:importantForAccessibility="no"
                 android:scaleType="fitCenter"
-                android:tint="@color/textLight"
+                app:tint="@color/textDark"
                 app:srcCompat="@drawable/ic_canvas_logo" />
 
             <TextView
diff --git a/apps/teacher/src/main/res/layout/view_edit_course_homepage.xml b/apps/teacher/src/main/res/layout/view_edit_course_homepage.xml
index 5d5ac71add..1ed4c70fbe 100644
--- a/apps/teacher/src/main/res/layout/view_edit_course_homepage.xml
+++ b/apps/teacher/src/main/res/layout/view_edit_course_homepage.xml
@@ -56,7 +56,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_below="@id/setHomeLabel"
-            android:alpha="0.55"
+            android:textColor="@color/textDark"
             android:freezesText="true"
             tools:text="Syllabus"/>
 
diff --git a/apps/teacher/src/main/res/layout/view_rename_course.xml b/apps/teacher/src/main/res/layout/view_rename_course.xml
index e1b2afcd22..4594143d7d 100644
--- a/apps/teacher/src/main/res/layout/view_rename_course.xml
+++ b/apps/teacher/src/main/res/layout/view_rename_course.xml
@@ -56,7 +56,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_below="@id/courseNameLabel"
-            android:alpha="0.55"
+            android:textColor="@color/textDark"
             android:freezesText="true"
             tools:text="Biology 101"/>
 
diff --git a/libs/login-api-2/src/main/res/layout/activity_login_landing_page.xml b/libs/login-api-2/src/main/res/layout/activity_login_landing_page.xml
index b41bb274f1..22adb062e5 100644
--- a/libs/login-api-2/src/main/res/layout/activity_login_landing_page.xml
+++ b/libs/login-api-2/src/main/res/layout/activity_login_landing_page.xml
@@ -55,8 +55,8 @@
                 android:layout_marginTop="24dp"
                 android:layout_marginBottom="2dp"
                 android:adjustViewBounds="true"
-                android:importantForAccessibility="no"
-                android:tint="@color/tiara"
+                android:contentDescription="@string/canvas"
+                android:tint="@color/textDarkest"
                 app:srcCompat="@drawable/ic_canvas_wordmark" />
 
             <TextView
diff --git a/libs/pandares/src/main/res/drawable/ic_rating_star.xml b/libs/pandares/src/main/res/drawable/ic_rating_star.xml
new file mode 100644
index 0000000000..0c50640422
--- /dev/null
+++ b/libs/pandares/src/main/res/drawable/ic_rating_star.xml
@@ -0,0 +1,5 @@
+<vector android:height="48dp" android:tint="#000000"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="48dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M12,17.27L18.18,21l-1.64,-7.03L22,9.24l-7.19,-0.61L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21z"/>
+</vector>
diff --git a/libs/pandares/src/main/res/drawable/ic_rating_star_outline.xml b/libs/pandares/src/main/res/drawable/ic_rating_star_outline.xml
new file mode 100644
index 0000000000..c32749453d
--- /dev/null
+++ b/libs/pandares/src/main/res/drawable/ic_rating_star_outline.xml
@@ -0,0 +1,5 @@
+<vector android:height="48dp" android:tint="#000000"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="48dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M22,9.24l-7.19,-0.62L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21 12,17.27 18.18,21l-1.63,-7.03L22,9.24zM12,15.4l-3.76,2.27 1,-4.28 -3.32,-2.88 4.38,-0.38L12,6.1l1.71,4.04 4.38,0.38 -3.32,2.88 1,4.28L12,15.4z"/>
+</vector>
diff --git a/libs/pandares/src/main/res/values/colors.xml b/libs/pandares/src/main/res/values/colors.xml
index 5843539a2c..0adee136e1 100644
--- a/libs/pandares/src/main/res/values/colors.xml
+++ b/libs/pandares/src/main/res/values/colors.xml
@@ -20,44 +20,44 @@
     <!-- InstUI colors - We should use these colors to build standard UI elements -->
     <color name="ash">#556572</color>
     <color name="backgroundAlert">#BF32A4</color>
-    <color name="backgroundDanger">#EE0612</color>
+    <color name="backgroundDanger">#E0061F</color>
     <color name="backgroundDark">#556572</color>
     <color name="backgroundDarkest">#2D3B45</color>
     <color name="backgroundGrouped">#F5F5F5</color>
     <color name="backgroundGroupedCell">#FFFFFF</color>
-    <color name="backgroundInfo">#008EE2</color>
+    <color name="backgroundInfo">#0374B5</color>
     <color name="backgroundLight">#F5F5F5</color>
     <color name="backgroundLightest">#FFFFFF</color>
     <color name="backgroundLightestElevated">#FFFFFF</color>
     <color name="backgroundMedium">#C7CDD1</color>
-    <color name="backgroundSuccess">#00AC18</color>
+    <color name="backgroundSuccess">#0B874B</color>
     <color name="backgroundWarning">#FC5E13</color>
     <color name="barney">#BF32A4</color>
     <color name="borderAlert">#BF32A4</color>
-    <color name="borderDanger">#EE0612</color>
+    <color name="borderDanger">#E0061F</color>
     <color name="borderDark">#556572</color>
     <color name="borderDarkest">#2D3B45</color>
-    <color name="borderInfo">#008EE2</color>
+    <color name="borderInfo">#0374B5</color>
     <color name="borderLight">#F5F5F5</color>
     <color name="borderLightest">#FFFFFF</color>
     <color name="borderMedium">#C7CDD1</color>
-    <color name="borderSuccess">#00AC18</color>
+    <color name="borderSuccess">#0B874B</color>
     <color name="borderWarning">#FC5E13</color>
-    <color name="crimson">#EE0612</color>
-    <color name="electric">#008EE2</color>
+    <color name="crimson">#E0061F</color>
+    <color name="electric">#0374B5</color>
     <color name="fire">#FC5E13</color>
     <color name="licorice">#2D3B45</color>
     <color name="oxford">#394B58</color> <!-- Only shade of gray that does not have pair in dark mode -->
     <color name="porcelain">#F5F5F5</color>
-    <color name="shamrock">#00AC18</color>
+    <color name="shamrock">#0B874B</color>
     <color name="textAlert">#BF32A4</color>
-    <color name="textDanger">#EE0612</color>
+    <color name="textDanger">#E0061F</color>
     <color name="textDark">#556572</color>
     <color name="textDarkest">#2D3B45</color>
-    <color name="textInfo">#008EE2</color>
+    <color name="textInfo">#0374B5</color>
     <color name="textLight">#F5F5F5</color>
     <color name="textLightest">#FFFFFF</color>
-    <color name="textSuccess">#00AC18</color>
+    <color name="textSuccess">#0B874B</color>
     <color name="textWarning">#FC5E13</color>
     <color name="tiara">#C7CDD1</color>
     <color name="white">#FFFFFF</color>
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/dialogs/RatingDialog.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/dialogs/RatingDialog.kt
index 04cf4f703d..7745073010 100644
--- a/libs/pandautils/src/main/java/com/instructure/pandautils/dialogs/RatingDialog.kt
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/dialogs/RatingDialog.kt
@@ -113,13 +113,11 @@ class RatingDialog : DialogFragment() {
 
         val starClickListener = View.OnClickListener { v ->
             stars.forEach {
-                it.setImageResource(R.drawable.ic_star)
-                it.setColorFilter(requireContext().getColor(R.color.backgroundMedium))
+                it.setImageResource(R.drawable.ic_rating_star_outline)
             }
             val selectionIndex = stars.indexOf(v)
             stars.take(selectionIndex + 1).forEach {
-                it.setImageResource(R.drawable.ic_star)
-                it.setColorFilter(requireContext().getColor(R.color.backgroundDark))
+                it.setImageResource(R.drawable.ic_rating_star)
             }
             val isFiveStars = selectionIndex >= 4
             comments.setVisible(!isFiveStars)
@@ -132,7 +130,6 @@ class RatingDialog : DialogFragment() {
         }
 
         stars.forEach {
-            it.setImageResource(R.drawable.ic_star)
             it.setOnClickListener(starClickListener)
         }
     }
diff --git a/libs/pandautils/src/main/res/layout/dialog_rating.xml b/libs/pandautils/src/main/res/layout/dialog_rating.xml
index 007ed070e7..ab56eb6e20 100644
--- a/libs/pandautils/src/main/res/layout/dialog_rating.xml
+++ b/libs/pandautils/src/main/res/layout/dialog_rating.xml
@@ -39,8 +39,8 @@
             android:layout_marginLeft="4dp"
             android:layout_marginRight="4dp"
             android:contentDescription="@string/star1"
-            android:src="@drawable/ic_star"
-            app:tint="@color/backgroundMedium" />
+            android:src="@drawable/ic_rating_star_outline"
+            app:tint="@color/backgroundDark" />
 
         <ImageView
             android:id="@+id/star2"
@@ -49,8 +49,8 @@
             android:layout_marginLeft="4dp"
             android:layout_marginRight="4dp"
             android:contentDescription="@string/star2"
-            android:src="@drawable/ic_star"
-            app:tint="@color/backgroundMedium"/>
+            android:src="@drawable/ic_rating_star_outline"
+            app:tint="@color/backgroundDark"/>
 
         <ImageView
             android:id="@+id/star3"
@@ -59,8 +59,8 @@
             android:layout_marginLeft="4dp"
             android:layout_marginRight="4dp"
             android:contentDescription="@string/star3"
-            android:src="@drawable/ic_star"
-            app:tint="@color/backgroundMedium"/>
+            android:src="@drawable/ic_rating_star_outline"
+            app:tint="@color/backgroundDark"/>
 
         <ImageView
             android:id="@+id/star4"
@@ -69,8 +69,8 @@
             android:layout_marginLeft="4dp"
             android:layout_marginRight="4dp"
             android:contentDescription="@string/star4"
-            android:src="@drawable/ic_star"
-            app:tint="@color/backgroundMedium"/>
+            android:src="@drawable/ic_rating_star_outline"
+            app:tint="@color/backgroundDark"/>
 
         <ImageView
             android:id="@+id/star5"
@@ -79,8 +79,8 @@
             android:layout_marginLeft="4dp"
             android:layout_marginRight="4dp"
             android:contentDescription="@string/star5"
-            android:src="@drawable/ic_star"
-            app:tint="@color/backgroundMedium"/>
+            android:src="@drawable/ic_rating_star_outline"
+            app:tint="@color/backgroundDark"/>
 
     </LinearLayout>
 
diff --git a/libs/pandautils/src/main/res/values/font_styles.xml b/libs/pandautils/src/main/res/values/font_styles.xml
index 1e19ec8b65..51fa9e391c 100644
--- a/libs/pandautils/src/main/res/values/font_styles.xml
+++ b/libs/pandautils/src/main/res/values/font_styles.xml
@@ -42,4 +42,8 @@
         <item name="android:textStyle">italic</item>
     </style>
 
+    <style name="NavigationTabTextAppeareance" parent="TextAppearance.Design.Tab">
+        <item name="android:textStyle">bold</item>
+    </style>
+
 </resources>
\ No newline at end of file

From 454740d1d0ed6f6f7a19c7ef30a8e03bc42bcc5f Mon Sep 17 00:00:00 2001
From: Kristof Deak <92309696+kdeakinstructure@users.noreply.github.com>
Date: Tue, 22 Aug 2023 12:32:24 +0200
Subject: [PATCH 10/22] Fix many breaking nightly tests in both apps (#2114)

* Rollback lowres devices to API lvl 26 (because API level 29 low resolution device is too flaky).

* fix teacher announcement and discussion e2e tests

* fix files e2e test in teacher

* fix breaking syllabus tablet test.
fix breaking discussion test.

* fix breaking landscape module tests

* Stub NotATeacherPageTest displaysPageObjects test because of the 'too many login attempts' change on the backend. (Will be put back after find found a solution for it)
---
 .../ui/interaction/ModuleInteractionTest.kt   | 338 ++++++++++++------
 .../teacher/ui/NotATeacherPageTest.kt         |   2 +
 .../teacher/ui/e2e/DiscussionsE2ETest.kt      |  12 +-
 .../teacher/ui/e2e/FilesE2ETest.kt            |   2 +-
 .../teacher/ui/pages/AnnouncementsListPage.kt |   2 +-
 .../teacher/ui/pages/CalendarEventPage.kt     |   4 +-
 6 files changed, 232 insertions(+), 128 deletions(-)

diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/ModuleInteractionTest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/ModuleInteractionTest.kt
index c35844fb1b..20c99a602c 100644
--- a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/ModuleInteractionTest.kt
+++ b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/ModuleInteractionTest.kt
@@ -18,12 +18,36 @@ package com.instructure.student.ui.interaction
 import android.text.Html
 import androidx.test.espresso.Espresso
 import androidx.test.espresso.web.webdriver.Locator
-import com.instructure.canvas.espresso.mockCanvas.*
-import com.instructure.canvasapi2.models.*
+import com.instructure.canvas.espresso.mockCanvas.MockCanvas
+import com.instructure.canvas.espresso.mockCanvas.addAssignment
+import com.instructure.canvas.espresso.mockCanvas.addDiscussionTopicToCourse
+import com.instructure.canvas.espresso.mockCanvas.addFileToCourse
+import com.instructure.canvas.espresso.mockCanvas.addItemToModule
+import com.instructure.canvas.espresso.mockCanvas.addLTITool
+import com.instructure.canvas.espresso.mockCanvas.addModuleToCourse
+import com.instructure.canvas.espresso.mockCanvas.addPageToCourse
+import com.instructure.canvas.espresso.mockCanvas.addQuestionToQuiz
+import com.instructure.canvas.espresso.mockCanvas.addQuizToCourse
+import com.instructure.canvas.espresso.mockCanvas.init
+import com.instructure.canvasapi2.models.Assignment
+import com.instructure.canvasapi2.models.CourseSettings
+import com.instructure.canvasapi2.models.DiscussionTopicHeader
+import com.instructure.canvasapi2.models.LockInfo
+import com.instructure.canvasapi2.models.LockedModule
+import com.instructure.canvasapi2.models.ModuleContentDetails
+import com.instructure.canvasapi2.models.ModuleObject
+import com.instructure.canvasapi2.models.Page
+import com.instructure.canvasapi2.models.Quiz
+import com.instructure.canvasapi2.models.QuizAnswer
+import com.instructure.canvasapi2.models.Tab
 import com.instructure.dataseeding.util.days
 import com.instructure.dataseeding.util.fromNow
 import com.instructure.dataseeding.util.iso8601
-import com.instructure.panda_annotations.*
+import com.instructure.panda_annotations.FeatureCategory
+import com.instructure.panda_annotations.Priority
+import com.instructure.panda_annotations.SecondaryFeatureCategory
+import com.instructure.panda_annotations.TestCategory
+import com.instructure.panda_annotations.TestMetaData
 import com.instructure.student.R
 import com.instructure.student.ui.pages.WebViewTextCheck
 import com.instructure.student.ui.utils.StudentTest
@@ -43,7 +67,6 @@ class ModuleInteractionTest : StudentTest() {
     private var page: Page? = null
     private val fileName = "ModuleFile.html"
     private var fileCheck: WebViewTextCheck? = null
-    private val externalUrl = "https://www.google.com"
     private var quiz: Quiz? = null
 
     // Tapping an Assignment module item should navigate to that item's detail page
@@ -55,7 +78,19 @@ class ModuleInteractionTest : StudentTest() {
         val course1 = data.courses.values.first()
         val module = data.courseModules[course1.id]!!.first()
 
+        // Create an assignment and add it as a module item
+        assignment = data.addAssignment(
+            courseId = course1.id,
+            submissionType = Assignment.SubmissionType.ONLINE_TEXT_ENTRY
+        )
+        data.addItemToModule(
+            course = course1,
+            moduleId = module.id,
+            item = assignment!!
+        )
+
         // Verify that we can launch into the assignment from an assignment module item
+        modulesPage.refresh()
         modulesPage.assertModuleDisplayed(module)
         modulesPage.assertModuleItemDisplayed(module, assignment!!.name!!)
         modulesPage.clickModuleItem(module, assignment!!.name!!)
@@ -71,8 +106,23 @@ class ModuleInteractionTest : StudentTest() {
         val data = getToCourseModules(studentCount = 1, courseCount = 1)
         val course1 = data.courses.values.first()
         val module = data.courseModules[course1.id]!!.first()
+        val user = data.users.values.first()
+
+        // Create a discussion and add it as a module item
+        topicHeader = data.addDiscussionTopicToCourse(
+            course = course1,
+            user = user,
+            topicTitle = "Discussion in module",
+            topicDescription = "In. A. Module."
+        )
+        data.addItemToModule(
+            course = course1,
+            moduleId = module.id,
+            item = topicHeader!!
+        )
 
         // Verify that we can launch into a discussion from a discussion module item
+        modulesPage.refresh()
         modulesPage.assertModuleDisplayed(module)
         modulesPage.assertModuleItemDisplayed(module, topicHeader!!.title!!)
         modulesPage.clickModuleItem(module, topicHeader!!.title!!)
@@ -87,6 +137,14 @@ class ModuleInteractionTest : StudentTest() {
         val course1 = data.courses.values.first()
         val module = data.courseModules[course1.id]!!.first()
 
+        val ltiTool = data.addLTITool("Google Drive", "http://google.com", course1, 1234L)
+        data.addItemToModule(
+            course = course1,
+            moduleId = module.id,
+            item = ltiTool!!
+        )
+
+        modulesPage.refresh()
         modulesPage.clickModuleItem(module, "Google Drive")
         canvasWebViewPage.assertTitle("Google Drive")
     }
@@ -96,11 +154,20 @@ class ModuleInteractionTest : StudentTest() {
     @TestMetaData(Priority.MANDATORY, FeatureCategory.MODULES, TestCategory.INTERACTION, false)
     fun testModules_launchesIntoExternalURL() {
         // Basic mock setup
+        val externalUrl = "https://www.google.com"
         val data = getToCourseModules(studentCount = 1, courseCount = 1)
         val course1 = data.courses.values.first()
         val module = data.courseModules[course1.id]!!.first()
 
+        // Create an external URL and add it as a module item
+        data.addItemToModule(
+            course = course1,
+            moduleId = module.id,
+            item = externalUrl
+        )
+
         // click the external url module item
+        modulesPage.refresh()
         modulesPage.clickModuleItem(module, externalUrl)
         // Not much we can test here, as it is an external URL, but testModules_navigateToNextAndPreviousModuleItems
         // will test that the module name and module item name are displayed correctly.
@@ -116,7 +183,26 @@ class ModuleInteractionTest : StudentTest() {
         val course1 = data.courses.values.first()
         val module = data.courseModules[course1.id]!!.first()
 
+        // Create a file and add it as a module item
+        val fileContent = "<h1 id=\"heading1\">A Heading</h1>"
+        fileCheck = WebViewTextCheck(Locator.ID, "heading1", "A Heading")
+
+        val fileId = data.addFileToCourse(
+            courseId = course1.id,
+            displayName = fileName,
+            fileContent = fileContent,
+            contentType = "text/html"
+        )
+        val rootFolderId = data.courseRootFolders[course1.id]!!.id
+        val fileFolder = data.folderFiles[rootFolderId]?.find { it.id == fileId }
+        data.addItemToModule(
+            course = course1,
+            moduleId = module.id,
+            item = fileFolder!!
+        )
+
         // Click the file module and verify that the file appears
+        modulesPage.refresh()
         modulesPage.clickModuleItem(module, fileName, R.id.openButton)
         canvasWebViewPage.waitForWebView()
         canvasWebViewPage.runTextChecks(fileCheck!!)
@@ -131,7 +217,22 @@ class ModuleInteractionTest : StudentTest() {
         val course1 = data.courses.values.first()
         val module = data.courseModules[course1.id]!!.first()
 
+        // Create a page and add it as a module item
+        page = data.addPageToCourse(
+            courseId = course1.id,
+            pageId = data.newItemId(),
+            published = true,
+            title = "Page In Course",
+            url = URLEncoder.encode("Page In Course", "UTF-8")
+        )
+        data.addItemToModule(
+            course = course1,
+            moduleId = module.id,
+            item = page!!
+        )
+
         // Verify that we can launch into a page from a page module item
+        modulesPage.refresh()
         modulesPage.assertModuleDisplayed(module)
         modulesPage.assertModuleItemDisplayed(module, page!!.title!!)
         modulesPage.clickModuleItem(module, page!!.title!!)
@@ -157,7 +258,48 @@ class ModuleInteractionTest : StudentTest() {
         val course1 = data.courses.values.first()
         val module = data.courseModules[course1.id]!!.first()
 
+        // Create a quiz and add it as a module item
+        quiz = data.addQuizToCourse(
+            course = course1
+        )
+
+        data.addQuestionToQuiz(
+            course = course1,
+            quizId = quiz!!.id,
+            questionName = "Math 1",
+            questionText = "What is 2 + 5?",
+            questionType = "multiple_choice_question",
+            answers = arrayOf(
+                QuizAnswer(answerText = "7"),
+                QuizAnswer(answerText = "25"),
+                QuizAnswer(answerText = "-7")
+            )
+        )
+
+        data.addQuestionToQuiz(
+            course = course1,
+            quizId = quiz!!.id,
+            questionName = "Math 2",
+            questionText = "Pi is greater than the square root of 2",
+            questionType = "true_false_question"
+        )
+
+        data.addQuestionToQuiz(
+            course = course1,
+            quizId = quiz!!.id,
+            questionName = "Math 3",
+            questionText = "Write an essay on why math is so awesome",
+            questionType = "essay_question"
+        )
+
+        data.addItemToModule(
+            course = course1,
+            moduleId = module.id,
+            item = quiz!!
+        )
+
         // Verify that we can launch into a quiz from a quiz module item
+        modulesPage.refresh()
         modulesPage.assertModuleDisplayed(module)
         modulesPage.assertModuleItemDisplayed(module, quiz!!.title!!)
         /* TODO: Check that the quiz is displayed if/when we can do so via WebView
@@ -177,7 +319,20 @@ class ModuleInteractionTest : StudentTest() {
         // Basic mock setup
         val data = getToCourseModules(studentCount = 1, courseCount = 1)
         val course1 = data.courses.values.first()
-        val module = data.courseModules[course1.id]!!.first()
+        var module = data.courseModules[course1.id]!!.first()
+
+        // Create an assignment and add it as a module item
+        assignment = data.addAssignment(
+            courseId = course1.id,
+            submissionType = Assignment.SubmissionType.ONLINE_TEXT_ENTRY
+        )
+        data.addItemToModule(
+            course = course1,
+            moduleId = module.id,
+            item = assignment!!
+        )
+
+        module = data.courseModules[course1.id]!!.first()
         val firstModuleItem = module.items[0]
 
         // Verify that expanding a module shows the module items and collapsing a module
@@ -185,6 +340,7 @@ class ModuleInteractionTest : StudentTest() {
         // We're going on the assumption that the lone module is initially expanded.  Although
         // the initial assertModuleItemDisplayed() would expand the module if it was not expanded
         // already.
+        modulesPage.refresh()
         modulesPage.assertModuleDisplayed(module)
         modulesPage.assertModuleItemDisplayed(module, firstModuleItem.title!!)
         modulesPage.clickModule(module)
@@ -221,11 +377,68 @@ class ModuleInteractionTest : StudentTest() {
     fun testModules_navigateToNextAndPreviousModuleItems() {
         // Basic mock setup
         val data = getToCourseModules(studentCount = 1, courseCount = 1)
+        val externalUrl = "https://www.google.com"
         val course1 = data.courses.values.first()
-        val module = data.courseModules[course1.id]!!.first()
+        var module = data.courseModules[course1.id]!!.first()
+        val user = data.users.values.first()
+
+        // Create an assignment and add it as a module item
+        assignment = data.addAssignment(
+            courseId = course1.id,
+            submissionType = Assignment.SubmissionType.ONLINE_TEXT_ENTRY
+        )
+        data.addItemToModule(
+            course = course1,
+            moduleId = module.id,
+            item = assignment!!
+        )
+
+        // Create a discussion and add it as a module item
+        topicHeader = data.addDiscussionTopicToCourse(
+            course = course1,
+            user = user,
+            topicTitle = "Discussion in module",
+            topicDescription = "In. A. Module."
+        )
+        data.addItemToModule(
+            course = course1,
+            moduleId = module.id,
+            item = topicHeader!!
+        )
+
+        val ltiTool = data.addLTITool("Google Drive", "http://google.com", course1, 1234L)
+        data.addItemToModule(
+            course = course1,
+            moduleId = module.id,
+            item = ltiTool!!
+        )
+
+        // Create a page and add it as a module item
+        page = data.addPageToCourse(
+            courseId = course1.id,
+            pageId = data.newItemId(),
+            published = true,
+            title = "Page In Course",
+            url = URLEncoder.encode("Page In Course", "UTF-8")
+        )
+        data.addItemToModule(
+            course = course1,
+            moduleId = module.id,
+            item = page!!
+        )
+
+        // Create an external URL and add it as a module item
+        data.addItemToModule(
+            course = course1,
+            moduleId = module.id,
+            item = externalUrl
+        )
+
+        module = data.courseModules[course1.id]!!.first()
 
         // Iterate through the module items, starting at the first
         val moduleItemList = module.items
+        modulesPage.refresh()
         modulesPage.clickModuleItem(module, moduleItemList[0].title!!)
 
         var moduleIndex = 0; // we start here
@@ -413,126 +626,15 @@ class ModuleInteractionTest : StudentTest() {
 
         // Add a course tab
         val course1 = data.courses.values.first()
-        val user1 = data.users.values.first()
         val modulesTab = Tab(position = 2, label = "Modules", visibility = "public", tabId = Tab.MODULES_ID)
         data.courseTabs[course1.id]!! += modulesTab
 
         // Create a module
-        val module = data.addModuleToCourse(
+        data.addModuleToCourse(
             course = course1,
             moduleName = "Big Module"
         )
 
-        // Create a discussion and add it as a module item
-        topicHeader = data.addDiscussionTopicToCourse(
-            course = course1,
-            user = user1,
-            topicTitle = "Discussion in module",
-            topicDescription = "In. A. Module."
-        )
-        data.addItemToModule(
-            course = course1,
-            moduleId = module.id,
-            item = topicHeader!!
-        )
-
-        // Create an assignment and add it as a module item
-        assignment = data.addAssignment(
-            courseId = course1.id,
-            submissionType = Assignment.SubmissionType.ONLINE_TEXT_ENTRY
-        )
-        data.addItemToModule(
-            course = course1,
-            moduleId = module.id,
-            item = assignment!!
-        )
-
-        // Create a page and add it as a module item
-        page = data.addPageToCourse(
-            courseId = course1.id,
-            pageId = data.newItemId(),
-            published = true,
-            title = "Page In Course",
-            url = URLEncoder.encode("Page In Course", "UTF-8")
-        )
-        data.addItemToModule(
-            course = course1,
-            moduleId = module.id,
-            item = page!!
-        )
-
-        // Create a file and add it as a module item
-        val fileContent = "<h1 id=\"heading1\">A Heading</h1>"
-        fileCheck = WebViewTextCheck(Locator.ID, "heading1", "A Heading")
-
-        val fileId = data.addFileToCourse(
-            courseId = course1.id,
-            displayName = fileName,
-            fileContent = fileContent,
-            contentType = "text/html"
-        )
-        val rootFolderId = data.courseRootFolders[course1.id]!!.id
-        val fileFolder = data.folderFiles[rootFolderId]?.find { it.id == fileId }
-        data.addItemToModule(
-            course = course1,
-            moduleId = module.id,
-            item = fileFolder!!
-        )
-
-        // Create an external URL and add it as a module item
-        data.addItemToModule(
-            course = course1,
-            moduleId = module.id,
-            item = externalUrl
-        )
-
-        // Create a quiz and add it as a module item
-        quiz = data.addQuizToCourse(
-            course = course1
-        )
-
-        data.addQuestionToQuiz(
-            course = course1,
-            quizId = quiz!!.id,
-            questionName = "Math 1",
-            questionText = "What is 2 + 5?",
-            questionType = "multiple_choice_question",
-            answers = arrayOf(
-                QuizAnswer(answerText = "7"),
-                QuizAnswer(answerText = "25"),
-                QuizAnswer(answerText = "-7")
-            )
-        )
-
-        data.addQuestionToQuiz(
-            course = course1,
-            quizId = quiz!!.id,
-            questionName = "Math 2",
-            questionText = "Pi is greater than the square root of 2",
-            questionType = "true_false_question"
-        )
-
-        data.addQuestionToQuiz(
-            course = course1,
-            quizId = quiz!!.id,
-            questionName = "Math 3",
-            questionText = "Write an essay on why math is so awesome",
-            questionType = "essay_question"
-        )
-
-        data.addItemToModule(
-            course = course1,
-            moduleId = module.id,
-            item = quiz!!
-        )
-
-        val ltiTool = data.addLTITool("Google Drive", "http://google.com", course1, 1234L)
-        data.addItemToModule(
-            course = course1,
-            moduleId = module.id,
-            item = ltiTool!!
-        )
-
         // Sign in
         val student = data.students[0]
         val token = data.tokenFor(student)!!
diff --git a/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/NotATeacherPageTest.kt b/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/NotATeacherPageTest.kt
index 24a7e27a53..fdabaaf522 100644
--- a/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/NotATeacherPageTest.kt
+++ b/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/NotATeacherPageTest.kt
@@ -15,6 +15,7 @@
  */
 package com.instructure.teacher.ui
 
+import com.instructure.canvas.espresso.Stub
 import com.instructure.teacher.ui.utils.TeacherTest
 import com.instructure.teacher.ui.utils.slowLogInAsStudent
 import dagger.hilt.android.testing.HiltAndroidTest
@@ -25,6 +26,7 @@ class NotATeacherPageTest : TeacherTest() {
 
     // Runs live; no MockCanvas
     @Test
+    @Stub("Stubbed because of the 'too many login attempts' change on backend. Will be de-stubbed when we find a solution for that.")
     override fun displaysPageObjects() {
         slowLogInAsStudent()
         notATeacherPage.assertPageObjects()
diff --git a/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/e2e/DiscussionsE2ETest.kt b/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/e2e/DiscussionsE2ETest.kt
index 17132fd6d5..4d80738c64 100644
--- a/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/e2e/DiscussionsE2ETest.kt
+++ b/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/e2e/DiscussionsE2ETest.kt
@@ -90,6 +90,10 @@ class DiscussionsE2ETest : TeacherTest() {
         discussionsListPage.assertGroupDisplayed("Pinned")
         discussionsListPage.assertDiscussionInGroup("Pinned", discussion2.title)
 
+        Log.d(STEP_TAG, "Assert that both of the discussions, '${discussion.title}' and '${discussion2.title}' discusssions are displayed.")
+        discussionsListPage.assertHasDiscussion(newTitle)
+        discussionsListPage.assertHasDiscussion(discussion2)
+
         Log.d(STEP_TAG,"Navigate to Discussions Details Page by clicking on 'Edit'. Delete the '$newTitle' discussion.")
         discussionsListPage.clickDiscussion(newTitle)
         discussionsDetailsPage.openEdit()
@@ -127,7 +131,7 @@ class DiscussionsE2ETest : TeacherTest() {
         Log.d(STEP_TAG,"Assert that the '$newDiscussionTitle' discussion is displayed and it is the only one.")
         discussionsListPage.assertDiscussionCount(1)
         discussionsListPage.assertHasDiscussion(newDiscussionTitle)
-        Espresso.pressBack() // need to press back to exit from the search input field
+        discussionsListPage.searchable.clickOnClearSearchButton()
 
         Log.d(STEP_TAG,"Collapse the discussion list and assert that the '$newDiscussionTitle' discussion can NOT be seen.")
         discussionsListPage.toggleCollapseExpandIcon()
@@ -138,11 +142,5 @@ class DiscussionsE2ETest : TeacherTest() {
         discussionsListPage.toggleCollapseExpandIcon()
         discussionsListPage.assertDiscussionCount(1)
         discussionsListPage.assertHasDiscussion(newDiscussionTitle)
-
-        Log.d(STEP_TAG, "Click on the clear search input button (X) on the toolbar. Assert that the default state, so both of the discussions will be displayed.")
-        discussionsListPage.searchable.clickOnClearSearchButton()
-        discussionsListPage.assertHasDiscussion(discussion)
-        discussionsListPage.assertHasDiscussion(discussion2)
-        discussionsListPage.assertDiscussionCount(2)
     }
 }
\ No newline at end of file
diff --git a/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/e2e/FilesE2ETest.kt b/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/e2e/FilesE2ETest.kt
index 71aab3cde4..87cc6c14c1 100644
--- a/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/e2e/FilesE2ETest.kt
+++ b/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/e2e/FilesE2ETest.kt
@@ -175,7 +175,7 @@ class FilesE2ETest: TeacherTest() {
         fileListPage.assertItemNotDisplayed("unfiled")
 
         Log.d(STEP_TAG, "Click on 'Reset' search (cross) icon and assert that all the root level directories and files are displayed (1).")
-        fileListPage.searchable.clickOnClearSearchButton()
+        fileListPage.searchable.pressSearchBackButton()
         fileListPage.assertFileListCount(1)
 
         Log.d(STEP_TAG,"Select 'unfiled' directory. Assert that ${discussionAttachmentFile.name} file is displayed on the File List Page.")
diff --git a/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/pages/AnnouncementsListPage.kt b/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/pages/AnnouncementsListPage.kt
index d8c9ad7b7f..88b00f66ec 100644
--- a/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/pages/AnnouncementsListPage.kt
+++ b/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/pages/AnnouncementsListPage.kt
@@ -95,7 +95,7 @@ class AnnouncementsListPage(val searchable: Searchable) : BasePage() {
      * @param announcementName: The announcement name string parameter.
      */
     fun assertHasAnnouncement(announcementName: String) {
-        onView(withText(announcementName)).assertDisplayed()
+        onView(withId(R.id.discussionTitle) + withText(announcementName)).assertDisplayed()
     }
 
     /**
diff --git a/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/pages/CalendarEventPage.kt b/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/pages/CalendarEventPage.kt
index 6d078ce3c2..63c194c0f8 100644
--- a/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/pages/CalendarEventPage.kt
+++ b/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/pages/CalendarEventPage.kt
@@ -25,6 +25,8 @@ import androidx.test.espresso.web.webdriver.Locator
 import com.instructure.canvas.espresso.containsTextCaseInsensitive
 import com.instructure.espresso.assertDisplayed
 import com.instructure.espresso.page.BasePage
+import com.instructure.espresso.page.plus
+import com.instructure.espresso.page.withParent
 import com.instructure.teacher.R
 import org.hamcrest.Matchers
 
@@ -56,7 +58,7 @@ class CalendarEventPage : BasePage(R.id.fragmentCalendarEvent) {
      * @throws AssertionError if the description does not match the expected description.
      */
     fun verifyDescription(description: String) {
-        Web.onWebView(ViewMatchers.withId(R.id.contentWebView))
+        Web.onWebView(ViewMatchers.withId(R.id.contentWebView) + withParent(R.id.calendarEventWebViewWrapper))
             .withElement(DriverAtoms.findElement(Locator.ID, "content"))
             .check(WebViewAssertions.webMatches(DriverAtoms.getText(), Matchers.comparesEqualTo(description)))
     }

From 1d3a67106702b8c1de08a25e2c9480e27f6384cd Mon Sep 17 00:00:00 2001
From: Tamas Kozmer <72397075+tamaskozmer@users.noreply.github.com>
Date: Wed, 23 Aug 2023 11:32:19 +0200
Subject: [PATCH 11/22] [MBL-16976][Student][Teacher] Fixed date picker
 contrast #2115

refs: MBL-16976
affects: Student, Teacher
release note: none
---
 apps/student/src/main/res/values/styles.xml   |  5 +++++
 .../main/res/values/themes_canvastheme.xml    |  1 +
 apps/teacher/src/main/res/values/styles.xml   |  6 ++++++
 .../res/color/calendar_color_selector.xml     | 20 +++++++++++++++++++
 .../pandautils/src/main/res/values/styles.xml |  4 ++++
 5 files changed, 36 insertions(+)
 create mode 100644 libs/pandautils/src/main/res/color/calendar_color_selector.xml

diff --git a/apps/student/src/main/res/values/styles.xml b/apps/student/src/main/res/values/styles.xml
index ab7bd8654a..f7f6d76219 100644
--- a/apps/student/src/main/res/values/styles.xml
+++ b/apps/student/src/main/res/values/styles.xml
@@ -255,4 +255,9 @@
         <item name="android:tint">@color/textDark</item>
     </style>
 
+    <style name="DatePickerStyle" parent="@android:style/Widget.DeviceDefault.DatePicker">
+        <item name="android:headerMonthTextAppearance">@style/DatePickerTextAppearance</item>
+        <item name="android:headerBackground">@color/licorice</item>
+    </style>
+
 </resources>
diff --git a/apps/student/src/main/res/values/themes_canvastheme.xml b/apps/student/src/main/res/values/themes_canvastheme.xml
index 25ff54c211..286ae42ffc 100755
--- a/apps/student/src/main/res/values/themes_canvastheme.xml
+++ b/apps/student/src/main/res/values/themes_canvastheme.xml
@@ -43,6 +43,7 @@
         <item name="pspdf__modalDialogStyle">@style/ModalDialogStyle</item>
         <item name="pspdf__annotationNoteHinterStyle">@style/AnnotationNoteHinter</item>
         <item name="pspdf__backgroundColor">@color/backgroundLight</item>
+        <item name="android:datePickerStyle">@style/DatePickerStyle</item>
     </style>
 
     <style name="CanvasMaterialTheme_Default.Translucent">
diff --git a/apps/teacher/src/main/res/values/styles.xml b/apps/teacher/src/main/res/values/styles.xml
index 28d0b6a11d..6a5b67577b 100644
--- a/apps/teacher/src/main/res/values/styles.xml
+++ b/apps/teacher/src/main/res/values/styles.xml
@@ -29,6 +29,7 @@
         <item name="android:windowBackground">@color/backgroundLightest</item>
         <item name="android:actionOverflowButtonStyle">@style/Widget.ActionButton.Overflow</item>
         <item name="pspdf__backgroundColor">@color/backgroundLight</item>
+        <item name="android:datePickerStyle">@style/DatePickerStyle</item>
     </style>
 
     <style name="PSPDFKitTheme" parent="AppTheme.NoActionBar">
@@ -284,4 +285,9 @@
         <item name="android:layout_marginTop">4dp</item>
     </style>
 
+    <style name="DatePickerStyle" parent="@android:style/Widget.DeviceDefault.DatePicker">
+        <item name="android:headerMonthTextAppearance">@style/DatePickerTextAppearance</item>
+        <item name="android:headerBackground">@color/ash</item>
+    </style>
+
 </resources>
diff --git a/libs/pandautils/src/main/res/color/calendar_color_selector.xml b/libs/pandautils/src/main/res/color/calendar_color_selector.xml
new file mode 100644
index 0000000000..1ba3935ed9
--- /dev/null
+++ b/libs/pandautils/src/main/res/color/calendar_color_selector.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (C) 2023 - present Instructure, Inc.
+  ~
+  ~     This program is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU General Public License as published by
+  ~     the Free Software Foundation, version 3 of the License.
+  ~
+  ~     This program is distributed in the hope that it will be useful,
+  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~     GNU General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU General Public License
+  ~     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  ~
+  -->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@color/white" android:state_selected="true"/>
+    <item android:color="@color/white" />
+</selector>
\ No newline at end of file
diff --git a/libs/pandautils/src/main/res/values/styles.xml b/libs/pandautils/src/main/res/values/styles.xml
index 87edd80e33..ea6efca1aa 100644
--- a/libs/pandautils/src/main/res/values/styles.xml
+++ b/libs/pandautils/src/main/res/values/styles.xml
@@ -219,4 +219,8 @@
         <item name="android:textColorSecondary">@color/white</item>
     </style>
 
+    <style name="DatePickerTextAppearance" parent="TextAppearance.AppCompat.Body1">
+        <item name="android:textColor">@color/calendar_color_selector</item>
+    </style>
+
 </resources>

From 71e6067faa8235ca1957896430cc1aa3a15e8996 Mon Sep 17 00:00:00 2001
From: Akos Hermann <72087159+hermannakos@users.noreply.github.com>
Date: Wed, 23 Aug 2023 13:05:40 +0200
Subject: [PATCH 12/22] [MBL-16981][All] Inbox input labels always visible
 (#2108)

Test plan: Check the inbox compose screen, the labels should always be visible.

refs: MBL-16981
affects: Student, Teacher, Parent
release note: Accessibility improvement.
---
 .../create_conversation_screen.dart           |  4 +-
 .../student/ui/pages/NewMessagePage.kt        |  3 +-
 .../fragment/InboxComposeMessageFragment.kt   |  2 +-
 .../layout/fragment_inbox_compose_message.xml | 70 +++++++++-------
 .../teacher/fragments/AddMessageFragment.kt   |  2 +-
 .../main/res/layout/fragment_add_message.xml  | 83 ++++++++++---------
 6 files changed, 92 insertions(+), 72 deletions(-)

diff --git a/apps/flutter_parent/lib/screens/inbox/create_conversation/create_conversation_screen.dart b/apps/flutter_parent/lib/screens/inbox/create_conversation/create_conversation_screen.dart
index 911f5db614..1cdbf7b6e8 100644
--- a/apps/flutter_parent/lib/screens/inbox/create_conversation/create_conversation_screen.dart
+++ b/apps/flutter_parent/lib/screens/inbox/create_conversation/create_conversation_screen.dart
@@ -463,7 +463,7 @@ class _CreateConversationScreenState extends State<CreateConversationScreen> wit
         style: Theme.of(context).textTheme.bodyText1,
         textCapitalization: TextCapitalization.sentences,
         decoration: InputDecoration(
-          hintText: L10n(context).messageSubjectInputHint,
+          labelText: L10n(context).messageSubjectInputHint,
           contentPadding: EdgeInsets.all(16),
           border: InputBorder.none,
         ),
@@ -484,7 +484,7 @@ class _CreateConversationScreenState extends State<CreateConversationScreen> wit
         maxLines: null,
         style: Theme.of(context).textTheme.bodyText2,
         decoration: InputDecoration(
-          hintText: L10n(context).messageBodyInputHint,
+          labelText: L10n(context).messageBodyInputHint,
           contentPadding: EdgeInsets.all(16),
           border: InputBorder.none,
         ),
diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/pages/NewMessagePage.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/pages/NewMessagePage.kt
index 5bd887a0cb..ee1737f2da 100644
--- a/apps/student/src/androidTest/java/com/instructure/student/ui/pages/NewMessagePage.kt
+++ b/apps/student/src/androidTest/java/com/instructure/student/ui/pages/NewMessagePage.kt
@@ -130,7 +130,8 @@ class NewMessagePage : BasePage() {
 
     fun setMessage(messageText: String) {
         Espresso.closeSoftKeyboard()
-        onView(allOf(withId(R.id.message), hasSibling(withId(R.id.sendIndividualDivider))))
+        onView(withId(R.id.messageContainer)).click()
+        onView(allOf(withId(R.id.message), withAncestor(R.id.messageContainer)))
                 .scrollTo()
                 .typeText(messageText)
     }
diff --git a/apps/student/src/main/java/com/instructure/student/fragment/InboxComposeMessageFragment.kt b/apps/student/src/main/java/com/instructure/student/fragment/InboxComposeMessageFragment.kt
index 6962b7d493..b4c6148bc8 100644
--- a/apps/student/src/main/java/com/instructure/student/fragment/InboxComposeMessageFragment.kt
+++ b/apps/student/src/main/java/com/instructure/student/fragment/InboxComposeMessageFragment.kt
@@ -319,7 +319,7 @@ class InboxComposeMessageFragment : ParentFragment(), FileUploadDialogParent {
 
     private fun handleExit() {
         // Check to see if the user has made any changes
-        if (binding.editSubject.text.isNotBlank() || binding.message.text.isNotBlank() || attachments.isNotEmpty()) {
+        if (binding.editSubject.text?.isNotBlank() == true || binding.message.text?.isNotBlank() == true || attachments.isNotEmpty()) {
             shouldAllowExit = false
             // Use childFragmentManager so that exiting the compose fragment also dismisses the dialog
             UnsavedChangesExitDialog.show(childFragmentManager) {
diff --git a/apps/student/src/main/res/layout/fragment_inbox_compose_message.xml b/apps/student/src/main/res/layout/fragment_inbox_compose_message.xml
index 16b4e10ed5..6a623ffdbb 100644
--- a/apps/student/src/main/res/layout/fragment_inbox_compose_message.xml
+++ b/apps/student/src/main/res/layout/fragment_inbox_compose_message.xml
@@ -120,22 +120,26 @@
 
             <include layout="@layout/view_divider"/>
 
-
-            <EditText
-                android:id="@+id/editSubject"
-                style="@style/TextFont.Regular"
+            <com.google.android.material.textfield.TextInputLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="4dp"
-                android:background="@android:color/transparent"
-                android:ellipsize="end"
-                android:hint="@string/subject"
-                android:inputType="textCapSentences"
-                android:lines="1"
-                android:padding="16dp"
-                android:textColorHint="@color/textDark"
-                android:textSize="16sp"
-                android:visibility="gone"/>
+                android:layout_height="wrap_content">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/editSubject"
+                    style="@style/TextFont.Regular"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="4dp"
+                    android:background="@android:color/transparent"
+                    android:ellipsize="end"
+                    android:hint="@string/subject"
+                    android:inputType="textCapSentences"
+                    android:lines="1"
+                    android:padding="16dp"
+                    android:textColorHint="@color/textDark"
+                    android:textSize="16sp"
+                    android:visibility="gone"/>
+            </com.google.android.material.textfield.TextInputLayout>
 
             <TextView
                 android:id="@+id/subjectView"
@@ -194,22 +198,28 @@
                 android:background="@color/backgroundMedium"
                 android:visibility="gone"/>
 
-            <EditText
-                android:id="@+id/message"
-                style="@style/TextFont.Regular"
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/messageContainer"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@color/transparent"
-                android:gravity="top"
-                android:hint="@string/message"
-                android:inputType="textCapSentences|textMultiLine|textImeMultiLine"
-                android:minLines="2"
-                android:padding="16dp"
-                android:scrollHorizontally="false"
-                android:singleLine="false"
-                android:textColor="@color/textDarkest"
-                android:textColorHint="@color/textDark"
-                android:textSize="16sp"/>
+                android:layout_height="wrap_content">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/message"
+                    style="@style/TextFont.Regular"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@color/transparent"
+                    android:gravity="top"
+                    android:hint="@string/message"
+                    android:inputType="textCapSentences|textMultiLine|textImeMultiLine"
+                    android:minLines="2"
+                    android:padding="16dp"
+                    android:scrollHorizontally="false"
+                    android:singleLine="false"
+                    android:textColor="@color/textDarkest"
+                    android:textColorHint="@color/textDark"
+                    android:textSize="16sp"/>
+            </com.google.android.material.textfield.TextInputLayout>
 
             <com.instructure.student.view.AttachmentLayout
                 android:id="@+id/attachmentLayout"
diff --git a/apps/teacher/src/main/java/com/instructure/teacher/fragments/AddMessageFragment.kt b/apps/teacher/src/main/java/com/instructure/teacher/fragments/AddMessageFragment.kt
index 23cd470e51..1b203c2092 100644
--- a/apps/teacher/src/main/java/com/instructure/teacher/fragments/AddMessageFragment.kt
+++ b/apps/teacher/src/main/java/com/instructure/teacher/fragments/AddMessageFragment.kt
@@ -341,7 +341,7 @@ class AddMessageFragment : BasePresenterFragment<AddMessagePresenter, AddMessage
 
     fun handleExit() {
         // Check to see if the user has made any changes
-        if (selectedCourse != null || binding.editSubject.text.isNotEmpty() || binding.message.text.isNotEmpty() || presenter.attachments.isNotEmpty()) {
+        if (selectedCourse != null || binding.editSubject.text?.isNotEmpty() == true || binding.message.text?.isNotEmpty() == true || presenter.attachments.isNotEmpty()) {
             shouldAllowExit = false
             UnsavedChangesExitDialog.show(requireActivity().supportFragmentManager) {
                 shouldAllowExit = true
diff --git a/apps/teacher/src/main/res/layout/fragment_add_message.xml b/apps/teacher/src/main/res/layout/fragment_add_message.xml
index 8676792908..15706d4422 100644
--- a/apps/teacher/src/main/res/layout/fragment_add_message.xml
+++ b/apps/teacher/src/main/res/layout/fragment_add_message.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright (C) 2017 - present  Instructure, Inc.
   ~
   ~     This program is free software: you can redistribute it and/or modify
@@ -107,12 +106,12 @@
                     android:id="@+id/contactsImageButton"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_centerVertical="true"
                     android:layout_alignParentEnd="true"
+                    android:layout_centerVertical="true"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:contentDescription="@string/select_recipients"
-                    android:minHeight="48dp"
                     android:minWidth="48dp"
+                    android:minHeight="48dp"
                     android:padding="16dp"
                     app:srcCompat="@drawable/ic_add" />
 
@@ -120,21 +119,26 @@
 
             <include layout="@layout/view_divider" />
 
-            <EditText
-                android:id="@+id/editSubject"
-                style="@style/TextFont.Regular"
+            <com.google.android.material.textfield.TextInputLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="4dp"
-                android:background="@android:color/transparent"
-                android:ellipsize="end"
-                android:hint="@string/label_subject"
-                android:inputType="textCapSentences"
-                android:lines="1"
-                android:padding="16dp"
-                android:textColorHint="@color/textDark"
-                android:textSize="16sp"
-                android:visibility="gone" />
+                android:layout_height="wrap_content">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/editSubject"
+                    style="@style/TextFont.Regular"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="4dp"
+                    android:background="@android:color/transparent"
+                    android:ellipsize="end"
+                    android:hint="@string/label_subject"
+                    android:inputType="textCapSentences"
+                    android:lines="1"
+                    android:padding="16dp"
+                    android:textColorHint="@color/textDark"
+                    android:textSize="16sp"
+                    android:visibility="gone" />
+            </com.google.android.material.textfield.TextInputLayout>
 
             <TextView
                 android:id="@+id/subjectView"
@@ -177,10 +181,10 @@
                     android:layout_height="wrap_content"
                     android:layout_alignParentEnd="true"
                     android:layout_centerVertical="true"
-                    android:layout_marginEnd="16dp"
                     android:layout_marginStart="16dp"
-                    android:minHeight="48dp"
-                    android:minWidth="48dp" />
+                    android:layout_marginEnd="16dp"
+                    android:minWidth="48dp"
+                    android:minHeight="48dp" />
 
             </RelativeLayout>
 
@@ -189,24 +193,29 @@
                 android:layout_width="match_parent"
                 android:layout_height="0.5dp"
                 android:background="@color/backgroundMedium"
-                android:visibility="gone"/>
+                android:visibility="gone" />
 
-            <EditText
-                android:id="@+id/message"
-                style="@style/TextFont.Regular"
+            <com.google.android.material.textfield.TextInputLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@color/transparent"
-                android:gravity="top"
-                android:hint="@string/rce_empty_message"
-                android:inputType="textCapSentences|textMultiLine|textImeMultiLine"
-                android:minLines="2"
-                android:padding="16dp"
-                android:scrollHorizontally="false"
-                android:singleLine="false"
-                android:textColor="@color/textDarkest"
-                android:textColorHint="@color/textDark"
-                android:textSize="16sp" />
+                android:layout_height="wrap_content">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/message"
+                    style="@style/TextFont.Regular"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@color/transparent"
+                    android:gravity="top"
+                    android:hint="@string/rce_empty_message"
+                    android:inputType="textCapSentences|textMultiLine|textImeMultiLine"
+                    android:minLines="2"
+                    android:padding="16dp"
+                    android:scrollHorizontally="false"
+                    android:singleLine="false"
+                    android:textColor="@color/textDarkest"
+                    android:textColorHint="@color/textDark"
+                    android:textSize="16sp" />
+            </com.google.android.material.textfield.TextInputLayout>
 
             <com.instructure.pandautils.views.AttachmentLayout
                 android:id="@+id/attachments"

From 10e032206c8ff2017ba1406741e2b88cc5a9a661 Mon Sep 17 00:00:00 2001
From: Tamas Kozmer <72397075+tamaskozmer@users.noreply.github.com>
Date: Thu, 24 Aug 2023 13:03:48 +0200
Subject: [PATCH 13/22] [MBL-17000][All] Login color issues (#2116)

refs: MBL-17000
affects: All
release note: none

* Fixed login color issues.

* Change pandautils test device in flank.
---
 .../svg/canvas-parent-login-logo-dark.svg      | 18 +++++++++---------
 .../assets/svg/canvas-parent-login-logo.svg    | 14 +++++++-------
 .../activities/BaseLoginLandingPageActivity.kt |  4 +++-
 .../activity_login_landing_page.xml            |  4 ++--
 .../res/layout/activity_login_landing_page.xml |  4 ++--
 libs/pandautils/flank.yml                      |  4 ++--
 6 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/apps/flutter_parent/assets/svg/canvas-parent-login-logo-dark.svg b/apps/flutter_parent/assets/svg/canvas-parent-login-logo-dark.svg
index cfc8e0bc77..ab80d41cfa 100644
--- a/apps/flutter_parent/assets/svg/canvas-parent-login-logo-dark.svg
+++ b/apps/flutter_parent/assets/svg/canvas-parent-login-logo-dark.svg
@@ -1,10 +1,10 @@
 <svg width="164" height="148" viewBox="0 0 164 148" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M82 55C86.5433 55 90.3004 58.3665 90.9127 62.7411C88.0828 63.5613 85.0926 64 82 64C78.9074 64 75.9172 63.5613 73.0884 62.7427C73.6996 58.3665 77.4567 55 82 55ZM65.7365 48.2635C68.9487 51.4756 69.2252 56.5117 66.5661 60.0379C61.2664 57.1152 56.8848 52.7336 53.9617 47.4348C57.4883 44.7748 62.5244 45.0513 65.7365 48.2635ZM110.038 47.4339L109.959 47.5784C107.036 52.8128 102.686 57.1416 97.4348 60.0383C94.7748 56.5117 95.0513 51.4756 98.2635 48.2635C101.476 45.0513 106.512 44.7748 110.038 47.4339ZM82 46C83.6569 46 85 47.3431 85 49C85 50.6569 83.6569 52 82 52C80.3431 52 79 50.6569 79 49C79 47.3431 80.3431 46 82 46ZM96.1421 41.8995C97.3137 43.0711 97.3137 44.9706 96.1421 46.1421C94.9706 47.3137 93.0711 47.3137 91.8995 46.1421C90.7279 44.9706 90.7279 43.0711 91.8995 41.8995C93.0711 40.7279 94.9706 40.7279 96.1421 41.8995ZM72.1005 41.8995C73.2721 43.0711 73.2721 44.9706 72.1005 46.1421C70.9289 47.3137 69.0294 47.3137 67.8579 46.1421C66.6863 44.9706 66.6863 43.0711 67.8579 41.8995C69.0294 40.7279 70.9289 40.7279 72.1005 41.8995ZM59 32C59 36.5433 55.6335 40.3004 51.2589 40.9127C50.4387 38.0828 50 35.0926 50 32C50 28.9074 50.4387 25.9172 51.2573 23.0884C55.6335 23.6996 59 27.4567 59 32ZM112.743 23.0884C113.561 25.9172 114 28.9074 114 32C114 35.0926 113.561 38.0828 112.743 40.9116C108.367 40.3004 105 36.5433 105 32C105 27.4732 108.342 23.727 112.693 23.0942L112.743 23.0884ZM99 29C100.657 29 102 30.3431 102 32C102 33.6569 100.657 35 99 35C97.3431 35 96 33.6569 96 32C96 30.3431 97.3431 29 99 29ZM65 29C66.6569 29 68 30.3431 68 32C68 33.6569 66.6569 35 65 35C63.3431 35 62 33.6569 62 32C62 30.3431 63.3431 29 65 29ZM96.1421 17.8579C97.3137 19.0294 97.3137 20.9289 96.1421 22.1005C94.9706 23.2721 93.0711 23.2721 91.8995 22.1005C90.7279 20.9289 90.7279 19.0294 91.8995 17.8579C93.0711 16.6863 94.9706 16.6863 96.1421 17.8579ZM72.1005 17.8579C73.2721 19.0294 73.2721 20.9289 72.1005 22.1005C70.9289 23.2721 69.0294 23.2721 67.8579 22.1005C66.6863 20.9289 66.6863 19.0294 67.8579 17.8579C69.0294 16.6863 70.9289 16.6863 72.1005 17.8579ZM97.4348 3.96169C102.734 6.88484 107.115 11.2664 110.038 16.5652C106.512 19.2252 101.476 18.9487 98.2635 15.7365C95.0933 12.5664 94.7825 7.6197 97.3311 4.10122L97.4348 3.96169ZM65.7365 15.7365C62.5244 18.9487 57.4883 19.2252 53.9621 16.5661C56.8848 11.2664 61.2664 6.88484 66.5652 3.96169C69.2252 7.48827 68.9487 12.5244 65.7365 15.7365ZM82 12C83.6569 12 85 13.3431 85 15C85 16.6569 83.6569 18 82 18C80.3431 18 79 16.6569 79 15C79 13.3431 80.3431 12 82 12ZM82 0C85.0926 0 88.0828 0.438709 90.9116 1.25729C90.3004 5.63346 86.5433 9 82 9C77.4567 9 73.6996 5.63346 73.0873 1.25885C75.9172 0.438709 78.9074 0 82 0Z" fill="#008EE2"/>
-<path d="M20 119C20 125.003 15.9217 128 9.98369 128H9.85318C3.91517 128 0 125.847 0 119.713V96.2871C0 90.4796 3.91517 88 9.85318 88H9.98369C15.9217 88 20 90.6925 20 96.5V101H14V97C14 94.2594 12.0065 93.677 9.98369 93.677C7.96085 93.677 6 94.2594 6 97V119C6 121.741 7.96085 122.258 9.98369 122.258C12.0065 122.258 14 121.741 14 119V114H20V119Z" fill="#FFFFFF"/>
-<path d="M43 118H35L34 127H27.5L34.9045 88H43L50.5 127H44L43 118ZM42 113L39 96L36.1415 113.002L42 113Z" fill="#FFFFFF"/>
-<path d="M129 118H121L120 127H113.5L120.904 88H129L136.5 127H130L129 118ZM128 113L125 96L122.142 113.002L128 113Z" fill="#FFFFFF"/>
-<path d="M59 127V88H65.349L74 112V88H80V127H73.5L65 102V127H59Z" fill="#FFFFFF"/>
-<path d="M102 127H96L88 88H95L99 117L103 88H109L102 127Z" fill="#FFFFFF"/>
-<path d="M157 97C157 94.5123 155.588 93.5646 153.689 93.5646C151.791 93.5646 150 94.0777 150 96.5V99.5C150 101.529 151.07 102.468 152.903 103.581L157.486 106.134C161.218 108.295 164 110.81 164 115V119C164 125.023 159.957 128 154 128C148.043 128 144 126.088 144 120V116H150V119C150 121.422 151.536 122.5 153.5 122.5C155.464 122.5 157.093 121.388 157.093 118.966V115.889C157.093 113.859 156.504 112.877 154.54 111.83L150.023 109.277C146.226 107.116 144 105.059 144 101V96C144 90.1735 148.632 88 154 88C159.368 88 163 90.1735 163 96V100H157V97Z" fill="#FFFFFF"/>
-<path d="M59.62 142.12C59.62 142.616 59.528 143.034 59.344 143.374C59.16 143.714 58.912 143.988 58.6 144.196C58.288 144.404 57.928 144.556 57.52 144.652C57.112 144.748 56.688 144.796 56.248 144.796H55.228V148H53.176V139.504H56.296C56.76 139.504 57.194 139.55 57.598 139.642C58.002 139.734 58.354 139.882 58.654 140.086C58.954 140.29 59.19 140.558 59.362 140.89C59.534 141.222 59.62 141.632 59.62 142.12ZM57.568 142.132C57.568 141.932 57.528 141.768 57.448 141.64C57.368 141.512 57.26 141.412 57.124 141.34C56.988 141.268 56.834 141.22 56.662 141.196C56.49 141.172 56.312 141.16 56.128 141.16H55.228V143.164H56.092C56.284 143.164 56.468 143.148 56.644 143.116C56.82 143.084 56.978 143.028 57.118 142.948C57.258 142.868 57.368 142.762 57.448 142.63C57.528 142.498 57.568 142.332 57.568 142.132ZM67.896 148L67.236 146.332H63.948L63.324 148H61.092L64.656 139.504H66.648L70.176 148H67.896ZM65.616 141.772L64.536 144.688H66.672L65.616 141.772ZM77.432 148L75.596 144.628H74.9V148H72.884V139.504H76.124C76.532 139.504 76.93 139.546 77.318 139.63C77.706 139.714 78.054 139.856 78.362 140.056C78.67 140.256 78.916 140.52 79.1 140.848C79.284 141.176 79.376 141.584 79.376 142.072C79.376 142.648 79.22 143.132 78.908 143.524C78.596 143.916 78.164 144.196 77.612 144.364L79.832 148H77.432ZM77.348 142.108C77.348 141.908 77.306 141.746 77.222 141.622C77.138 141.498 77.03 141.402 76.898 141.334C76.766 141.266 76.618 141.22 76.454 141.196C76.29 141.172 76.132 141.16 75.98 141.16H74.888V143.14H75.86C76.028 143.14 76.2 143.126 76.376 143.098C76.552 143.07 76.712 143.02 76.856 142.948C77 142.876 77.118 142.772 77.21 142.636C77.302 142.5 77.348 142.324 77.348 142.108ZM82.84 148V139.504H88.552V141.244H84.82V142.84H88.348V144.484H84.82V146.248H88.768V148H82.84ZM97.524 148L94.104 142.444H94.068L94.116 148H92.124V139.504H94.464L97.872 145.048H97.908L97.86 139.504H99.852V148H97.524ZM107.24 141.256V148H105.188V141.256H102.788V139.504H109.64V141.256H107.24Z" fill="#008EE2"/>
-</svg>
\ No newline at end of file
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M82 55C86.5433 55 90.3004 58.3665 90.9127 62.7411C88.0828 63.5613 85.0926 64 82 64C78.9074 64 75.9172 63.5613 73.0884 62.7427C73.6996 58.3665 77.4567 55 82 55ZM65.7365 48.2635C68.9487 51.4756 69.2252 56.5117 66.5661 60.0379C61.2664 57.1152 56.8848 52.7336 53.9617 47.4348C57.4883 44.7748 62.5244 45.0513 65.7365 48.2635ZM110.038 47.4339L109.959 47.5784C107.036 52.8128 102.686 57.1416 97.4348 60.0383C94.7748 56.5117 95.0513 51.4756 98.2635 48.2635C101.476 45.0513 106.512 44.7748 110.038 47.4339ZM82 46C83.6569 46 85 47.3431 85 49C85 50.6569 83.6569 52 82 52C80.3431 52 79 50.6569 79 49C79 47.3431 80.3431 46 82 46ZM96.1421 41.8995C97.3137 43.0711 97.3137 44.9706 96.1421 46.1421C94.9706 47.3137 93.0711 47.3137 91.8995 46.1421C90.7279 44.9706 90.7279 43.0711 91.8995 41.8995C93.0711 40.7279 94.9706 40.7279 96.1421 41.8995ZM72.1005 41.8995C73.2721 43.0711 73.2721 44.9706 72.1005 46.1421C70.9289 47.3137 69.0294 47.3137 67.8579 46.1421C66.6863 44.9706 66.6863 43.0711 67.8579 41.8995C69.0294 40.7279 70.9289 40.7279 72.1005 41.8995ZM59 32C59 36.5433 55.6335 40.3004 51.2589 40.9127C50.4387 38.0828 50 35.0926 50 32C50 28.9074 50.4387 25.9172 51.2573 23.0884C55.6335 23.6996 59 27.4567 59 32ZM112.743 23.0884C113.561 25.9172 114 28.9074 114 32C114 35.0926 113.561 38.0828 112.743 40.9116C108.367 40.3004 105 36.5433 105 32C105 27.4732 108.342 23.727 112.693 23.0942L112.743 23.0884ZM99 29C100.657 29 102 30.3431 102 32C102 33.6569 100.657 35 99 35C97.3431 35 96 33.6569 96 32C96 30.3431 97.3431 29 99 29ZM65 29C66.6569 29 68 30.3431 68 32C68 33.6569 66.6569 35 65 35C63.3431 35 62 33.6569 62 32C62 30.3431 63.3431 29 65 29ZM96.1421 17.8579C97.3137 19.0294 97.3137 20.9289 96.1421 22.1005C94.9706 23.2721 93.0711 23.2721 91.8995 22.1005C90.7279 20.9289 90.7279 19.0294 91.8995 17.8579C93.0711 16.6863 94.9706 16.6863 96.1421 17.8579ZM72.1005 17.8579C73.2721 19.0294 73.2721 20.9289 72.1005 22.1005C70.9289 23.2721 69.0294 23.2721 67.8579 22.1005C66.6863 20.9289 66.6863 19.0294 67.8579 17.8579C69.0294 16.6863 70.9289 16.6863 72.1005 17.8579ZM97.4348 3.96169C102.734 6.88484 107.115 11.2664 110.038 16.5652C106.512 19.2252 101.476 18.9487 98.2635 15.7365C95.0933 12.5664 94.7825 7.6197 97.3311 4.10122L97.4348 3.96169ZM65.7365 15.7365C62.5244 18.9487 57.4883 19.2252 53.9621 16.5661C56.8848 11.2664 61.2664 6.88484 66.5652 3.96169C69.2252 7.48827 68.9487 12.5244 65.7365 15.7365ZM82 12C83.6569 12 85 13.3431 85 15C85 16.6569 83.6569 18 82 18C80.3431 18 79 16.6569 79 15C79 13.3431 80.3431 12 82 12ZM82 0C85.0926 0 88.0828 0.438709 90.9116 1.25729C90.3004 5.63346 86.5433 9 82 9C77.4567 9 73.6996 5.63346 73.0873 1.25885C75.9172 0.438709 78.9074 0 82 0Z" fill="#008EE2"/>
+    <path d="M20 119C20 125.003 15.9217 128 9.98369 128H9.85318C3.91517 128 0 125.847 0 119.713V96.2871C0 90.4796 3.91517 88 9.85318 88H9.98369C15.9217 88 20 90.6925 20 96.5V101H14V97C14 94.2594 12.0065 93.677 9.98369 93.677C7.96085 93.677 6 94.2594 6 97V119C6 121.741 7.96085 122.258 9.98369 122.258C12.0065 122.258 14 121.741 14 119V114H20V119Z" fill="#008EE2"/>
+    <path d="M43 118H35L34 127H27.5L34.9045 88H43L50.5 127H44L43 118ZM42 113L39 96L36.1415 113.002L42 113Z" fill="#008EE2"/>
+    <path d="M129 118H121L120 127H113.5L120.904 88H129L136.5 127H130L129 118ZM128 113L125 96L122.142 113.002L128 113Z" fill="#008EE2"/>
+    <path d="M59 127V88H65.349L74 112V88H80V127H73.5L65 102V127H59Z" fill="#008EE2"/>
+    <path d="M102 127H96L88 88H95L99 117L103 88H109L102 127Z" fill="#008EE2"/>
+    <path d="M157 97C157 94.5123 155.588 93.5646 153.689 93.5646C151.791 93.5646 150 94.0777 150 96.5V99.5C150 101.529 151.07 102.468 152.903 103.581L157.486 106.134C161.218 108.295 164 110.81 164 115V119C164 125.023 159.957 128 154 128C148.043 128 144 126.088 144 120V116H150V119C150 121.422 151.536 122.5 153.5 122.5C155.464 122.5 157.093 121.388 157.093 118.966V115.889C157.093 113.859 156.504 112.877 154.54 111.83L150.023 109.277C146.226 107.116 144 105.059 144 101V96C144 90.1735 148.632 88 154 88C159.368 88 163 90.1735 163 96V100H157V97Z" fill="#008EE2"/>
+    <path d="M59.62 142.12C59.62 142.616 59.528 143.034 59.344 143.374C59.16 143.714 58.912 143.988 58.6 144.196C58.288 144.404 57.928 144.556 57.52 144.652C57.112 144.748 56.688 144.796 56.248 144.796H55.228V148H53.176V139.504H56.296C56.76 139.504 57.194 139.55 57.598 139.642C58.002 139.734 58.354 139.882 58.654 140.086C58.954 140.29 59.19 140.558 59.362 140.89C59.534 141.222 59.62 141.632 59.62 142.12ZM57.568 142.132C57.568 141.932 57.528 141.768 57.448 141.64C57.368 141.512 57.26 141.412 57.124 141.34C56.988 141.268 56.834 141.22 56.662 141.196C56.49 141.172 56.312 141.16 56.128 141.16H55.228V143.164H56.092C56.284 143.164 56.468 143.148 56.644 143.116C56.82 143.084 56.978 143.028 57.118 142.948C57.258 142.868 57.368 142.762 57.448 142.63C57.528 142.498 57.568 142.332 57.568 142.132ZM67.896 148L67.236 146.332H63.948L63.324 148H61.092L64.656 139.504H66.648L70.176 148H67.896ZM65.616 141.772L64.536 144.688H66.672L65.616 141.772ZM77.432 148L75.596 144.628H74.9V148H72.884V139.504H76.124C76.532 139.504 76.93 139.546 77.318 139.63C77.706 139.714 78.054 139.856 78.362 140.056C78.67 140.256 78.916 140.52 79.1 140.848C79.284 141.176 79.376 141.584 79.376 142.072C79.376 142.648 79.22 143.132 78.908 143.524C78.596 143.916 78.164 144.196 77.612 144.364L79.832 148H77.432ZM77.348 142.108C77.348 141.908 77.306 141.746 77.222 141.622C77.138 141.498 77.03 141.402 76.898 141.334C76.766 141.266 76.618 141.22 76.454 141.196C76.29 141.172 76.132 141.16 75.98 141.16H74.888V143.14H75.86C76.028 143.14 76.2 143.126 76.376 143.098C76.552 143.07 76.712 143.02 76.856 142.948C77 142.876 77.118 142.772 77.21 142.636C77.302 142.5 77.348 142.324 77.348 142.108ZM82.84 148V139.504H88.552V141.244H84.82V142.84H88.348V144.484H84.82V146.248H88.768V148H82.84ZM97.524 148L94.104 142.444H94.068L94.116 148H92.124V139.504H94.464L97.872 145.048H97.908L97.86 139.504H99.852V148H97.524ZM107.24 141.256V148H105.188V141.256H102.788V139.504H109.64V141.256H107.24Z" fill="#FFFFFF"/>
+</svg>
diff --git a/apps/flutter_parent/assets/svg/canvas-parent-login-logo.svg b/apps/flutter_parent/assets/svg/canvas-parent-login-logo.svg
index a7729978ef..b595560d0c 100644
--- a/apps/flutter_parent/assets/svg/canvas-parent-login-logo.svg
+++ b/apps/flutter_parent/assets/svg/canvas-parent-login-logo.svg
@@ -1,10 +1,10 @@
 <svg width="164" height="148" viewBox="0 0 164 148" fill="none" xmlns="http://www.w3.org/2000/svg">
 <path fill-rule="evenodd" clip-rule="evenodd" d="M82 55C86.5433 55 90.3004 58.3665 90.9127 62.7411C88.0828 63.5613 85.0926 64 82 64C78.9074 64 75.9172 63.5613 73.0884 62.7427C73.6996 58.3665 77.4567 55 82 55ZM65.7365 48.2635C68.9487 51.4756 69.2252 56.5117 66.5661 60.0379C61.2664 57.1152 56.8848 52.7336 53.9617 47.4348C57.4883 44.7748 62.5244 45.0513 65.7365 48.2635ZM110.038 47.4339L109.959 47.5784C107.036 52.8128 102.686 57.1416 97.4348 60.0383C94.7748 56.5117 95.0513 51.4756 98.2635 48.2635C101.476 45.0513 106.512 44.7748 110.038 47.4339ZM82 46C83.6569 46 85 47.3431 85 49C85 50.6569 83.6569 52 82 52C80.3431 52 79 50.6569 79 49C79 47.3431 80.3431 46 82 46ZM96.1421 41.8995C97.3137 43.0711 97.3137 44.9706 96.1421 46.1421C94.9706 47.3137 93.0711 47.3137 91.8995 46.1421C90.7279 44.9706 90.7279 43.0711 91.8995 41.8995C93.0711 40.7279 94.9706 40.7279 96.1421 41.8995ZM72.1005 41.8995C73.2721 43.0711 73.2721 44.9706 72.1005 46.1421C70.9289 47.3137 69.0294 47.3137 67.8579 46.1421C66.6863 44.9706 66.6863 43.0711 67.8579 41.8995C69.0294 40.7279 70.9289 40.7279 72.1005 41.8995ZM59 32C59 36.5433 55.6335 40.3004 51.2589 40.9127C50.4387 38.0828 50 35.0926 50 32C50 28.9074 50.4387 25.9172 51.2573 23.0884C55.6335 23.6996 59 27.4567 59 32ZM112.743 23.0884C113.561 25.9172 114 28.9074 114 32C114 35.0926 113.561 38.0828 112.743 40.9116C108.367 40.3004 105 36.5433 105 32C105 27.4732 108.342 23.727 112.693 23.0942L112.743 23.0884ZM99 29C100.657 29 102 30.3431 102 32C102 33.6569 100.657 35 99 35C97.3431 35 96 33.6569 96 32C96 30.3431 97.3431 29 99 29ZM65 29C66.6569 29 68 30.3431 68 32C68 33.6569 66.6569 35 65 35C63.3431 35 62 33.6569 62 32C62 30.3431 63.3431 29 65 29ZM96.1421 17.8579C97.3137 19.0294 97.3137 20.9289 96.1421 22.1005C94.9706 23.2721 93.0711 23.2721 91.8995 22.1005C90.7279 20.9289 90.7279 19.0294 91.8995 17.8579C93.0711 16.6863 94.9706 16.6863 96.1421 17.8579ZM72.1005 17.8579C73.2721 19.0294 73.2721 20.9289 72.1005 22.1005C70.9289 23.2721 69.0294 23.2721 67.8579 22.1005C66.6863 20.9289 66.6863 19.0294 67.8579 17.8579C69.0294 16.6863 70.9289 16.6863 72.1005 17.8579ZM97.4348 3.96169C102.734 6.88484 107.115 11.2664 110.038 16.5652C106.512 19.2252 101.476 18.9487 98.2635 15.7365C95.0933 12.5664 94.7825 7.6197 97.3311 4.10122L97.4348 3.96169ZM65.7365 15.7365C62.5244 18.9487 57.4883 19.2252 53.9621 16.5661C56.8848 11.2664 61.2664 6.88484 66.5652 3.96169C69.2252 7.48827 68.9487 12.5244 65.7365 15.7365ZM82 12C83.6569 12 85 13.3431 85 15C85 16.6569 83.6569 18 82 18C80.3431 18 79 16.6569 79 15C79 13.3431 80.3431 12 82 12ZM82 0C85.0926 0 88.0828 0.438709 90.9116 1.25729C90.3004 5.63346 86.5433 9 82 9C77.4567 9 73.6996 5.63346 73.0873 1.25885C75.9172 0.438709 78.9074 0 82 0Z" fill="#008EE2"/>
-<path d="M20 119C20 125.003 15.9217 128 9.98369 128H9.85318C3.91517 128 0 125.847 0 119.713V96.2871C0 90.4796 3.91517 88 9.85318 88H9.98369C15.9217 88 20 90.6925 20 96.5V101H14V97C14 94.2594 12.0065 93.677 9.98369 93.677C7.96085 93.677 6 94.2594 6 97V119C6 121.741 7.96085 122.258 9.98369 122.258C12.0065 122.258 14 121.741 14 119V114H20V119Z" fill="#2D3B45"/>
-<path d="M43 118H35L34 127H27.5L34.9045 88H43L50.5 127H44L43 118ZM42 113L39 96L36.1415 113.002L42 113Z" fill="#2D3B45"/>
-<path d="M129 118H121L120 127H113.5L120.904 88H129L136.5 127H130L129 118ZM128 113L125 96L122.142 113.002L128 113Z" fill="#2D3B45"/>
-<path d="M59 127V88H65.349L74 112V88H80V127H73.5L65 102V127H59Z" fill="#2D3B45"/>
-<path d="M102 127H96L88 88H95L99 117L103 88H109L102 127Z" fill="#2D3B45"/>
-<path d="M157 97C157 94.5123 155.588 93.5646 153.689 93.5646C151.791 93.5646 150 94.0777 150 96.5V99.5C150 101.529 151.07 102.468 152.903 103.581L157.486 106.134C161.218 108.295 164 110.81 164 115V119C164 125.023 159.957 128 154 128C148.043 128 144 126.088 144 120V116H150V119C150 121.422 151.536 122.5 153.5 122.5C155.464 122.5 157.093 121.388 157.093 118.966V115.889C157.093 113.859 156.504 112.877 154.54 111.83L150.023 109.277C146.226 107.116 144 105.059 144 101V96C144 90.1735 148.632 88 154 88C159.368 88 163 90.1735 163 96V100H157V97Z" fill="#2D3B45"/>
-<path d="M59.62 142.12C59.62 142.616 59.528 143.034 59.344 143.374C59.16 143.714 58.912 143.988 58.6 144.196C58.288 144.404 57.928 144.556 57.52 144.652C57.112 144.748 56.688 144.796 56.248 144.796H55.228V148H53.176V139.504H56.296C56.76 139.504 57.194 139.55 57.598 139.642C58.002 139.734 58.354 139.882 58.654 140.086C58.954 140.29 59.19 140.558 59.362 140.89C59.534 141.222 59.62 141.632 59.62 142.12ZM57.568 142.132C57.568 141.932 57.528 141.768 57.448 141.64C57.368 141.512 57.26 141.412 57.124 141.34C56.988 141.268 56.834 141.22 56.662 141.196C56.49 141.172 56.312 141.16 56.128 141.16H55.228V143.164H56.092C56.284 143.164 56.468 143.148 56.644 143.116C56.82 143.084 56.978 143.028 57.118 142.948C57.258 142.868 57.368 142.762 57.448 142.63C57.528 142.498 57.568 142.332 57.568 142.132ZM67.896 148L67.236 146.332H63.948L63.324 148H61.092L64.656 139.504H66.648L70.176 148H67.896ZM65.616 141.772L64.536 144.688H66.672L65.616 141.772ZM77.432 148L75.596 144.628H74.9V148H72.884V139.504H76.124C76.532 139.504 76.93 139.546 77.318 139.63C77.706 139.714 78.054 139.856 78.362 140.056C78.67 140.256 78.916 140.52 79.1 140.848C79.284 141.176 79.376 141.584 79.376 142.072C79.376 142.648 79.22 143.132 78.908 143.524C78.596 143.916 78.164 144.196 77.612 144.364L79.832 148H77.432ZM77.348 142.108C77.348 141.908 77.306 141.746 77.222 141.622C77.138 141.498 77.03 141.402 76.898 141.334C76.766 141.266 76.618 141.22 76.454 141.196C76.29 141.172 76.132 141.16 75.98 141.16H74.888V143.14H75.86C76.028 143.14 76.2 143.126 76.376 143.098C76.552 143.07 76.712 143.02 76.856 142.948C77 142.876 77.118 142.772 77.21 142.636C77.302 142.5 77.348 142.324 77.348 142.108ZM82.84 148V139.504H88.552V141.244H84.82V142.84H88.348V144.484H84.82V146.248H88.768V148H82.84ZM97.524 148L94.104 142.444H94.068L94.116 148H92.124V139.504H94.464L97.872 145.048H97.908L97.86 139.504H99.852V148H97.524ZM107.24 141.256V148H105.188V141.256H102.788V139.504H109.64V141.256H107.24Z" fill="#008EE2"/>
+<path d="M20 119C20 125.003 15.9217 128 9.98369 128H9.85318C3.91517 128 0 125.847 0 119.713V96.2871C0 90.4796 3.91517 88 9.85318 88H9.98369C15.9217 88 20 90.6925 20 96.5V101H14V97C14 94.2594 12.0065 93.677 9.98369 93.677C7.96085 93.677 6 94.2594 6 97V119C6 121.741 7.96085 122.258 9.98369 122.258C12.0065 122.258 14 121.741 14 119V114H20V119Z" fill="#008EE2"/>
+<path d="M43 118H35L34 127H27.5L34.9045 88H43L50.5 127H44L43 118ZM42 113L39 96L36.1415 113.002L42 113Z" fill="#008EE2"/>
+<path d="M129 118H121L120 127H113.5L120.904 88H129L136.5 127H130L129 118ZM128 113L125 96L122.142 113.002L128 113Z" fill="#008EE2"/>
+<path d="M59 127V88H65.349L74 112V88H80V127H73.5L65 102V127H59Z" fill="#008EE2"/>
+<path d="M102 127H96L88 88H95L99 117L103 88H109L102 127Z" fill="#008EE2"/>
+<path d="M157 97C157 94.5123 155.588 93.5646 153.689 93.5646C151.791 93.5646 150 94.0777 150 96.5V99.5C150 101.529 151.07 102.468 152.903 103.581L157.486 106.134C161.218 108.295 164 110.81 164 115V119C164 125.023 159.957 128 154 128C148.043 128 144 126.088 144 120V116H150V119C150 121.422 151.536 122.5 153.5 122.5C155.464 122.5 157.093 121.388 157.093 118.966V115.889C157.093 113.859 156.504 112.877 154.54 111.83L150.023 109.277C146.226 107.116 144 105.059 144 101V96C144 90.1735 148.632 88 154 88C159.368 88 163 90.1735 163 96V100H157V97Z" fill="#008EE2"/>
+<path d="M59.62 142.12C59.62 142.616 59.528 143.034 59.344 143.374C59.16 143.714 58.912 143.988 58.6 144.196C58.288 144.404 57.928 144.556 57.52 144.652C57.112 144.748 56.688 144.796 56.248 144.796H55.228V148H53.176V139.504H56.296C56.76 139.504 57.194 139.55 57.598 139.642C58.002 139.734 58.354 139.882 58.654 140.086C58.954 140.29 59.19 140.558 59.362 140.89C59.534 141.222 59.62 141.632 59.62 142.12ZM57.568 142.132C57.568 141.932 57.528 141.768 57.448 141.64C57.368 141.512 57.26 141.412 57.124 141.34C56.988 141.268 56.834 141.22 56.662 141.196C56.49 141.172 56.312 141.16 56.128 141.16H55.228V143.164H56.092C56.284 143.164 56.468 143.148 56.644 143.116C56.82 143.084 56.978 143.028 57.118 142.948C57.258 142.868 57.368 142.762 57.448 142.63C57.528 142.498 57.568 142.332 57.568 142.132ZM67.896 148L67.236 146.332H63.948L63.324 148H61.092L64.656 139.504H66.648L70.176 148H67.896ZM65.616 141.772L64.536 144.688H66.672L65.616 141.772ZM77.432 148L75.596 144.628H74.9V148H72.884V139.504H76.124C76.532 139.504 76.93 139.546 77.318 139.63C77.706 139.714 78.054 139.856 78.362 140.056C78.67 140.256 78.916 140.52 79.1 140.848C79.284 141.176 79.376 141.584 79.376 142.072C79.376 142.648 79.22 143.132 78.908 143.524C78.596 143.916 78.164 144.196 77.612 144.364L79.832 148H77.432ZM77.348 142.108C77.348 141.908 77.306 141.746 77.222 141.622C77.138 141.498 77.03 141.402 76.898 141.334C76.766 141.266 76.618 141.22 76.454 141.196C76.29 141.172 76.132 141.16 75.98 141.16H74.888V143.14H75.86C76.028 143.14 76.2 143.126 76.376 143.098C76.552 143.07 76.712 143.02 76.856 142.948C77 142.876 77.118 142.772 77.21 142.636C77.302 142.5 77.348 142.324 77.348 142.108ZM82.84 148V139.504H88.552V141.244H84.82V142.84H88.348V144.484H84.82V146.248H88.768V148H82.84ZM97.524 148L94.104 142.444H94.068L94.116 148H92.124V139.504H94.464L97.872 145.048H97.908L97.86 139.504H99.852V148H97.524ZM107.24 141.256V148H105.188V141.256H102.788V139.504H109.64V141.256H107.24Z" fill="#2D3B45"/>
 </svg>
diff --git a/libs/login-api-2/src/main/java/com/instructure/loginapi/login/activities/BaseLoginLandingPageActivity.kt b/libs/login-api-2/src/main/java/com/instructure/loginapi/login/activities/BaseLoginLandingPageActivity.kt
index c1b7f0687f..d236a8a53b 100644
--- a/libs/login-api-2/src/main/java/com/instructure/loginapi/login/activities/BaseLoginLandingPageActivity.kt
+++ b/libs/login-api-2/src/main/java/com/instructure/loginapi/login/activities/BaseLoginLandingPageActivity.kt
@@ -20,6 +20,7 @@ import android.animation.AnimatorSet
 import android.animation.ObjectAnimator
 import android.content.Intent
 import android.content.pm.ApplicationInfo
+import android.content.res.ColorStateList
 import android.os.Bundle
 import android.view.GestureDetector
 import android.view.MotionEvent
@@ -62,6 +63,7 @@ import com.instructure.loginapi.login.util.LoginPrefs
 import com.instructure.loginapi.login.util.PreviousUsersUtils
 import com.instructure.loginapi.login.util.SavedLoginInfo
 import com.instructure.loginapi.login.viewmodel.LoginViewModel
+import com.instructure.pandautils.binding.setTint
 import com.instructure.pandautils.binding.viewBinding
 import com.instructure.pandautils.utils.*
 import java.util.*
@@ -220,7 +222,7 @@ abstract class BaseLoginLandingPageActivity : AppCompatActivity(), ErrorReportDi
         ColorUtils.colorIt(color, canvasLogo)
 
         // App Name/Type. Will not be present in all layout versions
-        appDescriptionType.setTextColor(color)
+        canvasWordmark.imageTintList = ColorStateList.valueOf(color)
         appDescriptionType.setText(appTypeName())
 
         ViewStyler.themeStatusBar(this@BaseLoginLandingPageActivity)
diff --git a/libs/login-api-2/src/main/res/layout-land/activity_login_landing_page.xml b/libs/login-api-2/src/main/res/layout-land/activity_login_landing_page.xml
index a2b8b7a589..a9de871d69 100644
--- a/libs/login-api-2/src/main/res/layout-land/activity_login_landing_page.xml
+++ b/libs/login-api-2/src/main/res/layout-land/activity_login_landing_page.xml
@@ -55,7 +55,7 @@
                 android:layout_marginBottom="2dp"
                 android:adjustViewBounds="true"
                 android:importantForAccessibility="no"
-                android:tint="@color/tiara"
+                android:tint="@color/login_teacherAppTheme"
                 app:srcCompat="@drawable/ic_canvas_wordmark" />
 
             <TextView
@@ -66,7 +66,7 @@
                 android:letterSpacing="0.1"
                 android:text="@string/appUserTypeTeacher"
                 android:textAllCaps="true"
-                android:textColor="@color/login_teacherAppTheme"
+                android:textColor="@color/textDarkest"
                 android:textSize="14sp"
                 android:textStyle="bold" />
         </LinearLayout>
diff --git a/libs/login-api-2/src/main/res/layout/activity_login_landing_page.xml b/libs/login-api-2/src/main/res/layout/activity_login_landing_page.xml
index 22adb062e5..d1e37b99ca 100644
--- a/libs/login-api-2/src/main/res/layout/activity_login_landing_page.xml
+++ b/libs/login-api-2/src/main/res/layout/activity_login_landing_page.xml
@@ -56,7 +56,7 @@
                 android:layout_marginBottom="2dp"
                 android:adjustViewBounds="true"
                 android:contentDescription="@string/canvas"
-                android:tint="@color/textDarkest"
+                android:tint="@color/login_teacherAppTheme"
                 app:srcCompat="@drawable/ic_canvas_wordmark" />
 
             <TextView
@@ -67,7 +67,7 @@
                 android:letterSpacing="0.1"
                 android:text="@string/appUserTypeTeacher"
                 android:textAllCaps="true"
-                android:textColor="@color/login_teacherAppTheme"
+                android:textColor="@color/textDarkest"
                 android:textSize="14sp"
                 android:textStyle="bold" />
         </LinearLayout>
diff --git a/libs/pandautils/flank.yml b/libs/pandautils/flank.yml
index 48bcce337e..60bd72123a 100644
--- a/libs/pandautils/flank.yml
+++ b/libs/pandautils/flank.yml
@@ -10,8 +10,8 @@ gcloud:
   test-targets:
   - notAnnotation com.instructure.canvas.espresso.E2E, com.instructure.canvas.espresso.Stub, com.instructure.canvas.espresso.FlakyE2E, com.instructure.canvas.espresso.KnownBug
   device:
-  - model: Nexus6P
-    version: 26
+  - model: Pixel2.arm
+    version: 29
     locale: en_US
     orientation: portrait
 

From 34cab4dc5be1cf6248f8e0c19bf96ad1cc7e6218 Mon Sep 17 00:00:00 2001
From: Kristof Nemere <109959688+kristofnemere@users.noreply.github.com>
Date: Thu, 24 Aug 2023 13:11:32 +0200
Subject: [PATCH 14/22] [MBL-17001][Student] Syllabus Summary does not
 displayed when creating summary event while user has logged in

refs: MBL-17001
affects: Student
release note: none
---
 .../mobius/syllabus/ui/SyllabusView.kt        | 34 +++++++++++--------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/apps/student/src/main/java/com/instructure/student/mobius/syllabus/ui/SyllabusView.kt b/apps/student/src/main/java/com/instructure/student/mobius/syllabus/ui/SyllabusView.kt
index ff84ef1cc8..0d264ec66a 100644
--- a/apps/student/src/main/java/com/instructure/student/mobius/syllabus/ui/SyllabusView.kt
+++ b/apps/student/src/main/java/com/instructure/student/mobius/syllabus/ui/SyllabusView.kt
@@ -53,11 +53,7 @@ class SyllabusView(val canvasContext: CanvasContext, inflater: LayoutInflater, p
         override fun onTabUnselected(tab: TabLayout.Tab?) {}
 
         override fun onTabSelected(tab: TabLayout.Tab?) {
-            if (tab?.position == 0) {
-                binding.swipeRefreshLayout.setSwipeableChildren(R.id.syllabusScrollView)
-            } else {
-                binding.swipeRefreshLayout.setSwipeableChildren(R.id.syllabusEventsRecycler, R.id.syllabusEmptyView)
-            }
+            setupSwipeableChildren(tab?.position)
         }
     }
 
@@ -96,18 +92,34 @@ class SyllabusView(val canvasContext: CanvasContext, inflater: LayoutInflater, p
             is SyllabusViewState.Loaded -> {
                 binding.swipeRefreshLayout.isRefreshing = false
 
+                val pager = binding.syllabusPager
+
                 val hasBoth = state.eventsState != null && state.syllabus != null
                 binding.syllabusTabLayout.setVisible(hasBoth)
-                binding.syllabusPager.canSwipe = hasBoth
+                pager.canSwipe = hasBoth
 
-                binding.syllabusPager.setCurrentItem(if (state.syllabus == null) 1 else 0, false)
+                pager.setCurrentItem(if (state.syllabus == null) 1 else 0, false)
+
+                if (state.syllabus != null) webviewBinding?.syllabusWebViewWrapper?.loadHtml(
+                    state.syllabus,
+                    context.getString(com.instructure.pandares.R.string.syllabus)
+                )
 
-                if (state.syllabus != null) webviewBinding?.syllabusWebViewWrapper?.loadHtml(state.syllabus, context.getString(com.instructure.pandares.R.string.syllabus))
                 if (state.eventsState != null) renderEvents(state.eventsState)
+
+                setupSwipeableChildren(pager.currentItem)
             }
         }
     }
 
+    private fun setupSwipeableChildren(position: Int?) {
+        if (position == 0) {
+            binding.swipeRefreshLayout.setSwipeableChildren(R.id.syllabusScrollView)
+        } else {
+            binding.swipeRefreshLayout.setSwipeableChildren(R.id.syllabusEventsRecycler, R.id.syllabusEmptyView)
+        }
+    }
+
     private fun renderEvents(eventsState: EventsViewState) {
         with (eventsState) {
             eventsBinding?.syllabusEmptyView?.setVisible(visibility.empty)
@@ -115,12 +127,6 @@ class SyllabusView(val canvasContext: CanvasContext, inflater: LayoutInflater, p
             eventsBinding?.syllabusEventsRecycler?.setVisible(visibility.list)
         }
 
-        if (binding.syllabusPager.currentItem == 0) {
-            binding.swipeRefreshLayout.setSwipeableChildren(R.id.syllabusScrollView)
-        } else {
-            binding.swipeRefreshLayout.setSwipeableChildren(R.id.syllabusEventsRecycler, R.id.syllabusEmptyView)
-        }
-
         when (eventsState) {
             EventsViewState.Error -> {
                 eventsBinding?.syllabusRetry?.onClick { consumer?.accept(SyllabusEvent.PullToRefresh) }

From 9d8d6f4b53df155d21a74ac7d4e85ce08593147e Mon Sep 17 00:00:00 2001
From: Kristof Deak <92309696+kdeakinstructure@users.noreply.github.com>
Date: Fri, 25 Aug 2023 11:25:47 +0200
Subject: [PATCH 15/22] [MBL-16335][Student] - Extend SyllabusE2E test with
 Syllabus/Summary tab display logic. (#2118)

refs: MBL-16335
affects: Student
release note: none
---
 .../student/ui/e2e/SyllabusE2ETest.kt         | 12 ++++----
 .../student/ui/pages/SyllabusPage.kt          | 28 ++++++++++++++++++-
 .../instructure/dataseeding/api/CoursesApi.kt |  6 ++--
 .../instructure/dataseeding/api/SeedApi.kt    | 10 +++++--
 4 files changed, 44 insertions(+), 12 deletions(-)

diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/SyllabusE2ETest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/SyllabusE2ETest.kt
index 524f3a9c29..e4cdad1e9c 100644
--- a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/SyllabusE2ETest.kt
+++ b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/SyllabusE2ETest.kt
@@ -48,7 +48,7 @@ class SyllabusE2ETest: StudentTest() {
     fun testSyllabusE2E() {
 
         Log.d(PREPARATION_TAG, "Seeding data.")
-        val data = seedData(students = 1, teachers = 1, courses = 1)
+        val data = seedData(students = 1, teachers = 1, courses = 1, syllabusBody = "this is the syllabus body")
         val student = data.studentsList[0]
         val teacher = data.teachersList[0]
         val course = data.coursesList[0]
@@ -60,9 +60,10 @@ class SyllabusE2ETest: StudentTest() {
         Log.d(STEP_TAG,"Select ${course.name} course.")
         dashboardPage.selectCourse(course)
 
-        Log.d(STEP_TAG,"Navigate to Syllabus Page. Assert that Empty View is displayed, because there is no syllabus yet.")
+        Log.d(STEP_TAG,"Navigate to Syllabus Page. Assert that the syllabus body string is displayed, and there are no tabs yet.")
         courseBrowserPage.selectSyllabus()
-        syllabusPage.assertEmptyView()
+        syllabusPage.assertNoTabs()
+        syllabusPage.assertSyllabusBody("this is the syllabus body")
 
         Log.d(PREPARATION_TAG,"Seed an assignment for ${course.name} course.")
         val assignment = createAssignment(course, teacher)
@@ -70,10 +71,9 @@ class SyllabusE2ETest: StudentTest() {
         Log.d(PREPARATION_TAG,"Seed a quiz for ${course.name} course.")
         val quiz = createQuiz(course, teacher)
 
-        // TODO: Seed a generic calendar event
-
-        Log.d(STEP_TAG,"Refresh the page. Assert that all of the items, so ${assignment.name} assignment and ${quiz.title} quiz are displayed.")
+        Log.d(STEP_TAG,"Refresh the page. Navigate to 'Summary' tab. Assert that all of the items, so ${assignment.name} assignment and ${quiz.title} quiz are displayed.")
         syllabusPage.refresh()
+        syllabusPage.selectSummaryTab()
         syllabusPage.assertItemDisplayed(assignment.name)
         syllabusPage.assertItemDisplayed(quiz.title)
     }
diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/pages/SyllabusPage.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/pages/SyllabusPage.kt
index e0b55f5c17..df6acc3af8 100644
--- a/apps/student/src/androidTest/java/com/instructure/student/ui/pages/SyllabusPage.kt
+++ b/apps/student/src/androidTest/java/com/instructure/student/ui/pages/SyllabusPage.kt
@@ -17,15 +17,23 @@
 package com.instructure.student.ui.pages
 
 import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.assertion.ViewAssertions
+import androidx.test.espresso.matcher.ViewMatchers
 import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.espresso.web.assertion.WebViewAssertions
+import androidx.test.espresso.web.sugar.Web
+import androidx.test.espresso.web.webdriver.DriverAtoms
+import androidx.test.espresso.web.webdriver.Locator
 import com.instructure.canvas.espresso.containsTextCaseInsensitive
 import com.instructure.canvas.espresso.scrollRecyclerView
 import com.instructure.espresso.assertDisplayed
 import com.instructure.espresso.click
 import com.instructure.espresso.page.BasePage
+import com.instructure.espresso.page.plus
 import com.instructure.espresso.page.withAncestor
 import com.instructure.espresso.swipeDown
 import com.instructure.student.R
+import org.hamcrest.Matchers
 import org.hamcrest.Matchers.allOf
 
 open class SyllabusPage : BasePage(R.id.syllabusPage) {
@@ -39,7 +47,11 @@ open class SyllabusPage : BasePage(R.id.syllabusPage) {
     }
 
     fun selectSummaryTab() {
-        onView(containsTextCaseInsensitive("summary")).click()
+        onView(containsTextCaseInsensitive("summary") + withAncestor(R.id.syllabusTabLayout)).click()
+    }
+
+    fun selectSyllabusTab() {
+        onView(containsTextCaseInsensitive("syllabus") + withAncestor(R.id.syllabusTabLayout)).click()
     }
 
     fun selectSummaryEvent(name: String) {
@@ -50,4 +62,18 @@ open class SyllabusPage : BasePage(R.id.syllabusPage) {
         onView(allOf(withId(R.id.swipeRefreshLayout), withAncestor(R.id.syllabusPage))).swipeDown()
     }
 
+    fun assertNoTabs() {
+        onView(withId(R.id.syllabusTabLayout)).check(ViewAssertions.matches(ViewMatchers.withEffectiveVisibility(ViewMatchers.Visibility.GONE)))
+    }
+
+    fun assertSyllabusBody(syllabusBody: String) {
+            Web.onWebView(withId(R.id.contentWebView) + withAncestor(R.id.syllabusPage))
+                .withElement(DriverAtoms.findElement(Locator.ID, "content"))
+                .check(
+                    WebViewAssertions.webMatches(
+                        DriverAtoms.getText(),
+                        Matchers.comparesEqualTo(syllabusBody)
+                    )
+                )
+    }
 }
diff --git a/automation/dataseedingapi/src/main/kotlin/com/instructure/dataseeding/api/CoursesApi.kt b/automation/dataseedingapi/src/main/kotlin/com/instructure/dataseeding/api/CoursesApi.kt
index 2832736e43..dbbfd36533 100644
--- a/automation/dataseedingapi/src/main/kotlin/com/instructure/dataseeding/api/CoursesApi.kt
+++ b/automation/dataseedingapi/src/main/kotlin/com/instructure/dataseeding/api/CoursesApi.kt
@@ -82,7 +82,8 @@ object CoursesApi {
     fun createCourse(
         enrollmentTermId: Long? = null,
         publish: Boolean = true,
-        coursesService: CoursesService = adminCoursesService
+        coursesService: CoursesService = adminCoursesService,
+        syllabusBody: String? = null
     ): CourseApiModel {
         val randomCourseName = Randomizer.randomCourseName()
         val course = CreateCourseWrapper(
@@ -90,7 +91,8 @@ object CoursesApi {
             course = CreateCourse(
                 name = randomCourseName,
                 courseCode = randomCourseName.substring(0, 2),
-                enrollmentTermId = enrollmentTermId
+                enrollmentTermId = enrollmentTermId,
+                syllabusBody = syllabusBody
             )
         )
         return coursesService
diff --git a/automation/dataseedingapi/src/main/kotlin/com/instructure/dataseeding/api/SeedApi.kt b/automation/dataseedingapi/src/main/kotlin/com/instructure/dataseeding/api/SeedApi.kt
index 9536d92f91..98406ac1d3 100644
--- a/automation/dataseedingapi/src/main/kotlin/com/instructure/dataseeding/api/SeedApi.kt
+++ b/automation/dataseedingapi/src/main/kotlin/com/instructure/dataseeding/api/SeedApi.kt
@@ -16,7 +16,11 @@
 
 package com.instructure.dataseeding.api
 
-import com.instructure.dataseeding.model.*
+import com.instructure.dataseeding.model.CanvasUserApiModel
+import com.instructure.dataseeding.model.CourseApiModel
+import com.instructure.dataseeding.model.DiscussionApiModel
+import com.instructure.dataseeding.model.EnrollmentApiModel
+import com.instructure.dataseeding.model.FavoriteApiModel
 
 // Data-seeding API
 object SeedApi {
@@ -172,7 +176,7 @@ object SeedApi {
         with(seededData) {
             for (c in 0 until maxOf(request.courses + request.pastCourses, request.favoriteCourses)) {
                 // Seed course
-                addCourses(createCourse(request.gradingPeriods, request.publishCourses))
+                addCourses(createCourse(request.gradingPeriods, request.publishCourses, syllabusBody = request.syllabusBody))
 
                 // Seed users
                 for (t in 0 until request.teachers) {
@@ -316,7 +320,7 @@ object SeedApi {
         return if (accountId != null) {
             CoursesApi.createCourseInSubAccount(accountId = accountId, homeroomCourse = isHomeroomCourse, enrollmentTermId = enrollmentTermId, publish = publishCourses, syllabusBody = syllabusBody)
         } else {
-            CoursesApi.createCourse(enrollmentTermId, publishCourses)
+            CoursesApi.createCourse(enrollmentTermId, publishCourses, syllabusBody = syllabusBody)
         }
     }
 }
\ No newline at end of file

From 0e6a6a2a7bafbeef99295d300a170bc2e9628416 Mon Sep 17 00:00:00 2001
From: Kristof Nemere <109959688+kristofnemere@users.noreply.github.com>
Date: Tue, 29 Aug 2023 11:20:57 +0200
Subject: [PATCH 16/22] [MBL-16996][Parent] Score to letter grade conversion
 (#2120)

refs: MBL-16996
affects: Parent
release note: Added letter grade conversion by grading scheme.

* Convert score to letter grade

* More tests

* fixed tests

* Fixed comment
---
 apps/flutter_parent/lib/models/course.dart    |  18 ++
 apps/flutter_parent/lib/models/course.g.dart  |  76 ++++++---
 .../lib/models/grade_cell_data.dart           |  15 +-
 .../lib/models/grading_scheme_item.dart       |  44 +++++
 .../lib/models/grading_scheme_item.g.dart     | 154 ++++++++++++++++++
 .../lib/models/serializers.dart               |   3 +
 .../lib/models/serializers.g.dart             |   4 +
 .../lib/network/api/course_api.dart           |   2 +
 .../assignment_details_screen.dart            |   2 +-
 .../lib/screens/assignments/grade_cell.dart   |   4 +-
 .../courses/details/course_details_model.dart |   2 +-
 .../details/course_details_screen.dart        |   2 +-
 .../courses/details/course_grades_screen.dart |  61 ++++---
 .../test/models/course_test.dart              |  44 ++++-
 .../assignments/grade_cell_data_test.dart     | 103 +++++++++---
 .../courses/course_grades_screen_test.dart    |  82 +++++++++-
 16 files changed, 518 insertions(+), 98 deletions(-)
 create mode 100644 apps/flutter_parent/lib/models/grading_scheme_item.dart
 create mode 100644 apps/flutter_parent/lib/models/grading_scheme_item.g.dart

diff --git a/apps/flutter_parent/lib/models/course.dart b/apps/flutter_parent/lib/models/course.dart
index 4d9036b03d..931a1bc5b0 100644
--- a/apps/flutter_parent/lib/models/course.dart
+++ b/apps/flutter_parent/lib/models/course.dart
@@ -15,8 +15,10 @@ library course;
 
 import 'package:built_collection/built_collection.dart';
 import 'package:built_value/built_value.dart';
+import 'package:built_value/json_object.dart';
 import 'package:built_value/serializer.dart';
 import 'package:flutter_parent/models/course_settings.dart';
+import 'package:flutter_parent/models/grading_scheme_item.dart';
 import 'package:flutter_parent/models/section.dart';
 import 'package:flutter_parent/models/term.dart';
 
@@ -127,6 +129,16 @@ abstract class Course implements Built<Course, CourseBuilder> {
   @nullable
   CourseSettings get settings;
 
+  @nullable
+  @BuiltValueField(wireName: 'grading_scheme')
+  BuiltList<JsonObject> get gradingScheme;
+
+  List<GradingSchemeItem> get gradingSchemeItems {
+    if (gradingScheme == null) return [];
+    return gradingScheme.map((item) => GradingSchemeItem.fromJson(item)).where((element) => element != null).toList()
+      ..sort((a, b) => b.value.compareTo(a.value));
+  }
+
   static void _initializeBuilder(CourseBuilder b) => b
     ..id = ''
     ..enrollments = ListBuilder<Enrollment>()
@@ -176,6 +188,12 @@ abstract class Course implements Built<Course, CourseBuilder> {
   bool isValidForCurrentStudent(String currentStudentId) {
     return enrollments?.any((enrollment) => enrollment.userId == currentStudentId) ?? false;
   }
+
+  String convertScoreToLetterGrade(double score, double maxScore) {
+    if (maxScore == 0.0 || gradingSchemeItems.isEmpty) return "";
+    double percent = score / maxScore;
+    return gradingSchemeItems.firstWhere((element) => percent >= element.value, orElse: () => gradingSchemeItems.last).grade;
+  }
 }
 
 @BuiltValueEnum(wireName: 'default_view')
diff --git a/apps/flutter_parent/lib/models/course.g.dart b/apps/flutter_parent/lib/models/course.g.dart
index 3c8a4f7d71..737bb7026e 100644
--- a/apps/flutter_parent/lib/models/course.g.dart
+++ b/apps/flutter_parent/lib/models/course.g.dart
@@ -154,6 +154,13 @@ class _$CourseSerializer implements StructuredSerializer<Course> {
       ..add('settings')
       ..add(serializers.serialize(value,
           specifiedType: const FullType(CourseSettings)));
+    value = object.gradingScheme;
+
+    result
+      ..add('grading_scheme')
+      ..add(serializers.serialize(value,
+          specifiedType:
+              const FullType(BuiltList, const [const FullType(JsonObject)])));
 
     return result;
   }
@@ -265,6 +272,12 @@ class _$CourseSerializer implements StructuredSerializer<Course> {
           result.settings.replace(serializers.deserialize(value,
               specifiedType: const FullType(CourseSettings)) as CourseSettings);
           break;
+        case 'grading_scheme':
+          result.gradingScheme.replace(serializers.deserialize(value,
+                  specifiedType: const FullType(
+                      BuiltList, const [const FullType(JsonObject)]))
+              as BuiltList<Object>);
+          break;
       }
     }
 
@@ -344,6 +357,8 @@ class _$Course extends Course {
   final BuiltList<Section> sections;
   @override
   final CourseSettings settings;
+  @override
+  final BuiltList<JsonObject> gradingScheme;
 
   factory _$Course([void Function(CourseBuilder) updates]) =>
       (new CourseBuilder()..update(updates)).build();
@@ -375,7 +390,8 @@ class _$Course extends Course {
       this.homePage,
       this.term,
       this.sections,
-      this.settings})
+      this.settings,
+      this.gradingScheme})
       : super._() {
     BuiltValueNullFieldError.checkNotNull(id, 'Course', 'id');
     BuiltValueNullFieldError.checkNotNull(name, 'Course', 'name');
@@ -436,7 +452,8 @@ class _$Course extends Course {
         homePage == other.homePage &&
         term == other.term &&
         sections == other.sections &&
-        settings == other.settings;
+        settings == other.settings &&
+        gradingScheme == other.gradingScheme;
   }
 
   @override
@@ -459,26 +476,26 @@ class _$Course extends Course {
                                                                 $jc(
                                                                     $jc(
                                                                         $jc(
-                                                                            $jc($jc($jc($jc($jc($jc($jc($jc($jc(0, currentScore.hashCode), finalScore.hashCode), currentGrade.hashCode), finalGrade.hashCode), id.hashCode), name.hashCode), originalName.hashCode), courseCode.hashCode),
-                                                                                startAt.hashCode),
-                                                                            endAt.hashCode),
-                                                                        syllabusBody.hashCode),
-                                                                    hideFinalGrades.hashCode),
-                                                                isPublic.hashCode),
-                                                            enrollments.hashCode),
-                                                        needsGradingCount.hashCode),
-                                                    applyAssignmentGroupWeights.hashCode),
-                                                isFavorite.hashCode),
-                                            accessRestrictedByDate.hashCode),
-                                        imageDownloadUrl.hashCode),
-                                    hasWeightedGradingPeriods.hashCode),
-                                hasGradingPeriods.hashCode),
-                            restrictEnrollmentsToCourseDates.hashCode),
-                        workflowState.hashCode),
-                    homePage.hashCode),
-                term.hashCode),
-            sections.hashCode),
-        settings.hashCode));
+                                                                            $jc($jc($jc($jc($jc($jc($jc($jc($jc($jc(0, currentScore.hashCode), finalScore.hashCode), currentGrade.hashCode), finalGrade.hashCode), id.hashCode), name.hashCode), originalName.hashCode), courseCode.hashCode), startAt.hashCode),
+                                                                                endAt.hashCode),
+                                                                            syllabusBody.hashCode),
+                                                                        hideFinalGrades.hashCode),
+                                                                    isPublic.hashCode),
+                                                                enrollments.hashCode),
+                                                            needsGradingCount.hashCode),
+                                                        applyAssignmentGroupWeights.hashCode),
+                                                    isFavorite.hashCode),
+                                                accessRestrictedByDate.hashCode),
+                                            imageDownloadUrl.hashCode),
+                                        hasWeightedGradingPeriods.hashCode),
+                                    hasGradingPeriods.hashCode),
+                                restrictEnrollmentsToCourseDates.hashCode),
+                            workflowState.hashCode),
+                        homePage.hashCode),
+                    term.hashCode),
+                sections.hashCode),
+            settings.hashCode),
+        gradingScheme.hashCode));
   }
 
   @override
@@ -511,7 +528,8 @@ class _$Course extends Course {
           ..add('homePage', homePage)
           ..add('term', term)
           ..add('sections', sections)
-          ..add('settings', settings))
+          ..add('settings', settings)
+          ..add('gradingScheme', gradingScheme))
         .toString();
   }
 }
@@ -642,6 +660,12 @@ class CourseBuilder implements Builder<Course, CourseBuilder> {
       _$this._settings ??= new CourseSettingsBuilder();
   set settings(CourseSettingsBuilder settings) => _$this._settings = settings;
 
+  ListBuilder<JsonObject> _gradingScheme;
+  ListBuilder<JsonObject> get gradingScheme =>
+      _$this._gradingScheme ??= new ListBuilder<JsonObject>();
+  set gradingScheme(ListBuilder<JsonObject> gradingScheme) =>
+      _$this._gradingScheme = gradingScheme;
+
   CourseBuilder() {
     Course._initializeBuilder(this);
   }
@@ -676,6 +700,7 @@ class CourseBuilder implements Builder<Course, CourseBuilder> {
       _term = $v.term?.toBuilder();
       _sections = $v.sections?.toBuilder();
       _settings = $v.settings?.toBuilder();
+      _gradingScheme = $v.gradingScheme?.toBuilder();
       _$v = null;
     }
     return this;
@@ -733,7 +758,8 @@ class CourseBuilder implements Builder<Course, CourseBuilder> {
               homePage: homePage,
               term: _term?.build(),
               sections: _sections?.build(),
-              settings: _settings?.build());
+              settings: _settings?.build(),
+              gradingScheme: _gradingScheme?.build());
     } catch (_) {
       String _$failedField;
       try {
@@ -746,6 +772,8 @@ class CourseBuilder implements Builder<Course, CourseBuilder> {
         _sections?.build();
         _$failedField = 'settings';
         _settings?.build();
+        _$failedField = 'gradingScheme';
+        _gradingScheme?.build();
       } catch (e) {
         throw new BuiltValueNestedFieldError(
             'Course', _$failedField, e.toString());
diff --git a/apps/flutter_parent/lib/models/grade_cell_data.dart b/apps/flutter_parent/lib/models/grade_cell_data.dart
index 5cc6740ce4..f3466b460c 100644
--- a/apps/flutter_parent/lib/models/grade_cell_data.dart
+++ b/apps/flutter_parent/lib/models/grade_cell_data.dart
@@ -16,6 +16,7 @@ import 'package:built_value/built_value.dart';
 import 'package:flutter/material.dart' hide Builder;
 import 'package:flutter/rendering.dart';
 import 'package:flutter_parent/l10n/app_localizations.dart';
+import 'package:flutter_parent/models/course.dart';
 import 'package:flutter_parent/models/submission.dart';
 import 'package:flutter_parent/utils/core_extensions/date_time_extensions.dart';
 import 'package:flutter_parent/utils/design/parent_colors.dart';
@@ -61,16 +62,17 @@ abstract class GradeCellData implements Built<GradeCellData, GradeCellDataBuilde
     ..finalGrade = '';
 
   static GradeCellData forSubmission(
-    bool restrictQuantitativeData,
+    Course course,
     Assignment assignment,
     Submission submission,
     ThemeData theme,
     AppLocalizations l10n,
   ) {
-    var excused = submission?.excused ?? false;
+    final excused = submission?.excused ?? false;
+    final restrictQuantitativeData = course?.settings?.restrictQuantitativeData ?? false;
 
     // Return empty state if null, unsubmitted and ungraded, or has a 'not graded' or restricted grading type
-    final restricted = restrictQuantitativeData && assignment.isGradingTypeQuantitative() && !excused;
+    final restricted = restrictQuantitativeData && assignment.isGradingTypeQuantitative() && course.gradingSchemeItems.isEmpty && !excused;
     if (assignment == null ||
         submission == null ||
         (submission?.submittedAt == null && !excused && submission?.grade == null) ||
@@ -125,11 +127,16 @@ abstract class GradeCellData implements Built<GradeCellData, GradeCellDataBuilde
     // If grading type is Points, don't show the grade since we're already showing it as the score
     var grade = assignment.gradingType != GradingType.points ? submission.grade ?? '' : '';
 
+    if (restrictQuantitativeData && assignment.isGradingTypeQuantitative()) {
+      grade = course.convertScoreToLetterGrade(submission.score, assignment.pointsPossible);
+    }
+
     // Screen reader fails on letter grades with a minus (e.g. 'A-'), so we replace the dash with the word 'minus'
     var accessibleGradeString = grade.replaceAll('-', '. ${l10n.accessibilityMinus}');
 
     var latePenalty = '';
     var finalGrade = '';
+    var restrictedScore = grade;
 
     // Adjust for late penalty, if any
     if ((submission.pointsDeducted ?? 0.0) > 0.0) {
@@ -144,7 +151,7 @@ abstract class GradeCellData implements Built<GradeCellData, GradeCellDataBuilde
           ..state = GradeCellState.gradedRestrictQuantitativeData
           ..graphPercent = 1.0
           ..accentColor = accentColor
-          ..score = submission.grade
+          ..score = restrictedScore
           ..gradeContentDescription = accessibleGradeString)
         : GradeCellData((b) => b
           ..state = GradeCellState.graded
diff --git a/apps/flutter_parent/lib/models/grading_scheme_item.dart b/apps/flutter_parent/lib/models/grading_scheme_item.dart
new file mode 100644
index 0000000000..64010dda6b
--- /dev/null
+++ b/apps/flutter_parent/lib/models/grading_scheme_item.dart
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2023 - present Instructure, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 3 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import 'package:built_value/built_value.dart';
+import 'package:built_value/json_object.dart';
+import 'package:built_value/serializer.dart';
+
+part 'grading_scheme_item.g.dart';
+
+abstract class GradingSchemeItem implements Built<GradingSchemeItem, GradingSchemeItemBuilder> {
+  static Serializer<GradingSchemeItem> get serializer => _$gradingSchemeItemSerializer;
+
+  GradingSchemeItem._();
+
+  factory GradingSchemeItem([void Function(GradingSchemeItemBuilder) updates]) = _$GradingSchemeItem;
+
+  factory GradingSchemeItem.fromJson(JsonObject json) {
+    if (!json.isList) return null;
+    List<dynamic> items = json.asList;
+    if (!(items[0] is String) || !(items[1] is num)) return null;
+    String grade = items[0] as String;
+    double value = (items[1] as num).toDouble();
+    return GradingSchemeItem((b) => b
+      ..grade = grade
+      ..value = value);
+  }
+
+  String get grade;
+
+  double get value;
+}
diff --git a/apps/flutter_parent/lib/models/grading_scheme_item.g.dart b/apps/flutter_parent/lib/models/grading_scheme_item.g.dart
new file mode 100644
index 0000000000..684f7dc435
--- /dev/null
+++ b/apps/flutter_parent/lib/models/grading_scheme_item.g.dart
@@ -0,0 +1,154 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'grading_scheme_item.dart';
+
+// **************************************************************************
+// BuiltValueGenerator
+// **************************************************************************
+
+Serializer<GradingSchemeItem> _$gradingSchemeItemSerializer =
+    new _$GradingSchemeItemSerializer();
+
+class _$GradingSchemeItemSerializer
+    implements StructuredSerializer<GradingSchemeItem> {
+  @override
+  final Iterable<Type> types = const [GradingSchemeItem, _$GradingSchemeItem];
+  @override
+  final String wireName = 'GradingSchemeItem';
+
+  @override
+  Iterable<Object> serialize(Serializers serializers, GradingSchemeItem object,
+      {FullType specifiedType = FullType.unspecified}) {
+    final result = <Object>[
+      'grade',
+      serializers.serialize(object.grade,
+          specifiedType: const FullType(String)),
+      'value',
+      serializers.serialize(object.value,
+          specifiedType: const FullType(double)),
+    ];
+
+    return result;
+  }
+
+  @override
+  GradingSchemeItem deserialize(
+      Serializers serializers, Iterable<Object> serialized,
+      {FullType specifiedType = FullType.unspecified}) {
+    final result = new GradingSchemeItemBuilder();
+
+    final iterator = serialized.iterator;
+    while (iterator.moveNext()) {
+      final key = iterator.current as String;
+      iterator.moveNext();
+      final Object value = iterator.current;
+      switch (key) {
+        case 'grade':
+          result.grade = serializers.deserialize(value,
+              specifiedType: const FullType(String)) as String;
+          break;
+        case 'value':
+          result.value = serializers.deserialize(value,
+              specifiedType: const FullType(double)) as double;
+          break;
+      }
+    }
+
+    return result.build();
+  }
+}
+
+class _$GradingSchemeItem extends GradingSchemeItem {
+  @override
+  final String grade;
+  @override
+  final double value;
+
+  factory _$GradingSchemeItem(
+          [void Function(GradingSchemeItemBuilder) updates]) =>
+      (new GradingSchemeItemBuilder()..update(updates)).build();
+
+  _$GradingSchemeItem._({this.grade, this.value}) : super._() {
+    BuiltValueNullFieldError.checkNotNull(grade, 'GradingSchemeItem', 'grade');
+    BuiltValueNullFieldError.checkNotNull(value, 'GradingSchemeItem', 'value');
+  }
+
+  @override
+  GradingSchemeItem rebuild(void Function(GradingSchemeItemBuilder) updates) =>
+      (toBuilder()..update(updates)).build();
+
+  @override
+  GradingSchemeItemBuilder toBuilder() =>
+      new GradingSchemeItemBuilder()..replace(this);
+
+  @override
+  bool operator ==(Object other) {
+    if (identical(other, this)) return true;
+    return other is GradingSchemeItem &&
+        grade == other.grade &&
+        value == other.value;
+  }
+
+  @override
+  int get hashCode {
+    return $jf($jc($jc(0, grade.hashCode), value.hashCode));
+  }
+
+  @override
+  String toString() {
+    return (newBuiltValueToStringHelper('GradingSchemeItem')
+          ..add('grade', grade)
+          ..add('value', value))
+        .toString();
+  }
+}
+
+class GradingSchemeItemBuilder
+    implements Builder<GradingSchemeItem, GradingSchemeItemBuilder> {
+  _$GradingSchemeItem _$v;
+
+  String _grade;
+  String get grade => _$this._grade;
+  set grade(String grade) => _$this._grade = grade;
+
+  double _value;
+  double get value => _$this._value;
+  set value(double value) => _$this._value = value;
+
+  GradingSchemeItemBuilder();
+
+  GradingSchemeItemBuilder get _$this {
+    final $v = _$v;
+    if ($v != null) {
+      _grade = $v.grade;
+      _value = $v.value;
+      _$v = null;
+    }
+    return this;
+  }
+
+  @override
+  void replace(GradingSchemeItem other) {
+    ArgumentError.checkNotNull(other, 'other');
+    _$v = other as _$GradingSchemeItem;
+  }
+
+  @override
+  void update(void Function(GradingSchemeItemBuilder) updates) {
+    if (updates != null) updates(this);
+  }
+
+  @override
+  _$GradingSchemeItem build() {
+    final _$result = _$v ??
+        new _$GradingSchemeItem._(
+            grade: BuiltValueNullFieldError.checkNotNull(
+                grade, 'GradingSchemeItem', 'grade'),
+            value: BuiltValueNullFieldError.checkNotNull(
+                value, 'GradingSchemeItem', 'value'));
+    replace(_$result);
+    return _$result;
+  }
+}
+
+// ignore_for_file: always_put_control_body_on_new_line,always_specify_types,annotate_overrides,avoid_annotating_with_dynamic,avoid_as,avoid_catches_without_on_clauses,avoid_returning_this,deprecated_member_use_from_same_package,lines_longer_than_80_chars,omit_local_variable_types,prefer_expression_function_bodies,sort_constructors_first,test_types_in_equals,unnecessary_const,unnecessary_new
diff --git a/apps/flutter_parent/lib/models/serializers.dart b/apps/flutter_parent/lib/models/serializers.dart
index ee17cf2e00..1b3c08e964 100644
--- a/apps/flutter_parent/lib/models/serializers.dart
+++ b/apps/flutter_parent/lib/models/serializers.dart
@@ -16,6 +16,7 @@ library serializers;
 
 import 'package:built_collection/built_collection.dart';
 import 'package:built_value/iso_8601_date_time_serializer.dart';
+import 'package:built_value/json_object.dart';
 import 'package:built_value/serializer.dart';
 import 'package:built_value/standard_json_plugin.dart';
 import 'package:flutter_parent/models/account_creation_models/create_account_post_body.dart';
@@ -47,6 +48,7 @@ import 'package:flutter_parent/models/enrollment.dart';
 import 'package:flutter_parent/models/grade.dart';
 import 'package:flutter_parent/models/grading_period.dart';
 import 'package:flutter_parent/models/grading_period_response.dart';
+import 'package:flutter_parent/models/grading_scheme_item.dart';
 import 'package:flutter_parent/models/help_link.dart';
 import 'package:flutter_parent/models/help_links.dart';
 import 'package:flutter_parent/models/lock_info.dart';
@@ -172,6 +174,7 @@ part 'serializers.g.dart';
   User,
   UserColors,
   UserNameData,
+  GradingSchemeItem,
 ])
 final Serializers _serializers = _$_serializers;
 
diff --git a/apps/flutter_parent/lib/models/serializers.g.dart b/apps/flutter_parent/lib/models/serializers.g.dart
index 3847979f9c..0806afda58 100644
--- a/apps/flutter_parent/lib/models/serializers.g.dart
+++ b/apps/flutter_parent/lib/models/serializers.g.dart
@@ -49,6 +49,7 @@ Serializers _$_serializers = (new Serializers().toBuilder()
       ..add(GradeSubmissionWrapper.serializer)
       ..add(GradingPeriod.serializer)
       ..add(GradingPeriodResponse.serializer)
+      ..add(GradingSchemeItem.serializer)
       ..add(GradingType.serializer)
       ..add(HelpLink.serializer)
       ..add(HelpLinks.serializer)
@@ -114,6 +115,9 @@ Serializers _$_serializers = (new Serializers().toBuilder()
       ..addBuilderFactory(
           const FullType(BuiltList, const [const FullType(Section)]),
           () => new ListBuilder<Section>())
+      ..addBuilderFactory(
+          const FullType(BuiltList, const [const FullType(JsonObject)]),
+          () => new ListBuilder<JsonObject>())
       ..addBuilderFactory(
           const FullType(BuiltList, const [const FullType(GradingPeriod)]),
           () => new ListBuilder<GradingPeriod>())
diff --git a/apps/flutter_parent/lib/network/api/course_api.dart b/apps/flutter_parent/lib/network/api/course_api.dart
index cc12d6f124..9ce9f502c7 100644
--- a/apps/flutter_parent/lib/network/api/course_api.dart
+++ b/apps/flutter_parent/lib/network/api/course_api.dart
@@ -38,6 +38,7 @@ class CourseApi {
         'sections',
         'observed_users',
         'settings',
+        'grading_scheme'
       ],
       'enrollment_state': 'active',
     };
@@ -58,6 +59,7 @@ class CourseApi {
         'course_image',
         'observed_users',
         'settings',
+        'grading_scheme'
       ]
     };
     return fetch(canvasDio(forceRefresh: forceRefresh).get('courses/${courseId}', queryParameters: params));
diff --git a/apps/flutter_parent/lib/screens/assignments/assignment_details_screen.dart b/apps/flutter_parent/lib/screens/assignments/assignment_details_screen.dart
index 766094f36e..72d0fa5a88 100644
--- a/apps/flutter_parent/lib/screens/assignments/assignment_details_screen.dart
+++ b/apps/flutter_parent/lib/screens/assignments/assignment_details_screen.dart
@@ -185,7 +185,7 @@ class _AssignmentDetailsScreenState extends State<AssignmentDetailsScreen> {
                   style: textTheme.subtitle1, key: Key("assignment_details_due_date")),
             ),
           ],
-          GradeCell.forSubmission(context, course?.settings?.restrictQuantitativeData ?? false, assignment, submission),
+          GradeCell.forSubmission(context, course, assignment, submission),
           ..._lockedRow(assignment),
           Divider(),
           ..._rowTile(
diff --git a/apps/flutter_parent/lib/screens/assignments/grade_cell.dart b/apps/flutter_parent/lib/screens/assignments/grade_cell.dart
index 4a8e60b122..1f74cdfb8b 100644
--- a/apps/flutter_parent/lib/screens/assignments/grade_cell.dart
+++ b/apps/flutter_parent/lib/screens/assignments/grade_cell.dart
@@ -28,12 +28,12 @@ class GradeCell extends StatelessWidget {
 
   GradeCell.forSubmission(
     BuildContext context,
-    bool restrictQuantitativeData,
+    Course course,
     Assignment assignment,
     Submission submission, {
     Key key,
   })  : data = GradeCellData.forSubmission(
-          restrictQuantitativeData,
+          course,
           assignment,
           submission,
           Theme.of(context),
diff --git a/apps/flutter_parent/lib/screens/courses/details/course_details_model.dart b/apps/flutter_parent/lib/screens/courses/details/course_details_model.dart
index 33ef1e8f94..b14a450c75 100644
--- a/apps/flutter_parent/lib/screens/courses/details/course_details_model.dart
+++ b/apps/flutter_parent/lib/screens/courses/details/course_details_model.dart
@@ -77,7 +77,7 @@ class CourseDetailsModel extends BaseModel {
 
   Future<GradeDetails> loadAssignments({bool forceRefresh = false}) async {
     if (forceRefresh) {
-      course = await _interactor().loadCourse(courseId);
+      course = await _interactor().loadCourse(courseId, forceRefresh: forceRefresh);
     }
 
     final groupFuture = _interactor()
diff --git a/apps/flutter_parent/lib/screens/courses/details/course_details_screen.dart b/apps/flutter_parent/lib/screens/courses/details/course_details_screen.dart
index 46756cee46..005650dab6 100644
--- a/apps/flutter_parent/lib/screens/courses/details/course_details_screen.dart
+++ b/apps/flutter_parent/lib/screens/courses/details/course_details_screen.dart
@@ -145,7 +145,7 @@ class _CourseDetailsScreenState extends State<CourseDetailsScreen> with SingleTi
       return TabBarView(
         controller: _tabController,
         children: [
-          CourseGradesScreen(model.restrictQuantitativeData),
+          CourseGradesScreen(),
           if (model.hasHomePageAsFrontPage) CourseFrontPageScreen(courseId: model.courseId),
           if (model.hasHomePageAsSyllabus) CourseSyllabusScreen(model.course.syllabusBody),
           if (model.showSummary) CourseSummaryScreen(),
diff --git a/apps/flutter_parent/lib/screens/courses/details/course_grades_screen.dart b/apps/flutter_parent/lib/screens/courses/details/course_grades_screen.dart
index 57d692164f..21ec29988d 100644
--- a/apps/flutter_parent/lib/screens/courses/details/course_grades_screen.dart
+++ b/apps/flutter_parent/lib/screens/courses/details/course_grades_screen.dart
@@ -16,6 +16,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_parent/l10n/app_localizations.dart';
 import 'package:flutter_parent/models/assignment.dart';
 import 'package:flutter_parent/models/assignment_group.dart';
+import 'package:flutter_parent/models/course.dart';
 import 'package:flutter_parent/models/course_grade.dart';
 import 'package:flutter_parent/models/enrollment.dart';
 import 'package:flutter_parent/models/grading_period.dart';
@@ -36,10 +37,6 @@ import 'package:intl/intl.dart';
 import 'package:provider/provider.dart';
 
 class CourseGradesScreen extends StatefulWidget {
-  final bool _restrictQuantitativeData;
-
-  CourseGradesScreen(this._restrictQuantitativeData);
-
   @override
   _CourseGradesScreenState createState() => _CourseGradesScreenState();
 }
@@ -116,12 +113,12 @@ class _CourseGradesScreenState extends State<CourseGradesScreen> with AutomaticK
     return ListView(
       children: [
         header,
-        ..._assignmentListChildren(context, snapshot.data.assignmentGroups),
+        ..._assignmentListChildren(context, snapshot.data.assignmentGroups, model.course),
       ],
     );
   }
 
-  List<Widget> _assignmentListChildren(BuildContext context, List<AssignmentGroup> groups) {
+  List<Widget> _assignmentListChildren(BuildContext context, List<AssignmentGroup> groups, Course course) {
     final children = List<Widget>();
 
     for (AssignmentGroup group in groups) {
@@ -153,7 +150,7 @@ class _CourseGradesScreenState extends State<CourseGradesScreen> with AutomaticK
             ),
             children: <Widget>[
               ...(group.assignments.toList()..sort((a, b) => a.position.compareTo(b.position)))
-                  .map((assignment) => _AssignmentRow(assignment: assignment, restrictQuantitativeData: widget._restrictQuantitativeData))
+                  .map((assignment) => _AssignmentRow(assignment: assignment, course: course))
             ],
           ),
         ),
@@ -281,9 +278,9 @@ class _CourseGradeHeader extends StatelessWidget {
 
 class _AssignmentRow extends StatelessWidget {
   final Assignment assignment;
-  final bool restrictQuantitativeData;
+  final Course course;
 
-  const _AssignmentRow({Key key, this.assignment, this.restrictQuantitativeData}) : super(key: key);
+  const _AssignmentRow({Key key, this.assignment, this.course}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
@@ -378,15 +375,33 @@ class _AssignmentRow extends StatelessWidget {
     final localizations = L10n(context);
 
     final submission = assignment.submission(studentId);
+
+    final restrictQuantitativeData = course?.settings?.restrictQuantitativeData ?? false;
+
     if (submission?.excused ?? false) {
-      text = restrictQuantitativeData ? localizations.excused : localizations.gradeFormatScoreOutOfPointsPossible(localizations.excused, points);
-      semantics = restrictQuantitativeData ? localizations.excused : localizations.contentDescriptionScoreOutOfPointsPossible(localizations.excused, points);
+      text = restrictQuantitativeData
+          ? localizations.excused
+          : localizations.gradeFormatScoreOutOfPointsPossible(localizations.excused, points);
+      semantics = restrictQuantitativeData
+          ? localizations.excused
+          : localizations.contentDescriptionScoreOutOfPointsPossible(localizations.excused, points);
     } else if (submission?.grade != null) {
-      text = _formatGradeText(restrictQuantitativeData, submission.grade, points, localizations);
-      semantics = _formatGradeSemantics(restrictQuantitativeData, submission.grade, points, localizations);
+      String grade = restrictQuantitativeData && assignment.isGradingTypeQuantitative()
+          ? course.convertScoreToLetterGrade(submission.score, assignment.pointsPossible)
+          : submission.grade;
+      text = restrictQuantitativeData
+          ? grade
+          : localizations.gradeFormatScoreOutOfPointsPossible(grade, points);
+      semantics = restrictQuantitativeData
+          ? grade
+          : localizations.contentDescriptionScoreOutOfPointsPossible(grade, points);
     } else {
-      text = _formatGradeText(restrictQuantitativeData, localizations.assignmentNoScore, points, localizations);
-      semantics = _formatGradeSemantics(restrictQuantitativeData, '', points, localizations); // Read as "out of x points"
+      text = restrictQuantitativeData
+          ? localizations.assignmentNoScore
+          : localizations.gradeFormatScoreOutOfPointsPossible(localizations.assignmentNoScore, points);
+      semantics = restrictQuantitativeData
+          ? ''
+          : localizations.contentDescriptionScoreOutOfPointsPossible('', points);
     }
 
     return Text(text,
@@ -395,22 +410,6 @@ class _AssignmentRow extends StatelessWidget {
         key: Key("assignment_${assignment.id}_grade"));
   }
 
-  String _formatGradeText(bool restrictQuantitativeData, String score, String pointsPossible, AppLocalizations localizations) {
-    if (restrictQuantitativeData) {
-      return !assignment.isGradingTypeQuantitative() ? score : '';
-    } else {
-      return localizations.gradeFormatScoreOutOfPointsPossible(score, pointsPossible);
-    }
-  }
-
-  String _formatGradeSemantics(bool restrictQuantitativeData, String score, String pointsPossible, AppLocalizations localizations) {
-    if (restrictQuantitativeData) {
-      return !assignment.isGradingTypeQuantitative() ? score : '';
-    } else {
-      return localizations.contentDescriptionScoreOutOfPointsPossible(score, pointsPossible);
-    }
-  }
-
   String _formatDate(BuildContext context, DateTime date) {
     final l10n = L10n(context);
     return date.l10nFormat(l10n.dueDateAtTime) ?? l10n.noDueDate;
diff --git a/apps/flutter_parent/test/models/course_test.dart b/apps/flutter_parent/test/models/course_test.dart
index c9af1a4519..ef7b2cdee4 100644
--- a/apps/flutter_parent/test/models/course_test.dart
+++ b/apps/flutter_parent/test/models/course_test.dart
@@ -12,11 +12,11 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import 'package:built_collection/built_collection.dart';
+import 'package:built_value/json_object.dart';
 import 'package:flutter_parent/models/course.dart';
 import 'package:flutter_parent/models/course_grade.dart';
 import 'package:flutter_parent/models/enrollment.dart';
-import 'package:flutter_parent/models/section.dart';
-import 'package:flutter_parent/models/term.dart';
+import 'package:flutter_parent/models/grading_scheme_item.dart';
 import 'package:test/test.dart';
 
 void main() {
@@ -111,4 +111,44 @@ void main() {
       expect(isValid, isFalse);
     });
   });
+
+  group('gradingScheme', () {
+    final gradingSchemeBuilder = ListBuilder<JsonObject>()
+      ..add(JsonObject(["A", 0.9]))
+      ..add(JsonObject(["F", 0.0]));
+
+    final course = _course.rebuild((b) => b..gradingScheme = gradingSchemeBuilder);
+
+    test('returns "F" for 70 percent', () {
+      expect(course.convertScoreToLetterGrade(70, 100), 'F');
+    });
+
+    test('returns "A" for 90 percent', () {
+      expect(course.convertScoreToLetterGrade(90, 100), 'A');
+    });
+
+    test('returns empty if max score is 0', () {
+      expect(course.convertScoreToLetterGrade(10, 0), '');
+    });
+
+    test('returns empty if grading scheme is null or empty', () {
+      final course = _course.rebuild((b) => b..gradingScheme = null);
+      expect(course.convertScoreToLetterGrade(10, 0), '');
+    });
+
+    test('grading scheme mapping filters out incorrect items', () {
+      gradingSchemeBuilder.add(JsonObject(""));
+      gradingSchemeBuilder.add(JsonObject([1, 0.9]));
+      gradingSchemeBuilder.add(JsonObject(["C", "3"]));
+      final course = _course.rebuild((b) => b..gradingScheme = gradingSchemeBuilder);
+      expect(course.gradingSchemeItems, [
+        GradingSchemeItem((b) => b
+          ..grade = "A"
+          ..value = 0.9),
+        GradingSchemeItem((b) => b
+          ..grade = "F"
+          ..value = 0.0),
+      ]);
+    });
+  });
 }
diff --git a/apps/flutter_parent/test/screens/assignments/grade_cell_data_test.dart b/apps/flutter_parent/test/screens/assignments/grade_cell_data_test.dart
index 95f11361fb..32f6503b76 100644
--- a/apps/flutter_parent/test/screens/assignments/grade_cell_data_test.dart
+++ b/apps/flutter_parent/test/screens/assignments/grade_cell_data_test.dart
@@ -12,9 +12,12 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+import 'package:built_collection/built_collection.dart';
+import 'package:built_value/json_object.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_parent/l10n/app_localizations.dart';
 import 'package:flutter_parent/models/assignment.dart';
+import 'package:flutter_parent/models/course.dart';
 import 'package:flutter_parent/models/grade_cell_data.dart';
 import 'package:flutter_parent/models/submission.dart';
 import 'package:flutter_parent/utils/core_extensions/date_time_extensions.dart';
@@ -26,6 +29,7 @@ void main() {
   Assignment baseAssignment;
   Submission baseSubmission;
   GradeCellData baseGradedState;
+  Course baseCourse;
 
   Color accentColor = Colors.pinkAccent;
 
@@ -55,11 +59,20 @@ void main() {
       ..state = GradeCellState.graded
       ..accentColor = accentColor
       ..outOf = 'Out of 100 points');
+
+    final gradingSchemeBuilder = ListBuilder<JsonObject>()
+      ..add(JsonObject(["A", 0.9]))
+      ..add(JsonObject(["F", 0.0]));
+
+    baseCourse = Course((b) => b
+      ..id = '123'
+      ..settings.restrictQuantitativeData = false
+      ..gradingScheme = gradingSchemeBuilder);
   });
 
   test('Returns empty for null submission', () {
     var expected = GradeCellData();
-    var actual = GradeCellData.forSubmission(false, baseAssignment, null, theme, l10n);
+    var actual = GradeCellData.forSubmission(baseCourse, baseAssignment, null, theme, l10n);
     expect(actual, expected);
   });
 
@@ -69,7 +82,7 @@ void main() {
       ..graphPercent = 0.85
       ..score = '85'
       ..showPointsLabel = true);
-    var actual = GradeCellData.forSubmission(false, baseAssignment, submission, theme, l10n);
+    var actual = GradeCellData.forSubmission(baseCourse, baseAssignment, submission, theme, l10n);
     expect(actual, expected);
   });
 
@@ -81,7 +94,7 @@ void main() {
       ..grade = null
       ..score = 0.0);
     var expected = GradeCellData();
-    var actual = GradeCellData.forSubmission(false, baseAssignment, submission, theme, l10n);
+    var actual = GradeCellData.forSubmission(baseCourse, baseAssignment, submission, theme, l10n);
     expect(actual, expected);
   });
 
@@ -97,14 +110,14 @@ void main() {
         l10n.submissionStatusSuccessSubtitle,
         dateFormat: DateFormat.MMMMd(),
       ));
-    var actual = GradeCellData.forSubmission(false, baseAssignment, submission, theme, l10n);
+    var actual = GradeCellData.forSubmission(baseCourse, baseAssignment, submission, theme, l10n);
     expect(actual, expected);
   });
 
   test('Returns Empty state when not submitted and ungraded', () {
     var submission = Submission((b) => b..assignmentId = '1');
     var expected = GradeCellData();
-    var actual = GradeCellData.forSubmission(false, baseAssignment, submission, theme, l10n);
+    var actual = GradeCellData.forSubmission(baseCourse, baseAssignment, submission, theme, l10n);
     expect(actual, expected);
   });
 
@@ -114,7 +127,7 @@ void main() {
       ..graphPercent = 1.0
       ..showCompleteIcon = true
       ..grade = 'Excused');
-    var actual = GradeCellData.forSubmission(false, baseAssignment, submission, theme, l10n);
+    var actual = GradeCellData.forSubmission(baseCourse, baseAssignment, submission, theme, l10n);
     expect(actual, expected);
   });
 
@@ -127,7 +140,7 @@ void main() {
       ..showPointsLabel = true
       ..grade = '85%'
       ..gradeContentDescription = '85%');
-    var actual = GradeCellData.forSubmission(false, assignment, submission, theme, l10n);
+    var actual = GradeCellData.forSubmission(baseCourse, assignment, submission, theme, l10n);
     expect(actual, expected);
   });
 
@@ -138,7 +151,7 @@ void main() {
       ..graphPercent = 1.0
       ..showCompleteIcon = true
       ..grade = 'Complete');
-    var actual = GradeCellData.forSubmission(false, assignment, submission, theme, l10n);
+    var actual = GradeCellData.forSubmission(baseCourse, assignment, submission, theme, l10n);
     expect(actual, expected);
   });
 
@@ -152,7 +165,7 @@ void main() {
       ..graphPercent = 1.0
       ..showIncompleteIcon = true
       ..grade = 'Incomplete');
-    var actual = GradeCellData.forSubmission(false, assignment, submission, theme, l10n);
+    var actual = GradeCellData.forSubmission(baseCourse, assignment, submission, theme, l10n);
     expect(actual, expected);
   });
 
@@ -167,7 +180,7 @@ void main() {
         l10n.submissionStatusSuccessSubtitle,
         dateFormat: DateFormat.MMMMd(),
       ));
-    var actual = GradeCellData.forSubmission(false, assignment, submission, theme, l10n);
+    var actual = GradeCellData.forSubmission(baseCourse, assignment, submission, theme, l10n);
     expect(actual, expected);
   });
 
@@ -176,7 +189,7 @@ void main() {
       ..graphPercent = 0.85
       ..score = '85'
       ..showPointsLabel = true);
-    var actual = GradeCellData.forSubmission(false, baseAssignment, baseSubmission, theme, l10n);
+    var actual = GradeCellData.forSubmission(baseCourse, baseAssignment, baseSubmission, theme, l10n);
     expect(actual, expected);
   });
 
@@ -189,7 +202,7 @@ void main() {
       ..showPointsLabel = true
       ..grade = 'B+'
       ..gradeContentDescription = 'B+');
-    var actual = GradeCellData.forSubmission(false, assignment, submission, theme, l10n);
+    var actual = GradeCellData.forSubmission(baseCourse, assignment, submission, theme, l10n);
     expect(actual, expected);
   });
 
@@ -206,7 +219,7 @@ void main() {
       ..showPointsLabel = true
       ..grade = 'A-'
       ..gradeContentDescription = 'A. minus');
-    var actual = GradeCellData.forSubmission(false, assignment, submission, theme, l10n);
+    var actual = GradeCellData.forSubmission(baseCourse, assignment, submission, theme, l10n);
     expect(actual, expected);
   });
 
@@ -219,7 +232,7 @@ void main() {
       ..showPointsLabel = true
       ..grade = '3.8 GPA'
       ..gradeContentDescription = '3.8 GPA');
-    var actual = GradeCellData.forSubmission(false, assignment, submission, theme, l10n);
+    var actual = GradeCellData.forSubmission(baseCourse, assignment, submission, theme, l10n);
     expect(actual, expected);
   });
 
@@ -227,7 +240,7 @@ void main() {
     var assignment = baseAssignment.rebuild((b) => b..gradingType = GradingType.notGraded);
     var submission = Submission((b) => b..assignmentId = '1');
     var expected = GradeCellData();
-    var actual = GradeCellData.forSubmission(false, assignment, submission, theme, l10n);
+    var actual = GradeCellData.forSubmission(baseCourse, assignment, submission, theme, l10n);
     expect(actual, expected);
   });
 
@@ -242,7 +255,7 @@ void main() {
       ..showPointsLabel = true
       ..latePenalty = 'Late penalty (-6)'
       ..finalGrade = 'Final Grade: 79');
-    var actual = GradeCellData.forSubmission(false, baseAssignment, submission, theme, l10n);
+    var actual = GradeCellData.forSubmission(baseCourse, baseAssignment, submission, theme, l10n);
     expect(actual, expected);
   });
 
@@ -255,7 +268,7 @@ void main() {
       ..showPointsLabel = true
       ..grade = 'B-'
       ..gradeContentDescription = 'B. minus');
-    var actual = GradeCellData.forSubmission(false, assignment, submission, theme, l10n);
+    var actual = GradeCellData.forSubmission(baseCourse, assignment, submission, theme, l10n);
     expect(actual, expected);
   });
 
@@ -272,33 +285,40 @@ void main() {
       ..showPointsLabel = true
       ..grade = 'B'
       ..gradeContentDescription = 'B');
-    var actual = GradeCellData.forSubmission(false, assignment, submission, theme, l10n);
+    var actual = GradeCellData.forSubmission(baseCourse, assignment, submission, theme, l10n);
     expect(actual, expected);
   });
 
-  test('Returns Empty state when quantitative data is restricted and grading type is points and not excused', () {
+  test('Returns Empty state when quantitative data is restricted, grading type is points, grading scheme is null and not excused', () {
+    var course = baseCourse.rebuild((b) => b
+      ..settings.restrictQuantitativeData = true
+      ..gradingScheme = null);
     var assignment = baseAssignment.rebuild((b) => b..gradingType = GradingType.points);
     var submission = Submission((b) => b
       ..assignmentId = '1'
       ..score = 10.0
       ..grade = 'A');
     var expected = GradeCellData();
-    var actual = GradeCellData.forSubmission(true, assignment, submission, theme, l10n);
+    var actual = GradeCellData.forSubmission(course, assignment, submission, theme, l10n);
     expect(actual, expected);
   });
 
-  test('Returns Empty state when quantitative data is restricted and grading type is percent and not excused', () {
+  test('Returns Empty state when quantitative data is restricted, grading type is percent, grading scheme is null and not excused', () {
+    var course = baseCourse.rebuild((b) => b
+      ..settings.restrictQuantitativeData = true
+      ..gradingScheme = null);
     var assignment = baseAssignment.rebuild((b) => b..gradingType = GradingType.percent);
     var submission = Submission((b) => b
       ..assignmentId = '1'
       ..score = 10.0
       ..grade = 'A');
     var expected = GradeCellData();
-    var actual = GradeCellData.forSubmission(true, assignment, submission, theme, l10n);
+    var actual = GradeCellData.forSubmission(course, assignment, submission, theme, l10n);
     expect(actual, expected);
   });
 
   test('Returns correct state when quantitative data is restricted and grading type is percent and excused', () {
+    var course = baseCourse.rebuild((b) => b..settings.restrictQuantitativeData = true);
     var assignment = baseAssignment.rebuild((b) => b..gradingType = GradingType.percent);
     var submission = Submission((b) => b
       ..assignmentId = '1'
@@ -310,11 +330,12 @@ void main() {
       ..grade = l10n.excused
       ..outOf = ''
       ..showCompleteIcon = true);
-    var actual = GradeCellData.forSubmission(true, assignment, submission, theme, l10n);
+    var actual = GradeCellData.forSubmission(course, assignment, submission, theme, l10n);
     expect(actual, expected);
   });
 
   test('Returns correct state when quantitative data is restricted and graded', () {
+    var course = baseCourse.rebuild((b) => b..settings.restrictQuantitativeData = true);
     var assignment = baseAssignment.rebuild((b) => b..gradingType = GradingType.letterGrade);
     var submission = Submission((b) => b
       ..assignmentId = '1'
@@ -326,7 +347,41 @@ void main() {
       ..score = submission.grade
       ..gradeContentDescription = submission.grade
       ..outOf = '');
-    var actual = GradeCellData.forSubmission(true, assignment, submission, theme, l10n);
+    var actual = GradeCellData.forSubmission(course, assignment, submission, theme, l10n);
+    expect(actual, expected);
+  });
+
+  test('Returns correct state when quantitative data is restricted, grading type is percent and grading scheme is given', () {
+    var course = baseCourse.rebuild((b) => b..settings.restrictQuantitativeData = true);
+    var assignment = baseAssignment.rebuild((b) => b..gradingType = GradingType.percent);
+    var submission = Submission((b) => b
+      ..assignmentId = '1'
+      ..score = 10.0
+      ..grade = 'A');
+    var expected = baseGradedState.rebuild((b) => b
+      ..state = GradeCellState.gradedRestrictQuantitativeData
+      ..graphPercent = 1.0
+      ..score = 'F'
+      ..outOf = ''
+      ..gradeContentDescription = 'F');
+    var actual = GradeCellData.forSubmission(course, assignment, submission, theme, l10n);
+    expect(actual, expected);
+  });
+
+  test('Returns correct state when quantitative data is restricted, grading type is point and grading scheme is given', () {
+    var course = baseCourse.rebuild((b) => b..settings.restrictQuantitativeData = true);
+    var assignment = baseAssignment.rebuild((b) => b..gradingType = GradingType.points);
+    var submission = Submission((b) => b
+      ..assignmentId = '1'
+      ..score = 90.0
+      ..grade = 'A');
+    var expected = baseGradedState.rebuild((b) => b
+      ..state = GradeCellState.gradedRestrictQuantitativeData
+      ..graphPercent = 1.0
+      ..score = 'A'
+      ..outOf = ''
+      ..gradeContentDescription = 'A');
+    var actual = GradeCellData.forSubmission(course, assignment, submission, theme, l10n);
     expect(actual, expected);
   });
 }
diff --git a/apps/flutter_parent/test/screens/courses/course_grades_screen_test.dart b/apps/flutter_parent/test/screens/courses/course_grades_screen_test.dart
index 9a8e14d41b..bf2c9aff64 100644
--- a/apps/flutter_parent/test/screens/courses/course_grades_screen_test.dart
+++ b/apps/flutter_parent/test/screens/courses/course_grades_screen_test.dart
@@ -15,6 +15,7 @@
 import 'dart:convert';
 
 import 'package:built_collection/built_collection.dart';
+import 'package:built_value/json_object.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_parent/l10n/app_localizations.dart';
 import 'package:flutter_parent/models/assignment.dart';
@@ -320,6 +321,64 @@ void main() {
     expect(find.text(AppLocalizations().assignmentNotSubmittedLabel), findsOneWidget);
   });
 
+  testWidgetsWithAccessibilityChecks('Shows grade with possible points if not restricted', (tester) async {
+    final grade = 'FFF';
+    final group = _mockAssignmentGroup(assignments: [_mockAssignment(id: '1', pointsPossible: 2.2, submission: _mockSubmission(grade: grade))]);
+    final enrollment = Enrollment((b) => b..enrollmentState = 'active');
+
+    final model = CourseDetailsModel(_student, _courseId);
+    when(interactor.loadAssignmentGroups(_courseId, _studentId, null)).thenAnswer((_) async => [group]);
+    when(interactor.loadGradingPeriods(_courseId))
+        .thenAnswer((_) async => GradingPeriodResponse((b) => b..gradingPeriods = BuiltList.of(List<GradingPeriod>()).toBuilder()));
+    when(interactor.loadEnrollmentsForGradingPeriod(_courseId, _studentId, null)).thenAnswer((_) async => [enrollment]);
+    model.course = _mockCourse();
+
+    await tester.pumpWidget(_testableWidget(model));
+    await tester.pump(); // Build the widget
+    await tester.pump(); // Let the future finish
+
+    expect(find.text('$grade / 2.2'), findsOneWidget);
+  });
+
+  testWidgetsWithAccessibilityChecks('Shows grade without possible points if restricted', (tester) async {
+    final grade = 'FFF';
+    final group = _mockAssignmentGroup(assignments: [_mockAssignment(id: '1', pointsPossible: 2.2, submission: _mockSubmission(grade: grade))]);
+    final enrollment = Enrollment((b) => b..enrollmentState = 'active');
+
+    final model = CourseDetailsModel(_student, _courseId);
+    when(interactor.loadAssignmentGroups(_courseId, _studentId, null)).thenAnswer((_) async => [group]);
+    when(interactor.loadGradingPeriods(_courseId))
+        .thenAnswer((_) async => GradingPeriodResponse((b) => b..gradingPeriods = BuiltList.of(List<GradingPeriod>()).toBuilder()));
+    when(interactor.loadEnrollmentsForGradingPeriod(_courseId, _studentId, null)).thenAnswer((_) async => [enrollment]);
+    model.course = _mockCourse().rebuild((b) => b..settings.restrictQuantitativeData = true);
+
+    await tester.pumpWidget(_testableWidget(model));
+    await tester.pump(); // Build the widget
+    await tester.pump(); // Let the future finish
+
+    expect(find.text('$grade'), findsOneWidget);
+  });
+
+  testWidgetsWithAccessibilityChecks('Shows grade by score and grading scheme if restricted', (tester) async {
+    final group = _mockAssignmentGroup(assignments: [
+      _mockAssignment(id: '1', pointsPossible: 10, gradingType: GradingType.points, submission: _mockSubmission(grade: '', score: 1.0))
+    ]);
+    final enrollment = Enrollment((b) => b..enrollmentState = 'active');
+
+    final model = CourseDetailsModel(_student, _courseId);
+    when(interactor.loadAssignmentGroups(_courseId, _studentId, null)).thenAnswer((_) async => [group]);
+    when(interactor.loadGradingPeriods(_courseId))
+        .thenAnswer((_) async => GradingPeriodResponse((b) => b..gradingPeriods = BuiltList.of(List<GradingPeriod>()).toBuilder()));
+    when(interactor.loadEnrollmentsForGradingPeriod(_courseId, _studentId, null)).thenAnswer((_) async => [enrollment]);
+    model.course = _mockCourse().rebuild((b) => b..settings.restrictQuantitativeData = true);
+
+    await tester.pumpWidget(_testableWidget(model));
+    await tester.pump(); // Build the widget
+    await tester.pump(); // Let the future finish
+
+    expect(find.text('F'), findsOneWidget);
+  });
+
   group('CourseGradeHeader', () {
     testWidgetsWithAccessibilityChecks('from current score, max 2 digits', (tester) async {
       final groups = [
@@ -700,6 +759,10 @@ void main() {
   });
 }
 
+final _gradingSchemeBuilder = ListBuilder<JsonObject>()
+  ..add(JsonObject(["A", 0.9]))
+  ..add(JsonObject(["F", 0.0]));
+
 Course _mockCourse() {
   return Course((b) => b
     ..id = _courseId
@@ -709,7 +772,8 @@ Course _mockCourse() {
         ..userId = _studentId
         ..courseId = _courseId
         ..enrollmentState = 'active')
-    ]).toBuilder());
+    ]).toBuilder()
+    ..gradingScheme = _gradingSchemeBuilder);
 }
 
 GradeBuilder _mockGrade({double currentScore, double finalScore, String currentGrade, String finalGrade}) {
@@ -739,6 +803,7 @@ Assignment _mockAssignment({
   Submission submission,
   DateTime dueAt,
   double pointsPossible = 0,
+  GradingType gradingType
 }) {
   return Assignment((b) => b
     ..id = id
@@ -747,26 +812,27 @@ Assignment _mockAssignment({
     ..assignmentGroupId = groupId
     ..position = int.parse(id)
     ..dueAt = dueAt
-    ..submissionWrapper = SubmissionWrapper(
-            (b) => b..submissionList = BuiltList<Submission>.from(submission != null ? [submission] : []).toBuilder())
-        .toBuilder()
+    ..submissionWrapper =
+        SubmissionWrapper((b) => b..submissionList = BuiltList<Submission>.from(submission != null ? [submission] : []).toBuilder()).toBuilder()
     ..pointsPossible = pointsPossible
-    ..published = true);
+    ..published = true
+    ..gradingType = gradingType);
 }
 
-Submission _mockSubmission({String assignmentId = '', String grade, bool isLate, DateTime submittedAt}) {
+Submission _mockSubmission({String assignmentId = '', String grade, bool isLate, DateTime submittedAt, double score}) {
   return Submission((b) => b
     ..userId = _studentId
     ..assignmentId = assignmentId
     ..grade = grade
     ..submittedAt = submittedAt
-    ..isLate = isLate ?? false);
+    ..isLate = isLate ?? false
+    ..score = score ?? 0);
 }
 
 Widget _testableWidget(CourseDetailsModel model, {PlatformConfig platformConfig = const PlatformConfig()}) {
   return TestApp(
     Scaffold(
-      body: ChangeNotifierProvider<CourseDetailsModel>.value(value: model, child: CourseGradesScreen(false)),
+      body: ChangeNotifierProvider<CourseDetailsModel>.value(value: model, child: CourseGradesScreen()),
     ),
     platformConfig: platformConfig,
   );

From 96732427d1b65a2b2dfdaecf6782fd866ef64f10 Mon Sep 17 00:00:00 2001
From: Tamas Kozmer <72397075+tamaskozmer@users.noreply.github.com>
Date: Tue, 29 Aug 2023 11:36:00 +0200
Subject: [PATCH 17/22] [MBL-16995][Student] Score to letter grade conversion
 (#2121)

refs: MBL-16995
affects: Student
release note: Added letter grade conversion when quantitative data is restricted.

* Grades screen.

* Assignment list.

* Assignment details.

* Notifications widget.

* Notifications.

* Error handling and unit tests.

* Fixed pact test.

* Integration tests.

* Unit tests.

* Removed unused value.

* Removed unused import.
---
 .../AssignmentDetailsInteractionTest.kt       |  19 ++-
 .../AssignmentListInteractionTest.kt          |  17 ++-
 .../CourseGradesInteractionTest.kt            |  21 +++-
 .../NotificationInteractionTest.kt            |  27 ++--
 .../student/ui/pages/AssignmentListPage.kt    |   6 -
 .../student/ui/pages/CourseGradesPage.kt      |   6 -
 .../adapter/GradesListRecyclerAdapter.kt      |  15 ++-
 .../NotificationListRecyclerAdapter.kt        |   4 +-
 .../AssignmentListRecyclerAdapter.kt          |  23 ++--
 .../AssignmentDetailsViewModel.kt             |   8 +-
 .../gradecellview/GradeCellViewData.kt        |  19 ++-
 .../student/fragment/GradesListFragment.kt    |  24 ++--
 .../student/holders/AssignmentViewHolder.kt   |   8 +-
 .../student/holders/GradeViewHolder.kt        |   8 +-
 .../student/holders/NotificationViewHolder.kt |  21 ++--
 .../instructure/student/util/BinderUtils.kt   |  17 ++-
 .../student/widget/GradesViewWidgetService.kt |   2 +-
 .../widget/NotificationViewWidgetService.kt   |   9 +-
 .../student/widget/TodoViewWidgetService.kt   |   3 +-
 .../gradecellview/GradeCellViewDataTest.kt    |  22 +++-
 .../instructure/canvasapi2/apis/CourseAPI.kt  |  15 ++-
 .../canvasapi2/managers/CourseManager.kt      |  23 +++-
 .../instructure/canvasapi2/models/Course.kt   |  16 ++-
 .../canvasapi2/models/GradingSchemeRow.kt     |  19 +++
 .../canvasapi2/models/StreamItem.kt           |  17 ++-
 .../canvasapi2/utils/ModelExtensions.kt       |  12 ++
 .../pact/canvas/apis/CoursesApiPactTests.kt   |   2 +-
 .../instructure/canvasapi2/unit/CourseTest.kt |  19 +++
 .../canvasapi2/utils/ModelExtensionsTest.kt   | 117 ++++++++++++++++++
 29 files changed, 404 insertions(+), 115 deletions(-)
 create mode 100644 libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/GradingSchemeRow.kt
 create mode 100644 libs/canvas-api-2/src/test/java/com/instructure/canvasapi2/utils/ModelExtensionsTest.kt

diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/AssignmentDetailsInteractionTest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/AssignmentDetailsInteractionTest.kt
index 8be34b0815..b78a0e9db0 100644
--- a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/AssignmentDetailsInteractionTest.kt
+++ b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/AssignmentDetailsInteractionTest.kt
@@ -301,11 +301,11 @@ class AssignmentDetailsInteractionTest : StudentTest() {
     @TestMetaData(Priority.IMPORTANT, FeatureCategory.ASSIGNMENTS, TestCategory.INTERACTION, false)
     fun testPointsAssignmentWithQuantitativeRestriction() {
         setUpData(restrictQuantitativeData = true)
-        val assignment = addAssignment(MockCanvas.data, Assignment.GradingType.POINTS, "90", 90.0, 100)
+        val assignment = addAssignment(MockCanvas.data, Assignment.GradingType.POINTS, "65", 65.0, 100)
         goToAssignmentList()
         assignmentListPage.clickAssignment(assignment)
 
-        assignmentDetailsPage.assertGradeNotDisplayed()
+        assignmentDetailsPage.assertGradeDisplayed("D")
         assignmentDetailsPage.assertOutOfTextNotDisplayed()
         assignmentDetailsPage.assertScoreNotDisplayed()
     }
@@ -327,11 +327,11 @@ class AssignmentDetailsInteractionTest : StudentTest() {
     @TestMetaData(Priority.IMPORTANT, FeatureCategory.ASSIGNMENTS, TestCategory.INTERACTION, false)
     fun testPercentageAssignmentWithQuantitativeRestriction() {
         setUpData(restrictQuantitativeData = true)
-        val assignment = addAssignment(MockCanvas.data, Assignment.GradingType.PERCENT, "90%", 90.0, 100)
+        val assignment = addAssignment(MockCanvas.data, Assignment.GradingType.PERCENT, "70%", 70.0, 100)
         goToAssignmentList()
         assignmentListPage.clickAssignment(assignment)
 
-        assignmentDetailsPage.assertGradeNotDisplayed()
+        assignmentDetailsPage.assertGradeDisplayed("C")
         assignmentDetailsPage.assertOutOfTextNotDisplayed()
         assignmentDetailsPage.assertScoreNotDisplayed()
     }
@@ -358,8 +358,17 @@ class AssignmentDetailsInteractionTest : StudentTest() {
 
         val course = data.courses.values.first()
 
+        val gradingScheme = listOf(
+            listOf("A", 0.9),
+            listOf("B", 0.8),
+            listOf("C", 0.7),
+            listOf("D", 0.6),
+            listOf("F", 0.0)
+        )
+
         val newCourse = course
-            .copy(settings = CourseSettings(restrictQuantitativeData = restrictQuantitativeData))
+            .copy(settings = CourseSettings(restrictQuantitativeData = restrictQuantitativeData),
+                gradingSchemeRaw = gradingScheme)
         data.courses[course.id] = newCourse
 
         data.addAssignmentsToGroups(newCourse)
diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/AssignmentListInteractionTest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/AssignmentListInteractionTest.kt
index 8564fc53ed..b7c95d29ae 100644
--- a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/AssignmentListInteractionTest.kt
+++ b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/AssignmentListInteractionTest.kt
@@ -165,7 +165,7 @@ class AssignmentListInteractionTest : StudentTest() {
         val assignment = addAssignment(MockCanvas.data, Assignment.GradingType.POINTS, "90", 90.0, 100)
         goToAssignmentsPage()
 
-        assignmentListPage.assertAssignmentDisplayedWithoutGrade(assignment.name!!)
+        assignmentListPage.assertAssignmentDisplayedWithGrade(assignment.name!!, "A")
     }
 
     @Test
@@ -182,10 +182,10 @@ class AssignmentListInteractionTest : StudentTest() {
     @TestMetaData(Priority.IMPORTANT, FeatureCategory.ASSIGNMENTS, TestCategory.INTERACTION, false)
     fun testPercentageAssignmentWithQuantitativeRestriction() {
         setUpData(restrictQuantitativeData = true)
-        val assignment = addAssignment(MockCanvas.data, Assignment.GradingType.PERCENT, "90%", 90.0, 100)
+        val assignment = addAssignment(MockCanvas.data, Assignment.GradingType.PERCENT, "80%", 80.0, 100)
         goToAssignmentsPage()
 
-        assignmentListPage.assertAssignmentDisplayedWithoutGrade(assignment.name!!)
+        assignmentListPage.assertAssignmentDisplayedWithGrade(assignment.name!!, "B")
     }
 
     @Test
@@ -208,8 +208,17 @@ class AssignmentListInteractionTest : StudentTest() {
 
         val course = data.courses.values.first()
 
+        val gradingScheme = listOf(
+            listOf("A", 0.9),
+            listOf("B", 0.8),
+            listOf("C", 0.7),
+            listOf("D", 0.6),
+            listOf("F", 0.0)
+        )
+
         val newCourse = course
-            .copy(settings = CourseSettings(restrictQuantitativeData = restrictQuantitativeData))
+            .copy(settings = CourseSettings(restrictQuantitativeData = restrictQuantitativeData),
+                gradingSchemeRaw = gradingScheme)
         data.courses[course.id] = newCourse
 
         val assignmentList = mutableListOf<Assignment>()
diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/CourseGradesInteractionTest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/CourseGradesInteractionTest.kt
index 8471280aa4..ec8a032701 100644
--- a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/CourseGradesInteractionTest.kt
+++ b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/CourseGradesInteractionTest.kt
@@ -70,11 +70,11 @@ class CourseGradesInteractionTest : StudentTest() {
 
     @Test
     @TestMetaData(Priority.IMPORTANT, FeatureCategory.GRADES, TestCategory.INTERACTION, false)
-    fun testNAIsDisplayedWithOnlyScoreWhenRestrictedAndThereIsNoGrade() {
+    fun testConvertedGradeIsDisplayedWithOnlyScoreWhenRestrictedAndThereIsNoGrade() {
         val data = setUpData(courseCount = 1, favoriteCourseCount = 1)
         setUpCustomGrade(score = 100.0, data = data, restrictQuantitativeData = true)
         goToGrades(data)
-        courseGradesPage.assertTotalGrade(ViewMatchers.withText(courseGradesPage.getStringFromResource(R.string.noGradeText)))
+        courseGradesPage.assertTotalGrade(ViewMatchers.withText("A"))
     }
 
     @Test
@@ -182,7 +182,7 @@ class CourseGradesInteractionTest : StudentTest() {
 
         goToGrades(data)
 
-        courseGradesPage.assertAssignmentDisplayedWithoutGrade(assignment.name!!)
+        courseGradesPage.assertAssignmentDisplayed(assignment.name!!, "A")
     }
 
     @Test
@@ -202,11 +202,11 @@ class CourseGradesInteractionTest : StudentTest() {
     fun testPercentageAssignmentWithQuantitativeRestriction() {
         val data = setUpData(courseCount = 1, favoriteCourseCount = 1)
         setUpCustomGrade(score = 100.0, data = data, restrictQuantitativeData = true)
-        val assignment = addAssignment(data, Assignment.GradingType.PERCENT, "90%", 90.0, 100)
+        val assignment = addAssignment(data, Assignment.GradingType.PERCENT, "80%", 80.0, 100)
 
         goToGrades(data)
 
-        courseGradesPage.assertAssignmentDisplayedWithoutGrade(assignment.name!!)
+        courseGradesPage.assertAssignmentDisplayed(assignment.name!!, "B")
     }
 
     @Test
@@ -281,9 +281,18 @@ class CourseGradesInteractionTest : StudentTest() {
                 computedCurrentScore = score
             )
 
+        val gradingScheme = listOf(
+            listOf("A", 0.9),
+            listOf("B", 0.8),
+            listOf("C", 0.7),
+            listOf("D", 0.6),
+            listOf("F", 0.0)
+        )
+
         val newCourse = course
             .copy(settings = CourseSettings(restrictQuantitativeData = restrictQuantitativeData),
-                enrollments = mutableListOf(enrollment))
+                enrollments = mutableListOf(enrollment),
+                gradingSchemeRaw = gradingScheme)
         data.courses[course.id] = newCourse
     }
 }
\ No newline at end of file
diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/NotificationInteractionTest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/NotificationInteractionTest.kt
index 67523c82c9..3a28429766 100644
--- a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/NotificationInteractionTest.kt
+++ b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/NotificationInteractionTest.kt
@@ -132,23 +132,23 @@ class NotificationInteractionTest : StudentTest() {
     @Test
     @TestMetaData(Priority.MANDATORY, FeatureCategory.NOTIFICATIONS, TestCategory.INTERACTION, false)
     fun testNotificationList_showGradeUpdatedIfRestricted_points() {
-        val grade = "10.0"
+        val grade = "15.0"
         val data = goToNotifications(
             restrictQuantitativeData = true,
             gradingType = Assignment.GradingType.POINTS,
-            score = 10.0,
+            score = 15.0,
             grade = grade
         )
 
         val assignment = data.assignments.values.first()
 
-        notificationPage.assertGradeUpdated(assignment.name!!)
+        notificationPage.assertHasGrade(assignment.name!!, "C")
     }
 
     @Test
     @TestMetaData(Priority.MANDATORY, FeatureCategory.NOTIFICATIONS, TestCategory.INTERACTION, false)
-    fun testNotificationList_showGradeUpdatedIfRestricted_percent() {
-        val grade = "10%"
+    fun testNotificationList_convertGradeIfRestricted_percent() {
+        val grade = "50%"
         val data = goToNotifications(
             restrictQuantitativeData = true,
             gradingType = Assignment.GradingType.PERCENT,
@@ -158,7 +158,7 @@ class NotificationInteractionTest : StudentTest() {
 
         val assignment = data.assignments.values.first()
 
-        notificationPage.assertGradeUpdated(assignment.name!!)
+        notificationPage.assertHasGrade(assignment.name!!, "F")
     }
 
     @Test
@@ -236,13 +236,24 @@ class NotificationInteractionTest : StudentTest() {
         val course = data.courses.values.first()
         val student = data.students.first()
 
-        data.courses[course.id] = course.copy(settings = CourseSettings(restrictQuantitativeData = restrictQuantitativeData))
+        val gradingScheme = listOf(
+            listOf("A", 0.9),
+            listOf("B", 0.8),
+            listOf("C", 0.7),
+            listOf("D", 0.6),
+            listOf("F", 0.0)
+        )
+
+        data.courses[course.id] = course.copy(
+            settings = CourseSettings(restrictQuantitativeData = restrictQuantitativeData),
+            gradingSchemeRaw = gradingScheme)
 
         repeat(numSubmissions) {
             val assignment = data.addAssignment(
                 courseId = course.id,
                 submissionType = Assignment.SubmissionType.ONLINE_TEXT_ENTRY,
-                gradingType = Assignment.gradingTypeToAPIString(gradingType).orEmpty()
+                gradingType = Assignment.gradingTypeToAPIString(gradingType).orEmpty(),
+                pointsPossible = 20
             )
 
             val submission = data.addSubmissionForAssignment(
diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/pages/AssignmentListPage.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/pages/AssignmentListPage.kt
index 6244425c93..85f9267b41 100644
--- a/apps/student/src/androidTest/java/com/instructure/student/ui/pages/AssignmentListPage.kt
+++ b/apps/student/src/androidTest/java/com/instructure/student/ui/pages/AssignmentListPage.kt
@@ -98,12 +98,6 @@ class AssignmentListPage(val searchable: Searchable) : BasePage(pageResId = R.id
         onView(withId(R.id.points) + withParent(hasSibling(pointsMatcher))).assertHasText(gradeString)
     }
 
-    fun assertAssignmentDisplayedWithoutGrade(assignmentName: String) {
-        onView(withId(R.id.title) + withParent(R.id.textContainer) + withText(assignmentName)).assertDisplayed()
-        val pointsMatcher = withId(R.id.title) + withText(assignmentName)
-        onView(withId(R.id.points) + withParent(hasSibling(pointsMatcher))).assertNotDisplayed()
-    }
-
     fun assertAssignmentNotDisplayed(assignmentName: String) {
         onView(withText(assignmentName) + withId(R.id.title) + hasSibling(withId(R.id.description))).check(doesNotExist())
     }
diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/pages/CourseGradesPage.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/pages/CourseGradesPage.kt
index 4fcb1ef161..3261c98c36 100644
--- a/apps/student/src/androidTest/java/com/instructure/student/ui/pages/CourseGradesPage.kt
+++ b/apps/student/src/androidTest/java/com/instructure/student/ui/pages/CourseGradesPage.kt
@@ -87,12 +87,6 @@ class CourseGradesPage : BasePage(R.id.courseGradesPage) {
         onView(withId(R.id.points) + hasSibling(siblingMatcher)).assertHasText(gradeString)
     }
 
-    fun assertAssignmentDisplayedWithoutGrade(name: String) {
-        onView(withId(R.id.title) + withParent(R.id.textContainer)).assertHasText(name)
-        val siblingMatcher = withId(R.id.title) + withText(name)
-        onView(withId(R.id.points) + hasSibling(siblingMatcher)).assertNotDisplayed()
-    }
-
     // Hopefully this will be sufficient.  We may need to add some logic to scroll
     // to the top of the list first.  We have to use the custom constraints because the
     // swipeRefreshLayout may extend below the screen, and therefore may not be 90% visible.
diff --git a/apps/student/src/main/java/com/instructure/student/adapter/GradesListRecyclerAdapter.kt b/apps/student/src/main/java/com/instructure/student/adapter/GradesListRecyclerAdapter.kt
index 3f6173c2f7..9dca6b4615 100644
--- a/apps/student/src/main/java/com/instructure/student/adapter/GradesListRecyclerAdapter.kt
+++ b/apps/student/src/main/java/com/instructure/student/adapter/GradesListRecyclerAdapter.kt
@@ -34,6 +34,7 @@ import com.instructure.canvasapi2.models.CourseGrade
 import com.instructure.canvasapi2.models.Enrollment
 import com.instructure.canvasapi2.models.GradingPeriod
 import com.instructure.canvasapi2.models.GradingPeriodResponse
+import com.instructure.canvasapi2.models.GradingSchemeRow
 import com.instructure.canvasapi2.models.Submission
 import com.instructure.canvasapi2.utils.ApiPrefs
 import com.instructure.canvasapi2.utils.isNullOrEmpty
@@ -90,7 +91,7 @@ open class GradesListRecyclerAdapter(
 
     interface AdapterToGradesCallback {
         val isEdit: Boolean
-        fun notifyGradeChanged(courseGrade: CourseGrade?, restrictQuantitativeData: Boolean)
+        fun notifyGradeChanged(courseGrade: CourseGrade?, restrictQuantitativeData: Boolean, gradingScheme: List<GradingSchemeRow>)
         fun setTermSpinnerState(isEnabled: Boolean)
         fun setIsWhatIfGrading(isWhatIfGrading: Boolean)
     }
@@ -206,7 +207,7 @@ open class GradesListRecyclerAdapter(
                             course.enrollments = mutableListOf(it)
                             courseGrade = course.getCourseGradeFromEnrollment(it, false)
                             val restrictQuantitativeData = course.settings?.restrictQuantitativeData ?: false
-                            adapterToGradesCallback?.notifyGradeChanged(courseGrade, restrictQuantitativeData)
+                            adapterToGradesCallback?.notifyGradeChanged(courseGrade, restrictQuantitativeData, course.gradingScheme)
                         }
                     }
             } catch (e: CancellationException) {
@@ -274,7 +275,7 @@ open class GradesListRecyclerAdapter(
                 val course = canvasContext as Course?
                 courseGrade = course!!.getCourseGradeForGradingPeriodSpecificEnrollment(enrollment = enrollment)
                 val restrictQuantitativeData = course.settings?.restrictQuantitativeData ?: false
-                adapterToGradesCallback?.notifyGradeChanged(courseGrade, restrictQuantitativeData)
+                adapterToGradesCallback?.notifyGradeChanged(courseGrade, restrictQuantitativeData, course.gradingScheme)
                 // We need to update the course that the fragment is using
                 course.addEnrollment(enrollment)
             }
@@ -283,9 +284,11 @@ open class GradesListRecyclerAdapter(
 
     private fun updateCourseGrade() {
         // All grading periods and no grading periods are the same case
-        courseGrade = (canvasContext as Course).getCourseGrade(true)
-        val restrictQuantitativeData = (canvasContext as Course).settings?.restrictQuantitativeData ?: false
-        adapterToGradesCallback?.notifyGradeChanged(courseGrade, restrictQuantitativeData)
+        val course = canvasContext as? Course
+        courseGrade = course?.getCourseGrade(true)
+        val restrictQuantitativeData = course?.settings?.restrictQuantitativeData ?: false
+        val gradingScheme = course?.gradingScheme ?: emptyList()
+        adapterToGradesCallback?.notifyGradeChanged(courseGrade, restrictQuantitativeData, gradingScheme)
     }
 
     private fun updateWithAllAssignments(forceNetwork: Boolean) {
diff --git a/apps/student/src/main/java/com/instructure/student/adapter/NotificationListRecyclerAdapter.kt b/apps/student/src/main/java/com/instructure/student/adapter/NotificationListRecyclerAdapter.kt
index ff1cf533e7..8b09f7f7b5 100644
--- a/apps/student/src/main/java/com/instructure/student/adapter/NotificationListRecyclerAdapter.kt
+++ b/apps/student/src/main/java/com/instructure/student/adapter/NotificationListRecyclerAdapter.kt
@@ -21,7 +21,7 @@ import android.view.View
 import androidx.recyclerview.widget.RecyclerView
 import com.instructure.canvasapi2.StatusCallback
 import com.instructure.canvasapi2.managers.CourseManager.createCourseMap
-import com.instructure.canvasapi2.managers.CourseManager.getCourses
+import com.instructure.canvasapi2.managers.CourseManager.getCoursesWithGradingScheme
 import com.instructure.canvasapi2.managers.GroupManager.createGroupMap
 import com.instructure.canvasapi2.managers.GroupManager.getAllGroups
 import com.instructure.canvasapi2.managers.InboxManager.getConversation
@@ -112,7 +112,7 @@ class NotificationListRecyclerAdapter(
     override val isPaginated get() = true
 
     override fun loadFirstPage() {
-        getCourses(true, coursesCallback)
+        getCoursesWithGradingScheme(true, coursesCallback)
         getAllGroups(groupsCallback, true)
         if (canvasContext.type == CanvasContext.Type.USER) {
             getUserStream(streamCallback, true)
diff --git a/apps/student/src/main/java/com/instructure/student/adapter/assignment/AssignmentListRecyclerAdapter.kt b/apps/student/src/main/java/com/instructure/student/adapter/assignment/AssignmentListRecyclerAdapter.kt
index 0a39eb61f4..ff503444bc 100644
--- a/apps/student/src/main/java/com/instructure/student/adapter/assignment/AssignmentListRecyclerAdapter.kt
+++ b/apps/student/src/main/java/com/instructure/student/adapter/assignment/AssignmentListRecyclerAdapter.kt
@@ -58,9 +58,10 @@ abstract class AssignmentListRecyclerAdapter (
     private var assignmentGroupCallback: StatusCallback<List<AssignmentGroup>>? = null
     override var currentGradingPeriod: GradingPeriod? = null
     private var apiJob: WeaveJob? = null
-    private var settingsJob: WeaveJob? = null
+    private var courseJob: WeaveJob? = null
     protected var assignmentGroups: List<AssignmentGroup> = emptyList()
     private var restrictQuantitativeData = false
+    private var gradingSchemes = listOf<GradingSchemeRow>()
 
     var filter: AssignmentListFilter = AssignmentListFilter.ALL
     set(value) {
@@ -132,17 +133,13 @@ abstract class AssignmentListRecyclerAdapter (
             if changes are made here, check if they are needed in the other recycler adapters.*/
         val course = canvasContext as Course
 
-        if (course.settings != null && !isRefresh) {
-            restrictQuantitativeData = course.settings?.restrictQuantitativeData ?: false
+        courseJob = tryWeave {
+            val detailedCourse = CourseManager.getCourseWithGradeAsync(canvasContext.id, isRefresh).await().dataOrNull
+            restrictQuantitativeData = detailedCourse?.settings?.restrictQuantitativeData ?: false
+            gradingSchemes = detailedCourse?.gradingScheme ?: emptyList()
+            loadAssignmentsData(course)
+        } catch {
             loadAssignmentsData(course)
-        } else {
-            settingsJob = tryWeave {
-                val settings = CourseManager.getCourseSettingsAsync(canvasContext.id, isRefresh).await().dataOrNull
-                restrictQuantitativeData = settings?.restrictQuantitativeData ?: false
-                loadAssignmentsData(course)
-            } catch {
-                loadAssignmentsData(course)
-            }
         }
     }
 
@@ -202,7 +199,7 @@ abstract class AssignmentListRecyclerAdapter (
             assignmentGroup: AssignmentGroup,
             assignment: Assignment
     ) {
-        (holder as AssignmentViewHolder).bind(context, assignment, canvasContext.backgroundColor, adapterToAssignmentsCallback, restrictQuantitativeData)
+        (holder as AssignmentViewHolder).bind(context, assignment, canvasContext.backgroundColor, adapterToAssignmentsCallback, restrictQuantitativeData, gradingSchemes)
     }
 
     override fun onBindEmptyHolder(holder: RecyclerView.ViewHolder, assignmentGroup: AssignmentGroup) {
@@ -260,7 +257,7 @@ abstract class AssignmentListRecyclerAdapter (
     override fun cancel() {
         super.cancel()
         apiJob?.cancel()
-        settingsJob?.cancel()
+        courseJob?.cancel()
     }
 }
 
diff --git a/apps/student/src/main/java/com/instructure/student/features/assignmentdetails/AssignmentDetailsViewModel.kt b/apps/student/src/main/java/com/instructure/student/features/assignmentdetails/AssignmentDetailsViewModel.kt
index 1155fdcead..f9c07cd306 100644
--- a/apps/student/src/main/java/com/instructure/student/features/assignmentdetails/AssignmentDetailsViewModel.kt
+++ b/apps/student/src/main/java/com/instructure/student/features/assignmentdetails/AssignmentDetailsViewModel.kt
@@ -92,6 +92,7 @@ class AssignmentDetailsViewModel @Inject constructor(
     private var dbSubmission: DatabaseSubmission? = null
     private var isUploading = false
     private var restrictQuantitativeData = false
+    private var gradingScheme = emptyList<GradingSchemeRow>()
 
     var assignment: Assignment? = null
         private set
@@ -165,6 +166,7 @@ class AssignmentDetailsViewModel @Inject constructor(
             try {
                 val courseResult = courseManager.getCourseWithGradeAsync(course?.id.orDefault(), forceNetwork).await().dataOrThrow
                 restrictQuantitativeData = courseResult.settings?.restrictQuantitativeData ?: false
+                gradingScheme = courseResult.gradingScheme
 
                 isObserver = courseResult.enrollments?.firstOrNull { it.isObserver } != null
 
@@ -441,7 +443,8 @@ class AssignmentDetailsViewModel @Inject constructor(
                 colorKeeper.getOrGenerateColor(course),
                 assignment,
                 assignment.submission,
-                restrictQuantitativeData
+                restrictQuantitativeData,
+                gradingScheme = gradingScheme
             ),
             dueDate = due,
             submissionTypes = submissionTypes,
@@ -475,7 +478,8 @@ class AssignmentDetailsViewModel @Inject constructor(
             selectedSubmission,
             restrictQuantitativeData,
             attempt?.isUploading.orDefault(),
-            attempt?.isFailed.orDefault()
+            attempt?.isFailed.orDefault(),
+            gradingScheme
         )
         _data.value?.notifyPropertyChanged(BR.selectedGradeCellViewData)
     }
diff --git a/apps/student/src/main/java/com/instructure/student/features/assignmentdetails/gradecellview/GradeCellViewData.kt b/apps/student/src/main/java/com/instructure/student/features/assignmentdetails/gradecellview/GradeCellViewData.kt
index 6a0bc2a4c4..38d67e8b48 100644
--- a/apps/student/src/main/java/com/instructure/student/features/assignmentdetails/gradecellview/GradeCellViewData.kt
+++ b/apps/student/src/main/java/com/instructure/student/features/assignmentdetails/gradecellview/GradeCellViewData.kt
@@ -3,8 +3,10 @@ package com.instructure.student.features.assignmentdetails.gradecellview
 import android.content.res.Resources
 import androidx.core.graphics.ColorUtils
 import com.instructure.canvasapi2.models.Assignment
+import com.instructure.canvasapi2.models.GradingSchemeRow
 import com.instructure.canvasapi2.models.Submission
 import com.instructure.canvasapi2.utils.NumberHelper
+import com.instructure.canvasapi2.utils.convertScoreToLetterGrade
 import com.instructure.pandautils.utils.ThemedColor
 import com.instructure.pandautils.utils.getContentDescriptionForMinusGradeString
 import com.instructure.pandautils.utils.orDefault
@@ -45,9 +47,10 @@ data class GradeCellViewData(
             submission: Submission?,
             restrictQuantitativeData: Boolean = false,
             uploading: Boolean = false,
-            failed: Boolean = false
+            failed: Boolean = false,
+            gradingScheme: List<GradingSchemeRow> = emptyList()
         ): GradeCellViewData {
-            val hideGrades = restrictQuantitativeData && assignment?.isGradingTypeQuantitative == true && submission?.excused != true
+            val hideGrades = restrictQuantitativeData && assignment?.isGradingTypeQuantitative == true && submission?.excused != true && gradingScheme.isEmpty()
             val emptyGradeCell = assignment == null
                 || submission == null
                 || (submission.submittedAt == null && !submission.isGraded)
@@ -74,7 +77,7 @@ data class GradeCellViewData(
                         resources.getString(R.string.submissionStatusSuccessSubtitle)
                     )
                 )
-                else -> createGradedViewData(resources, courseColor, assignment!!, submission, restrictQuantitativeData)
+                else -> createGradedViewData(resources, courseColor, assignment!!, submission, restrictQuantitativeData, gradingScheme)
             }
         }
 
@@ -83,7 +86,8 @@ data class GradeCellViewData(
             courseColor: ThemedColor,
             assignment: Assignment,
             submission: Submission,
-            restrictQuantitativeData: Boolean
+            restrictQuantitativeData: Boolean,
+            gradingScheme: List<GradingSchemeRow>
         ): GradeCellViewData {
             val pointsPossibleText = NumberHelper.formatDecimal(assignment.pointsPossible, 2, true)
             val outOfText = if (restrictQuantitativeData) "" else resources.getString(R.string.outOfPointsAbbreviatedFormatted, pointsPossibleText)
@@ -121,8 +125,11 @@ data class GradeCellViewData(
                     )
                 )
             } else if (restrictQuantitativeData) {
-                // We can only reach this branch when the grading type is GPA or letter grade, so don't need to handle any other case
-                val grade = submission.grade ?: ""
+                val grade = if (assignment.isGradingTypeQuantitative) {
+                    convertScoreToLetterGrade(submission.score, assignment.pointsPossible, gradingScheme)
+                } else {
+                    submission.grade ?: ""
+                }
                 val accessibleGradeString = getContentDescriptionForMinusGradeString(grade, resources)
                 val contentDescription = resources.getString(
                     R.string.a11y_gradeCellContentDescriptionLetterGradeOnly,
diff --git a/apps/student/src/main/java/com/instructure/student/fragment/GradesListFragment.kt b/apps/student/src/main/java/com/instructure/student/fragment/GradesListFragment.kt
index c8b4771c17..bf7008a265 100644
--- a/apps/student/src/main/java/com/instructure/student/fragment/GradesListFragment.kt
+++ b/apps/student/src/main/java/com/instructure/student/fragment/GradesListFragment.kt
@@ -67,6 +67,7 @@ class GradesListFragment : ParentFragment(), Bookmarkable {
 
     private var isWhatIfGrading = false
     private var restrictQuantitativeData = false
+    private var gradingScheme = emptyList<GradingSchemeRow>()
 
     private lateinit var allTermsGradingPeriod: GradingPeriod
     private lateinit var recyclerAdapter: GradesListRecyclerAdapter
@@ -157,8 +158,7 @@ class GradesListFragment : ParentFragment(), Bookmarkable {
             } else {
                 val gradeString = getGradeString(
                     recyclerAdapter.courseGrade,
-                    !isChecked,
-                    restrictQuantitativeData
+                    !isChecked
                 )
                 txtOverallGrade.text = gradeString
                 txtOverallGrade.contentDescription = getContentDescriptionForMinusGradeString(gradeString, requireContext())
@@ -210,11 +210,12 @@ class GradesListFragment : ParentFragment(), Bookmarkable {
             }
         }
 
-        override fun notifyGradeChanged(courseGrade: CourseGrade?, restrictQuantitativeData: Boolean) {
+        override fun notifyGradeChanged(courseGrade: CourseGrade?, restrictQuantitativeData: Boolean, gradingScheme: List<GradingSchemeRow>) {
             Logger.d("Logging for Grades E2E, current total grade is: ${binding.txtOverallGrade.text}")
             if (!isAdded) return
-            val gradeString = getGradeString(courseGrade, !binding.showTotalCheckBox.isChecked, restrictQuantitativeData)
             this@GradesListFragment.restrictQuantitativeData = restrictQuantitativeData
+            this@GradesListFragment.gradingScheme = gradingScheme
+            val gradeString = getGradeString(courseGrade, !binding.showTotalCheckBox.isChecked)
             Logger.d("Logging for Grades E2E, new total grade is: $gradeString")
             binding.txtOverallGrade.text = gradeString
             binding.txtOverallGrade.contentDescription = getContentDescriptionForMinusGradeString(gradeString, requireContext())
@@ -302,23 +303,26 @@ class GradesListFragment : ParentFragment(), Bookmarkable {
 
     private fun getGradeString(
         courseGrade: CourseGrade?,
-        isFinal: Boolean,
-        restrictQuantitativeData: Boolean
+        isFinal: Boolean
     ): String {
         if (courseGrade == null) return getString(R.string.noGradeText)
         return if (isFinal) {
-            formatGrade(courseGrade.noFinalGrade, courseGrade.hasFinalGradeString(), courseGrade.finalGrade, courseGrade.finalScore, restrictQuantitativeData)
+            formatGrade(courseGrade.noFinalGrade, courseGrade.hasFinalGradeString(), courseGrade.finalGrade, courseGrade.finalScore)
         } else {
-            formatGrade(courseGrade.noCurrentGrade, courseGrade.hasCurrentGradeString(), courseGrade.currentGrade, courseGrade.currentScore, restrictQuantitativeData)
+            formatGrade(courseGrade.noCurrentGrade, courseGrade.hasCurrentGradeString(), courseGrade.currentGrade, courseGrade.currentScore)
         }
     }
 
-    private fun formatGrade(noGrade: Boolean, hasGradeString: Boolean, grade: String?, score: Double?, restrictQuantitativeData: Boolean): String {
+    private fun formatGrade(noGrade: Boolean, hasGradeString: Boolean, grade: String?, score: Double?): String {
         return if (noGrade) {
             getString(R.string.noGradeText)
         } else {
             if (restrictQuantitativeData) {
-                if (hasGradeString) grade.orEmpty() else getString(R.string.noGradeText)
+                when {
+                    hasGradeString -> grade.orEmpty()
+                    gradingScheme.isNotEmpty() && score != null -> convertPercentScoreToLetterGrade(score / 100, gradingScheme)
+                    else -> getString(R.string.noGradeText)
+                }
             } else {
                 NumberHelper.doubleToPercentage(score) + if (hasGradeString) String.format(" (%s)", grade) else ""
             }
diff --git a/apps/student/src/main/java/com/instructure/student/holders/AssignmentViewHolder.kt b/apps/student/src/main/java/com/instructure/student/holders/AssignmentViewHolder.kt
index 71355343c2..7c824ed748 100644
--- a/apps/student/src/main/java/com/instructure/student/holders/AssignmentViewHolder.kt
+++ b/apps/student/src/main/java/com/instructure/student/holders/AssignmentViewHolder.kt
@@ -21,6 +21,7 @@ import android.view.View
 import androidx.recyclerview.widget.RecyclerView
 import com.instructure.canvasapi2.models.Assignment
 import com.instructure.canvasapi2.models.CanvasContext
+import com.instructure.canvasapi2.models.GradingSchemeRow
 import com.instructure.canvasapi2.utils.DateHelper
 import com.instructure.pandautils.utils.ColorKeeper
 import com.instructure.pandautils.utils.setTextForVisibility
@@ -36,7 +37,8 @@ class AssignmentViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
         assignment: Assignment,
         courseColor: Int,
         adapterToFragmentCallback: AdapterToFragmentCallback<Assignment>,
-        restrictQuantitativeData: Boolean
+        restrictQuantitativeData: Boolean,
+        gradingSchemes: List<GradingSchemeRow>
     ) = with(ViewholderCardGenericBinding.bind(itemView)) {
         title.text = assignment.name
 
@@ -48,13 +50,13 @@ class AssignmentViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
         val submission = assignment.submission
 
         // Posted At now determines if an assignment is muted, even for old gradebook
-        val hideGrade = restrictQuantitativeData && assignment.isGradingTypeQuantitative && submission?.excused != true
+        val hideGrade = restrictQuantitativeData && assignment.isGradingTypeQuantitative && submission?.excused != true && gradingSchemes.isEmpty()
         if (submission?.postedAt == null || hideGrade) {
             // Mute that score
             points.visibility = View.GONE
         } else {
             points.visibility = View.VISIBLE
-            BinderUtils.setupGradeText(context, points, assignment, submission, courseColor, restrictQuantitativeData)
+            BinderUtils.setupGradeText(context, points, assignment, submission, courseColor, restrictQuantitativeData, gradingSchemes)
         }
 
         val drawable = BinderUtils.getAssignmentIcon(assignment)
diff --git a/apps/student/src/main/java/com/instructure/student/holders/GradeViewHolder.kt b/apps/student/src/main/java/com/instructure/student/holders/GradeViewHolder.kt
index 84932627d0..19179863a4 100644
--- a/apps/student/src/main/java/com/instructure/student/holders/GradeViewHolder.kt
+++ b/apps/student/src/main/java/com/instructure/student/holders/GradeViewHolder.kt
@@ -68,15 +68,17 @@ class GradeViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
             points.setGone()
         } else {
             val submission = assignment.submission
-            val restrictQuantitativeData = (canvasContext as? Course)?.settings?.restrictQuantitativeData ?: false
+            val course = canvasContext as? Course
+            val restrictQuantitativeData = course?.settings?.restrictQuantitativeData ?: false
+            val gradingScheme = course?.gradingScheme ?: emptyList()
             if (submission != null && Const.PENDING_REVIEW == submission.workflowState) {
                 points.setGone()
                 icon.setNestedIcon(R.drawable.ic_complete_solid, canvasContext.backgroundColor)
-            } else if (restrictQuantitativeData && assignment.isGradingTypeQuantitative && submission?.excused != true) {
+            } else if (restrictQuantitativeData && assignment.isGradingTypeQuantitative && submission?.excused != true && gradingScheme.isEmpty()) {
                 points.setGone()
             } else {
                 points.setVisible()
-                val (grade, contentDescription) = BinderUtils.getGrade(assignment, submission, context, restrictQuantitativeData)
+                val (grade, contentDescription) = BinderUtils.getGrade(assignment, submission, context, restrictQuantitativeData, gradingScheme)
                 points.text = grade
                 points.contentDescription = contentDescription
             }
diff --git a/apps/student/src/main/java/com/instructure/student/holders/NotificationViewHolder.kt b/apps/student/src/main/java/com/instructure/student/holders/NotificationViewHolder.kt
index 22f5f09bc2..113718dd12 100644
--- a/apps/student/src/main/java/com/instructure/student/holders/NotificationViewHolder.kt
+++ b/apps/student/src/main/java/com/instructure/student/holders/NotificationViewHolder.kt
@@ -26,6 +26,7 @@ import androidx.recyclerview.widget.RecyclerView
 import com.instructure.canvasapi2.models.CanvasContext
 import com.instructure.canvasapi2.models.Course
 import com.instructure.canvasapi2.models.StreamItem
+import com.instructure.canvasapi2.utils.convertScoreToLetterGrade
 import com.instructure.pandautils.utils.*
 import com.instructure.student.R
 import com.instructure.student.adapter.NotificationListRecyclerAdapter
@@ -99,16 +100,20 @@ class NotificationViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView)
                 drawableResId = R.drawable.ic_assignment
                 icon.contentDescription = context.getString(R.string.assignmentIcon)
 
-                val restrictQuantitativeData = (item.canvasContext as? Course)?.settings?.restrictQuantitativeData.orDefault()
-                        && item.assignment?.isGradingTypeQuantitative.orDefault()
+                val course = item.canvasContext as? Course
+                val restrictQuantitativeData = course?.settings?.restrictQuantitativeData.orDefault()
+                val gradingScheme = course?.gradingScheme.orEmpty()
                 // Need to prepend "Grade" in the message if there is a valid score
-                if (item.score != -1.0 && !restrictQuantitativeData) {
+                if (item.score != -1.0) {
                     // If the submission has a grade (like a letter or percentage) display it
-                    if (item.grade != null
-                        && item.grade != ""
-                        && item.grade != "null"
-                    ) {
-                        description.text = context.resources.getString(R.string.grade) + ": " + item.grade
+                    val pointsPossible = item.assignment?.pointsPossible
+                    val grade = if (item.assignment?.isGradingTypeQuantitative == true && restrictQuantitativeData && pointsPossible != null) {
+                        convertScoreToLetterGrade(item.score, pointsPossible, gradingScheme)
+                    } else {
+                        item.grade
+                    }
+                    if (grade != null && grade != "" && grade != "null") {
+                        description.text = context.resources.getString(R.string.grade) + ": " + grade
                     } else {
                         description.text = context.resources.getString(R.string.grade) + description.text
                     }
diff --git a/apps/student/src/main/java/com/instructure/student/util/BinderUtils.kt b/apps/student/src/main/java/com/instructure/student/util/BinderUtils.kt
index 005c4d4a7b..20af9eb4ac 100644
--- a/apps/student/src/main/java/com/instructure/student/util/BinderUtils.kt
+++ b/apps/student/src/main/java/com/instructure/student/util/BinderUtils.kt
@@ -23,8 +23,10 @@ import android.view.View
 import android.widget.TextView
 import androidx.core.content.ContextCompat
 import com.instructure.canvasapi2.models.Assignment
+import com.instructure.canvasapi2.models.GradingSchemeRow
 import com.instructure.canvasapi2.models.Submission
 import com.instructure.canvasapi2.utils.NumberHelper
+import com.instructure.canvasapi2.utils.convertScoreToLetterGrade
 import com.instructure.canvasapi2.utils.isValid
 import com.instructure.canvasapi2.utils.validOrNull
 import com.instructure.pandautils.utils.*
@@ -36,7 +38,7 @@ object BinderUtils {
     @Suppress("DEPRECATION")
     fun getHtmlAsText(html: String?) = html?.validOrNull()?.let { StringUtilities.simplifyHTML(Html.fromHtml(it)) }
 
-    fun getGrade(assignment: Assignment, submission: Submission?, context: Context, restrictQuantitativeData: Boolean = false): DisplayGrade {
+    fun getGrade(assignment: Assignment, submission: Submission?, context: Context, restrictQuantitativeData: Boolean, gradingScheme: List<GradingSchemeRow>): DisplayGrade {
         val possiblePoints = assignment.pointsPossible
         val pointsPossibleText = NumberHelper.formatDecimal(possiblePoints, 2, true)
 
@@ -108,6 +110,11 @@ object BinderUtils {
             }
         }
 
+        if (restrictQuantitativeData && assignment.isGradingTypeQuantitative) {
+            val letterGrade = convertScoreToLetterGrade(submission.score, assignment.pointsPossible, gradingScheme)
+            return DisplayGrade(letterGrade, getContentDescriptionForMinusGradeString(letterGrade, context).validOrNull() ?: letterGrade)
+        }
+
         // Numeric grade
         submission.grade?.toDoubleOrNull()?.let { parsedGrade ->
             if (restrictQuantitativeData) return DisplayGrade()
@@ -141,11 +148,11 @@ object BinderUtils {
         assignment: Assignment,
         submission: Submission,
         color: Int,
-        restrictQuantitativeData: Boolean
+        restrictQuantitativeData: Boolean,
+        gradingScheme: List<GradingSchemeRow>
     ) {
-        val hasGrade = submission.grade.isValid()
-        val (grade, contentDescription) = getGrade(assignment, submission, context, restrictQuantitativeData)
-        if (hasGrade) {
+        val (grade, contentDescription) = getGrade(assignment, submission, context, restrictQuantitativeData, gradingScheme)
+        if (!submission.excused && grade.isValid()) {
             textView.text = grade
             textView.contentDescription = contentDescription
             textView.setTextAppearance(R.style.TextStyle_Grade)
diff --git a/apps/student/src/main/java/com/instructure/student/widget/GradesViewWidgetService.kt b/apps/student/src/main/java/com/instructure/student/widget/GradesViewWidgetService.kt
index 052d93b02a..a743dd7cc4 100644
--- a/apps/student/src/main/java/com/instructure/student/widget/GradesViewWidgetService.kt
+++ b/apps/student/src/main/java/com/instructure/student/widget/GradesViewWidgetService.kt
@@ -133,7 +133,7 @@ class GradesViewWidgetService : BaseRemoteViewsService(), Serializable {
             if(NetworkUtils.isNetworkAvailable && ApiPrefs.user != null) {
                 try {
                     // Force network so we always get the latest data for grades
-                    setData(CourseManager.getCoursesSynchronous(true).filter
+                    setData(CourseManager.getCoursesSynchronousWithGradingScheme(true).filter
                     { it.isFavorite && it.isCurrentEnrolment() && !it.isInvited() })
                 } catch (e: Throwable) {
                     Logger.e("Could not load " + this::class.java.simpleName + " widget. " + e.message)
diff --git a/apps/student/src/main/java/com/instructure/student/widget/NotificationViewWidgetService.kt b/apps/student/src/main/java/com/instructure/student/widget/NotificationViewWidgetService.kt
index 566a268e98..a012f9f8fc 100644
--- a/apps/student/src/main/java/com/instructure/student/widget/NotificationViewWidgetService.kt
+++ b/apps/student/src/main/java/com/instructure/student/widget/NotificationViewWidgetService.kt
@@ -34,7 +34,6 @@ import com.instructure.canvasapi2.models.CanvasContext
 import com.instructure.canvasapi2.models.Course
 import com.instructure.canvasapi2.models.StreamItem
 import com.instructure.canvasapi2.utils.*
-import com.instructure.pandautils.utils.ColorKeeper
 import com.instructure.student.R
 import com.instructure.student.activity.NotificationWidgetRouter
 import com.instructure.student.util.StringUtilities
@@ -88,8 +87,10 @@ class NotificationViewWidgetService : BaseRemoteViewsService(), Serializable {
 
             if (!BaseRemoteViewsService.shouldHideDetails(appWidgetId)) {
                 val restrictQuantitativeData = (streamItem.canvasContext as? Course)?.settings?.restrictQuantitativeData ?: false
-                if (streamItem.getMessage(ContextKeeper.appContext, restrictQuantitativeData) != null) {
-                    row.setTextViewText(R.id.message, StringUtilities.simplifyHTML(Html.fromHtml(streamItem.getMessage(ContextKeeper.appContext, restrictQuantitativeData), Html.FROM_HTML_MODE_LEGACY)))
+                val gradingScheme = (streamItem.canvasContext as? Course)?.gradingScheme ?: emptyList()
+                val message = streamItem.getMessage(ContextKeeper.appContext, restrictQuantitativeData, gradingScheme)
+                if (message != null) {
+                    row.setTextViewText(R.id.message, StringUtilities.simplifyHTML(Html.fromHtml(message, Html.FROM_HTML_MODE_LEGACY)))
                     row.setTextColor(R.id.message, BaseRemoteViewsService.getWidgetSecondaryTextColor(appWidgetId, applicationContext))
                 } else {
                     row.setTextViewText(R.id.message, "")
@@ -140,7 +141,7 @@ class NotificationViewWidgetService : BaseRemoteViewsService(), Serializable {
         override fun loadData() {
             if(NetworkUtils.isNetworkAvailable && ApiPrefs.user != null) {
                 try {
-                    val courses = CourseManager.getCoursesSynchronous(true)
+                    val courses = CourseManager.getCoursesSynchronousWithGradingScheme(true)
                             .filter { it.isFavorite && !it.accessRestrictedByDate && !it.isInvited() }
                     val groups = GroupManager.getFavoriteGroupsSynchronous(false)
                     val userStream = StreamManager.getUserStreamSynchronous(25, true).toMutableList()
diff --git a/apps/student/src/main/java/com/instructure/student/widget/TodoViewWidgetService.kt b/apps/student/src/main/java/com/instructure/student/widget/TodoViewWidgetService.kt
index 0a74062e27..14def809cb 100644
--- a/apps/student/src/main/java/com/instructure/student/widget/TodoViewWidgetService.kt
+++ b/apps/student/src/main/java/com/instructure/student/widget/TodoViewWidgetService.kt
@@ -35,7 +35,6 @@ import com.instructure.canvasapi2.models.CanvasContext
 import com.instructure.canvasapi2.models.ScheduleItem
 import com.instructure.canvasapi2.models.ToDo
 import com.instructure.canvasapi2.utils.*
-import com.instructure.pandautils.utils.ColorKeeper
 import java.io.Serializable
 import java.util.*
 
@@ -161,7 +160,7 @@ class TodoViewWidgetService : BaseRemoteViewsService(), Serializable {
         override fun loadData() {
             if(NetworkUtils.isNetworkAvailable && ApiPrefs.user != null) {
                 try {
-                    val courses = CourseManager.getCoursesSynchronous(true)
+                    val courses = CourseManager.getCoursesSynchronousWithGradingScheme(true)
                             .filter { it.isFavorite && !it.accessRestrictedByDate && !it.isInvited() }
                     val groups = GroupManager.getFavoriteGroupsSynchronous(true)
                     val todos = ToDoManager.getTodosSynchronous(ApiPrefs.user!!, true)
diff --git a/apps/student/src/test/java/com/instructure/student/features/assignmentdetail/gradecellview/GradeCellViewDataTest.kt b/apps/student/src/test/java/com/instructure/student/features/assignmentdetail/gradecellview/GradeCellViewDataTest.kt
index 7a96e68346..ce09c567fa 100644
--- a/apps/student/src/test/java/com/instructure/student/features/assignmentdetail/gradecellview/GradeCellViewDataTest.kt
+++ b/apps/student/src/test/java/com/instructure/student/features/assignmentdetail/gradecellview/GradeCellViewDataTest.kt
@@ -20,6 +20,7 @@ package com.instructure.student.features.assignmentdetail.gradecellview
 import android.content.res.Resources
 import com.instructure.canvasapi2.models.Assignment
 import com.instructure.canvasapi2.models.Course
+import com.instructure.canvasapi2.models.GradingSchemeRow
 import com.instructure.canvasapi2.models.Submission
 import com.instructure.pandautils.R
 import com.instructure.pandautils.utils.ColorKeeper
@@ -72,7 +73,7 @@ class GradeCellViewDataTest {
     }
 
     @Test
-    fun `Create empty grade cell when assignment is quantitative and quantitative data is restricted`() {
+    fun `Create empty grade cell when assignment is quantitative and quantitative data is restricted and there is no grading scheme`() {
         val gradeCell = GradeCellViewData.fromSubmission(
             resources,
             colorKeeper.getOrGenerateColor(Course()),
@@ -84,6 +85,25 @@ class GradeCellViewDataTest {
         Assert.assertEquals(GradeCellViewData.State.EMPTY, gradeCell.state)
     }
 
+    @Test
+    fun `Create cell with converted grade when assignment is quantitative and quantitative data is restricted`() {
+        val gradeCell = GradeCellViewData.fromSubmission(
+            resources,
+            colorKeeper.getOrGenerateColor(Course()),
+            Assignment(gradingType = Assignment.POINTS_TYPE, pointsPossible = 20.0),
+            Submission(submittedAt = Date(), grade = "10", score = 17.0),
+            restrictQuantitativeData = true,
+            gradingScheme = listOf(
+                GradingSchemeRow("A", 0.9),
+                GradingSchemeRow("B", 0.8),
+                GradingSchemeRow("F", 0.0)
+            )
+        )
+
+        Assert.assertEquals(GradeCellViewData.State.GRADED, gradeCell.state)
+        Assert.assertEquals("B", gradeCell.grade)
+    }
+
     @Test
     fun `Create excused grade cell without points when assignment is quantitative and quantitative data is restricted`() {
         every { resources.getString(R.string.excused) } returns "EX"
diff --git a/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/apis/CourseAPI.kt b/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/apis/CourseAPI.kt
index 0a57121bbe..9ebfd03b96 100644
--- a/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/apis/CourseAPI.kt
+++ b/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/apis/CourseAPI.kt
@@ -42,6 +42,9 @@ object CourseAPI {
         @get:GET("courses?include[]=term&include[]=total_scores&include[]=license&include[]=is_public&include[]=needs_grading_count&include[]=permissions&include[]=favorites&include[]=current_grading_period_scores&include[]=course_image&include[]=banner_image&include[]=sections&include[]=settings&state[]=completed&state[]=available")
         val firstPageCourses: Call<List<Course>>
 
+        @get:GET("courses?include[]=term&include[]=total_scores&include[]=license&include[]=is_public&include[]=needs_grading_count&include[]=permissions&include[]=favorites&include[]=current_grading_period_scores&include[]=course_image&include[]=banner_image&include[]=sections&include[]=settings&state[]=completed&state[]=available&include[]=grading_scheme")
+        val firstPageCoursesWithGradingScheme: Call<List<Course>>
+
         @GET("courses?include[]=term&include[]=total_scores&include[]=license&include[]=is_public&include[]=needs_grading_count&include[]=permissions&include[]=favorites&include[]=current_grading_period_scores&include[]=course_image&include[]=banner_image&include[]=sections&state[]=completed&state[]=available")
         suspend fun getFirstPageCourses(@Tag params: RestParams): DataResult<List<Course>>
 
@@ -51,7 +54,7 @@ object CourseAPI {
         @get:GET("courses?include[]=term&include[]=total_scores&include[]=license&include[]=is_public&include[]=needs_grading_count&include[]=permissions&include[]=favorites&include[]=current_grading_period_scores&include[]=course_image&include[]=sections&state[]=current_and_concluded")
         val firstPageCoursesWithConcluded: Call<List<Course>>
 
-        @get:GET("courses?include[]=term&include[]=syllabus_body&include[]=total_scores&include[]=license&include[]=is_public&include[]=needs_grading_count&include[]=permissions&include[]=favorites&include[]=current_grading_period_scores&include[]=course_image&include[]=sections&state[]=completed&state[]=available&include[]=observed_users&include[]=settings")
+        @get:GET("courses?include[]=term&include[]=syllabus_body&include[]=total_scores&include[]=license&include[]=is_public&include[]=needs_grading_count&include[]=permissions&include[]=favorites&include[]=current_grading_period_scores&include[]=course_image&include[]=sections&state[]=completed&state[]=available&include[]=observed_users&include[]=settings&include[]=grading_scheme")
         val firstPageCoursesWithSyllabus: Call<List<Course>>
 
         @get:GET("courses?include[]=term&include[]=syllabus_body&include[]=license&include[]=is_public&include[]=permissions&enrollment_state=active")
@@ -72,7 +75,7 @@ object CourseAPI {
         @GET("courses/{courseId}?include[]=syllabus_body&include[]=term&include[]=license&include[]=is_public&include[]=permissions")
         fun getCourseWithSyllabus(@Path("courseId") courseId: Long): Call<Course>
 
-        @GET("courses/{courseId}?include[]=term&include[]=permissions&include[]=license&include[]=is_public&include[]=needs_grading_count&include[]=total_scores&include[]=current_grading_period_scores&include[]=course_image&include[]=settings")
+        @GET("courses/{courseId}?include[]=term&include[]=permissions&include[]=license&include[]=is_public&include[]=needs_grading_count&include[]=total_scores&include[]=current_grading_period_scores&include[]=course_image&include[]=settings&include[]=grading_scheme")
         fun getCourseWithGrade(@Path("courseId") courseId: Long): Call<Course>
 
         @GET("courses?include[]=term&include[]=total_scores&include[]=license&include[]=is_public&include[]=needs_grading_count&include[]=permissions&include[]=favorites&include[]=current_grading_period_scores&include[]=course_image&include[]=sections&state[]=current_and_concluded")
@@ -126,8 +129,8 @@ object CourseAPI {
     }
 
     @Throws(IOException::class)
-    fun getCoursesSynchronously(adapter: RestBuilder, params: RestParams): List<Course>? {
-        val firstPageResponse = adapter.build(CoursesInterface::class.java, params).firstPageCourses.execute()
+    fun getCoursesSynchronouslyWithGradingScheme(adapter: RestBuilder, params: RestParams): List<Course>? {
+        val firstPageResponse = adapter.build(CoursesInterface::class.java, params).firstPageCoursesWithGradingScheme.execute()
         return getCoursesRecursive(adapter, params, firstPageResponse, firstPageResponse.body())
     }
 
@@ -169,6 +172,10 @@ object CourseAPI {
         callback.addCall(adapter.build(CoursesInterface::class.java, params).firstPageCourses).enqueue(callback)
     }
 
+    fun getFirstPageCoursesWithGradingScheme(adapter: RestBuilder, callback: StatusCallback<List<Course>>, params: RestParams) {
+        callback.addCall(adapter.build(CoursesInterface::class.java, params).firstPageCoursesWithGradingScheme).enqueue(callback)
+    }
+
     fun getFirstPageCoursesWithConcluded(adapter: RestBuilder, callback: StatusCallback<List<Course>>, params: RestParams) {
         callback.addCall(adapter.build(CoursesInterface::class.java, params).firstPageCoursesWithConcluded).enqueue(callback)
     }
diff --git a/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/managers/CourseManager.kt b/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/managers/CourseManager.kt
index 5283bade91..ea621abb56 100644
--- a/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/managers/CourseManager.kt
+++ b/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/managers/CourseManager.kt
@@ -69,6 +69,25 @@ object CourseManager {
         CourseAPI.getFirstPageCourses(adapter, depaginatedCallback, params)
     }
 
+    fun getCoursesWithGradingScheme(forceNetwork: Boolean, callback: StatusCallback<List<Course>>) {
+        if (ApiPrefs.isStudentView) {
+            getCoursesTeacher(forceNetwork, callback)
+            return
+        }
+
+        val adapter = RestBuilder(callback)
+        val params = RestParams(usePerPageQueryParam = true, isForceReadFromNetwork = forceNetwork)
+
+        val depaginatedCallback = object : ExhaustiveListCallback<Course>(callback) {
+            override fun getNextPage(callback: StatusCallback<List<Course>>, nextUrl: String, isCached: Boolean) {
+                CourseAPI.getNextPageCourses(forceNetwork, nextUrl, adapter, callback)
+            }
+        }
+
+        adapter.statusCallback = depaginatedCallback
+        CourseAPI.getFirstPageCoursesWithGradingScheme(adapter, depaginatedCallback, params)
+    }
+
     fun getCoursesWithConcluded(forceNetwork: Boolean, callback: StatusCallback<List<Course>>) {
         if (ApiPrefs.isStudentView) {
             getCoursesTeacher(forceNetwork, callback)
@@ -341,11 +360,11 @@ object CourseManager {
     }
 
     @Throws(IOException::class)
-    fun getCoursesSynchronous(forceNetwork: Boolean): List<Course> {
+    fun getCoursesSynchronousWithGradingScheme(forceNetwork: Boolean): List<Course> {
         val adapter = RestBuilder()
         val params = RestParams(usePerPageQueryParam = true, isForceReadFromNetwork = forceNetwork)
 
-        val data = CourseAPI.getCoursesSynchronously(adapter, params)
+        val data = CourseAPI.getCoursesSynchronouslyWithGradingScheme(adapter, params)
         return data ?: ArrayList()
     }
 
diff --git a/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/Course.kt b/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/Course.kt
index 81e6665bbd..13a694a693 100644
--- a/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/Course.kt
+++ b/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/Course.kt
@@ -23,6 +23,7 @@ import com.instructure.canvasapi2.utils.isCreationPending
 import com.instructure.canvasapi2.utils.isNullOrEmpty
 import com.instructure.canvasapi2.utils.toDate
 import kotlinx.parcelize.Parcelize
+import kotlinx.parcelize.RawValue
 import java.util.*
 
 @Parcelize
@@ -80,7 +81,9 @@ data class Course(
         @SerializedName("grading_periods")
         val gradingPeriods: List<GradingPeriod>? = null,
         @SerializedName("settings")
-        val settings: CourseSettings? = null
+        val settings: CourseSettings? = null,
+        @SerializedName("grading_scheme")
+        val gradingSchemeRaw: List<List<@RawValue Any>>? = null,
 ) : CanvasContext(), Comparable<CanvasContext> {
     override val type: Type get() = Type.COURSE
 
@@ -128,6 +131,17 @@ data class Course(
             return false
         }
 
+    val gradingScheme: List<GradingSchemeRow>
+        get() {
+            return gradingSchemeRaw?.map { row ->
+                if (row.size < 2 || row[0] !is String || row[1] !is Double) {
+                    null
+                } else {
+                    GradingSchemeRow(row[0] as String, row[1] as Double)
+                }
+            }?.filterNotNull()?.sortedByDescending { it.value } ?: emptyList()
+        }
+
     /**
      * A helper method to get access to all course grade values in one place and how to display them
      *
diff --git a/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/GradingSchemeRow.kt b/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/GradingSchemeRow.kt
new file mode 100644
index 0000000000..cdab07e260
--- /dev/null
+++ b/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/GradingSchemeRow.kt
@@ -0,0 +1,19 @@
+/*
+ * Copyright (C) 2023 - present Instructure, Inc.
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, version 3 of the License.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.instructure.canvasapi2.models
+
+data class GradingSchemeRow(val name: String, val value: Double)
\ No newline at end of file
diff --git a/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/StreamItem.kt b/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/StreamItem.kt
index 7e50e7e874..dc5a269441 100644
--- a/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/StreamItem.kt
+++ b/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/StreamItem.kt
@@ -21,6 +21,7 @@ import android.content.Context
 import com.google.gson.annotations.SerializedName
 import com.instructure.canvasapi2.R
 import com.instructure.canvasapi2.utils.APIHelper
+import com.instructure.canvasapi2.utils.convertScoreToLetterGrade
 import com.instructure.canvasapi2.utils.toDate
 import kotlinx.parcelize.IgnoredOnParcel
 import kotlinx.parcelize.Parcelize
@@ -178,9 +179,9 @@ data class StreamItem(
         return title
     }
 
-    fun getMessage(context: Context, restrictQuantitativeData: Boolean = false): String? {
+    fun getMessage(context: Context, restrictQuantitativeData: Boolean = false, gradingScheme: List<GradingSchemeRow> = emptyList()): String? {
         if (message == null) {
-            message = createMessage(context, restrictQuantitativeData)
+            message = createMessage(context, restrictQuantitativeData, gradingScheme)
         }
         return message
     }
@@ -214,7 +215,7 @@ data class StreamItem(
         }
     }
 
-    private fun createMessage(context: Context, restrictQuantitativeData: Boolean = false): String? {
+    private fun createMessage(context: Context, restrictQuantitativeData: Boolean = false, gradingScheme: List<GradingSchemeRow> = emptyList()): String? {
         when (getStreamItemType()) {
             StreamItem.Type.CONVERSATION -> {
                 if (conversation == null) {
@@ -234,7 +235,7 @@ data class StreamItem(
 
                 val displayedGrade = when {
                     excused -> context.getString(R.string.gradeExcused)
-                    restrictQuantitativeData -> getGradeWhenQuantitativeDataRestricted(context)
+                    restrictQuantitativeData -> getGradeWhenQuantitativeDataRestricted(context, gradingScheme, score, assignment?.pointsPossible)
                     score != -1.0 -> score.toString().orEmpty()
                     else -> ""
                 }
@@ -255,9 +256,13 @@ data class StreamItem(
         } else message
     }
 
-    private fun getGradeWhenQuantitativeDataRestricted(context: Context): String {
+    private fun getGradeWhenQuantitativeDataRestricted(context: Context, gradingScheme: List<GradingSchemeRow>, score: Double, maxScore: Double?): String {
         return if (assignment?.isGradingTypeQuantitative == true) {
-            context.getString(R.string.gradeUpdated)
+            if (gradingScheme.isEmpty() || maxScore == null) {
+                context.getString(R.string.gradeUpdated)
+            } else {
+                convertScoreToLetterGrade(score, maxScore, gradingScheme)
+            }
         } else {
             grade.orEmpty()
         }
diff --git a/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/utils/ModelExtensions.kt b/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/utils/ModelExtensions.kt
index dd75aaccc5..80485eddc5 100644
--- a/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/utils/ModelExtensions.kt
+++ b/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/utils/ModelExtensions.kt
@@ -174,4 +174,16 @@ fun Assignment.toScheduleItem() : ScheduleItem {
             assignment = this,
             lockedModuleName = lockInfo?.lockedModuleName
     ).apply { courseId = id }
+}
+
+fun convertScoreToLetterGrade(score: Double, maxScore: Double, gradingScheme: List<GradingSchemeRow>): String {
+    if (maxScore == 0.0) return ""
+    val percent = (score / maxScore)
+    return convertPercentScoreToLetterGrade(percent, gradingScheme)
+}
+
+fun convertPercentScoreToLetterGrade(percentScore: Double, gradingScheme: List<GradingSchemeRow>): String {
+    if (gradingScheme.isEmpty()) return ""
+    val grade = gradingScheme.firstOrNull { percentScore >= it.value } ?: gradingScheme.last()
+    return grade.name
 }
\ No newline at end of file
diff --git a/libs/canvas-api-2/src/test/java/com/instructure/canvasapi2/pact/canvas/apis/CoursesApiPactTests.kt b/libs/canvas-api-2/src/test/java/com/instructure/canvasapi2/pact/canvas/apis/CoursesApiPactTests.kt
index 593eced3a1..17b9a342ab 100644
--- a/libs/canvas-api-2/src/test/java/com/instructure/canvasapi2/pact/canvas/apis/CoursesApiPactTests.kt
+++ b/libs/canvas-api-2/src/test/java/com/instructure/canvasapi2/pact/canvas/apis/CoursesApiPactTests.kt
@@ -210,7 +210,7 @@ class CoursesApiPactTests : ApiPactTestBase() {
     //region Test grabbing a single course with a grade
     //
 
-    val courseWithGradeQuery = "include[]=term&include[]=permissions&include[]=license&include[]=is_public&include[]=needs_grading_count&include[]=total_scores&include[]=current_grading_period_scores&include[]=course_image&include[]=settings"
+    val courseWithGradeQuery = "include[]=term&include[]=permissions&include[]=license&include[]=is_public&include[]=needs_grading_count&include[]=total_scores&include[]=current_grading_period_scores&include[]=course_image&include[]=settings&include[]=grading_scheme"
     val courseWithGradePath = "/api/v1/courses/3"
     val courseWithGradeFieldInfo = PactCourseFieldConfig.fromQueryString(courseId = 3, isFavorite = true, query = courseWithGradeQuery)
     val courseWithGradeResponseBody = LambdaDsl.newJsonBody { obj ->
diff --git a/libs/canvas-api-2/src/test/java/com/instructure/canvasapi2/unit/CourseTest.kt b/libs/canvas-api-2/src/test/java/com/instructure/canvasapi2/unit/CourseTest.kt
index 6e0cd09412..94284e772f 100644
--- a/libs/canvas-api-2/src/test/java/com/instructure/canvasapi2/unit/CourseTest.kt
+++ b/libs/canvas-api-2/src/test/java/com/instructure/canvasapi2/unit/CourseTest.kt
@@ -19,6 +19,7 @@ package com.instructure.canvasapi2.unit
 
 import com.instructure.canvasapi2.models.Course
 import com.instructure.canvasapi2.models.Enrollment
+import com.instructure.canvasapi2.models.GradingSchemeRow
 import com.instructure.canvasapi2.models.Section
 import com.instructure.canvasapi2.models.Term
 import com.instructure.canvasapi2.utils.Logger
@@ -562,4 +563,22 @@ class CourseTest {
 
         assertTrue(course.isBetweenValidDateRange())
     }
+
+    @Test
+    fun `Grading schemes are sorted and filtered correctly`() {
+        val course = baseCourse.copy(gradingSchemeRaw = listOf(
+            listOf("A", 0.95),
+            listOf("C", 0.7),
+            listOf(0.8),
+            listOf("B", 0.9),
+            listOf("A", "B")
+        ))
+
+        val gradingSchemes = course.gradingScheme
+
+        assertEquals(3, gradingSchemes.size)
+        assertEquals(GradingSchemeRow("A", 0.95), gradingSchemes[0])
+        assertEquals(GradingSchemeRow("B", 0.9), gradingSchemes[1])
+        assertEquals(GradingSchemeRow("C", 0.7), gradingSchemes[2])
+    }
 }
\ No newline at end of file
diff --git a/libs/canvas-api-2/src/test/java/com/instructure/canvasapi2/utils/ModelExtensionsTest.kt b/libs/canvas-api-2/src/test/java/com/instructure/canvasapi2/utils/ModelExtensionsTest.kt
new file mode 100644
index 0000000000..c50f1307f0
--- /dev/null
+++ b/libs/canvas-api-2/src/test/java/com/instructure/canvasapi2/utils/ModelExtensionsTest.kt
@@ -0,0 +1,117 @@
+/*
+ * Copyright (C) 2023 - present Instructure, Inc.
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, version 3 of the License.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.instructure.canvasapi2.utils
+
+import com.instructure.canvasapi2.models.GradingSchemeRow
+import org.junit.Assert
+import org.junit.Assert.*
+import org.junit.Test
+
+class ModelExtensionsTest {
+
+    private val gradingSchemes = listOf(
+        GradingSchemeRow("A", 0.95),
+        GradingSchemeRow("B", 0.9),
+        GradingSchemeRow("C", 0.8),
+        GradingSchemeRow("D", 0.7),
+        GradingSchemeRow("F", 0.6)
+    )
+
+    @Test
+    fun `Score to letter grade returns empty string when max score is 0`() {
+        val result = convertScoreToLetterGrade(1.0, 0.0, gradingSchemes)
+
+        assertEquals("", result)
+    }
+
+    @Test
+    fun `Score to letter grade returns empty string when grading schemes is empty`() {
+        val result = convertScoreToLetterGrade(1.0, 10.0, emptyList())
+
+        assertEquals("", result)
+    }
+
+    @Test
+    fun `Score to letter grade returns last item when nothing matches`() {
+        val result = convertScoreToLetterGrade(1.0, 10.0, gradingSchemes)
+
+        assertEquals("F", result)
+    }
+
+    @Test
+    fun `Score to letter grade returns last item when zero points`() {
+        val result = convertScoreToLetterGrade(0.0, 10.0, gradingSchemes)
+
+        assertEquals("F", result)
+    }
+
+    @Test
+    fun `Score to letter grade returns first item when overgraded`() {
+        val result = convertScoreToLetterGrade(15.0, 10.0, gradingSchemes)
+
+        assertEquals("A", result)
+    }
+
+    @Test
+    fun `Score to letter grade returns items inclusively`() {
+        val result = convertScoreToLetterGrade(95.0, 100.0, gradingSchemes)
+
+        assertEquals("A", result)
+    }
+
+    @Test
+    fun `Score to letter grade returns correct items with more decimal places`() {
+        val result = convertScoreToLetterGrade(94.9999, 100.0, gradingSchemes)
+
+        assertEquals("B", result)
+    }
+
+    @Test
+    fun `Score to letter grade returns the last value with negatice score`() {
+        val result = convertScoreToLetterGrade(-50.0, 100.0, gradingSchemes)
+
+        assertEquals("F", result)
+    }
+
+    @Test
+    fun `Score to letter grade returns C for 80 percent`() {
+        val result = convertScoreToLetterGrade(80.0, 100.0, gradingSchemes)
+
+        assertEquals("C", result)
+    }
+
+    @Test
+    fun `Score to letter grade returns D for 70 percent`() {
+        val result = convertScoreToLetterGrade(70.0, 100.0, gradingSchemes)
+
+        assertEquals("D", result)
+    }
+
+    @Test
+    fun `Convert percent to letter grade returns empty string when no grading schemes is empty`() {
+        val result = convertPercentScoreToLetterGrade(1.0, emptyList())
+
+        assertEquals("", result)
+    }
+
+    @Test
+    fun `Convert percent to letter grade returns last item when nothing matches`() {
+        val result = convertPercentScoreToLetterGrade( 0.1, gradingSchemes)
+
+        assertEquals("F", result)
+    }
+}
\ No newline at end of file

From 184a98b13b443a80730252b224704168041631c3 Mon Sep 17 00:00:00 2001
From: Kristof Deak <92309696+kdeakinstructure@users.noreply.github.com>
Date: Tue, 29 Aug 2023 13:30:22 +0200
Subject: [PATCH 18/22] [MBL-17007][Student] - Fix and stabilize Student
 landscape and tablet tests (#2122)

---
 .../ShareExtensionInteractionTest.kt          |  3 +++
 .../student/ui/pages/AssignmentDetailsPage.kt |  5 +++-
 .../student/ui/pages/BookmarkPage.kt          |  9 ++++----
 .../ui/pages/LeftSideNavigationDrawerPage.kt  | 13 ++++++++---
 .../student/ui/pages/NewMessagePage.kt        | 23 +++++++++++++++----
 5 files changed, 40 insertions(+), 13 deletions(-)

diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/ShareExtensionInteractionTest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/ShareExtensionInteractionTest.kt
index 75b100e24b..f19c657307 100644
--- a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/ShareExtensionInteractionTest.kt
+++ b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/ShareExtensionInteractionTest.kt
@@ -24,6 +24,7 @@ import androidx.test.platform.app.InstrumentationRegistry.getInstrumentation
 import androidx.test.uiautomator.UiDevice
 import androidx.test.uiautomator.UiSelector
 import com.instructure.canvas.espresso.Stub
+import com.instructure.canvas.espresso.StubTablet
 import com.instructure.canvas.espresso.mockCanvas.MockCanvas
 import com.instructure.canvas.espresso.mockCanvas.addAssignment
 import com.instructure.canvas.espresso.mockCanvas.init
@@ -85,6 +86,8 @@ class ShareExtensionInteractionTest : StudentTest() {
     }
 
     @Test
+    @StubTablet("Stubbed in Tablet because on Firebase it's breaking the workflow while actually no tests cases has failed." +
+            "Once the reason will be figured out, we will put back this test to tablet as well.")
     fun addAndRemoveFileFromFileUploadDialog() {
         val data = createMockData()
         val student = data.students[0]
diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/pages/AssignmentDetailsPage.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/pages/AssignmentDetailsPage.kt
index 2abb658dbb..5164267d7f 100644
--- a/apps/student/src/androidTest/java/com/instructure/student/ui/pages/AssignmentDetailsPage.kt
+++ b/apps/student/src/androidTest/java/com/instructure/student/ui/pages/AssignmentDetailsPage.kt
@@ -42,6 +42,7 @@ import com.instructure.espresso.click
 import com.instructure.espresso.page.BasePage
 import com.instructure.espresso.page.onView
 import com.instructure.espresso.page.onViewWithText
+import com.instructure.espresso.page.plus
 import com.instructure.espresso.page.waitForView
 import com.instructure.espresso.page.waitForViewWithText
 import com.instructure.espresso.page.withAncestor
@@ -50,6 +51,7 @@ import com.instructure.espresso.page.withParent
 import com.instructure.espresso.page.withText
 import com.instructure.espresso.scrollTo
 import com.instructure.espresso.swipeDown
+import com.instructure.espresso.swipeUp
 import com.instructure.espresso.typeText
 import com.instructure.espresso.waitForCheck
 import com.instructure.student.R
@@ -121,8 +123,9 @@ open class AssignmentDetailsPage : BasePage(R.id.assignmentDetailsPage) {
     }
 
     fun assertAssignmentLocked() {
+        if(CanvasTest.isLandscapeDevice()) onView(withId(R.id.swipeRefreshLayout) + withAncestor(R.id.assignmentDetailsPage)).swipeUp()
         onView(withId(R.id.lockedMessageTextView)).assertDisplayed()
-        onView(withId(R.id.lockedMessageTextView)).check(matches(containsTextCaseInsensitive("this assignment is locked")))
+        onView(withId(R.id.lockedMessageTextView)).check(matches(containsTextCaseInsensitive("this assignment is locked by the module")))
     }
 
     fun refresh() {
diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/pages/BookmarkPage.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/pages/BookmarkPage.kt
index 54c6b73b47..6d089573a3 100644
--- a/apps/student/src/androidTest/java/com/instructure/student/ui/pages/BookmarkPage.kt
+++ b/apps/student/src/androidTest/java/com/instructure/student/ui/pages/BookmarkPage.kt
@@ -17,12 +17,10 @@
 package com.instructure.student.ui.pages
 
 import androidx.appcompat.widget.AppCompatButton
+import androidx.test.espresso.Espresso
 import androidx.test.espresso.Espresso.onView
-import androidx.test.espresso.matcher.ViewMatchers.hasSibling
-import androidx.test.espresso.matcher.ViewMatchers.isAssignableFrom
-import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
-import androidx.test.espresso.matcher.ViewMatchers.withId
-import androidx.test.espresso.matcher.ViewMatchers.withText
+import androidx.test.espresso.matcher.ViewMatchers.*
+import com.instructure.canvas.espresso.CanvasTest
 import com.instructure.canvas.espresso.containsTextCaseInsensitive
 import com.instructure.canvas.espresso.scrollRecyclerView
 import com.instructure.espresso.assertDisplayed
@@ -65,6 +63,7 @@ class BookmarkPage : BasePage() {
         onView(withId(R.id.bookmarkEditText)).typeText(newName)
 
         // Save
+        if(CanvasTest.isLandscapeDevice()) Espresso.pressBack() //need to remove soft-keyboard on landscape devices
         onView(allOf(isAssignableFrom(AppCompatButton::class.java), containsTextCaseInsensitive("DONE"))).click()
     }
 
diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/pages/LeftSideNavigationDrawerPage.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/pages/LeftSideNavigationDrawerPage.kt
index b0680bbb85..d1a3d9a3ca 100644
--- a/apps/student/src/androidTest/java/com/instructure/student/ui/pages/LeftSideNavigationDrawerPage.kt
+++ b/apps/student/src/androidTest/java/com/instructure/student/ui/pages/LeftSideNavigationDrawerPage.kt
@@ -8,6 +8,7 @@ import androidx.test.espresso.ViewAction
 import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.matcher.ViewMatchers
 import androidx.test.espresso.matcher.ViewMatchers.withText
+import com.instructure.canvas.espresso.CanvasTest
 import com.instructure.canvas.espresso.waitForMatcherWithSleeps
 import com.instructure.canvasapi2.models.User
 import com.instructure.dataseeding.model.CanvasUserApiModel
@@ -21,7 +22,10 @@ import com.instructure.espresso.page.onView
 import com.instructure.espresso.page.onViewWithId
 import com.instructure.espresso.page.onViewWithText
 import com.instructure.espresso.page.waitForViewWithId
+import com.instructure.espresso.page.withId
 import com.instructure.espresso.scrollTo
+import com.instructure.espresso.swipeDown
+import com.instructure.espresso.swipeUp
 import com.instructure.student.R
 import org.hamcrest.CoreMatchers
 import org.hamcrest.Matcher
@@ -132,6 +136,8 @@ class LeftSideNavigationDrawerPage: BasePage() {
         userEmail.assertDisplayed()
 
         settings.assertDisplayed()
+
+        if(CanvasTest.isLandscapeDevice()) onView(withId(R.id.navigationDrawer)).swipeUp()
         changeUser.assertDisplayed()
         logoutButton.assertDisplayed()
         
@@ -144,10 +150,12 @@ class LeftSideNavigationDrawerPage: BasePage() {
     }
 
     private fun assertDefaultNavigationBehaviorMenuItems() {
+        if(CanvasTest.isLandscapeDevice()) onView(withId(R.id.navigationDrawer)).swipeDown()
         files.assertDisplayed()
         bookmarks.assertDisplayed()
         settings.assertDisplayed()
 
+        if(CanvasTest.isLandscapeDevice()) onView(withId(R.id.navigationDrawer)).swipeUp()
         showGrades.assertDisplayed()
         colorOverlay.assertDisplayed()
 
@@ -157,13 +165,12 @@ class LeftSideNavigationDrawerPage: BasePage() {
     }
 
     private fun assertElementaryNavigationBehaviorMenuItems() {
-        files.assertDisplayed()
         bookmarks.assertNotDisplayed()
-        settings.assertDisplayed()
-
         showGrades.assertNotDisplayed()
         colorOverlay.assertNotDisplayed()
 
+        files.assertDisplayed()
+        settings.assertDisplayed()
         help.assertDisplayed()
         changeUser.assertDisplayed()
         logoutButton.assertDisplayed()
diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/pages/NewMessagePage.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/pages/NewMessagePage.kt
index ee1737f2da..6801a10cf7 100644
--- a/apps/student/src/androidTest/java/com/instructure/student/ui/pages/NewMessagePage.kt
+++ b/apps/student/src/androidTest/java/com/instructure/student/ui/pages/NewMessagePage.kt
@@ -24,14 +24,30 @@ import androidx.test.espresso.ViewAssertion
 import androidx.test.espresso.action.ViewActions.click
 import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.matcher.ViewMatchers
-import androidx.test.espresso.matcher.ViewMatchers.*
+import androidx.test.espresso.matcher.ViewMatchers.hasChildCount
+import androidx.test.espresso.matcher.ViewMatchers.hasSibling
+import androidx.test.espresso.matcher.ViewMatchers.withChild
+import androidx.test.espresso.matcher.ViewMatchers.withText
 import com.instructure.canvasapi2.models.Course
 import com.instructure.canvasapi2.models.User
 import com.instructure.dataseeding.model.CanvasUserApiModel
 import com.instructure.dataseeding.model.CourseApiModel
 import com.instructure.dataseeding.model.GroupApiModel
-import com.instructure.espresso.*
-import com.instructure.espresso.page.*
+import com.instructure.espresso.OnViewWithId
+import com.instructure.espresso.RecyclerViewItemCountAssertion
+import com.instructure.espresso.assertDisplayed
+import com.instructure.espresso.assertNotDisplayed
+import com.instructure.espresso.click
+import com.instructure.espresso.page.BasePage
+import com.instructure.espresso.page.onView
+import com.instructure.espresso.page.onViewWithId
+import com.instructure.espresso.page.plus
+import com.instructure.espresso.page.withAncestor
+import com.instructure.espresso.page.withDescendant
+import com.instructure.espresso.page.withId
+import com.instructure.espresso.page.withText
+import com.instructure.espresso.scrollTo
+import com.instructure.espresso.typeText
 import com.instructure.student.R
 import junit.framework.Assert.assertTrue
 import org.hamcrest.Matchers.allOf
@@ -130,7 +146,6 @@ class NewMessagePage : BasePage() {
 
     fun setMessage(messageText: String) {
         Espresso.closeSoftKeyboard()
-        onView(withId(R.id.messageContainer)).click()
         onView(allOf(withId(R.id.message), withAncestor(R.id.messageContainer)))
                 .scrollTo()
                 .typeText(messageText)

From a046574b765850d57444feabd2b893a01378866f Mon Sep 17 00:00:00 2001
From: inst-danger <ios@instructure.com>
Date: Tue, 29 Aug 2023 15:48:58 +0200
Subject: [PATCH 19/22] Extract translations (#2119)

---
 apps/flutter_parent/lib/l10n/res/intl_en.arb             | 9 ++++++++-
 apps/flutter_parent/lib/l10n/res/intl_messages.arb       | 9 ++++++++-
 libs/flutter_student_embed/lib/l10n/res/intl_en.arb      | 2 +-
 .../flutter_student_embed/lib/l10n/res/intl_messages.arb | 2 +-
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/apps/flutter_parent/lib/l10n/res/intl_en.arb b/apps/flutter_parent/lib/l10n/res/intl_en.arb
index 9d2ca6f103..d5edbf3ece 100644
--- a/apps/flutter_parent/lib/l10n/res/intl_en.arb
+++ b/apps/flutter_parent/lib/l10n/res/intl_en.arb
@@ -1,5 +1,5 @@
 {
-  "@@last_modified": "2023-04-14T11:04:46.988317",
+  "@@last_modified": "2023-08-25T11:04:20.901151",
   "alertsLabel": "Alerts",
   "@alertsLabel": {
     "description": "The label for the Alerts tab",
@@ -2742,5 +2742,12 @@
     "type": "text",
     "placeholders_order": [],
     "placeholders": {}
+  },
+  "Instructure logo": "Instructure logo",
+  "@Instructure logo": {
+    "description": "Semantics label for the Instructure logo on the about page",
+    "type": "text",
+    "placeholders_order": [],
+    "placeholders": {}
   }
 }
\ No newline at end of file
diff --git a/apps/flutter_parent/lib/l10n/res/intl_messages.arb b/apps/flutter_parent/lib/l10n/res/intl_messages.arb
index 9d2ca6f103..d5edbf3ece 100644
--- a/apps/flutter_parent/lib/l10n/res/intl_messages.arb
+++ b/apps/flutter_parent/lib/l10n/res/intl_messages.arb
@@ -1,5 +1,5 @@
 {
-  "@@last_modified": "2023-04-14T11:04:46.988317",
+  "@@last_modified": "2023-08-25T11:04:20.901151",
   "alertsLabel": "Alerts",
   "@alertsLabel": {
     "description": "The label for the Alerts tab",
@@ -2742,5 +2742,12 @@
     "type": "text",
     "placeholders_order": [],
     "placeholders": {}
+  },
+  "Instructure logo": "Instructure logo",
+  "@Instructure logo": {
+    "description": "Semantics label for the Instructure logo on the about page",
+    "type": "text",
+    "placeholders_order": [],
+    "placeholders": {}
   }
 }
\ No newline at end of file
diff --git a/libs/flutter_student_embed/lib/l10n/res/intl_en.arb b/libs/flutter_student_embed/lib/l10n/res/intl_en.arb
index 428ebdf814..451f221a09 100644
--- a/libs/flutter_student_embed/lib/l10n/res/intl_en.arb
+++ b/libs/flutter_student_embed/lib/l10n/res/intl_en.arb
@@ -1,5 +1,5 @@
 {
-  "@@last_modified": "2023-04-14T11:04:56.872320",
+  "@@last_modified": "2023-08-25T11:04:30.842905",
   "coursesLabel": "Courses",
   "@coursesLabel": {
     "description": "The label for the Courses tab",
diff --git a/libs/flutter_student_embed/lib/l10n/res/intl_messages.arb b/libs/flutter_student_embed/lib/l10n/res/intl_messages.arb
index 428ebdf814..451f221a09 100644
--- a/libs/flutter_student_embed/lib/l10n/res/intl_messages.arb
+++ b/libs/flutter_student_embed/lib/l10n/res/intl_messages.arb
@@ -1,5 +1,5 @@
 {
-  "@@last_modified": "2023-04-14T11:04:56.872320",
+  "@@last_modified": "2023-08-25T11:04:30.842905",
   "coursesLabel": "Courses",
   "@coursesLabel": {
     "description": "The label for the Courses tab",

From e2b5aafdf25418263f7147ff74ca74ee073afd02 Mon Sep 17 00:00:00 2001
From: Kristof Nemere <109959688+kristofnemere@users.noreply.github.com>
Date: Wed, 30 Aug 2023 11:21:36 +0200
Subject: [PATCH 20/22] [MBL-17008][Parent] Empty circle shown on assignment
 details when opening zero points assignment/quiz

refs: MBL-17008
affects: Parent
release note: none
---
 apps/flutter_parent/lib/models/grade_cell_data.dart | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/apps/flutter_parent/lib/models/grade_cell_data.dart b/apps/flutter_parent/lib/models/grade_cell_data.dart
index f3466b460c..b9c0d5d11f 100644
--- a/apps/flutter_parent/lib/models/grade_cell_data.dart
+++ b/apps/flutter_parent/lib/models/grade_cell_data.dart
@@ -72,7 +72,11 @@ abstract class GradeCellData implements Built<GradeCellData, GradeCellDataBuilde
     final restrictQuantitativeData = course?.settings?.restrictQuantitativeData ?? false;
 
     // Return empty state if null, unsubmitted and ungraded, or has a 'not graded' or restricted grading type
-    final restricted = restrictQuantitativeData && assignment.isGradingTypeQuantitative() && course.gradingSchemeItems.isEmpty && !excused;
+    final restricted = restrictQuantitativeData &&
+        assignment.isGradingTypeQuantitative() &&
+        (course.gradingSchemeItems.isEmpty || assignment?.pointsPossible == 0) &&
+        !excused;
+
     if (assignment == null ||
         submission == null ||
         (submission?.submittedAt == null && !excused && submission?.grade == null) ||

From 015a73f71b68e9691e4a7c019a30e940a5cc1a7a Mon Sep 17 00:00:00 2001
From: inst-danger <ios@instructure.com>
Date: Wed, 30 Aug 2023 13:43:06 +0200
Subject: [PATCH 21/22] Update translations (#2129)

---
 libs/login-api-2/src/main/res/values-ar/strings.xml             | 1 +
 .../login-api-2/src/main/res/values-b+da+DK+instk12/strings.xml | 1 +
 .../login-api-2/src/main/res/values-b+en+AU+unimelb/strings.xml | 1 +
 .../src/main/res/values-b+en+GB+instukhe/strings.xml            | 1 +
 .../login-api-2/src/main/res/values-b+nb+NO+instk12/strings.xml | 1 +
 .../login-api-2/src/main/res/values-b+sv+SE+instk12/strings.xml | 1 +
 libs/login-api-2/src/main/res/values-b+zh+HK/strings.xml        | 1 +
 libs/login-api-2/src/main/res/values-b+zh+Hans/strings.xml      | 1 +
 libs/login-api-2/src/main/res/values-b+zh+Hant/strings.xml      | 1 +
 libs/login-api-2/src/main/res/values-ca/strings.xml             | 1 +
 libs/login-api-2/src/main/res/values-cy/strings.xml             | 1 +
 libs/login-api-2/src/main/res/values-da/strings.xml             | 1 +
 libs/login-api-2/src/main/res/values-de/strings.xml             | 1 +
 libs/login-api-2/src/main/res/values-en-rAU/strings.xml         | 1 +
 libs/login-api-2/src/main/res/values-en-rCA/strings.xml         | 1 +
 libs/login-api-2/src/main/res/values-en-rCY/strings.xml         | 1 +
 libs/login-api-2/src/main/res/values-en-rGB/strings.xml         | 1 +
 libs/login-api-2/src/main/res/values-es-rES/strings.xml         | 1 +
 libs/login-api-2/src/main/res/values-es/strings.xml             | 1 +
 libs/login-api-2/src/main/res/values-fi/strings.xml             | 1 +
 libs/login-api-2/src/main/res/values-fr-rCA/strings.xml         | 1 +
 libs/login-api-2/src/main/res/values-fr/strings.xml             | 1 +
 libs/login-api-2/src/main/res/values-ht/strings.xml             | 1 +
 libs/login-api-2/src/main/res/values-is/strings.xml             | 1 +
 libs/login-api-2/src/main/res/values-it/strings.xml             | 1 +
 libs/login-api-2/src/main/res/values-ja/strings.xml             | 1 +
 libs/login-api-2/src/main/res/values-mi/strings.xml             | 1 +
 libs/login-api-2/src/main/res/values-ms/strings.xml             | 1 +
 libs/login-api-2/src/main/res/values-nb/strings.xml             | 1 +
 libs/login-api-2/src/main/res/values-nl/strings.xml             | 1 +
 libs/login-api-2/src/main/res/values-pl/strings.xml             | 1 +
 libs/login-api-2/src/main/res/values-pt-rBR/strings.xml         | 1 +
 libs/login-api-2/src/main/res/values-pt-rPT/strings.xml         | 1 +
 libs/login-api-2/src/main/res/values-ru/strings.xml             | 1 +
 libs/login-api-2/src/main/res/values-sl/strings.xml             | 1 +
 libs/login-api-2/src/main/res/values-sv/strings.xml             | 1 +
 libs/login-api-2/src/main/res/values-th/strings.xml             | 1 +
 libs/login-api-2/src/main/res/values-vi/strings.xml             | 1 +
 libs/login-api-2/src/main/res/values-zh/strings.xml             | 1 +
 libs/pandares/src/main/res/values-ar/strings.xml                | 2 ++
 libs/pandares/src/main/res/values-b+da+DK+instk12/strings.xml   | 2 ++
 libs/pandares/src/main/res/values-b+en+AU+unimelb/strings.xml   | 2 ++
 libs/pandares/src/main/res/values-b+en+GB+instukhe/strings.xml  | 2 ++
 libs/pandares/src/main/res/values-b+nb+NO+instk12/strings.xml   | 2 ++
 libs/pandares/src/main/res/values-b+sv+SE+instk12/strings.xml   | 2 ++
 libs/pandares/src/main/res/values-b+zh+HK/strings.xml           | 2 ++
 libs/pandares/src/main/res/values-b+zh+Hans/strings.xml         | 2 ++
 libs/pandares/src/main/res/values-b+zh+Hant/strings.xml         | 2 ++
 libs/pandares/src/main/res/values-ca/strings.xml                | 2 ++
 libs/pandares/src/main/res/values-cy/strings.xml                | 2 ++
 libs/pandares/src/main/res/values-da/strings.xml                | 2 ++
 libs/pandares/src/main/res/values-de/strings.xml                | 2 ++
 libs/pandares/src/main/res/values-en-rAU/strings.xml            | 2 ++
 libs/pandares/src/main/res/values-en-rCY/strings.xml            | 2 ++
 libs/pandares/src/main/res/values-en-rGB/strings.xml            | 2 ++
 libs/pandares/src/main/res/values-es-rES/strings.xml            | 2 ++
 libs/pandares/src/main/res/values-es/strings.xml                | 2 ++
 libs/pandares/src/main/res/values-fi/strings.xml                | 2 ++
 libs/pandares/src/main/res/values-fr-rCA/strings.xml            | 2 ++
 libs/pandares/src/main/res/values-fr/strings.xml                | 2 ++
 libs/pandares/src/main/res/values-ht/strings.xml                | 2 ++
 libs/pandares/src/main/res/values-is/strings.xml                | 2 ++
 libs/pandares/src/main/res/values-it/strings.xml                | 2 ++
 libs/pandares/src/main/res/values-ja/strings.xml                | 2 ++
 libs/pandares/src/main/res/values-mi/strings.xml                | 2 ++
 libs/pandares/src/main/res/values-ms/strings.xml                | 2 ++
 libs/pandares/src/main/res/values-nb/strings.xml                | 2 ++
 libs/pandares/src/main/res/values-nl/strings.xml                | 2 ++
 libs/pandares/src/main/res/values-pl/strings.xml                | 2 ++
 libs/pandares/src/main/res/values-pt-rBR/strings.xml            | 2 ++
 libs/pandares/src/main/res/values-pt-rPT/strings.xml            | 2 ++
 libs/pandares/src/main/res/values-ru/strings.xml                | 2 ++
 libs/pandares/src/main/res/values-sl/strings.xml                | 2 ++
 libs/pandares/src/main/res/values-sv/strings.xml                | 2 ++
 libs/pandares/src/main/res/values-th/strings.xml                | 2 ++
 libs/pandares/src/main/res/values-vi/strings.xml                | 2 ++
 libs/pandares/src/main/res/values-zh/strings.xml                | 2 ++
 77 files changed, 115 insertions(+)

diff --git a/libs/login-api-2/src/main/res/values-ar/strings.xml b/libs/login-api-2/src/main/res/values-ar/strings.xml
index 23551097f6..a6dc6fea19 100644
--- a/libs/login-api-2/src/main/res/values-ar/strings.xml
+++ b/libs/login-api-2/src/main/res/values-ar/strings.xml
@@ -109,6 +109,7 @@
     <string name="schoolInstructureCom">school.instructure.com</string>
     <string name="contentDescription_removePreviousUser">حذف المستخدم السابق</string>
     <string name="accountDomainFooter">ألا تستطيع العثور على مدرستك؟ حاول كتابة رابط URL الكامل للمدرسة.</string>
+    <string name="accountDomainFooterLink">اضغط هنا للحصول على المساعدة.</string>
 
     <string name="login_noInternetConnectionTitle">لا يوجد اتصال بالإنترنت</string>
     <string name="login_noInternetConnectionMessage">يتطلب هذا الإجراء اتصالاً بالإنترنت.</string>
diff --git a/libs/login-api-2/src/main/res/values-b+da+DK+instk12/strings.xml b/libs/login-api-2/src/main/res/values-b+da+DK+instk12/strings.xml
index 2f2c627f22..c14f873ae4 100644
--- a/libs/login-api-2/src/main/res/values-b+da+DK+instk12/strings.xml
+++ b/libs/login-api-2/src/main/res/values-b+da+DK+instk12/strings.xml
@@ -111,6 +111,7 @@
     <string name="schoolInstructureCom">school.instructure.com</string>
     <string name="contentDescription_removePreviousUser">Fjern forrige bruger</string>
     <string name="accountDomainFooter">Kan du ikke finde din skole? Prøv at indtaste skolens fulde URL.</string>
+    <string name="accountDomainFooterLink">Tryk her for at få hjælp.</string>
 
     <string name="login_noInternetConnectionTitle">Ingen internetforbindelse</string>
     <string name="login_noInternetConnectionMessage">Denne handling kræver en internetforbindelse.</string>
diff --git a/libs/login-api-2/src/main/res/values-b+en+AU+unimelb/strings.xml b/libs/login-api-2/src/main/res/values-b+en+AU+unimelb/strings.xml
index de85b5f2a0..562a29b642 100644
--- a/libs/login-api-2/src/main/res/values-b+en+AU+unimelb/strings.xml
+++ b/libs/login-api-2/src/main/res/values-b+en+AU+unimelb/strings.xml
@@ -109,6 +109,7 @@
     <string name="schoolInstructureCom">school.instructure.com</string>
     <string name="contentDescription_removePreviousUser">Remove Previous User</string>
     <string name="accountDomainFooter">Can\'t find your school? Try typing the full school URL.</string>
+    <string name="accountDomainFooterLink">Tap here for help.</string>
 
     <string name="login_noInternetConnectionTitle">No Internet Connection</string>
     <string name="login_noInternetConnectionMessage">This action requires an internet connection.</string>
diff --git a/libs/login-api-2/src/main/res/values-b+en+GB+instukhe/strings.xml b/libs/login-api-2/src/main/res/values-b+en+GB+instukhe/strings.xml
index 9ad8745705..2008cc1293 100644
--- a/libs/login-api-2/src/main/res/values-b+en+GB+instukhe/strings.xml
+++ b/libs/login-api-2/src/main/res/values-b+en+GB+instukhe/strings.xml
@@ -111,6 +111,7 @@
     <string name="schoolInstructureCom">school.instructure.com</string>
     <string name="contentDescription_removePreviousUser">Remove Previous User</string>
     <string name="accountDomainFooter">Can\'t find your school? Try typing the full school URL.</string>
+    <string name="accountDomainFooterLink">Tap here for help.</string>
 
     <string name="login_noInternetConnectionTitle">No Internet Connection</string>
     <string name="login_noInternetConnectionMessage">This action requires an internet connection.</string>
diff --git a/libs/login-api-2/src/main/res/values-b+nb+NO+instk12/strings.xml b/libs/login-api-2/src/main/res/values-b+nb+NO+instk12/strings.xml
index 527ce5beb1..ec5a6c20af 100644
--- a/libs/login-api-2/src/main/res/values-b+nb+NO+instk12/strings.xml
+++ b/libs/login-api-2/src/main/res/values-b+nb+NO+instk12/strings.xml
@@ -110,6 +110,7 @@
     <string name="schoolInstructureCom">school.instructure.com</string>
     <string name="contentDescription_removePreviousUser">Fjerne forrige bruker</string>
     <string name="accountDomainFooter">Finner du ikke skolen din? Prøv å skrive hele skolens URL.</string>
+    <string name="accountDomainFooterLink">Trykk her for hjelp.</string>
 
     <string name="login_noInternetConnectionTitle">Ingen Internett-tilkobling</string>
     <string name="login_noInternetConnectionMessage">Denne handlingen krever Internett-tilkobling.</string>
diff --git a/libs/login-api-2/src/main/res/values-b+sv+SE+instk12/strings.xml b/libs/login-api-2/src/main/res/values-b+sv+SE+instk12/strings.xml
index cd28a78c01..6545349e99 100644
--- a/libs/login-api-2/src/main/res/values-b+sv+SE+instk12/strings.xml
+++ b/libs/login-api-2/src/main/res/values-b+sv+SE+instk12/strings.xml
@@ -111,6 +111,7 @@
     <string name="schoolInstructureCom">school.instructure.com</string>
     <string name="contentDescription_removePreviousUser">Ta bort tidigare användare</string>
     <string name="accountDomainFooter">Kan du inte hitta din skola? Försök att skriva in skolans fullständiga URL.</string>
+    <string name="accountDomainFooterLink">Tryck här för hjälp.</string>
 
     <string name="login_noInternetConnectionTitle">Ingen internetanslutning</string>
     <string name="login_noInternetConnectionMessage">Den här åtgärden kräver internetanslutning.</string>
diff --git a/libs/login-api-2/src/main/res/values-b+zh+HK/strings.xml b/libs/login-api-2/src/main/res/values-b+zh+HK/strings.xml
index 438733e270..7617208253 100644
--- a/libs/login-api-2/src/main/res/values-b+zh+HK/strings.xml
+++ b/libs/login-api-2/src/main/res/values-b+zh+HK/strings.xml
@@ -109,6 +109,7 @@
     <string name="schoolInstructureCom">school.instructure.com</string>
     <string name="contentDescription_removePreviousUser">移除先前使用者</string>
     <string name="accountDomainFooter">找不到您的學校？請嘗試輸入學校完整URL。</string>
+    <string name="accountDomainFooterLink">點擊此處獲取支援。</string>
 
     <string name="login_noInternetConnectionTitle">沒有網絡連線</string>
     <string name="login_noInternetConnectionMessage">此動作需要網絡連線。</string>
diff --git a/libs/login-api-2/src/main/res/values-b+zh+Hans/strings.xml b/libs/login-api-2/src/main/res/values-b+zh+Hans/strings.xml
index 72d0ea9c83..871b422f6d 100644
--- a/libs/login-api-2/src/main/res/values-b+zh+Hans/strings.xml
+++ b/libs/login-api-2/src/main/res/values-b+zh+Hans/strings.xml
@@ -109,6 +109,7 @@
     <string name="schoolInstructureCom">school.instructure.com</string>
     <string name="contentDescription_removePreviousUser">删除上一个用户</string>
     <string name="accountDomainFooter">找不到您的学校？尝试键入完整的学校 URL。</string>
+    <string name="accountDomainFooterLink">轻击此处获取帮助。</string>
 
     <string name="login_noInternetConnectionTitle">无互联网连接</string>
     <string name="login_noInternetConnectionMessage">此操作需要互联网连接。</string>
diff --git a/libs/login-api-2/src/main/res/values-b+zh+Hant/strings.xml b/libs/login-api-2/src/main/res/values-b+zh+Hant/strings.xml
index 438733e270..7617208253 100644
--- a/libs/login-api-2/src/main/res/values-b+zh+Hant/strings.xml
+++ b/libs/login-api-2/src/main/res/values-b+zh+Hant/strings.xml
@@ -109,6 +109,7 @@
     <string name="schoolInstructureCom">school.instructure.com</string>
     <string name="contentDescription_removePreviousUser">移除先前使用者</string>
     <string name="accountDomainFooter">找不到您的學校？請嘗試輸入學校完整URL。</string>
+    <string name="accountDomainFooterLink">點擊此處獲取支援。</string>
 
     <string name="login_noInternetConnectionTitle">沒有網絡連線</string>
     <string name="login_noInternetConnectionMessage">此動作需要網絡連線。</string>
diff --git a/libs/login-api-2/src/main/res/values-ca/strings.xml b/libs/login-api-2/src/main/res/values-ca/strings.xml
index 6bbb991bd4..36169a8672 100644
--- a/libs/login-api-2/src/main/res/values-ca/strings.xml
+++ b/libs/login-api-2/src/main/res/values-ca/strings.xml
@@ -111,6 +111,7 @@
     <string name="schoolInstructureCom">school.instructure.com</string>
     <string name="contentDescription_removePreviousUser">Eliminar l\'usuari anterior</string>
     <string name="accountDomainFooter">No trobeu la vostra escola? Proveu d\'escriure l\'URL de l\'escola complet.</string>
+    <string name="accountDomainFooterLink">Toqueu aquí per obtenir ajuda.</string>
 
     <string name="login_noInternetConnectionTitle">No hi ha cap connexió a Internet</string>
     <string name="login_noInternetConnectionMessage">Per dur a terme aquesta acció cal tenir una connexió a Internet.</string>
diff --git a/libs/login-api-2/src/main/res/values-cy/strings.xml b/libs/login-api-2/src/main/res/values-cy/strings.xml
index 11cfe6cf52..0e1d15dd39 100644
--- a/libs/login-api-2/src/main/res/values-cy/strings.xml
+++ b/libs/login-api-2/src/main/res/values-cy/strings.xml
@@ -109,6 +109,7 @@
     <string name="schoolInstructureCom">school.instructure.com</string>
     <string name="contentDescription_removePreviousUser">Tynnu defnyddiwr blaenorol?</string>
     <string name="accountDomainFooter">Methu dod o hyd i’ch ysgol? Ceisiwch deipio URL llawn yr ysgol.</string>
+    <string name="accountDomainFooterLink">Tapiwch yma i gael help.</string>
 
     <string name="login_noInternetConnectionTitle">Dim cysylltiad â\'r rhyngrwyd</string>
     <string name="login_noInternetConnectionMessage">Mae angen cysylltiad â\'r rhyngrwyd i wneud hyn.</string>
diff --git a/libs/login-api-2/src/main/res/values-da/strings.xml b/libs/login-api-2/src/main/res/values-da/strings.xml
index 8f1838288b..1faf265adb 100644
--- a/libs/login-api-2/src/main/res/values-da/strings.xml
+++ b/libs/login-api-2/src/main/res/values-da/strings.xml
@@ -109,6 +109,7 @@
     <string name="schoolInstructureCom">school.instructure.com</string>
     <string name="contentDescription_removePreviousUser">Fjern forrige bruger</string>
     <string name="accountDomainFooter">Kan du ikke finde din skole? Prøv at indtaste skolens fulde URL.</string>
+    <string name="accountDomainFooterLink">Tryk her for at få hjælp.</string>
 
     <string name="login_noInternetConnectionTitle">Ingen internetforbindelse</string>
     <string name="login_noInternetConnectionMessage">Denne handling kræver en internetforbindelse.</string>
diff --git a/libs/login-api-2/src/main/res/values-de/strings.xml b/libs/login-api-2/src/main/res/values-de/strings.xml
index 47261dfc0b..8389e442df 100644
--- a/libs/login-api-2/src/main/res/values-de/strings.xml
+++ b/libs/login-api-2/src/main/res/values-de/strings.xml
@@ -109,6 +109,7 @@
     <string name="schoolInstructureCom">school.instructure.com</string>
     <string name="contentDescription_removePreviousUser">Vorherige/n Benutzer*in entfernen</string>
     <string name="accountDomainFooter">Finden Sie Ihre Schule nicht? Geben Sie den vollständigen URL der Schule ein.</string>
+    <string name="accountDomainFooterLink">Tippen Sie hier, um Hilfe zu erhalten.</string>
 
     <string name="login_noInternetConnectionTitle">Keine Internetverbindung</string>
     <string name="login_noInternetConnectionMessage">Diese Aktion erfordert eine Internetverbindung.</string>
diff --git a/libs/login-api-2/src/main/res/values-en-rAU/strings.xml b/libs/login-api-2/src/main/res/values-en-rAU/strings.xml
index de85b5f2a0..562a29b642 100644
--- a/libs/login-api-2/src/main/res/values-en-rAU/strings.xml
+++ b/libs/login-api-2/src/main/res/values-en-rAU/strings.xml
@@ -109,6 +109,7 @@
     <string name="schoolInstructureCom">school.instructure.com</string>
     <string name="contentDescription_removePreviousUser">Remove Previous User</string>
     <string name="accountDomainFooter">Can\'t find your school? Try typing the full school URL.</string>
+    <string name="accountDomainFooterLink">Tap here for help.</string>
 
     <string name="login_noInternetConnectionTitle">No Internet Connection</string>
     <string name="login_noInternetConnectionMessage">This action requires an internet connection.</string>
diff --git a/libs/login-api-2/src/main/res/values-en-rCA/strings.xml b/libs/login-api-2/src/main/res/values-en-rCA/strings.xml
index 3727f20dd5..d319e90b16 100644
--- a/libs/login-api-2/src/main/res/values-en-rCA/strings.xml
+++ b/libs/login-api-2/src/main/res/values-en-rCA/strings.xml
@@ -112,6 +112,7 @@ F
     <string name="schoolInstructureCom">school.instructure.com</string>
     <string name="contentDescription_removePreviousUser">Remove Previous User</string>
     <string name="accountDomainFooter">Can\'t find your school? Try typing the full school URL.</string>
+    <string name="accountDomainFooterLink">Tap here for help.</string>
 
     <string name="login_noInternetConnectionTitle">No Internet Connection</string>
     <string name="login_noInternetConnectionMessage">This action requires an internet connection.</string>
diff --git a/libs/login-api-2/src/main/res/values-en-rCY/strings.xml b/libs/login-api-2/src/main/res/values-en-rCY/strings.xml
index 9ad8745705..2008cc1293 100644
--- a/libs/login-api-2/src/main/res/values-en-rCY/strings.xml
+++ b/libs/login-api-2/src/main/res/values-en-rCY/strings.xml
@@ -111,6 +111,7 @@
     <string name="schoolInstructureCom">school.instructure.com</string>
     <string name="contentDescription_removePreviousUser">Remove Previous User</string>
     <string name="accountDomainFooter">Can\'t find your school? Try typing the full school URL.</string>
+    <string name="accountDomainFooterLink">Tap here for help.</string>
 
     <string name="login_noInternetConnectionTitle">No Internet Connection</string>
     <string name="login_noInternetConnectionMessage">This action requires an internet connection.</string>
diff --git a/libs/login-api-2/src/main/res/values-en-rGB/strings.xml b/libs/login-api-2/src/main/res/values-en-rGB/strings.xml
index 4b3cdd4bcb..4efa16bd21 100644
--- a/libs/login-api-2/src/main/res/values-en-rGB/strings.xml
+++ b/libs/login-api-2/src/main/res/values-en-rGB/strings.xml
@@ -109,6 +109,7 @@
     <string name="schoolInstructureCom">school.instructure.com</string>
     <string name="contentDescription_removePreviousUser">Remove Previous User</string>
     <string name="accountDomainFooter">Can\'t find your school? Try typing the full school URL.</string>
+    <string name="accountDomainFooterLink">Tap here for help.</string>
 
     <string name="login_noInternetConnectionTitle">No Internet Connection</string>
     <string name="login_noInternetConnectionMessage">This action requires an internet connection.</string>
diff --git a/libs/login-api-2/src/main/res/values-es-rES/strings.xml b/libs/login-api-2/src/main/res/values-es-rES/strings.xml
index feeaaaa281..34f0ec1e70 100644
--- a/libs/login-api-2/src/main/res/values-es-rES/strings.xml
+++ b/libs/login-api-2/src/main/res/values-es-rES/strings.xml
@@ -110,6 +110,7 @@
     <string name="schoolInstructureCom">school.instructure.com</string>
     <string name="contentDescription_removePreviousUser">Eliminar usuario anterior</string>
     <string name="accountDomainFooter">¿No puedes encontrar tu escuela? Intenta escribir la URL completa de la escuela.</string>
+    <string name="accountDomainFooterLink">Toca aquí para obtener ayuda.</string>
 
     <string name="login_noInternetConnectionTitle">No hay conexión a Internet</string>
     <string name="login_noInternetConnectionMessage">Esta acción requiere conexión a Internet.</string>
diff --git a/libs/login-api-2/src/main/res/values-es/strings.xml b/libs/login-api-2/src/main/res/values-es/strings.xml
index 3b4c42e957..f87d909f6e 100644
--- a/libs/login-api-2/src/main/res/values-es/strings.xml
+++ b/libs/login-api-2/src/main/res/values-es/strings.xml
@@ -111,6 +111,7 @@
     <string name="schoolInstructureCom">school.instructure.com</string>
     <string name="contentDescription_removePreviousUser">Eliminar usuario anterior</string>
     <string name="accountDomainFooter">¿No puede encontrar su escuela? Intente escribir la URL completa de la escuela.</string>
+    <string name="accountDomainFooterLink">Presione aquí para obtener ayuda.</string>
 
     <string name="login_noInternetConnectionTitle">Sin conexión a Internet</string>
     <string name="login_noInternetConnectionMessage">Esta acción requiere conexión a Internet.</string>
diff --git a/libs/login-api-2/src/main/res/values-fi/strings.xml b/libs/login-api-2/src/main/res/values-fi/strings.xml
index f64c603f8d..4157a60613 100644
--- a/libs/login-api-2/src/main/res/values-fi/strings.xml
+++ b/libs/login-api-2/src/main/res/values-fi/strings.xml
@@ -111,6 +111,7 @@
     <string name="schoolInstructureCom">school.instructure.com</string>
     <string name="contentDescription_removePreviousUser">Poista edellinen käyttäjä</string>
     <string name="accountDomainFooter">Etkö löydä kouluasi? Yritä kirjoittaa koko koulun URL</string>
+    <string name="accountDomainFooterLink">Avaa ohje napauttamalla tässä.</string>
 
     <string name="login_noInternetConnectionTitle">Ei Internet-yhteyttä</string>
     <string name="login_noInternetConnectionMessage">Tähän toimintoon vaaditaan Internet-yhteys.</string>
diff --git a/libs/login-api-2/src/main/res/values-fr-rCA/strings.xml b/libs/login-api-2/src/main/res/values-fr-rCA/strings.xml
index 3ca2376d4b..060153b513 100644
--- a/libs/login-api-2/src/main/res/values-fr-rCA/strings.xml
+++ b/libs/login-api-2/src/main/res/values-fr-rCA/strings.xml
@@ -109,6 +109,7 @@
     <string name="schoolInstructureCom">school.instructure.com</string>
     <string name="contentDescription_removePreviousUser">Retirer l\'utilisateur précédent</string>
     <string name="accountDomainFooter">Vous ne trouvez pas votre école? Essayez de saisir l\'URL complète de l’école.</string>
+    <string name="accountDomainFooterLink">Appuyer ici pour obtenir de l\'aide.</string>
 
     <string name="login_noInternetConnectionTitle">Aucune connexion Internet</string>
     <string name="login_noInternetConnectionMessage">Cette action nécessite une connexion Internet.</string>
diff --git a/libs/login-api-2/src/main/res/values-fr/strings.xml b/libs/login-api-2/src/main/res/values-fr/strings.xml
index 538a698666..d2a7dedb52 100644
--- a/libs/login-api-2/src/main/res/values-fr/strings.xml
+++ b/libs/login-api-2/src/main/res/values-fr/strings.xml
@@ -109,6 +109,7 @@
     <string name="schoolInstructureCom">school.instructure.com</string>
     <string name="contentDescription_removePreviousUser">Supprimer utilisateur précédent</string>
     <string name="accountDomainFooter">Vous ne trouvez pas votre école ? Essayez d’entrer l’URL complète de l’école</string>
+    <string name="accountDomainFooterLink">Appuyez ici pour obtenir de l’aide.</string>
 
     <string name="login_noInternetConnectionTitle">Aucune connexion internet</string>
     <string name="login_noInternetConnectionMessage">Cette action nécessite une connexion Internet.</string>
diff --git a/libs/login-api-2/src/main/res/values-ht/strings.xml b/libs/login-api-2/src/main/res/values-ht/strings.xml
index 4303be39f4..2eea2ac773 100644
--- a/libs/login-api-2/src/main/res/values-ht/strings.xml
+++ b/libs/login-api-2/src/main/res/values-ht/strings.xml
@@ -109,6 +109,7 @@
     <string name="schoolInstructureCom">school.instructure.com</string>
     <string name="contentDescription_removePreviousUser">Elimine Ansyen Itilizatè</string>
     <string name="accountDomainFooter">Ou paka jwenn lekòl ou a? Eseye tape tout URL lekòl la</string>
+    <string name="accountDomainFooterLink">Tape la pou èd.</string>
 
     <string name="login_noInternetConnectionTitle">Pa gen Koneksyon Internet</string>
     <string name="login_noInternetConnectionMessage">Pou aksyon sa a ou bezwen konekte sou entènèt.</string>
diff --git a/libs/login-api-2/src/main/res/values-is/strings.xml b/libs/login-api-2/src/main/res/values-is/strings.xml
index 4ac89d3b60..ab6760cb70 100644
--- a/libs/login-api-2/src/main/res/values-is/strings.xml
+++ b/libs/login-api-2/src/main/res/values-is/strings.xml
@@ -111,6 +111,7 @@
     <string name="schoolInstructureCom">school.instructure.com</string>
     <string name="contentDescription_removePreviousUser">Fjarlægja fyrri notanda</string>
     <string name="accountDomainFooter">Finnurðu ekki skólann þinn? Prufaðu að slá inn alla vefslóð skólans.</string>
+    <string name="accountDomainFooterLink">Smelltu hér til að fá hjálp.</string>
 
     <string name="login_noInternetConnectionTitle">Engin nettenging</string>
     <string name="login_noInternetConnectionMessage">Þessi aðgerð krefst nettengingar.</string>
diff --git a/libs/login-api-2/src/main/res/values-it/strings.xml b/libs/login-api-2/src/main/res/values-it/strings.xml
index 675781a920..541ff2dc4e 100644
--- a/libs/login-api-2/src/main/res/values-it/strings.xml
+++ b/libs/login-api-2/src/main/res/values-it/strings.xml
@@ -111,6 +111,7 @@
     <string name="schoolInstructureCom">school.instructure.com</string>
     <string name="contentDescription_removePreviousUser">Rimuovi utente precedente</string>
     <string name="accountDomainFooter">Non riesci a trova la tua scuola? Prova a digitare l’URL della scuola per intero.</string>
+    <string name="accountDomainFooterLink">Tocca qui per assistenza.</string>
 
     <string name="login_noInternetConnectionTitle">Nessuna connessione a Internet</string>
     <string name="login_noInternetConnectionMessage">Questa azione richiede una connessione a Internet.</string>
diff --git a/libs/login-api-2/src/main/res/values-ja/strings.xml b/libs/login-api-2/src/main/res/values-ja/strings.xml
index 13acaf4ee3..01da4c3a5d 100644
--- a/libs/login-api-2/src/main/res/values-ja/strings.xml
+++ b/libs/login-api-2/src/main/res/values-ja/strings.xml
@@ -109,6 +109,7 @@
     <string name="schoolInstructureCom">school.instructure.com</string>
     <string name="contentDescription_removePreviousUser">以前のユーザーを削除</string>
     <string name="accountDomainFooter">学校が見つかりませんか？学校の完全なURLを入力してみてください。</string>
+    <string name="accountDomainFooterLink">ここをタップしてヘルプを表示します。</string>
 
     <string name="login_noInternetConnectionTitle">インターネット接続なし</string>
     <string name="login_noInternetConnectionMessage">この操作にはインターネット接続が必要です。</string>
diff --git a/libs/login-api-2/src/main/res/values-mi/strings.xml b/libs/login-api-2/src/main/res/values-mi/strings.xml
index 59b0fc3de9..772695e3af 100644
--- a/libs/login-api-2/src/main/res/values-mi/strings.xml
+++ b/libs/login-api-2/src/main/res/values-mi/strings.xml
@@ -111,6 +111,7 @@
     <string name="schoolInstructureCom">school.instructure.com</string>
     <string name="contentDescription_removePreviousUser">Tango Kaiwhakmahi o mua</string>
     <string name="accountDomainFooter">Kaore e kitea tō kura? Ngana ki te pātō te nuinga o te kura url</string>
+    <string name="accountDomainFooterLink">Pātō ki kōnei mo te awhina</string>
 
     <string name="login_noInternetConnectionTitle">Kaore he hononga ipurangi</string>
     <string name="login_noInternetConnectionMessage">Tēnei mahi ka mahi he hononga ipurangi</string>
diff --git a/libs/login-api-2/src/main/res/values-ms/strings.xml b/libs/login-api-2/src/main/res/values-ms/strings.xml
index 4229891bcc..b8be733a44 100644
--- a/libs/login-api-2/src/main/res/values-ms/strings.xml
+++ b/libs/login-api-2/src/main/res/values-ms/strings.xml
@@ -110,6 +110,7 @@
     <string name="schoolInstructureCom">school.instructure.com</string>
     <string name="contentDescription_removePreviousUser">Alih Keluar Pengguna Sebelumnya</string>
     <string name="accountDomainFooter">Tidak menemui sekolah anda? Cuba taip URL sekolah yang penuh.</string>
+    <string name="accountDomainFooterLink">Ketik di sini untuk mendapatkan bantuan.</string>
 
     <string name="login_noInternetConnectionTitle">Tiada Sambungan Internet</string>
     <string name="login_noInternetConnectionMessage">Tindakan ini memerlukan sambungan Internet</string>
diff --git a/libs/login-api-2/src/main/res/values-nb/strings.xml b/libs/login-api-2/src/main/res/values-nb/strings.xml
index e062fe3ba6..1d7d7e6851 100644
--- a/libs/login-api-2/src/main/res/values-nb/strings.xml
+++ b/libs/login-api-2/src/main/res/values-nb/strings.xml
@@ -111,6 +111,7 @@
     <string name="schoolInstructureCom">school.instructure.com</string>
     <string name="contentDescription_removePreviousUser">Fjerne forrige bruker</string>
     <string name="accountDomainFooter">Finner du ikke skolen din? Prøv å skrive hele skolens URL.</string>
+    <string name="accountDomainFooterLink">Trykk her for hjelp.</string>
 
     <string name="login_noInternetConnectionTitle">Ingen Internett-tilkobling</string>
     <string name="login_noInternetConnectionMessage">Denne handlingen krever Internett-tilkobling.</string>
diff --git a/libs/login-api-2/src/main/res/values-nl/strings.xml b/libs/login-api-2/src/main/res/values-nl/strings.xml
index 5b4e4a596b..0e4ae4a8f3 100644
--- a/libs/login-api-2/src/main/res/values-nl/strings.xml
+++ b/libs/login-api-2/src/main/res/values-nl/strings.xml
@@ -109,6 +109,7 @@
     <string name="schoolInstructureCom">school.instructure.com</string>
     <string name="contentDescription_removePreviousUser">Vorige gebruiker verwijderen</string>
     <string name="accountDomainFooter">Kun je je school niet vinden? Typ de volledige URL van de school.</string>
+    <string name="accountDomainFooterLink">Tik hier voor hulp.</string>
 
     <string name="login_noInternetConnectionTitle">Geen internetverbinding</string>
     <string name="login_noInternetConnectionMessage">Voor deze actie is een internetverbinding vereist.</string>
diff --git a/libs/login-api-2/src/main/res/values-pl/strings.xml b/libs/login-api-2/src/main/res/values-pl/strings.xml
index 64e3193940..552807641f 100644
--- a/libs/login-api-2/src/main/res/values-pl/strings.xml
+++ b/libs/login-api-2/src/main/res/values-pl/strings.xml
@@ -109,6 +109,7 @@
     <string name="schoolInstructureCom">school.instructure.com</string>
     <string name="contentDescription_removePreviousUser">Usuń poprzedniego użytkownika</string>
     <string name="accountDomainFooter">Nie możesz znaleźć swojej szkoły? Spróbuj wprowadzić pełen adres URL szkoły.</string>
+    <string name="accountDomainFooterLink">Stuknij tutaj, aby uzyskać pomoc.</string>
 
     <string name="login_noInternetConnectionTitle">Brak połączenia internetowego</string>
     <string name="login_noInternetConnectionMessage">To działanie wymaga połączenia internetowego.</string>
diff --git a/libs/login-api-2/src/main/res/values-pt-rBR/strings.xml b/libs/login-api-2/src/main/res/values-pt-rBR/strings.xml
index 21fd1ffc8e..24542db009 100644
--- a/libs/login-api-2/src/main/res/values-pt-rBR/strings.xml
+++ b/libs/login-api-2/src/main/res/values-pt-rBR/strings.xml
@@ -111,6 +111,7 @@
     <string name="schoolInstructureCom">school.instructure.com</string>
     <string name="contentDescription_removePreviousUser">Remover usuário anterior</string>
     <string name="accountDomainFooter">Não consegue localizar a sua escola? Tente digitar a URL completa da escola.</string>
+    <string name="accountDomainFooterLink">Toque aqui para ajuda.</string>
 
     <string name="login_noInternetConnectionTitle">Sem conexão à internet</string>
     <string name="login_noInternetConnectionMessage">Esta ação exige conexão à internet.</string>
diff --git a/libs/login-api-2/src/main/res/values-pt-rPT/strings.xml b/libs/login-api-2/src/main/res/values-pt-rPT/strings.xml
index 549dc0523c..e6147e54df 100644
--- a/libs/login-api-2/src/main/res/values-pt-rPT/strings.xml
+++ b/libs/login-api-2/src/main/res/values-pt-rPT/strings.xml
@@ -109,6 +109,7 @@
     <string name="schoolInstructureCom">school.instructure.com</string>
     <string name="contentDescription_removePreviousUser">Remover utilizador anterior?</string>
     <string name="accountDomainFooter">Não vê sua escola? Tente digitar o URL completo da escola.</string>
+    <string name="accountDomainFooterLink">Toque aqui para ajuda.</string>
 
     <string name="login_noInternetConnectionTitle">Sem ligação à Internet</string>
     <string name="login_noInternetConnectionMessage">Esta ação requer uma conexão com a internet.</string>
diff --git a/libs/login-api-2/src/main/res/values-ru/strings.xml b/libs/login-api-2/src/main/res/values-ru/strings.xml
index ecaff5b7c8..b2730ba446 100644
--- a/libs/login-api-2/src/main/res/values-ru/strings.xml
+++ b/libs/login-api-2/src/main/res/values-ru/strings.xml
@@ -109,6 +109,7 @@
     <string name="schoolInstructureCom">school.instructure.com</string>
     <string name="contentDescription_removePreviousUser">Удалить предыдущего пользователя</string>
     <string name="accountDomainFooter">Не удается найти свое учебное заведение? Попробуйте набрать полный адрес URL учебного заведения.</string>
+    <string name="accountDomainFooterLink">Прикоснитесь здесь для получения помощи.</string>
 
     <string name="login_noInternetConnectionTitle">Нет интернет-соединения</string>
     <string name="login_noInternetConnectionMessage">Для выполнения этого действия необходимо интернет-соединение.</string>
diff --git a/libs/login-api-2/src/main/res/values-sl/strings.xml b/libs/login-api-2/src/main/res/values-sl/strings.xml
index 9501e8172f..22206a77c5 100644
--- a/libs/login-api-2/src/main/res/values-sl/strings.xml
+++ b/libs/login-api-2/src/main/res/values-sl/strings.xml
@@ -111,6 +111,7 @@
     <string name="schoolInstructureCom">school.instructure.com</string>
     <string name="contentDescription_removePreviousUser">Odstrani predhodnega uporabnika</string>
     <string name="accountDomainFooter">Ali svoje šole ne najdete? Poskusite vnesti poln naslov URL šole.</string>
+    <string name="accountDomainFooterLink">Za pomoč tapnite tukaj.</string>
 
     <string name="login_noInternetConnectionTitle">Brez internetne povezave.</string>
     <string name="login_noInternetConnectionMessage">Pri tem dejanju je potrebna internetna povezava.</string>
diff --git a/libs/login-api-2/src/main/res/values-sv/strings.xml b/libs/login-api-2/src/main/res/values-sv/strings.xml
index cd28a78c01..6545349e99 100644
--- a/libs/login-api-2/src/main/res/values-sv/strings.xml
+++ b/libs/login-api-2/src/main/res/values-sv/strings.xml
@@ -111,6 +111,7 @@
     <string name="schoolInstructureCom">school.instructure.com</string>
     <string name="contentDescription_removePreviousUser">Ta bort tidigare användare</string>
     <string name="accountDomainFooter">Kan du inte hitta din skola? Försök att skriva in skolans fullständiga URL.</string>
+    <string name="accountDomainFooterLink">Tryck här för hjälp.</string>
 
     <string name="login_noInternetConnectionTitle">Ingen internetanslutning</string>
     <string name="login_noInternetConnectionMessage">Den här åtgärden kräver internetanslutning.</string>
diff --git a/libs/login-api-2/src/main/res/values-th/strings.xml b/libs/login-api-2/src/main/res/values-th/strings.xml
index fe43425e2e..5ca4798884 100644
--- a/libs/login-api-2/src/main/res/values-th/strings.xml
+++ b/libs/login-api-2/src/main/res/values-th/strings.xml
@@ -110,6 +110,7 @@
     <string name="schoolInstructureCom">school.instructure.com</string>
     <string name="contentDescription_removePreviousUser">ลบผู้ใช้ก่อนหน้า</string>
     <string name="accountDomainFooter">ไม่พบโรงเรียนของคุณ ลองพิมพ์ URL เต็มของสถานศึกษา</string>
+    <string name="accountDomainFooterLink">กดเลือกที่นี่เพื่อรับความช่วยเหลือ</string>
 
     <string name="login_noInternetConnectionTitle">ไม่มีการเชื่อมต่ออินเทอร์เน็ต</string>
     <string name="login_noInternetConnectionMessage">การดำเนินการนี้ต้องมีการเชื่อมต่ออินเทอร์เน็ต</string>
diff --git a/libs/login-api-2/src/main/res/values-vi/strings.xml b/libs/login-api-2/src/main/res/values-vi/strings.xml
index 301d0f6c50..0b1ef97420 100644
--- a/libs/login-api-2/src/main/res/values-vi/strings.xml
+++ b/libs/login-api-2/src/main/res/values-vi/strings.xml
@@ -110,6 +110,7 @@
     <string name="schoolInstructureCom">school.instructure.com</string>
     <string name="contentDescription_removePreviousUser">Loại Bỏ Người Dùng Trước</string>
     <string name="accountDomainFooter">Không tìm được trường của bạn? Hãy thử nhập URL đầy đủ của trường</string>
+    <string name="accountDomainFooterLink">Nhấn vào đây để được trợ giúp.</string>
 
     <string name="login_noInternetConnectionTitle">Không Có Kết Nối Internet</string>
     <string name="login_noInternetConnectionMessage">Thao tác này bắt buộc phải có kết nối internet.</string>
diff --git a/libs/login-api-2/src/main/res/values-zh/strings.xml b/libs/login-api-2/src/main/res/values-zh/strings.xml
index 72d0ea9c83..871b422f6d 100644
--- a/libs/login-api-2/src/main/res/values-zh/strings.xml
+++ b/libs/login-api-2/src/main/res/values-zh/strings.xml
@@ -109,6 +109,7 @@
     <string name="schoolInstructureCom">school.instructure.com</string>
     <string name="contentDescription_removePreviousUser">删除上一个用户</string>
     <string name="accountDomainFooter">找不到您的学校？尝试键入完整的学校 URL。</string>
+    <string name="accountDomainFooterLink">轻击此处获取帮助。</string>
 
     <string name="login_noInternetConnectionTitle">无互联网连接</string>
     <string name="login_noInternetConnectionMessage">此操作需要互联网连接。</string>
diff --git a/libs/pandares/src/main/res/values-ar/strings.xml b/libs/pandares/src/main/res/values-ar/strings.xml
index 81c3003445..6aefe0cf01 100644
--- a/libs/pandares/src/main/res/values-ar/strings.xml
+++ b/libs/pandares/src/main/res/values-ar/strings.xml
@@ -455,6 +455,7 @@
     <!-- Notifications -->
     <string name="deleted">تم الحذف</string>
 
+    <string name="gradeUpdated">تم تحديث الدرجة</string>
     <string name="loadingCanvas">جارٍ تحميل محتوى Canvas&#8230;</string>
 
     <string name="unknownDevice">UnknownDevice</string>
@@ -1170,6 +1171,7 @@
 
     <string name="a11y_gradeCellContentDescriptionHint">يمكنك فتح تفاصيل الإرسال من هنا</string>
 
+    <string name="a11y_gradeCellContentDescriptionLetterGradeOnly">الدرجة: %s</string>
     <plurals name="minutes">
         <item quantity="zero">%s من الدقائق</item>
         <item quantity="one">%s دقيقة</item>
diff --git a/libs/pandares/src/main/res/values-b+da+DK+instk12/strings.xml b/libs/pandares/src/main/res/values-b+da+DK+instk12/strings.xml
index e1651e56b6..3d89c5ace5 100644
--- a/libs/pandares/src/main/res/values-b+da+DK+instk12/strings.xml
+++ b/libs/pandares/src/main/res/values-b+da+DK+instk12/strings.xml
@@ -432,6 +432,7 @@
     <!-- Notifications -->
     <string name="deleted">Slettet</string>
 
+    <string name="gradeUpdated">Vurdering opdateret</string>
     <string name="loadingCanvas">Indlæser Canvas-indhold&#8230;</string>
 
     <string name="unknownDevice">UnknownDevice</string>
@@ -1119,6 +1120,7 @@
 
     <string name="a11y_gradeCellContentDescriptionHint">Du kan åbne afleveringsdetaljerne herfra</string>
 
+    <string name="a11y_gradeCellContentDescriptionLetterGradeOnly">Vurdering: %s</string>
     <plurals name="minutes">
         <item quantity="one">%s minut</item>
         <item quantity="other">%s minutter</item>
diff --git a/libs/pandares/src/main/res/values-b+en+AU+unimelb/strings.xml b/libs/pandares/src/main/res/values-b+en+AU+unimelb/strings.xml
index 9d91414183..013c458795 100644
--- a/libs/pandares/src/main/res/values-b+en+AU+unimelb/strings.xml
+++ b/libs/pandares/src/main/res/values-b+en+AU+unimelb/strings.xml
@@ -432,6 +432,7 @@
     <!-- Notifications -->
     <string name="deleted">Deleted</string>
 
+    <string name="gradeUpdated">Grade updated</string>
     <string name="loadingCanvas">Loading Canvas Content&#8230;</string>
 
     <string name="unknownDevice">UnknownDevice</string>
@@ -1119,6 +1120,7 @@
 
     <string name="a11y_gradeCellContentDescriptionHint">You can open Submission details from here</string>
 
+    <string name="a11y_gradeCellContentDescriptionLetterGradeOnly">Grade: %s</string>
     <plurals name="minutes">
         <item quantity="one">%s Minute</item>
         <item quantity="other">%s Minutes</item>
diff --git a/libs/pandares/src/main/res/values-b+en+GB+instukhe/strings.xml b/libs/pandares/src/main/res/values-b+en+GB+instukhe/strings.xml
index 4072036e2e..e860a4f857 100644
--- a/libs/pandares/src/main/res/values-b+en+GB+instukhe/strings.xml
+++ b/libs/pandares/src/main/res/values-b+en+GB+instukhe/strings.xml
@@ -432,6 +432,7 @@
     <!-- Notifications -->
     <string name="deleted">Deleted</string>
 
+    <string name="gradeUpdated">Grade updated</string>
     <string name="loadingCanvas">Loading Canvas Content&#8230;</string>
 
     <string name="unknownDevice">UnknownDevice</string>
@@ -1119,6 +1120,7 @@
 
     <string name="a11y_gradeCellContentDescriptionHint">You can open Submission details from here</string>
 
+    <string name="a11y_gradeCellContentDescriptionLetterGradeOnly">Grade: %s</string>
     <plurals name="minutes">
         <item quantity="one">%s minute</item>
         <item quantity="other">%s Minutes</item>
diff --git a/libs/pandares/src/main/res/values-b+nb+NO+instk12/strings.xml b/libs/pandares/src/main/res/values-b+nb+NO+instk12/strings.xml
index bd6ae8ec18..3bbbfdbd80 100644
--- a/libs/pandares/src/main/res/values-b+nb+NO+instk12/strings.xml
+++ b/libs/pandares/src/main/res/values-b+nb+NO+instk12/strings.xml
@@ -432,6 +432,7 @@
     <!-- Notifications -->
     <string name="deleted">Slettet</string>
 
+    <string name="gradeUpdated">Vurdering oppdatert</string>
     <string name="loadingCanvas">Laster Canvas-innhold&#8230;</string>
 
     <string name="unknownDevice">UnknownDevice</string>
@@ -1119,6 +1120,7 @@
 
     <string name="a11y_gradeCellContentDescriptionHint">Du kan åpne Detaljer om innlevering her</string>
 
+    <string name="a11y_gradeCellContentDescriptionLetterGradeOnly">Vurdering: %s</string>
     <plurals name="minutes">
         <item quantity="one">%s minutt</item>
         <item quantity="other">%s minutter</item>
diff --git a/libs/pandares/src/main/res/values-b+sv+SE+instk12/strings.xml b/libs/pandares/src/main/res/values-b+sv+SE+instk12/strings.xml
index 44ae3284e8..eb7b807e44 100644
--- a/libs/pandares/src/main/res/values-b+sv+SE+instk12/strings.xml
+++ b/libs/pandares/src/main/res/values-b+sv+SE+instk12/strings.xml
@@ -432,6 +432,7 @@
     <!-- Notifications -->
     <string name="deleted">Borttagen</string>
 
+    <string name="gradeUpdated">Bedömning uppdaterat</string>
     <string name="loadingCanvas">Läser in Canvas-innehåll&#8230;</string>
 
     <string name="unknownDevice">UnknownDevice</string>
@@ -1119,6 +1120,7 @@
 
     <string name="a11y_gradeCellContentDescriptionHint">Du kan öppna inlämningsinformationen härifrån</string>
 
+    <string name="a11y_gradeCellContentDescriptionLetterGradeOnly">Bedömning: %s</string>
     <plurals name="minutes">
         <item quantity="one">%s minut</item>
         <item quantity="other">%s minuter</item>
diff --git a/libs/pandares/src/main/res/values-b+zh+HK/strings.xml b/libs/pandares/src/main/res/values-b+zh+HK/strings.xml
index b6bf168689..ee91fbdcd0 100644
--- a/libs/pandares/src/main/res/values-b+zh+HK/strings.xml
+++ b/libs/pandares/src/main/res/values-b+zh+HK/strings.xml
@@ -426,6 +426,7 @@
     <!-- Notifications -->
     <string name="deleted">已刪除</string>
 
+    <string name="gradeUpdated">評分已更新</string>
     <string name="loadingCanvas">載入 Canvas 內容&#8230;</string>
 
     <string name="unknownDevice">UnknownDevice</string>
@@ -1106,6 +1107,7 @@
 
     <string name="a11y_gradeCellContentDescriptionHint">您可以從此處開啟提交項目詳細資料</string>
 
+    <string name="a11y_gradeCellContentDescriptionLetterGradeOnly">評分：%s</string>
     <plurals name="minutes">
         <item quantity="other">%s 分鐘</item>
     </plurals>
diff --git a/libs/pandares/src/main/res/values-b+zh+Hans/strings.xml b/libs/pandares/src/main/res/values-b+zh+Hans/strings.xml
index 815e304d01..9fd0ff9c21 100644
--- a/libs/pandares/src/main/res/values-b+zh+Hans/strings.xml
+++ b/libs/pandares/src/main/res/values-b+zh+Hans/strings.xml
@@ -426,6 +426,7 @@
     <!-- Notifications -->
     <string name="deleted">已删除</string>
 
+    <string name="gradeUpdated">评分已更新</string>
     <string name="loadingCanvas">正在加载Canvas内容&#8230;</string>
 
     <string name="unknownDevice">UnknownDevice</string>
@@ -1106,6 +1107,7 @@
 
     <string name="a11y_gradeCellContentDescriptionHint">您可以从此处打开提交详情</string>
 
+    <string name="a11y_gradeCellContentDescriptionLetterGradeOnly">评分：%s</string>
     <plurals name="minutes">
         <item quantity="other">%s 分钟</item>
     </plurals>
diff --git a/libs/pandares/src/main/res/values-b+zh+Hant/strings.xml b/libs/pandares/src/main/res/values-b+zh+Hant/strings.xml
index b6bf168689..ee91fbdcd0 100644
--- a/libs/pandares/src/main/res/values-b+zh+Hant/strings.xml
+++ b/libs/pandares/src/main/res/values-b+zh+Hant/strings.xml
@@ -426,6 +426,7 @@
     <!-- Notifications -->
     <string name="deleted">已刪除</string>
 
+    <string name="gradeUpdated">評分已更新</string>
     <string name="loadingCanvas">載入 Canvas 內容&#8230;</string>
 
     <string name="unknownDevice">UnknownDevice</string>
@@ -1106,6 +1107,7 @@
 
     <string name="a11y_gradeCellContentDescriptionHint">您可以從此處開啟提交項目詳細資料</string>
 
+    <string name="a11y_gradeCellContentDescriptionLetterGradeOnly">評分：%s</string>
     <plurals name="minutes">
         <item quantity="other">%s 分鐘</item>
     </plurals>
diff --git a/libs/pandares/src/main/res/values-ca/strings.xml b/libs/pandares/src/main/res/values-ca/strings.xml
index 00d064fb12..013976b360 100644
--- a/libs/pandares/src/main/res/values-ca/strings.xml
+++ b/libs/pandares/src/main/res/values-ca/strings.xml
@@ -432,6 +432,7 @@
     <!-- Notifications -->
     <string name="deleted">Suprimit</string>
 
+    <string name="gradeUpdated">S’ha actualitzat la nota</string>
     <string name="loadingCanvas">S\'està carregant el contingut de Canvas&#8230;</string>
 
     <string name="unknownDevice">UnknownDevice</string>
@@ -1119,6 +1120,7 @@
 
     <string name="a11y_gradeCellContentDescriptionHint">Podeu obrir Informació de l’entrega des d\'aquí</string>
 
+    <string name="a11y_gradeCellContentDescriptionLetterGradeOnly">Nota: %s</string>
     <plurals name="minutes">
         <item quantity="one">%s minut</item>
         <item quantity="other">%s minuts</item>
diff --git a/libs/pandares/src/main/res/values-cy/strings.xml b/libs/pandares/src/main/res/values-cy/strings.xml
index 6bd48540a4..8498f8bf6d 100644
--- a/libs/pandares/src/main/res/values-cy/strings.xml
+++ b/libs/pandares/src/main/res/values-cy/strings.xml
@@ -432,6 +432,7 @@
     <!-- Notifications -->
     <string name="deleted">Wedi dileu</string>
 
+    <string name="gradeUpdated">Gradd wedi’i diweddaru</string>
     <string name="loadingCanvas">Llwytho Cynnwys Canvas&#8230;</string>
 
     <string name="unknownDevice">UnknownDevice</string>
@@ -1119,6 +1120,7 @@
 
     <string name="a11y_gradeCellContentDescriptionHint">Gallwch chi agor manylion Cyflwyniad fan hyn</string>
 
+    <string name="a11y_gradeCellContentDescriptionLetterGradeOnly">Gradd: %s</string>
     <plurals name="minutes">
         <item quantity="one">%s Munud</item>
         <item quantity="other">%s Munud</item>
diff --git a/libs/pandares/src/main/res/values-da/strings.xml b/libs/pandares/src/main/res/values-da/strings.xml
index 5235e2943e..ddc3e5462f 100644
--- a/libs/pandares/src/main/res/values-da/strings.xml
+++ b/libs/pandares/src/main/res/values-da/strings.xml
@@ -432,6 +432,7 @@
     <!-- Notifications -->
     <string name="deleted">Slettet</string>
 
+    <string name="gradeUpdated">Karakter opdateret</string>
     <string name="loadingCanvas">Indlæser Canvas-indhold&#8230;</string>
 
     <string name="unknownDevice">UnknownDevice</string>
@@ -1119,6 +1120,7 @@
 
     <string name="a11y_gradeCellContentDescriptionHint">Du kan åbne afleveringsdetaljerne herfra</string>
 
+    <string name="a11y_gradeCellContentDescriptionLetterGradeOnly">Karakter: %s</string>
     <plurals name="minutes">
         <item quantity="one">%s minut</item>
         <item quantity="other">%s minutter</item>
diff --git a/libs/pandares/src/main/res/values-de/strings.xml b/libs/pandares/src/main/res/values-de/strings.xml
index 97b9b7ade9..58cda0e850 100644
--- a/libs/pandares/src/main/res/values-de/strings.xml
+++ b/libs/pandares/src/main/res/values-de/strings.xml
@@ -432,6 +432,7 @@
     <!-- Notifications -->
     <string name="deleted">Gelöscht</string>
 
+    <string name="gradeUpdated">Note aktualisiert</string>
     <string name="loadingCanvas">Canvas-Content laden&#8230;</string>
 
     <string name="unknownDevice">UnknownDevice</string>
@@ -1119,6 +1120,7 @@
 
     <string name="a11y_gradeCellContentDescriptionHint">Sie können die Abgabedetails von hier aus öffnen</string>
 
+    <string name="a11y_gradeCellContentDescriptionLetterGradeOnly">Note: %s</string>
     <plurals name="minutes">
         <item quantity="one">%s Minute</item>
         <item quantity="other">%s Minuten</item>
diff --git a/libs/pandares/src/main/res/values-en-rAU/strings.xml b/libs/pandares/src/main/res/values-en-rAU/strings.xml
index 94d73a8b46..8aa32c6d13 100644
--- a/libs/pandares/src/main/res/values-en-rAU/strings.xml
+++ b/libs/pandares/src/main/res/values-en-rAU/strings.xml
@@ -432,6 +432,7 @@
     <!-- Notifications -->
     <string name="deleted">Deleted</string>
 
+    <string name="gradeUpdated">Mark updated</string>
     <string name="loadingCanvas">Loading Canvas Content&#8230;</string>
 
     <string name="unknownDevice">UnknownDevice</string>
@@ -1119,6 +1120,7 @@
 
     <string name="a11y_gradeCellContentDescriptionHint">You can open Submission details from here</string>
 
+    <string name="a11y_gradeCellContentDescriptionLetterGradeOnly">Mark: %s</string>
     <plurals name="minutes">
         <item quantity="one">%s Minute</item>
         <item quantity="other">%s Minutes</item>
diff --git a/libs/pandares/src/main/res/values-en-rCY/strings.xml b/libs/pandares/src/main/res/values-en-rCY/strings.xml
index 4072036e2e..e860a4f857 100644
--- a/libs/pandares/src/main/res/values-en-rCY/strings.xml
+++ b/libs/pandares/src/main/res/values-en-rCY/strings.xml
@@ -432,6 +432,7 @@
     <!-- Notifications -->
     <string name="deleted">Deleted</string>
 
+    <string name="gradeUpdated">Grade updated</string>
     <string name="loadingCanvas">Loading Canvas Content&#8230;</string>
 
     <string name="unknownDevice">UnknownDevice</string>
@@ -1119,6 +1120,7 @@
 
     <string name="a11y_gradeCellContentDescriptionHint">You can open Submission details from here</string>
 
+    <string name="a11y_gradeCellContentDescriptionLetterGradeOnly">Grade: %s</string>
     <plurals name="minutes">
         <item quantity="one">%s minute</item>
         <item quantity="other">%s Minutes</item>
diff --git a/libs/pandares/src/main/res/values-en-rGB/strings.xml b/libs/pandares/src/main/res/values-en-rGB/strings.xml
index 2b1b2629c7..70d3e97250 100644
--- a/libs/pandares/src/main/res/values-en-rGB/strings.xml
+++ b/libs/pandares/src/main/res/values-en-rGB/strings.xml
@@ -432,6 +432,7 @@
     <!-- Notifications -->
     <string name="deleted">Deleted</string>
 
+    <string name="gradeUpdated">Grade updated</string>
     <string name="loadingCanvas">Loading Canvas Content&#8230;</string>
 
     <string name="unknownDevice">UnknownDevice</string>
@@ -1119,6 +1120,7 @@
 
     <string name="a11y_gradeCellContentDescriptionHint">You can open Submission details from here</string>
 
+    <string name="a11y_gradeCellContentDescriptionLetterGradeOnly">Grade: %s</string>
     <plurals name="minutes">
         <item quantity="one">%s minute</item>
         <item quantity="other">%s Minutes</item>
diff --git a/libs/pandares/src/main/res/values-es-rES/strings.xml b/libs/pandares/src/main/res/values-es-rES/strings.xml
index e8465b9bf7..8cef4f43c9 100644
--- a/libs/pandares/src/main/res/values-es-rES/strings.xml
+++ b/libs/pandares/src/main/res/values-es-rES/strings.xml
@@ -432,6 +432,7 @@
     <!-- Notifications -->
     <string name="deleted">Eliminado</string>
 
+    <string name="gradeUpdated">Nota actualizada</string>
     <string name="loadingCanvas">Cargando el contenido de Canvas&#8230;</string>
 
     <string name="unknownDevice">UnknownDevice</string>
@@ -1119,6 +1120,7 @@
 
     <string name="a11y_gradeCellContentDescriptionHint">Desde aquí puedes abrir los detalles de la entrega</string>
 
+    <string name="a11y_gradeCellContentDescriptionLetterGradeOnly">Nota: %s</string>
     <plurals name="minutes">
         <item quantity="one">%s minuto</item>
         <item quantity="other">%s minutos</item>
diff --git a/libs/pandares/src/main/res/values-es/strings.xml b/libs/pandares/src/main/res/values-es/strings.xml
index 22bfecd1b7..1aaa81bfb7 100644
--- a/libs/pandares/src/main/res/values-es/strings.xml
+++ b/libs/pandares/src/main/res/values-es/strings.xml
@@ -432,6 +432,7 @@
     <!-- Notifications -->
     <string name="deleted">Eliminado</string>
 
+    <string name="gradeUpdated">Calificación actualizada</string>
     <string name="loadingCanvas">Cargando el contenido de Canvas&#8230;</string>
 
     <string name="unknownDevice">UnknownDevice</string>
@@ -1119,6 +1120,7 @@
 
     <string name="a11y_gradeCellContentDescriptionHint">Desde aquí puede abrir los detalles de Entrega</string>
 
+    <string name="a11y_gradeCellContentDescriptionLetterGradeOnly">Calificación: %s</string>
     <plurals name="minutes">
         <item quantity="one">%s minuto</item>
         <item quantity="other">%s minutos</item>
diff --git a/libs/pandares/src/main/res/values-fi/strings.xml b/libs/pandares/src/main/res/values-fi/strings.xml
index d4f361ce9a..ab65479f50 100644
--- a/libs/pandares/src/main/res/values-fi/strings.xml
+++ b/libs/pandares/src/main/res/values-fi/strings.xml
@@ -432,6 +432,7 @@
     <!-- Notifications -->
     <string name="deleted">Poistettu</string>
 
+    <string name="gradeUpdated">Arvosana päivitetty</string>
     <string name="loadingCanvas">Ladataan Canvas-sisältöä&#8230;</string>
 
     <string name="unknownDevice">UnknownDevice</string>
@@ -1119,6 +1120,7 @@
 
     <string name="a11y_gradeCellContentDescriptionHint">Voit avata tehtävän palautustiedot täältä</string>
 
+    <string name="a11y_gradeCellContentDescriptionLetterGradeOnly">Arvosana: %s</string>
     <plurals name="minutes">
         <item quantity="one">%s Minuutti</item>
         <item quantity="other">%s minuuttia</item>
diff --git a/libs/pandares/src/main/res/values-fr-rCA/strings.xml b/libs/pandares/src/main/res/values-fr-rCA/strings.xml
index 63e5e000cd..dd583f2abc 100644
--- a/libs/pandares/src/main/res/values-fr-rCA/strings.xml
+++ b/libs/pandares/src/main/res/values-fr-rCA/strings.xml
@@ -432,6 +432,7 @@
     <!-- Notifications -->
     <string name="deleted">Supprimé</string>
 
+    <string name="gradeUpdated">Note mise à jour</string>
     <string name="loadingCanvas">Chargement du contenu de Canvas&#8230;</string>
 
     <string name="unknownDevice">UnknownDevice</string>
@@ -1119,6 +1120,7 @@
 
     <string name="a11y_gradeCellContentDescriptionHint">Vous pouvez ouvrir les détails de l’envoi à partir d’ici</string>
 
+    <string name="a11y_gradeCellContentDescriptionLetterGradeOnly">Note : %s</string>
     <plurals name="minutes">
         <item quantity="one">%s Minute</item>
         <item quantity="other">%s Minutes</item>
diff --git a/libs/pandares/src/main/res/values-fr/strings.xml b/libs/pandares/src/main/res/values-fr/strings.xml
index a566c9618a..adaf919f50 100644
--- a/libs/pandares/src/main/res/values-fr/strings.xml
+++ b/libs/pandares/src/main/res/values-fr/strings.xml
@@ -432,6 +432,7 @@
     <!-- Notifications -->
     <string name="deleted">Supprimé</string>
 
+    <string name="gradeUpdated">Note mise à jour</string>
     <string name="loadingCanvas">Chargement du contenu Canvas&#8230;</string>
 
     <string name="unknownDevice">UnknownDevice</string>
@@ -1119,6 +1120,7 @@
 
     <string name="a11y_gradeCellContentDescriptionHint">Vous pouvez ouvrir les Détails de soumission à partir d\'ici</string>
 
+    <string name="a11y_gradeCellContentDescriptionLetterGradeOnly">Note : %s</string>
     <plurals name="minutes">
         <item quantity="one">%s Minute</item>
         <item quantity="other">%s Minutes</item>
diff --git a/libs/pandares/src/main/res/values-ht/strings.xml b/libs/pandares/src/main/res/values-ht/strings.xml
index bad97880f0..4d9e1e3de6 100644
--- a/libs/pandares/src/main/res/values-ht/strings.xml
+++ b/libs/pandares/src/main/res/values-ht/strings.xml
@@ -432,6 +432,7 @@
     <!-- Notifications -->
     <string name="deleted">Efase</string>
 
+    <string name="gradeUpdated">Klas aktyalize</string>
     <string name="loadingCanvas">Chajman Kontni Canvas&#8230;</string>
 
     <string name="unknownDevice">UnknownDevice</string>
@@ -1119,6 +1120,7 @@
 
     <string name="a11y_gradeCellContentDescriptionHint">Ou ka ouvri detay Soumisyon yo la a</string>
 
+    <string name="a11y_gradeCellContentDescriptionLetterGradeOnly">Klas: %s</string>
     <plurals name="minutes">
         <item quantity="one">%s Minit</item>
         <item quantity="other">%s Minit</item>
diff --git a/libs/pandares/src/main/res/values-is/strings.xml b/libs/pandares/src/main/res/values-is/strings.xml
index 11335d2433..71498f4b73 100644
--- a/libs/pandares/src/main/res/values-is/strings.xml
+++ b/libs/pandares/src/main/res/values-is/strings.xml
@@ -432,6 +432,7 @@
     <!-- Notifications -->
     <string name="deleted">Eytt</string>
 
+    <string name="gradeUpdated">Einkunn uppfærð</string>
     <string name="loadingCanvas">Sæki Canvas efni&#8230;</string>
 
     <string name="unknownDevice">UnknownDevice</string>
@@ -1119,6 +1120,7 @@
 
     <string name="a11y_gradeCellContentDescriptionHint">Þú getur opnað upplýsingar um skil héðan</string>
 
+    <string name="a11y_gradeCellContentDescriptionLetterGradeOnly">Einkunn: %s</string>
     <plurals name="minutes">
         <item quantity="one">%s Mínúta</item>
         <item quantity="other">%s mínútur</item>
diff --git a/libs/pandares/src/main/res/values-it/strings.xml b/libs/pandares/src/main/res/values-it/strings.xml
index 95e35d513b..1ebe6ca67a 100644
--- a/libs/pandares/src/main/res/values-it/strings.xml
+++ b/libs/pandares/src/main/res/values-it/strings.xml
@@ -432,6 +432,7 @@
     <!-- Notifications -->
     <string name="deleted">Eliminato</string>
 
+    <string name="gradeUpdated">Voto aggiornato</string>
     <string name="loadingCanvas">Caricamento dei contenuti Contenuto&#8230;</string>
 
     <string name="unknownDevice">UnknownDevice</string>
@@ -1119,6 +1120,7 @@
 
     <string name="a11y_gradeCellContentDescriptionHint">Puoi aprire i dettagli consegna da qui</string>
 
+    <string name="a11y_gradeCellContentDescriptionLetterGradeOnly">Voto: %s</string>
     <plurals name="minutes">
         <item quantity="one">%s minuto</item>
         <item quantity="other">%s minuti</item>
diff --git a/libs/pandares/src/main/res/values-ja/strings.xml b/libs/pandares/src/main/res/values-ja/strings.xml
index 44d2184638..0b26bf4991 100644
--- a/libs/pandares/src/main/res/values-ja/strings.xml
+++ b/libs/pandares/src/main/res/values-ja/strings.xml
@@ -426,6 +426,7 @@
     <!-- Notifications -->
     <string name="deleted">削除されました</string>
 
+    <string name="gradeUpdated">評定を更新しました</string>
     <string name="loadingCanvas">Canvas コンテンツ&#8230;を読み込み中</string>
 
     <string name="unknownDevice">UnknownDevice</string>
@@ -1106,6 +1107,7 @@
 
     <string name="a11y_gradeCellContentDescriptionHint">「提出」の詳細はここで開くことができます</string>
 
+    <string name="a11y_gradeCellContentDescriptionLetterGradeOnly">評定：%s</string>
     <plurals name="minutes">
         <item quantity="other">%s 分</item>
     </plurals>
diff --git a/libs/pandares/src/main/res/values-mi/strings.xml b/libs/pandares/src/main/res/values-mi/strings.xml
index 31a742b7fb..3ce51d36f9 100644
--- a/libs/pandares/src/main/res/values-mi/strings.xml
+++ b/libs/pandares/src/main/res/values-mi/strings.xml
@@ -432,6 +432,7 @@
     <!-- Notifications -->
     <string name="deleted">mukua</string>
 
+    <string name="gradeUpdated">Koeke kua whakahoutia</string>
     <string name="loadingCanvas">E uta ana Canvas Ihirangi&#8230;</string>
 
     <string name="unknownDevice">UnknownDevice</string>
@@ -1119,6 +1120,7 @@
 
     <string name="a11y_gradeCellContentDescriptionHint">Mai i konei, ka kite koe i nga Taipitopito Tukunga.</string>
 
+    <string name="a11y_gradeCellContentDescriptionLetterGradeOnly">Kōeke: %s</string>
     <plurals name="minutes">
         <item quantity="one">%s Meneti</item>
         <item quantity="other">%s meneti</item>
diff --git a/libs/pandares/src/main/res/values-ms/strings.xml b/libs/pandares/src/main/res/values-ms/strings.xml
index 22552f920e..bce19c3d3a 100644
--- a/libs/pandares/src/main/res/values-ms/strings.xml
+++ b/libs/pandares/src/main/res/values-ms/strings.xml
@@ -432,6 +432,7 @@
     <!-- Notifications -->
     <string name="deleted">Telah Dipadamkan</string>
 
+    <string name="gradeUpdated">Gred dikemas kini</string>
     <string name="loadingCanvas">Memuatkan Kandungan Canvas&#8230;</string>
 
     <string name="unknownDevice">UnknownDevice</string>
@@ -1119,6 +1120,7 @@
 
     <string name="a11y_gradeCellContentDescriptionHint">Anda boleh membuka butiran Serahan di sini</string>
 
+    <string name="a11y_gradeCellContentDescriptionLetterGradeOnly">Gred: %s</string>
     <plurals name="minutes">
         <item quantity="one">%s Minit</item>
         <item quantity="other">%s Minit</item>
diff --git a/libs/pandares/src/main/res/values-nb/strings.xml b/libs/pandares/src/main/res/values-nb/strings.xml
index fc43bf719c..74ed00f0d0 100644
--- a/libs/pandares/src/main/res/values-nb/strings.xml
+++ b/libs/pandares/src/main/res/values-nb/strings.xml
@@ -432,6 +432,7 @@
     <!-- Notifications -->
     <string name="deleted">Slettet</string>
 
+    <string name="gradeUpdated">Vurdering oppdatert</string>
     <string name="loadingCanvas">Laster Canvas-innhold&#8230;</string>
 
     <string name="unknownDevice">UnknownDevice</string>
@@ -1119,6 +1120,7 @@
 
     <string name="a11y_gradeCellContentDescriptionHint">Du kan åpne Detaljer om innlevering her</string>
 
+    <string name="a11y_gradeCellContentDescriptionLetterGradeOnly">Vurdering: %s</string>
     <plurals name="minutes">
         <item quantity="one">%s minutt</item>
         <item quantity="other">%s minutter</item>
diff --git a/libs/pandares/src/main/res/values-nl/strings.xml b/libs/pandares/src/main/res/values-nl/strings.xml
index e5e50a7c83..0b32e79400 100644
--- a/libs/pandares/src/main/res/values-nl/strings.xml
+++ b/libs/pandares/src/main/res/values-nl/strings.xml
@@ -432,6 +432,7 @@
     <!-- Notifications -->
     <string name="deleted">Verwijderd</string>
 
+    <string name="gradeUpdated">Cijfer bijgewerkt</string>
     <string name="loadingCanvas">Canvas Content aan het uploaden&#8230;</string>
 
     <string name="unknownDevice">UnknownDevice</string>
@@ -1119,6 +1120,7 @@
 
     <string name="a11y_gradeCellContentDescriptionHint">U kunt inleverdetails hier openen</string>
 
+    <string name="a11y_gradeCellContentDescriptionLetterGradeOnly">Cijfer: %s</string>
     <plurals name="minutes">
         <item quantity="one">%s minuut</item>
         <item quantity="other">%s minuten</item>
diff --git a/libs/pandares/src/main/res/values-pl/strings.xml b/libs/pandares/src/main/res/values-pl/strings.xml
index f40e84f984..a9f3d91551 100644
--- a/libs/pandares/src/main/res/values-pl/strings.xml
+++ b/libs/pandares/src/main/res/values-pl/strings.xml
@@ -444,6 +444,7 @@
     <!-- Notifications -->
     <string name="deleted">Usunięto</string>
 
+    <string name="gradeUpdated">Zaktualizowano ocenę</string>
     <string name="loadingCanvas">Ładowanie zawartości Canvas&#8230;</string>
 
     <string name="unknownDevice">UnknownDevice</string>
@@ -1145,6 +1146,7 @@
 
     <string name="a11y_gradeCellContentDescriptionHint">Tutaj można otworzyć szczegóły przesyłki</string>
 
+    <string name="a11y_gradeCellContentDescriptionLetterGradeOnly">Ocena: %s</string>
     <plurals name="minutes">
         <item quantity="one">%s min</item>
         <item quantity="few">%s min</item>
diff --git a/libs/pandares/src/main/res/values-pt-rBR/strings.xml b/libs/pandares/src/main/res/values-pt-rBR/strings.xml
index ce7e963aba..dc5f3aec5c 100644
--- a/libs/pandares/src/main/res/values-pt-rBR/strings.xml
+++ b/libs/pandares/src/main/res/values-pt-rBR/strings.xml
@@ -432,6 +432,7 @@
     <!-- Notifications -->
     <string name="deleted">Excluído</string>
 
+    <string name="gradeUpdated">Nota atualizada</string>
     <string name="loadingCanvas">Carregando conteúdo do Canvas&#8230;</string>
 
     <string name="unknownDevice">UnknownDevice</string>
@@ -1119,6 +1120,7 @@
 
     <string name="a11y_gradeCellContentDescriptionHint">Você pode abrir os detalhes do Envio aqui</string>
 
+    <string name="a11y_gradeCellContentDescriptionLetterGradeOnly">Nota: %s</string>
     <plurals name="minutes">
         <item quantity="one">%s Minuto</item>
         <item quantity="other">%s Minutos</item>
diff --git a/libs/pandares/src/main/res/values-pt-rPT/strings.xml b/libs/pandares/src/main/res/values-pt-rPT/strings.xml
index 3c73a4d156..1bf5144981 100644
--- a/libs/pandares/src/main/res/values-pt-rPT/strings.xml
+++ b/libs/pandares/src/main/res/values-pt-rPT/strings.xml
@@ -432,6 +432,7 @@
     <!-- Notifications -->
     <string name="deleted">Eliminado</string>
 
+    <string name="gradeUpdated">Nota atualizada</string>
     <string name="loadingCanvas">A carregar o conteúdo da tela&#8230;</string>
 
     <string name="unknownDevice">UnknownDevice</string>
@@ -1119,6 +1120,7 @@
 
     <string name="a11y_gradeCellContentDescriptionHint">Podes abrir detalhes de Submissão a partir daqui</string>
 
+    <string name="a11y_gradeCellContentDescriptionLetterGradeOnly">Nota: %s</string>
     <plurals name="minutes">
         <item quantity="one">%s minuto</item>
         <item quantity="other">%s minutos</item>
diff --git a/libs/pandares/src/main/res/values-ru/strings.xml b/libs/pandares/src/main/res/values-ru/strings.xml
index 311d8519e6..9c7d3ded27 100644
--- a/libs/pandares/src/main/res/values-ru/strings.xml
+++ b/libs/pandares/src/main/res/values-ru/strings.xml
@@ -444,6 +444,7 @@
     <!-- Notifications -->
     <string name="deleted">Удалено</string>
 
+    <string name="gradeUpdated">Оценка обновлена</string>
     <string name="loadingCanvas">Загрузка контента Canvas&#8230;</string>
 
     <string name="unknownDevice">UnknownDevice</string>
@@ -1145,6 +1146,7 @@
 
     <string name="a11y_gradeCellContentDescriptionHint">Вы можете открыть информацию об отправке здесь</string>
 
+    <string name="a11y_gradeCellContentDescriptionLetterGradeOnly">Оценка: %s</string>
     <plurals name="minutes">
         <item quantity="one">%s минута</item>
         <item quantity="few">%s минут</item>
diff --git a/libs/pandares/src/main/res/values-sl/strings.xml b/libs/pandares/src/main/res/values-sl/strings.xml
index 3dd4497706..b77f4e12fc 100644
--- a/libs/pandares/src/main/res/values-sl/strings.xml
+++ b/libs/pandares/src/main/res/values-sl/strings.xml
@@ -432,6 +432,7 @@
     <!-- Notifications -->
     <string name="deleted">Odstranjeno</string>
 
+    <string name="gradeUpdated">Ocena je posodobljena</string>
     <string name="loadingCanvas">Nalaganje vsebine sistema Canvas&#8230;</string>
 
     <string name="unknownDevice">UnknownDevice</string>
@@ -1119,6 +1120,7 @@
 
     <string name="a11y_gradeCellContentDescriptionHint">Tukaj lahko odprete podrobnosti o oddaji</string>
 
+    <string name="a11y_gradeCellContentDescriptionLetterGradeOnly">Ocena: %s</string>
     <plurals name="minutes">
         <item quantity="one">%s minuta</item>
         <item quantity="other">%s minut</item>
diff --git a/libs/pandares/src/main/res/values-sv/strings.xml b/libs/pandares/src/main/res/values-sv/strings.xml
index b923d00664..fc1aee1a9d 100644
--- a/libs/pandares/src/main/res/values-sv/strings.xml
+++ b/libs/pandares/src/main/res/values-sv/strings.xml
@@ -432,6 +432,7 @@
     <!-- Notifications -->
     <string name="deleted">Borttagen</string>
 
+    <string name="gradeUpdated">Omdöme uppdaterat</string>
     <string name="loadingCanvas">Läser in Canvas-innehåll&#8230;</string>
 
     <string name="unknownDevice">UnknownDevice</string>
@@ -1119,6 +1120,7 @@
 
     <string name="a11y_gradeCellContentDescriptionHint">Du kan öppna inlämningsinformationen härifrån</string>
 
+    <string name="a11y_gradeCellContentDescriptionLetterGradeOnly">Omdöme: %s</string>
     <plurals name="minutes">
         <item quantity="one">%s minut</item>
         <item quantity="other">%s minuter</item>
diff --git a/libs/pandares/src/main/res/values-th/strings.xml b/libs/pandares/src/main/res/values-th/strings.xml
index a0a534be86..e9871f3baf 100644
--- a/libs/pandares/src/main/res/values-th/strings.xml
+++ b/libs/pandares/src/main/res/values-th/strings.xml
@@ -432,6 +432,7 @@
     <!-- Notifications -->
     <string name="deleted">ลบแล้ว</string>
 
+    <string name="gradeUpdated">อัพเดตเกรดแล้ว</string>
     <string name="loadingCanvas">กำลังโหลดเนื้อหา Canvas&#8230;</string>
 
     <string name="unknownDevice">UnknownDevice</string>
@@ -1119,6 +1120,7 @@
 
     <string name="a11y_gradeCellContentDescriptionHint">คุณสามารถเปิดรายละเอียดผลงานจัดส่ง (Submission details) ได้จากที่นี่</string>
 
+    <string name="a11y_gradeCellContentDescriptionLetterGradeOnly">เกรด: %s</string>
     <plurals name="minutes">
         <item quantity="one">%s นาที</item>
         <item quantity="other">%s นาที</item>
diff --git a/libs/pandares/src/main/res/values-vi/strings.xml b/libs/pandares/src/main/res/values-vi/strings.xml
index db8ee483c2..bcf91a4a53 100644
--- a/libs/pandares/src/main/res/values-vi/strings.xml
+++ b/libs/pandares/src/main/res/values-vi/strings.xml
@@ -432,6 +432,7 @@
     <!-- Notifications -->
     <string name="deleted">Đã xóa</string>
 
+    <string name="gradeUpdated">Đã cập nhật lớp</string>
     <string name="loadingCanvas">Đang Tải Nội Dung Canvas&#8230;</string>
 
     <string name="unknownDevice">UnknownDevice</string>
@@ -1119,6 +1120,7 @@
 
     <string name="a11y_gradeCellContentDescriptionHint">Bạn có thể mở chi tiết Bài Nộp từ đây</string>
 
+    <string name="a11y_gradeCellContentDescriptionLetterGradeOnly">Lớp: %s</string>
     <plurals name="minutes">
         <item quantity="one">%s Phút</item>
         <item quantity="other">%s Phút</item>
diff --git a/libs/pandares/src/main/res/values-zh/strings.xml b/libs/pandares/src/main/res/values-zh/strings.xml
index 815e304d01..9fd0ff9c21 100644
--- a/libs/pandares/src/main/res/values-zh/strings.xml
+++ b/libs/pandares/src/main/res/values-zh/strings.xml
@@ -426,6 +426,7 @@
     <!-- Notifications -->
     <string name="deleted">已删除</string>
 
+    <string name="gradeUpdated">评分已更新</string>
     <string name="loadingCanvas">正在加载Canvas内容&#8230;</string>
 
     <string name="unknownDevice">UnknownDevice</string>
@@ -1106,6 +1107,7 @@
 
     <string name="a11y_gradeCellContentDescriptionHint">您可以从此处打开提交详情</string>
 
+    <string name="a11y_gradeCellContentDescriptionLetterGradeOnly">评分：%s</string>
     <plurals name="minutes">
         <item quantity="other">%s 分钟</item>
     </plurals>

From 9d18a6c9a6ca517bff6ca338f679bc7f81e3eb53 Mon Sep 17 00:00:00 2001
From: "kristof.nemere" <kristof.nemere@instructure.com>
Date: Wed, 30 Aug 2023 13:44:38 +0200
Subject: [PATCH 22/22] Version bump

---
 apps/flutter_parent/pubspec.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/flutter_parent/pubspec.yaml b/apps/flutter_parent/pubspec.yaml
index c87f6a3c72..d43bf36c23 100644
--- a/apps/flutter_parent/pubspec.yaml
+++ b/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.8.0+46
+version: 3.8.1+47
 
 module:
   androidX: true