Release Student 7.12.0 (276) (#2968)

Release Student 7.12.0 (276)

Author: hermannakos

apps/parent/build.gradle

@@ -40,8 +40,8 @@ android {
         applicationId "com.instructure.parentapp"
         minSdkVersion Versions.MIN_SDK
         targetSdkVersion Versions.TARGET_SDK
-        versionCode 56
-        versionName "4.0.0"
+        versionCode 57
+        versionName "4.1.0"
 
         buildConfigField "boolean", "IS_TESTING", "false"
         testInstrumentationRunner 'com.instructure.parentapp.ui.espresso.ParentHiltTestRunner'

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

@@ -281,6 +281,7 @@ class CalendarE2ETest : ParentComposeTest() {
         Log.d(ASSERTION_TAG, "Assert that the event is displayed with the corresponding details (title, context name, date, status) on the page.")
         val currentDate = getDateInCanvasCalendarFormat()
         calendarScreenPage.assertItemDetails(newEventTitle, parent.name, currentDate)
+        Thread.sleep(2000)
 
         Log.d(STEP_TAG, "Click on the 'Add' (FAB) button and 'Add To Do' to create a new To Do.")
         calendarScreenPage.clickOnAddButton()
@@ -299,7 +300,6 @@ class CalendarE2ETest : ParentComposeTest() {
         val calendar = Calendar.getInstance().apply { add(Calendar.DAY_OF_MONTH, 2) }
         Log.d(STEP_TAG, "Select a date which is 2 days in the future from today and select '${course.name}' course as the canvas context.")
         calendarToDoCreateUpdatePage.selectDate(calendar)
-        Thread.sleep(2000)
         calendarToDoCreateUpdatePage.selectCanvasContext(course.name)
 
         Log.d(STEP_TAG, "Click on the 'Save' button.")

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

@@ -21,15 +21,19 @@ import androidx.test.espresso.Espresso
 import com.instructure.canvas.espresso.E2E
 import com.instructure.canvas.espresso.FeatureCategory
 import com.instructure.canvas.espresso.Priority
+import com.instructure.canvas.espresso.SecondaryFeatureCategory
 import com.instructure.canvas.espresso.TestCategory
 import com.instructure.canvas.espresso.TestMetaData
+import com.instructure.canvas.espresso.checkToastText
 import com.instructure.dataseeding.api.AssignmentsApi
 import com.instructure.dataseeding.model.GradingType
 import com.instructure.dataseeding.model.SubmissionType
 import com.instructure.dataseeding.util.days
 import com.instructure.dataseeding.util.fromNow
 import com.instructure.dataseeding.util.iso8601
+import com.instructure.espresso.ViewUtils
 import com.instructure.pandautils.utils.AppTheme
+import com.instructure.parentapp.R
 import com.instructure.parentapp.utils.ParentComposeTest
 import com.instructure.parentapp.utils.seedData
 import com.instructure.parentapp.utils.tokenLogin
@@ -154,4 +158,74 @@ class SettingsE2ETest : ParentComposeTest() {
         Log.d(STEP_TAG,"Assert that the Instructure company logo has been displayed on the About page.")
         aboutPage.assertInstructureLogoDisplayed()
     }
+
+    @E2E
+    @Test
+    @TestMetaData(Priority.IMPORTANT, FeatureCategory.INBOX, TestCategory.E2E, SecondaryFeatureCategory.INBOX_SIGNATURE)
+    fun testInboxSignatureE2E() {
+
+        Log.d(PREPARATION_TAG, "Seeding data.")
+        val data = seedData(students = 1, courses = 1, parents = 1)
+        val course = data.coursesList[0]
+        val parent = data.parentsList[0]
+        val student = data.studentsList[0]
+
+        Log.d(STEP_TAG, "Login with user: '${parent.name}', login id: '${parent.loginId}'.")
+        tokenLogin(parent)
+        dashboardPage.waitForRender()
+
+        Log.d(STEP_TAG, "Open the Left Side Navigation Drawer menu.")
+        dashboardPage.openLeftSideMenu()
+
+        Log.d(STEP_TAG, "Navigate to User Settings Page.")
+        leftSideNavigationDrawerPage.clickSettings()
+
+        Log.d(ASSERTION_TAG, "Assert that by default the Inbox Signature is 'Not Set'.")
+        settingsPage.assertSettingsItemDisplayed("Inbox Signature", "Not Set")
+
+        Log.d(STEP_TAG, "Click on the 'Inbox Signature' settings.")
+        settingsPage.clickOnSettingsItem("Inbox Signature")
+
+        Log.d(ASSERTION_TAG, "Assert that by default the 'Inbox Signature' toggle is turned off.")
+        inboxSignatureSettingsPage.assertSignatureEnabledState(false)
+
+        val signatureText = "President of AC Milan\nVice President of Ferencvaros"
+
+        Log.d(STEP_TAG, "Turn on the 'Inbox Signature' and set the inbox signature text to: '$signatureText'. Save the changes.")
+        inboxSignatureSettingsPage.toggleSignatureEnabledState()
+        inboxSignatureSettingsPage.changeSignatureText(signatureText)
+        inboxSignatureSettingsPage.saveChanges()
+
+        Log.d(ASSERTION_TAG, "Assert that the 'Inbox settings saved!' toast message is displayed.")
+        checkToastText(R.string.inboxSignatureSettingsUpdated, activityRule.activity)
+
+        Log.d(STEP_TAG, "Refresh the Settings page.")
+        settingsPage.refresh()
+
+        Log.d(ASSERTION_TAG, "Assert that the Inbox Signature became 'Enabled'.")
+        settingsPage.assertSettingsItemDisplayed("Inbox Signature", "Enabled")
+
+        Log.d(STEP_TAG, "Click on the 'Inbox Signature' settings.")
+        settingsPage.clickOnSettingsItem("Inbox Signature")
+
+        Log.d(ASSERTION_TAG, "Assert that the previously changed inbox signature text has been really set to: '$signatureText' and the toggle has turned off.")
+        inboxSignatureSettingsPage.assertSignatureText(signatureText)
+        inboxSignatureSettingsPage.assertSignatureEnabledState(true)
+
+        Log.d(STEP_TAG, "Navigate back to the Dashboard.")
+        ViewUtils.pressBackButton(2)
+
+        Log.d(STEP_TAG, "Open the Left Side Navigation Drawer menu.")
+        dashboardPage.openLeftSideMenu()
+
+        Log.d(STEP_TAG, "Open 'Inbox' menu.")
+        leftSideNavigationDrawerPage.clickInbox()
+
+        Log.d(STEP_TAG,"Click on 'New Message' button.")
+        inboxPage.pressNewMessageButton()
+        inboxCoursePickerPage.selectCourseWithUser(course.name, student.shortName)
+
+        Log.d(ASSERTION_TAG, "Assert that the previously set inbox signature text is displayed by default when the user opens the Compose New Message Page.")
+        inboxComposeMessagePage.assertBodyText("\n\n---\nPresident of AC Milan\nVice President of Ferencvaros")
+    }
 }

apps/parent/src/androidTest/java/com/instructure/parentapp/ui/pages/CoursesPage.kt

@@ -100,6 +100,7 @@ class CoursesPage(private val composeTestRule: ComposeTestRule) {
             .performScrollTo()
             .assertIsDisplayed()
             .performClick()
+        composeTestRule.waitForIdle()
     }
 
     fun refresh() {

apps/parent/src/androidTest/java/com/instructure/parentapp/utils/ParentComposeTest.kt

@@ -28,6 +28,7 @@ import com.instructure.canvas.espresso.common.pages.compose.CalendarToDoDetailsP
 import com.instructure.canvas.espresso.common.pages.compose.GradesPage
 import com.instructure.canvas.espresso.common.pages.compose.InboxComposePage
 import com.instructure.canvas.espresso.common.pages.compose.InboxDetailsPage
+import com.instructure.canvas.espresso.common.pages.compose.InboxSignatureSettingsPage
 import com.instructure.canvas.espresso.common.pages.compose.RecipientPickerPage
 import com.instructure.canvas.espresso.common.pages.compose.SettingsPage
 import com.instructure.parentapp.features.login.LoginActivity
@@ -78,6 +79,7 @@ abstract class ParentComposeTest : ParentTest() {
     protected val calendarToDoDetailsPage = CalendarToDoDetailsPage(composeTestRule)
     protected val calendarFilterPage = CalendarFilterPage(composeTestRule)
     protected val reminderPage = ReminderPage(composeTestRule)
+    protected val inboxSignatureSettingsPage = InboxSignatureSettingsPage(composeTestRule)
 
     override fun displaysPageObjects() = Unit
 }

apps/parent/src/main/java/com/instructure/parentapp/di/feature/AssignmentListModule.kt

@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2025 - 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.parentapp.di.feature
+
+import com.instructure.pandautils.features.assignments.list.AssignmentListBehavior
+import com.instructure.pandautils.features.assignments.list.AssignmentListRepository
+import com.instructure.pandautils.features.assignments.list.AssignmentListRouter
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.android.components.FragmentComponent
+import dagger.hilt.android.components.ViewModelComponent
+
+@Module
+@InstallIn(FragmentComponent::class)
+class AssignmentListFragmentModule {
+    @Provides
+    fun provideAssignmentListRouter(): AssignmentListRouter {
+        throw NotImplementedError()
+    }
+}
+
+@Module
+@InstallIn(ViewModelComponent::class)
+class AssignmentListModule {
+    @Provides
+    fun provideAssignmentListBehavior(): AssignmentListBehavior {
+        throw NotImplementedError()
+    }
+
+    @Provides
+    fun provideAssignmentListRepository(): AssignmentListRepository {
+        throw NotImplementedError()
+    }
+}

apps/parent/src/main/java/com/instructure/parentapp/di/feature/LoginModule.kt

@@ -17,29 +17,67 @@
 
 package com.instructure.parentapp.di.feature
 
+import android.content.Context
+import android.content.Intent
 import androidx.fragment.app.FragmentActivity
+import com.instructure.canvasapi2.LoginRouter
+import com.instructure.canvasapi2.models.AccountDomain
 import com.instructure.canvasapi2.utils.Analytics
+import com.instructure.canvasapi2.utils.ApiPrefs
 import com.instructure.loginapi.login.LoginNavigation
 import com.instructure.loginapi.login.features.acceptableusepolicy.AcceptableUsePolicyRouter
+import com.instructure.loginapi.login.util.LoginPrefs
 import com.instructure.pandautils.features.reminder.AlarmScheduler
 import com.instructure.parentapp.features.login.ParentAcceptableUsePolicyRouter
 import com.instructure.parentapp.features.login.ParentLoginNavigation
+import com.instructure.parentapp.features.login.SignInActivity
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.android.components.ActivityComponent
+import dagger.hilt.android.qualifiers.ApplicationContext
+import dagger.hilt.components.SingletonComponent
+import javax.inject.Singleton
 
 @Module
 @InstallIn(ActivityComponent::class)
 class LoginModule {
 
     @Provides
-    fun provideAcceptableUsePolicyRouter(activity: FragmentActivity, alarmScheduler: AlarmScheduler, analytics: Analytics): AcceptableUsePolicyRouter {
+    fun provideAcceptableUsePolicyRouter(
+        activity: FragmentActivity,
+        alarmScheduler: AlarmScheduler,
+        analytics: Analytics
+    ): AcceptableUsePolicyRouter {
         return ParentAcceptableUsePolicyRouter(activity, alarmScheduler, analytics)
     }
 
     @Provides
-    fun provideLoginNavigation(activity: FragmentActivity, alarmScheduler: AlarmScheduler): LoginNavigation {
+    fun provideLoginNavigation(
+        activity: FragmentActivity,
+        alarmScheduler: AlarmScheduler
+    ): LoginNavigation {
         return ParentLoginNavigation(activity, alarmScheduler)
     }
+}
+
+@Module
+@InstallIn(SingletonComponent::class)
+class LoginRouterModule {
+    @Provides
+    @Singleton
+    fun provideLoginRouter(
+        @ApplicationContext context: Context,
+        loginPrefs: LoginPrefs,
+        apiPrefs: ApiPrefs
+    ): LoginRouter {
+        return object : LoginRouter {
+            override fun loginIntent(): Intent {
+                return SignInActivity.createIntent(
+                    context,
+                    loginPrefs.lastSavedLogin?.accountDomain ?: AccountDomain(apiPrefs.domain)
+                )
+            }
+        }
+    }
 }

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

@@ -132,7 +132,9 @@ private fun CourseDetailsScreenContent(
 
     LaunchedEffect(pagerState) {
         snapshotFlow { pagerState.currentPage }.collect { page ->
-            actionHandler(CourseDetailsAction.CurrentTabChanged(uiState.tabs[page]))
+            uiState.tabs.getOrNull(page)?.let {
+                actionHandler(CourseDetailsAction.CurrentTabChanged(it))
+            }
         }
     }
 

apps/parent/src/main/java/com/instructure/parentapp/features/courses/details/summary/SummaryUiState.kt

@@ -33,4 +33,4 @@ sealed class ScreenState {
     data object Error : ScreenState()
     data object Empty : ScreenState()
     data object Content : ScreenState()
-}
+}

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

@@ -29,14 +29,15 @@ import com.instructure.canvasapi2.models.Enrollment
 import com.instructure.canvasapi2.models.GradingPeriod
 import com.instructure.canvasapi2.utils.depaginate
 import com.instructure.pandautils.features.grades.GradesRepository
+import com.instructure.pandautils.features.grades.gradepreferences.SortBy
 import com.instructure.pandautils.utils.orDefault
 import com.instructure.parentapp.util.ParentPrefs
 
 
 class ParentGradesRepository(
     private val assignmentApi: AssignmentAPI.AssignmentInterface,
     private val courseApi: CourseAPI.CoursesInterface,
-    parentPrefs: ParentPrefs
+    private val parentPrefs: ParentPrefs
 ) : GradesRepository {
 
     override val studentId = parentPrefs.currentStudent?.id.orDefault()
@@ -51,6 +52,7 @@ class ParentGradesRepository(
                 val filteredAssignments = group.assignments
                     .filter { assignment -> assignment.published }
                     .filter { assignment -> getGradingTypeFromAPIString(assignment.gradingType.orEmpty()) != Assignment.GradingType.NOT_GRADED }
+                    .filter { assignment -> assignment.submissionList.isNullOrEmpty() || assignment.submissionList?.any { submission -> submission.userId == studentId } == true}
                 group.copy(assignments = filteredAssignments).toAssignmentGroup(studentId)
             }
         }.dataOrThrow
@@ -85,4 +87,14 @@ class ParentGradesRepository(
             firstEnrollment == null && gradingPeriodId == null
         )
     }
+
+    override fun getSortBy(): SortBy? {
+        return parentPrefs.gradesSortBy?.let {
+            SortBy.valueOf(it)
+        }
+    }
+
+    override fun setSortBy(sortBy: SortBy) {
+        parentPrefs.gradesSortBy = sortBy.name
+    }
 }