diff --git a/android-vault b/android-vault
index 15225ede6c..2f81632319 160000
--- a/android-vault
+++ b/android-vault
@@ -1 +1 @@
-Subproject commit 15225ede6c44da8265e5cdaea34d49dbc47cb8f5
+Subproject commit 2f816323198928844c274ede6692e0fd8430d4d1
diff --git a/apps/build.gradle b/apps/build.gradle
index 8d5d077915..c9cbf4d9db 100644
--- a/apps/build.gradle
+++ b/apps/build.gradle
@@ -33,7 +33,6 @@ buildscript {
classpath Plugins.KOTLIN
classpath Plugins.FIREBASE_CRASHLYTICS
if (project.coverageEnabled) { classpath Plugins.JACOCO_ANDROID }
- classpath Plugins.SQLDELIGHT
classpath Plugins.HILT
classpath Plugins.HEAP
}
diff --git a/apps/flutter_parent/android/app/build.gradle b/apps/flutter_parent/android/app/build.gradle
index 5fd86f30e5..0190a20214 100644
--- a/apps/flutter_parent/android/app/build.gradle
+++ b/apps/flutter_parent/android/app/build.gradle
@@ -33,7 +33,7 @@ if (keystorePropertiesFile.exists()) {
}
android {
- compileSdk 33
+ compileSdk 34
sourceSets {
main.java.srcDirs += 'src/main/kotlin'
@@ -46,7 +46,7 @@ android {
defaultConfig {
applicationId "com.instructure.parentapp"
minSdkVersion 26
- targetSdk 33
+ targetSdk 34
versionCode flutterVersionCode.toInteger()
versionName flutterVersionName
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
diff --git a/apps/flutter_parent/lib/l10n/app_localizations.dart b/apps/flutter_parent/lib/l10n/app_localizations.dart
index 86768767b3..b7f03e6be3 100644
--- a/apps/flutter_parent/lib/l10n/app_localizations.dart
+++ b/apps/flutter_parent/lib/l10n/app_localizations.dart
@@ -1715,4 +1715,14 @@ class AppLocalizations {
String get needToEnablePermission =>
Intl.message('You need to enable exact alarm permission for this action', desc: 'Error message when the user tries to set a reminder without the permission');
+
+ String get submissionAndRubric => Intl.message(
+ 'Submission & Rubric',
+ desc: 'Button text for Submission and Rubric on Assignment Details Screen'
+ );
+
+ String get submission => Intl.message(
+ 'Submission',
+ desc: 'Title for WebView screen when opening submission'
+ );
}
diff --git a/apps/flutter_parent/lib/l10n/res/intl_ga.arb b/apps/flutter_parent/lib/l10n/res/intl_ga.arb
new file mode 100644
index 0000000000..bea1391b7a
--- /dev/null
+++ b/apps/flutter_parent/lib/l10n/res/intl_ga.arb
@@ -0,0 +1,2753 @@
+{
+ "@@last_modified": "2023-08-25T11:04:20.901151",
+ "alertsLabel": "Foláirimh",
+ "@alertsLabel": {
+ "description": "The label for the Alerts tab",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "calendarLabel": "Féilire",
+ "@calendarLabel": {
+ "description": "The label for the Calendar tab",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "coursesLabel": "Cúrsaí",
+ "@coursesLabel": {
+ "description": "The label for the Courses tab",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "No Students": "Níl Mic Léinn ann",
+ "@No Students": {
+ "description": "Text for when an observer has no students they are observing",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Tap to show student selector": "Tapáil chun roghnóir an mhic léinn a thaispeáint",
+ "@Tap to show student selector": {
+ "description": "Semantics label for the area that will show the student selector when tapped",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Tap to pair with a new student": "Tapáil chun péireáil le mac léinn nua",
+ "@Tap to pair with a new student": {
+ "description": "Semantics label for the add student button in the student selector",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Tap to select this student": "Tapáil chun an mac léinn seo a roghnú",
+ "@Tap to select this student": {
+ "description": "Semantics label on individual students in the student switcher",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Manage Students": "Bainistigh Mic Léinn",
+ "@Manage Students": {
+ "description": "Label text for the Manage Students nav drawer button as well as the title for the Manage Students screen",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Help": "Cabhair",
+ "@Help": {
+ "description": "Label text for the help nav drawer button",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Log Out": "Logáil Amach",
+ "@Log Out": {
+ "description": "Label text for the Log Out nav drawer button",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Switch Users": "Malartaigh Úsáideoirí",
+ "@Switch Users": {
+ "description": "Label text for the Switch Users nav drawer button",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "appVersion": "v. {version}",
+ "@appVersion": {
+ "description": "App version shown in the navigation drawer",
+ "type": "text",
+ "placeholders_order": [
+ "version"
+ ],
+ "placeholders": {
+ "version": {}
+ }
+ },
+ "Are you sure you want to log out?": "An bhfuil tú cinnte gur mhaith leat logáil amach?",
+ "@Are you sure you want to log out?": {
+ "description": "Confirmation message displayed when the user tries to log out",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Calendars": "Féilirí",
+ "@Calendars": {
+ "description": "Label for button that lets users select which calendars to display",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "nextMonth": "An mhí seo chugainn: {month}",
+ "@nextMonth": {
+ "description": "Label for the button that switches the calendar to the next month",
+ "type": "text",
+ "placeholders_order": [
+ "month"
+ ],
+ "placeholders": {
+ "month": {}
+ }
+ },
+ "previousMonth": "An mhí roimhe sin: {month}",
+ "@previousMonth": {
+ "description": "Label for the button that switches the calendar to the previous month",
+ "type": "text",
+ "placeholders_order": [
+ "month"
+ ],
+ "placeholders": {
+ "month": {}
+ }
+ },
+ "nextWeek": "An tseachtain seo chugainn ag tosnú {date}",
+ "@nextWeek": {
+ "description": "Label for the button that switches the calendar to the next week",
+ "type": "text",
+ "placeholders_order": [
+ "date"
+ ],
+ "placeholders": {
+ "date": {}
+ }
+ },
+ "previousWeek": "An tseachtain roimhe ag tosnú {date}",
+ "@previousWeek": {
+ "description": "Label for the button that switches the calendar to the previous week",
+ "type": "text",
+ "placeholders_order": [
+ "date"
+ ],
+ "placeholders": {
+ "date": {}
+ }
+ },
+ "selectedMonthLabel": "Mí {month}",
+ "@selectedMonthLabel": {
+ "description": "Accessibility label for the button that expands/collapses the month view",
+ "type": "text",
+ "placeholders_order": [
+ "month"
+ ],
+ "placeholders": {
+ "month": {}
+ }
+ },
+ "expand": "leathnaigh",
+ "@expand": {
+ "description": "Accessibility label for the on-tap hint for the button that expands/collapses the month view",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "collapse": "leacaigh",
+ "@collapse": {
+ "description": "Accessibility label for the on-tap hint for the button that expands/collapses the month view",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "pointsPossible": "{points} pointe féideartha",
+ "@pointsPossible": {
+ "description": "Screen reader label used for the points possible for an assignment, quiz, etc.",
+ "type": "text",
+ "placeholders_order": [
+ "points"
+ ],
+ "placeholders": {
+ "points": {}
+ }
+ },
+ "calendarDaySemanticsLabel": "{eventCount,plural, =1{{date}, {eventCount} imeacht}other{{date}, {eventCount} imeacht}}",
+ "@calendarDaySemanticsLabel": {
+ "description": "Screen reader label used for calendar day, reads the date and count of events",
+ "type": "text",
+ "placeholders_order": [
+ "date",
+ "eventCount"
+ ],
+ "placeholders": {
+ "date": {},
+ "eventCount": {}
+ }
+ },
+ "No Events Today!": "Gan Imeacht inniu!",
+ "@No Events Today!": {
+ "description": "Title displayed when there are no calendar events for the current day",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "It looks like a great day to rest, relax, and recharge.": "Breathnaíonn sé cosúil le lá iontach chun sos a ghlacadh, scíth a ligean, agus d'anáil a tharraingt.",
+ "@It looks like a great day to rest, relax, and recharge.": {
+ "description": "Message displayed when there are no calendar events for the current day",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "There was an error loading your student's calendar": "Tharla earráid agus féilire do mhic léinn á lódáil",
+ "@There was an error loading your student's calendar": {
+ "description": "Message displayed when calendar events could not be loaded for the current student",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Tap to favorite the courses you want to see on the Calendar. Select up to 10.": "Tapáil chun na cúrsaí is fearr leat a fheiceáil ar an bhFéilire. Roghnaigh suas le 10 gcinn.",
+ "@Tap to favorite the courses you want to see on the Calendar. Select up to 10.": {
+ "description": "Description text on calendar filter screen.",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "You may only choose 10 calendars to display": "Ní féidir leat ach 10 bhféilire a roghnú lena thaispeáint",
+ "@You may only choose 10 calendars to display": {
+ "description": "Error text when trying to select more than 10 calendars",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "You must select at least one calendar to display": "Ní mór duit féilire amháin ar a laghad a roghnú lena thaispeáint",
+ "@You must select at least one calendar to display": {
+ "description": "Error text when trying to de-select all calendars",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Planner Note": "Nóta Pleanálaí",
+ "@Planner Note": {
+ "description": "Label used for notes in the planner",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Go to today": "Téigh go dtí inniu",
+ "@Go to today": {
+ "description": "Accessibility label used for the today button in the planner",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Previous Logins": "Logáil Isteach Roimhe Seo",
+ "@Previous Logins": {
+ "description": "Label for the list of previous user logins",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "canvasLogoLabel": "Lógó Canvas",
+ "@canvasLogoLabel": {
+ "description": "The semantics label for the Canvas logo",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "findSchool": "Aimsigh Scoil",
+ "@findSchool": {
+ "description": "Text for the find-my-school button",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "findAnotherSchool": "Aimsigh scoil eile",
+ "@findAnotherSchool": {
+ "description": "Text for the find-another-school button",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "domainSearchInputHint": "Cuir isteach ainm scoile nó ceantar…",
+ "@domainSearchInputHint": {
+ "description": "Input hint for the text box on the domain search screen",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "noDomainResults": "Ní féidir scoileanna a mheaitseálann \"{query}\" a aimsiú",
+ "@noDomainResults": {
+ "description": "Message shown to users when the domain search query did not return any results",
+ "type": "text",
+ "placeholders_order": [
+ "query"
+ ],
+ "placeholders": {
+ "query": {}
+ }
+ },
+ "domainSearchHelpLabel": "Conas a aimsím mo scoil nó mo cheantar?",
+ "@domainSearchHelpLabel": {
+ "description": "Label for the help button on the domain search screen",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "canvasGuides": "Treoracha Canvas",
+ "@canvasGuides": {
+ "description": "Proper name for the Canvas Guides. This will be used in the domainSearchHelpBody text and will be highlighted and clickable",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "canvasSupport": "Tacaíocht Canvas",
+ "@canvasSupport": {
+ "description": "Proper name for Canvas Support. This will be used in the domainSearchHelpBody text and will be highlighted and clickable",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "domainSearchHelpBody": "Déan iarracht ainm na scoile nó an cheantair a bhfuil tú ag iarraidh rochtain a fháil air a chuardach, ar nós “Smith Private School” nó “Smith County Schools”. Is féidir leat fearann Canvas a chur isteach go díreach freisin, amhail “smith.instructure.com.” \n\nChun tuilleadh faisnéise a fháil maidir le cuntas Canvas d’institiúide a aimsiú, is féidir leat cuairt a thabhairt ar an {canvasGuides}, déan teagmháil le {canvasSupport}, nó déan teagmháil le do scoil chun cúnamh a fháil.",
+ "@domainSearchHelpBody": {
+ "description": "The body text shown in the help dialog on the domain search screen",
+ "type": "text",
+ "placeholders_order": [
+ "canvasGuides",
+ "canvasSupport"
+ ],
+ "placeholders": {
+ "canvasGuides": {},
+ "canvasSupport": {}
+ }
+ },
+ "Uh oh!": "Uh ó!",
+ "@Uh oh!": {
+ "description": "Title of the screen that shows when a crash has occurred",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "We’re not sure what happened, but it wasn’t good. Contact us if this keeps happening.": "Níl muid cinnte cad a tharla, ach ní raibh sé go maith. Déan teagmháil linn má leanann sé seo ag tarlú.",
+ "@We’re not sure what happened, but it wasn’t good. Contact us if this keeps happening.": {
+ "description": "Message shown when a crash has occurred",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Contact Support": "Tacaíocht Teagmhála",
+ "@Contact Support": {
+ "description": "Label for the button that allows users to contact support after a crash has occurred",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "View error details": "Féach ar shonraí earráide",
+ "@View error details": {
+ "description": "Label for the button that allowed users to view crash details",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Restart app": "Atosaigh an aip",
+ "@Restart app": {
+ "description": "Label for the button that will restart the entire application",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Application version": "Leagan feidhmchláir",
+ "@Application version": {
+ "description": "Label for the application version displayed in the crash details",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Device model": "Múnla gléas",
+ "@Device model": {
+ "description": "Label for the device model displayed in the crash details",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Android OS version": "Android leagan OS",
+ "@Android OS version": {
+ "description": "Label for the Android operating system version displayed in the crash details",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Full error message": "Teachtaireacht earráide iomlán",
+ "@Full error message": {
+ "description": "Label for the full error message displayed in the crash details",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Inbox": "Bosca Isteach",
+ "@Inbox": {
+ "description": "Title for the Inbox screen",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "There was an error loading your inbox messages.": "Tharla earráid agus do theachtaireachtaí sa bhosca isteach á lódáil.",
+ "@There was an error loading your inbox messages.": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "No Subject": "Níl aon Ábhar",
+ "@No Subject": {
+ "description": "Title used for inbox messages that have no subject",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Unable to fetch courses. Please check your connection and try again.": "Ní féidir cúrsaí a fháil. Seiceáil do cheangal agus bain triail eile as.",
+ "@Unable to fetch courses. Please check your connection and try again.": {
+ "description": "Message shown when an error occured while loading courses",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Choose a course to message": "Roghnaigh cúrsa chun teachtaireacht a dhéanamh",
+ "@Choose a course to message": {
+ "description": "Header in the course list shown when the user is choosing which course to associate with a new message",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Inbox Zero": "Bosca Isteach Nialais",
+ "@Inbox Zero": {
+ "description": "Title of the message shown when there are no inbox messages",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "You’re all caught up!": "Tá tú suas chun dáta ar fad!",
+ "@You’re all caught up!": {
+ "description": "Subtitle of the message shown when there are no inbox messages",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "There was an error loading recipients for this course": "Tharla earráid agus faighteoirí á lódáil don chúrsa seo",
+ "@There was an error loading recipients for this course": {
+ "description": "Message shown when attempting to create a new message but the recipients list failed to load",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Unable to send message. Check your connection and try again.": "Ní féidir teachtaireacht a sheoladh. Seiceáil do cheangal agus bain triail eile as.",
+ "@Unable to send message. Check your connection and try again.": {
+ "description": "Message show when there was an error creating or sending a new message",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Unsaved changes": "Athruithe nach bhfuil sábháilte",
+ "@Unsaved changes": {
+ "description": "Title of the dialog shown when the user tries to leave with unsaved changes",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Are you sure you wish to close this page? Your unsent message will be lost.": "An bhfuil tú cinnte gur mian leat an leathanach seo a dhúnadh? Caillfear do theachtaireacht nár seoladh.",
+ "@Are you sure you wish to close this page? Your unsent message will be lost.": {
+ "description": "Body text of the dialog shown when the user tries leave with unsaved changes",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "New message": "Teachtaireacht nua",
+ "@New message": {
+ "description": "Title of the new-message screen",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Add attachment": "Cuir ceangaltán leis",
+ "@Add attachment": {
+ "description": "Tooltip for the add-attachment button in the new-message screen",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Send message": "Seol teachtaireacht",
+ "@Send message": {
+ "description": "Tooltip for the send-message button in the new-message screen",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Select recipients": "Roghnaigh faighteoirí",
+ "@Select recipients": {
+ "description": "Tooltip for the button that allows users to select message recipients",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "No recipients selected": "Níor roghnaíodh aon fhaighteoir",
+ "@No recipients selected": {
+ "description": "Hint displayed when the user has not selected any message recipients",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Message subject": "Ábhar na teachtaireachta",
+ "@Message subject": {
+ "description": "Hint text displayed in the input field for the message subject",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Message": "Teachtaireacht",
+ "@Message": {
+ "description": "Hint text displayed in the input field for the message body",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Recipients": "Faighteoirí",
+ "@Recipients": {
+ "description": "Label for message recipients",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "plusRecipientCount": "+{count}",
+ "@plusRecipientCount": {
+ "description": "Shows the number of recipients that are selected but not displayed on screen.",
+ "type": "text",
+ "placeholders_order": [
+ "count"
+ ],
+ "placeholders": {
+ "count": {
+ "example": 5
+ }
+ }
+ },
+ "Failed. Tap for options.": "Theip air. Tapáil le haghaidh roghanna.",
+ "@Failed. Tap for options.": {
+ "description": "Short message shown on a message attachment when uploading has failed",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "courseForWhom": "le haghaidh {studentShortName}",
+ "@courseForWhom": {
+ "description": "Describes for whom a course is for (i.e. for Bill)",
+ "type": "text",
+ "placeholders_order": [
+ "studentShortName"
+ ],
+ "placeholders": {
+ "studentShortName": {}
+ }
+ },
+ "messageLinkPostscript": "Maidir le: {studentName}, {linkUrl}",
+ "@messageLinkPostscript": {
+ "description": "A postscript appended to new messages that clarifies which student is the subject of the message and also includes a URL for the related Canvas component (course, assignment, event, etc).",
+ "type": "text",
+ "placeholders_order": [
+ "studentName",
+ "linkUrl"
+ ],
+ "placeholders": {
+ "studentName": {},
+ "linkUrl": {}
+ }
+ },
+ "There was an error loading this conversation": "Tharla earráid agus an comhrá seo á lódáil",
+ "@There was an error loading this conversation": {
+ "description": "Message shown when a conversation fails to load",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Reply": "Freagair",
+ "@Reply": {
+ "description": "Button label for replying to a conversation",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Reply All": "Freagair Do Chách",
+ "@Reply All": {
+ "description": "Button label for replying to all conversation participants",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Unknown User": "Úsáideoir Anaithnid",
+ "@Unknown User": {
+ "description": "Label used where the user name is not known",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "me": "mé",
+ "@me": {
+ "description": "First-person pronoun (i.e. 'me') that will be used in message author info, e.g. 'Me to 4 others' or 'Jon Snow to me'",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "authorToRecipient": "{authorName} go {recipientName}",
+ "@authorToRecipient": {
+ "description": "Author info for a single-recipient message; includes both the author name and the recipient name.",
+ "type": "text",
+ "placeholders_order": [
+ "authorName",
+ "recipientName"
+ ],
+ "placeholders": {
+ "authorName": {},
+ "recipientName": {}
+ }
+ },
+ "authorToNOthers": "{howMany,plural, =1{{authorName} go 1 eile}other{{authorName} go {howMany} daoine eile}}",
+ "@authorToNOthers": {
+ "description": "Author info for a mutli-recipient message; includes the author name and the number of recipients",
+ "type": "text",
+ "placeholders_order": [
+ "authorName",
+ "howMany"
+ ],
+ "placeholders": {
+ "authorName": {},
+ "howMany": {}
+ }
+ },
+ "authorToRecipientAndNOthers": "{howMany,plural, =1{{authorName} go {recipientName} & 1 eile}other{{authorName} go {recipientName} & {howMany} daoine eile}}",
+ "@authorToRecipientAndNOthers": {
+ "description": "Author info for a multi-recipient message; includes the author name, one recipient name, and the number of other recipients",
+ "type": "text",
+ "placeholders_order": [
+ "authorName",
+ "recipientName",
+ "howMany"
+ ],
+ "placeholders": {
+ "authorName": {},
+ "recipientName": {},
+ "howMany": {}
+ }
+ },
+ "Download": "Íoslódáil",
+ "@Download": {
+ "description": "Label for the button that will begin downloading a file",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Open with another app": "Oscail le aip eile",
+ "@Open with another app": {
+ "description": "Label for the button that will allow users to open a file with another app",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "There are no installed applications that can open this file": "Níl aon fheidhmchláir suiteáilte ar féidir an comhad seo a oscailt",
+ "@There are no installed applications that can open this file": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Unsupported File": "Comhad nach dtacaítear leis",
+ "@Unsupported File": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "This file is unsupported and can’t be viewed through the app": "Ní thacaítear leis an gcomhad seo agus ní féidir é a fheiceáil tríd an aip",
+ "@This file is unsupported and can’t be viewed through the app": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Unable to play this media file": "Ní féidir an comhad meáin seo a sheinm",
+ "@Unable to play this media file": {
+ "description": "Message shown when audio or video media could not be played",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Unable to load this image": "Ní féidir an íomhá seo a lódáil",
+ "@Unable to load this image": {
+ "description": "Message shown when an image file could not be loaded or displayed",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "There was an error loading this file": "Tharla earráid agus an comhad seo á lódáil",
+ "@There was an error loading this file": {
+ "description": "Message shown when a file could not be loaded or displayed",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "No Courses": "Níl aon Chúrsaí",
+ "@No Courses": {
+ "description": "Title for having no courses",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Your student’s courses might not be published yet.": "Seans nach bhfuil cúrsaí do mhic léinn foilsithe fós.",
+ "@Your student’s courses might not be published yet.": {
+ "description": "Message for having no courses",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "There was an error loading your student’s courses.": "Tharla earráid agus cúrsaí do mhic léinn á lódáil.",
+ "@There was an error loading your student’s courses.": {
+ "description": "Message displayed when the list of student courses could not be loaded",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "No Grade": "Níl Marc Ann",
+ "@No Grade": {
+ "description": "Message shown when there is currently no grade available for a course",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Filter by": "Scag de réir",
+ "@Filter by": {
+ "description": "Title for list of terms to filter grades by",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Grades": "Marcanna",
+ "@Grades": {
+ "description": "Label for the \"Grades\" tab in course details",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Syllabus": "Siollabas",
+ "@Syllabus": {
+ "description": "Label for the \"Syllabus\" tab in course details",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Front Page": "Leathanach Tosaigh",
+ "@Front Page": {
+ "description": "Label for the \"Front Page\" tab in course details",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Summary": "Achoimre",
+ "@Summary": {
+ "description": "Label for the \"Summary\" tab in course details",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Send a message about this course": "Seol teachtaireacht faoin gcúrsa seo",
+ "@Send a message about this course": {
+ "description": "Accessibility hint for the course messaage floating action button",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Total Grade": "Marc Iomlán",
+ "@Total Grade": {
+ "description": "Label for the total grade in the course",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Graded": "Marcáilte",
+ "@Graded": {
+ "description": "Label for assignments that have been graded",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Submitted": "Curtha isteach",
+ "@Submitted": {
+ "description": "Label for assignments that have been submitted",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Not Submitted": "Níl sé Curtha isteach",
+ "@Not Submitted": {
+ "description": "Label for assignments that have not been submitted",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Late": "Mall",
+ "@Late": {
+ "description": "Label for assignments that have been marked late or submitted late",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Missing": "Ar Iarraidh",
+ "@Missing": {
+ "description": "Label for assignments that have been marked missing or are not submitted and past the due date",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "-": "-",
+ "@-": {
+ "description": "Value representing no score for student submission",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "All Grading Periods": "Gach Tréimhse Mharcála",
+ "@All Grading Periods": {
+ "description": "Label for selecting all grading periods",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "No Assignments": "Níl aon Tascanna ann",
+ "@No Assignments": {
+ "description": "Title for the no assignments message",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "It looks like assignments haven't been created in this space yet.": "Tá an chuma ar an scéal nár cruthaíodh tascanna sa spás seo go fóill.",
+ "@It looks like assignments haven't been created in this space yet.": {
+ "description": "Message for no assignments",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "There was an error loading the summary details for this course.": "Tharla earráid agus na sonraí achoimre don chúrsa seo á lódáil.",
+ "@There was an error loading the summary details for this course.": {
+ "description": "Message shown when the course summary could not be loaded",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "No Summary": "Níl Achoimre Ann",
+ "@No Summary": {
+ "description": "Title displayed when there are no items in the course summary",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "This course does not have any assignments or calendar events yet.": "Níl aon tascanna ná imeachtaí féilire ag an gcúrsa seo fós.",
+ "@This course does not have any assignments or calendar events yet.": {
+ "description": "Message displayed when there are no items in the course summary",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "gradeFormatScoreOutOfPointsPossible": "{score} / {pointsPossible}",
+ "@gradeFormatScoreOutOfPointsPossible": {
+ "description": "Formatted string for a student score out of the points possible",
+ "type": "text",
+ "placeholders_order": [
+ "score",
+ "pointsPossible"
+ ],
+ "placeholders": {
+ "score": {},
+ "pointsPossible": {}
+ }
+ },
+ "contentDescriptionScoreOutOfPointsPossible": "{score} as {pointsPossible} pointí",
+ "@contentDescriptionScoreOutOfPointsPossible": {
+ "description": "Formatted string for a student score out of the points possible",
+ "type": "text",
+ "placeholders_order": [
+ "score",
+ "pointsPossible"
+ ],
+ "placeholders": {
+ "score": {},
+ "pointsPossible": {}
+ }
+ },
+ "gradesSubjectMessage": "Maidir le: {studentName}, Marcanna",
+ "@gradesSubjectMessage": {
+ "description": "The subject line for a message to a teacher regarding a student's grades",
+ "type": "text",
+ "placeholders_order": [
+ "studentName"
+ ],
+ "placeholders": {
+ "studentName": {}
+ }
+ },
+ "syllabusSubjectMessage": "Maidir le: {studentName}, Siollabas",
+ "@syllabusSubjectMessage": {
+ "description": "The subject line for a message to a teacher regarding a course syllabus",
+ "type": "text",
+ "placeholders_order": [
+ "studentName"
+ ],
+ "placeholders": {
+ "studentName": {}
+ }
+ },
+ "frontPageSubjectMessage": "Maidir le: {studentName}, Leathanach Tosaigh",
+ "@frontPageSubjectMessage": {
+ "description": "The subject line for a message to a teacher regarding a course front page",
+ "type": "text",
+ "placeholders_order": [
+ "studentName"
+ ],
+ "placeholders": {
+ "studentName": {}
+ }
+ },
+ "assignmentSubjectMessage": "Maidir le: {studentName}, Tasc - {assignmentName}",
+ "@assignmentSubjectMessage": {
+ "description": "The subject line for a message to a teacher regarding a student's assignment",
+ "type": "text",
+ "placeholders_order": [
+ "studentName",
+ "assignmentName"
+ ],
+ "placeholders": {
+ "studentName": {},
+ "assignmentName": {}
+ }
+ },
+ "eventSubjectMessage": "Maidir le: {studentName}, Imeacht - {eventTitle}",
+ "@eventSubjectMessage": {
+ "description": "The subject line for a message to a teacher regarding a calendar event",
+ "type": "text",
+ "placeholders_order": [
+ "studentName",
+ "eventTitle"
+ ],
+ "placeholders": {
+ "studentName": {},
+ "eventTitle": {}
+ }
+ },
+ "There is no page information available.": "Níl aon eolas leathanaigh ar fáil.",
+ "@There is no page information available.": {
+ "description": "Description for when no page information is available",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Assignment Details": "Sonraí an Taisc",
+ "@Assignment Details": {
+ "description": "Title for the page that shows details for an assignment",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "assignmentTotalPoints": "{points} pte",
+ "@assignmentTotalPoints": {
+ "description": "Label used for the total points the assignment is worth",
+ "type": "text",
+ "placeholders_order": [
+ "points"
+ ],
+ "placeholders": {
+ "points": {}
+ }
+ },
+ "assignmentTotalPointsAccessible": "{points} pointe",
+ "@assignmentTotalPointsAccessible": {
+ "description": "Screen reader label used for the total points the assignment is worth",
+ "type": "text",
+ "placeholders_order": [
+ "points"
+ ],
+ "placeholders": {
+ "points": {}
+ }
+ },
+ "Due": "Dlite",
+ "@Due": {
+ "description": "Label for an assignment due date",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Grade": "Marc",
+ "@Grade": {
+ "description": "Label for the section that displays an assignment's grade",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Locked": "Faoi ghlas",
+ "@Locked": {
+ "description": "Label for when an assignment is locked",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "assignmentLockedModule": "Tá an tasc seo glasáilte ag an modúl \"{moduleName}\".",
+ "@assignmentLockedModule": {
+ "description": "The locked description when an assignment is locked by a module",
+ "type": "text",
+ "placeholders_order": [
+ "moduleName"
+ ],
+ "placeholders": {
+ "moduleName": {}
+ }
+ },
+ "Remind Me": "Cuir i gcuimhne dom",
+ "@Remind Me": {
+ "description": "Label for the row to set reminders",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Set a date and time to be notified of this specific assignment.": "Socraigh dáta agus am le bheith curtha ar an eolas faoin tasc ar leith seo.",
+ "@Set a date and time to be notified of this specific assignment.": {
+ "description": "Description for row to set reminders",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "You will be notified about this assignment on…": "Cuirfear ar an eolas thú faoin tasc seo ar…",
+ "@You will be notified about this assignment on…": {
+ "description": "Description for when a reminder is set",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Instructions": "Treoracha",
+ "@Instructions": {
+ "description": "Label for the description of the assignment when it has quiz instructions",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Send a message about this assignment": "Seol teachtaireacht faoin tasc seo",
+ "@Send a message about this assignment": {
+ "description": "Accessibility hint for the assignment messaage floating action button",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "This app is not authorized for use.": "Níl an aip seo údaraithe le húsáid.",
+ "@This app is not authorized for use.": {
+ "description": "The error shown when the app being used is not verified by Canvas",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "The server you entered is not authorized for this app.": "Níl an freastalaí a d'iontráil tú údaraithe don aip seo.",
+ "@The server you entered is not authorized for this app.": {
+ "description": "The error shown when the desired login domain is not verified by Canvas",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "The user agent for this app is not authorized.": "Níl an gníomhaire úsáideora don aip seo údaraithe.",
+ "@The user agent for this app is not authorized.": {
+ "description": "The error shown when the user agent during verification is not verified by Canvas",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "We were unable to verify the server for use with this app.": "Níorbh fhéidir linn an freastalaí a fhíorú lena úsáid leis an aip seo.",
+ "@We were unable to verify the server for use with this app.": {
+ "description": "The generic error shown when we are unable to verify with Canvas",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Reminders": "Meabhrúcháin",
+ "@Reminders": {
+ "description": "Name of the system notification channel for assignment and event reminders",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Notifications for reminders about assignments and calendar events": "Fógraí le haghaidh meabhrúcháin faoi thascanna agus imeachtaí féilire",
+ "@Notifications for reminders about assignments and calendar events": {
+ "description": "Description of the system notification channel for assignment and event reminders",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Reminders have changed!": "Tá meabhrúcháin tar éis athrú!",
+ "@Reminders have changed!": {
+ "description": "Title of the dialog shown when the user needs to update their reminders",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "In order to provide you with a better experience, we have updated how reminders work. You can add new reminders by viewing an assignment or calendar event and tapping the switch under the \"Remind Me\" section. \n\nBe aware that any reminders created with older versions of this app will not be compatible with the new changes and you will need to create them again.": "Chun eispéireas níos fearr a sholáthar duit, tá nuashonrú déanta againn ar an gcaoi a n-oibríonn meabhrúcháin. Is féidir leat meabhrúcháin nua a chur leis trí thasc nó imeacht féilire a fheiceáil agus an lasc a thapáil faoin rannán \"Cuir i gcuimhne dom\".\n\nTabhair faoi deara nach mbeidh aon mheabhrúcháin a chruthaítear le leaganacha níos sine den aip seo comhoiriúnach leis na hathruithe nua agus beidh ort iad a chruthú arís.",
+ "@In order to provide you with a better experience, we have updated how reminders work. You can add new reminders by viewing an assignment or calendar event and tapping the switch under the \"Remind Me\" section.\n\nBe aware that any reminders created with older versions of this app will not be compatible with the new changes and you will need to create them again.": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Not a parent?": "Ní tuismitheoir tú?",
+ "@Not a parent?": {
+ "description": "Title for the screen that shows when the user is not observing any students",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "We couldn't find any students associated with this account": "Níorbh fhéidir linn aon mhac léinn a bhaineann leis an gcuntas seo a aimsiú",
+ "@We couldn't find any students associated with this account": {
+ "description": "Subtitle for the screen that shows when the user is not observing any students",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Are you a student or teacher?": "An mac léinn nó múinteoir tú?",
+ "@Are you a student or teacher?": {
+ "description": "Label for button that will show users the option to view other Canvas apps in the Play Store",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "One of our other apps might be a better fit. Tap one to visit the Play Store.": "D'fhéadfadh go mbeadh ceann dár n-aipeanna eile níos oiriúnaí. Tapáil ceann amháin chun cuairt a thabhairt ar an Play Store.",
+ "@One of our other apps might be a better fit. Tap one to visit the Play Store.": {
+ "description": "Description of options to view other Canvas apps in the Play Store",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Return to Login": "Fill ar Logáil Isteach",
+ "@Return to Login": {
+ "description": "Label for the button that returns the user to the login screen",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "STUDENT": "MAC LÉINN",
+ "@STUDENT": {
+ "description": "The \"student\" portion of the \"Canvas Student\" app name, in all caps. \"Canvas\" is excluded in this context as it will be displayed to the user as a wordmark image",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "TEACHER": "MÚINTEOIR",
+ "@TEACHER": {
+ "description": "The \"teacher\" portion of the \"Canvas Teacher\" app name, in all caps. \"Canvas\" is excluded in this context as it will be displayed to the user as a wordmark image",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Canvas Student": "Mac Léinn Canvas",
+ "@Canvas Student": {
+ "description": "The name of the Canvas Student app. Only \"Student\" should be translated as \"Canvas\" is a brand name in this context and should not be translated.",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Canvas Teacher": "Múinteoir Canvas",
+ "@Canvas Teacher": {
+ "description": "The name of the Canvas Teacher app. Only \"Teacher\" should be translated as \"Canvas\" is a brand name in this context and should not be translated.",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "No Alerts": "Níl aon Fholáirimh",
+ "@No Alerts": {
+ "description": "The title for the empty message to show to users when there are no alerts for the student.",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "There’s nothing to be notified of yet.": "Níl aon rud le cur in iúl go fóill.",
+ "@There’s nothing to be notified of yet.": {
+ "description": "The empty message to show to users when there are no alerts for the student.",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "dismissAlertLabel": "Diúltaigh {alertTitle}",
+ "@dismissAlertLabel": {
+ "description": "Accessibility label to dismiss an alert",
+ "type": "text",
+ "placeholders_order": [
+ "alertTitle"
+ ],
+ "placeholders": {
+ "alertTitle": {}
+ }
+ },
+ "Course Announcement": "Fógra an Chúrsa",
+ "@Course Announcement": {
+ "description": "Title for alerts when there is a course announcement",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Institution Announcement": "Fógra Institiúide",
+ "@Institution Announcement": {
+ "description": "Title for alerts when there is an institution announcement",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "assignmentGradeAboveThreshold": "Marc an Taisc Thar {threshold}",
+ "@assignmentGradeAboveThreshold": {
+ "description": "Title for alerts when an assignment grade is above the threshold value",
+ "type": "text",
+ "placeholders_order": [
+ "threshold"
+ ],
+ "placeholders": {
+ "threshold": {}
+ }
+ },
+ "assignmentGradeBelowThreshold": "Marc an Taisc Faoi {threshold}",
+ "@assignmentGradeBelowThreshold": {
+ "description": "Title for alerts when an assignment grade is below the threshold value",
+ "type": "text",
+ "placeholders_order": [
+ "threshold"
+ ],
+ "placeholders": {
+ "threshold": {}
+ }
+ },
+ "courseGradeAboveThreshold": "Marc an Chúrsa Thar {threshold}",
+ "@courseGradeAboveThreshold": {
+ "description": "Title for alerts when a course grade is above the threshold value",
+ "type": "text",
+ "placeholders_order": [
+ "threshold"
+ ],
+ "placeholders": {
+ "threshold": {}
+ }
+ },
+ "courseGradeBelowThreshold": "Marc an Chúrsa Faoi {threshold}",
+ "@courseGradeBelowThreshold": {
+ "description": "Title for alerts when a course grade is below the threshold value",
+ "type": "text",
+ "placeholders_order": [
+ "threshold"
+ ],
+ "placeholders": {
+ "threshold": {}
+ }
+ },
+ "Settings": "Socruithe",
+ "@Settings": {
+ "description": "Title for the settings screen",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Theme": "Téama",
+ "@Theme": {
+ "description": "Label for the light/dark theme section in the settings page",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Dark Mode": "Mód Dorcha",
+ "@Dark Mode": {
+ "description": "Label for the button that enables dark mode",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Light Mode": "Mód Geall",
+ "@Light Mode": {
+ "description": "Label for the button that enables light mode",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "High Contrast Mode": "Mód Codarsnachta Ard",
+ "@High Contrast Mode": {
+ "description": "Label for the switch that toggles high contrast mode",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Use Dark Theme in Web Content": "Úsáid Téama Dorcha in Ábhar Gréasáin",
+ "@Use Dark Theme in Web Content": {
+ "description": "Label for the switch that toggles dark mode for webviews",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Appearance": "Dealramh",
+ "@Appearance": {
+ "description": "Label for the appearance section in the settings page",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Successfully submitted!": "Curtha isteach go rathúil!",
+ "@Successfully submitted!": {
+ "description": "Title displayed in the grade cell for an assignment that has been submitted",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "submissionStatusSuccessSubtitle": "Cuireadh an tasc seo isteach ar {date} ag {time} agus tá sé ag fanacht le bheith marcáilte",
+ "@submissionStatusSuccessSubtitle": {
+ "description": "Subtitle displayed in the grade cell for an assignment that has been submitted and is awaiting a grade",
+ "type": "text",
+ "placeholders_order": [
+ "date",
+ "time"
+ ],
+ "placeholders": {
+ "date": {},
+ "time": {}
+ }
+ },
+ "outOfPoints": "{howMany,plural, =1{As pointe 1}other{ as {points} pointe}}",
+ "@outOfPoints": {
+ "description": "Description for an assignment grade that has points without a current scoroe",
+ "type": "text",
+ "placeholders_order": [
+ "points",
+ "howMany"
+ ],
+ "placeholders": {
+ "points": {},
+ "howMany": {}
+ }
+ },
+ "Excused": "Leithscéal faighte",
+ "@Excused": {
+ "description": "Grading status for an assignment marked as excused",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Complete": "Críochnaithe",
+ "@Complete": {
+ "description": "Grading status for an assignment marked as complete",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Incomplete": "Neamhchríochnaithe",
+ "@Incomplete": {
+ "description": "Grading status for an assignment marked as incomplete",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "minus": "lúide",
+ "@minus": {
+ "description": "Screen reader-friendly replacement for the \"-\" character in letter grades like \"A-\"",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "latePenalty": "Pionós déanach (-{pointsLost})",
+ "@latePenalty": {
+ "description": "Text displayed when a late penalty has been applied to the assignment",
+ "type": "text",
+ "placeholders_order": [
+ "pointsLost"
+ ],
+ "placeholders": {
+ "pointsLost": {}
+ }
+ },
+ "finalGrade": "Marc Deiridh: {grade}",
+ "@finalGrade": {
+ "description": "Text that displays the final grade of an assignment",
+ "type": "text",
+ "placeholders_order": [
+ "grade"
+ ],
+ "placeholders": {
+ "grade": {}
+ }
+ },
+ "Alert Settings": "Socruithe Foláirimh",
+ "@Alert Settings": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Alert me when…": "Tabhair foláireamh dom nuair…",
+ "@Alert me when…": {
+ "description": "Header for the screen where the observer chooses the thresholds that will determine when they receive alerts (e.g. when an assignment is graded below 70%)",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Course grade below": "Marc an chúrsa thar",
+ "@Course grade below": {
+ "description": "Label describing the threshold for when the course grade is below a certain percentage",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Course grade above": "Marc an chúrsa faoi",
+ "@Course grade above": {
+ "description": "Label describing the threshold for when the course grade is above a certain percentage",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Assignment missing": "Tasc in easnamh",
+ "@Assignment missing": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Assignment grade below": "Marc an taisc faoi",
+ "@Assignment grade below": {
+ "description": "Label describing the threshold for when an assignment is graded below a certain percentage",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Assignment grade above": "Marc an taisc thar",
+ "@Assignment grade above": {
+ "description": "Label describing the threshold for when an assignment is graded above a certain percentage",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Course Announcements": "Fógraí an Chúrsa",
+ "@Course Announcements": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Institution Announcements": "Fógraí na hInstitiúide",
+ "@Institution Announcements": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Never": "Riamh",
+ "@Never": {
+ "description": "Indication that tells the user they will not receive alert notifications of a specific kind",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Grade percentage": "Céatadán an mairc",
+ "@Grade percentage": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "There was an error loading your student's alerts.": "Tharla earráid agus foláirimh do mhic léinn á lódáil.",
+ "@There was an error loading your student's alerts.": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Must be below 100": "Ní mór dó a bheith faoi 100",
+ "@Must be below 100": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "mustBeBelowN": "Ní mór dó a bheith faoi {percentage}",
+ "@mustBeBelowN": {
+ "description": "Validation error to the user that they must choose a percentage below 'n'",
+ "type": "text",
+ "placeholders_order": [
+ "percentage"
+ ],
+ "placeholders": {
+ "percentage": {
+ "example": 5
+ }
+ }
+ },
+ "mustBeAboveN": "Ní mór dó a bheith thar {percentage}",
+ "@mustBeAboveN": {
+ "description": "Validation error to the user that they must choose a percentage above 'n'",
+ "type": "text",
+ "placeholders_order": [
+ "percentage"
+ ],
+ "placeholders": {
+ "percentage": {
+ "example": 5
+ }
+ }
+ },
+ "Select Student Color": "Roghnaigh Dath an Mhic Léinn",
+ "@Select Student Color": {
+ "description": "Title for screen that allows users to assign a color to a specific student",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Electric, blue": "Leictreach, gorm",
+ "@Electric, blue": {
+ "description": "Name of the Electric (blue) color",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Plum, Purple": "Plumchorcra, Corcra",
+ "@Plum, Purple": {
+ "description": "Name of the Plum (purple) color",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Barney, Fuschia": "Barney, Fuschia",
+ "@Barney, Fuschia": {
+ "description": "Name of the Barney (fuschia) color",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Raspberry, Red": "Sú craobh, Dearg",
+ "@Raspberry, Red": {
+ "description": "Name of the Raspberry (red) color",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Fire, Orange": "Dóiteáin, Oráiste",
+ "@Fire, Orange": {
+ "description": "Name of the Fire (orange) color",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Shamrock, Green": "Seamróg, Glas",
+ "@Shamrock, Green": {
+ "description": "Name of the Shamrock (green) color",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "An error occurred while saving your selection. Please try again.": "Tharla earráid agus do rogha á shábháil. Bain triail as arís, le do thoil.",
+ "@An error occurred while saving your selection. Please try again.": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "changeStudentColorLabel": "Athraigh dath le haghaidh {studentName}",
+ "@changeStudentColorLabel": {
+ "description": "Accessibility label for the button that lets users change the color associated with a specific student",
+ "type": "text",
+ "placeholders_order": [
+ "studentName"
+ ],
+ "placeholders": {
+ "studentName": {}
+ }
+ },
+ "Teacher": "Múinteoir",
+ "@Teacher": {
+ "description": "Label for the Teacher enrollment type",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Student": "Mac léinn",
+ "@Student": {
+ "description": "Label for the Student enrollment type",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "TA": "CT",
+ "@TA": {
+ "description": "Label for the Teaching Assistant enrollment type (also known as Teacher Aid or Education Assistant), reduced to a short acronym/initialism if appropriate.",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Observer": "Breathnóir",
+ "@Observer": {
+ "description": "Label for the Observer enrollment type",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Use Camera": "Úsáid Ceamara",
+ "@Use Camera": {
+ "description": "Label for the action item that lets the user capture a photo using the device camera",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Upload File": "Uaslódáil Comhad",
+ "@Upload File": {
+ "description": "Label for the action item that lets the user upload a file from their device",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Choose from Gallery": "Roghnaigh ón nGailearaí",
+ "@Choose from Gallery": {
+ "description": "Label for the action item that lets the user select a photo from their device gallery",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Preparing…": "Ag ullmhú…",
+ "@Preparing…": {
+ "description": "Message shown while a file is being prepared to attach to a message",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Add student with…": "Cuir mac léinn le…",
+ "@Add student with…": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Add Student": "Cuir Mac Léinn leis",
+ "@Add Student": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "You are not observing any students.": "Níl tú ag breathnú ar mhac léinn ar bith.",
+ "@You are not observing any students.": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "There was an error loading your students.": "Tharla earráid agus do mhic léinn á lódáil.",
+ "@There was an error loading your students.": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Pairing Code": "Cód Péireála",
+ "@Pairing Code": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Students can obtain a pairing code through the Canvas website": "Is féidir le mic léinn cód péireála a fháil trí shuíomh Gréasáin Canvas",
+ "@Students can obtain a pairing code through the Canvas website": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Enter the student pairing code provided to you. If the pairing code doesn't work, it may have expired": "Cuir isteach an cód péireála mac léinn a thugtar duit. Mura n-oibríonn an cód péireála, seans go mbeidh sé imithe in éag",
+ "@Enter the student pairing code provided to you. If the pairing code doesn't work, it may have expired": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Your code is incorrect or expired.": "Tá do chód mícheart nó imithe in éag.",
+ "@Your code is incorrect or expired.": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Something went wrong trying to create your account, please reach out to your school for assistance.": "Tharla earráid agus do chuntas a chruthú, déan teagmháil le do scoil le haghaidh cabhrach.",
+ "@Something went wrong trying to create your account, please reach out to your school for assistance.": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "QR Code": "Cód MF",
+ "@QR Code": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Students can create a QR code using the Canvas Student app on their mobile device": "Is féidir le mic léinn cód MF a chruthú ag baint úsáide as an aip Canvas Mac Léinn ar a ngléas soghluaiste",
+ "@Students can create a QR code using the Canvas Student app on their mobile device": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Add new student": "Cuir mac léinn nua leis",
+ "@Add new student": {
+ "description": "Semantics label for the FAB on the Manage Students Screen",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Select": "Roghnaigh",
+ "@Select": {
+ "description": "Hint text to tell the user to choose one of two options",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "I have a Canvas account": "Tá cuntas Canvas agam",
+ "@I have a Canvas account": {
+ "description": "Option to select for users that have a canvas account",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "I don't have a Canvas account": "Níl cuntas Canvas agam",
+ "@I don't have a Canvas account": {
+ "description": "Option to select for users that don't have a canvas account",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Create Account": "Cruthaigh Cuntas",
+ "@Create Account": {
+ "description": "Button text for account creation confirmation",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Full Name": "Ainm iomlán",
+ "@Full Name": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Email Address": "Seoladh Ríomhphoist",
+ "@Email Address": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Password": "Pasfhocal",
+ "@Password": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Full Name…": "Ainm iomlán…",
+ "@Full Name…": {
+ "description": "hint label for inside form field",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Email…": "Ríomhphost…",
+ "@Email…": {
+ "description": "hint label for inside form field",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Password…": "Pasfhocal…",
+ "@Password…": {
+ "description": "hint label for inside form field",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Please enter full name": "Cuir isteach ainm iomlán",
+ "@Please enter full name": {
+ "description": "Error message for form field",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Please enter an email address": "Cuir isteach seoladh ríomhphoist",
+ "@Please enter an email address": {
+ "description": "Error message for form field",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Please enter a valid email address": "Cuir isteach seoladh ríomhphoist bailí",
+ "@Please enter a valid email address": {
+ "description": "Error message for form field",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Password is required": "Tá pasfhocal ag teastáil",
+ "@Password is required": {
+ "description": "Error message for form field",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Password must contain at least 8 characters": "Caithfidh 8 gcarachtar ar a laghad a bheith sa phasfhocal",
+ "@Password must contain at least 8 characters": {
+ "description": "Error message for form field",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "qrCreateAccountTos": "Trí ‘Cruthaigh Cuntas’ a thapáil, aontaíonn tú leis an {termsOfService} agus aithníonn tú an {privacyPolicy}",
+ "@qrCreateAccountTos": {
+ "description": "The text show on the account creation screen",
+ "type": "text",
+ "placeholders_order": [
+ "termsOfService",
+ "privacyPolicy"
+ ],
+ "placeholders": {
+ "termsOfService": {},
+ "privacyPolicy": {}
+ }
+ },
+ "Terms of Service": "Tearmaí Seirbhíse",
+ "@Terms of Service": {
+ "description": "Label for the Canvas Terms of Service agreement. This will be used in the qrCreateAccountTos text and will be highlighted and clickable",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Privacy Policy": "Polasaí Príobháideachais",
+ "@Privacy Policy": {
+ "description": "Label for the Canvas Privacy Policy agreement. This will be used in the qrCreateAccountTos text and will be highlighted and clickable",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "View the Privacy Policy": "Féach ar an bPolasaí Príobháideachais",
+ "@View the Privacy Policy": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Already have an account? ": "An bhfuil cuntas agat cheana féin? ",
+ "@Already have an account? ": {
+ "description": "Part of multiline text span, includes AccountSignIn1-2, in that order",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Sign In": "Sínigh isteach",
+ "@Sign In": {
+ "description": "Part of multiline text span, includes AccountSignIn1-2, in that order",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Hide Password": "Folaigh Pasfhocal",
+ "@Hide Password": {
+ "description": "content description for password hide button",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Show Password": "Taispeáin Pasfhocal",
+ "@Show Password": {
+ "description": "content description for password show button",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Terms of Service Link": "Nasc Téarmaí Seirbhíse",
+ "@Terms of Service Link": {
+ "description": "content description for terms of service link",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Privacy Policy Link": "Nasc Polasaí Príobháideachais",
+ "@Privacy Policy Link": {
+ "description": "content description for privacy policy link",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Event": "Imeacht",
+ "@Event": {
+ "description": "Title for the event details screen",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Date": "Dáta",
+ "@Date": {
+ "description": "Label for the event date",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Location": "Suíomh",
+ "@Location": {
+ "description": "Label for the location information",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "No Location Specified": "Níl Suíomh Sonraithe",
+ "@No Location Specified": {
+ "description": "Description for events that do not have a location",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "eventTime": "{startAt} - {endAt}",
+ "@eventTime": {
+ "description": "The time the event is happening, example: \"2:00 pm - 4:00 pm\"",
+ "type": "text",
+ "placeholders_order": [
+ "startAt",
+ "endAt"
+ ],
+ "placeholders": {
+ "startAt": {},
+ "endAt": {}
+ }
+ },
+ "Set a date and time to be notified of this event.": "Socraigh dáta agus am le cur ar an eolas faoin imeacht seo.",
+ "@Set a date and time to be notified of this event.": {
+ "description": "Description for row to set event reminders",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "You will be notified about this event on…": "Cuirfear ar an eolas thú faoin imeacht seo ar…",
+ "@You will be notified about this event on…": {
+ "description": "Description for when an event reminder is set",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Share Your Love for the App": "Comhroinn do Grá don Aip",
+ "@Share Your Love for the App": {
+ "description": "Label for option to open the app store",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Tell us about your favorite parts of the app": "Inis dúinn faoi na cuideanna is fearr leat den aip",
+ "@Tell us about your favorite parts of the app": {
+ "description": "Description for option to open the app store",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Legal": "Dlíthiúil",
+ "@Legal": {
+ "description": "Label for legal information option",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Privacy policy, terms of use, open source": "Polasaí príobháideachais, téarmaí úsáide, foinse oscailte",
+ "@Privacy policy, terms of use, open source": {
+ "description": "Description for legal information option",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Idea for Canvas Parent App [Android]": "Smaoineamh don Aip Máthairchúrsa Canvas [Android]",
+ "@Idea for Canvas Parent App [Android]": {
+ "description": "The subject for the email to request a feature",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "The following information will help us better understand your idea:": "Cabhróidh an t-eolas seo a leanas linn do smaoineamh a thuiscint níos fearr:",
+ "@The following information will help us better understand your idea:": {
+ "description": "The header for the users information that is attached to a feature request",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Domain:": "Fearann:",
+ "@Domain:": {
+ "description": "The label for the Canvas domain of the logged in user",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "User ID:": "ID an Úsáideora:",
+ "@User ID:": {
+ "description": "The label for the Canvas user ID of the logged in user",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Email:": "Ríomhphost:",
+ "@Email:": {
+ "description": "The label for the eamil of the logged in user",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Locale:": "Suíomh:",
+ "@Locale:": {
+ "description": "The label for the locale of the logged in user",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Terms of Use": "Téarmaí Úsáide",
+ "@Terms of Use": {
+ "description": "Label for the terms of use",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Canvas on GitHub": "Canvas ar GitHub",
+ "@Canvas on GitHub": {
+ "description": "Label for the button that opens the Canvas project on GitHub's website",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "There was a problem loading the Terms of Use": "Bhí fadhb ann agus na Téarmaí Úsáide á lódáil",
+ "@There was a problem loading the Terms of Use": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Device": "Gléas",
+ "@Device": {
+ "description": "Label used for device manufacturer/model in the error report",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "OS Version": "Leagan OS",
+ "@OS Version": {
+ "description": "Label used for device operating system version in the error report",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Version Number": "Uimhir Leagan",
+ "@Version Number": {
+ "description": "Label used for the app version number in the error report",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Report A Problem": "Tuairiscigh Fadhb",
+ "@Report A Problem": {
+ "description": "Title used for generic dialog to report problems",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Subject": "Ábhar",
+ "@Subject": {
+ "description": "Label used for Subject text field",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "A subject is required.": "Tá ábhar ag teastáil.",
+ "@A subject is required.": {
+ "description": "Error shown when the subject field is empty",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "An email address is required.": "Tá seoladh ríomhphoist ag teastáil.",
+ "@An email address is required.": {
+ "description": "Error shown when the email field is empty",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Description": "Cur síos",
+ "@Description": {
+ "description": "Label used for Description text field",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "A description is required.": "Tá cur síos ag teastáil.",
+ "@A description is required.": {
+ "description": "Error shown when the description field is empty",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "How is this affecting you?": "Cén tionchar atá aige seo ort?",
+ "@How is this affecting you?": {
+ "description": "Label used for the dropdown to select how severe the issue is",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "send": "seol",
+ "@send": {
+ "description": "Label used for send button when reporting a problem",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Just a casual question, comment, idea, suggestion…": "Níl ann ach ceist ócáideach, ráiteas, smaoineamh, moladh…",
+ "@Just a casual question, comment, idea, suggestion…": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "I need some help but it's not urgent.": "Tá roinnt cabhrach de dhíth orm ach níl sé práinneach.",
+ "@I need some help but it's not urgent.": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Something's broken but I can work around it to get what I need done.": "Tá rud éigin briste ach is féidir liom oibriú timpeall air chun an méid a theastaíonn uaim a dhéanamh.",
+ "@Something's broken but I can work around it to get what I need done.": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "I can't get things done until I hear back from you.": "Ní féidir liom rudaí a dhéanamh go dtí go gcloisim ar ais uait.",
+ "@I can't get things done until I hear back from you.": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "EXTREME CRITICAL EMERGENCY!!": "ÉIGEANDÁIL FÍORCHRITICIÚIL!!",
+ "@EXTREME CRITICAL EMERGENCY!!": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Not Graded": "Níl sé Marcáilte",
+ "@Not Graded": {
+ "description": "Description for an assignment has not been graded.",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Login flow: Normal": "Sreabhadh logáil isteach: Gnáth",
+ "@Login flow: Normal": {
+ "description": "Description for the normal login flow",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Login flow: Canvas": "Sreabhadh logáil isteach: Canvas",
+ "@Login flow: Canvas": {
+ "description": "Description for the Canvas login flow",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Login flow: Site Admin": "Sreabhadh logáil isteach: Riarthóir an tSuímh",
+ "@Login flow: Site Admin": {
+ "description": "Description for the Site Admin login flow",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Login flow: Skip mobile verify": "Sreabhadh logáil isteach: Scipeáil deimhniú soghluaiste",
+ "@Login flow: Skip mobile verify": {
+ "description": "Description for the login flow that skips domain verification for mobile",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Act As User": "Gníomh mar Úsáideoir",
+ "@Act As User": {
+ "description": "Label for the button that allows the user to act (masquerade) as another user",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Stop Acting as User": "Stop ag Gníomhú mar Úsáideoir",
+ "@Stop Acting as User": {
+ "description": "Label for the button that allows the user to stop acting (masquerading) as another user",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "actingAsUser": "Tá tú ag gníomhú mar {userName}",
+ "@actingAsUser": {
+ "description": "Message shown while acting (masquerading) as another user",
+ "type": "text",
+ "placeholders_order": [
+ "userName"
+ ],
+ "placeholders": {
+ "userName": {}
+ }
+ },
+ "\"Act as\" is essentially logging in as this user without a password. You will be able to take any action as if you were this user, and from other users' points of views, it will be as if this user performed them. However, audit logs record that you were the one who performed the actions on behalf of this user.": "Go bunúsach is éard atá i gceist le \"Gníomh mar\" logáil isteach mar an úsáideoir seo gan pasfhocal. Beidh tú in ann aon ghníomg a dhéanamh amhail is gur tusa an t-úsáideoir seo, agus ó dhearcadh úsáideoirí eile, beidh sé mar a rinne an t-úsáideoir seo iad. Mar sin féin, taifeadann logaí iniúchta gurb tusa an té a rinne na gníomhartha thar ceann an úsáideora seo.",
+ "@\"Act as\" is essentially logging in as this user without a password. You will be able to take any action as if you were this user, and from other users' points of views, it will be as if this user performed them. However, audit logs record that you were the one who performed the actions on behalf of this user.": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Domain": "Fearann",
+ "@Domain": {
+ "description": "Text field hint for domain url input",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "You must enter a valid domain": "Ní mór duit fearann bailí a chur isteach",
+ "@You must enter a valid domain": {
+ "description": "Message displayed for domain input error",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "User ID": "ID an Úsáideora",
+ "@User ID": {
+ "description": "Text field hint for user ID input",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "You must enter a user id": "Ní mór duit id an úsáideora a chur isteach",
+ "@You must enter a user id": {
+ "description": "Message displayed for user Id input error",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "There was an error trying to act as this user. Please check the Domain and User ID and try again.": "Tharla earráid agus iarracht á déanamh mar úsáideoir seo. Seiceáil an Fearainn agus ID an Úsáideora agus bain triail eile as.",
+ "@There was an error trying to act as this user. Please check the Domain and User ID and try again.": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "endMasqueradeMessage": "Stopfaidh tú ag gníomhú mar {userName} agus filleadh ar do chuntas bunaidh.",
+ "@endMasqueradeMessage": {
+ "description": "Confirmation message displayed when the user wants to stop acting (masquerading) as another user",
+ "type": "text",
+ "placeholders_order": [
+ "userName"
+ ],
+ "placeholders": {
+ "userName": {}
+ }
+ },
+ "endMasqueradeLogoutMessage": "Stopfaidh tú ag gníomhú mar {userName} agus logálfar amach thú.",
+ "@endMasqueradeLogoutMessage": {
+ "description": "Confirmation message displayed when the user wants to stop acting (masquerading) as another user and will be logged out.",
+ "type": "text",
+ "placeholders_order": [
+ "userName"
+ ],
+ "placeholders": {
+ "userName": {}
+ }
+ },
+ "How are we doing?": "Conas atá ag éirí linn?",
+ "@How are we doing?": {
+ "description": "Title for dialog asking user to rate the app out of 5 stars.",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Don't show again": "Ná taispeáin arís",
+ "@Don't show again": {
+ "description": "Button to prevent the rating dialog from showing again.",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "What can we do better?": "Cad is féidir linn a dhéanamh níos fearr?",
+ "@What can we do better?": {
+ "description": "Hint text for providing a comment with the rating.",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Send Feedback": "Seol Aiseolas",
+ "@Send Feedback": {
+ "description": "Button to send rating with feedback",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "ratingDialogEmailSubject": "Moltaí le haghaidh Android - Máthairchúrsa Canvas {version}",
+ "@ratingDialogEmailSubject": {
+ "description": "The subject for an email to provide feedback for CanvasParent.",
+ "type": "text",
+ "placeholders_order": [
+ "version"
+ ],
+ "placeholders": {
+ "version": {}
+ }
+ },
+ "starRating": "{position,plural, =1{{position} réalta}other{{position} réalta}}",
+ "@starRating": {
+ "description": "Accessibility label for the 1 stars to 5 stars rating",
+ "type": "text",
+ "placeholders_order": [
+ "position"
+ ],
+ "placeholders": {
+ "position": {
+ "example": 1
+ }
+ }
+ },
+ "Student Pairing": "Péireáil Mac Léinn",
+ "@Student Pairing": {
+ "description": "Title for the screen where users can pair to students using a QR code",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Open Canvas Student": "Oscail Mac Léinn Canvas",
+ "@Open Canvas Student": {
+ "description": "Title for QR pairing tutorial screen instructing users to open the Canvas Student app",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "You'll need to open your student's Canvas Student app to continue. Go into Main Menu > Settings > Pair with Observer and scan the QR code you see there.": "Beidh ort aip Mac Léinn Canvas do mhic léinn a oscailt chun leanúint ar aghaidh. Téigh isteach sa Phríomh-Roghchlár > Socruithe > Péireáil le Breathnóir agus scanadh an cód MF a fheiceann tú ann.",
+ "@You'll need to open your student's Canvas Student app to continue. Go into Main Menu > Settings > Pair with Observer and scan the QR code you see there.": {
+ "description": "Message explaining how QR code pairing works",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Screenshot showing location of pairing QR code generation in the Canvas Student app": "Gabháil scáileáin a thaispeánann an áit inar péireáladh giniúint cód MF san aip Canvas Mac Léinn",
+ "@Screenshot showing location of pairing QR code generation in the Canvas Student app": {
+ "description": "Content Description for qr pairing tutorial screenshot",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Expired QR Code": "Cód MF imithe in éag",
+ "@Expired QR Code": {
+ "description": "Error title shown when the users scans a QR code that has expired",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "The QR code you scanned may have expired. Refresh the code on the student's device and try again.": "Seans go bhfuil an cód MF a scanáil tú imithe in éag. Athnuaigh an cód ar ghléas an mac léinn agus bain triail eile as.",
+ "@The QR code you scanned may have expired. Refresh the code on the student's device and try again.": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "A network error occurred when adding this student. Check your connection and try again.": "Tharla earráid ghréasáin agus an mac léinn seo á chur leis. Seiceáil do cheangal agus bain triail eile as.",
+ "@A network error occurred when adding this student. Check your connection and try again.": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Invalid QR Code": "Cód MF neamhbhailí",
+ "@Invalid QR Code": {
+ "description": "Error title shown when the user scans an invalid QR code",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Incorrect Domain": "Fearann Mícheart",
+ "@Incorrect Domain": {
+ "description": "Error title shown when the users scane a QR code for a student that belongs to a different domain",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "The student you are trying to add belongs to a different school. Log in or create an account with that school to scan this code.": "Is le scoil eile é an mac léinn seo a bhfuil tú ag iarraidh a chur leis. Logáil isteach nó cruthaigh cuntas leis an scoil sin chun an cód seo a scanadh.",
+ "@The student you are trying to add belongs to a different school. Log in or create an account with that school to scan this code.": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Camera Permission": "Cead Ceamara",
+ "@Camera Permission": {
+ "description": "Error title shown when the user wans to scan a QR code but has denied the camera permission",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "This will unpair and remove all enrollments for this student from your account.": "Déanfaidh sé seo na rolluithe ar fad don mhac léinn seo a dhíphéireáil agus a bhaint de do chuntas.",
+ "@This will unpair and remove all enrollments for this student from your account.": {
+ "description": "Confirmation message shown when the user tries to delete a student from their account",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "There was a problem removing this student from your account. Please check your connection and try again.": "Bhí fadhb ann an mac léinn seo a bhaint de do chuntas. Seiceáil do cheangal agus bain triail eile as.",
+ "@There was a problem removing this student from your account. Please check your connection and try again.": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Cancel": "Cealaigh",
+ "@Cancel": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "next": "Ar aghaidh",
+ "@next": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "ok": "CGL",
+ "@ok": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Yes": "Tá",
+ "@Yes": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "No": "Níl",
+ "@No": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Retry": "Bain triail eile as",
+ "@Retry": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Delete": "Scrios",
+ "@Delete": {
+ "description": "Label used for general delete/remove actions",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Done": "Déanta",
+ "@Done": {
+ "description": "Label for general done/finished actions",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Refresh": "Athnuaigh",
+ "@Refresh": {
+ "description": "Label for button to refresh data from the web",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "View Description": "Féach ar Chur síos",
+ "@View Description": {
+ "description": "Button to view the description for an event or assignment",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "expanded": "leathnaithe",
+ "@expanded": {
+ "description": "Description for the accessibility reader for list groups that are expanded",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "collapsed": "leacaithe",
+ "@collapsed": {
+ "description": "Description for the accessibility reader for list groups that are expanded",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "An unexpected error occurred": "Tharla earráid gan choinne",
+ "@An unexpected error occurred": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "No description": "Gan cuir síos",
+ "@No description": {
+ "description": "Message used when the assignment has no description",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Launch External Tool": "Seol Uirlis Sheachtrach",
+ "@Launch External Tool": {
+ "description": "Button text added to webviews to let users open external tools in their browser",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Interactions on this page are limited by your institution.": "Tá idirghníomhaíochtaí ar an leathanach seo teoranta ag d'institiúid.",
+ "@Interactions on this page are limited by your institution.": {
+ "description": "Message describing how the webview has limited access due to an instution setting",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "dateAtTime": "{date} ag {time}",
+ "@dateAtTime": {
+ "description": "The string to format dates",
+ "type": "text",
+ "placeholders_order": [
+ "date",
+ "time"
+ ],
+ "placeholders": {
+ "date": {},
+ "time": {}
+ }
+ },
+ "dueDateAtTime": "Dlite {date} ag {time}",
+ "@dueDateAtTime": {
+ "description": "The string to format due dates",
+ "type": "text",
+ "placeholders_order": [
+ "date",
+ "time"
+ ],
+ "placeholders": {
+ "date": {},
+ "time": {}
+ }
+ },
+ "No Due Date": "Níl Dáta Dlite",
+ "@No Due Date": {
+ "description": "Label for assignments that do not have a due date",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Filter": "Scag",
+ "@Filter": {
+ "description": "Label for buttons to filter what items are visible",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "unread": "neamhléite",
+ "@unread": {
+ "description": "Label for things that are marked as unread",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "unreadCount": "{count} neamhléite",
+ "@unreadCount": {
+ "description": "Formatted string for when there are a number of unread items",
+ "type": "text",
+ "placeholders_order": [
+ "count"
+ ],
+ "placeholders": {
+ "count": {}
+ }
+ },
+ "badgeNumberPlus": "{count}+",
+ "@badgeNumberPlus": {
+ "description": "Formatted string for when too many items are being notified in a badge, generally something like: 99+",
+ "type": "text",
+ "placeholders_order": [
+ "count"
+ ],
+ "placeholders": {
+ "count": {}
+ }
+ },
+ "There was an error loading this announcement": "Tharla earráid agus an fógra seo á lódáil",
+ "@There was an error loading this announcement": {
+ "description": "Message shown when an announcement detail screen fails to load",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Network error": "Earráid ghréasáin",
+ "@Network error": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Under Construction": "Á dTógáil",
+ "@Under Construction": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "We are currently building this feature for your viewing pleasure.": "Táimid ag tógáil an ghné seo faoi láthair chun do phléisiúr féachana.",
+ "@We are currently building this feature for your viewing pleasure.": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Request Login Help Button": "Cnaipe Iarr Cabhair ag Logáil Isteach",
+ "@Request Login Help Button": {
+ "description": "Accessibility hint for button that opens help dialog for a login help request",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Request Login Help": "Iarr Cabhair Logála Isteach",
+ "@Request Login Help": {
+ "description": "Title of help dialog for a login help request",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "I'm having trouble logging in": "Tá deacracht agam logáil isteach",
+ "@I'm having trouble logging in": {
+ "description": "Subject of help dialog for a login help request",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "An error occurred when trying to display this link": "Tharla earráid agus an nasc seo á thaispeáint",
+ "@An error occurred when trying to display this link": {
+ "description": "Error message shown when a link can't be opened",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "We are unable to display this link, it may belong to an institution you currently aren't logged in to.": "Ní féidir linn an nasc seo a thaispeáint, seans gur le hinstitiúid nach bhfuil tú logáilte isteach inti faoi láthair.",
+ "@We are unable to display this link, it may belong to an institution you currently aren't logged in to.": {
+ "description": "Description for error page shown when clicking a link",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Link Error": "Earráid Naisc",
+ "@Link Error": {
+ "description": "Title for error page shown when clicking a link",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Open In Browser": "Oscail i mBrabhsálaí",
+ "@Open In Browser": {
+ "description": "Text for button to open a link in the browswer",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "You'll find the QR code on the web in your account profile. Click 'QR for Mobile Login' in the list.": "Gheobhaidh tú an cód MF ar an ngréasán i do phróifíl chuntais. Cliceáil 'MF le haghaidh Logáil Isteach Móibíleach' sa liosta.",
+ "@You'll find the QR code on the web in your account profile. Click 'QR for Mobile Login' in the list.": {
+ "description": "Text for qr login tutorial screen",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Locate QR Code": "Aimsigh Cód MF",
+ "@Locate QR Code": {
+ "description": "Text for qr login button",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Please scan a QR code generated by Canvas": "Scan cód MF ginte ag Canvas",
+ "@Please scan a QR code generated by Canvas": {
+ "description": "Text for qr login error with incorrect qr code",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "There was an error logging in. Please generate another QR Code and try again.": "Tharla earráid agus logáil isteach. Gin Cód MF eile agus bain triail eile as.",
+ "@There was an error logging in. Please generate another QR Code and try again.": {
+ "description": "Text for qr login error",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Screenshot showing location of QR code generation in browser": "Seit scáileáin a thaispeánann suíomh giniúna an chóid MF sa bhrabhsálaí",
+ "@Screenshot showing location of QR code generation in browser": {
+ "description": "Content Description for qr login tutorial screenshot",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "QR scanning requires camera access": "Teastaíonn rochtain ceamara le haghaidh scanadh MF",
+ "@QR scanning requires camera access": {
+ "description": "placeholder for camera error for QR code scan",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "The linked item is no longer available": "Níl an mhír nasctha ar fáil a thuilleadh",
+ "@The linked item is no longer available": {
+ "description": "error message when the alert could no be opened",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Message sent": "Teachtaireacht seolta",
+ "@Message sent": {
+ "description": "confirmation message on the screen when the user succesfully sends a message",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Acceptable Use Policy": "Beartas Úsáide Sothuigthe",
+ "@Acceptable Use Policy": {
+ "description": "title for the acceptable use policy screen",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Submit": "Cuir isteach",
+ "@Submit": {
+ "description": "submit button title for acceptable use policy screen",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Either you're a new user or the Acceptable Use Policy has changed since you last agreed to it. Please agree to the Acceptable Use Policy before you continue.": "Is úsáideoir nua thú nó tá an Beartas um Úsáid Inghlactha athraithe ó d’aontaigh tú leis an uair dheireanach. Aontaigh leis an mBeartas um Úsáid Inghlactha sula leanann tú ar aghaidh.",
+ "@Either you're a new user or the Acceptable Use Policy has changed since you last agreed to it. Please agree to the Acceptable Use Policy before you continue.": {
+ "description": "acceptable use policy screen description",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "I agree to the Acceptable Use Policy.": "Aontaím leis an mBeartas um Úsáid Inghlactha.",
+ "@I agree to the Acceptable Use Policy.": {
+ "description": "acceptable use policy switch title",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "About": "Faoi",
+ "@About": {
+ "description": "Title for about menu item in settings",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "App": "Aip",
+ "@App": {
+ "description": "Title for App field on about page",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Login ID": "ID Logáil Isteach",
+ "@Login ID": {
+ "description": "Title for Login ID field on about page",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Email": "Ríomhphost",
+ "@Email": {
+ "description": "Title for Email field on about page",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Version": "Leagan",
+ "@Version": {
+ "description": "Title for Version field on about page",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Instructure logo": "Lógó Instructure",
+ "@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_hi.arb b/apps/flutter_parent/lib/l10n/res/intl_hi.arb
new file mode 100644
index 0000000000..bc0b681b83
--- /dev/null
+++ b/apps/flutter_parent/lib/l10n/res/intl_hi.arb
@@ -0,0 +1,2753 @@
+{
+ "@@last_modified": "2023-08-25T11:04:20.901151",
+ "alertsLabel": "चेतावनियां",
+ "@alertsLabel": {
+ "description": "The label for the Alerts tab",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "calendarLabel": "कैलेंडर",
+ "@calendarLabel": {
+ "description": "The label for the Calendar tab",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "coursesLabel": "पाठ्यक्रम",
+ "@coursesLabel": {
+ "description": "The label for the Courses tab",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "No Students": "कोई छात्र नहीं",
+ "@No Students": {
+ "description": "Text for when an observer has no students they are observing",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Tap to show student selector": "छात्र चयनकर्ता दिखाने के लिए टैप करें",
+ "@Tap to show student selector": {
+ "description": "Semantics label for the area that will show the student selector when tapped",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Tap to pair with a new student": "किसी नए छात्र के साथ जुड़ने के लिए टैप करें",
+ "@Tap to pair with a new student": {
+ "description": "Semantics label for the add student button in the student selector",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Tap to select this student": "इस छात्र को चुनने केलिए टैप करें",
+ "@Tap to select this student": {
+ "description": "Semantics label on individual students in the student switcher",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Manage Students": "छात्र प्रबंधित करें",
+ "@Manage Students": {
+ "description": "Label text for the Manage Students nav drawer button as well as the title for the Manage Students screen",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Help": "मदद",
+ "@Help": {
+ "description": "Label text for the help nav drawer button",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Log Out": "लॉग आउट करें",
+ "@Log Out": {
+ "description": "Label text for the Log Out nav drawer button",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Switch Users": "उपयोगकर्ता स्विच करें",
+ "@Switch Users": {
+ "description": "Label text for the Switch Users nav drawer button",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "appVersion": "v. {version}",
+ "@appVersion": {
+ "description": "App version shown in the navigation drawer",
+ "type": "text",
+ "placeholders_order": [
+ "version"
+ ],
+ "placeholders": {
+ "version": {}
+ }
+ },
+ "Are you sure you want to log out?": "क्या आप सच में लॉग आउट होना चाहते हैं?",
+ "@Are you sure you want to log out?": {
+ "description": "Confirmation message displayed when the user tries to log out",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Calendars": "कैलेंडर",
+ "@Calendars": {
+ "description": "Label for button that lets users select which calendars to display",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "nextMonth": "अगला महीना: {month}",
+ "@nextMonth": {
+ "description": "Label for the button that switches the calendar to the next month",
+ "type": "text",
+ "placeholders_order": [
+ "month"
+ ],
+ "placeholders": {
+ "month": {}
+ }
+ },
+ "previousMonth": "पिछला महीना: {month}",
+ "@previousMonth": {
+ "description": "Label for the button that switches the calendar to the previous month",
+ "type": "text",
+ "placeholders_order": [
+ "month"
+ ],
+ "placeholders": {
+ "month": {}
+ }
+ },
+ "nextWeek": "अगला सप्ताह {date} से शुरू",
+ "@nextWeek": {
+ "description": "Label for the button that switches the calendar to the next week",
+ "type": "text",
+ "placeholders_order": [
+ "date"
+ ],
+ "placeholders": {
+ "date": {}
+ }
+ },
+ "previousWeek": "पिछला सप्ताह {date} से शुरू",
+ "@previousWeek": {
+ "description": "Label for the button that switches the calendar to the previous week",
+ "type": "text",
+ "placeholders_order": [
+ "date"
+ ],
+ "placeholders": {
+ "date": {}
+ }
+ },
+ "selectedMonthLabel": "{month} का महीना",
+ "@selectedMonthLabel": {
+ "description": "Accessibility label for the button that expands/collapses the month view",
+ "type": "text",
+ "placeholders_order": [
+ "month"
+ ],
+ "placeholders": {
+ "month": {}
+ }
+ },
+ "expand": "बढ़ाएं",
+ "@expand": {
+ "description": "Accessibility label for the on-tap hint for the button that expands/collapses the month view",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "collapse": "संक्षिप्त करें",
+ "@collapse": {
+ "description": "Accessibility label for the on-tap hint for the button that expands/collapses the month view",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "pointsPossible": "{points} पॉइंट्स संभव हैं",
+ "@pointsPossible": {
+ "description": "Screen reader label used for the points possible for an assignment, quiz, etc.",
+ "type": "text",
+ "placeholders_order": [
+ "points"
+ ],
+ "placeholders": {
+ "points": {}
+ }
+ },
+ "calendarDaySemanticsLabel": "{eventCount,plural, =1{{date}, {eventCount} घटना}other{{date}, {eventCount} घटनाएं}}",
+ "@calendarDaySemanticsLabel": {
+ "description": "Screen reader label used for calendar day, reads the date and count of events",
+ "type": "text",
+ "placeholders_order": [
+ "date",
+ "eventCount"
+ ],
+ "placeholders": {
+ "date": {},
+ "eventCount": {}
+ }
+ },
+ "No Events Today!": "आज कोई घटना नहीं है!",
+ "@No Events Today!": {
+ "description": "Title displayed when there are no calendar events for the current day",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "It looks like a great day to rest, relax, and recharge.": "आज का दिन आराम, विश्राम करने और नई ऊर्जा पाने के लिए अच्छा लग रहा है।",
+ "@It looks like a great day to rest, relax, and recharge.": {
+ "description": "Message displayed when there are no calendar events for the current day",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "There was an error loading your student's calendar": "आपके छात्र के कैलेंडर को लोड करने में त्रुटि हुई",
+ "@There was an error loading your student's calendar": {
+ "description": "Message displayed when calendar events could not be loaded for the current student",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Tap to favorite the courses you want to see on the Calendar. Select up to 10.": "उन पाठ्यक्रमों को पसंदीदा बनाने के लिए टैप करें जिन्हें आप कैलेंडर पर देखना चाहते हैं। अधिकतम 10 चुनें।",
+ "@Tap to favorite the courses you want to see on the Calendar. Select up to 10.": {
+ "description": "Description text on calendar filter screen.",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "You may only choose 10 calendars to display": "आप प्रदर्शित करने के लिए केवल 10 कैलेंडर चुन सकते हैं",
+ "@You may only choose 10 calendars to display": {
+ "description": "Error text when trying to select more than 10 calendars",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "You must select at least one calendar to display": "आपको प्रदर्शित करने के लिए कम से कम एक कैलेंडर का चयन करना होगा",
+ "@You must select at least one calendar to display": {
+ "description": "Error text when trying to de-select all calendars",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Planner Note": "योजनाकर्ता नोट",
+ "@Planner Note": {
+ "description": "Label used for notes in the planner",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Go to today": "आज पर जाएं",
+ "@Go to today": {
+ "description": "Accessibility label used for the today button in the planner",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Previous Logins": "पिछले लॉगिन",
+ "@Previous Logins": {
+ "description": "Label for the list of previous user logins",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "canvasLogoLabel": "Canvas लोगो",
+ "@canvasLogoLabel": {
+ "description": "The semantics label for the Canvas logo",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "findSchool": "स्कूल ढूंढें",
+ "@findSchool": {
+ "description": "Text for the find-my-school button",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "findAnotherSchool": "कोई अन्य स्कूल ढूंढें",
+ "@findAnotherSchool": {
+ "description": "Text for the find-another-school button",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "domainSearchInputHint": "स्कूल का नाम या डिस्ट्रिक्ट दर्ज करें…",
+ "@domainSearchInputHint": {
+ "description": "Input hint for the text box on the domain search screen",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "noDomainResults": "\"{query}\" से मेल खाते स्कूल ढूंढने में असमर्थ ",
+ "@noDomainResults": {
+ "description": "Message shown to users when the domain search query did not return any results",
+ "type": "text",
+ "placeholders_order": [
+ "query"
+ ],
+ "placeholders": {
+ "query": {}
+ }
+ },
+ "domainSearchHelpLabel": "मैं अपना स्कूल या डिस्ट्रिक्ट कैसे ढूंढूं?",
+ "@domainSearchHelpLabel": {
+ "description": "Label for the help button on the domain search screen",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "canvasGuides": "Canvas गाइड",
+ "@canvasGuides": {
+ "description": "Proper name for the Canvas Guides. This will be used in the domainSearchHelpBody text and will be highlighted and clickable",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "canvasSupport": "Canvas सपोर्ट",
+ "@canvasSupport": {
+ "description": "Proper name for Canvas Support. This will be used in the domainSearchHelpBody text and will be highlighted and clickable",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "domainSearchHelpBody": "आप जिस स्कूल या डिस्ट्रिक्ट को एक्सेस करने का प्रयास कर रहे हैं उसका नाम खोजने का प्रयास करें, जैसे \"Smith प्राइवेट स्कूल\" या \"Smith काउंटी स्कूल\"। आप सीधे Canvas डोमेन भी दर्ज कर सकते हैं, जैसे \"smith.instructure.com\" \n\nअपने संस्थान के Canvas खाते को खोजने के बारे में अधिक जानकारी के लिए, आप {canvasGuides} पर जा सकते हैं, {canvasSupport} से संपर्क कर सकते हैं, या सहायता के लिए अपने स्कूल से संपर्क कर सकते हैं।",
+ "@domainSearchHelpBody": {
+ "description": "The body text shown in the help dialog on the domain search screen",
+ "type": "text",
+ "placeholders_order": [
+ "canvasGuides",
+ "canvasSupport"
+ ],
+ "placeholders": {
+ "canvasGuides": {},
+ "canvasSupport": {}
+ }
+ },
+ "Uh oh!": "उह ओह!",
+ "@Uh oh!": {
+ "description": "Title of the screen that shows when a crash has occurred",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "We’re not sure what happened, but it wasn’t good. Contact us if this keeps happening.": "हमें नहीं पता कि क्या हुआ, पर जो हुआ अच्छा नहीं था। यदि ऐसा बार-बार हो, तो हमसे संपर्क करें।",
+ "@We’re not sure what happened, but it wasn’t good. Contact us if this keeps happening.": {
+ "description": "Message shown when a crash has occurred",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Contact Support": "सपोर्ट से संपर्क करें",
+ "@Contact Support": {
+ "description": "Label for the button that allows users to contact support after a crash has occurred",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "View error details": "त्रुटि विवरण देखें",
+ "@View error details": {
+ "description": "Label for the button that allowed users to view crash details",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Restart app": "ऐप फिर से शुरू करें",
+ "@Restart app": {
+ "description": "Label for the button that will restart the entire application",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Application version": "ऐप्लिकेशन संस्करण",
+ "@Application version": {
+ "description": "Label for the application version displayed in the crash details",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Device model": "डिवाइस मॉडल",
+ "@Device model": {
+ "description": "Label for the device model displayed in the crash details",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Android OS version": "Android OS संस्करण",
+ "@Android OS version": {
+ "description": "Label for the Android operating system version displayed in the crash details",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Full error message": "पूर्ण त्रुटि संदेश",
+ "@Full error message": {
+ "description": "Label for the full error message displayed in the crash details",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Inbox": "इनबॉक्स",
+ "@Inbox": {
+ "description": "Title for the Inbox screen",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "There was an error loading your inbox messages.": "आपके इनबॉक्स संदेशों को लोड करने में त्रुटि हुई।",
+ "@There was an error loading your inbox messages.": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "No Subject": "कोई विषय नहीं",
+ "@No Subject": {
+ "description": "Title used for inbox messages that have no subject",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Unable to fetch courses. Please check your connection and try again.": "पाठ्यक्रम प्राप्त करने में असमर्थ। कृपया अपने कनेक्शन की जांच करें और फिर से कोशिश करें।",
+ "@Unable to fetch courses. Please check your connection and try again.": {
+ "description": "Message shown when an error occured while loading courses",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Choose a course to message": "संदेश के लिए कोई पाठ्यक्रम चुनें",
+ "@Choose a course to message": {
+ "description": "Header in the course list shown when the user is choosing which course to associate with a new message",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Inbox Zero": "इनबॉक्स ज़ीरो",
+ "@Inbox Zero": {
+ "description": "Title of the message shown when there are no inbox messages",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "You’re all caught up!": "आपका काम पूरा हुआ!",
+ "@You’re all caught up!": {
+ "description": "Subtitle of the message shown when there are no inbox messages",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "There was an error loading recipients for this course": "इस पाठ्यक्रम के लिए प्राप्तकर्ता लोड करने में त्रुटि हुई",
+ "@There was an error loading recipients for this course": {
+ "description": "Message shown when attempting to create a new message but the recipients list failed to load",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Unable to send message. Check your connection and try again.": "संदेश भेजने में असमर्थ। अपने कनेक्शन की जांच करें और फिर से कोशिश करें।",
+ "@Unable to send message. Check your connection and try again.": {
+ "description": "Message show when there was an error creating or sending a new message",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Unsaved changes": "बिना सहेजे गए बदलाव",
+ "@Unsaved changes": {
+ "description": "Title of the dialog shown when the user tries to leave with unsaved changes",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Are you sure you wish to close this page? Your unsent message will be lost.": "क्या आप सच में इस पेज को बंद करना चाहते हैं? आपका नहीं भेजा गया संदेश गुम हो जाएगा।",
+ "@Are you sure you wish to close this page? Your unsent message will be lost.": {
+ "description": "Body text of the dialog shown when the user tries leave with unsaved changes",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "New message": "नया संदेश",
+ "@New message": {
+ "description": "Title of the new-message screen",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Add attachment": "संलग्नक जोड़ें",
+ "@Add attachment": {
+ "description": "Tooltip for the add-attachment button in the new-message screen",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Send message": "संदेश भेजें",
+ "@Send message": {
+ "description": "Tooltip for the send-message button in the new-message screen",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Select recipients": "प्राप्तकर्ता चुनें",
+ "@Select recipients": {
+ "description": "Tooltip for the button that allows users to select message recipients",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "No recipients selected": "कोई प्राप्तकर्ता नहीं चुना गया",
+ "@No recipients selected": {
+ "description": "Hint displayed when the user has not selected any message recipients",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Message subject": "संदेश विषय",
+ "@Message subject": {
+ "description": "Hint text displayed in the input field for the message subject",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Message": "संदेश",
+ "@Message": {
+ "description": "Hint text displayed in the input field for the message body",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Recipients": "प्राप्तकर्ता",
+ "@Recipients": {
+ "description": "Label for message recipients",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "plusRecipientCount": "+{count}",
+ "@plusRecipientCount": {
+ "description": "Shows the number of recipients that are selected but not displayed on screen.",
+ "type": "text",
+ "placeholders_order": [
+ "count"
+ ],
+ "placeholders": {
+ "count": {
+ "example": 5
+ }
+ }
+ },
+ "Failed. Tap for options.": "विफल हुआ। विकल्पों के लिए टैप करें।",
+ "@Failed. Tap for options.": {
+ "description": "Short message shown on a message attachment when uploading has failed",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "courseForWhom": "{studentShortName} के लिए",
+ "@courseForWhom": {
+ "description": "Describes for whom a course is for (i.e. for Bill)",
+ "type": "text",
+ "placeholders_order": [
+ "studentShortName"
+ ],
+ "placeholders": {
+ "studentShortName": {}
+ }
+ },
+ "messageLinkPostscript": "इसके संबंध में: {studentName}, {linkUrl}",
+ "@messageLinkPostscript": {
+ "description": "A postscript appended to new messages that clarifies which student is the subject of the message and also includes a URL for the related Canvas component (course, assignment, event, etc).",
+ "type": "text",
+ "placeholders_order": [
+ "studentName",
+ "linkUrl"
+ ],
+ "placeholders": {
+ "studentName": {},
+ "linkUrl": {}
+ }
+ },
+ "There was an error loading this conversation": "इस बातचीत को लोड करने में त्रुटि हुई",
+ "@There was an error loading this conversation": {
+ "description": "Message shown when a conversation fails to load",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Reply": "उत्तर दें",
+ "@Reply": {
+ "description": "Button label for replying to a conversation",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Reply All": "सभी के लिए उत्तर दें",
+ "@Reply All": {
+ "description": "Button label for replying to all conversation participants",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Unknown User": "अज्ञात उपयोगकर्ता",
+ "@Unknown User": {
+ "description": "Label used where the user name is not known",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "me": "मैं",
+ "@me": {
+ "description": "First-person pronoun (i.e. 'me') that will be used in message author info, e.g. 'Me to 4 others' or 'Jon Snow to me'",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "authorToRecipient": "{authorName} से {recipientName} तक",
+ "@authorToRecipient": {
+ "description": "Author info for a single-recipient message; includes both the author name and the recipient name.",
+ "type": "text",
+ "placeholders_order": [
+ "authorName",
+ "recipientName"
+ ],
+ "placeholders": {
+ "authorName": {},
+ "recipientName": {}
+ }
+ },
+ "authorToNOthers": "{howMany,plural, =1{{authorName} से 1 अन्य}other{{authorName} से {howMany} अन्य}}",
+ "@authorToNOthers": {
+ "description": "Author info for a mutli-recipient message; includes the author name and the number of recipients",
+ "type": "text",
+ "placeholders_order": [
+ "authorName",
+ "howMany"
+ ],
+ "placeholders": {
+ "authorName": {},
+ "howMany": {}
+ }
+ },
+ "authorToRecipientAndNOthers": "{howMany,plural, =1{{authorName} से {recipientName} और 1 अन्य}other{{authorName} से {recipientName} और {howMany} अन्य}}",
+ "@authorToRecipientAndNOthers": {
+ "description": "Author info for a multi-recipient message; includes the author name, one recipient name, and the number of other recipients",
+ "type": "text",
+ "placeholders_order": [
+ "authorName",
+ "recipientName",
+ "howMany"
+ ],
+ "placeholders": {
+ "authorName": {},
+ "recipientName": {},
+ "howMany": {}
+ }
+ },
+ "Download": "डाउनलोड करें",
+ "@Download": {
+ "description": "Label for the button that will begin downloading a file",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Open with another app": "किसी अन्य ऐप से खोलें",
+ "@Open with another app": {
+ "description": "Label for the button that will allow users to open a file with another app",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "There are no installed applications that can open this file": "ऐसे कोई इंस्टॉल किए गए ऐप्लिकेशन नहीं हैं जो इस फ़ाइल को खोल सकें",
+ "@There are no installed applications that can open this file": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Unsupported File": "असमार्थित फ़ाइल",
+ "@Unsupported File": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "This file is unsupported and can’t be viewed through the app": "यह फ़ाइल असमर्थित है और इसे ऐप के माध्यम से नहीं देखा जा सकता है",
+ "@This file is unsupported and can’t be viewed through the app": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Unable to play this media file": "इस मीडिया फ़ाइल को चलाने में असमर्थ",
+ "@Unable to play this media file": {
+ "description": "Message shown when audio or video media could not be played",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Unable to load this image": "यह छवि लोड करने में असमर्थ",
+ "@Unable to load this image": {
+ "description": "Message shown when an image file could not be loaded or displayed",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "There was an error loading this file": "इस फ़ाइल को लोड करने में त्रुटि हुई",
+ "@There was an error loading this file": {
+ "description": "Message shown when a file could not be loaded or displayed",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "No Courses": "कोई पाठ्यक्रम नहीं",
+ "@No Courses": {
+ "description": "Title for having no courses",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Your student’s courses might not be published yet.": "हो सकता है कि आपके छात्र के पाठ्यक्रम अभी तक प्रकाशित न हुए हों।",
+ "@Your student’s courses might not be published yet.": {
+ "description": "Message for having no courses",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "There was an error loading your student’s courses.": "आपके छात्र के पाठ्यक्रम लोड करने में त्रुटि हुई।",
+ "@There was an error loading your student’s courses.": {
+ "description": "Message displayed when the list of student courses could not be loaded",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "No Grade": "कोई ग्रेड नहीं",
+ "@No Grade": {
+ "description": "Message shown when there is currently no grade available for a course",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Filter by": "इसके अनुसार फ़िल्टर करें",
+ "@Filter by": {
+ "description": "Title for list of terms to filter grades by",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Grades": "ग्रेड",
+ "@Grades": {
+ "description": "Label for the \"Grades\" tab in course details",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Syllabus": "पाठ्यक्रम",
+ "@Syllabus": {
+ "description": "Label for the \"Syllabus\" tab in course details",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Front Page": "मुख पृष्ठ",
+ "@Front Page": {
+ "description": "Label for the \"Front Page\" tab in course details",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Summary": "संक्षिप्त विवरण",
+ "@Summary": {
+ "description": "Label for the \"Summary\" tab in course details",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Send a message about this course": "इस पाठ्यक्रम के बारे में संदेश भेजें",
+ "@Send a message about this course": {
+ "description": "Accessibility hint for the course messaage floating action button",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Total Grade": "कुल ग्रेड",
+ "@Total Grade": {
+ "description": "Label for the total grade in the course",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Graded": "ग्रेड किए गए",
+ "@Graded": {
+ "description": "Label for assignments that have been graded",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Submitted": "सबमिट किया गया",
+ "@Submitted": {
+ "description": "Label for assignments that have been submitted",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Not Submitted": "सबमिट नहीं किया गया",
+ "@Not Submitted": {
+ "description": "Label for assignments that have not been submitted",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Late": "विलंब",
+ "@Late": {
+ "description": "Label for assignments that have been marked late or submitted late",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Missing": "लापता",
+ "@Missing": {
+ "description": "Label for assignments that have been marked missing or are not submitted and past the due date",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "-": "-",
+ "@-": {
+ "description": "Value representing no score for student submission",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "All Grading Periods": "सभी ग्रेडिंग अवधियां",
+ "@All Grading Periods": {
+ "description": "Label for selecting all grading periods",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "No Assignments": "कोई असाइनमेंट नहीं",
+ "@No Assignments": {
+ "description": "Title for the no assignments message",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "It looks like assignments haven't been created in this space yet.": "लगता है इस खाली स्थान में अभी तक कोई असाइनमेंट नहीं बनाई गई है।",
+ "@It looks like assignments haven't been created in this space yet.": {
+ "description": "Message for no assignments",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "There was an error loading the summary details for this course.": "इस पाठ्यक्रम के लिए संक्षिप्त विवरण लोड करने में त्रुटि हुई।",
+ "@There was an error loading the summary details for this course.": {
+ "description": "Message shown when the course summary could not be loaded",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "No Summary": "कोई संक्षिप्त विवरण नहीं",
+ "@No Summary": {
+ "description": "Title displayed when there are no items in the course summary",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "This course does not have any assignments or calendar events yet.": "इस पाठ्यक्रम में अभी तक कोई असाइनमेंट या कैलेंडर घटना नहीं है।",
+ "@This course does not have any assignments or calendar events yet.": {
+ "description": "Message displayed when there are no items in the course summary",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "gradeFormatScoreOutOfPointsPossible": "{score} / {pointsPossible}",
+ "@gradeFormatScoreOutOfPointsPossible": {
+ "description": "Formatted string for a student score out of the points possible",
+ "type": "text",
+ "placeholders_order": [
+ "score",
+ "pointsPossible"
+ ],
+ "placeholders": {
+ "score": {},
+ "pointsPossible": {}
+ }
+ },
+ "contentDescriptionScoreOutOfPointsPossible": "{pointsPossible} में से {score} पॉइंट्स",
+ "@contentDescriptionScoreOutOfPointsPossible": {
+ "description": "Formatted string for a student score out of the points possible",
+ "type": "text",
+ "placeholders_order": [
+ "score",
+ "pointsPossible"
+ ],
+ "placeholders": {
+ "score": {},
+ "pointsPossible": {}
+ }
+ },
+ "gradesSubjectMessage": "इसके संबंध में: {studentName}, ग्रेड",
+ "@gradesSubjectMessage": {
+ "description": "The subject line for a message to a teacher regarding a student's grades",
+ "type": "text",
+ "placeholders_order": [
+ "studentName"
+ ],
+ "placeholders": {
+ "studentName": {}
+ }
+ },
+ "syllabusSubjectMessage": "इसके संबंध में: {studentName}, पाठ्यक्रम",
+ "@syllabusSubjectMessage": {
+ "description": "The subject line for a message to a teacher regarding a course syllabus",
+ "type": "text",
+ "placeholders_order": [
+ "studentName"
+ ],
+ "placeholders": {
+ "studentName": {}
+ }
+ },
+ "frontPageSubjectMessage": "इसके संबंध में: {studentName}, मुख पृष्ठ",
+ "@frontPageSubjectMessage": {
+ "description": "The subject line for a message to a teacher regarding a course front page",
+ "type": "text",
+ "placeholders_order": [
+ "studentName"
+ ],
+ "placeholders": {
+ "studentName": {}
+ }
+ },
+ "assignmentSubjectMessage": "इसके संबंध में: {studentName}, असाइनमेंट - {assignmentName}",
+ "@assignmentSubjectMessage": {
+ "description": "The subject line for a message to a teacher regarding a student's assignment",
+ "type": "text",
+ "placeholders_order": [
+ "studentName",
+ "assignmentName"
+ ],
+ "placeholders": {
+ "studentName": {},
+ "assignmentName": {}
+ }
+ },
+ "eventSubjectMessage": "इसके संबंध में: {studentName}, घटना - {eventTitle}",
+ "@eventSubjectMessage": {
+ "description": "The subject line for a message to a teacher regarding a calendar event",
+ "type": "text",
+ "placeholders_order": [
+ "studentName",
+ "eventTitle"
+ ],
+ "placeholders": {
+ "studentName": {},
+ "eventTitle": {}
+ }
+ },
+ "There is no page information available.": "पेज की कोई जानकारी उपलब्ध नहीं है।",
+ "@There is no page information available.": {
+ "description": "Description for when no page information is available",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Assignment Details": "असाइनमेंट विवरण",
+ "@Assignment Details": {
+ "description": "Title for the page that shows details for an assignment",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "assignmentTotalPoints": "{points} पॉइंट्स",
+ "@assignmentTotalPoints": {
+ "description": "Label used for the total points the assignment is worth",
+ "type": "text",
+ "placeholders_order": [
+ "points"
+ ],
+ "placeholders": {
+ "points": {}
+ }
+ },
+ "assignmentTotalPointsAccessible": "{points} पॉइंट्स",
+ "@assignmentTotalPointsAccessible": {
+ "description": "Screen reader label used for the total points the assignment is worth",
+ "type": "text",
+ "placeholders_order": [
+ "points"
+ ],
+ "placeholders": {
+ "points": {}
+ }
+ },
+ "Due": "नियत",
+ "@Due": {
+ "description": "Label for an assignment due date",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Grade": "ग्रेड",
+ "@Grade": {
+ "description": "Label for the section that displays an assignment's grade",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Locked": "लॉक किया गया",
+ "@Locked": {
+ "description": "Label for when an assignment is locked",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "assignmentLockedModule": "यह असाइनमेंट \"{moduleName}\" मॉड्यूल द्वारा लॉक की गई है।",
+ "@assignmentLockedModule": {
+ "description": "The locked description when an assignment is locked by a module",
+ "type": "text",
+ "placeholders_order": [
+ "moduleName"
+ ],
+ "placeholders": {
+ "moduleName": {}
+ }
+ },
+ "Remind Me": "मुझे याद दिलाएं",
+ "@Remind Me": {
+ "description": "Label for the row to set reminders",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Set a date and time to be notified of this specific assignment.": "इस विशिष्ट असाइनमेंट की सूचना पाने के लिए कोई तिथि और समय निर्धारित करें।",
+ "@Set a date and time to be notified of this specific assignment.": {
+ "description": "Description for row to set reminders",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "You will be notified about this assignment on…": "आपको इस असाइनमेंट के बारे में सूचित किया जाएगा...",
+ "@You will be notified about this assignment on…": {
+ "description": "Description for when a reminder is set",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Instructions": "निर्देश",
+ "@Instructions": {
+ "description": "Label for the description of the assignment when it has quiz instructions",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Send a message about this assignment": "इस असाइनमेंट के बारे में संदेश भेजें",
+ "@Send a message about this assignment": {
+ "description": "Accessibility hint for the assignment messaage floating action button",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "This app is not authorized for use.": "यह ऐप उपयोग के लिए अधिकृत नहीं है।",
+ "@This app is not authorized for use.": {
+ "description": "The error shown when the app being used is not verified by Canvas",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "The server you entered is not authorized for this app.": "आपके द्वारा दर्ज किया गया सर्वर इस ऐप के लिए अधिकृत नहीं है।",
+ "@The server you entered is not authorized for this app.": {
+ "description": "The error shown when the desired login domain is not verified by Canvas",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "The user agent for this app is not authorized.": "इस ऐप के लिए उपयोगकर्ता एजेंट अधिकृत नहीं है।",
+ "@The user agent for this app is not authorized.": {
+ "description": "The error shown when the user agent during verification is not verified by Canvas",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "We were unable to verify the server for use with this app.": "हम इस ऐप के उपयोग के लिए सर्वर को सत्यापित करने में असमर्थ थे।",
+ "@We were unable to verify the server for use with this app.": {
+ "description": "The generic error shown when we are unable to verify with Canvas",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Reminders": "अनुस्मारक",
+ "@Reminders": {
+ "description": "Name of the system notification channel for assignment and event reminders",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Notifications for reminders about assignments and calendar events": "असाइनमेंट और कैलेंडर घटना के बारे में अनुस्मारक के लिए सूचनाएं",
+ "@Notifications for reminders about assignments and calendar events": {
+ "description": "Description of the system notification channel for assignment and event reminders",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Reminders have changed!": "अनुस्मारक बदल गए हैं!",
+ "@Reminders have changed!": {
+ "description": "Title of the dialog shown when the user needs to update their reminders",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "In order to provide you with a better experience, we have updated how reminders work. You can add new reminders by viewing an assignment or calendar event and tapping the switch under the \"Remind Me\" section. \n\nBe aware that any reminders created with older versions of this app will not be compatible with the new changes and you will need to create them again.": "आपके अनुभव को बेहतर बनाने के लिए, हमने अनुस्मारक की कार्यक्षमता को उन्नत किया है। आप किसी असाइनमेंट या कैलेंडर घटना को देखकर और \"मुझे याद दिलाएं\" अनुभाग के अंतर्गत स्विच को टैप करके नए अनुस्मारक जोड़ सकते हैं।\n\nध्यान रखें कि इस ऐप के पुराने संस्करणों के साथ बनाया गया कोई भी अनुस्मारक नए परिवर्तनों के साथ संगत नहीं होगा और आपको उन्हें फिर से बनाने की आवश्यकता होगी।",
+ "@In order to provide you with a better experience, we have updated how reminders work. You can add new reminders by viewing an assignment or calendar event and tapping the switch under the \"Remind Me\" section.\n\nBe aware that any reminders created with older versions of this app will not be compatible with the new changes and you will need to create them again.": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Not a parent?": "माता-पिता नहीं है?",
+ "@Not a parent?": {
+ "description": "Title for the screen that shows when the user is not observing any students",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "We couldn't find any students associated with this account": "हमें इस खाते से जुड़ा कोई भी छात्र नहीं मिला",
+ "@We couldn't find any students associated with this account": {
+ "description": "Subtitle for the screen that shows when the user is not observing any students",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Are you a student or teacher?": "कआप छात्र हैं या शिक्षक हैं?",
+ "@Are you a student or teacher?": {
+ "description": "Label for button that will show users the option to view other Canvas apps in the Play Store",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "One of our other apps might be a better fit. Tap one to visit the Play Store.": "हमारा एक अन्य ऐप संभावित रूप से आपकी आवश्यकताओं को बेहतर ढंग से पूरा कर सकता है। प्ले स्टोर पर जाने के लिए टैप करें।",
+ "@One of our other apps might be a better fit. Tap one to visit the Play Store.": {
+ "description": "Description of options to view other Canvas apps in the Play Store",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Return to Login": "लॉगिन पर वापस जाएं",
+ "@Return to Login": {
+ "description": "Label for the button that returns the user to the login screen",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "STUDENT": "छात्र",
+ "@STUDENT": {
+ "description": "The \"student\" portion of the \"Canvas Student\" app name, in all caps. \"Canvas\" is excluded in this context as it will be displayed to the user as a wordmark image",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "TEACHER": "शिक्षक",
+ "@TEACHER": {
+ "description": "The \"teacher\" portion of the \"Canvas Teacher\" app name, in all caps. \"Canvas\" is excluded in this context as it will be displayed to the user as a wordmark image",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Canvas Student": "Canvas छात्र",
+ "@Canvas Student": {
+ "description": "The name of the Canvas Student app. Only \"Student\" should be translated as \"Canvas\" is a brand name in this context and should not be translated.",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Canvas Teacher": "Canvas शिक्षक",
+ "@Canvas Teacher": {
+ "description": "The name of the Canvas Teacher app. Only \"Teacher\" should be translated as \"Canvas\" is a brand name in this context and should not be translated.",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "No Alerts": "कोई चेतावनी नहीं",
+ "@No Alerts": {
+ "description": "The title for the empty message to show to users when there are no alerts for the student.",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "There’s nothing to be notified of yet.": "अभी तक सूचित करने लायक कुछ भी नहीं है।",
+ "@There’s nothing to be notified of yet.": {
+ "description": "The empty message to show to users when there are no alerts for the student.",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "dismissAlertLabel": "{alertTitle} खारिज करें",
+ "@dismissAlertLabel": {
+ "description": "Accessibility label to dismiss an alert",
+ "type": "text",
+ "placeholders_order": [
+ "alertTitle"
+ ],
+ "placeholders": {
+ "alertTitle": {}
+ }
+ },
+ "Course Announcement": "पाठ्यक्रम की घोषणा",
+ "@Course Announcement": {
+ "description": "Title for alerts when there is a course announcement",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Institution Announcement": "संस्थान की घोषणा",
+ "@Institution Announcement": {
+ "description": "Title for alerts when there is an institution announcement",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "assignmentGradeAboveThreshold": "{threshold} से ऊपर का असाइनमेंट ग्रेड",
+ "@assignmentGradeAboveThreshold": {
+ "description": "Title for alerts when an assignment grade is above the threshold value",
+ "type": "text",
+ "placeholders_order": [
+ "threshold"
+ ],
+ "placeholders": {
+ "threshold": {}
+ }
+ },
+ "assignmentGradeBelowThreshold": "{threshold} से नीचे का असाइनमेंट ग्रेड",
+ "@assignmentGradeBelowThreshold": {
+ "description": "Title for alerts when an assignment grade is below the threshold value",
+ "type": "text",
+ "placeholders_order": [
+ "threshold"
+ ],
+ "placeholders": {
+ "threshold": {}
+ }
+ },
+ "courseGradeAboveThreshold": "{threshold} से ऊपर का पाठ्यक्रम ग्रेड",
+ "@courseGradeAboveThreshold": {
+ "description": "Title for alerts when a course grade is above the threshold value",
+ "type": "text",
+ "placeholders_order": [
+ "threshold"
+ ],
+ "placeholders": {
+ "threshold": {}
+ }
+ },
+ "courseGradeBelowThreshold": "{threshold} से नीचे का पाठ्यक्रम ग्रेड",
+ "@courseGradeBelowThreshold": {
+ "description": "Title for alerts when a course grade is below the threshold value",
+ "type": "text",
+ "placeholders_order": [
+ "threshold"
+ ],
+ "placeholders": {
+ "threshold": {}
+ }
+ },
+ "Settings": "सेटिंग्स",
+ "@Settings": {
+ "description": "Title for the settings screen",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Theme": "थीम",
+ "@Theme": {
+ "description": "Label for the light/dark theme section in the settings page",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Dark Mode": "डार्क मोड",
+ "@Dark Mode": {
+ "description": "Label for the button that enables dark mode",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Light Mode": "लाइट मोड",
+ "@Light Mode": {
+ "description": "Label for the button that enables light mode",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "High Contrast Mode": "हाई कंट्रास्ट मोड",
+ "@High Contrast Mode": {
+ "description": "Label for the switch that toggles high contrast mode",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Use Dark Theme in Web Content": "वेब सामग्री में डार्क थीम का उपयोग करें",
+ "@Use Dark Theme in Web Content": {
+ "description": "Label for the switch that toggles dark mode for webviews",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Appearance": "दिखावट",
+ "@Appearance": {
+ "description": "Label for the appearance section in the settings page",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Successfully submitted!": "सफलतापूर्वक सबमिट किया गया!",
+ "@Successfully submitted!": {
+ "description": "Title displayed in the grade cell for an assignment that has been submitted",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "submissionStatusSuccessSubtitle": "यह असाइनमेंट {date} को {time} बजे सबमिट की गई थी और ग्रेड होने की प्रतीक्षा कर रही है",
+ "@submissionStatusSuccessSubtitle": {
+ "description": "Subtitle displayed in the grade cell for an assignment that has been submitted and is awaiting a grade",
+ "type": "text",
+ "placeholders_order": [
+ "date",
+ "time"
+ ],
+ "placeholders": {
+ "date": {},
+ "time": {}
+ }
+ },
+ "outOfPoints": "{howMany,plural, =1{1 पॉइंट में से}other{{points} पॉइंट्स में से}}",
+ "@outOfPoints": {
+ "description": "Description for an assignment grade that has points without a current scoroe",
+ "type": "text",
+ "placeholders_order": [
+ "points",
+ "howMany"
+ ],
+ "placeholders": {
+ "points": {},
+ "howMany": {}
+ }
+ },
+ "Excused": "माफ़ किया",
+ "@Excused": {
+ "description": "Grading status for an assignment marked as excused",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Complete": "पूरा हुआ",
+ "@Complete": {
+ "description": "Grading status for an assignment marked as complete",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Incomplete": "अधूरा",
+ "@Incomplete": {
+ "description": "Grading status for an assignment marked as incomplete",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "minus": "ऋण",
+ "@minus": {
+ "description": "Screen reader-friendly replacement for the \"-\" character in letter grades like \"A-\"",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "latePenalty": "विलंब दंड (-{pointsLost})",
+ "@latePenalty": {
+ "description": "Text displayed when a late penalty has been applied to the assignment",
+ "type": "text",
+ "placeholders_order": [
+ "pointsLost"
+ ],
+ "placeholders": {
+ "pointsLost": {}
+ }
+ },
+ "finalGrade": "अंतिम ग्रेड: {grade}",
+ "@finalGrade": {
+ "description": "Text that displays the final grade of an assignment",
+ "type": "text",
+ "placeholders_order": [
+ "grade"
+ ],
+ "placeholders": {
+ "grade": {}
+ }
+ },
+ "Alert Settings": "चेतावनी की सेटिंग्स",
+ "@Alert Settings": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Alert me when…": "मुझे चेतावनी दें जब…",
+ "@Alert me when…": {
+ "description": "Header for the screen where the observer chooses the thresholds that will determine when they receive alerts (e.g. when an assignment is graded below 70%)",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Course grade below": "इससे नीचे का पाठ्यक्रम ग्रेड:",
+ "@Course grade below": {
+ "description": "Label describing the threshold for when the course grade is below a certain percentage",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Course grade above": "इससे ऊपर का पाठ्यक्रम ग्रेड: ",
+ "@Course grade above": {
+ "description": "Label describing the threshold for when the course grade is above a certain percentage",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Assignment missing": "असाइनमेंट लापता है",
+ "@Assignment missing": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Assignment grade below": "इससे नीचे का असाइनमेंट ग्रेड:",
+ "@Assignment grade below": {
+ "description": "Label describing the threshold for when an assignment is graded below a certain percentage",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Assignment grade above": "इससे ऊपर का असाइनमेंट ग्रेड:",
+ "@Assignment grade above": {
+ "description": "Label describing the threshold for when an assignment is graded above a certain percentage",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Course Announcements": "पाठ्यक्रम घोषणाएं",
+ "@Course Announcements": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Institution Announcements": "संस्थान की घोषणाएं",
+ "@Institution Announcements": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Never": "कभी नहीं",
+ "@Never": {
+ "description": "Indication that tells the user they will not receive alert notifications of a specific kind",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Grade percentage": "ग्रेड प्रतिशत",
+ "@Grade percentage": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "There was an error loading your student's alerts.": "आपके छात्र की चेतावनियां लोड करने में त्रुटि हुई।",
+ "@There was an error loading your student's alerts.": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Must be below 100": "100 से कम होना चाहिए",
+ "@Must be below 100": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "mustBeBelowN": "{percentage} से कम होना चाहिए",
+ "@mustBeBelowN": {
+ "description": "Validation error to the user that they must choose a percentage below 'n'",
+ "type": "text",
+ "placeholders_order": [
+ "percentage"
+ ],
+ "placeholders": {
+ "percentage": {
+ "example": 5
+ }
+ }
+ },
+ "mustBeAboveN": "{percentage} से ऊपर होना चाहिए",
+ "@mustBeAboveN": {
+ "description": "Validation error to the user that they must choose a percentage above 'n'",
+ "type": "text",
+ "placeholders_order": [
+ "percentage"
+ ],
+ "placeholders": {
+ "percentage": {
+ "example": 5
+ }
+ }
+ },
+ "Select Student Color": "छात्र रंग का चयन करें",
+ "@Select Student Color": {
+ "description": "Title for screen that allows users to assign a color to a specific student",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Electric, blue": "इलेक्ट्रिक, नीला",
+ "@Electric, blue": {
+ "description": "Name of the Electric (blue) color",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Plum, Purple": "प्लम, बैंगनी",
+ "@Plum, Purple": {
+ "description": "Name of the Plum (purple) color",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Barney, Fuschia": "बार्नी, रानी गुलाबी",
+ "@Barney, Fuschia": {
+ "description": "Name of the Barney (fuschia) color",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Raspberry, Red": "रास्पबेरी, लाल",
+ "@Raspberry, Red": {
+ "description": "Name of the Raspberry (red) color",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Fire, Orange": "आग, नारंगी",
+ "@Fire, Orange": {
+ "description": "Name of the Fire (orange) color",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Shamrock, Green": "शैमरॉक, हरा",
+ "@Shamrock, Green": {
+ "description": "Name of the Shamrock (green) color",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "An error occurred while saving your selection. Please try again.": "आपका चयन सहेजते समय त्रुटि उत्पन्न हुई। कृपया फिर से कोशिश करें।",
+ "@An error occurred while saving your selection. Please try again.": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "changeStudentColorLabel": "{studentName} के लिए रंग बदलें",
+ "@changeStudentColorLabel": {
+ "description": "Accessibility label for the button that lets users change the color associated with a specific student",
+ "type": "text",
+ "placeholders_order": [
+ "studentName"
+ ],
+ "placeholders": {
+ "studentName": {}
+ }
+ },
+ "Teacher": "शिक्षक",
+ "@Teacher": {
+ "description": "Label for the Teacher enrollment type",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Student": "छात्र",
+ "@Student": {
+ "description": "Label for the Student enrollment type",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "TA": "TA",
+ "@TA": {
+ "description": "Label for the Teaching Assistant enrollment type (also known as Teacher Aid or Education Assistant), reduced to a short acronym/initialism if appropriate.",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Observer": "समीक्षक",
+ "@Observer": {
+ "description": "Label for the Observer enrollment type",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Use Camera": "कैमरे का उपयोग करें",
+ "@Use Camera": {
+ "description": "Label for the action item that lets the user capture a photo using the device camera",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Upload File": "फ़ाइल अपलोड करें",
+ "@Upload File": {
+ "description": "Label for the action item that lets the user upload a file from their device",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Choose from Gallery": "गैलरी से चुनें",
+ "@Choose from Gallery": {
+ "description": "Label for the action item that lets the user select a photo from their device gallery",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Preparing…": "तैयार किया जा रहा है…",
+ "@Preparing…": {
+ "description": "Message shown while a file is being prepared to attach to a message",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Add student with…": "छात्र को इसके साथ जोड़ें...",
+ "@Add student with…": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Add Student": "छात्र जोड़ें",
+ "@Add Student": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "You are not observing any students.": "आप किसी भी छात्र की समीक्षा नहीं कर रहे हैं।",
+ "@You are not observing any students.": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "There was an error loading your students.": "आपके छात्रों को लोड करने में त्रुटि हुई।",
+ "@There was an error loading your students.": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Pairing Code": "पेयरिंग कोड",
+ "@Pairing Code": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Students can obtain a pairing code through the Canvas website": "छात्र Canvas वेबसाइट के माध्यम से पेयरिंग कोड प्राप्त कर सकते हैं",
+ "@Students can obtain a pairing code through the Canvas website": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Enter the student pairing code provided to you. If the pairing code doesn't work, it may have expired": "आपको प्रदान किया गया छात्र पेयरिंग कोड दर्ज करें। यदि पेयरिंग कोड काम नहीं करता है, तो हो सकता है वह समाप्त हो गया हो",
+ "@Enter the student pairing code provided to you. If the pairing code doesn't work, it may have expired": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Your code is incorrect or expired.": "आपका कोड गलत है या समाप्त हो गया है।",
+ "@Your code is incorrect or expired.": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Something went wrong trying to create your account, please reach out to your school for assistance.": "अपना खाता बनाने की कोशिश में कुछ गलत हो गया, कृपया सहायता के लिए अपने स्कूल से संपर्क करें।",
+ "@Something went wrong trying to create your account, please reach out to your school for assistance.": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "QR Code": "QR कोड",
+ "@QR Code": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Students can create a QR code using the Canvas Student app on their mobile device": "छात्र अपने मोबाइल डिवाइस पर Canvas छात्र ऐप का उपयोग करके QR कोड बना सकते हैं",
+ "@Students can create a QR code using the Canvas Student app on their mobile device": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Add new student": "नया छात्र जोड़ें",
+ "@Add new student": {
+ "description": "Semantics label for the FAB on the Manage Students Screen",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Select": "चयन करें",
+ "@Select": {
+ "description": "Hint text to tell the user to choose one of two options",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "I have a Canvas account": "मेरे पास Canvas खाता है",
+ "@I have a Canvas account": {
+ "description": "Option to select for users that have a canvas account",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "I don't have a Canvas account": "मेरे पास Canvas खाता नहीं है",
+ "@I don't have a Canvas account": {
+ "description": "Option to select for users that don't have a canvas account",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Create Account": "खाता बनाएं",
+ "@Create Account": {
+ "description": "Button text for account creation confirmation",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Full Name": "पूरा नाम",
+ "@Full Name": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Email Address": "ईमेल पता",
+ "@Email Address": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Password": "पासवर्ड",
+ "@Password": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Full Name…": "पूरा नाम…",
+ "@Full Name…": {
+ "description": "hint label for inside form field",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Email…": "ईमेल…",
+ "@Email…": {
+ "description": "hint label for inside form field",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Password…": "पासवर्ड…",
+ "@Password…": {
+ "description": "hint label for inside form field",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Please enter full name": "कृपया पूरा नाम दर्ज करें",
+ "@Please enter full name": {
+ "description": "Error message for form field",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Please enter an email address": "कृपया ईमेल पता दर्ज करें",
+ "@Please enter an email address": {
+ "description": "Error message for form field",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Please enter a valid email address": "कृपया मान्य ईमेल पता दर्ज करें",
+ "@Please enter a valid email address": {
+ "description": "Error message for form field",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Password is required": "पासवर्ड की आवश्यकता है",
+ "@Password is required": {
+ "description": "Error message for form field",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Password must contain at least 8 characters": "पासवर्ड में कम से कम 8 कैरेक्टर होने चाहिए",
+ "@Password must contain at least 8 characters": {
+ "description": "Error message for form field",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "qrCreateAccountTos": "'खाता बनाएं' पर टैप करके, आप {termsOfService} से सहमत होते हैं और {privacyPolicy} को स्वीकार करते हैं",
+ "@qrCreateAccountTos": {
+ "description": "The text show on the account creation screen",
+ "type": "text",
+ "placeholders_order": [
+ "termsOfService",
+ "privacyPolicy"
+ ],
+ "placeholders": {
+ "termsOfService": {},
+ "privacyPolicy": {}
+ }
+ },
+ "Terms of Service": "सेवा की शर्तें",
+ "@Terms of Service": {
+ "description": "Label for the Canvas Terms of Service agreement. This will be used in the qrCreateAccountTos text and will be highlighted and clickable",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Privacy Policy": "गोपनीयता नीति",
+ "@Privacy Policy": {
+ "description": "Label for the Canvas Privacy Policy agreement. This will be used in the qrCreateAccountTos text and will be highlighted and clickable",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "View the Privacy Policy": "गोपनीयता नीति देखें",
+ "@View the Privacy Policy": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Already have an account? ": "पहले से कोई खाता है? ",
+ "@Already have an account? ": {
+ "description": "Part of multiline text span, includes AccountSignIn1-2, in that order",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Sign In": "साइन इन करें",
+ "@Sign In": {
+ "description": "Part of multiline text span, includes AccountSignIn1-2, in that order",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Hide Password": "पासवर्ड छिपाएं",
+ "@Hide Password": {
+ "description": "content description for password hide button",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Show Password": "पासवर्ड दिखाएं",
+ "@Show Password": {
+ "description": "content description for password show button",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Terms of Service Link": "सेवा की शर्तें लिंक",
+ "@Terms of Service Link": {
+ "description": "content description for terms of service link",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Privacy Policy Link": "गोपनीयता नीति लिंक",
+ "@Privacy Policy Link": {
+ "description": "content description for privacy policy link",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Event": "घटना",
+ "@Event": {
+ "description": "Title for the event details screen",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Date": "तिथि",
+ "@Date": {
+ "description": "Label for the event date",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Location": "लोकेशन",
+ "@Location": {
+ "description": "Label for the location information",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "No Location Specified": "कोई लोकेशन निर्दिष्ट नहीं",
+ "@No Location Specified": {
+ "description": "Description for events that do not have a location",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "eventTime": "{startAt} - {endAt}",
+ "@eventTime": {
+ "description": "The time the event is happening, example: \"2:00 pm - 4:00 pm\"",
+ "type": "text",
+ "placeholders_order": [
+ "startAt",
+ "endAt"
+ ],
+ "placeholders": {
+ "startAt": {},
+ "endAt": {}
+ }
+ },
+ "Set a date and time to be notified of this event.": "इस घटना की सूचना पाने के लिए कोई तिथि और समय निर्धारित करें।",
+ "@Set a date and time to be notified of this event.": {
+ "description": "Description for row to set event reminders",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "You will be notified about this event on…": "आपको इस घटना के बारे में सूचित किया जाएगा...",
+ "@You will be notified about this event on…": {
+ "description": "Description for when an event reminder is set",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Share Your Love for the App": "ऐप के लिए अपना प्यार साझा करें",
+ "@Share Your Love for the App": {
+ "description": "Label for option to open the app store",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Tell us about your favorite parts of the app": "हमें ऐप के अपने पसंदीदा हिस्सों के बारे में बताएं",
+ "@Tell us about your favorite parts of the app": {
+ "description": "Description for option to open the app store",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Legal": "कानूनी",
+ "@Legal": {
+ "description": "Label for legal information option",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Privacy policy, terms of use, open source": "गोपनीयता नीति, उपयोग की शर्तें, ओपन सोर्स",
+ "@Privacy policy, terms of use, open source": {
+ "description": "Description for legal information option",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Idea for Canvas Parent App [Android]": "Canvas माता-पिता ऐप [Android] के लिए आइडिया",
+ "@Idea for Canvas Parent App [Android]": {
+ "description": "The subject for the email to request a feature",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "The following information will help us better understand your idea:": "निम्नलिखित जानकारी हमें आपके आइडिया को बेहतर ढंग से समझने में मदद करेगी:",
+ "@The following information will help us better understand your idea:": {
+ "description": "The header for the users information that is attached to a feature request",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Domain:": "डोमेन:",
+ "@Domain:": {
+ "description": "The label for the Canvas domain of the logged in user",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "User ID:": "उपयोगकर्ता आईडी:",
+ "@User ID:": {
+ "description": "The label for the Canvas user ID of the logged in user",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Email:": "ईमेल:",
+ "@Email:": {
+ "description": "The label for the eamil of the logged in user",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Locale:": "स्थान:",
+ "@Locale:": {
+ "description": "The label for the locale of the logged in user",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Terms of Use": "उपयोग की शर्तें",
+ "@Terms of Use": {
+ "description": "Label for the terms of use",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Canvas on GitHub": "GitHub पर Canvas",
+ "@Canvas on GitHub": {
+ "description": "Label for the button that opens the Canvas project on GitHub's website",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "There was a problem loading the Terms of Use": "उपयोग की शर्तों को लोड करने में समस्या आई",
+ "@There was a problem loading the Terms of Use": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Device": "डिवाइस",
+ "@Device": {
+ "description": "Label used for device manufacturer/model in the error report",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "OS Version": "OS संस्करण",
+ "@OS Version": {
+ "description": "Label used for device operating system version in the error report",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Version Number": "संस्करण संख्या",
+ "@Version Number": {
+ "description": "Label used for the app version number in the error report",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Report A Problem": "समस्या की रिपोर्ट करें",
+ "@Report A Problem": {
+ "description": "Title used for generic dialog to report problems",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Subject": "विषय",
+ "@Subject": {
+ "description": "Label used for Subject text field",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "A subject is required.": "विषय की आवश्यकता है।",
+ "@A subject is required.": {
+ "description": "Error shown when the subject field is empty",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "An email address is required.": "ईमेल पता आवश्यक है।",
+ "@An email address is required.": {
+ "description": "Error shown when the email field is empty",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Description": "विवरण",
+ "@Description": {
+ "description": "Label used for Description text field",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "A description is required.": "विवरण आवश्यक है।",
+ "@A description is required.": {
+ "description": "Error shown when the description field is empty",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "How is this affecting you?": "इसका आप पर क्या प्रभाव पड़ रहा है?",
+ "@How is this affecting you?": {
+ "description": "Label used for the dropdown to select how severe the issue is",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "send": "भेजें",
+ "@send": {
+ "description": "Label used for send button when reporting a problem",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Just a casual question, comment, idea, suggestion…": "बस एक अनौपचारिक प्रश्न, टिप्पणी, आइडिया, सुझाव...",
+ "@Just a casual question, comment, idea, suggestion…": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "I need some help but it's not urgent.": "मुझे कुछ मदद की ज़रूरत है, लेकिन यह अत्यावश्यक नहीं है।",
+ "@I need some help but it's not urgent.": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Something's broken but I can work around it to get what I need done.": "एक समस्या है, लेकिन काम को पूरा करने के लिए कोई समाधान निकाल लिया जाएगा।",
+ "@Something's broken but I can work around it to get what I need done.": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "I can't get things done until I hear back from you.": "जब तक आपसे प्रतिक्रिया नहीं मिल जाती, काम पूरा नहीं किया जा सकता।",
+ "@I can't get things done until I hear back from you.": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "EXTREME CRITICAL EMERGENCY!!": "अत्यधिक गंभीर आपातकालीन स्थिति!!",
+ "@EXTREME CRITICAL EMERGENCY!!": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Not Graded": "ग्रेड नहीं किया गया",
+ "@Not Graded": {
+ "description": "Description for an assignment has not been graded.",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Login flow: Normal": "लॉगिन प्रवाह: सामान्य",
+ "@Login flow: Normal": {
+ "description": "Description for the normal login flow",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Login flow: Canvas": "लॉगिन प्रवाह: Canvas",
+ "@Login flow: Canvas": {
+ "description": "Description for the Canvas login flow",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Login flow: Site Admin": "लॉगिन प्रवाह: साइट व्यवस्थापक",
+ "@Login flow: Site Admin": {
+ "description": "Description for the Site Admin login flow",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Login flow: Skip mobile verify": "लॉगिन प्रवाह: मोबाइल सत्यापन छोड़ें",
+ "@Login flow: Skip mobile verify": {
+ "description": "Description for the login flow that skips domain verification for mobile",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Act As User": "उपयोगकर्ता के रूप में कार्य करें",
+ "@Act As User": {
+ "description": "Label for the button that allows the user to act (masquerade) as another user",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Stop Acting as User": "उपयोगकर्ता के रूप में कार्य करना बंद करें",
+ "@Stop Acting as User": {
+ "description": "Label for the button that allows the user to stop acting (masquerading) as another user",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "actingAsUser": "आप {userName} के रूप में कार्य कर रहे हैं",
+ "@actingAsUser": {
+ "description": "Message shown while acting (masquerading) as another user",
+ "type": "text",
+ "placeholders_order": [
+ "userName"
+ ],
+ "placeholders": {
+ "userName": {}
+ }
+ },
+ "\"Act as\" is essentially logging in as this user without a password. You will be able to take any action as if you were this user, and from other users' points of views, it will be as if this user performed them. However, audit logs record that you were the one who performed the actions on behalf of this user.": "\"इस रूप में कार्य करें\" अनिवार्य रूप से बिना पासवर्ड के इस उपयोगकर्ता के रूप में लॉग इन करना है। आपके पास ऐसे कार्य करने की क्षमता होगी जैसे कि आप यह उपयोगकर्ता थे, और अन्य उपयोगकर्ताओं को ऐसा प्रतीत होगा जैसे कि इस उपयोगकर्ता ने कार्य किए हैं। हालांकि, ऑडिट लॉग रिकॉर्ड बताते हैं कि वो आप ही थे जिन्होंने इस उपयोगकर्ता की ओर से कार्रवाई की थी।",
+ "@\"Act as\" is essentially logging in as this user without a password. You will be able to take any action as if you were this user, and from other users' points of views, it will be as if this user performed them. However, audit logs record that you were the one who performed the actions on behalf of this user.": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Domain": "डोमेन",
+ "@Domain": {
+ "description": "Text field hint for domain url input",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "You must enter a valid domain": "आपको कोई मान्य डोमेन दर्ज करना चाहिए",
+ "@You must enter a valid domain": {
+ "description": "Message displayed for domain input error",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "User ID": "उपयोगकर्ता आईडी",
+ "@User ID": {
+ "description": "Text field hint for user ID input",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "You must enter a user id": "आपको उपयोगकर्ता आईडी दर्ज करनी चाहिए",
+ "@You must enter a user id": {
+ "description": "Message displayed for user Id input error",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "There was an error trying to act as this user. Please check the Domain and User ID and try again.": "इस उपयोगकर्ता के रूप में कार्य करने का प्रयास करते समय त्रुटि हुई। कृपया डोमेन और उपयोगकर्ता आईडी की जांच करें और फिर से कोशिश करें।",
+ "@There was an error trying to act as this user. Please check the Domain and User ID and try again.": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "endMasqueradeMessage": "आप {userName} के रूप में कार्य करना बंद कर देंगे और अपने मूल खाते में वापस आ जाएंगे।",
+ "@endMasqueradeMessage": {
+ "description": "Confirmation message displayed when the user wants to stop acting (masquerading) as another user",
+ "type": "text",
+ "placeholders_order": [
+ "userName"
+ ],
+ "placeholders": {
+ "userName": {}
+ }
+ },
+ "endMasqueradeLogoutMessage": "आप {userName} के रूप में कार्य करना बंद कर देंगे और आपको लॉग आउट कर दिया जाएगा।",
+ "@endMasqueradeLogoutMessage": {
+ "description": "Confirmation message displayed when the user wants to stop acting (masquerading) as another user and will be logged out.",
+ "type": "text",
+ "placeholders_order": [
+ "userName"
+ ],
+ "placeholders": {
+ "userName": {}
+ }
+ },
+ "How are we doing?": "हमारा कार्य कैसा चल रहा है?",
+ "@How are we doing?": {
+ "description": "Title for dialog asking user to rate the app out of 5 stars.",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Don't show again": "फिर से न दिखाएं",
+ "@Don't show again": {
+ "description": "Button to prevent the rating dialog from showing again.",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "What can we do better?": "हम क्या बेहतर कर सकते हैं?",
+ "@What can we do better?": {
+ "description": "Hint text for providing a comment with the rating.",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Send Feedback": "फ़ीडबैक भेजें",
+ "@Send Feedback": {
+ "description": "Button to send rating with feedback",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "ratingDialogEmailSubject": "Android - Canvas Parent {version} के लिए सुझाव",
+ "@ratingDialogEmailSubject": {
+ "description": "The subject for an email to provide feedback for CanvasParent.",
+ "type": "text",
+ "placeholders_order": [
+ "version"
+ ],
+ "placeholders": {
+ "version": {}
+ }
+ },
+ "starRating": "{position,plural, =1{{position} तारा}other{{position} तारे}}",
+ "@starRating": {
+ "description": "Accessibility label for the 1 stars to 5 stars rating",
+ "type": "text",
+ "placeholders_order": [
+ "position"
+ ],
+ "placeholders": {
+ "position": {
+ "example": 1
+ }
+ }
+ },
+ "Student Pairing": "छात्र पेयरिंग",
+ "@Student Pairing": {
+ "description": "Title for the screen where users can pair to students using a QR code",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Open Canvas Student": "Canvas Student खोलें",
+ "@Open Canvas Student": {
+ "description": "Title for QR pairing tutorial screen instructing users to open the Canvas Student app",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "You'll need to open your student's Canvas Student app to continue. Go into Main Menu > Settings > Pair with Observer and scan the QR code you see there.": "जारी रखने के लिए आपको अपने छात्र का Canvas Student ऐप खोलना होगा। मुख्य मेनू > सेटिंग्स > समीक्षक के साथ पेयर करें में जाएं और वहां दिखाई देने वाले QR कोड को स्कैन करें।",
+ "@You'll need to open your student's Canvas Student app to continue. Go into Main Menu > Settings > Pair with Observer and scan the QR code you see there.": {
+ "description": "Message explaining how QR code pairing works",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Screenshot showing location of pairing QR code generation in the Canvas Student app": "Canvas Student ऐप में QR कोड जेनरेशन को पेयर करने का स्थान दिखाने वाला स्क्रीनशॉट",
+ "@Screenshot showing location of pairing QR code generation in the Canvas Student app": {
+ "description": "Content Description for qr pairing tutorial screenshot",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Expired QR Code": "समाप्त हुआ QR कोड",
+ "@Expired QR Code": {
+ "description": "Error title shown when the users scans a QR code that has expired",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "The QR code you scanned may have expired. Refresh the code on the student's device and try again.": "हो सकता है कि आपके द्वारा स्कैन किए गए QR कोड का समय समाप्त हो गया हो। छात्र की डिवाइस पर कोड रीफ़्रेश करें और फिर से कोशिश करें।",
+ "@The QR code you scanned may have expired. Refresh the code on the student's device and try again.": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "A network error occurred when adding this student. Check your connection and try again.": "इस छात्र को जोड़ते समय कोई नेटवर्क त्रुटि उत्पन्न हुई। अपने कनेक्शन की जांच करें और फिर से कोशिश करें।",
+ "@A network error occurred when adding this student. Check your connection and try again.": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Invalid QR Code": "अमान्य QR कोड",
+ "@Invalid QR Code": {
+ "description": "Error title shown when the user scans an invalid QR code",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Incorrect Domain": "गलत डोमेन",
+ "@Incorrect Domain": {
+ "description": "Error title shown when the users scane a QR code for a student that belongs to a different domain",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "The student you are trying to add belongs to a different school. Log in or create an account with that school to scan this code.": "जिस छात्र को आप जोड़ने का प्रयास कर रहे हैं वह एक अलग स्कूल से है। इस कोड को स्कैन करने के लिए लॉग इन करें या उस स्कूल में खाता बनाएं।",
+ "@The student you are trying to add belongs to a different school. Log in or create an account with that school to scan this code.": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Camera Permission": "कैमरा अनुमति",
+ "@Camera Permission": {
+ "description": "Error title shown when the user wans to scan a QR code but has denied the camera permission",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "This will unpair and remove all enrollments for this student from your account.": "इस तरह से आपके खाते से इस छात्र के सभी नामांकन अनपेयर हो जाएंगे और निकाल दिए जाएंगे।",
+ "@This will unpair and remove all enrollments for this student from your account.": {
+ "description": "Confirmation message shown when the user tries to delete a student from their account",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "There was a problem removing this student from your account. Please check your connection and try again.": "इस छात्र को आपके खाते से निकालने में समस्या हुई। कृपया अपने कनेक्शन की जांच करें और फिर से कोशिश करें।",
+ "@There was a problem removing this student from your account. Please check your connection and try again.": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Cancel": "रद्द करें",
+ "@Cancel": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "next": "अगला",
+ "@next": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "ok": "ठीक है",
+ "@ok": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Yes": "हां",
+ "@Yes": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "No": "नहीं",
+ "@No": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Retry": "पुन: प्रयास करें",
+ "@Retry": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Delete": "मिटाएं",
+ "@Delete": {
+ "description": "Label used for general delete/remove actions",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Done": "हो गया",
+ "@Done": {
+ "description": "Label for general done/finished actions",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Refresh": "रीफ़्रेश करें",
+ "@Refresh": {
+ "description": "Label for button to refresh data from the web",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "View Description": "विवरण देखें",
+ "@View Description": {
+ "description": "Button to view the description for an event or assignment",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "expanded": "बढ़ाया गया",
+ "@expanded": {
+ "description": "Description for the accessibility reader for list groups that are expanded",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "collapsed": "संक्षिप्त किया गया",
+ "@collapsed": {
+ "description": "Description for the accessibility reader for list groups that are expanded",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "An unexpected error occurred": "एक अप्रत्याशित त्रुटि हुई",
+ "@An unexpected error occurred": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "No description": "कोई विवरण नहीं",
+ "@No description": {
+ "description": "Message used when the assignment has no description",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Launch External Tool": "बाहरी उपकरण लॉन्च करें",
+ "@Launch External Tool": {
+ "description": "Button text added to webviews to let users open external tools in their browser",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Interactions on this page are limited by your institution.": "इस पेज पर बातचीत आपके संस्थान द्वारा सीमित हैं।",
+ "@Interactions on this page are limited by your institution.": {
+ "description": "Message describing how the webview has limited access due to an instution setting",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "dateAtTime": "{time} पर {date}",
+ "@dateAtTime": {
+ "description": "The string to format dates",
+ "type": "text",
+ "placeholders_order": [
+ "date",
+ "time"
+ ],
+ "placeholders": {
+ "date": {},
+ "time": {}
+ }
+ },
+ "dueDateAtTime": "{date} को {time} बजे नियत",
+ "@dueDateAtTime": {
+ "description": "The string to format due dates",
+ "type": "text",
+ "placeholders_order": [
+ "date",
+ "time"
+ ],
+ "placeholders": {
+ "date": {},
+ "time": {}
+ }
+ },
+ "No Due Date": "कोई नियत तिथि नहीं",
+ "@No Due Date": {
+ "description": "Label for assignments that do not have a due date",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Filter": "फ़िल्टर",
+ "@Filter": {
+ "description": "Label for buttons to filter what items are visible",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "unread": "अपठित",
+ "@unread": {
+ "description": "Label for things that are marked as unread",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "unreadCount": "{count} अपठित",
+ "@unreadCount": {
+ "description": "Formatted string for when there are a number of unread items",
+ "type": "text",
+ "placeholders_order": [
+ "count"
+ ],
+ "placeholders": {
+ "count": {}
+ }
+ },
+ "badgeNumberPlus": "{count}+",
+ "@badgeNumberPlus": {
+ "description": "Formatted string for when too many items are being notified in a badge, generally something like: 99+",
+ "type": "text",
+ "placeholders_order": [
+ "count"
+ ],
+ "placeholders": {
+ "count": {}
+ }
+ },
+ "There was an error loading this announcement": "इस घोषणा को लोड करने में त्रुटि हुई",
+ "@There was an error loading this announcement": {
+ "description": "Message shown when an announcement detail screen fails to load",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Network error": "नेटवर्क त्रुटि",
+ "@Network error": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Under Construction": "निर्माणाधीन",
+ "@Under Construction": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "We are currently building this feature for your viewing pleasure.": "हम वर्तमान में आपके देखने के अनुभव को बेहतर बनाने के लिए इस फ़ीचर को विकसित कर रहे हैं।",
+ "@We are currently building this feature for your viewing pleasure.": {
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Request Login Help Button": "लॉगिन मदद बटन का अनुरोध करें",
+ "@Request Login Help Button": {
+ "description": "Accessibility hint for button that opens help dialog for a login help request",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Request Login Help": "लॉगिन मदद का अनुरोध करें",
+ "@Request Login Help": {
+ "description": "Title of help dialog for a login help request",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "I'm having trouble logging in": "मुझे लॉग इन करने में समस्या हो रही है",
+ "@I'm having trouble logging in": {
+ "description": "Subject of help dialog for a login help request",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "An error occurred when trying to display this link": "इस लिंक को प्रदर्शित करने का प्रयास करते समय त्रुटि उत्पन्न हुई",
+ "@An error occurred when trying to display this link": {
+ "description": "Error message shown when a link can't be opened",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "We are unable to display this link, it may belong to an institution you currently aren't logged in to.": "हम इस लिंक को प्रदर्शित करने में असमर्थ हैं, यह किसी ऐसे संस्थान से संबंधित हो सकता है जिसमें आप वर्तमान में लॉग इन नहीं हैं।",
+ "@We are unable to display this link, it may belong to an institution you currently aren't logged in to.": {
+ "description": "Description for error page shown when clicking a link",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Link Error": "लिंक त्रुटि",
+ "@Link Error": {
+ "description": "Title for error page shown when clicking a link",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Open In Browser": "ब्राउज़र में खोलें",
+ "@Open In Browser": {
+ "description": "Text for button to open a link in the browswer",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "You'll find the QR code on the web in your account profile. Click 'QR for Mobile Login' in the list.": "आपको वेब पर अपनी खाता प्रोफ़ाइल में QR कोड मिलेगा। सूची में 'मोबाइल लॉगिन के लिए QR' पर क्लिक करें।",
+ "@You'll find the QR code on the web in your account profile. Click 'QR for Mobile Login' in the list.": {
+ "description": "Text for qr login tutorial screen",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Locate QR Code": "QR कोड का पता लगाएं",
+ "@Locate QR Code": {
+ "description": "Text for qr login button",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Please scan a QR code generated by Canvas": "कृपया Canvas द्वारा जेनरेट किए गए QR कोड को स्कैन करें",
+ "@Please scan a QR code generated by Canvas": {
+ "description": "Text for qr login error with incorrect qr code",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "There was an error logging in. Please generate another QR Code and try again.": "लॉग इन करने में त्रुटि हुई। कृपया कोई अन्य QR कोड जेनरेट करें और फिर से कोशिश करें।",
+ "@There was an error logging in. Please generate another QR Code and try again.": {
+ "description": "Text for qr login error",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Screenshot showing location of QR code generation in browser": "ब्राउज़र में QR कोड जेनरेशन का स्थान दिखाने वाला स्क्रीनशॉट",
+ "@Screenshot showing location of QR code generation in browser": {
+ "description": "Content Description for qr login tutorial screenshot",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "QR scanning requires camera access": "QR स्कैनिंग के लिए कैमरा एक्सेस की आवश्यकता होती है",
+ "@QR scanning requires camera access": {
+ "description": "placeholder for camera error for QR code scan",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "The linked item is no longer available": "लिंक किया गया आइटम अब उपलब्ध नहीं है",
+ "@The linked item is no longer available": {
+ "description": "error message when the alert could no be opened",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Message sent": "संदेश भेजा गया",
+ "@Message sent": {
+ "description": "confirmation message on the screen when the user succesfully sends a message",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Acceptable Use Policy": "स्वीकार्य उपयोग नीति",
+ "@Acceptable Use Policy": {
+ "description": "title for the acceptable use policy screen",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Submit": "सबमिट करें",
+ "@Submit": {
+ "description": "submit button title for acceptable use policy screen",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Either you're a new user or the Acceptable Use Policy has changed since you last agreed to it. Please agree to the Acceptable Use Policy before you continue.": "या तो आप नए उपयोगकर्ता हैं या स्वीकार्य उपयोग नीति तब से बदल गई है जब आप पिछली बार इसके लिए सहमत हुए थे। जारी रखने से पहले कृपया स्वीकार्य उपयोग नीति से सहमत हों।",
+ "@Either you're a new user or the Acceptable Use Policy has changed since you last agreed to it. Please agree to the Acceptable Use Policy before you continue.": {
+ "description": "acceptable use policy screen description",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "I agree to the Acceptable Use Policy.": "मैं स्वीकार्य उपयोग नीति से सहमत हूं।",
+ "@I agree to the Acceptable Use Policy.": {
+ "description": "acceptable use policy switch title",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "About": "इसके बारे में",
+ "@About": {
+ "description": "Title for about menu item in settings",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "App": "ऐप",
+ "@App": {
+ "description": "Title for App field on about page",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Login ID": "लॉगिन आईडी",
+ "@Login ID": {
+ "description": "Title for Login ID field on about page",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Email": "ईमेल",
+ "@Email": {
+ "description": "Title for Email field on about page",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Version": "संस्करण",
+ "@Version": {
+ "description": "Title for Version field on about page",
+ "type": "text",
+ "placeholders_order": [],
+ "placeholders": {}
+ },
+ "Instructure logo": "Instructure लोगो",
+ "@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/network/utils/analytics.dart b/apps/flutter_parent/lib/network/utils/analytics.dart
index 9254d431a0..c9eeb47f20 100644
--- a/apps/flutter_parent/lib/network/utils/analytics.dart
+++ b/apps/flutter_parent/lib/network/utils/analytics.dart
@@ -14,8 +14,8 @@
import 'package:firebase_crashlytics/firebase_crashlytics.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter_parent/network/api/heap_api.dart';
-import 'package:flutter_parent/utils/features_utils.dart';
import 'package:flutter_parent/utils/debug_flags.dart';
+import 'package:flutter_parent/utils/features_utils.dart';
/// Event names
/// The naming scheme for the majority of these is found in a google doc so that we can be consistent
@@ -54,6 +54,7 @@ class AnalyticsEventConstants {
static const USER_PROPERTY_BUILD_TYPE = 'build_type';
static const USER_PROPERTY_OS_VERSION = 'os_version';
static const VIEWED_OLD_REMINDER_MESSAGE = 'viewed_old_reminder_message';
+ static const SUBMISSION_AND_RUBRIC_INTERACTION = 'submission_and_rubric_interaction';
}
/// (Copied from canvas-api-2, make sure to stay in sync)
diff --git a/apps/flutter_parent/lib/router/panda_router.dart b/apps/flutter_parent/lib/router/panda_router.dart
index cf6f2d3d92..b4ea35148d 100644
--- a/apps/flutter_parent/lib/router/panda_router.dart
+++ b/apps/flutter_parent/lib/router/panda_router.dart
@@ -14,6 +14,7 @@
* along with this program. If not, see .
*/
+import 'dart:convert';
import 'dart:core';
import 'package:fluro/fluro.dart';
@@ -34,13 +35,13 @@ import 'package:flutter_parent/screens/dashboard/dashboard_screen.dart';
import 'package:flutter_parent/screens/domain_search/domain_search_screen.dart';
import 'package:flutter_parent/screens/events/event_details_screen.dart';
import 'package:flutter_parent/screens/help/help_screen.dart';
-import 'package:flutter_parent/screens/settings/legal_screen.dart';
import 'package:flutter_parent/screens/help/terms_of_use_screen.dart';
import 'package:flutter_parent/screens/inbox/conversation_list/conversation_list_screen.dart';
import 'package:flutter_parent/screens/login_landing_screen.dart';
import 'package:flutter_parent/screens/not_a_parent_screen.dart';
import 'package:flutter_parent/screens/pairing/qr_pairing_screen.dart';
import 'package:flutter_parent/screens/qr_login/qr_login_tutorial_screen.dart';
+import 'package:flutter_parent/screens/settings/legal_screen.dart';
import 'package:flutter_parent/screens/settings/settings_screen.dart';
import 'package:flutter_parent/screens/splash/splash_screen.dart';
import 'package:flutter_parent/screens/web_login/web_login_screen.dart';
@@ -152,8 +153,11 @@ class PandaRouter {
static final String _simpleWebView = '/internal';
- static String simpleWebViewRoute(String url, String infoText) =>
- '/internal?${_RouterKeys.url}=${Uri.encodeQueryComponent(url)}&${_RouterKeys.infoText}=${Uri.encodeQueryComponent(infoText)}';
+ static String simpleWebViewRoute(String url, String infoText, bool limitWebAccess) =>
+ '/internal?${_RouterKeys.url}=${Uri.encodeQueryComponent(url)}&${_RouterKeys.infoText}=${Uri.encodeQueryComponent(infoText)}&${_RouterKeys.limitWebAccess}=${limitWebAccess}';
+
+ static String submissionWebViewRoute(String url, String title, Map cookies, bool limitWebAccess) =>
+ '/internal?${_RouterKeys.url}=${Uri.encodeQueryComponent(url)}&${_RouterKeys.title}=${Uri.encodeQueryComponent(title)}&${_RouterKeys.cookies}=${jsonEncode(cookies)}&${_RouterKeys.limitWebAccess}=${limitWebAccess}';
static String settings() => '/settings';
@@ -376,7 +380,13 @@ class PandaRouter {
static Handler _simpleWebViewHandler = Handler(handlerFunc: (BuildContext? context, Map> params) {
final url = params[_RouterKeys.url]![0];
final infoText = params[_RouterKeys.infoText]?.elementAt(0);
- return SimpleWebViewScreen(url, url, infoText: infoText == null || infoText == 'null' ? null : infoText);
+ final titleParam = params[_RouterKeys.title]?.firstOrNull;
+ final title = (titleParam == null || titleParam.isEmpty) ? url : titleParam;
+ final cookiesParam = params[_RouterKeys.cookies]?.firstOrNull;
+ final cookies = (cookiesParam == null || cookiesParam.isEmpty) ? {} : jsonDecode(cookiesParam);
+ final limitWebAccess = params[_RouterKeys.limitWebAccess]?.firstOrNull == 'true';
+ return SimpleWebViewScreen(url, title, limitWebAccess,
+ infoText: infoText == null || infoText == 'null' ? null : infoText, initialCookies: cookies);
});
static Handler _syllabusHandler = Handler(handlerFunc: (BuildContext? context, Map> params) {
@@ -461,7 +471,7 @@ class PandaRouter {
final url = await _interactor.getAuthUrl(link);
if (limitWebAccess) {
// Special case for limit webview access flag (We don't want them to be able to navigate within the webview)
- locator().pushRoute(context, simpleWebViewRoute(url, L10n(context).webAccessLimitedMessage));
+ locator().pushRoute(context, simpleWebViewRoute(url, L10n(context).webAccessLimitedMessage, true));
} else if (await locator().canLaunch(link) ?? false) {
// No native route found, let's launch the url if possible, or show an error toast
locator().launch(url);
@@ -519,6 +529,9 @@ class _RouterKeys {
static final accountName = 'accountName';
static final eventId = 'eventId';
static final infoText = 'infoText';
+ static final title = 'title';
+ static final cookies = 'cookies';
+ static final limitWebAccess = 'limitWebAccess';
static final isCreatingAccount = 'isCreatingAccount';
static final loginFlow = 'loginFlow';
static final qrLoginUrl = 'qrLoginUrl';
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 2814bad688..24786721a6 100644
--- a/apps/flutter_parent/lib/screens/assignments/assignment_details_screen.dart
+++ b/apps/flutter_parent/lib/screens/assignments/assignment_details_screen.dart
@@ -17,12 +17,14 @@ import 'package:flutter_parent/models/assignment.dart';
import 'package:flutter_parent/models/reminder.dart';
import 'package:flutter_parent/models/user.dart';
import 'package:flutter_parent/network/utils/api_prefs.dart';
+import 'package:flutter_parent/router/panda_router.dart';
import 'package:flutter_parent/screens/assignments/assignment_details_interactor.dart';
import 'package:flutter_parent/screens/assignments/grade_cell.dart';
import 'package:flutter_parent/screens/inbox/create_conversation/create_conversation_screen.dart';
import 'package:flutter_parent/utils/common_widgets/error_panda_widget.dart';
import 'package:flutter_parent/utils/common_widgets/loading_indicator.dart';
import 'package:flutter_parent/utils/common_widgets/web_view/html_description_tile.dart';
+import 'package:flutter_parent/utils/common_widgets/web_view/web_content_interactor.dart';
import 'package:flutter_parent/utils/core_extensions/date_time_extensions.dart';
import 'package:flutter_parent/utils/design/canvas_icons_solid.dart';
import 'package:flutter_parent/utils/design/parent_theme.dart';
@@ -33,6 +35,7 @@ import 'package:flutter_parent/utils/service_locator.dart';
import 'package:flutter_svg/svg.dart';
import 'package:permission_handler/permission_handler.dart';
+import '../../network/utils/analytics.dart';
import '../../utils/veneers/flutter_snackbar_veneer.dart';
class AssignmentDetailsScreen extends StatefulWidget {
@@ -183,6 +186,30 @@ class _AssignmentDetailsScreenState extends State {
],
),
),
+ Divider(),
+ Padding(
+ padding: const EdgeInsets.only(top: 16.0, bottom: 16.0),
+ child: OutlinedButton(
+ onPressed: () {
+ _onSubmissionAndRubricClicked(assignment.htmlUrl, l10n.submission);
+ },
+ child: Align(
+ alignment: Alignment.center,
+ child: Row(mainAxisSize: MainAxisSize.min, children: [
+ Text(
+ l10n.submissionAndRubric,
+ style: textTheme.titleMedium?.copyWith(color: ParentTheme.of(context)?.studentColor),
+ ),
+ SizedBox(width: 6),
+ Icon(CanvasIconsSolid.arrow_open_right, color: ParentTheme.of(context)?.studentColor, size: 14)
+ ])),
+ style: OutlinedButton.styleFrom(
+ minimumSize: Size(double.infinity, 48),
+ shape: RoundedRectangleBorder(
+ borderRadius: BorderRadius.circular(6.0),
+ ),
+ side: BorderSide(width: 0.5, color: ParentTheme.of(context)?.onSurfaceColor ?? Colors.grey),
+ ))),
if (!fullyLocked) ...[
Divider(),
..._rowTile(
@@ -372,4 +399,17 @@ class _AssignmentDetailsScreenState extends State {
locator.get().push(context, screen);
}
}
+
+ _onSubmissionAndRubricClicked(String? assignmentUrl, String title) async {
+ if (assignmentUrl == null) return;
+ final parentId = ApiPrefs.getUser()?.id ?? 0;
+ final currentStudentId = _currentStudent?.id ?? 0;
+ locator().pushRoute(context, PandaRouter.submissionWebViewRoute(
+ await locator().getAuthUrl(assignmentUrl),
+ title,
+ {"k5_observed_user_for_$parentId": "$currentStudentId"},
+ false
+ ));
+ locator().logEvent(AnalyticsEventConstants.SUBMISSION_AND_RUBRIC_INTERACTION);
+ }
}
diff --git a/apps/flutter_parent/lib/utils/common_widgets/web_view/simple_web_view_screen.dart b/apps/flutter_parent/lib/utils/common_widgets/web_view/simple_web_view_screen.dart
index cc186be9dc..dcb7c6ba10 100644
--- a/apps/flutter_parent/lib/utils/common_widgets/web_view/simple_web_view_screen.dart
+++ b/apps/flutter_parent/lib/utils/common_widgets/web_view/simple_web_view_screen.dart
@@ -19,12 +19,24 @@ import 'package:flutter_parent/utils/design/parent_theme.dart';
import 'package:flutter_parent/utils/web_view_utils.dart';
import 'package:webview_flutter/webview_flutter.dart';
+import '../../service_locator.dart';
+import '../../url_launcher.dart';
+
class SimpleWebViewScreen extends StatefulWidget {
- final String _url;
- final String _title;
- final String? _infoText;
+ final String url;
+ final String title;
+ final String? infoText;
+ final Map? initialCookies;
+ final bool limitWebAccess;
- SimpleWebViewScreen(this._url, this._title, {String? infoText}) : _infoText = infoText;
+ SimpleWebViewScreen(
+ this.url,
+ this.title,
+ this.limitWebAccess, {
+ String? infoText,
+ Map? initialCookies,
+ }) : this.infoText = infoText,
+ this.initialCookies = initialCookies;
@override
State createState() => _SimpleWebViewScreenState();
@@ -43,7 +55,7 @@ class _SimpleWebViewScreenState extends State {
backgroundColor: Colors.transparent,
iconTheme: Theme.of(context).iconTheme,
bottom: ParentTheme.of(context)?.appBarDivider(shadowInLightMode: false),
- title: Text(widget._title, style: Theme.of(context).textTheme.titleLarge),
+ title: Text(widget.title, style: Theme.of(context).textTheme.titleLarge),
),
body: WebView(
javascriptMode: JavascriptMode.unrestricted,
@@ -52,34 +64,51 @@ class _SimpleWebViewScreenState extends State {
navigationDelegate: _handleNavigation,
onWebViewCreated: (controller) {
_controller = controller;
- controller.loadUrl(widget._url);
+ controller.loadUrl(widget.url);
},
onPageFinished: _handlePageLoaded,
+ initialCookies: _getCookies(),
),
),
);
}
NavigationDecision _handleNavigation(NavigationRequest request) {
- if (!request.isForMainFrame || widget._url.startsWith(request.url)) return NavigationDecision.navigate;
+ if (request.url.contains('/download?download_frd=')) {
+ locator().launch(request.url);
+ return NavigationDecision.prevent;
+ }
+ if (!request.isForMainFrame || widget.url.startsWith(request.url) || !widget.limitWebAccess) return NavigationDecision.navigate;
return NavigationDecision.prevent;
}
void _handlePageLoaded(String url) async {
// If there's no info to show, just return
- if (widget._infoText == null || widget._infoText!.isEmpty) return;
+ if (widget.infoText == null || widget.infoText!.isEmpty) return;
// Run javascript to show the info alert
await _controller?.evaluateJavascript(_showAlertJavascript);
}
+ String _getDomain() {
+ final uri = Uri.parse(widget.url);
+ return uri.host;
+ }
+
+ List _getCookies() {
+ return widget.initialCookies?.entries
+ .map((entry) => WebViewCookie(name: entry.key.toString(), value: entry.value.toString(), domain: _getDomain()))
+ .toList() ??
+ [];
+ }
+
String get _showAlertJavascript => """
const floatNode = `
- ${widget._infoText}
+ ${widget.infoText}
diff --git a/apps/flutter_parent/lib/utils/common_widgets/web_view/web_content_interactor.dart b/apps/flutter_parent/lib/utils/common_widgets/web_view/web_content_interactor.dart
index 93aaec8122..58c39f237c 100644
--- a/apps/flutter_parent/lib/utils/common_widgets/web_view/web_content_interactor.dart
+++ b/apps/flutter_parent/lib/utils/common_widgets/web_view/web_content_interactor.dart
@@ -28,7 +28,8 @@ class WebContentInteractor {
}
Future getAuthUrl(String targetUrl) async {
- if (targetUrl.contains(ApiPrefs.getDomain()!)) {
+ final domain = ApiPrefs.getDomain();
+ if (domain != null && targetUrl.contains(domain)) {
return _authUrl(targetUrl);
} else {
return targetUrl;
diff --git a/apps/flutter_parent/pubspec.yaml b/apps/flutter_parent/pubspec.yaml
index 0c370d64e5..9f1ace5fff 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.10.0+50
+version: 3.11.0+51
module:
androidX: true
diff --git a/apps/flutter_parent/test/router/panda_router_test.dart b/apps/flutter_parent/test/router/panda_router_test.dart
index 56b87aa149..ad6cf2c602 100644
--- a/apps/flutter_parent/test/router/panda_router_test.dart
+++ b/apps/flutter_parent/test/router/panda_router_test.dart
@@ -25,20 +25,19 @@ import 'package:flutter_parent/screens/announcements/announcement_details_screen
import 'package:flutter_parent/screens/assignments/assignment_details_screen.dart';
import 'package:flutter_parent/screens/calendar/calendar_screen.dart';
import 'package:flutter_parent/screens/calendar/calendar_widget/calendar_widget.dart';
-import 'package:flutter_parent/screens/courses/details/course_details_interactor.dart';
import 'package:flutter_parent/screens/courses/details/course_details_screen.dart';
import 'package:flutter_parent/screens/courses/routing_shell/course_routing_shell_screen.dart';
import 'package:flutter_parent/screens/dashboard/dashboard_screen.dart';
import 'package:flutter_parent/screens/domain_search/domain_search_screen.dart';
import 'package:flutter_parent/screens/events/event_details_screen.dart';
import 'package:flutter_parent/screens/help/help_screen.dart';
-import 'package:flutter_parent/screens/settings/legal_screen.dart';
import 'package:flutter_parent/screens/help/terms_of_use_screen.dart';
import 'package:flutter_parent/screens/inbox/conversation_list/conversation_list_screen.dart';
import 'package:flutter_parent/screens/login_landing_screen.dart';
import 'package:flutter_parent/screens/not_a_parent_screen.dart';
import 'package:flutter_parent/screens/pairing/qr_pairing_screen.dart';
import 'package:flutter_parent/screens/qr_login/qr_login_tutorial_screen.dart';
+import 'package:flutter_parent/screens/settings/legal_screen.dart';
import 'package:flutter_parent/screens/settings/settings_screen.dart';
import 'package:flutter_parent/screens/splash/splash_screen.dart';
import 'package:flutter_parent/screens/web_login/web_login_screen.dart';
@@ -55,7 +54,6 @@ import '../utils/accessibility_utils.dart';
import '../utils/canvas_model_utils.dart';
import '../utils/platform_config.dart';
import '../utils/test_app.dart';
-import '../utils/test_helpers/mock_helpers.dart';
import '../utils/test_helpers/mock_helpers.mocks.dart';
final _analytics = MockAnalytics();
@@ -369,6 +367,19 @@ void main() {
expect((widget as CourseRoutingShellScreen).courseId, courseId);
expect((widget).type, CourseShellType.frontPage);
});
+
+ test('submissionWebViewRoute returns SimpleWebViewScreen', () {
+ final url = 'https://test.instructure.com';
+ final title = 'Title';
+ final cookies = {'key': 'value'};
+ final widget = _getWidgetFromRoute(PandaRouter.submissionWebViewRoute(url, title, cookies, false)) as SimpleWebViewScreen;
+
+ expect(widget, isA());
+ expect(widget.url, url);
+ expect(widget.title, title);
+ expect(widget.initialCookies, cookies);
+ expect(widget.limitWebAccess, false);
+ });
});
group('external url handler', () {
@@ -584,7 +595,7 @@ void main() {
);
verify(_analytics.logMessage('Attempting to route INTERNAL url: $url')).called(1);
- verify(_mockNav.pushRoute(any, PandaRouter.simpleWebViewRoute(url, AppLocalizations().webAccessLimitedMessage)));
+ verify(_mockNav.pushRoute(any, PandaRouter.simpleWebViewRoute(url, AppLocalizations().webAccessLimitedMessage, true)));
});
});
diff --git a/apps/flutter_parent/test/screens/assignments/assignment_details_screen_test.dart b/apps/flutter_parent/test/screens/assignments/assignment_details_screen_test.dart
index ac2f283561..95b5f99721 100644
--- a/apps/flutter_parent/test/screens/assignments/assignment_details_screen_test.dart
+++ b/apps/flutter_parent/test/screens/assignments/assignment_details_screen_test.dart
@@ -33,6 +33,7 @@ import 'package:flutter_parent/screens/inbox/create_conversation/create_conversa
import 'package:flutter_parent/utils/common_widgets/error_panda_widget.dart';
import 'package:flutter_parent/utils/common_widgets/loading_indicator.dart';
import 'package:flutter_parent/utils/common_widgets/web_view/html_description_tile.dart';
+import 'package:flutter_parent/utils/common_widgets/web_view/simple_web_view_screen.dart';
import 'package:flutter_parent/utils/common_widgets/web_view/web_content_interactor.dart';
import 'package:flutter_parent/utils/core_extensions/date_time_extensions.dart';
import 'package:flutter_parent/utils/design/canvas_icons_solid.dart';
@@ -48,7 +49,6 @@ import 'package:permission_handler/permission_handler.dart';
import '../../utils/accessibility_utils.dart';
import '../../utils/platform_config.dart';
import '../../utils/test_app.dart';
-import '../../utils/test_helpers/mock_helpers.dart';
import '../../utils/test_helpers/mock_helpers.mocks.dart';
void main() {
@@ -621,4 +621,45 @@ void main() {
expect(find.text(AppLocalizations().assignmentRemindMeDescription), findsOneWidget);
expect((tester.widget(find.byType(Switch)) as Switch).value, false);
});
+
+ testWidgetsWithAccessibilityChecks('shows Submission & Rubric button', (tester) async {
+ when(interactor.loadAssignmentDetails(any, courseId, assignmentId, studentId)).thenAnswer((_) async => AssignmentDetails(assignment: assignment));
+
+ await tester.pumpWidget(TestApp(
+ AssignmentDetailsScreen(
+ courseId: courseId,
+ assignmentId: assignmentId,
+ ),
+ platformConfig: PlatformConfig(mockApiPrefs: {ApiPrefs.KEY_CURRENT_STUDENT: json.encode(serialize(student))}),
+ ));
+
+ // Pump for a duration since we're delaying webview load for the animation
+ await tester.pumpAndSettle(Duration(seconds: 1));
+
+ expect(find.text(AppLocalizations().submissionAndRubric), findsOneWidget);
+ });
+
+ testWidgetsWithAccessibilityChecks('Submission & Rubric button opens SimpleWebViewScreen', (tester) async {
+ when(interactor.loadAssignmentDetails(any, courseId, assignmentId, studentId)).thenAnswer((_) async => AssignmentDetails(assignment: assignment));
+
+ await tester.pumpWidget(TestApp(
+ AssignmentDetailsScreen(
+ courseId: courseId,
+ assignmentId: assignmentId,
+ ),
+ platformConfig: PlatformConfig(mockApiPrefs: {ApiPrefs.KEY_CURRENT_STUDENT: json.encode(serialize(student))}, initWebview: true),
+ ));
+
+ // Pump for a duration since we're delaying webview load for the animation
+ await tester.pumpAndSettle(Duration(seconds: 1));
+
+ await tester.tap(find.text(AppLocalizations().submissionAndRubric));
+ await tester.pumpAndSettle();
+
+ // Check to make sure we're on the SimpleWebViewScreen screen
+ expect(find.byType(SimpleWebViewScreen), findsOneWidget);
+
+ // Check that we have the correct title
+ expect(find.text(AppLocalizations().submission), findsOneWidget);
+ });
}
diff --git a/apps/flutter_parent/test/utils/widgets/webview/simple_web_view_screen_test.dart b/apps/flutter_parent/test/utils/widgets/webview/simple_web_view_screen_test.dart
index 944e670e5b..211e087f4b 100644
--- a/apps/flutter_parent/test/utils/widgets/webview/simple_web_view_screen_test.dart
+++ b/apps/flutter_parent/test/utils/widgets/webview/simple_web_view_screen_test.dart
@@ -29,7 +29,7 @@ void main() {
final url = 'https://www.google.com';
final title = 'title';
- await tester.pumpWidget(TestApp(SimpleWebViewScreen(url, title), platformConfig: config));
+ await tester.pumpWidget(TestApp(SimpleWebViewScreen(url, title, true), platformConfig: config));
await tester.pump();
expect(find.text(title), findsOneWidget);
@@ -39,7 +39,7 @@ void main() {
final url = 'https://www.google.com';
final title = 'title';
- await tester.pumpWidget(TestApp(SimpleWebViewScreen(url, title), platformConfig: config));
+ await tester.pumpWidget(TestApp(SimpleWebViewScreen(url, title, true), platformConfig: config));
await tester.pump();
expect(find.byType(WebView), findsOneWidget);
@@ -51,7 +51,7 @@ void main() {
final title = 'title';
await TestApp.showWidgetFromTap(tester, (context) {
- return Navigator.of(context).push(MaterialPageRoute(builder: (context) => SimpleWebViewScreen(url, title)));
+ return Navigator.of(context).push(MaterialPageRoute(builder: (context) => SimpleWebViewScreen(url, title, true)));
}, config: config);
expect(find.byType(WebView), findsOneWidget);
diff --git a/apps/flutter_sdk_url b/apps/flutter_sdk_url
deleted file mode 100644
index 6fcfede9b9..0000000000
--- a/apps/flutter_sdk_url
+++ /dev/null
@@ -1 +0,0 @@
-https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_2.5.3-stable.tar.xz
\ No newline at end of file
diff --git a/apps/gradle.properties b/apps/gradle.properties
index 582f323a7e..23b8fadbcb 100644
--- a/apps/gradle.properties
+++ b/apps/gradle.properties
@@ -1,8 +1,3 @@
android.enableJetifier=true
android.useAndroidX=true
-org.gradle.jvmargs=-Xmx4g -XX:MaxMetaspaceSize=2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
-
-# Flutter embed
-target-platform=android-x64,android-arm,android-arm64
-flutter.hostAppProjectName=:student
-org.gradle.workers.max=1
+org.gradle.jvmargs=-Xmx4g -XX:MaxMetaspaceSize=2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
\ No newline at end of file
diff --git a/apps/parent/.gitignore b/apps/parent/.gitignore
new file mode 100644
index 0000000000..b6df9f40c4
--- /dev/null
+++ b/apps/parent/.gitignore
@@ -0,0 +1,58 @@
+# Private data
+google-services.json
+src/main/res/xml/analytics.xml
+src/main/res/values/private_strings.xml
+private.properties
+
+# built application files #
+*.apk
+*.ap_
+
+# files for the dex VM #
+*.dex
+
+# Java class files #
+*.class
+
+# generated files #
+bin
+gen
+target
+
+# Local configuration file (sdk path, etc) #
+local.properties
+
+# Windows thumbnail db #
+Thumbs.db
+
+# OSX files
+.DS_Store
+
+# Eclipse project files #
+.classpath
+.project
+
+# Android Studio #
+.idea
+*.iml
+build
+*.iws
+
+# Package Files #
+*.jar
+*.war
+*.ear
+
+# Project Files #
+.gitconfig
+
+# Gradle Files #
+gradle.properties
+.gradle
+
+# OSS License data
+src/main/res/raw/third_party_license_metadata
+src/main/res/raw/third_party_licenses
+
+# Flank
+results/
diff --git a/apps/parent/build.gradle b/apps/parent/build.gradle
new file mode 100644
index 0000000000..6f22fb2773
--- /dev/null
+++ b/apps/parent/build.gradle
@@ -0,0 +1,221 @@
+/*
+ * Copyright (C) 2024 - 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 .
+ *
+ */
+
+plugins {
+ id 'com.android.application'
+ id 'com.google.gms.google-services'
+ id 'org.jetbrains.kotlin.android'
+ id 'kotlin-kapt'
+ id 'com.google.firebase.crashlytics'
+ id 'dagger.hilt.android.plugin'
+}
+
+configurations {
+ all*.exclude group: 'commons-logging', module: 'commons-logging'
+ all*.exclude group: 'org.apache.httpcomponents', module: 'httpclient'
+}
+
+def coverageEnabled = project.hasProperty('coverage')
+
+android {
+ namespace 'com.instructure.parentapp'
+ compileSdk Versions.COMPILE_SDK
+
+ defaultConfig {
+ applicationId "com.instructure.parentapp"
+ minSdkVersion Versions.MIN_SDK
+ targetSdkVersion Versions.TARGET_SDK
+ versionCode 50
+ versionName "3.10.0"
+
+ buildConfigField "boolean", "IS_TESTING", "false"
+ testInstrumentationRunner 'com.instructure.parentapp.ui.espresso.ParentHiltTestRunner'
+ testInstrumentationRunnerArguments disableAnalytics: 'true'
+
+ /* Add private data */
+ PrivateData.merge(project, "parent")
+ }
+
+ packagingOptions {
+ exclude 'META-INF/maven/com.google.guava/guava/pom.xml'
+ exclude 'META-INF/maven/com.google.guava/guava/pom.properties'
+ exclude 'META-INF/DEPENDENCIES'
+ exclude 'META-INF/LICENSE'
+ exclude 'META-INF/LICENSE.txt'
+ exclude 'META-INF/NOTICE'
+ exclude 'META-INF/rxjava.properties'
+ exclude 'LICENSE.txt'
+ }
+
+
+ lintOptions {
+ abortOnError false
+ }
+
+ flavorDimensions 'default'
+
+ productFlavors {
+ dev {
+ dimension 'default'
+ }
+
+ qa {
+ buildConfigField "boolean", "IS_TESTING", "true"
+ dimension 'default'
+ }
+
+ prod {
+ dimension 'default'
+ }
+ }
+
+ buildTypes {
+ debug {
+ testCoverageEnabled = coverageEnabled
+ proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
+ minifyEnabled false
+ shrinkResources false
+ pseudoLocalesEnabled true
+
+ firebaseCrashlytics {
+ // If you don't need crash reporting for your debug build,
+ // you can speed up your build by disabling mapping file uploading.
+ mappingFileUploadEnabled false
+ }
+ }
+
+ debugMinify {
+ initWith debug
+ debuggable false
+ minifyEnabled true
+ shrinkResources true
+ matchingFallbacks = ['debug']
+ }
+
+ release {
+ minifyEnabled true
+ shrinkResources true
+ proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+ }
+ }
+
+ configurations.all {
+ resolutionStrategy.force 'com.google.code.findbugs:jsr305:1.3.9'
+ /*
+ Resolves dependency versions across test and production APKs, specifically, transitive
+ dependencies. This is required since Espresso internally has a dependency on support-annotations.
+ https://github.com/googlecodelabs/android-testing/blob/57852eaf7df88ddaf828eca879a407f2249d5348/app/build.gradle#L86
+ */
+ resolutionStrategy.force Libs.ANDROIDX_ANNOTATION
+
+ resolutionStrategy.force Libs.KOTLIN_COROUTINES_CORE
+ resolutionStrategy.force Libs.KOTLIN_STD_LIB
+ }
+
+ configurations.implementation.dependencies.each { compileDependency ->
+ println "Excluding compile dependency: ${compileDependency.getName()}"
+ configurations.androidTestImplementation.dependencies.each { androidTestCompileDependency ->
+ configurations.androidTestImplementation.exclude module: "${compileDependency.getName()}"
+ }
+ }
+
+ compileOptions {
+ sourceCompatibility JavaVersion.VERSION_1_8
+ targetCompatibility JavaVersion.VERSION_1_8
+ }
+ kotlinOptions {
+ jvmTarget = '1.8'
+ }
+ buildFeatures {
+ viewBinding true
+ dataBinding true
+ compose true
+ }
+ hilt {
+ enableAggregatingTask = false
+ enableExperimentalClasspathAggregation = true
+ }
+ composeOptions {
+ kotlinCompilerExtensionVersion = Versions.KOTLIN_COMPOSE_COMPILER_VERSION
+ }
+
+ testOptions.animationsDisabled = true
+}
+
+dependencies {
+
+ implementation fileTree(dir: 'libs', include: ['*.jar'])
+
+ /* Project Modules */
+ implementation project(path: ':login-api-2')
+
+ /* Android Test Dependencies */
+ androidTestImplementation project(path: ':espresso')
+ androidTestImplementation project(':dataseedingapi')
+
+ /* Unit Test Dependencies */
+ testImplementation Libs.JUNIT
+ testImplementation Libs.ROBOLECTRIC
+ testImplementation Libs.ANDROIDX_TEST_JUNIT
+ testImplementation Libs.MOCKK
+ androidTestImplementation Libs.ANDROIDX_TEST_JUNIT
+ testImplementation Libs.KOTLIN_COROUTINES_TEST
+ testImplementation Libs.THREETEN_BP
+ testImplementation Libs.ANDROIDX_CORE_TESTING
+
+ /* Firebase */
+ implementation platform(Libs.FIREBASE_BOM) {
+ exclude group: 'com.google.firebase', module: 'firebase-analytics'
+ }
+ implementation Libs.FIREBASE_MESSAGING
+ implementation Libs.FIREBASE_CRASHLYTICS_NDK
+ implementation(Libs.FIREBASE_CRASHLYTICS) {
+ transitive = true
+ }
+
+ /* Kotlin */
+ implementation Libs.KOTLIN_STD_LIB
+
+ /* DI */
+ implementation Libs.HILT
+ kapt Libs.HILT_COMPILER
+ implementation Libs.HILT_ANDROIDX_WORK
+ kapt Libs.HILT_ANDROIDX_COMPILER
+ androidTestImplementation Libs.HILT_TESTING
+
+ /* ROOM */
+ implementation Libs.ROOM
+ kapt Libs.ROOM_COMPILER
+ implementation Libs.ROOM_COROUTINES
+
+ /* Navigation */
+ implementation Libs.NAVIGATION_FRAGMENT
+ implementation Libs.NAVIGATION_KTX
+
+ /* Support dependencies */
+ implementation Libs.ANDROIDX_ANNOTATION
+ implementation Libs.ANDROIDX_APPCOMPAT
+ implementation Libs.ANDROIDX_BROWSER
+ implementation Libs.ANDROIDX_CARDVIEW
+ implementation Libs.ANDROIDX_CONSTRAINT_LAYOUT
+ implementation Libs.ANDROIDX_DESIGN
+ implementation Libs.ANDROIDX_RECYCLERVIEW
+ implementation Libs.ANDROIDX_PALETTE
+ implementation Libs.PLAY_IN_APP_UPDATES
+
+ androidTestImplementation Libs.COMPOSE_UI_TEST
+}
\ No newline at end of file
diff --git a/apps/parent/proguard-rules.txt b/apps/parent/proguard-rules.txt
new file mode 100644
index 0000000000..925fea2093
--- /dev/null
+++ b/apps/parent/proguard-rules.txt
@@ -0,0 +1,250 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+# http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+# public *;
+#}
+
+-dontoptimize
+-verbose
+
+-dontpreverify
+-optimizations !code/simplification/arithmetic
+
+-keepattributes *Annotation*,Signature,EnclosingMethod,ElementList,Root,Annotation,InnerClasses,SourceFile,LineNumberTable
+
+# Android
+
+-keep public class * extends android.app.Activity
+-keep public class * extends android.app.Application
+-keep public class * extends android.app.Service
+-keep public class * extends android.content.BroadcastReceiver
+-keep public class * extends android.content.ContentProvider
+-keep public class * extends android.app.backup.BackupAgentHelper
+-keep public class * extends android.preference.Preference
+-keep public class * implements java.io.Serializable
+-keep public class * extends androidx.fragment.app.Fragment
+-keep public class * extends androidx.fragment.app.ListFragment
+-keep public class * extends android.os.AsyncTask
+
+-keep public class * extends android.view.View {
+ public (android.content.Context);
+ public (android.content.Context, android.util.AttributeSet);
+ public (android.content.Context, android.util.AttributeSet, int);
+ public void set*(...);
+}
+
+-keepclasseswithmembers class * {
+ public (android.content.Context, android.util.AttributeSet);
+}
+
+-keepclasseswithmembers class * {
+ public (android.content.Context, android.util.AttributeSet, int);
+}
+
+-keepclassmembers class * extends android.content.Context {
+ public void *(android.view.View);
+ public void *(android.view.MenuItem);
+}
+
+-keepclassmembers class * implements android.os.Parcelable {
+ static ** CREATOR;
+}
+
+-keepnames class * implements android.os.Parcelable {
+ public static final ** CREATOR;
+}
+
+-keepclassmembers class **.R$* {
+ public static ;
+}
+
+-keepclassmembers class * {
+ @android.webkit.JavascriptInterface ;
+}
+
+-keepclassmembers enum * {
+ public static **[] values();
+ public static ** valueOf(java.lang.String);
+}
+
+-keepclassmembers class * implements java.io.Serializable {
+ static final long serialVersionUID;
+ private static final java.io.ObjectStreamField[] serialPersistentFields;
+ private void writeObject(java.io.ObjectOutputStream);
+ private void readObject(java.io.ObjectInputStream);
+ java.lang.Object writeReplace();
+ java.lang.Object readResolve();
+}
+
+-keep class * extends java.util.ListResourceBundle {
+ protected Object[][] getContents();
+}
+
+-keep public class com.google.android.gms.common.internal.safeparcel.SafeParcelable {
+ public static final *** NULL;
+}
+
+-keepnames @com.google.android.gms.common.annotation.KeepName class *
+-keepclassmembernames class * {
+ @com.google.android.gms.common.annotation.KeepName *;
+}
+-dontwarn com.google.android.gms.**
+
+-dontwarn com.google.api.**
+-dontwarn android.net.http.**
+-keep class com.google.api.** { *; }
+-keep class android.net.http.** { *; }
+
+# Google
+
+-keep class com.google.appengine.** { *; }
+
+# Apache
+
+-dontwarn org.apache.**
+-keep class org.apache.http.** { *; }
+-keep class org.apache.james.mime4j.** { *; }
+
+# Amazon
+
+-keep class com.amazonaws.services.sqs.QueueUrlHandler { *; }
+-keep class com.amazonaws.javax.xml.transform.sax.* { public *; }
+-keep class com.amazonaws.javax.xml.stream.** { *; }
+-keep class com.amazonaws.services.**.model.*Exception* { *; }
+-keep class com.amazonaws.internal.** { *; }
+-keep class org.codehaus.** { *; }
+-keep class org.joda.convert.* { *; }
+-keepnames class com.fasterxml.jackson.** { *; }
+-keepnames class com.amazonaws.** { *; }
+
+-dontwarn com.amazonaws.auth.policy.conditions.S3ConditionFactory
+-dontwarn org.joda.time.**
+-dontwarn com.fasterxml.jackson.databind.**
+-dontwarn javax.xml.stream.events.**
+-dontwarn org.codehaus.jackson.**
+-dontwarn org.apache.commons.logging.impl.**
+-dontwarn org.apache.http.conn.scheme.**
+-dontwarn org.apache.http.annotation.**
+-dontwarn org.ietf.jgss.**
+-dontwarn org.w3c.dom.bootstrap.**
+
+-keep class org.ietf.** { *; }
+-keep interface org.ietf.** { *; }
+
+-dontwarn com.amazon.**
+-dontwarn com.amazonaws.**
+
+-keep class com.amazon.** { *; }
+-dontwarn org.apache.http.annotation.**
+-keep class com.amazonaws.** { *; }
+-keep class org.apache.commons.logging.** { *; }
+-keep class com.amazonaws.services.sqs.QueueUrlHandler { *; }
+-keep class com.amazonaws.javax.xml.transform.sax.* { public *; }
+-keep class com.amazonaws.javax.xml.stream.** { *; }
+-keep class com.amazonaws.services.**.model.*Exception* { *; }
+-keep class org.codehaus.** { *; }
+
+-dontwarn javax.xml.stream.events.**
+-dontwarn org.codehaus.jackson.**
+-dontwarn org.apache.commons.logging.impl.**
+-dontwarn org.apache.http.conn.scheme.**
+
+-keep class android.webkit.** { *; }
+
+# Retrofit
+
+-dontwarn retrofit2.**
+-dontwarn retrofit.**
+-dontwarn rx.**
+-dontwarn okio.**
+-dontwarn com.squareup.okhttp.*
+-dontwarn retrofit.appengine.UrlFetchClient
+-keep class com.google.gson.** { *; }
+-keep class com.google.inject.** { *; }
+-keep class javax.inject.** { *; }
+-keep class retrofit2.** { *; }
+-keep class retrofit.** { *; }
+-keepclasseswithmembers class * {
+ @retrofit.http.* ;
+}
+
+# Retrofit, OkHttp, Gson
+
+-keep class com.squareup.okhttp.** { *; }
+-keep interface com.squareup.okhttp.** { *; }
+-dontwarn com.squareup.okhttp.**
+-keep class sun.misc.Unsafe { *; }
+-dontwarn java.nio.file.*
+-dontwarn org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement
+-dontwarn okhttp3.**
+-keep class okhttp3.** { *; }
+
+# PSPDFKit
+-keep class com.pspdfkit.** { *; }
+-dontwarn com.pspdfkit.**
+-dontwarn sun.misc.**
+-dontwarn android.view.WindowInsets
+-dontwarn android.graphics.Insets
+-dontwarn edu.umd.cs.findbugs.annotations.SuppressWarnings
+-keepnames class io.reactivex.android.schedulers.AndroidSchedulers
+-keepnames class io.reactivex.Observable
+
+# RxJava
+-keep class rx.internal.util.unsafe.** { *; }
+
+# SimpleFramework.xml
+-dontwarn org.simpleframework.xml.stream.**
+-keep public class org.simpleframework.** { *; }
+-keep class org.simpleframework.xml.** { *; }
+-keep class org.simpleframework.xml.core.** { *; }
+-keep class org.simpleframework.xml.util.** { *; }
+-keep class javax.xml.stream.** { *; }
+
+-keepclassmembers class * {
+ @org.simpleframework.xml.* *;
+}
+
+# Instructure
+
+-keep public class com.instructure.** { *; }
+-keep public class instructure.** { *; }
+
+# androidsvg
+
+-dontwarn com.caverock.androidsvg.**
+-keep public class com.caverock.androidsvg.** { *; }
+
+# Greenrobot event bus
+-keep public class org.greenrobot.eventbus.** { *; }
+
+# Glide
+-dontwarn com.bumptech.glide.load.resource.bitmap.VideoDecoder
+-keep public class * extends com.bumptech.glide.AppGlideModule
+-keep public class * implements com.bumptech.glide.module.GlideModule
+-keep public enum com.bumptech.glide.load.ImageHeaderParser$** {
+ **[] $VALUES;
+ public *;
+}
+
+# afollestad material dialogs
+-dontwarn me.zhanghai.android.materialprogressbar.**
+
+-dontwarn com.sothree.slidinguppanel.**
+
+# Mobius
+-dontwarn org.slf4j.impl.StaticLoggerBinder
+-dontwarn org.slf4j.impl.StaticMDCBinder
+-dontwarn org.slf4j.impl.StaticMarkerBinder
+
+# Kotlin
+-dontwarn kotlinx.atomicfu.AtomicBoolean
+
+-keepattributes Exceptions, Signature, InnerClasses, LineNumberTable, SourceFile, EnclosingMethod
\ No newline at end of file
diff --git a/apps/parent/src/androidTest/java/com/instructure/parentapp/ui/compose/CoursesScreenTest.kt b/apps/parent/src/androidTest/java/com/instructure/parentapp/ui/compose/CoursesScreenTest.kt
new file mode 100644
index 0000000000..07772ed7b0
--- /dev/null
+++ b/apps/parent/src/androidTest/java/com/instructure/parentapp/ui/compose/CoursesScreenTest.kt
@@ -0,0 +1,128 @@
+/*
+ * Copyright (C) 2024 - present Instructure, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package com.instructure.parentapp.ui.compose
+
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.test.assertHasClickAction
+import androidx.compose.ui.test.assertIsDisplayed
+import androidx.compose.ui.test.junit4.createComposeRule
+import androidx.compose.ui.test.onNodeWithTag
+import androidx.compose.ui.test.onNodeWithText
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.instructure.espresso.assertTextColor
+import com.instructure.pandares.R
+import com.instructure.parentapp.features.courses.list.CourseListItemUiState
+import com.instructure.parentapp.features.courses.list.CoursesScreen
+import com.instructure.parentapp.features.courses.list.CoursesUiState
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+
+@RunWith(AndroidJUnit4::class)
+class CoursesScreenTest {
+
+ @get:Rule
+ val composeTestRule = createComposeRule()
+
+ @Test
+ fun assertEmptyContent() {
+ composeTestRule.setContent {
+ CoursesScreen(
+ uiState = CoursesUiState(
+ isLoading = false,
+ courseListItems = emptyList()
+ ),
+ actionHandler = {}
+ )
+ }
+
+ composeTestRule.onNodeWithText("No Courses")
+ .assertIsDisplayed()
+ composeTestRule.onNodeWithText("Your student’s courses might not be published yet.")
+ .assertIsDisplayed()
+ composeTestRule.onNodeWithTag(R.drawable.ic_panda_book.toString())
+ .assertIsDisplayed()
+ }
+
+ @Test
+ fun assertErrorContent() {
+ composeTestRule.setContent {
+ CoursesScreen(
+ uiState = CoursesUiState(
+ isLoading = false,
+ isError = true
+ ),
+ actionHandler = {}
+ )
+ }
+
+ composeTestRule.onNodeWithText("There was an error loading your student’s courses.")
+ .assertIsDisplayed()
+ composeTestRule.onNodeWithText("Retry")
+ .assertIsDisplayed()
+ .assertHasClickAction()
+ }
+
+ @Test
+ fun assertCourseContent() {
+ composeTestRule.setContent {
+ CoursesScreen(
+ uiState = CoursesUiState(
+ isLoading = false,
+ studentColor = android.graphics.Color.RED,
+ courseListItems = listOf(
+ CourseListItemUiState(
+ courseId = 1,
+ courseName = "Course 1",
+ courseCode = "C1",
+ grade = "A+"
+ )
+ )
+ ),
+ actionHandler = {}
+ )
+ }
+
+ composeTestRule.onNodeWithText("Course 1")
+ .assertIsDisplayed()
+ composeTestRule.onNodeWithText("C1")
+ .assertIsDisplayed()
+ composeTestRule.onNodeWithText("A+", useUnmergedTree = true)
+ .assertIsDisplayed()
+ .assertTextColor(Color(android.graphics.Color.RED))
+ composeTestRule.onNodeWithTag("courseListItem")
+ .assertIsDisplayed()
+ .assertHasClickAction()
+ }
+
+ @Test
+ fun assertLoadingContent() {
+ composeTestRule.setContent {
+ CoursesScreen(
+ uiState = CoursesUiState(
+ isLoading = true
+ ),
+ actionHandler = {}
+ )
+ }
+
+ composeTestRule.onNodeWithTag("pullRefreshIndicator")
+ .assertIsDisplayed()
+ }
+}
diff --git a/apps/parent/src/androidTest/java/com/instructure/parentapp/ui/compose/ManageStudentsScreenTest.kt b/apps/parent/src/androidTest/java/com/instructure/parentapp/ui/compose/ManageStudentsScreenTest.kt
new file mode 100644
index 0000000000..bb70b4e921
--- /dev/null
+++ b/apps/parent/src/androidTest/java/com/instructure/parentapp/ui/compose/ManageStudentsScreenTest.kt
@@ -0,0 +1,155 @@
+/*
+ * Copyright (C) 2024 - present Instructure, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package com.instructure.parentapp.ui.compose
+
+import androidx.compose.ui.test.assertHasClickAction
+import androidx.compose.ui.test.assertIsDisplayed
+import androidx.compose.ui.test.hasAnyChild
+import androidx.compose.ui.test.hasTestTag
+import androidx.compose.ui.test.hasText
+import androidx.compose.ui.test.junit4.createComposeRule
+import androidx.compose.ui.test.onNodeWithTag
+import androidx.compose.ui.test.onNodeWithText
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.instructure.pandares.R
+import com.instructure.pandautils.utils.ThemedColor
+import com.instructure.parentapp.features.managestudents.ColorPickerDialogUiState
+import com.instructure.parentapp.features.managestudents.ManageStudentsScreen
+import com.instructure.parentapp.features.managestudents.ManageStudentsUiState
+import com.instructure.parentapp.features.managestudents.StudentItemUiState
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+
+@RunWith(AndroidJUnit4::class)
+class ManageStudentsScreenTest {
+
+ @get:Rule
+ val composeTestRule = createComposeRule()
+
+ @Test
+ fun assertEmptyContent() {
+ composeTestRule.setContent {
+ ManageStudentsScreen(
+ uiState = ManageStudentsUiState(
+ isLoading = false,
+ studentListItems = emptyList()
+ ),
+ actionHandler = {},
+ navigationActionClick = {}
+ )
+ }
+
+ composeTestRule.onNodeWithText("You are not observing any students.")
+ .assertIsDisplayed()
+ composeTestRule.onNodeWithText("Retry")
+ .assertIsDisplayed()
+ .assertHasClickAction()
+ composeTestRule.onNodeWithTag(R.drawable.panda_manage_students.toString())
+ .assertIsDisplayed()
+ }
+
+ @Test
+ fun assertErrorContent() {
+ composeTestRule.setContent {
+ ManageStudentsScreen(
+ uiState = ManageStudentsUiState(
+ isLoadError = true,
+ studentListItems = emptyList()
+ ),
+ actionHandler = {},
+ navigationActionClick = {}
+ )
+ }
+
+ composeTestRule.onNodeWithText("There was an error loading your students.")
+ .assertIsDisplayed()
+ composeTestRule.onNodeWithText("Retry")
+ .assertIsDisplayed()
+ .assertHasClickAction()
+ }
+
+ @Test
+ fun assertStudentListContent() {
+ composeTestRule.setContent {
+ ManageStudentsScreen(
+ uiState = ManageStudentsUiState(
+ studentListItems = listOf(
+ StudentItemUiState(
+ studentId = 1,
+ studentName = "John Doe",
+ studentPronouns = "He/Him",
+ studentColor = ThemedColor(R.color.studentGreen)
+ ),
+ StudentItemUiState(
+ studentId = 2,
+ studentName = "Jane Doe",
+ studentColor = ThemedColor(R.color.studentPink)
+ )
+ )
+ ),
+ actionHandler = {},
+ navigationActionClick = {}
+ )
+ }
+
+ fun studentItemMatcher(name: String) = hasTestTag("studentListItem") and hasAnyChild(hasText(name))
+ composeTestRule.onNode(studentItemMatcher("John Doe (He/Him)"), true)
+ .assertIsDisplayed()
+ composeTestRule.onNode(studentItemMatcher("Jane Doe"), true)
+ .assertIsDisplayed()
+ }
+
+ @Test
+ fun assertColorPickerDialogError() {
+ composeTestRule.setContent {
+ ManageStudentsScreen(
+ uiState = ManageStudentsUiState(
+ studentListItems = listOf(
+ StudentItemUiState(
+ studentId = 1,
+ studentName = "John Doe",
+ studentColor = ThemedColor(R.color.studentGreen)
+ )
+ ),
+ colorPickerDialogUiState = ColorPickerDialogUiState(
+ showColorPickerDialog = true,
+ studentId = 1,
+ initialUserColor = null,
+ userColors = emptyList(),
+ isSavingColorError = true
+ )
+ ),
+ actionHandler = {},
+ navigationActionClick = {}
+ )
+ }
+
+ composeTestRule.onNodeWithText("Select Student Color")
+ .assertIsDisplayed()
+ composeTestRule.onNodeWithText("An error occurred while saving your selection. Please try again.")
+ .assertIsDisplayed()
+ composeTestRule.onNodeWithText("Cancel")
+ .assertIsDisplayed()
+ .assertHasClickAction()
+ composeTestRule.onNodeWithText("OK")
+ .assertIsDisplayed()
+ .assertHasClickAction()
+ }
+}
diff --git a/apps/parent/src/androidTest/java/com/instructure/parentapp/ui/compose/NotAParentScreenTest.kt b/apps/parent/src/androidTest/java/com/instructure/parentapp/ui/compose/NotAParentScreenTest.kt
new file mode 100644
index 0000000000..70de846d41
--- /dev/null
+++ b/apps/parent/src/androidTest/java/com/instructure/parentapp/ui/compose/NotAParentScreenTest.kt
@@ -0,0 +1,79 @@
+/*
+ * Copyright (C) 2024 - 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 .
+ *
+ */
+
+package com.instructure.parentapp.ui.compose
+
+import androidx.compose.ui.test.assertHasClickAction
+import androidx.compose.ui.test.assertIsDisplayed
+import androidx.compose.ui.test.assertIsNotDisplayed
+import androidx.compose.ui.test.junit4.createComposeRule
+import androidx.compose.ui.test.onNodeWithText
+import androidx.compose.ui.test.performClick
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.instructure.parentapp.features.notaparent.NotAParentScreen
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+
+@RunWith(AndroidJUnit4::class)
+class NotAParentScreenTest {
+
+ @get:Rule
+ val composeTestRule = createComposeRule()
+
+ @Test
+ fun assertContent() {
+ composeTestRule.setContent {
+ NotAParentScreen(
+ returnToLoginClick = {},
+ onStudentClick = {},
+ onTeacherClick = {}
+ )
+ }
+
+ composeTestRule.onNodeWithText("Not a parent?").assertIsDisplayed()
+ composeTestRule.onNodeWithText("We couldn't find any students associated with your account").assertIsDisplayed()
+ composeTestRule.onNodeWithText("Return to login")
+ .assertIsDisplayed()
+ .assertHasClickAction()
+ composeTestRule.onNodeWithText("Are you a student or teacher?")
+ .assertIsDisplayed()
+ .assertHasClickAction()
+ composeTestRule.onNodeWithText("STUDENT")
+ .assertIsNotDisplayed()
+ }
+
+ @Test
+ fun assertAppOptions() {
+ composeTestRule.setContent {
+ NotAParentScreen(
+ returnToLoginClick = {},
+ onStudentClick = {},
+ onTeacherClick = {}
+ )
+ }
+
+ composeTestRule.onNodeWithText("Are you a student or teacher?").performClick()
+ composeTestRule.onNodeWithText("STUDENT")
+ .assertIsDisplayed()
+ .assertHasClickAction()
+ composeTestRule.onNodeWithText("TEACHER")
+ .assertIsDisplayed()
+ .assertHasClickAction()
+ }
+}
diff --git a/apps/parent/src/androidTest/java/com/instructure/parentapp/ui/compose/alerts/AlertsListItemTest.kt b/apps/parent/src/androidTest/java/com/instructure/parentapp/ui/compose/alerts/AlertsListItemTest.kt
new file mode 100644
index 0000000000..252a86d226
--- /dev/null
+++ b/apps/parent/src/androidTest/java/com/instructure/parentapp/ui/compose/alerts/AlertsListItemTest.kt
@@ -0,0 +1,250 @@
+/*
+ * Copyright (C) 2024 - present Instructure, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.instructure.parentapp.ui.compose.alerts
+
+import android.graphics.Color
+import androidx.compose.ui.test.assertHasClickAction
+import androidx.compose.ui.test.assertIsDisplayed
+import androidx.compose.ui.test.assertIsNotDisplayed
+import androidx.compose.ui.test.junit4.createComposeRule
+import androidx.compose.ui.test.onNodeWithTag
+import androidx.compose.ui.test.onNodeWithText
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.instructure.canvasapi2.models.AlertType
+import com.instructure.parentapp.features.alerts.list.AlertsItemUiState
+import com.instructure.parentapp.features.alerts.list.AlertsListItem
+import com.instructure.parentapp.utils.hasDrawable
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import java.util.Date
+import com.instructure.parentapp.R
+import java.text.SimpleDateFormat
+import java.util.Locale
+
+@RunWith(AndroidJUnit4::class)
+class AlertsListItemTest {
+
+ @get:Rule
+ val composeTestRule = createComposeRule()
+
+ @Test
+ fun assertAssignmentMissing() {
+ composeTestRule.setContent {
+ AlertsListItem(alert = AlertsItemUiState(
+ alertId = 1L,
+ title = "Assignment Missing title",
+ alertType = AlertType.ASSIGNMENT_MISSING,
+ date = Date(),
+ observerAlertThreshold = null,
+ lockedForUser = false,
+ unread = true,
+ htmlUrl = null
+ ), userColor = Color.BLUE, actionHandler = {})
+ }
+
+ composeTestRule.waitForIdle()
+
+ composeTestRule.onNodeWithText("Assignment missing").assertIsDisplayed()
+ composeTestRule.onNodeWithText("Assignment Missing title").assertIsDisplayed()
+ composeTestRule.onNode(hasDrawable(R.drawable.ic_warning)).assertIsDisplayed()
+ composeTestRule.onNodeWithText(parseDate(Date())).assertIsDisplayed()
+ composeTestRule.onNodeWithTag("alertItem").assertHasClickAction()
+ }
+
+ @Test
+ fun assertAssignmentGradeHigh() {
+ composeTestRule.setContent {
+ AlertsListItem(alert = AlertsItemUiState(
+ alertId = 1L,
+ title = "Assignment Grade High title",
+ alertType = AlertType.ASSIGNMENT_GRADE_HIGH,
+ date = Date(),
+ observerAlertThreshold = "90%",
+ lockedForUser = false,
+ unread = true,
+ htmlUrl = null
+ ), userColor = Color.BLUE, actionHandler = {})
+ }
+
+ composeTestRule.onNodeWithText("Assignment Grade Above 90%").assertIsDisplayed()
+ composeTestRule.onNodeWithText("Assignment Grade High title").assertIsDisplayed()
+ composeTestRule.onNode(hasDrawable(R.drawable.ic_info)).assertIsDisplayed()
+ composeTestRule.onNodeWithText(parseDate(Date())).assertIsDisplayed()
+ composeTestRule.onNodeWithTag("alertItem").assertHasClickAction()
+ }
+
+ @Test
+ fun assertAssignmentGradeLow() {
+ composeTestRule.setContent {
+ AlertsListItem(alert = AlertsItemUiState(
+ alertId = 1L,
+ title = "Assignment Grade Low title",
+ alertType = AlertType.ASSIGNMENT_GRADE_LOW,
+ date = Date(),
+ observerAlertThreshold = "60%",
+ lockedForUser = false,
+ unread = true,
+ htmlUrl = null
+ ), userColor = Color.BLUE, actionHandler = {})
+ }
+
+ composeTestRule.onNodeWithText("Assignment Grade Below 60%").assertIsDisplayed()
+ composeTestRule.onNodeWithText("Assignment Grade Low title").assertIsDisplayed()
+ composeTestRule.onNode(hasDrawable(R.drawable.ic_warning)).assertIsDisplayed()
+ composeTestRule.onNodeWithText(parseDate(Date())).assertIsDisplayed()
+ composeTestRule.onNodeWithTag("alertItem").assertHasClickAction()
+ }
+
+ @Test
+ fun assertCourseGradeHigh() {
+ composeTestRule.setContent {
+ AlertsListItem(alert = AlertsItemUiState(
+ alertId = 1L,
+ title = "Course Grade High title",
+ alertType = AlertType.COURSE_GRADE_HIGH,
+ date = Date(),
+ observerAlertThreshold = "90%",
+ lockedForUser = false,
+ unread = true,
+ htmlUrl = null
+ ), userColor = Color.BLUE, actionHandler = {})
+ }
+
+ composeTestRule.onNodeWithText("Course Grade Above 90%").assertIsDisplayed()
+ composeTestRule.onNodeWithText("Course Grade High title").assertIsDisplayed()
+ composeTestRule.onNode(hasDrawable(R.drawable.ic_info)).assertIsDisplayed()
+ composeTestRule.onNodeWithText(parseDate(Date())).assertIsDisplayed()
+ composeTestRule.onNodeWithTag("alertItem").assertHasClickAction()
+ }
+
+ @Test
+ fun assertCourseGradeLow() {
+ composeTestRule.setContent {
+ AlertsListItem(alert = AlertsItemUiState(
+ alertId = 1L,
+ title = "Course Grade Low title",
+ alertType = AlertType.COURSE_GRADE_LOW,
+ date = Date(),
+ observerAlertThreshold = "60%",
+ lockedForUser = false,
+ unread = true,
+ htmlUrl = null
+ ), userColor = Color.BLUE, actionHandler = {})
+ }
+
+ composeTestRule.onNodeWithText("Course Grade Below 60%").assertIsDisplayed()
+ composeTestRule.onNodeWithText("Course Grade Low title").assertIsDisplayed()
+ composeTestRule.onNode(hasDrawable(R.drawable.ic_warning)).assertIsDisplayed()
+ composeTestRule.onNodeWithText(parseDate(Date())).assertIsDisplayed()
+ composeTestRule.onNodeWithTag("alertItem").assertHasClickAction()
+ }
+
+ @Test
+ fun assertCourseAnnouncement() {
+ composeTestRule.setContent {
+ AlertsListItem(alert = AlertsItemUiState(
+ alertId = 1L,
+ title = "Course Announcement title",
+ alertType = AlertType.COURSE_ANNOUNCEMENT,
+ date = Date(),
+ observerAlertThreshold = null,
+ lockedForUser = false,
+ unread = true,
+ htmlUrl = null
+ ), userColor = Color.BLUE, actionHandler = {})
+ }
+
+ composeTestRule.onNodeWithText("Course Announcement").assertIsDisplayed()
+ composeTestRule.onNodeWithText("Course Announcement title").assertIsDisplayed()
+ composeTestRule.onNode(hasDrawable(R.drawable.ic_info)).assertIsDisplayed()
+ composeTestRule.onNodeWithText(parseDate(Date())).assertIsDisplayed()
+ composeTestRule.onNodeWithTag("alertItem").assertHasClickAction()
+ }
+
+ @Test
+ fun assertInstitutionAnnouncement() {
+ composeTestRule.setContent {
+ AlertsListItem(alert = AlertsItemUiState(
+ alertId = 1L,
+ title = "Institution Announcement title",
+ alertType = AlertType.INSTITUTION_ANNOUNCEMENT,
+ date = Date(),
+ observerAlertThreshold = null,
+ lockedForUser = false,
+ unread = true,
+ htmlUrl = null
+ ), userColor = Color.BLUE, actionHandler = {})
+ }
+
+ composeTestRule.onNodeWithText("Institution Announcement").assertIsDisplayed()
+ composeTestRule.onNodeWithText("Institution Announcement title").assertIsDisplayed()
+ composeTestRule.onNode(hasDrawable(R.drawable.ic_info)).assertIsDisplayed()
+ composeTestRule.onNodeWithText(parseDate(Date())).assertIsDisplayed()
+ composeTestRule.onNodeWithTag("alertItem").assertHasClickAction()
+ }
+
+ @Test
+ fun assertLockedForUser() {
+ composeTestRule.setContent {
+ AlertsListItem(alert = AlertsItemUiState(
+ alertId = 1L,
+ title = "Locked for User title",
+ alertType = AlertType.ASSIGNMENT_MISSING,
+ date = Date(),
+ observerAlertThreshold = null,
+ lockedForUser = true,
+ unread = true,
+ htmlUrl = null
+ ), userColor = Color.BLUE, actionHandler = {})
+ }
+
+ composeTestRule.onNodeWithText("Assignment missing").assertIsDisplayed()
+ composeTestRule.onNodeWithText("Locked for User title").assertIsDisplayed()
+ composeTestRule.onNode(hasDrawable(R.drawable.ic_lock_lined)).assertIsDisplayed()
+ composeTestRule.onNodeWithText(parseDate(Date())).assertIsDisplayed()
+ composeTestRule.onNodeWithTag("alertItem").assertHasClickAction()
+ }
+
+ @Test
+ fun assertRead() {
+ composeTestRule.setContent {
+ AlertsListItem(alert = AlertsItemUiState(
+ alertId = 1L,
+ title = "Institution Announcement title",
+ alertType = AlertType.INSTITUTION_ANNOUNCEMENT,
+ date = Date(),
+ observerAlertThreshold = null,
+ lockedForUser = false,
+ unread = false,
+ htmlUrl = null
+ ), userColor = Color.BLUE, actionHandler = {})
+ }
+
+ composeTestRule.onNodeWithText("Institution Announcement").assertIsDisplayed()
+ composeTestRule.onNodeWithText("Institution Announcement title").assertIsDisplayed()
+ composeTestRule.onNode(hasDrawable(R.drawable.ic_info)).assertIsDisplayed()
+ composeTestRule.onNodeWithText(parseDate(Date())).assertIsDisplayed()
+ composeTestRule.onNodeWithTag("alertItem").assertHasClickAction()
+ composeTestRule.onNodeWithTag("unreadIndicator").assertIsNotDisplayed()
+ }
+
+ private fun parseDate(date: Date): String {
+ val dateFormat = SimpleDateFormat("MMM d, yyyy", Locale.getDefault())
+ val timeFormat = SimpleDateFormat("h:mm a", Locale.getDefault())
+ return "${dateFormat.format(date)} at ${timeFormat.format(date)}"
+ }
+}
\ No newline at end of file
diff --git a/apps/parent/src/androidTest/java/com/instructure/parentapp/ui/compose/alerts/AlertsScreenTest.kt b/apps/parent/src/androidTest/java/com/instructure/parentapp/ui/compose/alerts/AlertsScreenTest.kt
new file mode 100644
index 0000000000..3f2586ed59
--- /dev/null
+++ b/apps/parent/src/androidTest/java/com/instructure/parentapp/ui/compose/alerts/AlertsScreenTest.kt
@@ -0,0 +1,224 @@
+/*
+ * Copyright (C) 2024 - present Instructure, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.instructure.parentapp.ui.compose.alerts
+
+import android.graphics.Color
+import androidx.compose.material.ExperimentalMaterialApi
+import androidx.compose.ui.test.assertHasClickAction
+import androidx.compose.ui.test.assertIsDisplayed
+import androidx.compose.ui.test.hasAnyDescendant
+import androidx.compose.ui.test.hasTestTag
+import androidx.compose.ui.test.hasText
+import androidx.compose.ui.test.junit4.createComposeRule
+import androidx.compose.ui.test.onNodeWithTag
+import androidx.compose.ui.test.onNodeWithText
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.instructure.canvasapi2.models.AlertType
+import com.instructure.parentapp.features.alerts.list.AlertsItemUiState
+import com.instructure.parentapp.features.alerts.list.AlertsScreen
+import com.instructure.parentapp.features.alerts.list.AlertsUiState
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import java.text.SimpleDateFormat
+import java.time.Instant
+import java.util.Date
+import java.util.Locale
+
+@ExperimentalMaterialApi
+@RunWith(AndroidJUnit4::class)
+class AlertsScreenTest {
+
+ @get:Rule
+ val composeTestRule = createComposeRule()
+
+ @Test
+ fun assertError() {
+ composeTestRule.setContent {
+ AlertsScreen(uiState = AlertsUiState(
+ alerts = emptyList(),
+ isLoading = false,
+ isError = true,
+ isRefreshing = false,
+ studentColor = Color.BLUE,
+ ), actionHandler = {})
+ }
+
+
+ composeTestRule.onNodeWithText("There was an error loading your student’s alerts.")
+ .assertIsDisplayed()
+ composeTestRule.onNodeWithText("Retry").assertHasClickAction().assertIsDisplayed()
+ }
+
+ @Test
+ fun assertLoading() {
+ composeTestRule.setContent {
+ AlertsScreen(uiState = AlertsUiState(
+ alerts = emptyList(),
+ isLoading = true,
+ isError = false,
+ isRefreshing = false,
+ studentColor = Color.BLUE,
+ ), actionHandler = {})
+ }
+
+ composeTestRule.onNodeWithTag("loading").assertIsDisplayed()
+ }
+
+ @Test
+ fun assertEmpty() {
+ composeTestRule.setContent {
+ AlertsScreen(uiState = AlertsUiState(
+ alerts = emptyList(),
+ isLoading = false,
+ isError = false,
+ isRefreshing = false,
+ studentColor = Color.BLUE,
+ ), actionHandler = {})
+ }
+
+ composeTestRule.onNodeWithText("No Alerts").assertIsDisplayed()
+ composeTestRule.onNodeWithText("There's nothing to be notified of yet.").assertIsDisplayed()
+ }
+
+ @Test
+ fun assertRefreshing() {
+ composeTestRule.setContent {
+ AlertsScreen(uiState = AlertsUiState(
+ alerts = emptyList(),
+ isLoading = false,
+ isError = false,
+ isRefreshing = true,
+ studentColor = Color.BLUE,
+ ), actionHandler = {})
+ }
+
+ composeTestRule.onNodeWithTag("pullRefreshIndicator").assertIsDisplayed()
+ }
+
+ @Test
+ fun assertContent() {
+ val items = listOf(
+ AlertsItemUiState(
+ alertId = 1,
+ title = "Alert 1",
+ alertType = AlertType.ASSIGNMENT_GRADE_LOW,
+ date = Date.from(Instant.parse("2023-09-15T09:02:00Z")),
+ observerAlertThreshold = "20%",
+ lockedForUser = false,
+ unread = false,
+ htmlUrl = null
+ ),
+ AlertsItemUiState(
+ alertId = 2,
+ title = "Alert 2",
+ alertType = AlertType.ASSIGNMENT_GRADE_HIGH,
+ date = Date.from(Instant.parse("2023-09-16T09:02:00Z")),
+ observerAlertThreshold = "80%",
+ lockedForUser = false,
+ unread = true,
+ htmlUrl = null
+ ),
+ AlertsItemUiState(
+ alertId = 3,
+ title = "Alert 3",
+ alertType = AlertType.COURSE_GRADE_LOW,
+ date = Date.from(Instant.parse("2023-09-17T09:02:00Z")),
+ observerAlertThreshold = "20%",
+ lockedForUser = false,
+ unread = false,
+ htmlUrl = null
+ ),
+ AlertsItemUiState(
+ alertId = 4,
+ title = "Alert 4",
+ alertType = AlertType.COURSE_GRADE_HIGH,
+ date = Date.from(Instant.parse("2023-09-18T09:02:00Z")),
+ observerAlertThreshold = "50%",
+ lockedForUser = false,
+ unread = true,
+ htmlUrl = null
+ ),
+ AlertsItemUiState(
+ alertId = 5,
+ title = "Alert 5",
+ alertType = AlertType.ASSIGNMENT_MISSING,
+ date = Date.from(Instant.parse("2023-09-19T09:02:00Z")),
+ observerAlertThreshold = null,
+ lockedForUser = false,
+ unread = false,
+ htmlUrl = null
+ ),
+ AlertsItemUiState(
+ alertId = 6,
+ title = "Alert 6",
+ alertType = AlertType.COURSE_ANNOUNCEMENT,
+ date = Date.from(Instant.parse("2023-09-20T09:02:00Z")),
+ observerAlertThreshold = null,
+ lockedForUser = false,
+ unread = true,
+ htmlUrl = null
+ ),
+ AlertsItemUiState(
+ alertId = 7,
+ title = "Alert 7",
+ alertType = AlertType.INSTITUTION_ANNOUNCEMENT,
+ date = Date.from(Instant.parse("2023-09-21T09:02:00Z")),
+ observerAlertThreshold = null,
+ lockedForUser = false,
+ unread = false,
+ htmlUrl = null
+ )
+ )
+
+ composeTestRule.setContent {
+ AlertsScreen(uiState = AlertsUiState(
+ alerts = items,
+ isLoading = false,
+ isError = false,
+ isRefreshing = false,
+ studentColor = Color.BLUE,
+ ), actionHandler = {})
+ }
+
+ items.forEach {
+ composeTestRule.onNodeWithText(it.title).assertIsDisplayed()
+ composeTestRule.onNodeWithText(parseAlertType(it.alertType, it.observerAlertThreshold)).assertIsDisplayed()
+ composeTestRule.onNodeWithText(parseDate(it.date!!)).assertIsDisplayed()
+ composeTestRule.onNode(hasAnyDescendant(hasText(it.title)).and(hasTestTag("alertItem")), useUnmergedTree = true).assertHasClickAction()
+ }
+ }
+
+ private fun parseDate(date: Date): String {
+ val dateFormat = SimpleDateFormat("MMM d", Locale.getDefault())
+ val timeFormat = SimpleDateFormat("h:mm a", Locale.getDefault())
+ return "${dateFormat.format(date)} at ${timeFormat.format(date)}"
+ }
+
+ private fun parseAlertType(alertType: AlertType, threshold: String?): String {
+ return when(alertType) {
+ AlertType.ASSIGNMENT_GRADE_LOW -> "Assignment Grade Below $threshold"
+ AlertType.ASSIGNMENT_GRADE_HIGH -> "Assignment Grade Above $threshold"
+ AlertType.COURSE_GRADE_LOW -> "Course Grade Below $threshold"
+ AlertType.COURSE_GRADE_HIGH -> "Course Grade Above $threshold"
+ AlertType.ASSIGNMENT_MISSING -> "Assignment missing"
+ AlertType.COURSE_ANNOUNCEMENT -> "Course Announcement"
+ AlertType.INSTITUTION_ANNOUNCEMENT -> "Institution Announcement"
+ else -> "Unknown"
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/apps/parent/src/androidTest/java/com/instructure/parentapp/ui/espresso/ParentHiltTestApplication.kt b/apps/parent/src/androidTest/java/com/instructure/parentapp/ui/espresso/ParentHiltTestApplication.kt
new file mode 100644
index 0000000000..133f99ea69
--- /dev/null
+++ b/apps/parent/src/androidTest/java/com/instructure/parentapp/ui/espresso/ParentHiltTestApplication.kt
@@ -0,0 +1,23 @@
+/*
+ * Copyright (C) 2024 - present Instructure, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package com.instructure.parentapp.ui.espresso
+
+import dagger.hilt.android.testing.CustomTestApplication
+
+@CustomTestApplication(TestAppManager::class)
+interface ParentHiltTestApplication
\ No newline at end of file
diff --git a/apps/student/src/main/java/com/instructure/student/db/Db.kt b/apps/parent/src/androidTest/java/com/instructure/parentapp/ui/espresso/ParentHiltTestRunner.kt
similarity index 51%
rename from apps/student/src/main/java/com/instructure/student/db/Db.kt
rename to apps/parent/src/androidTest/java/com/instructure/parentapp/ui/espresso/ParentHiltTestRunner.kt
index 6881833765..f1d1d18169 100644
--- a/apps/student/src/main/java/com/instructure/student/db/Db.kt
+++ b/apps/parent/src/androidTest/java/com/instructure/parentapp/ui/espresso/ParentHiltTestRunner.kt
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2019 - present Instructure, Inc.
+ * Copyright (C) 2024 - present Instructure, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,29 +14,16 @@
* limitations under the License.
*
*/
-package com.instructure.student.db
-import com.squareup.sqldelight.db.SqlDriver
+package com.instructure.parentapp.ui.espresso
-object Db {
- private var driverRef: SqlDriver? = null
- private var dbRef: StudentDb? = null
+import android.app.Application
+import android.content.Context
+import com.instructure.canvas.espresso.CanvasRunner
- val ready: Boolean
- get() = driverRef != null
+class ParentHiltTestRunner : CanvasRunner() {
- fun dbSetup(driver: SqlDriver) {
- val db = createQueryWrapper(driver)
- driverRef = driver
- dbRef = db
+ override fun newApplication(cl: ClassLoader?, className: String?, context: Context?): Application {
+ return super.newApplication(cl, ParentHiltTestApplication_Application::class.java.name, context)
}
-
- internal fun dbClear() {
- driverRef!!.close()
- dbRef = null
- driverRef = null
- }
-
- val instance: StudentDb
- get() = dbRef!!
-}
\ No newline at end of file
+}
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/room/MigrationUtils.kt b/apps/parent/src/androidTest/java/com/instructure/parentapp/ui/espresso/TestAppManager.kt
similarity index 58%
rename from libs/pandautils/src/main/java/com/instructure/pandautils/room/MigrationUtils.kt
rename to apps/parent/src/androidTest/java/com/instructure/parentapp/ui/espresso/TestAppManager.kt
index 73b60cf4e5..76c05c44d5 100644
--- a/libs/pandautils/src/main/java/com/instructure/pandautils/room/MigrationUtils.kt
+++ b/apps/parent/src/androidTest/java/com/instructure/parentapp/ui/espresso/TestAppManager.kt
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2023 - present Instructure, Inc.
+ * Copyright (C) 2024 - present Instructure, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -15,15 +15,16 @@
*
*/
-package com.instructure.pandautils.room
+package com.instructure.parentapp.ui.espresso
-import androidx.room.migration.Migration
-import androidx.sqlite.db.SupportSQLiteDatabase
+import androidx.work.WorkerFactory
+import com.instructure.parentapp.util.BaseAppManager
-fun createMigration(from: Int, to: Int, migrationBlock: (SupportSQLiteDatabase) -> Unit): Migration {
- return object : Migration(from, to) {
- override fun migrate(database: SupportSQLiteDatabase) {
- migrationBlock(database)
- }
+open class TestAppManager : BaseAppManager() {
+
+ var workerFactory: WorkerFactory? = null
+
+ override fun getWorkManagerFactory(): WorkerFactory {
+ return workerFactory ?: WorkerFactory.getDefaultWorkerFactory()
}
}
\ No newline at end of file
diff --git a/apps/parent/src/androidTest/java/com/instructure/parentapp/ui/interaction/AlertsInteractionTest.kt b/apps/parent/src/androidTest/java/com/instructure/parentapp/ui/interaction/AlertsInteractionTest.kt
new file mode 100644
index 0000000000..7a2d099067
--- /dev/null
+++ b/apps/parent/src/androidTest/java/com/instructure/parentapp/ui/interaction/AlertsInteractionTest.kt
@@ -0,0 +1,173 @@
+/*
+ * Copyright (C) 2024 - present Instructure, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */ package com.instructure.parentapp.ui.interaction
+
+import androidx.compose.ui.platform.ComposeView
+import androidx.test.espresso.matcher.ViewMatchers
+import com.google.android.apps.common.testing.accessibility.framework.AccessibilityCheckResultUtils
+import com.google.android.apps.common.testing.accessibility.framework.checks.SpeakableTextPresentCheck
+import com.instructure.canvas.espresso.mockCanvas.MockCanvas
+import com.instructure.canvas.espresso.mockCanvas.addObserverAlert
+import com.instructure.canvas.espresso.mockCanvas.init
+import com.instructure.canvasapi2.models.AlertType
+import com.instructure.canvasapi2.models.AlertWorkflowState
+import com.instructure.parentapp.utils.ParentComposeTest
+import com.instructure.parentapp.utils.tokenLogin
+import dagger.hilt.android.testing.HiltAndroidTest
+import org.hamcrest.Matchers
+import org.junit.Test
+import java.util.Date
+
+@HiltAndroidTest
+class AlertsInteractionTest : ParentComposeTest() {
+
+ @Test
+ fun dismissAlert() {
+ val data = initData()
+ goToAlerts(data)
+
+ val student = data.students.first()
+ val observer = data.parents.first()
+ val course = data.courses.values.first()
+
+ val alert = data.addObserverAlert(
+ observer,
+ student,
+ course,
+ AlertType.ASSIGNMENT_MISSING,
+ AlertWorkflowState.UNREAD,
+ Date(),
+ null,
+ false
+ )
+
+ alertsPage.refresh()
+
+ alertsPage.assertAlertItemDisplayed(alert.title)
+
+ composeTestRule.waitForIdle()
+ alertsPage.dismissAlert(alert.title)
+
+ composeTestRule.waitForIdle()
+ alertsPage.assertSnackbar("Alert dismissed")
+ alertsPage.assertAlertItemNotDisplayed(alert.title)
+ alertsPage.refresh()
+ alertsPage.assertAlertItemNotDisplayed(alert.title)
+ }
+
+ @Test
+ fun undoDismiss() {
+ val data = initData()
+ goToAlerts(data)
+
+ val student = data.students.first()
+ val observer = data.parents.first()
+ val course = data.courses.values.first()
+
+ val alert = data.addObserverAlert(
+ observer,
+ student,
+ course,
+ AlertType.ASSIGNMENT_MISSING,
+ AlertWorkflowState.UNREAD,
+ Date(),
+ null,
+ false
+ )
+
+ alertsPage.refresh()
+
+ alertsPage.assertAlertItemDisplayed(alert.title)
+
+ composeTestRule.waitForIdle()
+ alertsPage.dismissAlert(alert.title)
+
+ composeTestRule.waitForIdle()
+ alertsPage.assertSnackbar("Alert dismissed")
+ alertsPage.clickUndo()
+ alertsPage.assertAlertItemDisplayed(alert.title)
+
+ alertsPage.refresh()
+ alertsPage.assertAlertItemDisplayed(alert.title)
+ }
+
+ @Test
+ fun emptyAlerts() {
+ val data = initData()
+ goToAlerts(data)
+
+ alertsPage.assertEmptyState()
+ }
+
+ @Test
+ fun openAlert() {
+ val data = initData()
+ goToAlerts(data)
+
+ val student = data.students.first()
+ val observer = data.parents.first()
+ val course = data.courses.values.first()
+
+ val alert = data.addObserverAlert(
+ observer,
+ student,
+ course,
+ AlertType.ASSIGNMENT_MISSING,
+ AlertWorkflowState.UNREAD,
+ Date(),
+ null,
+ false
+ )
+
+ alertsPage.refresh()
+
+ composeTestRule.waitForIdle()
+ alertsPage.assertAlertItemDisplayed(alert.title)
+ alertsPage.assertAlertUnread(alert.title)
+ alertsPage.clickOnAlert(alert.title)
+
+ //TODO check that we route to the correct screen when ready
+ }
+
+ private fun initData(): MockCanvas {
+ return MockCanvas.init(studentCount = 1, parentCount = 1, courseCount = 1)
+ }
+
+ private fun goToAlerts(data: MockCanvas) {
+ val parent = data.parents.first()
+ val token = data.tokenFor(parent)!!
+ tokenLogin(data.domain, token, parent)
+
+ dashboardPage.clickAlerts()
+ }
+
+ override fun enableAndConfigureAccessibilityChecks() {
+ extraAccessibilitySupressions = Matchers.allOf(
+ AccessibilityCheckResultUtils.matchesCheck(
+ SpeakableTextPresentCheck::class.java
+ ),
+ AccessibilityCheckResultUtils.matchesViews(
+ ViewMatchers.withParent(
+ ViewMatchers.withClassName(
+ Matchers.equalTo(ComposeView::class.java.name)
+ )
+ )
+ )
+ )
+
+ super.enableAndConfigureAccessibilityChecks()
+ }
+
+}
\ No newline at end of file
diff --git a/apps/parent/src/androidTest/java/com/instructure/parentapp/ui/interaction/CoursesInteractionTest.kt b/apps/parent/src/androidTest/java/com/instructure/parentapp/ui/interaction/CoursesInteractionTest.kt
new file mode 100644
index 0000000000..b03bded687
--- /dev/null
+++ b/apps/parent/src/androidTest/java/com/instructure/parentapp/ui/interaction/CoursesInteractionTest.kt
@@ -0,0 +1,123 @@
+/*
+ * Copyright (C) 2024 - 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 .
+ *
+ */
+
+package com.instructure.parentapp.ui.interaction
+
+import com.instructure.canvas.espresso.mockCanvas.MockCanvas
+import com.instructure.canvas.espresso.mockCanvas.addCourseWithEnrollment
+import com.instructure.canvas.espresso.mockCanvas.addEnrollment
+import com.instructure.canvas.espresso.mockCanvas.init
+import com.instructure.canvasapi2.models.Enrollment
+import com.instructure.parentapp.ui.pages.CoursesPage
+import com.instructure.parentapp.utils.ParentComposeTest
+import com.instructure.parentapp.utils.tokenLogin
+import dagger.hilt.android.testing.HiltAndroidTest
+import org.junit.Test
+
+
+@HiltAndroidTest
+class CoursesInteractionTest : ParentComposeTest() {
+
+ private val coursesPage = CoursesPage(composeTestRule)
+
+ @Test
+ fun testNoCourseDisplayed() {
+ val data = initData()
+ data.courses.clear()
+
+ goToCourses(data)
+
+ composeTestRule.waitForIdle()
+ coursesPage.assertEmptyContentDisplayed()
+ }
+
+ @Test
+ fun testCourseDisplayed() {
+ val data = initData()
+
+ goToCourses(data)
+
+ composeTestRule.waitForIdle()
+ coursesPage.assertCourseItemDisplayed(data.courses.values.first())
+ }
+
+ @Test
+ fun testShowGradeIfThereIsACurrentGrade() {
+ val data = initData()
+ val course = data.courses.values.find {
+ val enrollment = it.enrollments!!.first()
+ !enrollment.currentGrade.isNullOrEmpty() && enrollment.currentScore != null
+ }
+ val enrollment = course!!.enrollments!!.first()
+
+ goToCourses(data)
+
+ composeTestRule.waitForIdle()
+ coursesPage.assertGradeTextDisplayed(course.name, "${enrollment.currentGrade} ${enrollment.currentScore}%")
+ }
+
+ @Test
+ fun testShowNoGradeIfThereIsNoCurrentGrade() {
+ val data = initData()
+ val firstStudent = data.students.first()
+ val courseWithoutGrade = data.addCourseWithEnrollment(firstStudent, Enrollment.EnrollmentType.Student, score = null, grade = null)
+ data.addEnrollment(data.parents.first(), courseWithoutGrade, Enrollment.EnrollmentType.Observer, firstStudent)
+
+ goToCourses(data)
+
+ composeTestRule.waitForIdle()
+ coursesPage.assertGradeTextDisplayed(courseWithoutGrade.name, "No Grade")
+ }
+
+ @Test
+ fun testShowGradeOnlyIfQuantitativeDataIsRestricted() {
+ val data = initData()
+ val firstStudent = data.students.first()
+ val course = data.addCourseWithEnrollment(firstStudent, Enrollment.EnrollmentType.Student, restrictQuantitativeData = true)
+ data.addEnrollment(data.parents.first(), course, Enrollment.EnrollmentType.Observer, firstStudent)
+
+ goToCourses(data)
+
+ composeTestRule.waitForIdle()
+ coursesPage.assertGradeTextIsNotDisplayed(course.name)
+ }
+
+ @Test
+ fun testCourseTapped() {
+ val data = initData()
+
+ goToCourses(data)
+
+ composeTestRule.waitForIdle()
+ coursesPage.tapCurseItem(data.courses.values.first().name)
+ // TODO Assert course details when implemented
+ }
+
+ private fun initData(): MockCanvas {
+ return MockCanvas.init(
+ parentCount = 1,
+ studentCount = 1,
+ courseCount = 3
+ )
+ }
+
+ private fun goToCourses(data: MockCanvas) {
+ val parent = data.parents.first()
+ val token = data.tokenFor(parent)!!
+ tokenLogin(data.domain, token, parent)
+ }
+}
diff --git a/apps/parent/src/androidTest/java/com/instructure/parentapp/ui/interaction/DashboardInteractionTest.kt b/apps/parent/src/androidTest/java/com/instructure/parentapp/ui/interaction/DashboardInteractionTest.kt
new file mode 100644
index 0000000000..264ce4131e
--- /dev/null
+++ b/apps/parent/src/androidTest/java/com/instructure/parentapp/ui/interaction/DashboardInteractionTest.kt
@@ -0,0 +1,126 @@
+/*
+ * Copyright (C) 2024 - 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 .
+ *
+ */
+
+package com.instructure.parentapp.ui.interaction
+
+import androidx.compose.ui.platform.ComposeView
+import androidx.test.espresso.assertion.ViewAssertions
+import androidx.test.espresso.matcher.ViewMatchers
+import com.google.android.apps.common.testing.accessibility.framework.AccessibilityCheckResultUtils
+import com.google.android.apps.common.testing.accessibility.framework.checks.SpeakableTextPresentCheck
+import com.instructure.canvas.espresso.mockCanvas.MockCanvas
+import com.instructure.canvas.espresso.mockCanvas.init
+import com.instructure.canvas.espresso.waitForMatcherWithSleeps
+import com.instructure.loginapi.login.R
+import com.instructure.parentapp.utils.ParentTest
+import com.instructure.parentapp.utils.tokenLogin
+import dagger.hilt.android.testing.HiltAndroidTest
+import org.hamcrest.Matchers
+import org.junit.Test
+
+
+@HiltAndroidTest
+class DashboardInteractionTest : ParentTest() {
+
+ @Test
+ fun testObserverData() {
+ val data = initData()
+
+ goToDashboard(data)
+
+ dashboardPage.openNavigationDrawer()
+ dashboardPage.assertObserverData(data.parents.first())
+ }
+
+ @Test
+ fun testChangeStudent() {
+ val data = initData()
+
+ goToDashboard(data)
+
+ val students = data.students.sortedBy { it.sortableName }
+ dashboardPage.assertSelectedStudent(students.first().shortName!!)
+ dashboardPage.openStudentSelector()
+ dashboardPage.selectStudent(data.students.last().shortName!!)
+ dashboardPage.assertSelectedStudent(students.last().shortName!!)
+ }
+
+ @Test
+ fun testLogout() {
+ val data = initData()
+
+ goToDashboard(data)
+
+ dashboardPage.openNavigationDrawer()
+ dashboardPage.tapLogout()
+ dashboardPage.assertLogoutDialog()
+ dashboardPage.tapOk()
+ waitForMatcherWithSleeps(ViewMatchers.withId(R.id.canvasLogo), 20000).check(
+ ViewAssertions.matches(
+ ViewMatchers.isDisplayed()
+ )
+ )
+ }
+
+ @Test
+ fun testSwitchUsers() {
+ val data = initData()
+
+ goToDashboard(data)
+
+ dashboardPage.openNavigationDrawer()
+ dashboardPage.tapSwitchUsers()
+ waitForMatcherWithSleeps(ViewMatchers.withId(R.id.canvasLogo), 20000).check(
+ ViewAssertions.matches(
+ ViewMatchers.isDisplayed()
+ )
+ )
+ }
+
+ private fun initData(): MockCanvas {
+ return MockCanvas.init(
+ parentCount = 1,
+ studentCount = 2,
+ courseCount = 1
+ )
+ }
+
+ private fun goToDashboard(data: MockCanvas) {
+ val parent = data.parents.first()
+ val token = data.tokenFor(parent)!!
+ tokenLogin(data.domain, token, parent)
+ }
+
+ override fun displaysPageObjects() = Unit
+
+ override fun enableAndConfigureAccessibilityChecks() {
+ extraAccessibilitySupressions = Matchers.allOf(
+ AccessibilityCheckResultUtils.matchesCheck(
+ SpeakableTextPresentCheck::class.java
+ ),
+ AccessibilityCheckResultUtils.matchesViews(
+ ViewMatchers.withParent(
+ ViewMatchers.withClassName(
+ Matchers.equalTo(ComposeView::class.java.name)
+ )
+ )
+ )
+ )
+
+ super.enableAndConfigureAccessibilityChecks()
+ }
+}
diff --git a/apps/parent/src/androidTest/java/com/instructure/parentapp/ui/interaction/ManageStudentsInteractionTest.kt b/apps/parent/src/androidTest/java/com/instructure/parentapp/ui/interaction/ManageStudentsInteractionTest.kt
new file mode 100644
index 0000000000..9e5b444aec
--- /dev/null
+++ b/apps/parent/src/androidTest/java/com/instructure/parentapp/ui/interaction/ManageStudentsInteractionTest.kt
@@ -0,0 +1,105 @@
+/*
+ * Copyright (C) 2024 - present Instructure, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package com.instructure.parentapp.ui.interaction
+
+import androidx.compose.ui.platform.ComposeView
+import androidx.test.espresso.matcher.ViewMatchers
+import com.google.android.apps.common.testing.accessibility.framework.AccessibilityCheckResultUtils
+import com.google.android.apps.common.testing.accessibility.framework.checks.SpeakableTextPresentCheck
+import com.instructure.canvas.espresso.mockCanvas.MockCanvas
+import com.instructure.canvas.espresso.mockCanvas.init
+import com.instructure.parentapp.ui.pages.ManageStudentsPage
+import com.instructure.parentapp.utils.ParentComposeTest
+import com.instructure.parentapp.utils.tokenLogin
+import dagger.hilt.android.testing.HiltAndroidTest
+import org.hamcrest.Matchers
+import org.junit.Test
+
+
+@HiltAndroidTest
+class ManageStudentsInteractionTest : ParentComposeTest() {
+
+ private val manageStudentsPage = ManageStudentsPage(composeTestRule)
+
+ @Test
+ fun testStudentsDisplayed() {
+ val data = initData()
+
+ goToManageStudents(data)
+
+ composeTestRule.waitForIdle()
+ data.students.forEach {
+ manageStudentsPage.assertStudentItemDisplayed(it)
+ }
+ }
+
+ @Test
+ fun testStudentTapped() {
+ val data = initData()
+
+ goToManageStudents(data)
+
+ composeTestRule.waitForIdle()
+ manageStudentsPage.tapStudent(data.students.first().shortName!!)
+ // TODO Assert alert settings when implemented
+ }
+
+ @Test
+ fun testColorPickerDialog() {
+ val data = initData()
+
+ goToManageStudents(data)
+
+ composeTestRule.waitForIdle()
+ manageStudentsPage.tapStudentColor(data.students.first().shortName!!)
+ manageStudentsPage.assertColorPickerDialogDisplayed()
+ }
+
+ private fun initData(): MockCanvas {
+ return MockCanvas.init(
+ parentCount = 1,
+ studentCount = 3,
+ courseCount = 1
+ )
+ }
+
+ private fun goToManageStudents(data: MockCanvas) {
+ val parent = data.parents.first()
+ val token = data.tokenFor(parent)!!
+ tokenLogin(data.domain, token, parent)
+ dashboardPage.openNavigationDrawer()
+ dashboardPage.tapManageStudents()
+ }
+
+ override fun enableAndConfigureAccessibilityChecks() {
+ extraAccessibilitySupressions = Matchers.allOf(
+ AccessibilityCheckResultUtils.matchesCheck(
+ SpeakableTextPresentCheck::class.java
+ ),
+ AccessibilityCheckResultUtils.matchesViews(
+ ViewMatchers.withParent(
+ ViewMatchers.withClassName(
+ Matchers.equalTo(ComposeView::class.java.name)
+ )
+ )
+ )
+ )
+
+ super.enableAndConfigureAccessibilityChecks()
+ }
+}
\ No newline at end of file
diff --git a/apps/parent/src/androidTest/java/com/instructure/parentapp/ui/interaction/NotAParentInteractionsTest.kt b/apps/parent/src/androidTest/java/com/instructure/parentapp/ui/interaction/NotAParentInteractionsTest.kt
new file mode 100644
index 0000000000..0bccedad38
--- /dev/null
+++ b/apps/parent/src/androidTest/java/com/instructure/parentapp/ui/interaction/NotAParentInteractionsTest.kt
@@ -0,0 +1,120 @@
+/*
+ * Copyright (C) 2024 - 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 .
+ *
+ */
+
+package com.instructure.parentapp.ui.interaction
+
+import android.content.Intent
+import androidx.test.espresso.assertion.ViewAssertions
+import androidx.test.espresso.intent.Intents
+import androidx.test.espresso.intent.matcher.IntentMatchers
+import androidx.test.espresso.matcher.ViewMatchers
+import com.instructure.canvas.espresso.mockCanvas.MockCanvas
+import com.instructure.canvas.espresso.mockCanvas.addCourse
+import com.instructure.canvas.espresso.mockCanvas.addEnrollment
+import com.instructure.canvas.espresso.mockCanvas.addUser
+import com.instructure.canvas.espresso.mockCanvas.init
+import com.instructure.canvas.espresso.mockCanvas.updateUserEnrollments
+import com.instructure.canvas.espresso.waitForMatcherWithSleeps
+import com.instructure.canvasapi2.models.Enrollment
+import com.instructure.loginapi.login.R
+import com.instructure.parentapp.ui.pages.NotAParentPage
+import com.instructure.parentapp.utils.ParentComposeTest
+import com.instructure.parentapp.utils.tokenLogin
+import dagger.hilt.android.testing.HiltAndroidTest
+import org.hamcrest.CoreMatchers
+import org.junit.Test
+
+
+@HiltAndroidTest
+class NotAParentInteractionsTest : ParentComposeTest() {
+
+ private val notAParentPage = NotAParentPage(composeTestRule)
+
+ @Test
+ fun testLogout() {
+ val data = initData()
+ goToNotAParentScreen(data)
+
+ notAParentPage.tapReturnToLogin()
+ waitForMatcherWithSleeps(ViewMatchers.withId(R.id.canvasLogo), 20000).check(
+ ViewAssertions.matches(
+ ViewMatchers.isDisplayed()
+ )
+ )
+ }
+
+ @Test
+ fun testTapStudent() {
+ val data = initData()
+ goToNotAParentScreen(data)
+
+ notAParentPage.expandAppOptions()
+ Intents.init()
+ try {
+ val expectedIntent = CoreMatchers.allOf(
+ IntentMatchers.hasAction(Intent.ACTION_VIEW),
+ CoreMatchers.anyOf(
+ // Could be either of these, depending on whether the play store app is installed
+ IntentMatchers.hasData("market://details?id=com.instructure.candroid"),
+ IntentMatchers.hasData("https://play.google.com/store/apps/details?id=com.instructure.candroid")
+ )
+ )
+ notAParentPage.tapApp("STUDENT")
+ Intents.intended(expectedIntent)
+ } finally {
+ Intents.release()
+ }
+ }
+
+ @Test
+ fun testTapTeacher() {
+ val data = initData()
+ goToNotAParentScreen(data)
+
+ notAParentPage.expandAppOptions()
+ Intents.init()
+ try {
+ val expectedIntent = CoreMatchers.allOf(
+ IntentMatchers.hasAction(Intent.ACTION_VIEW),
+ CoreMatchers.anyOf(
+ // Could be either of these, depending on whether the play store app is installed
+ IntentMatchers.hasData("market://details?id=com.instructure.teacher"),
+ IntentMatchers.hasData("https://play.google.com/store/apps/details?id=com.instructure.teacher")
+ )
+ )
+ notAParentPage.tapApp("TEACHER")
+ Intents.intended(expectedIntent)
+ } finally {
+ Intents.release()
+ }
+ }
+
+ private fun initData(): MockCanvas {
+ val data = MockCanvas.init()
+ val parent = data.addUser()
+ val course = data.addCourse()
+ data.addEnrollment(parent, course, Enrollment.EnrollmentType.Observer)
+ data.updateUserEnrollments()
+ return data
+ }
+
+ private fun goToNotAParentScreen(data: MockCanvas) {
+ val parent = data.parents.first()
+ val token = data.tokenFor(parent)!!
+ tokenLogin(data.domain, token, parent, false)
+ }
+}
diff --git a/apps/parent/src/androidTest/java/com/instructure/parentapp/ui/interaction/ParentCalendarInteractionTest.kt b/apps/parent/src/androidTest/java/com/instructure/parentapp/ui/interaction/ParentCalendarInteractionTest.kt
new file mode 100644
index 0000000000..c1db9f2719
--- /dev/null
+++ b/apps/parent/src/androidTest/java/com/instructure/parentapp/ui/interaction/ParentCalendarInteractionTest.kt
@@ -0,0 +1,95 @@
+/*
+ * Copyright (C) 2024 - present Instructure, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.instructure.parentapp.ui.interaction
+
+import androidx.compose.ui.platform.ComposeView
+import androidx.test.espresso.matcher.ViewMatchers
+import com.google.android.apps.common.testing.accessibility.framework.AccessibilityCheckResultUtils
+import com.google.android.apps.common.testing.accessibility.framework.checks.SpeakableTextPresentCheck
+import com.instructure.canvas.espresso.common.interaction.CalendarInteractionTest
+import com.instructure.canvas.espresso.mockCanvas.MockCanvas
+import com.instructure.canvas.espresso.mockCanvas.init
+import com.instructure.canvasapi2.models.User
+import com.instructure.parentapp.BuildConfig
+import com.instructure.parentapp.features.login.LoginActivity
+import com.instructure.parentapp.ui.pages.DashboardPage
+import com.instructure.parentapp.utils.ParentActivityTestRule
+import com.instructure.parentapp.utils.tokenLogin
+import dagger.hilt.android.testing.HiltAndroidTest
+import org.hamcrest.Matchers
+
+@HiltAndroidTest
+class ParentCalendarInteractionTest : CalendarInteractionTest() {
+
+ override val isTesting = BuildConfig.IS_TESTING
+
+ override val activityRule = ParentActivityTestRule(LoginActivity::class.java)
+
+ private val dashboardPage = DashboardPage()
+
+ override fun goToCalendar(data: MockCanvas) {
+ val parent = data.parents.first()
+ val token = data.tokenFor(parent)!!
+ tokenLogin(data.domain, token, parent)
+
+ dashboardPage.clickCalendar()
+
+ composeTestRule.waitForIdle()
+ }
+
+ override fun initData(): MockCanvas {
+ return MockCanvas.init(
+ parentCount = 1,
+ studentCount = 1,
+ teacherCount = 1,
+ courseCount = 2,
+ favoriteCourseCount = 1
+ )
+ }
+
+ override fun getLoggedInUser(): User {
+ return MockCanvas.data.parents[0]
+ }
+
+ override fun assertAssignmentDetailsTitle(title: String) {
+ // TODO No assertion here, this should be implemented when the Assignment Details page is created
+ }
+
+ override fun assertDiscussionDetailsTitle(title: String) {
+ // TODO No assertion here, this should be implemented when the Assignment Details page is created
+ }
+
+ override fun clickTodayButton() {
+ dashboardPage.clickTodayButton()
+ }
+
+ override fun enableAndConfigureAccessibilityChecks() {
+ extraAccessibilitySupressions = Matchers.allOf(
+ AccessibilityCheckResultUtils.matchesCheck(
+ SpeakableTextPresentCheck::class.java
+ ),
+ AccessibilityCheckResultUtils.matchesViews(
+ ViewMatchers.withParent(
+ ViewMatchers.withClassName(
+ Matchers.equalTo(ComposeView::class.java.name)
+ )
+ )
+ )
+ )
+
+ super.enableAndConfigureAccessibilityChecks()
+ }
+}
\ No newline at end of file
diff --git a/apps/parent/src/androidTest/java/com/instructure/parentapp/ui/interaction/ParentCreateUpdateEventInteractionTest.kt b/apps/parent/src/androidTest/java/com/instructure/parentapp/ui/interaction/ParentCreateUpdateEventInteractionTest.kt
new file mode 100644
index 0000000000..09365aedb6
--- /dev/null
+++ b/apps/parent/src/androidTest/java/com/instructure/parentapp/ui/interaction/ParentCreateUpdateEventInteractionTest.kt
@@ -0,0 +1,98 @@
+/*
+ * Copyright (C) 2024 - present Instructure, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.instructure.parentapp.ui.interaction
+
+import androidx.compose.ui.platform.ComposeView
+import androidx.test.espresso.matcher.ViewMatchers
+import com.google.android.apps.common.testing.accessibility.framework.AccessibilityCheckResultUtils
+import com.google.android.apps.common.testing.accessibility.framework.checks.SpeakableTextPresentCheck
+import com.instructure.canvas.espresso.common.interaction.CreateUpdateEventInteractionTest
+import com.instructure.canvas.espresso.mockCanvas.MockCanvas
+import com.instructure.canvas.espresso.mockCanvas.init
+import com.instructure.canvasapi2.models.User
+import com.instructure.parentapp.BuildConfig
+import com.instructure.parentapp.features.login.LoginActivity
+import com.instructure.parentapp.ui.pages.DashboardPage
+import com.instructure.parentapp.utils.ParentActivityTestRule
+import com.instructure.parentapp.utils.tokenLogin
+import dagger.hilt.android.testing.HiltAndroidTest
+import org.hamcrest.Matchers
+
+@HiltAndroidTest
+class ParentCreateUpdateEventInteractionTest : CreateUpdateEventInteractionTest() {
+
+ override val isTesting = BuildConfig.IS_TESTING
+
+ override val activityRule = ParentActivityTestRule(LoginActivity::class.java)
+
+ private val dashboardPage = DashboardPage()
+
+ override fun goToCreateEvent(data: MockCanvas) {
+ val parent = data.parents.first()
+ val token = data.tokenFor(parent)!!
+ tokenLogin(data.domain, token, parent)
+
+ dashboardPage.clickCalendar()
+
+ composeTestRule.waitForIdle()
+ calendarScreenPage.clickOnAddButton()
+ calendarScreenPage.clickAddEvent()
+ }
+
+ override fun goToEditEvent(data: MockCanvas) {
+ val parent = data.parents.first()
+ val token = data.tokenFor(parent)!!
+ tokenLogin(data.domain, token, parent)
+
+ dashboardPage.clickCalendar()
+
+ val event = data.userCalendarEvents[parent.id]!!.first()
+
+ composeTestRule.waitForIdle()
+ calendarScreenPage.clickOnItem(event.title!!)
+ calendarEventDetailsPage.clickOverflowMenu()
+ calendarEventDetailsPage.clickEditMenu()
+ }
+
+ override fun initData(): MockCanvas {
+ return MockCanvas.init(
+ parentCount = 1,
+ studentCount = 1,
+ teacherCount = 0,
+ courseCount = 1,
+ favoriteCourseCount = 1
+ )
+ }
+
+ override fun enableAndConfigureAccessibilityChecks() {
+ extraAccessibilitySupressions = Matchers.allOf(
+ AccessibilityCheckResultUtils.matchesCheck(
+ SpeakableTextPresentCheck::class.java
+ ),
+ AccessibilityCheckResultUtils.matchesViews(
+ ViewMatchers.withParent(
+ ViewMatchers.withClassName(
+ Matchers.equalTo(ComposeView::class.java.name)
+ )
+ )
+ )
+ )
+
+ super.enableAndConfigureAccessibilityChecks()
+ }
+
+ override fun getLoggedInUser(): User = MockCanvas.data.parents[0]
+}
diff --git a/apps/parent/src/androidTest/java/com/instructure/parentapp/ui/interaction/ParentCreateUpdateToDoInteractionTest.kt b/apps/parent/src/androidTest/java/com/instructure/parentapp/ui/interaction/ParentCreateUpdateToDoInteractionTest.kt
new file mode 100644
index 0000000000..a40c6cc6fd
--- /dev/null
+++ b/apps/parent/src/androidTest/java/com/instructure/parentapp/ui/interaction/ParentCreateUpdateToDoInteractionTest.kt
@@ -0,0 +1,100 @@
+/*
+ * Copyright (C) 2024 - present Instructure, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.instructure.parentapp.ui.interaction
+
+import androidx.compose.ui.platform.ComposeView
+import androidx.test.espresso.matcher.ViewMatchers
+import com.google.android.apps.common.testing.accessibility.framework.AccessibilityCheckResultUtils
+import com.google.android.apps.common.testing.accessibility.framework.checks.SpeakableTextPresentCheck
+import com.instructure.canvas.espresso.common.interaction.CreateUpdateToDoInteractionTest
+import com.instructure.canvas.espresso.mockCanvas.MockCanvas
+import com.instructure.canvas.espresso.mockCanvas.init
+import com.instructure.canvasapi2.models.User
+import com.instructure.parentapp.BuildConfig
+import com.instructure.parentapp.features.login.LoginActivity
+import com.instructure.parentapp.ui.pages.DashboardPage
+import com.instructure.parentapp.utils.ParentActivityTestRule
+import com.instructure.parentapp.utils.tokenLogin
+import dagger.hilt.android.testing.HiltAndroidTest
+import org.hamcrest.Matchers
+
+@HiltAndroidTest
+class ParentCreateUpdateToDoInteractionTest : CreateUpdateToDoInteractionTest() {
+
+ override val isTesting = BuildConfig.IS_TESTING
+
+ override val activityRule = ParentActivityTestRule(LoginActivity::class.java)
+
+ private val dashboardPage = DashboardPage()
+
+ override fun goToCreateToDo(data: MockCanvas) {
+ val parent = data.parents.first()
+ val token = data.tokenFor(parent)!!
+ tokenLogin(data.domain, token, parent)
+
+ dashboardPage.clickCalendar()
+
+ composeTestRule.waitForIdle()
+ calendarScreenPage.clickOnAddButton()
+ calendarScreenPage.clickAddTodo()
+ }
+
+ override fun goToEditToDo(data: MockCanvas) {
+ val parent = data.parents.first()
+ val token = data.tokenFor(parent)!!
+ tokenLogin(data.domain, token, parent)
+
+ dashboardPage.clickCalendar()
+
+ val todo = data.todos.first()
+
+ composeTestRule.waitForIdle()
+ calendarScreenPage.clickOnItem(todo.plannable.title)
+ calendarToDoDetailsPage.clickToolbarMenu()
+ calendarToDoDetailsPage.clickEditMenu()
+ }
+
+ override fun initData(): MockCanvas {
+ val data = MockCanvas.init(
+ parentCount = 1,
+ studentCount = 1,
+ teacherCount = 0,
+ courseCount = 1,
+ favoriteCourseCount = 1
+ )
+ data.currentUser = data.parents.first()
+ return data
+ }
+
+ override fun getLoggedInUser(): User = MockCanvas.data.parents[0]
+
+ override fun enableAndConfigureAccessibilityChecks() {
+ extraAccessibilitySupressions = Matchers.allOf(
+ AccessibilityCheckResultUtils.matchesCheck(
+ SpeakableTextPresentCheck::class.java
+ ),
+ AccessibilityCheckResultUtils.matchesViews(
+ ViewMatchers.withParent(
+ ViewMatchers.withClassName(
+ Matchers.equalTo(ComposeView::class.java.name)
+ )
+ )
+ )
+ )
+
+ super.enableAndConfigureAccessibilityChecks()
+ }
+}
diff --git a/apps/parent/src/androidTest/java/com/instructure/parentapp/ui/interaction/ParentEventDetailsInteractionTest.kt b/apps/parent/src/androidTest/java/com/instructure/parentapp/ui/interaction/ParentEventDetailsInteractionTest.kt
new file mode 100644
index 0000000000..e685a3520c
--- /dev/null
+++ b/apps/parent/src/androidTest/java/com/instructure/parentapp/ui/interaction/ParentEventDetailsInteractionTest.kt
@@ -0,0 +1,81 @@
+/*
+ * Copyright (C) 2024 - present Instructure, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.instructure.parentapp.ui.interaction
+
+import androidx.compose.ui.platform.ComposeView
+import androidx.test.espresso.matcher.ViewMatchers
+import com.google.android.apps.common.testing.accessibility.framework.AccessibilityCheckResultUtils
+import com.google.android.apps.common.testing.accessibility.framework.checks.SpeakableTextPresentCheck
+import com.instructure.canvas.espresso.common.interaction.EventDetailsInteractionTest
+import com.instructure.canvas.espresso.mockCanvas.MockCanvas
+import com.instructure.canvas.espresso.mockCanvas.init
+import com.instructure.parentapp.BuildConfig
+import com.instructure.parentapp.features.login.LoginActivity
+import com.instructure.parentapp.ui.pages.DashboardPage
+import com.instructure.parentapp.utils.ParentActivityTestRule
+import com.instructure.parentapp.utils.tokenLogin
+import dagger.hilt.android.testing.HiltAndroidTest
+import org.hamcrest.Matchers
+
+@HiltAndroidTest
+class ParentEventDetailsInteractionTest : EventDetailsInteractionTest() {
+
+ override val isTesting = BuildConfig.IS_TESTING
+
+ override val activityRule = ParentActivityTestRule(LoginActivity::class.java)
+
+ private val dashboardPage = DashboardPage()
+
+ override fun goToEventDetails(data: MockCanvas) {
+ val parent = data.parents.first()
+ val token = data.tokenFor(parent)!!
+ tokenLogin(data.domain, token, parent)
+
+ dashboardPage.clickCalendar()
+
+ val event = data.courseCalendarEvents.values.first().first()
+
+ composeTestRule.waitForIdle()
+ calendarScreenPage.clickOnItem(event.title!!)
+ }
+
+ override fun initData(): MockCanvas {
+ return MockCanvas.init(
+ parentCount = 1,
+ studentCount = 1,
+ teacherCount = 1,
+ courseCount = 1,
+ favoriteCourseCount = 1
+ )
+ }
+
+ override fun enableAndConfigureAccessibilityChecks() {
+ extraAccessibilitySupressions = Matchers.allOf(
+ AccessibilityCheckResultUtils.matchesCheck(
+ SpeakableTextPresentCheck::class.java
+ ),
+ AccessibilityCheckResultUtils.matchesViews(
+ ViewMatchers.withParent(
+ ViewMatchers.withClassName(
+ Matchers.equalTo(ComposeView::class.java.name)
+ )
+ )
+ )
+ )
+
+ super.enableAndConfigureAccessibilityChecks()
+ }
+}
diff --git a/apps/parent/src/androidTest/java/com/instructure/parentapp/ui/interaction/ParentInboxListInteractionTest.kt b/apps/parent/src/androidTest/java/com/instructure/parentapp/ui/interaction/ParentInboxListInteractionTest.kt
new file mode 100644
index 0000000000..b1d5a9aa9c
--- /dev/null
+++ b/apps/parent/src/androidTest/java/com/instructure/parentapp/ui/interaction/ParentInboxListInteractionTest.kt
@@ -0,0 +1,106 @@
+/*
+ * Copyright (C) 2024 - present Instructure, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.instructure.parentapp.ui.interaction
+
+import androidx.compose.ui.platform.ComposeView
+import androidx.test.espresso.matcher.ViewMatchers
+import com.google.android.apps.common.testing.accessibility.framework.AccessibilityCheckResultUtils
+import com.google.android.apps.common.testing.accessibility.framework.checks.SpeakableTextPresentCheck
+import com.instructure.canvas.espresso.common.interaction.InboxListInteractionTest
+import com.instructure.canvas.espresso.mockCanvas.MockCanvas
+import com.instructure.canvas.espresso.mockCanvas.addCoursePermissions
+import com.instructure.canvas.espresso.mockCanvas.addRecipientsToCourse
+import com.instructure.canvas.espresso.mockCanvas.init
+import com.instructure.canvasapi2.models.CanvasContextPermission
+import com.instructure.canvasapi2.models.User
+import com.instructure.parentapp.BuildConfig
+import com.instructure.parentapp.features.login.LoginActivity
+import com.instructure.parentapp.ui.pages.DashboardPage
+import com.instructure.parentapp.util.ParentPrefs
+import com.instructure.parentapp.utils.ParentActivityTestRule
+import com.instructure.parentapp.utils.tokenLogin
+import dagger.hilt.android.testing.HiltAndroidTest
+import org.hamcrest.Matchers
+import org.junit.Before
+
+@HiltAndroidTest
+class ParentInboxListInteractionTest : InboxListInteractionTest() {
+ override val isTesting = BuildConfig.IS_TESTING
+
+ override val activityRule = ParentActivityTestRule(LoginActivity::class.java)
+
+ private val dashboardPage = DashboardPage()
+
+ override fun goToInbox(data: MockCanvas) {
+ val parent = data.parents.first()
+ val token = data.tokenFor(parent)!!
+ tokenLogin(data.domain, token, parent)
+
+ dashboardPage.assertPageObjects()
+ dashboardPage.openNavigationDrawer()
+ dashboardPage.clickInbox()
+ }
+
+ override fun createInitialData(courseCount: Int): MockCanvas {
+ val data = MockCanvas.init(
+ parentCount = 1,
+ studentCount = 1,
+ courseCount = courseCount,
+ teacherCount = 1,
+ favoriteCourseCount = courseCount
+ )
+
+ val course1 = data.courses.values.first()
+
+ data.addCoursePermissions(
+ course1.id,
+ CanvasContextPermission(send_messages_all = true, send_messages = true)
+ )
+
+ data.addRecipientsToCourse(
+ course = course1,
+ students = data.students,
+ teachers = data.teachers
+ )
+
+ return data
+ }
+
+ override fun getLoggedInUser(): User {
+ return MockCanvas.data.parents.first()
+ }
+
+ override fun getOtherUser(): User {
+ return MockCanvas.data.teachers.first()
+ }
+
+ override fun enableAndConfigureAccessibilityChecks() {
+ extraAccessibilitySupressions = Matchers.allOf(
+ AccessibilityCheckResultUtils.matchesCheck(
+ SpeakableTextPresentCheck::class.java
+ ),
+ AccessibilityCheckResultUtils.matchesViews(
+ ViewMatchers.withParent(
+ ViewMatchers.withClassName(
+ Matchers.equalTo(ComposeView::class.java.name)
+ )
+ )
+ )
+ )
+
+ super.enableAndConfigureAccessibilityChecks()
+ }
+}
\ No newline at end of file
diff --git a/apps/parent/src/androidTest/java/com/instructure/parentapp/ui/interaction/ParentSettingsInteractionTest.kt b/apps/parent/src/androidTest/java/com/instructure/parentapp/ui/interaction/ParentSettingsInteractionTest.kt
new file mode 100644
index 0000000000..e83142be59
--- /dev/null
+++ b/apps/parent/src/androidTest/java/com/instructure/parentapp/ui/interaction/ParentSettingsInteractionTest.kt
@@ -0,0 +1,74 @@
+/*
+ * Copyright (C) 2024 - present Instructure, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.instructure.parentapp.ui.interaction
+
+import androidx.compose.ui.platform.ComposeView
+import androidx.test.espresso.matcher.ViewMatchers
+import com.google.android.apps.common.testing.accessibility.framework.AccessibilityCheckResultUtils
+import com.google.android.apps.common.testing.accessibility.framework.checks.SpeakableTextPresentCheck
+import com.instructure.canvas.espresso.common.interaction.SettingsInteractionTest
+import com.instructure.canvas.espresso.mockCanvas.MockCanvas
+import com.instructure.canvas.espresso.mockCanvas.init
+import com.instructure.parentapp.BuildConfig
+import com.instructure.parentapp.features.login.LoginActivity
+import com.instructure.parentapp.ui.pages.DashboardPage
+import com.instructure.parentapp.utils.ParentActivityTestRule
+import com.instructure.parentapp.utils.tokenLogin
+import dagger.hilt.android.testing.HiltAndroidTest
+import org.hamcrest.Matchers
+
+@HiltAndroidTest
+class ParentSettingsInteractionTest : SettingsInteractionTest() {
+
+ override val isTesting = BuildConfig.IS_TESTING
+
+ override val activityRule = ParentActivityTestRule(LoginActivity::class.java)
+
+ private val dashboardPage = DashboardPage()
+
+ override fun initData(): MockCanvas {
+ return MockCanvas.init(
+ parentCount = 1,
+ studentCount = 3,
+ courseCount = 1
+ )
+ }
+
+ override fun goToSettings(data: MockCanvas) {
+ val parent = data.parents.first()
+ val token = data.tokenFor(parent)!!
+ tokenLogin(data.domain, token, parent)
+ dashboardPage.openNavigationDrawer()
+ dashboardPage.tapSettings()
+ }
+
+ override fun enableAndConfigureAccessibilityChecks() {
+ extraAccessibilitySupressions = Matchers.allOf(
+ AccessibilityCheckResultUtils.matchesCheck(
+ SpeakableTextPresentCheck::class.java
+ ),
+ AccessibilityCheckResultUtils.matchesViews(
+ ViewMatchers.withParent(
+ ViewMatchers.withClassName(
+ Matchers.equalTo(ComposeView::class.java.name)
+ )
+ )
+ )
+ )
+
+ super.enableAndConfigureAccessibilityChecks()
+ }
+}
\ No newline at end of file
diff --git a/apps/parent/src/androidTest/java/com/instructure/parentapp/ui/interaction/ParentToDoDetailsInteractionTest.kt b/apps/parent/src/androidTest/java/com/instructure/parentapp/ui/interaction/ParentToDoDetailsInteractionTest.kt
new file mode 100644
index 0000000000..2a374c8ad9
--- /dev/null
+++ b/apps/parent/src/androidTest/java/com/instructure/parentapp/ui/interaction/ParentToDoDetailsInteractionTest.kt
@@ -0,0 +1,89 @@
+/*
+ * Copyright (C) 2024 - present Instructure, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.instructure.parentapp.ui.interaction
+
+import android.app.Activity
+import androidx.compose.ui.platform.ComposeView
+import androidx.test.espresso.matcher.ViewMatchers
+import com.google.android.apps.common.testing.accessibility.framework.AccessibilityCheckResultUtils
+import com.google.android.apps.common.testing.accessibility.framework.checks.SpeakableTextPresentCheck
+import com.instructure.canvas.espresso.common.interaction.ToDoDetailsInteractionTest
+import com.instructure.canvas.espresso.mockCanvas.MockCanvas
+import com.instructure.canvas.espresso.mockCanvas.init
+import com.instructure.canvasapi2.models.User
+import com.instructure.espresso.InstructureActivityTestRule
+import com.instructure.parentapp.BuildConfig
+import com.instructure.parentapp.features.login.LoginActivity
+import com.instructure.parentapp.ui.pages.DashboardPage
+import com.instructure.parentapp.utils.ParentActivityTestRule
+import com.instructure.parentapp.utils.tokenLogin
+import dagger.hilt.android.testing.HiltAndroidTest
+import org.hamcrest.Matchers
+
+@HiltAndroidTest
+class ParentToDoDetailsInteractionTest : ToDoDetailsInteractionTest() {
+
+ override val isTesting = BuildConfig.IS_TESTING
+
+ override val activityRule: InstructureActivityTestRule =
+ ParentActivityTestRule(LoginActivity::class.java)
+
+ private val dashboardPage = DashboardPage()
+
+ override fun displaysPageObjects() = Unit
+
+ override fun goToToDoDetails(data: MockCanvas) {
+ val parent = data.parents.first()
+ val token = data.tokenFor(parent)!!
+ tokenLogin(data.domain, token, parent)
+
+ dashboardPage.clickCalendar()
+
+ val todo = data.todos.first()
+
+ composeTestRule.waitForIdle()
+ calendarScreenPage.clickOnItem(todo.plannable.title)
+ }
+
+ override fun initData(): MockCanvas {
+ return MockCanvas.init(
+ parentCount = 1,
+ studentCount = 1,
+ teacherCount = 1,
+ courseCount = 1,
+ favoriteCourseCount = 1
+ )
+ }
+
+ override fun getLoggedInUser(): User = MockCanvas.data.parents.first()
+
+ override fun enableAndConfigureAccessibilityChecks() {
+ extraAccessibilitySupressions = Matchers.allOf(
+ AccessibilityCheckResultUtils.matchesCheck(
+ SpeakableTextPresentCheck::class.java
+ ),
+ AccessibilityCheckResultUtils.matchesViews(
+ ViewMatchers.withParent(
+ ViewMatchers.withClassName(
+ Matchers.equalTo(ComposeView::class.java.name)
+ )
+ )
+ )
+ )
+
+ super.enableAndConfigureAccessibilityChecks()
+ }
+}
\ No newline at end of file
diff --git a/apps/parent/src/androidTest/java/com/instructure/parentapp/ui/pages/AlertsPage.kt b/apps/parent/src/androidTest/java/com/instructure/parentapp/ui/pages/AlertsPage.kt
new file mode 100644
index 0000000000..09f206e617
--- /dev/null
+++ b/apps/parent/src/androidTest/java/com/instructure/parentapp/ui/pages/AlertsPage.kt
@@ -0,0 +1,94 @@
+/*
+ * Copyright (C) 2024 - present Instructure, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */ package com.instructure.parentapp.ui.pages
+
+import androidx.compose.ui.test.assertIsDisplayed
+import androidx.compose.ui.test.assertIsNotDisplayed
+import androidx.compose.ui.test.hasAnyAncestor
+import androidx.compose.ui.test.hasAnyDescendant
+import androidx.compose.ui.test.hasTestTag
+import androidx.compose.ui.test.hasText
+import androidx.compose.ui.test.junit4.ComposeTestRule
+import androidx.compose.ui.test.onNodeWithTag
+import androidx.compose.ui.test.onNodeWithText
+import androidx.compose.ui.test.onRoot
+import androidx.compose.ui.test.performClick
+import androidx.compose.ui.test.performTouchInput
+import androidx.compose.ui.test.swipeDown
+import com.instructure.espresso.assertDisplayed
+import com.instructure.espresso.click
+import com.instructure.espresso.page.BasePage
+import com.instructure.espresso.page.onViewWithText
+
+class AlertsPage(private val composeTestRule: ComposeTestRule) : BasePage() {
+
+ fun assertAlertItemDisplayed(title: String) {
+ composeTestRule.onNodeWithText(title).assertIsDisplayed()
+ }
+
+ fun assertAlertItemNotDisplayed(title: String) {
+ composeTestRule.onNodeWithText(title).assertIsNotDisplayed()
+ }
+
+ fun assertEmptyState() {
+ composeTestRule.onNodeWithTag("emptyAlerts").assertIsDisplayed()
+ }
+
+ fun assertAlertRead(title: String) {
+ composeTestRule.onNode(
+ hasTestTag("unreadIndicator")
+ .and(hasAnyAncestor(hasTestTag("alertItem").and(hasAnyDescendant(hasText(title))))),
+ useUnmergedTree = true
+ ).assertIsNotDisplayed()
+ }
+
+ fun assertAlertUnread(title: String) {
+ composeTestRule.onNode(
+ hasTestTag("unreadIndicator")
+ .and(hasAnyAncestor(hasTestTag("alertItem").and(hasAnyDescendant(hasText(title))))),
+ useUnmergedTree = true
+ ).assertIsDisplayed()
+ }
+
+ fun dismissAlert(title: String) {
+ composeTestRule.onNode(
+ hasAnyAncestor(hasAnyDescendant(hasText(title)).and(hasTestTag("alertItem"))).and(
+ hasTestTag(
+ "dismissButton"
+ )
+ ),
+ useUnmergedTree = true
+ ).performClick()
+ }
+
+ fun clickOnAlert(title: String) {
+ composeTestRule.onNode(
+ hasTestTag("alertItem").and(hasAnyDescendant(hasText(title))),
+ useUnmergedTree = true
+ ).performClick()
+ }
+
+ fun refresh() {
+ composeTestRule.onRoot().performTouchInput { swipeDown() }
+ }
+
+ fun assertSnackbar(message: String) {
+ onViewWithText(message).assertDisplayed()
+ }
+
+ fun clickUndo() {
+ onViewWithText("UNDO").click()
+ }
+}
\ No newline at end of file
diff --git a/apps/parent/src/androidTest/java/com/instructure/parentapp/ui/pages/CoursesPage.kt b/apps/parent/src/androidTest/java/com/instructure/parentapp/ui/pages/CoursesPage.kt
new file mode 100644
index 0000000000..83c9844e4f
--- /dev/null
+++ b/apps/parent/src/androidTest/java/com/instructure/parentapp/ui/pages/CoursesPage.kt
@@ -0,0 +1,73 @@
+/*
+ * Copyright (C) 2024 - present Instructure, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package com.instructure.parentapp.ui.pages
+
+import androidx.compose.ui.test.assertIsDisplayed
+import androidx.compose.ui.test.assertIsNotDisplayed
+import androidx.compose.ui.test.hasTestTag
+import androidx.compose.ui.test.hasText
+import androidx.compose.ui.test.junit4.ComposeTestRule
+import androidx.compose.ui.test.onNodeWithTag
+import androidx.compose.ui.test.onNodeWithText
+import androidx.compose.ui.test.performClick
+import androidx.compose.ui.test.performScrollTo
+import com.instructure.canvasapi2.models.Course
+import com.instructure.composeTest.hasSiblingWithText
+import com.instructure.pandares.R
+
+
+class CoursesPage(private val composeTestRule: ComposeTestRule) {
+
+ fun assertCourseItemDisplayed(course: Course) {
+ composeTestRule.onNodeWithText(course.name)
+ .performScrollTo()
+ .assertIsDisplayed()
+ course.courseCode?.let {
+ composeTestRule.onNode(hasSiblingWithText(course.name).and(hasText(it)), true)
+ .performScrollTo()
+ .assertIsDisplayed()
+ }
+ }
+
+ fun assertEmptyContentDisplayed() {
+ composeTestRule.onNodeWithText("No Courses")
+ .assertIsDisplayed()
+ composeTestRule.onNodeWithText("Your student’s courses might not be published yet.")
+ .assertIsDisplayed()
+ composeTestRule.onNodeWithTag(R.drawable.ic_panda_book.toString())
+ .assertIsDisplayed()
+ }
+
+ fun assertGradeTextDisplayed(courseName: String, gradeText: String) {
+ composeTestRule.onNode(hasSiblingWithText(courseName).and(hasText(gradeText)), true)
+ .performScrollTo()
+ .assertIsDisplayed()
+ }
+
+ fun assertGradeTextIsNotDisplayed(courseName: String) {
+ composeTestRule.onNode(hasSiblingWithText(courseName).and(hasTestTag("gradeText")), true)
+ .assertIsNotDisplayed()
+ }
+
+ fun tapCurseItem(courseName: String) {
+ composeTestRule.onNodeWithText(courseName)
+ .performScrollTo()
+ .assertIsDisplayed()
+ .performClick()
+ }
+}
diff --git a/apps/parent/src/androidTest/java/com/instructure/parentapp/ui/pages/DashboardPage.kt b/apps/parent/src/androidTest/java/com/instructure/parentapp/ui/pages/DashboardPage.kt
new file mode 100644
index 0000000000..0be5021eaa
--- /dev/null
+++ b/apps/parent/src/androidTest/java/com/instructure/parentapp/ui/pages/DashboardPage.kt
@@ -0,0 +1,104 @@
+/*
+ * Copyright (C) 2024 - present Instructure, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package com.instructure.parentapp.ui.pages
+
+import com.instructure.canvasapi2.models.User
+import com.instructure.espresso.OnViewWithId
+import com.instructure.espresso.assertDisplayed
+import com.instructure.espresso.click
+import com.instructure.espresso.page.BasePage
+import com.instructure.espresso.page.getStringFromResource
+import com.instructure.espresso.page.onView
+import com.instructure.espresso.page.onViewWithId
+import com.instructure.espresso.page.onViewWithText
+import com.instructure.espresso.page.plus
+import com.instructure.espresso.page.withAncestor
+import com.instructure.espresso.page.withText
+import com.instructure.parentapp.R
+import org.hamcrest.Matchers.equalToIgnoringCase
+
+class DashboardPage : BasePage(R.id.drawer_layout) {
+
+ private val toolbar by OnViewWithId(R.id.toolbar)
+ private val bottomNavigationView by OnViewWithId(R.id.bottom_nav)
+ private val alertsItem by OnViewWithId(R.id.alerts)
+ private val calendarItem by OnViewWithId(R.id.calendar)
+
+ fun assertObserverData(user: User) {
+ onViewWithText(user.name).assertDisplayed()
+ onViewWithText(user.email.orEmpty()).assertDisplayed()
+ }
+
+ fun openNavigationDrawer() {
+ onViewWithId(R.id.navigationButtonHolder).click()
+ }
+
+ fun assertSelectedStudent(name: String) {
+ onView(withText(name) + withAncestor(R.id.selected_student_container)).assertDisplayed()
+ }
+
+ fun openStudentSelector() {
+ toolbar.click()
+ }
+
+ fun selectStudent(name: String) {
+ onView(withText(name) + withAncestor(R.id.student_list)).click()
+ }
+
+ fun tapLogout() {
+ onViewWithText(R.string.logout).click()
+ }
+
+ fun assertLogoutDialog() {
+ onViewWithText(R.string.logout_warning).assertDisplayed()
+ onViewWithText(equalToIgnoringCase(getStringFromResource(android.R.string.cancel))).assertDisplayed()
+ onViewWithText(equalToIgnoringCase(getStringFromResource(android.R.string.ok))).assertDisplayed()
+ }
+
+ fun tapOk() {
+ onViewWithText(android.R.string.ok).click()
+ }
+
+ fun tapSwitchUsers() {
+ onViewWithText(R.string.navigationDrawerSwitchUsers).click()
+ }
+
+ fun clickInbox() {
+ onViewWithText(R.string.inbox).click()
+ }
+
+ fun clickAlerts() {
+ alertsItem.click()
+ }
+
+ fun clickCalendar() {
+ calendarItem.click()
+ }
+
+ fun clickTodayButton() {
+ onViewWithId(R.id.todayButtonHolder).click()
+ }
+
+ fun tapManageStudents() {
+ onViewWithText(R.string.screenTitleManageStudents).click()
+ }
+
+ fun tapSettings() {
+ onViewWithText(R.string.settings).click()
+ }
+}
diff --git a/apps/parent/src/androidTest/java/com/instructure/parentapp/ui/pages/ManageStudentsPage.kt b/apps/parent/src/androidTest/java/com/instructure/parentapp/ui/pages/ManageStudentsPage.kt
new file mode 100644
index 0000000000..a1b0eb904a
--- /dev/null
+++ b/apps/parent/src/androidTest/java/com/instructure/parentapp/ui/pages/ManageStudentsPage.kt
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2024 - 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 .
+ *
+ */
+
+package com.instructure.parentapp.ui.pages
+
+import androidx.compose.ui.test.assertHasClickAction
+import androidx.compose.ui.test.assertIsDisplayed
+import androidx.compose.ui.test.hasAnyChild
+import androidx.compose.ui.test.hasAnySibling
+import androidx.compose.ui.test.hasTestTag
+import androidx.compose.ui.test.hasText
+import androidx.compose.ui.test.junit4.ComposeTestRule
+import androidx.compose.ui.test.onNodeWithText
+import androidx.compose.ui.test.performClick
+import com.instructure.canvasapi2.models.User
+
+
+class ManageStudentsPage(private val composeTestRule: ComposeTestRule) {
+
+ fun assertStudentItemDisplayed(user: User) {
+ composeTestRule.onNodeWithText(user.shortName.orEmpty())
+ .assertIsDisplayed()
+ composeTestRule.onNode(hasTestTag("studentListItem") and hasAnyChild(hasText(user.shortName.orEmpty())), true)
+ .assertIsDisplayed()
+ .assertHasClickAction()
+ }
+
+ fun tapStudent(name: String) {
+ composeTestRule.onNodeWithText(name)
+ .assertIsDisplayed()
+ .performClick()
+ }
+
+ fun tapStudentColor(name: String) {
+ composeTestRule.onNode(hasTestTag("studentColor") and hasAnySibling(hasText(name)), true)
+ .assertIsDisplayed()
+ .performClick()
+ }
+
+ fun assertColorPickerDialogDisplayed() {
+ composeTestRule.onNodeWithText("Select Student Color")
+ .assertIsDisplayed()
+ composeTestRule.onNodeWithText("Cancel")
+ .assertIsDisplayed()
+ composeTestRule.onNodeWithText("OK")
+ .assertIsDisplayed()
+ }
+}
diff --git a/apps/parent/src/androidTest/java/com/instructure/parentapp/ui/pages/NotAParentPage.kt b/apps/parent/src/androidTest/java/com/instructure/parentapp/ui/pages/NotAParentPage.kt
new file mode 100644
index 0000000000..72ba16cb88
--- /dev/null
+++ b/apps/parent/src/androidTest/java/com/instructure/parentapp/ui/pages/NotAParentPage.kt
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2024 - present Instructure, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package com.instructure.parentapp.ui.pages
+
+import androidx.compose.ui.test.junit4.ComposeTestRule
+import androidx.compose.ui.test.onNodeWithText
+import androidx.compose.ui.test.performClick
+
+
+class NotAParentPage(private val composeTestRule: ComposeTestRule) {
+
+ fun expandAppOptions() {
+ composeTestRule.onNodeWithText("Are you a student or teacher?").performClick()
+ }
+
+ fun tapReturnToLogin() {
+ composeTestRule.onNodeWithText("Return to login").performClick()
+ }
+
+ fun tapApp(appName: String) {
+ composeTestRule.onNodeWithText(appName).performClick()
+ }
+}
diff --git a/apps/parent/src/androidTest/java/com/instructure/parentapp/utils/ParentActivityTestRule.kt b/apps/parent/src/androidTest/java/com/instructure/parentapp/utils/ParentActivityTestRule.kt
new file mode 100644
index 0000000000..39aa54cdd1
--- /dev/null
+++ b/apps/parent/src/androidTest/java/com/instructure/parentapp/utils/ParentActivityTestRule.kt
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2024 - present Instructure, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package com.instructure.parentapp.utils
+
+import android.app.Activity
+import android.content.Context
+import com.instructure.espresso.InstructureActivityTestRule
+import com.instructure.loginapi.login.util.LoginPrefs
+import com.instructure.loginapi.login.util.PreviousUsersUtils
+import com.instructure.pandautils.utils.PandaAppResetter
+import com.instructure.pandautils.utils.ThemePrefs
+import com.instructure.parentapp.util.ParentPrefs
+
+
+class ParentActivityTestRule(activityClass: Class) : InstructureActivityTestRule(activityClass) {
+
+ override fun performReset(context: Context) {
+ PandaAppResetter.reset(context)
+ ParentPrefs.clearPrefs()
+ PreviousUsersUtils.clear(context)
+ LoginPrefs.clearPrefs()
+
+ // We need to set this true so the theme selector won't stop our tests.
+ ThemePrefs.themeSelectionShown = true
+ }
+}
diff --git a/apps/parent/src/androidTest/java/com/instructure/parentapp/utils/ParentComposeTest.kt b/apps/parent/src/androidTest/java/com/instructure/parentapp/utils/ParentComposeTest.kt
new file mode 100644
index 0000000000..85d6f19e0f
--- /dev/null
+++ b/apps/parent/src/androidTest/java/com/instructure/parentapp/utils/ParentComposeTest.kt
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2024 - present Instructure, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package com.instructure.parentapp.utils
+
+import androidx.compose.ui.test.junit4.createAndroidComposeRule
+import com.instructure.parentapp.features.login.LoginActivity
+import com.instructure.parentapp.ui.pages.AlertsPage
+import org.junit.Rule
+
+
+abstract class ParentComposeTest : ParentTest() {
+
+ @get:Rule(order = 1)
+ val composeTestRule = createAndroidComposeRule()
+
+ protected val alertsPage = AlertsPage(composeTestRule)
+
+ override fun displaysPageObjects() = Unit
+}
diff --git a/apps/parent/src/androidTest/java/com/instructure/parentapp/utils/ParentTest.kt b/apps/parent/src/androidTest/java/com/instructure/parentapp/utils/ParentTest.kt
new file mode 100644
index 0000000000..1d1a2b3d2f
--- /dev/null
+++ b/apps/parent/src/androidTest/java/com/instructure/parentapp/utils/ParentTest.kt
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2024 - present Instructure, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package com.instructure.parentapp.utils
+
+import com.instructure.canvas.espresso.CanvasTest
+import com.instructure.parentapp.BuildConfig
+import com.instructure.parentapp.features.login.LoginActivity
+import com.instructure.parentapp.ui.pages.DashboardPage
+
+
+abstract class ParentTest : CanvasTest() {
+
+ override val isTesting = BuildConfig.IS_TESTING
+
+ override val activityRule = ParentActivityTestRule(LoginActivity::class.java)
+
+ val dashboardPage = DashboardPage()
+}
\ No newline at end of file
diff --git a/apps/parent/src/androidTest/java/com/instructure/parentapp/utils/ParentTestExtensions.kt b/apps/parent/src/androidTest/java/com/instructure/parentapp/utils/ParentTestExtensions.kt
new file mode 100644
index 0000000000..99c8e6583b
--- /dev/null
+++ b/apps/parent/src/androidTest/java/com/instructure/parentapp/utils/ParentTestExtensions.kt
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2024 - 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 .
+ *
+ */
+
+package com.instructure.parentapp.utils
+
+import androidx.annotation.DrawableRes
+import androidx.compose.ui.test.SemanticsMatcher
+import com.instructure.canvas.espresso.CanvasTest
+import com.instructure.canvasapi2.models.User
+import com.instructure.pandautils.utils.DrawableId
+import com.instructure.parentapp.features.login.LoginActivity
+
+
+fun CanvasTest.tokenLogin(domain: String, token: String, user: User, assertDashboard: Boolean = true) {
+ activityRule.runOnUiThread {
+ (originalActivity as LoginActivity).loginWithToken(
+ token,
+ domain,
+ user
+ )
+ }
+
+ if (assertDashboard && this is ParentTest) {
+ dashboardPage.assertPageObjects()
+ }
+}
+
+fun hasDrawable(@DrawableRes id: Int): SemanticsMatcher =
+ SemanticsMatcher.expectValue(DrawableId, id)
diff --git a/apps/parent/src/main/AndroidManifest.xml b/apps/parent/src/main/AndroidManifest.xml
new file mode 100644
index 0000000000..14ab33d460
--- /dev/null
+++ b/apps/parent/src/main/AndroidManifest.xml
@@ -0,0 +1,127 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/di/AlertsModule.kt b/apps/parent/src/main/java/com/instructure/parentapp/di/AlertsModule.kt
new file mode 100644
index 0000000000..23e6953d61
--- /dev/null
+++ b/apps/parent/src/main/java/com/instructure/parentapp/di/AlertsModule.kt
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2024 - 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 .
+ *
+ */
+package com.instructure.parentapp.di
+
+import com.instructure.canvasapi2.apis.CourseAPI
+import com.instructure.canvasapi2.apis.ObserverApi
+import com.instructure.parentapp.features.alerts.list.AlertsRepository
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.android.components.ViewModelComponent
+
+@Module
+@InstallIn(ViewModelComponent::class)
+class AlertsModule {
+
+ @Provides
+ fun provideAlertsRepository(observerApi: ObserverApi, courseApi: CourseAPI.CoursesInterface): AlertsRepository {
+ return AlertsRepository(observerApi, courseApi)
+ }
+}
\ No newline at end of file
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/di/ApplicationModule.kt b/apps/parent/src/main/java/com/instructure/parentapp/di/ApplicationModule.kt
new file mode 100644
index 0000000000..7d0f341cf6
--- /dev/null
+++ b/apps/parent/src/main/java/com/instructure/parentapp/di/ApplicationModule.kt
@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2024 - 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 .
+ *
+ */
+
+package com.instructure.parentapp.di
+
+import com.instructure.canvasapi2.utils.Analytics
+import com.instructure.canvasapi2.utils.ApiPrefs
+import com.instructure.loginapi.login.util.PreviousUsersUtils
+import com.instructure.loginapi.login.util.QRLogin
+import com.instructure.pandautils.utils.LogoutHelper
+import com.instructure.parentapp.util.ParentLogoutHelper
+import com.instructure.parentapp.util.ParentPrefs
+import com.instructure.parentapp.util.navigation.Navigation
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+class ApplicationModule {
+
+ @Provides
+ fun provideLogoutHelper(): LogoutHelper {
+ return ParentLogoutHelper()
+ }
+
+ @Provides
+ fun provideQRLogin(): QRLogin {
+ return QRLogin
+ }
+
+ @Provides
+ fun provideAnalytics(): Analytics {
+ return Analytics
+ }
+
+ @Provides
+ fun providePreviousUsersUtils(): PreviousUsersUtils {
+ return PreviousUsersUtils
+ }
+
+ @Provides
+ fun provideParentPrefs(): ParentPrefs {
+ return ParentPrefs
+ }
+
+ @Provides
+ @Singleton
+ fun provideNavigation(apiPrefs: ApiPrefs): Navigation {
+ return Navigation(apiPrefs)
+ }
+}
\ No newline at end of file
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/di/DatabaseModule.kt b/apps/parent/src/main/java/com/instructure/parentapp/di/DatabaseModule.kt
new file mode 100644
index 0000000000..1d1e147775
--- /dev/null
+++ b/apps/parent/src/main/java/com/instructure/parentapp/di/DatabaseModule.kt
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2024 - 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 .
+ *
+ */
+
+package com.instructure.parentapp.di
+
+import android.content.Context
+import androidx.room.Room
+import com.instructure.pandautils.room.appdatabase.AppDatabase
+import com.instructure.pandautils.room.appdatabase.appDatabaseMigrations
+import com.instructure.pandautils.room.calendar.CalendarFilterDatabase
+import com.instructure.pandautils.room.calendar.calendarDatabaseMigrations
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.android.qualifiers.ApplicationContext
+import dagger.hilt.components.SingletonComponent
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+class DatabaseModule {
+
+ @Provides
+ @Singleton
+ fun provideDatabase(@ApplicationContext context: Context): AppDatabase {
+ return Room.databaseBuilder(context, AppDatabase::class.java, "db-canvas-parent")
+ .addMigrations(*appDatabaseMigrations)
+ .build()
+ }
+
+ @Provides
+ @Singleton
+ fun provideCalendarDatabase(@ApplicationContext context: Context): CalendarFilterDatabase {
+ return Room.databaseBuilder(context, CalendarFilterDatabase::class.java, "db-calendar-parent")
+ .addMigrations(*calendarDatabaseMigrations)
+ .build()
+ }
+}
\ No newline at end of file
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/di/DefaultBindingsModule.kt b/apps/parent/src/main/java/com/instructure/parentapp/di/DefaultBindingsModule.kt
new file mode 100644
index 0000000000..e80ad959ed
--- /dev/null
+++ b/apps/parent/src/main/java/com/instructure/parentapp/di/DefaultBindingsModule.kt
@@ -0,0 +1,107 @@
+/*
+ * Copyright (C) 2024 - 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 .
+ *
+ */
+
+package com.instructure.parentapp.di
+
+import com.instructure.pandautils.features.dashboard.edit.EditDashboardRepository
+import com.instructure.pandautils.features.dashboard.edit.EditDashboardRouter
+import com.instructure.pandautils.features.dashboard.notifications.DashboardRouter
+import com.instructure.pandautils.features.discussion.router.DiscussionRouteHelperRepository
+import com.instructure.pandautils.features.discussion.router.DiscussionRouter
+import com.instructure.pandautils.features.elementary.grades.GradesRouter
+import com.instructure.pandautils.features.elementary.homeroom.HomeroomRouter
+import com.instructure.pandautils.features.elementary.importantdates.ImportantDatesRouter
+import com.instructure.pandautils.features.elementary.resources.itemviewmodels.ResourcesRouter
+import com.instructure.pandautils.features.elementary.schedule.ScheduleRouter
+import com.instructure.pandautils.features.offline.sync.SyncRouter
+import com.instructure.pandautils.features.shareextension.ShareExtensionRouter
+import com.instructure.pandautils.utils.ToolbarSetupBehavior
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+
+
+@Module
+@InstallIn(SingletonComponent::class)
+class DefaultBindingsModule {
+
+ @Provides
+ fun provideDashboardRouter(): DashboardRouter {
+ throw NotImplementedError()
+ }
+
+ @Provides
+ fun provideEditDashboardRouter(): EditDashboardRouter {
+ throw NotImplementedError()
+ }
+
+ @Provides
+ fun provideEditDashboardRepository(): EditDashboardRepository {
+ throw NotImplementedError()
+ }
+
+ @Provides
+ fun provideDiscussionRouteHelperStudentRepository(): DiscussionRouteHelperRepository {
+ throw NotImplementedError()
+ }
+
+ @Provides
+ fun provideDiscussionRouter(): DiscussionRouter {
+ throw NotImplementedError()
+ }
+
+ @Provides
+ fun provideGradesRouter(): GradesRouter {
+ throw NotImplementedError()
+ }
+
+ @Provides
+ fun provideHomeroomRouter(): HomeroomRouter {
+ throw NotImplementedError()
+ }
+
+ @Provides
+ fun provideImportantDatesRouter(): ImportantDatesRouter {
+ throw NotImplementedError()
+ }
+
+ @Provides
+ fun provideResourcesRouter(): ResourcesRouter {
+ throw NotImplementedError()
+ }
+
+ @Provides
+ fun provideScheduleRouter(): ScheduleRouter {
+ throw NotImplementedError()
+ }
+
+ @Provides
+ fun provideToolbarSetup(): ToolbarSetupBehavior {
+ throw NotImplementedError()
+ }
+
+ @Provides
+ fun provideShareExtensionRouter(): ShareExtensionRouter {
+ throw NotImplementedError()
+ }
+
+ @Provides
+ fun provideSyncRouter(): SyncRouter {
+ throw NotImplementedError()
+ }
+}
\ No newline at end of file
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/di/FragmentModule.kt b/apps/parent/src/main/java/com/instructure/parentapp/di/FragmentModule.kt
new file mode 100644
index 0000000000..07bffd2025
--- /dev/null
+++ b/apps/parent/src/main/java/com/instructure/parentapp/di/FragmentModule.kt
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2024 - 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 .
+ *
+ */
+
+package com.instructure.parentapp.di
+
+import androidx.fragment.app.FragmentActivity
+import com.instructure.pandautils.navigation.WebViewRouter
+import com.instructure.parentapp.util.navigation.ParentWebViewRouter
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.android.components.FragmentComponent
+
+/**
+ * Module for various common Fragment scope dependencies that are used in different Fragments.
+ */
+@Module
+@InstallIn(FragmentComponent::class)
+class FragmentModule {
+
+ @Provides
+ fun provideWebViewRouter(activity: FragmentActivity): WebViewRouter {
+ return ParentWebViewRouter(activity)
+ }
+}
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/di/LegalModule.kt b/apps/parent/src/main/java/com/instructure/parentapp/di/LegalModule.kt
new file mode 100644
index 0000000000..e99ad42ecd
--- /dev/null
+++ b/apps/parent/src/main/java/com/instructure/parentapp/di/LegalModule.kt
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2024 - 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 .
+ *
+ */
+package com.instructure.parentapp.di
+
+import android.app.Activity
+import com.instructure.pandautils.features.legal.LegalRouter
+import com.instructure.parentapp.features.legal.ParentLegalRouter
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.android.components.ActivityComponent
+
+@Module
+@InstallIn(ActivityComponent::class)
+class LegalModule {
+
+ @Provides
+ fun provideLegalRouter(activity: Activity): LegalRouter {
+ return ParentLegalRouter(activity)
+ }
+}
\ No newline at end of file
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/di/ManageStudentsModule.kt b/apps/parent/src/main/java/com/instructure/parentapp/di/ManageStudentsModule.kt
new file mode 100644
index 0000000000..8b6ccebd9e
--- /dev/null
+++ b/apps/parent/src/main/java/com/instructure/parentapp/di/ManageStudentsModule.kt
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2024 - 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 .
+ *
+ */
+
+package com.instructure.parentapp.di
+
+import com.instructure.canvasapi2.apis.EnrollmentAPI
+import com.instructure.canvasapi2.apis.UserAPI
+import com.instructure.parentapp.features.managestudents.ManageStudentsRepository
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.android.components.ViewModelComponent
+
+
+@Module
+@InstallIn(ViewModelComponent::class)
+class ManageStudentsModule {
+
+ @Provides
+ fun provideManageStudentsRepository(
+ enrollmentsApi: EnrollmentAPI.EnrollmentInterface,
+ userApi: UserAPI.UsersInterface
+ ): ManageStudentsRepository {
+ return ManageStudentsRepository(enrollmentsApi, userApi)
+ }
+}
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/di/SettingsModule.kt b/apps/parent/src/main/java/com/instructure/parentapp/di/SettingsModule.kt
new file mode 100644
index 0000000000..f706dbb0b0
--- /dev/null
+++ b/apps/parent/src/main/java/com/instructure/parentapp/di/SettingsModule.kt
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2024 - 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 .
+ *
+ */
+package com.instructure.parentapp.di
+
+import com.instructure.pandautils.features.settings.SettingsBehaviour
+import com.instructure.pandautils.features.settings.SettingsRouter
+import com.instructure.parentapp.features.settings.ParentSettingsBehaviour
+import com.instructure.parentapp.features.settings.ParentSettingsRouter
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+
+@Module
+@InstallIn(SingletonComponent::class)
+class SettingsModule {
+
+ @Provides
+ fun provideSettingsBehaviour(): SettingsBehaviour {
+ return ParentSettingsBehaviour()
+ }
+
+ @Provides
+ fun provideSettingsRouter(): SettingsRouter {
+ return ParentSettingsRouter()
+ }
+}
\ No newline at end of file
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/di/feature/AboutModule.kt b/apps/parent/src/main/java/com/instructure/parentapp/di/feature/AboutModule.kt
new file mode 100644
index 0000000000..c93501e8b1
--- /dev/null
+++ b/apps/parent/src/main/java/com/instructure/parentapp/di/feature/AboutModule.kt
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2024 - 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 .
+ *
+ */
+
+package com.instructure.parentapp.di.feature
+
+import android.content.Context
+import com.instructure.canvasapi2.utils.ApiPrefs
+import com.instructure.pandautils.features.about.AboutRepository
+import com.instructure.parentapp.features.about.ParentAboutRepository
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.android.components.ViewModelComponent
+import dagger.hilt.android.qualifiers.ApplicationContext
+
+@Module
+@InstallIn(ViewModelComponent::class)
+class AboutModule {
+
+ @Provides
+ fun provideAboutRepository(
+ @ApplicationContext context: Context,
+ apiPrefs: ApiPrefs
+ ): AboutRepository {
+ return ParentAboutRepository(context, apiPrefs)
+ }
+}
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/di/feature/CalendarModule.kt b/apps/parent/src/main/java/com/instructure/parentapp/di/feature/CalendarModule.kt
new file mode 100644
index 0000000000..9f8aa5efdc
--- /dev/null
+++ b/apps/parent/src/main/java/com/instructure/parentapp/di/feature/CalendarModule.kt
@@ -0,0 +1,64 @@
+/*
+ * Copyright (C) 2024 - 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 .
+ *
+ */
+package com.instructure.parentapp.di.feature
+
+import androidx.fragment.app.FragmentActivity
+import com.instructure.canvasapi2.apis.CalendarEventAPI
+import com.instructure.canvasapi2.apis.CourseAPI
+import com.instructure.canvasapi2.apis.FeaturesAPI
+import com.instructure.canvasapi2.apis.PlannerAPI
+import com.instructure.canvasapi2.utils.ApiPrefs
+import com.instructure.pandautils.features.calendar.CalendarRepository
+import com.instructure.pandautils.features.calendar.CalendarRouter
+import com.instructure.pandautils.room.calendar.daos.CalendarFilterDao
+import com.instructure.parentapp.features.calendar.ParentCalendarRepository
+import com.instructure.parentapp.features.calendar.ParentCalendarRouter
+import com.instructure.parentapp.util.ParentPrefs
+import com.instructure.parentapp.util.navigation.Navigation
+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 CalendarModule {
+
+ @Provides
+ fun provideCalendarRouter(activity: FragmentActivity, navigation: Navigation): CalendarRouter {
+ return ParentCalendarRouter(activity, navigation)
+ }
+}
+
+@Module
+@InstallIn(ViewModelComponent::class)
+class CalendarViewModelModule {
+
+ @Provides
+ fun provideCalendarRepository(
+ plannerApi: PlannerAPI.PlannerInterface,
+ coursesApi: CourseAPI.CoursesInterface,
+ calendarEventsApi: CalendarEventAPI.CalendarEventInterface,
+ apiPrefs: ApiPrefs,
+ featuresApi: FeaturesAPI.FeaturesInterface,
+ parentPrefs: ParentPrefs,
+ calendarFilterDao: CalendarFilterDao
+ ): CalendarRepository {
+ return ParentCalendarRepository(plannerApi, coursesApi, calendarEventsApi, apiPrefs, featuresApi, parentPrefs, calendarFilterDao)
+ }
+}
\ No newline at end of file
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/di/feature/CoursesModule.kt b/apps/parent/src/main/java/com/instructure/parentapp/di/feature/CoursesModule.kt
new file mode 100644
index 0000000000..0a6dd85b9a
--- /dev/null
+++ b/apps/parent/src/main/java/com/instructure/parentapp/di/feature/CoursesModule.kt
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2024 - 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 .
+ *
+ */
+
+package com.instructure.parentapp.di.feature
+
+import android.content.Context
+import com.instructure.canvasapi2.apis.CourseAPI
+import com.instructure.parentapp.features.courses.list.CourseGradeFormatter
+import com.instructure.parentapp.features.courses.list.CoursesRepository
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.android.components.ViewModelComponent
+import dagger.hilt.android.qualifiers.ApplicationContext
+
+
+@Module
+@InstallIn(ViewModelComponent::class)
+class CoursesModule {
+
+ @Provides
+ fun provideCoursesRepository(courseApi: CourseAPI.CoursesInterface): CoursesRepository {
+ return CoursesRepository(courseApi)
+ }
+
+ @Provides
+ fun provideCourseGradeFormatter(@ApplicationContext context: Context): CourseGradeFormatter {
+ return CourseGradeFormatter(context)
+ }
+}
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/di/feature/CreateUpdateEventModule.kt b/apps/parent/src/main/java/com/instructure/parentapp/di/feature/CreateUpdateEventModule.kt
new file mode 100644
index 0000000000..9a4e3933a8
--- /dev/null
+++ b/apps/parent/src/main/java/com/instructure/parentapp/di/feature/CreateUpdateEventModule.kt
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2024 - 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 .
+ *
+ */
+
+package com.instructure.parentapp.di.feature
+
+import com.instructure.canvasapi2.apis.CalendarEventAPI
+import com.instructure.canvasapi2.utils.ApiPrefs
+import com.instructure.pandautils.features.calendarevent.createupdate.CreateUpdateEventRepository
+import com.instructure.parentapp.features.calendarevent.ParentCreateUpdateEventRepository
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.android.components.ViewModelComponent
+
+
+@Module
+@InstallIn(ViewModelComponent::class)
+class CreateUpdateEventModule {
+
+ @Provides
+ fun provideCreateUpdateEventRepository(
+ calendarEventApi: CalendarEventAPI.CalendarEventInterface,
+ apiPrefs: ApiPrefs
+ ): CreateUpdateEventRepository {
+ return ParentCreateUpdateEventRepository(calendarEventApi, apiPrefs)
+ }
+}
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/di/feature/CreateUpdateToDoModule.kt b/apps/parent/src/main/java/com/instructure/parentapp/di/feature/CreateUpdateToDoModule.kt
new file mode 100644
index 0000000000..756137158f
--- /dev/null
+++ b/apps/parent/src/main/java/com/instructure/parentapp/di/feature/CreateUpdateToDoModule.kt
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2024 - 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 .
+ *
+ */
+package com.instructure.parentapp.di.feature
+
+import com.instructure.canvasapi2.apis.CalendarEventAPI
+import com.instructure.canvasapi2.apis.CourseAPI
+import com.instructure.canvasapi2.apis.PlannerAPI
+import com.instructure.canvasapi2.di.PLANNER_API_SERIALIZE_NULLS
+import com.instructure.canvasapi2.utils.ApiPrefs
+import com.instructure.pandautils.features.calendarevent.createupdate.CreateUpdateEventRepository
+import com.instructure.pandautils.features.calendartodo.createupdate.CreateUpdateToDoRepository
+import com.instructure.parentapp.features.calendarevent.ParentCreateUpdateEventRepository
+import com.instructure.parentapp.features.calendartodo.ParentCreateUpdateToDoRepository
+import com.instructure.parentapp.util.ParentPrefs
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.android.components.ViewModelComponent
+import javax.inject.Named
+
+@Module
+@InstallIn(ViewModelComponent::class)
+class CreateUpdateToDoModule {
+
+ @Provides
+ fun provideCreateUpdateToDoRepository(
+ coursesApi: CourseAPI.CoursesInterface,
+ parentPrefs: ParentPrefs,
+ @Named(PLANNER_API_SERIALIZE_NULLS) plannerApi: PlannerAPI.PlannerInterface
+ ): CreateUpdateToDoRepository {
+ return ParentCreateUpdateToDoRepository(coursesApi, parentPrefs, plannerApi)
+ }
+}
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/di/feature/DashboardModule.kt b/apps/parent/src/main/java/com/instructure/parentapp/di/feature/DashboardModule.kt
new file mode 100644
index 0000000000..4c575ef2a6
--- /dev/null
+++ b/apps/parent/src/main/java/com/instructure/parentapp/di/feature/DashboardModule.kt
@@ -0,0 +1,70 @@
+/*
+ * Copyright (C) 2024 - 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 .
+ *
+ */
+
+package com.instructure.parentapp.di.feature
+
+import com.instructure.canvasapi2.apis.EnrollmentAPI
+import com.instructure.canvasapi2.apis.UnreadCountAPI
+import com.instructure.parentapp.features.dashboard.AlertCountUpdater
+import com.instructure.parentapp.features.dashboard.AlertCountUpdaterImpl
+import com.instructure.parentapp.features.dashboard.DashboardRepository
+import com.instructure.parentapp.features.dashboard.InboxCountUpdater
+import com.instructure.parentapp.features.dashboard.InboxCountUpdaterImpl
+import com.instructure.parentapp.features.dashboard.SelectedStudentHolder
+import com.instructure.parentapp.features.dashboard.SelectedStudentHolderImpl
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.android.components.ViewModelComponent
+import dagger.hilt.components.SingletonComponent
+import javax.inject.Singleton
+
+@Module
+@InstallIn(ViewModelComponent::class)
+class DashboardModule {
+
+ @Provides
+ fun provideDashboardRepository(
+ enrollmentApi: EnrollmentAPI.EnrollmentInterface,
+ unreadCountsApi: UnreadCountAPI.UnreadCountsInterface
+ ): DashboardRepository {
+ return DashboardRepository(enrollmentApi, unreadCountsApi)
+ }
+}
+
+@Module
+@InstallIn(SingletonComponent::class)
+class SelectedStudentHolderModule {
+
+ @Provides
+ @Singleton
+ fun provideSelectedStudentHolder(): SelectedStudentHolder {
+ return SelectedStudentHolderImpl()
+ }
+
+ @Provides
+ @Singleton
+ fun provideInboxCountUpdater(): InboxCountUpdater {
+ return InboxCountUpdaterImpl()
+ }
+
+ @Provides
+ @Singleton
+ fun provideAlertCountUpdater(): AlertCountUpdater {
+ return AlertCountUpdaterImpl()
+ }
+}
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/di/feature/EventModule.kt b/apps/parent/src/main/java/com/instructure/parentapp/di/feature/EventModule.kt
new file mode 100644
index 0000000000..cfcb31ec97
--- /dev/null
+++ b/apps/parent/src/main/java/com/instructure/parentapp/di/feature/EventModule.kt
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2024 - 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 .
+ *
+ */
+
+package com.instructure.parentapp.di.feature
+
+import androidx.fragment.app.FragmentActivity
+import com.instructure.pandautils.features.calendarevent.details.EventRouter
+import com.instructure.parentapp.features.calendarevent.ParentEventRouter
+import com.instructure.parentapp.util.navigation.Navigation
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.android.components.FragmentComponent
+
+@Module
+@InstallIn(FragmentComponent::class)
+class EventModule {
+
+ @Provides
+ fun provideEventRouter(activity: FragmentActivity, navigation: Navigation): EventRouter {
+ return ParentEventRouter(activity, navigation)
+ }
+}
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/di/feature/HelpDialogModule.kt b/apps/parent/src/main/java/com/instructure/parentapp/di/feature/HelpDialogModule.kt
new file mode 100644
index 0000000000..3467d30c71
--- /dev/null
+++ b/apps/parent/src/main/java/com/instructure/parentapp/di/feature/HelpDialogModule.kt
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2024 - 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 .
+ *
+ */
+
+package com.instructure.parentapp.di.feature
+
+import androidx.fragment.app.FragmentActivity
+import com.instructure.pandautils.features.help.HelpDialogFragmentBehavior
+import com.instructure.pandautils.features.help.HelpLinkFilter
+import com.instructure.parentapp.features.help.ParentHelpDialogFragmentBehavior
+import com.instructure.parentapp.features.help.ParentHelpLinkFilter
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.android.components.FragmentComponent
+import dagger.hilt.android.components.ViewModelComponent
+
+@Module
+@InstallIn(ViewModelComponent::class)
+class HelpDialogModule {
+
+ @Provides
+ fun provideHelpLinkFilter(): HelpLinkFilter {
+ return ParentHelpLinkFilter()
+ }
+}
+
+@Module
+@InstallIn(FragmentComponent::class)
+class HelpDialogFragmentModule {
+
+ @Provides
+ fun provideHelpDialogFragmentBehavior(activity: FragmentActivity): HelpDialogFragmentBehavior {
+ return ParentHelpDialogFragmentBehavior(activity)
+ }
+}
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/di/feature/InboxModule.kt b/apps/parent/src/main/java/com/instructure/parentapp/di/feature/InboxModule.kt
new file mode 100644
index 0000000000..7b6dc43d5b
--- /dev/null
+++ b/apps/parent/src/main/java/com/instructure/parentapp/di/feature/InboxModule.kt
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2024 - 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 .
+ *
+ */
+
+package com.instructure.parentapp.di.feature
+
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentActivity
+import com.instructure.canvasapi2.apis.CourseAPI
+import com.instructure.canvasapi2.apis.GroupAPI
+import com.instructure.canvasapi2.apis.InboxApi
+import com.instructure.canvasapi2.apis.ProgressAPI
+import com.instructure.pandautils.features.inbox.list.InboxRepository
+import com.instructure.pandautils.features.inbox.list.InboxRouter
+import com.instructure.parentapp.features.inbox.list.ParentInboxRepository
+import com.instructure.parentapp.features.inbox.list.ParentInboxRouter
+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 InboxFragmentModule {
+
+ @Provides
+ fun provideInboxRouter(activity: FragmentActivity, fragment: Fragment): InboxRouter {
+ return ParentInboxRouter(activity, fragment)
+ }
+}
+
+@Module
+@InstallIn(ViewModelComponent::class)
+class InboxModule {
+
+ @Provides
+ fun provideInboxRepository(
+ inboxApi: InboxApi.InboxInterface,
+ coursesApi: CourseAPI.CoursesInterface,
+ groupsApi: GroupAPI.GroupInterface,
+ progressApi: ProgressAPI.ProgressInterface
+ ): InboxRepository {
+ return ParentInboxRepository(inboxApi, coursesApi, groupsApi, progressApi)
+ }
+}
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/di/feature/LoginModule.kt b/apps/parent/src/main/java/com/instructure/parentapp/di/feature/LoginModule.kt
new file mode 100644
index 0000000000..8880972b59
--- /dev/null
+++ b/apps/parent/src/main/java/com/instructure/parentapp/di/feature/LoginModule.kt
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2024 - 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 .
+ *
+ */
+
+package com.instructure.parentapp.di.feature
+
+import androidx.fragment.app.FragmentActivity
+import com.instructure.loginapi.login.LoginNavigation
+import com.instructure.loginapi.login.features.acceptableusepolicy.AcceptableUsePolicyRouter
+import com.instructure.parentapp.features.login.ParentAcceptableUsePolicyRouter
+import com.instructure.parentapp.features.login.ParentLoginNavigation
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.android.components.ActivityComponent
+
+@Module
+@InstallIn(ActivityComponent::class)
+class LoginModule {
+
+ @Provides
+ fun provideAcceptableUsePolicyRouter(activity: FragmentActivity): AcceptableUsePolicyRouter {
+ return ParentAcceptableUsePolicyRouter(activity)
+ }
+
+ @Provides
+ fun provideLoginNavigation(activity: FragmentActivity): LoginNavigation {
+ return ParentLoginNavigation(activity)
+ }
+}
\ No newline at end of file
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/di/feature/SplashModule.kt b/apps/parent/src/main/java/com/instructure/parentapp/di/feature/SplashModule.kt
new file mode 100644
index 0000000000..fa964f67de
--- /dev/null
+++ b/apps/parent/src/main/java/com/instructure/parentapp/di/feature/SplashModule.kt
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2024 - 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 .
+ *
+ */
+
+package com.instructure.parentapp.di.feature
+
+import com.instructure.canvasapi2.apis.EnrollmentAPI
+import com.instructure.canvasapi2.apis.ThemeAPI
+import com.instructure.canvasapi2.apis.UserAPI
+import com.instructure.parentapp.features.splash.SplashRepository
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.android.components.ViewModelComponent
+
+
+@Module
+@InstallIn(ViewModelComponent::class)
+class SplashModule {
+
+ @Provides
+ fun provideSplashRepository(
+ userApi: UserAPI.UsersInterface,
+ themeApi: ThemeAPI.ThemeInterface,
+ enrollmentApi: EnrollmentAPI.EnrollmentInterface
+ ): SplashRepository {
+ return SplashRepository(userApi, themeApi, enrollmentApi)
+ }
+}
\ No newline at end of file
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/di/feature/ToDoModule.kt b/apps/parent/src/main/java/com/instructure/parentapp/di/feature/ToDoModule.kt
new file mode 100644
index 0000000000..dd699ea531
--- /dev/null
+++ b/apps/parent/src/main/java/com/instructure/parentapp/di/feature/ToDoModule.kt
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2024 - 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 .
+ *
+ */
+
+package com.instructure.parentapp.di.feature
+
+import androidx.fragment.app.FragmentActivity
+import com.instructure.pandautils.features.calendartodo.details.ToDoRouter
+import com.instructure.parentapp.features.calendartodo.ParentToDoRouter
+import com.instructure.parentapp.util.navigation.Navigation
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.android.components.FragmentComponent
+
+@Module
+@InstallIn(FragmentComponent::class)
+class ToDoModule {
+
+ @Provides
+ fun provideToDoRouter(activity: FragmentActivity, navigation: Navigation): ToDoRouter {
+ return ParentToDoRouter(activity, navigation)
+ }
+}
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/features/about/ParentAboutRepository.kt b/apps/parent/src/main/java/com/instructure/parentapp/features/about/ParentAboutRepository.kt
new file mode 100644
index 0000000000..ca1c822b1d
--- /dev/null
+++ b/apps/parent/src/main/java/com/instructure/parentapp/features/about/ParentAboutRepository.kt
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2024 - 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 .
+ *
+ */
+package com.instructure.parentapp.features.about
+
+import android.content.Context
+import com.instructure.canvasapi2.utils.ApiPrefs
+import com.instructure.pandautils.features.about.AboutRepository
+import com.instructure.parentapp.BuildConfig
+
+class ParentAboutRepository(context: Context, apiPrefs: ApiPrefs) :
+ AboutRepository(context, apiPrefs) {
+
+ override val appVersion: String = BuildConfig.VERSION_NAME
+}
\ No newline at end of file
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/features/alerts/list/AlertsFragment.kt b/apps/parent/src/main/java/com/instructure/parentapp/features/alerts/list/AlertsFragment.kt
new file mode 100644
index 0000000000..74a2c9bdf0
--- /dev/null
+++ b/apps/parent/src/main/java/com/instructure/parentapp/features/alerts/list/AlertsFragment.kt
@@ -0,0 +1,73 @@
+/*
+ * Copyright (C) 2024 - 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 .
+ *
+ */
+
+package com.instructure.parentapp.features.alerts.list
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.platform.ComposeView
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.viewModels
+import androidx.lifecycle.lifecycleScope
+import com.google.android.material.snackbar.Snackbar
+import com.instructure.pandautils.utils.collectOneOffEvents
+import com.instructure.parentapp.R
+import com.instructure.parentapp.util.navigation.Navigation
+import dagger.hilt.android.AndroidEntryPoint
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class AlertsFragment : Fragment() {
+
+ @Inject
+ lateinit var navigation: Navigation
+
+ private val viewModel: AlertsViewModel by viewModels()
+
+ override fun onCreateView(
+ inflater: LayoutInflater,
+ container: ViewGroup?,
+ savedInstanceState: Bundle?
+ ): View {
+ lifecycleScope.collectOneOffEvents(viewModel.events, ::handleAction)
+ return ComposeView(requireActivity()).apply {
+ setContent {
+ val uiState by viewModel.uiState.collectAsState()
+ AlertsScreen(uiState = uiState, actionHandler = viewModel::handleAction)
+ }
+ }
+ }
+
+ private fun handleAction(action: AlertsViewModelAction) {
+ when (action) {
+ is AlertsViewModelAction.Navigate -> {
+ navigation.navigate(activity, action.route)
+ }
+
+ is AlertsViewModelAction.ShowSnackbar -> {
+ Snackbar.make(requireView(), action.message, Snackbar.LENGTH_SHORT).apply {
+ action.action?.let { setAction(it) { action.actionCallback?.invoke() } }
+ setActionTextColor(resources.getColor(R.color.white, resources.newTheme()))
+ }.show()
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/features/alerts/list/AlertsRepository.kt b/apps/parent/src/main/java/com/instructure/parentapp/features/alerts/list/AlertsRepository.kt
new file mode 100644
index 0000000000..70b932d0cf
--- /dev/null
+++ b/apps/parent/src/main/java/com/instructure/parentapp/features/alerts/list/AlertsRepository.kt
@@ -0,0 +1,81 @@
+/*
+ * Copyright (C) 2024 - 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 .
+ *
+ */
+package com.instructure.parentapp.features.alerts.list
+
+import com.instructure.canvasapi2.apis.CourseAPI
+import com.instructure.canvasapi2.apis.ObserverApi
+import com.instructure.canvasapi2.builders.RestParams
+import com.instructure.canvasapi2.models.Alert
+import com.instructure.canvasapi2.models.AlertThreshold
+import com.instructure.canvasapi2.models.AlertWorkflowState
+import com.instructure.canvasapi2.models.CourseSettings
+import com.instructure.canvasapi2.utils.depaginate
+
+class AlertsRepository(
+ private val observerApi: ObserverApi,
+ private val courseApi: CourseAPI.CoursesInterface
+) {
+
+ suspend fun getAlertsForStudent(studentId: Long, forceNetwork: Boolean): List {
+ val restParams = RestParams(isForceReadFromNetwork = forceNetwork)
+ val allAlerts = observerApi.getObserverAlerts(studentId, restParams).depaginate {
+ observerApi.getNextPageObserverAlerts(it, restParams)
+ }.dataOrThrow.sortedByDescending { it.actionDate }
+
+ val coursesMap = mutableMapOf()
+ val filteredAlerts = allAlerts.filter { alert ->
+ if (!alert.isQuantitativeRestrictionApplies()) return@filter true
+
+ alert.getCourseId()?.let { courseId ->
+ val settings = coursesMap.getOrPut(courseId) {
+ courseApi.getCourseSettings(courseId, restParams).dataOrNull
+ }
+ settings?.restrictQuantitativeData?.not() ?: true
+ } ?: true
+ }
+
+ return filteredAlerts
+ }
+
+ suspend fun getAlertThresholdForStudent(
+ studentId: Long,
+ forceNetwork: Boolean
+ ): List {
+ val restParams = RestParams(isForceReadFromNetwork = forceNetwork)
+ return observerApi.getObserverAlertThresholds(studentId, restParams).dataOrNull
+ ?: emptyList()
+ }
+
+ suspend fun updateAlertWorkflow(alertId: Long, workflowState: AlertWorkflowState): Alert {
+ val restParams = RestParams(isForceReadFromNetwork = true)
+ return observerApi.updateAlertWorkflow(
+ alertId,
+ workflowState.name.lowercase(),
+ restParams
+ ).dataOrThrow
+ }
+
+ suspend fun getUnreadAlertCount(studentId: Long): Int {
+ val alerts = try {
+ getAlertsForStudent(studentId, true)
+ } catch (e: Exception) {
+ emptyList()
+ }
+ return alerts.count { it.workflowState == AlertWorkflowState.UNREAD }
+ }
+
+}
\ No newline at end of file
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/features/alerts/list/AlertsScreen.kt b/apps/parent/src/main/java/com/instructure/parentapp/features/alerts/list/AlertsScreen.kt
new file mode 100644
index 0000000000..01739d777d
--- /dev/null
+++ b/apps/parent/src/main/java/com/instructure/parentapp/features/alerts/list/AlertsScreen.kt
@@ -0,0 +1,441 @@
+/*
+ * Copyright (C) 2024 - 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 .
+ *
+ */
+@file:OptIn(ExperimentalMaterialApi::class, ExperimentalFoundationApi::class)
+
+package com.instructure.parentapp.features.alerts.list
+
+import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.ExperimentalMaterialApi
+import androidx.compose.material.Icon
+import androidx.compose.material.IconButton
+import androidx.compose.material.Scaffold
+import androidx.compose.material.Text
+import androidx.compose.material.pullrefresh.PullRefreshIndicator
+import androidx.compose.material.pullrefresh.pullRefresh
+import androidx.compose.material.pullrefresh.rememberPullRefreshState
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.toArgb
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.testTag
+import androidx.compose.ui.res.colorResource
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.semantics.semantics
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import com.instructure.canvasapi2.models.AlertType
+import com.instructure.canvasapi2.utils.ContextKeeper
+import com.instructure.canvasapi2.utils.DateHelper
+import com.instructure.pandautils.R
+import com.instructure.pandautils.compose.CanvasTheme
+import com.instructure.pandautils.compose.composables.EmptyContent
+import com.instructure.pandautils.compose.composables.ErrorContent
+import com.instructure.pandautils.compose.composables.Loading
+import com.instructure.pandautils.utils.drawableId
+import java.util.Date
+
+
+@Composable
+fun AlertsScreen(
+ uiState: AlertsUiState,
+ actionHandler: (AlertsAction) -> Unit,
+ modifier: Modifier = Modifier
+) {
+ CanvasTheme {
+ Scaffold(
+ backgroundColor = colorResource(id = R.color.backgroundLightest),
+ content = { padding ->
+ val pullRefreshState = rememberPullRefreshState(
+ refreshing = uiState.isRefreshing,
+ onRefresh = {
+ actionHandler(AlertsAction.Refresh)
+ }
+ )
+ Box(modifier = modifier.pullRefresh(pullRefreshState)) {
+ when {
+ uiState.isError -> {
+ ErrorContent(
+ errorMessage = stringResource(id = R.string.errorLoadingAlerts),
+ retryClick = {
+ actionHandler(AlertsAction.Refresh)
+ }, modifier = Modifier.fillMaxSize()
+ )
+ }
+
+ uiState.isLoading -> {
+ Loading(
+ modifier = Modifier
+ .fillMaxSize()
+ .testTag("loading"),
+ color = Color(uiState.studentColor)
+ )
+ }
+
+ uiState.alerts.isEmpty() -> {
+ EmptyContent(
+ emptyTitle = stringResource(id = R.string.parentNoAlerts),
+ emptyMessage = stringResource(id = R.string.parentNoAlersMessage),
+ imageRes = R.drawable.ic_panda_noalerts,
+ modifier = Modifier
+ .fillMaxSize()
+ .testTag("emptyAlerts")
+ .verticalScroll(rememberScrollState())
+ )
+ }
+
+ else -> {
+ AlertsListContent(
+ uiState = uiState,
+ actionHandler = actionHandler,
+ modifier = Modifier
+ .padding(padding)
+ .fillMaxSize()
+ )
+ }
+ }
+ PullRefreshIndicator(
+ refreshing = uiState.isRefreshing,
+ state = pullRefreshState,
+ modifier = Modifier
+ .align(Alignment.TopCenter)
+ .testTag("pullRefreshIndicator"),
+ contentColor = Color(uiState.studentColor)
+ )
+ }
+
+ },
+ modifier = modifier
+ )
+ }
+}
+
+@Composable
+fun AlertsListContent(
+ uiState: AlertsUiState,
+ actionHandler: (AlertsAction) -> Unit,
+ modifier: Modifier = Modifier
+) {
+ LazyColumn(
+ modifier = modifier
+ ) {
+ items(uiState.alerts, key = { it.alertId }) { alert ->
+ AlertsListItem(
+ alert = alert,
+ userColor = uiState.studentColor,
+ actionHandler = actionHandler,
+ modifier = Modifier.animateItemPlacement()
+ )
+ Spacer(modifier = Modifier.size(8.dp))
+ }
+ }
+}
+
+@Composable
+fun AlertsListItem(
+ alert: AlertsItemUiState,
+ userColor: Int,
+ actionHandler: (AlertsAction) -> Unit,
+ modifier: Modifier = Modifier
+) {
+ val context = LocalContext.current
+
+ fun alertTitle(alertType: AlertType, alertThreshold: String?): String {
+ val threshold = alertThreshold.orEmpty()
+ return when (alertType) {
+ AlertType.ASSIGNMENT_MISSING -> context.getString(R.string.assignmentMissingAlertTitle)
+ AlertType.ASSIGNMENT_GRADE_HIGH -> context.getString(
+ R.string.assignmentGradeHighAlertTitle,
+ threshold
+ )
+ AlertType.ASSIGNMENT_GRADE_LOW -> context.getString(
+ R.string.assignmentGradeLowAlertTitle,
+ threshold
+ )
+ AlertType.COURSE_GRADE_HIGH -> context.getString(
+ R.string.courseGradeHighAlertTitle,
+ threshold
+ )
+ AlertType.COURSE_GRADE_LOW -> context.getString(
+ R.string.courseGradeLowAlertTitle,
+ threshold
+ )
+ AlertType.COURSE_ANNOUNCEMENT -> context.getString(R.string.courseAnnouncementAlertTitle)
+ AlertType.INSTITUTION_ANNOUNCEMENT -> context.getString(R.string.institutionAnnouncementAlertTitle)
+ }
+ }
+
+ fun alertIcon(alertType: AlertType, lockedForUser: Boolean): Int {
+ return when {
+ lockedForUser -> R.drawable.ic_lock_lined
+ alertType.isAlertInfo() || alertType.isAlertPositive() -> R.drawable.ic_info
+ alertType.isAlertNegative() -> R.drawable.ic_warning
+ else -> R.drawable.ic_info
+ }
+ }
+
+ fun alertColor(alertType: AlertType): Int {
+ return when {
+ alertType.isAlertInfo() -> context.getColor(R.color.textDark)
+ alertType.isAlertNegative() -> context.getColor(R.color.textDanger)
+ alertType.isAlertPositive() -> userColor
+ else -> context.getColor(R.color.textDark)
+ }
+ }
+
+ fun dateTime(dateTime: Date): String {
+ val date = DateHelper.getDayMonthDateString(context, dateTime)
+ val time = DateHelper.getFormattedTime(context, dateTime)
+
+ return context.getString(R.string.alertDateTime, date, time)
+ }
+
+ Row(modifier = modifier
+ .fillMaxWidth()
+ .clickable(enabled = alert.htmlUrl != null) {
+ alert.htmlUrl?.let {
+ actionHandler(AlertsAction.Navigate(alert.alertId, it))
+ }
+ }
+ .padding(8.dp)
+ .testTag("alertItem"),
+ verticalAlignment = Alignment.CenterVertically) {
+ Row(modifier = Modifier.align(Alignment.Top)) {
+ if (alert.unread) {
+ Box(
+ modifier = Modifier
+ .size(8.dp)
+ .clip(CircleShape)
+ .background(Color(userColor))
+ .testTag("unreadIndicator")
+ )
+ }
+
+ val iconId = alertIcon(alert.alertType, alert.lockedForUser)
+ Icon(
+ modifier = Modifier
+ .padding(start = if (alert.unread) 0.dp else 8.dp, end = 32.dp)
+ .semantics {
+ drawableId = iconId
+ },
+ painter = painterResource(id = iconId),
+ contentDescription = null,
+ tint = Color(alertColor(alert.alertType))
+ )
+ }
+ Column(modifier = Modifier.weight(1f)) {
+ Text(
+ text = alertTitle(alert.alertType, alert.observerAlertThreshold),
+ style = TextStyle(color = Color(alertColor(alert.alertType)), fontSize = 12.sp)
+ )
+ Text(
+ modifier = Modifier.padding(vertical = 4.dp),
+ text = alert.title,
+ style = TextStyle(color = colorResource(id = R.color.textDarkest), fontSize = 16.sp)
+ )
+ alert.date?.let {
+ Text(
+ text = dateTime(alert.date),
+ style = TextStyle(
+ color = colorResource(id = R.color.textDark),
+ fontSize = 12.sp
+ )
+ )
+ }
+ }
+ IconButton(
+ modifier = Modifier
+ .testTag("dismissButton"),
+ onClick = { actionHandler(AlertsAction.DismissAlert(alert.alertId)) }) {
+ Icon(
+ painter = painterResource(id = R.drawable.ic_close),
+ tint = colorResource(id = R.color.textDark),
+ contentDescription = stringResource(
+ id = R.string.a11y_contentDescription_observerAlertDelete
+ )
+ )
+ }
+ }
+}
+
+@Preview
+@Composable
+fun AlertsScreenPreview() {
+ AlertsScreen(
+ uiState = AlertsUiState(
+ alerts = listOf(
+ AlertsItemUiState(
+ alertId = 1L,
+ title = "Alert title",
+ alertType = AlertType.COURSE_ANNOUNCEMENT,
+ date = Date(),
+ observerAlertThreshold = null,
+ lockedForUser = false,
+ unread = true,
+ htmlUrl = ""
+ ),
+ AlertsItemUiState(
+ alertId = 2L,
+ title = "Assignment missing",
+ alertType = AlertType.ASSIGNMENT_MISSING,
+ date = Date(),
+ observerAlertThreshold = null,
+ lockedForUser = false,
+ unread = false,
+ htmlUrl = ""
+ ),
+ AlertsItemUiState(
+ alertId = 3L,
+ title = "Course grade low",
+ alertType = AlertType.COURSE_GRADE_LOW,
+ date = Date(),
+ observerAlertThreshold = "8",
+ lockedForUser = false,
+ unread = false,
+ htmlUrl = ""
+ ),
+ AlertsItemUiState(
+ alertId = 4L,
+ title = "Course grade high",
+ alertType = AlertType.COURSE_GRADE_HIGH,
+ date = Date(),
+ observerAlertThreshold = "80%",
+ lockedForUser = false,
+ unread = false,
+ htmlUrl = ""
+ ),
+ AlertsItemUiState(
+ alertId = 5L,
+ title = "Institution announcement",
+ alertType = AlertType.INSTITUTION_ANNOUNCEMENT,
+ date = Date(),
+ observerAlertThreshold = null,
+ lockedForUser = false,
+ unread = false,
+ htmlUrl = ""
+ ),
+ AlertsItemUiState(
+ alertId = 6L,
+ title = "Assignment grade low",
+ alertType = AlertType.ASSIGNMENT_GRADE_LOW,
+ date = Date(),
+ observerAlertThreshold = "8",
+ lockedForUser = false,
+ unread = false,
+ htmlUrl = ""
+ ),
+ AlertsItemUiState(
+ alertId = 7L,
+ title = "Assignment grade high",
+ alertType = AlertType.ASSIGNMENT_GRADE_HIGH,
+ date = Date(),
+ observerAlertThreshold = "80%",
+ lockedForUser = false,
+ unread = false,
+ htmlUrl = ""
+ ),
+ AlertsItemUiState(
+ alertId = 8L,
+ title = "Locked alert",
+ alertType = AlertType.COURSE_ANNOUNCEMENT,
+ date = Date(),
+ observerAlertThreshold = null,
+ lockedForUser = true,
+ unread = false,
+ htmlUrl = ""
+ )
+ )
+ ),
+ actionHandler = {}
+ )
+}
+
+@Preview
+@Composable
+fun AlertsScreenErrorPreview() {
+ AlertsScreen(
+ uiState = AlertsUiState(isError = true),
+ actionHandler = {}
+ )
+}
+
+@Preview
+@Composable
+fun AlertsScreenEmptyPreview() {
+ AlertsScreen(
+ uiState = AlertsUiState(),
+ actionHandler = {}
+ )
+}
+
+@Preview
+@Composable
+fun AlertsScreenLoadingPreview() {
+ ContextKeeper.appContext = LocalContext.current
+ AlertsScreen(
+ uiState = AlertsUiState(isLoading = true),
+ actionHandler = {}
+ )
+}
+
+@Preview
+@Composable
+fun AlertsScreenRefreshingPreview() {
+ AlertsScreen(
+ uiState = AlertsUiState(isRefreshing = true),
+ actionHandler = {}
+ )
+}
+
+@Preview
+@Composable
+fun AlertsListItemPreview() {
+ AlertsListItem(
+ alert = AlertsItemUiState(
+ alertId = 1L,
+ title = "Alert title",
+ alertType = AlertType.COURSE_ANNOUNCEMENT,
+ date = Date(),
+ observerAlertThreshold = null,
+ lockedForUser = false,
+ unread = true,
+ htmlUrl = ""
+ ),
+ userColor = Color.Blue.toArgb(),
+ actionHandler = {}
+ )
+}
\ No newline at end of file
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/features/alerts/list/AlertsUiState.kt b/apps/parent/src/main/java/com/instructure/parentapp/features/alerts/list/AlertsUiState.kt
new file mode 100644
index 0000000000..f9199fcd11
--- /dev/null
+++ b/apps/parent/src/main/java/com/instructure/parentapp/features/alerts/list/AlertsUiState.kt
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2024 - 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 .
+ *
+ */ package com.instructure.parentapp.features.alerts.list
+
+import android.graphics.Color
+import androidx.annotation.ColorInt
+import com.instructure.canvasapi2.models.AlertType
+import java.util.Date
+
+data class AlertsUiState(
+ val alerts: List = emptyList(),
+ @ColorInt val studentColor: Int = Color.BLACK,
+ val isLoading: Boolean = false,
+ val isError: Boolean = false,
+ val isRefreshing: Boolean = false
+)
+
+data class AlertsItemUiState(
+ val alertId: Long,
+ val title: String,
+ val alertType: AlertType,
+ val date: Date?,
+ val observerAlertThreshold: String?,
+ val lockedForUser: Boolean,
+ val unread: Boolean,
+ val htmlUrl: String?
+)
+
+sealed class AlertsViewModelAction {
+ data class Navigate(val route: String): AlertsViewModelAction()
+ data class ShowSnackbar(val message: Int, val action: Int?, val actionCallback: (() -> Unit)?): AlertsViewModelAction()
+}
+
+sealed class AlertsAction {
+ data object Refresh : AlertsAction()
+ data class Navigate(val alertId: Long, val route: String) : AlertsAction()
+ data class DismissAlert(val alertId: Long) : AlertsAction()
+}
\ No newline at end of file
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/features/alerts/list/AlertsViewModel.kt b/apps/parent/src/main/java/com/instructure/parentapp/features/alerts/list/AlertsViewModel.kt
new file mode 100644
index 0000000000..84ee8ac7a9
--- /dev/null
+++ b/apps/parent/src/main/java/com/instructure/parentapp/features/alerts/list/AlertsViewModel.kt
@@ -0,0 +1,204 @@
+/*
+ * Copyright (C) 2024 - 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 .
+ *
+ */
+package com.instructure.parentapp.features.alerts.list
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.instructure.canvasapi2.models.Alert
+import com.instructure.canvasapi2.models.AlertThreshold
+import com.instructure.canvasapi2.models.AlertWorkflowState
+import com.instructure.canvasapi2.models.User
+import com.instructure.pandautils.utils.ColorKeeper
+import com.instructure.parentapp.R
+import com.instructure.parentapp.features.dashboard.AlertCountUpdater
+import com.instructure.parentapp.features.dashboard.SelectedStudentHolder
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.channels.Channel
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.flow.receiveAsFlow
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+@HiltViewModel
+class AlertsViewModel @Inject constructor(
+ private val repository: AlertsRepository,
+ private val colorKeeper: ColorKeeper,
+ private val selectedStudentHolder: SelectedStudentHolder,
+ private val alertCountUpdater: AlertCountUpdater
+) : ViewModel() {
+
+ private val _uiState = MutableStateFlow(AlertsUiState())
+ val uiState = _uiState.asStateFlow()
+
+ private val _events = Channel()
+ val events = _events.receiveAsFlow()
+
+ private var selectedStudent: User? = null
+ private var thresholds: Map = emptyMap()
+
+ init {
+ viewModelScope.launch {
+ selectedStudentHolder.selectedStudentState.collectLatest {
+ studentChanged(it)
+ }
+ }
+ }
+
+ private suspend fun studentChanged(student: User?) {
+ if (selectedStudent != student) {
+ selectedStudent = student
+ _uiState.update {
+ it.copy(
+ studentColor = colorKeeper.getOrGenerateUserColor(student).textAndIconColor(),
+ isLoading = true
+ )
+ }
+ loadThresholds()
+ loadAlerts()
+ }
+ }
+
+ private suspend fun loadThresholds(forceNetwork: Boolean = false) {
+ selectedStudent?.let { student ->
+ val thresholds = repository.getAlertThresholdForStudent(student.id, forceNetwork)
+ this.thresholds = thresholds.associateBy { it.id }
+ }
+ }
+
+ private suspend fun loadAlerts(forceNetwork: Boolean = false) {
+ selectedStudent?.let { student ->
+ try {
+ val alerts = repository.getAlertsForStudent(student.id, forceNetwork)
+ val alertItems = alerts.map { createAlertItem(it) }
+ _uiState.update {
+ it.copy(
+ alerts = alertItems,
+ isLoading = false,
+ isError = false,
+ isRefreshing = false,
+ )
+ }
+ } catch (e: Exception) {
+ setError()
+ }
+ } ?: setError()
+
+ alertCountUpdater.updateShouldRefreshAlertCount(true)
+ }
+
+ private fun setError() {
+ _uiState.update {
+ it.copy(isLoading = false, isError = true, isRefreshing = false, alerts = emptyList())
+ }
+ }
+
+ fun handleAction(action: AlertsAction) {
+ when (action) {
+ is AlertsAction.Navigate -> {
+ viewModelScope.launch {
+ _events.send(AlertsViewModelAction.Navigate(action.route))
+ markAlertRead(action.alertId)
+ alertCountUpdater.updateShouldRefreshAlertCount(true)
+ }
+ }
+
+ is AlertsAction.Refresh -> {
+ viewModelScope.launch {
+ _uiState.update { it.copy(isRefreshing = true) }
+ loadThresholds(true)
+ loadAlerts(true)
+ }
+ }
+
+ is AlertsAction.DismissAlert -> {
+ viewModelScope.launch {
+ dismissAlert(action.alertId)
+ }
+ }
+ }
+ }
+
+ private suspend fun markAlertRead(alertId: Long) {
+ try {
+ _uiState.update { uiState ->
+ uiState.copy(
+ alerts = uiState.alerts.map { alertItem ->
+ if (alertItem.alertId == alertId) alertItem.copy(unread = false) else alertItem
+ }
+ )
+ }
+ repository.updateAlertWorkflow(alertId, AlertWorkflowState.READ)
+ alertCountUpdater.updateShouldRefreshAlertCount(true)
+ } catch (e: Exception) {
+ //No need to do anything. The alert will stay read.
+ }
+ }
+
+ private suspend fun dismissAlert(alertId: Long) {
+ fun resetAlert(alert: AlertsItemUiState) {
+ val alerts = _uiState.value.alerts.toMutableList()
+ alerts.add(alert)
+ alerts.sortByDescending { it.date }
+ _uiState.update { it.copy(alerts = alerts) }
+ viewModelScope.launch {
+ alertCountUpdater.updateShouldRefreshAlertCount(true)
+ }
+ }
+
+ val alerts = _uiState.value.alerts.toMutableList()
+ val alert = alerts.find { it.alertId == alertId } ?: return
+ alerts.removeIf { it.alertId == alertId }
+ _uiState.update { it.copy(alerts = alerts) }
+
+ try {
+ repository.updateAlertWorkflow(alertId, AlertWorkflowState.DISMISSED)
+ alertCountUpdater.updateShouldRefreshAlertCount(true)
+ _events.send(AlertsViewModelAction.ShowSnackbar(R.string.alertDismissMessage, R.string.alertDismissAction) {
+ viewModelScope.launch {
+ try {
+ repository.updateAlertWorkflow(
+ alert.alertId,
+ if (alert.unread) AlertWorkflowState.UNREAD else AlertWorkflowState.READ
+ )
+ resetAlert(alert)
+ } catch (e: Exception) {
+ _events.send(AlertsViewModelAction.ShowSnackbar(R.string.alertDismissActionErrorMessage, null, null))
+ }
+ }
+ })
+ } catch (e: Exception) {
+ _events.send(AlertsViewModelAction.ShowSnackbar(R.string.alertDismissErrorMessage, null, null))
+ resetAlert(alert)
+ }
+ }
+
+ private fun createAlertItem(alert: Alert): AlertsItemUiState {
+ return AlertsItemUiState(
+ alertId = alert.id,
+ title = alert.title,
+ alertType = alert.alertType,
+ date = alert.actionDate,
+ observerAlertThreshold = thresholds[alert.observerAlertThresholdId]?.threshold,
+ lockedForUser = alert.lockedForUser,
+ unread = alert.workflowState == AlertWorkflowState.UNREAD,
+ htmlUrl = alert.htmlUrl
+ )
+ }
+}
\ No newline at end of file
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/features/calendar/ParentCalendarFragment.kt b/apps/parent/src/main/java/com/instructure/parentapp/features/calendar/ParentCalendarFragment.kt
new file mode 100644
index 0000000000..9f5d6762b0
--- /dev/null
+++ b/apps/parent/src/main/java/com/instructure/parentapp/features/calendar/ParentCalendarFragment.kt
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2024 - 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 .
+ *
+ */
+package com.instructure.parentapp.features.calendar
+
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.flowWithLifecycle
+import androidx.lifecycle.lifecycleScope
+import com.instructure.pandautils.features.calendar.BaseCalendarFragment
+import com.instructure.pandautils.utils.ColorKeeper
+import com.instructure.pandautils.utils.ViewStyler
+import com.instructure.parentapp.features.dashboard.SelectedStudentHolder
+import com.instructure.parentapp.util.ParentPrefs
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class ParentCalendarFragment : BaseCalendarFragment() {
+
+ @Inject
+ lateinit var selectedStudentHolder: SelectedStudentHolder
+
+ override fun onStart() {
+ super.onStart()
+ lifecycleScope.launch {
+ selectedStudentHolder.selectedStudentChangedFlow.flowWithLifecycle(lifecycle, Lifecycle.State.STARTED).collectLatest {
+ delay(100)
+ refreshCalendar()
+ }
+ }
+ }
+
+ override fun applyTheme() {
+ val student = ParentPrefs.currentStudent
+ val color = ColorKeeper.getOrGenerateUserColor(student).backgroundColor()
+ ViewStyler.setStatusBarDark(requireActivity(), color)
+ }
+
+ override fun showToolbar(): Boolean = false
+}
\ No newline at end of file
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/features/calendar/ParentCalendarRepository.kt b/apps/parent/src/main/java/com/instructure/parentapp/features/calendar/ParentCalendarRepository.kt
new file mode 100644
index 0000000000..2a12e6151d
--- /dev/null
+++ b/apps/parent/src/main/java/com/instructure/parentapp/features/calendar/ParentCalendarRepository.kt
@@ -0,0 +1,173 @@
+/*
+ * Copyright (C) 2024 - 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 .
+ *
+ */
+package com.instructure.parentapp.features.calendar
+
+import com.instructure.canvasapi2.apis.CalendarEventAPI
+import com.instructure.canvasapi2.apis.CourseAPI
+import com.instructure.canvasapi2.apis.FeaturesAPI
+import com.instructure.canvasapi2.apis.PlannerAPI
+import com.instructure.canvasapi2.builders.RestParams
+import com.instructure.canvasapi2.models.CanvasContext
+import com.instructure.canvasapi2.models.Plannable
+import com.instructure.canvasapi2.models.PlannableType
+import com.instructure.canvasapi2.models.PlannerItem
+import com.instructure.canvasapi2.models.toPlannerItems
+import com.instructure.canvasapi2.utils.ApiPrefs
+import com.instructure.canvasapi2.utils.DataResult
+import com.instructure.canvasapi2.utils.depaginate
+import com.instructure.canvasapi2.utils.toDate
+import com.instructure.pandautils.features.calendar.CalendarRepository
+import com.instructure.pandautils.room.calendar.daos.CalendarFilterDao
+import com.instructure.pandautils.room.calendar.entities.CalendarFilterEntity
+import com.instructure.pandautils.utils.orDefault
+import com.instructure.parentapp.util.ParentPrefs
+import kotlinx.coroutines.async
+import kotlinx.coroutines.awaitAll
+import kotlinx.coroutines.coroutineScope
+
+class ParentCalendarRepository(
+ private val plannerApi: PlannerAPI.PlannerInterface,
+ private val coursesApi: CourseAPI.CoursesInterface,
+ private val calendarEventApi: CalendarEventAPI.CalendarEventInterface,
+ private val apiPrefs: ApiPrefs,
+ private val featuresApi: FeaturesAPI.FeaturesInterface,
+ private val parentPrefs: ParentPrefs,
+ private val calendarFilterDao: CalendarFilterDao
+) : CalendarRepository {
+
+ private var canvasContexts: List = emptyList()
+
+ override suspend fun getPlannerItems(
+ startDate: String,
+ endDate: String,
+ contextCodes: List,
+ forceNetwork: Boolean
+ ): List {
+ if (contextCodes.isEmpty()) return emptyList()
+
+ val restParams = RestParams(usePerPageQueryParam = true, isForceReadFromNetwork = forceNetwork)
+
+ val allItems = coroutineScope {
+ val calendarEvents = async {
+ calendarEventApi.getCalendarEvents(
+ false,
+ CalendarEventAPI.CalendarEventType.CALENDAR.apiName,
+ startDate,
+ endDate,
+ contextCodes,
+ restParams
+ ).depaginate {
+ calendarEventApi.next(it, restParams)
+ }.dataOrThrow.toPlannerItems(PlannableType.CALENDAR_EVENT)
+ }
+
+ val calendarAssignments = async {
+ calendarEventApi.getCalendarEvents(
+ false,
+ CalendarEventAPI.CalendarEventType.ASSIGNMENT.apiName,
+ startDate,
+ endDate,
+ contextCodes,
+ restParams
+ ).depaginate {
+ calendarEventApi.next(it, restParams)
+ }.dataOrThrow.toPlannerItems(PlannableType.ASSIGNMENT)
+ }
+
+ val plannerNotes = async {
+ plannerApi.getPlannerNotes(startDate, endDate, contextCodes, restParams).depaginate {
+ plannerApi.nextPagePlannerNotes(it, restParams)
+ }.dataOrThrow.toPlannerItems()
+ }
+
+ return@coroutineScope listOf(calendarEvents, calendarAssignments, plannerNotes).awaitAll()
+ }
+
+ return allItems.flatten().sortedBy { it.plannableDate }
+ }
+
+ override suspend fun getCanvasContexts(): DataResult>> {
+ val params = RestParams(usePerPageQueryParam = true)
+
+ val coursesResult = coursesApi.firstPageObserveeCourses(params)
+ .depaginate { nextUrl -> coursesApi.next(nextUrl, params) }
+
+ val currentStudent = parentPrefs.currentStudent
+
+ return if (coursesResult is DataResult.Success) {
+ val validCourses = coursesResult.data.filter { it.isObserver }.filter {
+ it.enrollments?.any { enrollment -> enrollment.userId == currentStudent?.id }.orDefault()
+ }
+ val users = apiPrefs.user?.let { listOf(it) } ?: emptyList()
+ val contexts = (users + validCourses).groupBy { it.type }.filter { it.value.isNotEmpty() }
+ canvasContexts = contexts.values.flatten()
+ DataResult.Success(contexts)
+ } else {
+ DataResult.Fail()
+ }
+ }
+
+ override suspend fun getCalendarFilterLimit(): Int {
+ val result = featuresApi.getAccountSettingsFeatures(RestParams())
+ return if (result.isSuccess) {
+ val features = result.dataOrThrow
+ val increasedContextLimit = features["calendar_contexts_limit"]
+ if (increasedContextLimit == true) 20 else 10
+ } else {
+ 10
+ }
+ }
+
+ private fun List.toPlannerItems(): List {
+ return mapNotNull { plannable ->
+ val contextType = if (plannable.courseId != null) CanvasContext.Type.COURSE.apiString else CanvasContext.Type.USER.apiString
+ val contextName = if (plannable.courseId != null) canvasContexts.find { it.id == plannable.courseId }?.name else null
+ val plannableDate = plannable.todoDate.toDate()
+ if (plannableDate == null) {
+ null
+ } else {
+ PlannerItem(
+ courseId = plannable.courseId,
+ groupId = plannable.groupId,
+ userId = plannable.userId,
+ contextType = contextType,
+ contextName = contextName,
+ plannableType = PlannableType.PLANNER_NOTE,
+ plannable = plannable,
+ plannableDate = plannableDate,
+ htmlUrl = null,
+ submissionState = null,
+ newActivity = false,
+ plannerOverride = null
+ )
+ }
+ }
+ }
+
+ override suspend fun getCalendarFilters(): CalendarFilterEntity? {
+ return calendarFilterDao.findByUserIdAndDomainAndObserveeId(
+ apiPrefs.user?.id.orDefault(),
+ apiPrefs.fullDomain,
+ parentPrefs.currentStudent?.id.orDefault()
+ )
+ }
+
+ override suspend fun updateCalendarFilters(calendarFilterEntity: CalendarFilterEntity) {
+ val updatedEntity = calendarFilterEntity.copy(observeeId = parentPrefs.currentStudent?.id.orDefault(-1))
+ calendarFilterDao.insertOrUpdate(updatedEntity)
+ }
+}
\ No newline at end of file
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/features/calendar/ParentCalendarRouter.kt b/apps/parent/src/main/java/com/instructure/parentapp/features/calendar/ParentCalendarRouter.kt
new file mode 100644
index 0000000000..9532b182e1
--- /dev/null
+++ b/apps/parent/src/main/java/com/instructure/parentapp/features/calendar/ParentCalendarRouter.kt
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2024 - 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 .
+ *
+ */
+package com.instructure.parentapp.features.calendar
+
+import androidx.fragment.app.FragmentActivity
+import com.instructure.canvasapi2.models.CanvasContext
+import com.instructure.canvasapi2.models.PlannerItem
+import com.instructure.pandautils.features.calendar.CalendarRouter
+import com.instructure.parentapp.util.navigation.Navigation
+
+class ParentCalendarRouter(
+ private val activity: FragmentActivity,
+ private val navigation: Navigation
+) : CalendarRouter {
+
+ // This is a no-op in the Parent app, navigation drawer is already handled in the DashboardFragment
+ override fun openNavigationDrawer() = Unit
+
+ override fun openAssignment(canvasContext: CanvasContext, assignmentId: Long) {
+ // TODO Implement in the assignment details ticket
+ }
+
+ override fun openDiscussion(canvasContext: CanvasContext, discussionId: Long) {
+ // TODO Implement in the assignment details ticket
+ }
+
+ override fun openQuiz(canvasContext: CanvasContext, htmlUrl: String) {
+ // TODO Implement in the assignment details ticket
+ }
+
+ override fun openCalendarEvent(canvasContext: CanvasContext, eventId: Long) {
+ navigation.navigate(activity, navigation.calendarEventRoute(canvasContext.type.apiString, canvasContext.id, eventId))
+ }
+
+ override fun openToDo(plannerItem: PlannerItem) {
+ navigation.navigate(activity, navigation.toDoRoute(plannerItem))
+ }
+
+ override fun openCreateToDo(initialDateString: String?) {
+ navigation.navigate(activity, navigation.createToDoRoute(initialDateString))
+ }
+
+ override fun openCreateEvent(initialDateString: String?) {
+ navigation.navigate(activity, navigation.createEventRoute(initialDateString))
+ }
+
+ // This is a no-op in the Parent app, navigation drawer is already handled in the DashboardFragment
+ override fun attachNavigationDrawer() = Unit
+}
\ No newline at end of file
diff --git a/apps/teacher/src/main/java/com/instructure/teacher/factory/DiscussionsReplyFactory.kt b/apps/parent/src/main/java/com/instructure/parentapp/features/calendarevent/ParentCreateUpdateEventRepository.kt
similarity index 52%
rename from apps/teacher/src/main/java/com/instructure/teacher/factory/DiscussionsReplyFactory.kt
rename to apps/parent/src/main/java/com/instructure/parentapp/features/calendarevent/ParentCreateUpdateEventRepository.kt
index 91ec1c8286..de13d2dff9 100644
--- a/apps/teacher/src/main/java/com/instructure/teacher/factory/DiscussionsReplyFactory.kt
+++ b/apps/parent/src/main/java/com/instructure/parentapp/features/calendarevent/ParentCreateUpdateEventRepository.kt
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2017 - present Instructure, Inc.
+ * Copyright (C) 2024 - 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
@@ -14,19 +14,21 @@
* along with this program. If not, see .
*
*/
-package com.instructure.teacher.factory
+package com.instructure.parentapp.features.calendarevent
+
+import com.instructure.canvasapi2.apis.CalendarEventAPI
import com.instructure.canvasapi2.models.CanvasContext
-import com.instructure.teacher.presenters.DiscussionsReplyPresenter
-import com.instructure.teacher.viewinterface.DiscussionsReplyView
-import instructure.androidblueprint.PresenterFactory
+import com.instructure.canvasapi2.utils.ApiPrefs
+import com.instructure.pandautils.features.calendarevent.createupdate.CreateUpdateEventRepository
+
-class DiscussionsReplyFactory(
- val canvasContext: CanvasContext,
- val discussionTopicHeaderId: Long,
- val discussionEntryId: Long) : PresenterFactory {
+class ParentCreateUpdateEventRepository(
+ calendarEventApi: CalendarEventAPI.CalendarEventInterface,
+ private val apiPrefs: ApiPrefs,
+) : CreateUpdateEventRepository(calendarEventApi) {
- override fun create(): DiscussionsReplyPresenter {
- return DiscussionsReplyPresenter(canvasContext, discussionTopicHeaderId, discussionEntryId)
+ override suspend fun getCanvasContexts(): List {
+ return apiPrefs.user?.let { listOf(it) } ?: emptyList()
}
}
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/features/calendarevent/ParentEventRouter.kt b/apps/parent/src/main/java/com/instructure/parentapp/features/calendarevent/ParentEventRouter.kt
new file mode 100644
index 0000000000..979f085a70
--- /dev/null
+++ b/apps/parent/src/main/java/com/instructure/parentapp/features/calendarevent/ParentEventRouter.kt
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2024 - 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 .
+ *
+ */
+package com.instructure.parentapp.features.calendarevent
+
+import androidx.fragment.app.FragmentActivity
+import com.instructure.canvasapi2.models.ScheduleItem
+import com.instructure.pandautils.features.calendarevent.details.EventRouter
+import com.instructure.parentapp.util.navigation.Navigation
+
+class ParentEventRouter(private val activity: FragmentActivity, private val navigation: Navigation) : EventRouter {
+
+ override fun openEditEvent(scheduleItem: ScheduleItem) {
+ navigation.navigate(activity, navigation.updateEventRoute(scheduleItem))
+ }
+}
\ No newline at end of file
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/features/calendartodo/ParentCreateUpdateToDoRepository.kt b/apps/parent/src/main/java/com/instructure/parentapp/features/calendartodo/ParentCreateUpdateToDoRepository.kt
new file mode 100644
index 0000000000..87858dd5e0
--- /dev/null
+++ b/apps/parent/src/main/java/com/instructure/parentapp/features/calendartodo/ParentCreateUpdateToDoRepository.kt
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2024 - 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 .
+ *
+ */
+package com.instructure.parentapp.features.calendartodo
+
+import com.instructure.canvasapi2.apis.CourseAPI
+import com.instructure.canvasapi2.apis.PlannerAPI
+import com.instructure.canvasapi2.builders.RestParams
+import com.instructure.canvasapi2.models.Course
+import com.instructure.canvasapi2.utils.depaginate
+import com.instructure.pandautils.features.calendartodo.createupdate.CreateUpdateToDoRepository
+import com.instructure.pandautils.utils.orDefault
+import com.instructure.parentapp.util.ParentPrefs
+
+class ParentCreateUpdateToDoRepository(
+ private val coursesApi: CourseAPI.CoursesInterface,
+ private val parentPrefs: ParentPrefs,
+ plannerApi: PlannerAPI.PlannerInterface
+) : CreateUpdateToDoRepository(plannerApi) {
+
+ override suspend fun getCourses(): List {
+ val params = RestParams(usePerPageQueryParam = true)
+
+ val coursesResult = coursesApi.firstPageObserveeCourses(params)
+ .depaginate { nextUrl -> coursesApi.next(nextUrl, params) }
+ .dataOrNull.orEmpty()
+
+ val currentStudent = parentPrefs.currentStudent
+
+ return coursesResult.filter { it.isObserver }.filter {
+ it.enrollments?.any { enrollment -> enrollment.userId == currentStudent?.id }.orDefault()
+ }
+ }
+}
\ No newline at end of file
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/features/calendartodo/ParentToDoRouter.kt b/apps/parent/src/main/java/com/instructure/parentapp/features/calendartodo/ParentToDoRouter.kt
new file mode 100644
index 0000000000..14bfd4933e
--- /dev/null
+++ b/apps/parent/src/main/java/com/instructure/parentapp/features/calendartodo/ParentToDoRouter.kt
@@ -0,0 +1,12 @@
+package com.instructure.parentapp.features.calendartodo
+
+import androidx.fragment.app.FragmentActivity
+import com.instructure.canvasapi2.models.PlannerItem
+import com.instructure.pandautils.features.calendartodo.details.ToDoRouter
+import com.instructure.parentapp.util.navigation.Navigation
+
+class ParentToDoRouter(private val activity: FragmentActivity, private val navigation: Navigation) : ToDoRouter {
+ override fun openEditToDo(plannerItem: PlannerItem) {
+ navigation.navigate(activity, navigation.updateToDoRoute(plannerItem))
+ }
+}
\ No newline at end of file
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/features/courses/details/CourseDetailsFragment.kt b/apps/parent/src/main/java/com/instructure/parentapp/features/courses/details/CourseDetailsFragment.kt
new file mode 100644
index 0000000000..5435b31b82
--- /dev/null
+++ b/apps/parent/src/main/java/com/instructure/parentapp/features/courses/details/CourseDetailsFragment.kt
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2024 - 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 .
+ *
+ */
+
+package com.instructure.parentapp.features.courses.details
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.compose.material.Text
+import androidx.compose.ui.platform.ComposeView
+import androidx.fragment.app.Fragment
+
+
+class CourseDetailsFragment : Fragment() {
+
+ override fun onCreateView(
+ inflater: LayoutInflater,
+ container: ViewGroup?,
+ savedInstanceState: Bundle?
+ ): View {
+ return ComposeView(requireActivity()).apply {
+ setContent {
+ Text(text = "Course Details")
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/features/courses/list/CourseGradeFormatter.kt b/apps/parent/src/main/java/com/instructure/parentapp/features/courses/list/CourseGradeFormatter.kt
new file mode 100644
index 0000000000..1096da8778
--- /dev/null
+++ b/apps/parent/src/main/java/com/instructure/parentapp/features/courses/list/CourseGradeFormatter.kt
@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) 2024 - 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 .
+ *
+ */
+
+package com.instructure.parentapp.features.courses.list
+
+import android.content.Context
+import com.instructure.canvasapi2.models.Course
+import com.instructure.pandautils.utils.orDefault
+import com.instructure.parentapp.R
+import dagger.hilt.android.qualifiers.ApplicationContext
+import java.text.NumberFormat
+
+
+class CourseGradeFormatter(@ApplicationContext private val context: Context) {
+
+ private val percentageFormat = NumberFormat.getPercentInstance().apply {
+ maximumFractionDigits = 2
+ }
+
+ fun getGradeText(course: Course, selectedStudentId: Long): String? {
+ val enrollment = course.enrollments?.find { it.userId == selectedStudentId } ?: return null
+ val grade = course.parentGetCourseGradeFromEnrollment(
+ enrollment,
+ course.enrollments.orEmpty().any {
+ !it.hasActiveGradingPeriod()
+ }
+ )
+
+ val restrictQuantitativeData = course.settings?.restrictQuantitativeData.orDefault()
+ if (grade.isLocked || (restrictQuantitativeData && !grade.hasCurrentGradeString())) return null
+
+ val formattedScore = grade.currentScore?.takeIf {
+ !restrictQuantitativeData
+ }?.let {
+ percentageFormat.format(it / 100)
+ }.orEmpty()
+
+ return when {
+ grade.noCurrentGrade -> context.getString(R.string.noGrade)
+ !grade.currentGrade.isNullOrEmpty() -> "${grade.currentGrade} $formattedScore"
+ else -> formattedScore
+ }
+ }
+}
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/features/courses/list/CoursesFragment.kt b/apps/parent/src/main/java/com/instructure/parentapp/features/courses/list/CoursesFragment.kt
new file mode 100644
index 0000000000..1fd6b2e8a0
--- /dev/null
+++ b/apps/parent/src/main/java/com/instructure/parentapp/features/courses/list/CoursesFragment.kt
@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2024 - 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 .
+ *
+ */
+
+package com.instructure.parentapp.features.courses.list
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.platform.ComposeView
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.viewModels
+import androidx.lifecycle.lifecycleScope
+import com.instructure.pandautils.utils.collectOneOffEvents
+import com.instructure.parentapp.util.navigation.Navigation
+import dagger.hilt.android.AndroidEntryPoint
+import javax.inject.Inject
+
+
+@AndroidEntryPoint
+class CoursesFragment : Fragment() {
+
+ private val viewModel: CoursesViewModel by viewModels()
+
+ @Inject
+ lateinit var navigation: Navigation
+
+ override fun onCreateView(
+ inflater: LayoutInflater,
+ container: ViewGroup?,
+ savedInstanceState: Bundle?
+ ): View {
+ lifecycleScope.collectOneOffEvents(viewModel.events, ::handleAction)
+
+ return ComposeView(requireActivity()).apply {
+ setContent {
+ val uiState by viewModel.uiState.collectAsState()
+ CoursesScreen(uiState, viewModel::handleAction)
+ }
+ }
+ }
+
+ private fun handleAction(action: CoursesViewModelAction) {
+ when (action) {
+ is CoursesViewModelAction.NavigateToCourseDetails -> {
+ navigation.navigate(activity, navigation.courseDetailsRoute(action.courseId))
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/features/courses/list/CoursesRepository.kt b/apps/parent/src/main/java/com/instructure/parentapp/features/courses/list/CoursesRepository.kt
new file mode 100644
index 0000000000..10550dd3b1
--- /dev/null
+++ b/apps/parent/src/main/java/com/instructure/parentapp/features/courses/list/CoursesRepository.kt
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2024 - 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 .
+ *
+ */
+
+package com.instructure.parentapp.features.courses.list
+
+import com.instructure.canvasapi2.apis.CourseAPI
+import com.instructure.canvasapi2.builders.RestParams
+import com.instructure.canvasapi2.models.Course
+import com.instructure.canvasapi2.utils.depaginate
+import com.instructure.pandautils.utils.orDefault
+
+
+class CoursesRepository(
+ private val courseApi: CourseAPI.CoursesInterface
+) {
+
+ suspend fun getCourses(studentId: Long, forceRefresh: Boolean): List {
+ val params = RestParams(isForceReadFromNetwork = forceRefresh)
+ return courseApi.firstPageObserveeCourses(params).depaginate { nextUrl ->
+ courseApi.next(nextUrl, params)
+ }.dataOrThrow.filter {
+ it.enrollments?.any { enrollment ->
+ enrollment.userId == studentId
+ }.orDefault()
+ }
+ }
+}
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/features/courses/list/CoursesScreen.kt b/apps/parent/src/main/java/com/instructure/parentapp/features/courses/list/CoursesScreen.kt
new file mode 100644
index 0000000000..fecbb39972
--- /dev/null
+++ b/apps/parent/src/main/java/com/instructure/parentapp/features/courses/list/CoursesScreen.kt
@@ -0,0 +1,178 @@
+/*
+ * Copyright (C) 2024 - 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 .
+ *
+ */
+
+package com.instructure.parentapp.features.courses.list
+
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.material.ExperimentalMaterialApi
+import androidx.compose.material.Scaffold
+import androidx.compose.material.Text
+import androidx.compose.material.pullrefresh.PullRefreshIndicator
+import androidx.compose.material.pullrefresh.pullRefresh
+import androidx.compose.material.pullrefresh.rememberPullRefreshState
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.testTag
+import androidx.compose.ui.res.colorResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import com.instructure.pandautils.R
+import com.instructure.pandautils.compose.CanvasTheme
+import com.instructure.pandautils.compose.composables.EmptyContent
+import com.instructure.pandautils.compose.composables.ErrorContent
+
+
+@Composable
+internal fun CoursesScreen(
+ uiState: CoursesUiState,
+ actionHandler: (CoursesAction) -> Unit,
+ modifier: Modifier = Modifier
+) {
+ CanvasTheme {
+ Scaffold(
+ backgroundColor = colorResource(id = R.color.backgroundLightest),
+ content = { padding ->
+ if (uiState.isError) {
+ ErrorContent(
+ errorMessage = stringResource(id = R.string.errorLoadingCourses),
+ retryClick = {
+ actionHandler(CoursesAction.Refresh)
+ }, modifier = Modifier.fillMaxSize()
+ )
+ } else if (uiState.isEmpty) {
+ EmptyContent(
+ emptyTitle = stringResource(id = R.string.parentNoCourses),
+ emptyMessage = stringResource(id = R.string.parentNoCoursesMessage),
+ imageRes = R.drawable.ic_panda_book,
+ modifier = Modifier.fillMaxSize()
+ )
+ } else {
+ CourseListContent(
+ uiState = uiState,
+ actionHandler = actionHandler,
+ modifier = Modifier
+ .padding(padding)
+ .fillMaxSize()
+ )
+ }
+ },
+ modifier = modifier
+ )
+ }
+}
+
+@OptIn(ExperimentalMaterialApi::class)
+@Composable
+private fun CourseListContent(
+ uiState: CoursesUiState,
+ actionHandler: (CoursesAction) -> Unit,
+ modifier: Modifier = Modifier
+) {
+ val pullRefreshState = rememberPullRefreshState(
+ refreshing = uiState.isLoading,
+ onRefresh = {
+ actionHandler(CoursesAction.Refresh)
+ }
+ )
+
+ Box(
+ modifier = modifier.pullRefresh(pullRefreshState)
+ ) {
+ LazyColumn(
+ modifier = Modifier.fillMaxSize()
+ ) {
+ items(uiState.courseListItems) {
+ CourseListItem(it, uiState.studentColor, actionHandler)
+ }
+ }
+
+ PullRefreshIndicator(
+ refreshing = uiState.isLoading,
+ state = pullRefreshState,
+ modifier = Modifier
+ .align(Alignment.TopCenter)
+ .testTag("pullRefreshIndicator"),
+ contentColor = Color(uiState.studentColor)
+ )
+ }
+}
+
+@Composable
+private fun CourseListItem(
+ uiState: CourseListItemUiState,
+ studentColor: Int,
+ actionHandler: (CoursesAction) -> Unit,
+ modifier: Modifier = Modifier
+) {
+ Column(
+ modifier = modifier
+ .fillMaxWidth()
+ .testTag("courseListItem")
+ .clickable {
+ actionHandler(CoursesAction.CourseTapped(uiState.courseId))
+ }
+ .padding(horizontal = 16.dp, vertical = 8.dp)
+ ) {
+ Text(
+ text = uiState.courseName,
+ color = colorResource(id = R.color.textDarkest),
+ fontSize = 16.sp
+ )
+ uiState.courseCode?.let {
+ Text(
+ text = uiState.courseCode,
+ color = colorResource(id = R.color.textDark),
+ fontSize = 14.sp
+ )
+ }
+ uiState.grade?.let {
+ Text(
+ text = uiState.grade,
+ color = Color(studentColor),
+ fontSize = 16.sp,
+ modifier = Modifier.testTag("gradeText")
+ )
+ }
+ }
+}
+
+@Preview(showBackground = true)
+@Composable
+private fun CourseListPreview() {
+ CoursesScreen(
+ uiState = CoursesUiState(
+ studentColor = android.graphics.Color.RED,
+ courseListItems = listOf(
+ CourseListItemUiState(1L, "Course 1", "course-1", "A"),
+ CourseListItemUiState(2L, "Course 2", "course-2", ""),
+ CourseListItemUiState(3L, "Course 3", "", "C")
+ )
+ ),
+ actionHandler = {}
+ )
+}
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/features/courses/list/CoursesUiState.kt b/apps/parent/src/main/java/com/instructure/parentapp/features/courses/list/CoursesUiState.kt
new file mode 100644
index 0000000000..aa49968991
--- /dev/null
+++ b/apps/parent/src/main/java/com/instructure/parentapp/features/courses/list/CoursesUiState.kt
@@ -0,0 +1,30 @@
+package com.instructure.parentapp.features.courses.list
+
+import android.graphics.Color
+import androidx.annotation.ColorInt
+
+
+data class CoursesUiState(
+ val isLoading: Boolean = true,
+ val isError: Boolean = false,
+ val courseListItems: List = emptyList(),
+ @ColorInt val studentColor: Int = Color.BLACK
+) {
+ val isEmpty = courseListItems.isEmpty() && !isLoading
+}
+
+data class CourseListItemUiState(
+ val courseId: Long,
+ val courseName: String = "",
+ val courseCode: String? = null,
+ val grade: String? = null
+)
+
+sealed class CoursesAction {
+ data class CourseTapped(val courseId: Long) : CoursesAction()
+ data object Refresh : CoursesAction()
+}
+
+sealed class CoursesViewModelAction {
+ data class NavigateToCourseDetails(val courseId: Long) : CoursesViewModelAction()
+}
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/features/courses/list/CoursesViewModel.kt b/apps/parent/src/main/java/com/instructure/parentapp/features/courses/list/CoursesViewModel.kt
new file mode 100644
index 0000000000..72f5a8353e
--- /dev/null
+++ b/apps/parent/src/main/java/com/instructure/parentapp/features/courses/list/CoursesViewModel.kt
@@ -0,0 +1,125 @@
+/*
+ * Copyright (C) 2024 - 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 .
+ *
+ */
+
+package com.instructure.parentapp.features.courses.list
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.instructure.canvasapi2.models.User
+import com.instructure.canvasapi2.utils.weave.catch
+import com.instructure.canvasapi2.utils.weave.tryLaunch
+import com.instructure.pandautils.utils.ColorKeeper
+import com.instructure.parentapp.features.dashboard.SelectedStudentHolder
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.channels.Channel
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.receiveAsFlow
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+
+@HiltViewModel
+class CoursesViewModel @Inject constructor(
+ private val repository: CoursesRepository,
+ private val colorKeeper: ColorKeeper,
+ private val selectedStudentHolder: SelectedStudentHolder,
+ private val courseGradeFormatter: CourseGradeFormatter
+) : ViewModel() {
+
+ private val _uiState = MutableStateFlow(CoursesUiState())
+ val uiState = _uiState.asStateFlow()
+
+ private val _events = Channel()
+ val events = _events.receiveAsFlow()
+
+ private var selectedStudent: User? = null
+
+ init {
+ viewModelScope.launch {
+ selectedStudentHolder.selectedStudentState.collect {
+ studentChanged(it)
+ }
+ }
+ }
+
+ private fun loadCourses(forceRefresh: Boolean = false) {
+ viewModelScope.tryLaunch {
+ val color = colorKeeper.getOrGenerateUserColor(selectedStudent).textAndIconColor()
+
+ _uiState.update {
+ it.copy(
+ isLoading = true,
+ isError = false,
+ studentColor = color
+ )
+ }
+
+ selectedStudent?.id?.let {
+ val courses = repository.getCourses(it, forceRefresh)
+ _uiState.update { state ->
+ state.copy(
+ isLoading = false,
+ courseListItems = courses.map { course ->
+ CourseListItemUiState(
+ course.id,
+ course.name,
+ course.courseCode,
+ courseGradeFormatter.getGradeText(course, it)
+ )
+ }
+ )
+ }
+ } ?: run {
+ setErrorState()
+ }
+ } catch {
+ setErrorState()
+ }
+ }
+
+ private fun setErrorState() {
+ _uiState.update {
+ it.copy(
+ isLoading = false,
+ isError = true
+ )
+ }
+ }
+
+ private fun studentChanged(student: User?) {
+ if (selectedStudent != student) {
+ selectedStudent = student
+ loadCourses()
+ }
+ }
+
+ fun handleAction(action: CoursesAction) {
+ when (action) {
+ is CoursesAction.CourseTapped -> {
+ viewModelScope.launch {
+ _events.send(CoursesViewModelAction.NavigateToCourseDetails(action.courseId))
+ }
+ }
+
+ is CoursesAction.Refresh -> {
+ loadCourses(true)
+ }
+ }
+ }
+}
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/features/dashboard/AlertCountUpdater.kt b/apps/parent/src/main/java/com/instructure/parentapp/features/dashboard/AlertCountUpdater.kt
new file mode 100644
index 0000000000..7873738602
--- /dev/null
+++ b/apps/parent/src/main/java/com/instructure/parentapp/features/dashboard/AlertCountUpdater.kt
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2024 - 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 .
+ *
+ */ package com.instructure.parentapp.features.dashboard
+
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.SharedFlow
+import kotlinx.coroutines.flow.asSharedFlow
+
+interface AlertCountUpdater {
+ val shouldRefreshAlertCountFlow: SharedFlow
+ suspend fun updateShouldRefreshAlertCount(shouldRefresh: Boolean)
+}
+
+class AlertCountUpdaterImpl : AlertCountUpdater {
+ private val _shouldRefreshAlertCountFlow = MutableSharedFlow(replay = 1)
+ override val shouldRefreshAlertCountFlow = _shouldRefreshAlertCountFlow.asSharedFlow()
+
+ override suspend fun updateShouldRefreshAlertCount(shouldRefresh: Boolean) {
+ _shouldRefreshAlertCountFlow.emit(shouldRefresh)
+ }
+}
\ No newline at end of file
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/features/dashboard/DashboardFragment.kt b/apps/parent/src/main/java/com/instructure/parentapp/features/dashboard/DashboardFragment.kt
new file mode 100644
index 0000000000..6bbf91cbfa
--- /dev/null
+++ b/apps/parent/src/main/java/com/instructure/parentapp/features/dashboard/DashboardFragment.kt
@@ -0,0 +1,309 @@
+/*
+ * Copyright (C) 2024 - 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 .
+ *
+ */
+
+package com.instructure.parentapp.features.dashboard
+
+import android.content.res.ColorStateList
+import android.graphics.drawable.GradientDrawable
+import android.os.Bundle
+import android.view.Gravity
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.LinearLayout
+import android.widget.TextView
+import androidx.appcompat.app.AlertDialog
+import androidx.core.view.GravityCompat
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.viewModels
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.flowWithLifecycle
+import androidx.lifecycle.lifecycleScope
+import androidx.navigation.NavController
+import androidx.navigation.fragment.NavHostFragment
+import com.google.firebase.crashlytics.FirebaseCrashlytics
+import com.instructure.canvasapi2.models.User
+import com.instructure.loginapi.login.tasks.LogoutTask
+import com.instructure.pandautils.features.calendar.CalendarSharedEvents
+import com.instructure.pandautils.features.calendar.SharedCalendarAction
+import com.instructure.pandautils.features.help.HelpDialogFragment
+import com.instructure.pandautils.interfaces.NavigationCallbacks
+import com.instructure.pandautils.utils.ColorKeeper
+import com.instructure.pandautils.utils.ViewStyler
+import com.instructure.pandautils.utils.animateCircularBackgroundColorChange
+import com.instructure.pandautils.utils.applyTheme
+import com.instructure.pandautils.utils.collectOneOffEvents
+import com.instructure.pandautils.utils.getDrawableCompat
+import com.instructure.pandautils.utils.onClick
+import com.instructure.pandautils.utils.setGone
+import com.instructure.pandautils.utils.setVisible
+import com.instructure.pandautils.utils.showThemed
+import com.instructure.pandautils.utils.toPx
+import com.instructure.parentapp.R
+import com.instructure.parentapp.databinding.FragmentDashboardBinding
+import com.instructure.parentapp.databinding.NavigationDrawerHeaderLayoutBinding
+import com.instructure.parentapp.util.ParentLogoutTask
+import com.instructure.parentapp.util.ParentPrefs
+import com.instructure.parentapp.util.navigation.Navigation
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.launch
+import org.threeten.bp.LocalDate
+import javax.inject.Inject
+
+
+@AndroidEntryPoint
+class DashboardFragment : Fragment(), NavigationCallbacks {
+
+ private lateinit var binding: FragmentDashboardBinding
+
+ private val viewModel: DashboardViewModel by viewModels()
+
+ @Inject
+ lateinit var navigation: Navigation
+
+ @Inject
+ lateinit var calendarSharedEvents: CalendarSharedEvents
+
+ @Inject
+ lateinit var firebaseCrashlytics: FirebaseCrashlytics
+
+ private lateinit var navController: NavController
+ private lateinit var headerLayoutBinding: NavigationDrawerHeaderLayoutBinding
+
+ private var inboxBadge: TextView? = null
+
+ override fun onCreateView(
+ inflater: LayoutInflater,
+ container: ViewGroup?,
+ savedInstanceState: Bundle?
+ ): View {
+ binding = FragmentDashboardBinding.inflate(inflater, container, false)
+ binding.viewModel = viewModel
+ binding.lifecycleOwner = viewLifecycleOwner
+
+ viewLifecycleOwner.lifecycleScope.collectOneOffEvents(calendarSharedEvents.events, ::handleSharedCalendarAction)
+ return binding.root
+ }
+
+ private fun handleDashboardAction(dashboardAction: DashboardAction) {
+ when (dashboardAction) {
+ is DashboardAction.NavigateDeepLink -> {
+ try {
+ navController.navigate(dashboardAction.deepLinkUri)
+ } catch (e: Exception) {
+ firebaseCrashlytics.recordException(e)
+ }
+ }
+ }
+ }
+
+ private fun handleSharedCalendarAction(sharedCalendarAction: SharedCalendarAction) {
+ if (sharedCalendarAction is SharedCalendarAction.TodayButtonVisible) {
+ binding.todayButtonHolder.setVisible(sharedCalendarAction.visible)
+ }
+ }
+
+ override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+ super.onViewCreated(view, savedInstanceState)
+
+ setupNavigation()
+ viewLifecycleOwner.lifecycleScope.collectOneOffEvents(viewModel.events, ::handleDashboardAction)
+
+ lifecycleScope.launch {
+ viewModel.data.flowWithLifecycle(lifecycle, Lifecycle.State.STARTED).collectLatest {
+ setupNavigationDrawerHeader(it.userViewData)
+ setupAppColors(it.selectedStudent)
+ updateUnreadCount(it.unreadCount)
+ updateAlertCount(it.alertCount)
+ }
+ }
+ }
+
+ private fun updateAlertCount(alertCount: Int) {
+ val badge = binding.bottomNav.getOrCreateBadge(R.id.alerts)
+ badge.verticalOffset = 10
+ badge.horizontalOffset = 10
+ badge.setVisible(alertCount != 0, true)
+ badge.maxNumber = 99
+ badge.number = alertCount
+ }
+
+ private fun updateUnreadCount(unreadCount: Int) {
+ val unreadCountText = if (unreadCount <= 99) unreadCount.toString() else requireContext().getString(R.string.inboxUnreadCountMoreThan99)
+ inboxBadge?.visibility = if (unreadCount == 0) View.GONE else View.VISIBLE
+ inboxBadge?.text = unreadCountText
+ binding.unreadCountBadge.visibility = if (unreadCount == 0) View.GONE else View.VISIBLE
+ binding.unreadCountBadge.text = unreadCountText
+
+ val navButtonContentDescription = if (unreadCount == 0) {
+ getString(R.string.navigation_drawer_open)
+ } else {
+ getString(R.string.a11y_parentOpenNavigationDrawerWithBadge, unreadCountText)
+ }
+
+ binding.navigationButtonHolder.contentDescription = navButtonContentDescription
+ }
+
+ private fun setupNavigation() {
+ val navHostFragment = childFragmentManager.findFragmentById(R.id.nav_host_fragment) as NavHostFragment
+ navController = navHostFragment.navController
+ navController.graph = navigation.createDashboardNavGraph(navController)
+
+ setupToolbar()
+ setupNavigationDrawer()
+ setupBottomNavigationView()
+ }
+
+ private fun setupToolbar() {
+ binding.navigationButtonHolder.contentDescription = getString(R.string.navigation_drawer_open)
+ binding.navigationButtonHolder.onClick {
+ openNavigationDrawer()
+ }
+ binding.todayButtonHolder.onClick {
+ calendarSharedEvents.sendEvent(lifecycleScope, SharedCalendarAction.TodayButtonTapped)
+ }
+ binding.todayButtonText.text = LocalDate.now().dayOfMonth.toString()
+ }
+
+ private fun setupNavigationDrawer() {
+ val navView = binding.navView
+
+ headerLayoutBinding = NavigationDrawerHeaderLayoutBinding.bind(navView.getHeaderView(0))
+
+ val actionView = (navView.menu.findItem(R.id.inbox)).actionView as LinearLayout
+ actionView.gravity = Gravity.CENTER
+
+ inboxBadge = TextView(requireContext())
+ actionView.addView(inboxBadge)
+
+ inboxBadge?.width = 24.toPx
+ inboxBadge?.height = 24.toPx
+ inboxBadge?.gravity = Gravity.CENTER
+ inboxBadge?.textSize = 10f
+ inboxBadge?.setTextColor(requireContext().getColor(R.color.white))
+ inboxBadge?.setBackgroundResource(R.drawable.bg_button_full_rounded_filled)
+ inboxBadge?.visibility = View.GONE
+
+
+ navView.setNavigationItemSelectedListener {
+ closeNavigationDrawer()
+ when (it.itemId) {
+ R.id.inbox -> menuItemSelected { navigation.navigate(activity, navigation.inbox) }
+ R.id.manage_students -> menuItemSelected { navigation.navigate(activity, navigation.manageStudents) }
+ R.id.settings -> menuItemSelected { navigation.navigate(activity, navigation.settings) }
+ R.id.help -> menuItemSelected { activity?.let { HelpDialogFragment.show(it) } }
+ R.id.log_out -> menuItemSelected { onLogout() }
+ R.id.switch_users -> menuItemSelected { onSwitchUsers() }
+ else -> false
+ }
+ }
+ }
+
+ private fun menuItemSelected(action: () -> Unit): Boolean {
+ action()
+ return true
+ }
+
+ private fun setupBottomNavigationView() {
+ val bottomNavigationView = binding.bottomNav
+
+ bottomNavigationView.setOnItemSelectedListener {
+ when (it.itemId) {
+ R.id.courses -> navigateWithPopBackStack(navigation.courses)
+ R.id.calendar -> navigateWithPopBackStack(navigation.calendar)
+ R.id.alerts -> navigateWithPopBackStack(navigation.alerts)
+ else -> false
+ }
+ }
+
+ navController.addOnDestinationChangedListener { _, destination, _ ->
+ if (destination.route == navigation.alerts || destination.route == navigation.courses) {
+ binding.todayButtonHolder.setGone()
+ }
+ }
+
+ navController.addOnDestinationChangedListener { _, destination, _ ->
+ val menuId = when (destination.route) {
+ navigation.courses -> R.id.courses
+ navigation.calendar -> R.id.calendar
+ navigation.alerts -> R.id.alerts
+ else -> return@addOnDestinationChangedListener
+ }
+ bottomNavigationView.menu.findItem(menuId).isChecked = true
+ }
+ }
+
+ private fun navigateWithPopBackStack(route: String): Boolean {
+ navController.popBackStack()
+ navController.navigate(route)
+ return true
+ }
+
+ private fun setupAppColors(student: User?) {
+ val color = ColorKeeper.getOrGenerateUserColor(student).backgroundColor()
+ if (binding.toolbar.background == null) {
+ binding.toolbar.setBackgroundColor(color)
+ } else {
+ binding.toolbar.animateCircularBackgroundColorChange(color, binding.toolbarImage)
+ }
+ inboxBadge?.backgroundTintList = ColorStateList(arrayOf(intArrayOf()), intArrayOf(color))
+ binding.bottomNav.applyTheme(color, requireActivity().getColor(R.color.textDarkest))
+ ViewStyler.setStatusBarDark(requireActivity(), color)
+
+ val gradientDrawable = requireContext().getDrawableCompat(R.drawable.bg_button_full_rounded_filled_with_border) as? GradientDrawable
+ gradientDrawable?.setStroke(2.toPx, color)
+ binding.unreadCountBadge.background = gradientDrawable
+ binding.unreadCountBadge.setTextColor(color)
+
+ binding.bottomNav.getOrCreateBadge(R.id.alerts).backgroundColor = color
+ }
+
+ private fun openNavigationDrawer() {
+ binding.drawerLayout.openDrawer(GravityCompat.START)
+ }
+
+ private fun closeNavigationDrawer() {
+ binding.drawerLayout.closeDrawer(GravityCompat.START)
+ }
+
+ private fun setupNavigationDrawerHeader(userViewData: UserViewData?) {
+ headerLayoutBinding.userViewData = userViewData
+ }
+
+ private fun onLogout() {
+ AlertDialog.Builder(requireContext())
+ .setTitle(R.string.logout_warning)
+ .setPositiveButton(android.R.string.ok) { _, _ ->
+ ParentLogoutTask(LogoutTask.Type.LOGOUT).execute()
+ }
+ .setNegativeButton(android.R.string.cancel, null)
+ .showThemed(ColorKeeper.getOrGenerateUserColor(ParentPrefs.currentStudent).textAndIconColor())
+ }
+
+ private fun onSwitchUsers() {
+ ParentLogoutTask(LogoutTask.Type.SWITCH_USERS).execute()
+ }
+
+ override fun onHandleBackPressed(): Boolean {
+ if (binding.drawerLayout.isDrawerOpen(GravityCompat.START)) {
+ closeNavigationDrawer()
+ return true
+ }
+ return false
+ }
+}
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/features/dashboard/DashboardRepository.kt b/apps/parent/src/main/java/com/instructure/parentapp/features/dashboard/DashboardRepository.kt
new file mode 100644
index 0000000000..50691ad9e0
--- /dev/null
+++ b/apps/parent/src/main/java/com/instructure/parentapp/features/dashboard/DashboardRepository.kt
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2024 - 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 .
+ *
+ */
+
+package com.instructure.parentapp.features.dashboard
+
+import com.instructure.canvasapi2.apis.EnrollmentAPI
+import com.instructure.canvasapi2.apis.UnreadCountAPI
+import com.instructure.canvasapi2.builders.RestParams
+import com.instructure.canvasapi2.models.User
+import com.instructure.canvasapi2.utils.depaginate
+import com.instructure.pandautils.utils.orDefault
+
+
+class DashboardRepository(
+ private val enrollmentApi: EnrollmentAPI.EnrollmentInterface,
+ private val unreadCountApi: UnreadCountAPI.UnreadCountsInterface
+) {
+
+ suspend fun getStudents(): List {
+ val params = RestParams(usePerPageQueryParam = true)
+ return enrollmentApi.firstPageObserveeEnrollmentsParent(params).depaginate {
+ enrollmentApi.getNextPage(it, params)
+ }.dataOrNull
+ .orEmpty()
+ .mapNotNull { it.observedUser }
+ .distinct()
+ .sortedBy { it.sortableName }
+ }
+
+ suspend fun getUnreadCounts(): Int {
+ val params = RestParams(isForceReadFromNetwork = true)
+ val unreadCount = unreadCountApi.getUnreadConversationCount(params).dataOrNull?.unreadCount ?: "0"
+ return unreadCount.toIntOrNull().orDefault()
+ }
+}
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/features/dashboard/DashboardViewData.kt b/apps/parent/src/main/java/com/instructure/parentapp/features/dashboard/DashboardViewData.kt
new file mode 100644
index 0000000000..a113adc161
--- /dev/null
+++ b/apps/parent/src/main/java/com/instructure/parentapp/features/dashboard/DashboardViewData.kt
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2024 - 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 .
+ *
+ */
+
+package com.instructure.parentapp.features.dashboard
+
+import android.net.Uri
+import com.instructure.canvasapi2.models.User
+
+
+data class DashboardViewData(
+ val userViewData: UserViewData? = null,
+ val studentSelectorExpanded: Boolean = false,
+ val studentItems: List = emptyList(),
+ val selectedStudent: User? = null,
+ val unreadCount: Int = 0,
+ val alertCount: Int = 0
+)
+
+data class StudentItemViewData(
+ val studentId: Long,
+ val studentName: String,
+ val avatarUrl: String
+)
+
+data class UserViewData(
+ val name: String?,
+ val pronouns: String?,
+ val shortName: String?,
+ val avatarUrl: String?,
+ val email: String?
+)
+
+sealed class DashboardAction {
+ data class NavigateDeepLink(val deepLinkUri: Uri) : DashboardAction()
+}
\ No newline at end of file
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/features/dashboard/DashboardViewModel.kt b/apps/parent/src/main/java/com/instructure/parentapp/features/dashboard/DashboardViewModel.kt
new file mode 100644
index 0000000000..034f41433b
--- /dev/null
+++ b/apps/parent/src/main/java/com/instructure/parentapp/features/dashboard/DashboardViewModel.kt
@@ -0,0 +1,225 @@
+/*
+ * Copyright (C) 2024 - 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 .
+ *
+ */
+
+package com.instructure.parentapp.features.dashboard
+
+import android.content.Context
+import android.content.Intent
+import androidx.lifecycle.SavedStateHandle
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import androidx.navigation.NavController.Companion.KEY_DEEP_LINK_INTENT
+import com.instructure.canvasapi2.models.User
+import com.instructure.canvasapi2.utils.ApiPrefs
+import com.instructure.canvasapi2.utils.weave.catch
+import com.instructure.canvasapi2.utils.weave.tryLaunch
+import com.instructure.loginapi.login.util.PreviousUsersUtils
+import com.instructure.pandautils.mvvm.ViewState
+import com.instructure.pandautils.utils.orDefault
+import com.instructure.parentapp.R
+import com.instructure.parentapp.features.alerts.list.AlertsRepository
+import com.instructure.parentapp.util.ParentPrefs
+import dagger.hilt.android.lifecycle.HiltViewModel
+import dagger.hilt.android.qualifiers.ApplicationContext
+import kotlinx.coroutines.channels.Channel
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.receiveAsFlow
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+
+@HiltViewModel
+class DashboardViewModel @Inject constructor(
+ @ApplicationContext private val context: Context,
+ private val repository: DashboardRepository,
+ private val alertsRepository: AlertsRepository,
+ private val previousUsersUtils: PreviousUsersUtils,
+ private val apiPrefs: ApiPrefs,
+ private val parentPrefs: ParentPrefs,
+ private val selectedStudentHolder: SelectedStudentHolder,
+ private val inboxCountUpdater: InboxCountUpdater,
+ private val alertCountUpdater: AlertCountUpdater,
+ savedStateHandle: SavedStateHandle,
+) : ViewModel() {
+
+ private val _data = MutableStateFlow(DashboardViewData())
+ val data = _data.asStateFlow()
+
+ private val _state = MutableStateFlow(ViewState.Loading)
+ val state = _state.asStateFlow()
+
+ private val _events = Channel()
+ val events = _events.receiveAsFlow()
+
+ private val currentUser = previousUsersUtils.getSignedInUser(context, apiPrefs.domain, apiPrefs.user?.id.orDefault())
+ private val intent = savedStateHandle.get(KEY_DEEP_LINK_INTENT)
+
+ init {
+ handleDeeplink()
+ loadData()
+ }
+
+ private fun handleDeeplink() {
+ val uri = intent?.data
+
+ uri?.let {
+ viewModelScope.launch {
+ _events.send(DashboardAction.NavigateDeepLink(it))
+ }
+ }
+ }
+
+ private fun loadData() {
+ viewModelScope.launch {
+ inboxCountUpdater.shouldRefreshInboxCountFlow.collect { shouldUpdate ->
+ if (shouldUpdate) {
+ updateUnreadCount()
+ inboxCountUpdater.updateShouldRefreshInboxCount(false)
+ }
+ }
+ }
+
+ viewModelScope.launch {
+ alertCountUpdater.shouldRefreshAlertCountFlow.collect { shouldUpdate ->
+ if (shouldUpdate) {
+ updateAlertCount()
+ alertCountUpdater.updateShouldRefreshAlertCount(false)
+ }
+ }
+ }
+
+ viewModelScope.tryLaunch {
+ _state.value = ViewState.Loading
+
+ setupUserInfo()
+ loadStudents()
+ updateUnreadCount()
+ updateAlertCount()
+
+ if (_data.value.studentItems.isEmpty()) {
+ _state.value = ViewState.Empty(
+ R.string.noStudentsError,
+ R.string.noStudentsErrorDescription,
+ R.drawable.panda_manage_students
+ )
+ } else {
+ _state.value = ViewState.Success
+ }
+ } catch {
+ viewModelScope.launch {
+ _state.value = ViewState.Error(context.getString(R.string.errorOccurred))
+ }
+ }
+ }
+
+ private fun setupUserInfo() {
+ apiPrefs.user?.let { user ->
+ _data.update {
+ it.copy(
+ userViewData = UserViewData(
+ user.name,
+ user.pronouns,
+ user.shortName,
+ user.avatarUrl,
+ user.primaryEmail
+ )
+ )
+ }
+ }
+ }
+
+ private suspend fun loadStudents() {
+ val students = repository.getStudents()
+ val selectedStudent = students.find { it.id == currentUser?.selectedStudentId } ?: students.firstOrNull()
+ parentPrefs.currentStudent = selectedStudent
+ selectedStudent?.let {
+ selectedStudentHolder.updateSelectedStudent(it)
+ }
+
+ _data.update { data ->
+ data.copy(
+ studentItems = students.map { user ->
+ StudentItemViewModel(
+ StudentItemViewData(
+ user.id,
+ user.shortName.orEmpty(),
+ user.avatarUrl.orEmpty()
+ )
+ ) { userId ->
+ onStudentSelected(students.first { it.id == userId })
+ }
+ },
+ selectedStudent = selectedStudent
+ )
+ }
+
+ if (_data.value.studentItems.isEmpty()) {
+ _state.value = ViewState.Empty(
+ R.string.noStudentsError,
+ R.string.noStudentsErrorDescription,
+ R.drawable.panda_manage_students
+ )
+ } else {
+ _state.value = ViewState.Success
+ }
+ }
+
+ private fun onStudentSelected(student: User) {
+ parentPrefs.currentStudent = student
+ currentUser?.let {
+ previousUsersUtils.add(context, it.copy(selectedStudentId = student.id))
+ }
+ _data.update {
+ it.copy(
+ studentSelectorExpanded = false,
+ selectedStudent = student
+ )
+ }
+ viewModelScope.launch {
+ selectedStudentHolder.updateSelectedStudent(student)
+ updateAlertCount()
+ }
+ }
+
+ private suspend fun updateUnreadCount() {
+ val unreadCount = repository.getUnreadCounts()
+ _data.update { data ->
+ data.copy(
+ unreadCount = unreadCount
+ )
+ }
+ }
+
+ private suspend fun updateAlertCount() {
+ _data.value.selectedStudent?.id?.let {
+ val alertCount = alertsRepository.getUnreadAlertCount(it)
+ _data.update {
+ it.copy(
+ alertCount = alertCount
+ )
+ }
+ }
+ }
+
+ fun toggleStudentSelector() {
+ _data.update {
+ it.copy(studentSelectorExpanded = !it.studentSelectorExpanded)
+ }
+ }
+}
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/features/dashboard/InboxCountUpdater.kt b/apps/parent/src/main/java/com/instructure/parentapp/features/dashboard/InboxCountUpdater.kt
new file mode 100644
index 0000000000..e23eb39335
--- /dev/null
+++ b/apps/parent/src/main/java/com/instructure/parentapp/features/dashboard/InboxCountUpdater.kt
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2024 - 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 .
+ *
+ */
+package com.instructure.parentapp.features.dashboard
+
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.SharedFlow
+import kotlinx.coroutines.flow.asSharedFlow
+
+interface InboxCountUpdater {
+ val shouldRefreshInboxCountFlow: SharedFlow
+ suspend fun updateShouldRefreshInboxCount(shouldRefresh: Boolean)
+}
+
+class InboxCountUpdaterImpl : InboxCountUpdater {
+ private val _shouldRefreshInboxCountFlow = MutableSharedFlow(replay = 1)
+ override val shouldRefreshInboxCountFlow = _shouldRefreshInboxCountFlow.asSharedFlow()
+
+ override suspend fun updateShouldRefreshInboxCount(shouldRefresh: Boolean) {
+ _shouldRefreshInboxCountFlow.emit(shouldRefresh)
+ }
+}
\ No newline at end of file
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/features/dashboard/SelectedStudentHolder.kt b/apps/parent/src/main/java/com/instructure/parentapp/features/dashboard/SelectedStudentHolder.kt
new file mode 100644
index 0000000000..0992d1a9e0
--- /dev/null
+++ b/apps/parent/src/main/java/com/instructure/parentapp/features/dashboard/SelectedStudentHolder.kt
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2024 - 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 .
+ *
+ */
+
+package com.instructure.parentapp.features.dashboard
+
+
+import com.instructure.canvasapi2.models.User
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.SharedFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asSharedFlow
+import kotlinx.coroutines.flow.asStateFlow
+
+interface SelectedStudentHolder {
+ val selectedStudentState: StateFlow
+ val selectedStudentChangedFlow: SharedFlow
+ suspend fun updateSelectedStudent(user: User)
+}
+
+class SelectedStudentHolderImpl : SelectedStudentHolder {
+ private val _selectedStudentState = MutableStateFlow(null)
+ override val selectedStudentState = _selectedStudentState.asStateFlow()
+
+ private val _selectedStudentChangedFlow = MutableSharedFlow()
+ override val selectedStudentChangedFlow: SharedFlow = _selectedStudentChangedFlow.asSharedFlow()
+
+ override suspend fun updateSelectedStudent(user: User) {
+ _selectedStudentState.value = user
+ _selectedStudentChangedFlow.emit(user)
+ }
+}
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/features/dashboard/StudentItemViewModel.kt b/apps/parent/src/main/java/com/instructure/parentapp/features/dashboard/StudentItemViewModel.kt
new file mode 100644
index 0000000000..05f750c17a
--- /dev/null
+++ b/apps/parent/src/main/java/com/instructure/parentapp/features/dashboard/StudentItemViewModel.kt
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2024 - 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 .
+ *
+ */
+
+package com.instructure.parentapp.features.dashboard
+
+import com.instructure.pandautils.mvvm.ItemViewModel
+import com.instructure.parentapp.R
+
+
+data class StudentItemViewModel(
+ val studentItemViewData: StudentItemViewData,
+ private val onStudentSelected: (Long) -> Unit
+) : ItemViewModel {
+
+ override val layoutId = R.layout.item_student
+
+ fun onStudentClick() {
+ onStudentSelected(studentItemViewData.studentId)
+ }
+}
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/features/help/ParentHelpDialogFragmentBehavior.kt b/apps/parent/src/main/java/com/instructure/parentapp/features/help/ParentHelpDialogFragmentBehavior.kt
new file mode 100644
index 0000000000..60c6f93c4b
--- /dev/null
+++ b/apps/parent/src/main/java/com/instructure/parentapp/features/help/ParentHelpDialogFragmentBehavior.kt
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2024 - 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 .
+ *
+ */
+
+package com.instructure.parentapp.features.help
+
+import android.content.Intent
+import androidx.core.net.toUri
+import androidx.fragment.app.FragmentActivity
+import com.instructure.loginapi.login.dialog.ErrorReportDialog
+import com.instructure.pandautils.features.help.HelpDialogFragmentBehavior
+import com.instructure.pandautils.utils.AppType
+import com.instructure.pandautils.utils.Utils
+import com.instructure.parentapp.R
+
+class ParentHelpDialogFragmentBehavior(private val parentActivity: FragmentActivity) : HelpDialogFragmentBehavior {
+ override fun reportProblem() {
+ ErrorReportDialog().apply {
+ arguments = ErrorReportDialog.createBundle(parentActivity.getString(R.string.appUserTypeParent))
+ show(parentActivity.supportFragmentManager, ErrorReportDialog.TAG)
+ }
+ }
+
+ override fun rateTheApp() {
+ Utils.goToAppStore(AppType.PARENT, parentActivity)
+ }
+
+ override fun askInstructor() = Unit
+
+ override fun openWebView(url: String, title: String) {
+ val intent = Intent(Intent.ACTION_VIEW, url.toUri())
+ parentActivity.startActivity(intent)
+ }
+}
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/features/help/ParentHelpLinkFilter.kt b/apps/parent/src/main/java/com/instructure/parentapp/features/help/ParentHelpLinkFilter.kt
new file mode 100644
index 0000000000..6078689d42
--- /dev/null
+++ b/apps/parent/src/main/java/com/instructure/parentapp/features/help/ParentHelpLinkFilter.kt
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2024 - 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 .
+ *
+ */
+
+package com.instructure.parentapp.features.help
+
+import com.instructure.canvasapi2.models.Course
+import com.instructure.canvasapi2.models.HelpLink
+import com.instructure.pandautils.features.help.HelpLinkFilter
+
+class ParentHelpLinkFilter : HelpLinkFilter {
+
+ override fun isLinkAllowed(link: HelpLink, favoriteCourses: List): Boolean {
+ return link.availableTo.contains("observer") || link.availableTo.contains("user")
+ }
+}
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/features/inbox/list/ParentInboxRepository.kt b/apps/parent/src/main/java/com/instructure/parentapp/features/inbox/list/ParentInboxRepository.kt
new file mode 100644
index 0000000000..42b1c7c5d0
--- /dev/null
+++ b/apps/parent/src/main/java/com/instructure/parentapp/features/inbox/list/ParentInboxRepository.kt
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2024 - 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 .
+ *
+ */
+
+package com.instructure.parentapp.features.inbox.list
+
+import com.instructure.canvasapi2.apis.CourseAPI
+import com.instructure.canvasapi2.apis.GroupAPI
+import com.instructure.canvasapi2.apis.InboxApi
+import com.instructure.canvasapi2.apis.ProgressAPI
+import com.instructure.canvasapi2.builders.RestParams
+import com.instructure.canvasapi2.models.Course
+import com.instructure.canvasapi2.models.Enrollment
+import com.instructure.canvasapi2.utils.DataResult
+import com.instructure.canvasapi2.utils.depaginate
+import com.instructure.canvasapi2.utils.hasActiveEnrollment
+import com.instructure.canvasapi2.utils.isValidTerm
+import com.instructure.pandautils.features.inbox.list.InboxRepository
+
+class ParentInboxRepository(
+ inboxApi: InboxApi.InboxInterface,
+ private val coursesApi: CourseAPI.CoursesInterface,
+ groupsApi: GroupAPI.GroupInterface,
+ progressApi: ProgressAPI.ProgressInterface
+) : InboxRepository(inboxApi, groupsApi, progressApi) {
+
+ override suspend fun getCourses(params: RestParams): DataResult> {
+ val coursesResult = coursesApi.getCoursesByEnrollmentType(Enrollment.EnrollmentType.Observer.apiTypeString, params)
+ .depaginate { nextUrl -> coursesApi.next(nextUrl, params) }
+
+ if (coursesResult.isFail) return coursesResult
+
+ val courses = (coursesResult as DataResult.Success).data
+
+ val validCourses = courses.filter { it.isValidTerm() && it.hasActiveEnrollment() }
+ return DataResult.Success(validCourses)
+ }
+}
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/features/inbox/list/ParentInboxRouter.kt b/apps/parent/src/main/java/com/instructure/parentapp/features/inbox/list/ParentInboxRouter.kt
new file mode 100644
index 0000000000..7a4d5221fe
--- /dev/null
+++ b/apps/parent/src/main/java/com/instructure/parentapp/features/inbox/list/ParentInboxRouter.kt
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2024 - 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 .
+ *
+ */
+
+package com.instructure.parentapp.features.inbox.list
+
+import androidx.appcompat.widget.Toolbar
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentActivity
+import com.instructure.canvasapi2.apis.InboxApi
+import com.instructure.canvasapi2.models.Conversation
+import com.instructure.pandautils.features.inbox.list.InboxRouter
+import com.instructure.pandautils.utils.setupAsBackButton
+import org.greenrobot.eventbus.Subscribe
+
+
+class ParentInboxRouter(private val activity: FragmentActivity, private val fragment: Fragment) : InboxRouter {
+
+ override fun openConversation(conversation: Conversation, scope: InboxApi.Scope) {
+ // TODO: Implement
+ }
+
+ override fun attachNavigationIcon(toolbar: Toolbar) {
+ toolbar.setupAsBackButton {
+ activity.onBackPressed()
+ }
+ }
+
+ override fun routeToNewMessage() {
+ // TODO: Implement
+ }
+
+ override fun avatarClicked(conversation: Conversation, scope: InboxApi.Scope) {
+ // TODO: Implement
+ }
+
+ @Suppress("unused")
+ @Subscribe(sticky = true)
+ fun onUpdateConversation(event: Any) {
+ // TODO: Implement
+ }
+}
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/features/legal/ParentLegalRouter.kt b/apps/parent/src/main/java/com/instructure/parentapp/features/legal/ParentLegalRouter.kt
new file mode 100644
index 0000000000..3953ec2fae
--- /dev/null
+++ b/apps/parent/src/main/java/com/instructure/parentapp/features/legal/ParentLegalRouter.kt
@@ -0,0 +1,70 @@
+/*
+ * Copyright (C) 2024 - 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 .
+ *
+ */
+package com.instructure.parentapp.features.legal
+
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import androidx.browser.customtabs.CustomTabColorSchemeParams
+import androidx.browser.customtabs.CustomTabsIntent
+import com.instructure.pandautils.features.legal.LegalRouter
+import com.instructure.pandautils.utils.ThemePrefs
+import com.instructure.pandautils.utils.asChooserExcludingInstructure
+
+class ParentLegalRouter(private val context: Context) : LegalRouter {
+
+ override fun routeToTermsOfService(html: String) {
+ launchCustomTab("http://www.canvaslms.com/policies/terms-of-use")
+ }
+
+ override fun routeToPrivacyPolicy() {
+ launchCustomTab("https://www.instructure.com/policies/product-privacy-policy")
+ }
+
+ override fun routeToOpenSource() {
+ val intent = Intent(
+ Intent.ACTION_VIEW,
+ Uri.parse("https://github.com/instructure/canvas-android")
+ )
+ context.startActivity(intent)
+ }
+
+ private fun launchCustomTab(url: String) {
+ val uri = Uri.parse(url)
+ .buildUpon()
+ .appendQueryParameter("display", "borderless")
+ .appendQueryParameter("platform", "android")
+ .build()
+
+ val colorSchemeParams = CustomTabColorSchemeParams.Builder()
+ .setToolbarColor(ThemePrefs.primaryColor)
+ .build()
+
+ var intent = CustomTabsIntent.Builder()
+ .setDefaultColorSchemeParams(colorSchemeParams)
+ .setShowTitle(true)
+ .build()
+ .intent
+
+ intent.data = uri
+
+ // Exclude Instructure apps from chooser options
+ intent = intent.asChooserExcludingInstructure()
+
+ context.startActivity(intent)
+ }
+}
\ No newline at end of file
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/features/login/FindSchoolActivity.kt b/apps/parent/src/main/java/com/instructure/parentapp/features/login/FindSchoolActivity.kt
new file mode 100644
index 0000000000..4afa1a9dd2
--- /dev/null
+++ b/apps/parent/src/main/java/com/instructure/parentapp/features/login/FindSchoolActivity.kt
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2024 - 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 .
+ *
+ */
+
+package com.instructure.parentapp.features.login
+
+import android.content.Context
+import android.content.Intent
+import androidx.core.content.ContextCompat
+import com.instructure.canvasapi2.models.AccountDomain
+import com.instructure.loginapi.login.activities.BaseLoginFindSchoolActivity
+import com.instructure.parentapp.R
+
+
+class FindSchoolActivity : BaseLoginFindSchoolActivity() {
+
+ override fun themeColor(): Int {
+ return ContextCompat.getColor(this, R.color.login_parentAppTheme)
+ }
+
+ override fun signInActivityIntent(accountDomain: AccountDomain): Intent {
+ return SignInActivity.createIntent(this, accountDomain)
+ }
+
+ companion object {
+ fun createIntent(context: Context): Intent = Intent(context, FindSchoolActivity::class.java)
+ }
+}
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/features/login/LoginActivity.kt b/apps/parent/src/main/java/com/instructure/parentapp/features/login/LoginActivity.kt
new file mode 100644
index 0000000000..95dfe40745
--- /dev/null
+++ b/apps/parent/src/main/java/com/instructure/parentapp/features/login/LoginActivity.kt
@@ -0,0 +1,88 @@
+/*
+ * Copyright (C) 2024 - 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 .
+ *
+ */
+
+package com.instructure.parentapp.features.login
+
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import android.os.Bundle
+import androidx.core.content.ContextCompat
+import com.instructure.canvasapi2.models.User
+import com.instructure.canvasapi2.utils.ApiPrefs
+import com.instructure.loginapi.login.activities.BaseLoginInitActivity
+import com.instructure.loginapi.login.util.QRLogin
+import com.instructure.pandautils.utils.AppType
+import com.instructure.pandautils.utils.Const
+import com.instructure.pandautils.utils.Utils
+import com.instructure.parentapp.R
+import com.instructure.parentapp.features.login.routevalidator.RouteValidatorActivity
+import com.instructure.parentapp.features.main.MainActivity
+import dagger.hilt.android.AndroidEntryPoint
+
+@AndroidEntryPoint
+class LoginActivity : BaseLoginInitActivity() {
+
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+ // Check to see if we are switching users from an external QR scan
+ if (QRLogin.verifySSOLoginUri(intent.data, AppType.PARENT)) {
+ startActivity(RouteValidatorActivity.createIntent(this, intent.data!!))
+ finish()
+ }
+ }
+
+ override fun beginLoginFlowIntent(): Intent {
+ return LoginLandingPageActivity.createIntent(this)
+ }
+
+ override fun themeColor(): Int {
+ return ContextCompat.getColor(this, R.color.login_parentAppTheme)
+ }
+
+ override fun userAgent() = Const.PARENT_USER_AGENT
+
+ /**
+ * ONLY USE FOR UI TESTING
+ * Skips the traditional login process by directly setting the domain, token, and user info.
+ */
+ fun loginWithToken(token: String, domain: String, user: User) {
+ ApiPrefs.accessToken = token
+ ApiPrefs.domain = domain
+ ApiPrefs.user = user
+ ApiPrefs.userAgent = Utils.generateUserAgent(this, userAgent())
+ val intent = MainActivity.createIntent(this, Uri.EMPTY)
+ finish()
+ startActivity(intent)
+ }
+
+ companion object {
+ fun createIntent(context: Context): Intent {
+ val intent = Intent(context, LoginActivity::class.java)
+ intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
+ return intent
+ }
+
+ // Used specifically for a QR Scan user switch
+ fun createIntent(context: Context, uri: Uri): Intent {
+ val intent = Intent(context, LoginActivity::class.java)
+ intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
+ intent.data = uri
+ return intent
+ }
+ }
+}
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/features/login/LoginLandingPageActivity.kt b/apps/parent/src/main/java/com/instructure/parentapp/features/login/LoginLandingPageActivity.kt
new file mode 100644
index 0000000000..1bd04ee831
--- /dev/null
+++ b/apps/parent/src/main/java/com/instructure/parentapp/features/login/LoginLandingPageActivity.kt
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2024 - 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 .
+ *
+ */
+
+package com.instructure.parentapp.features.login
+
+import android.content.Context
+import android.content.Intent
+import androidx.core.content.ContextCompat
+import com.instructure.canvasapi2.models.AccountDomain
+import com.instructure.loginapi.login.activities.BaseLoginLandingPageActivity
+import com.instructure.parentapp.R
+import dagger.hilt.android.AndroidEntryPoint
+
+
+@AndroidEntryPoint
+class LoginLandingPageActivity : BaseLoginLandingPageActivity() {
+
+ override fun beginFindSchoolFlow(): Intent {
+ return FindSchoolActivity.createIntent(this)
+ }
+
+ override fun signInActivityIntent(accountDomain: AccountDomain): Intent {
+ return SignInActivity.createIntent(this, accountDomain)
+ }
+
+ override fun beginCanvasNetworkFlow(url: String): Intent {
+ return SignInActivity.createIntent(this, AccountDomain(url))
+ }
+
+ override fun themeColor(): Int {
+ return ContextCompat.getColor(this, R.color.login_parentAppTheme)
+ }
+
+ override fun appTypeName(): Int {
+ return R.string.appUserTypeParent
+ }
+
+ override fun loginWithQRCodeEnabled() = true
+
+ override fun loginWithQRIntent(): Intent {
+ return Intent(this, ParentLoginWithQRActivity::class.java)
+ }
+
+ companion object {
+ fun createIntent(context: Context): Intent {
+ return Intent(context, LoginLandingPageActivity::class.java)
+ }
+ }
+}
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/features/login/ParentAcceptableUsePolicyRouter.kt b/apps/parent/src/main/java/com/instructure/parentapp/features/login/ParentAcceptableUsePolicyRouter.kt
new file mode 100644
index 0000000000..81dcfc45fb
--- /dev/null
+++ b/apps/parent/src/main/java/com/instructure/parentapp/features/login/ParentAcceptableUsePolicyRouter.kt
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2024 - 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 .
+ *
+ */ package com.instructure.parentapp.features.login
+
+import android.content.Intent
+import android.webkit.CookieManager
+import androidx.fragment.app.FragmentActivity
+import com.instructure.loginapi.login.features.acceptableusepolicy.AcceptableUsePolicyRouter
+import com.instructure.loginapi.login.tasks.LogoutTask
+import com.instructure.parentapp.features.main.MainActivity
+import com.instructure.parentapp.util.ParentLogoutTask
+
+class ParentAcceptableUsePolicyRouter(
+ private val activity: FragmentActivity
+) : AcceptableUsePolicyRouter {
+ override fun openPolicy(content: String) {
+ TODO("Not yet implemented")
+ }
+
+ override fun startApp() {
+ CookieManager.getInstance().flush()
+
+ val intent = Intent(activity, MainActivity::class.java)
+ activity.intent?.extras?.let { intent.putExtras(it) }
+ activity.startActivity(intent)
+ }
+
+ override fun logout() {
+ ParentLogoutTask(LogoutTask.Type.LOGOUT).execute()
+ }
+}
\ No newline at end of file
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/features/login/ParentLoginNavigation.kt b/apps/parent/src/main/java/com/instructure/parentapp/features/login/ParentLoginNavigation.kt
new file mode 100644
index 0000000000..3102beaf5f
--- /dev/null
+++ b/apps/parent/src/main/java/com/instructure/parentapp/features/login/ParentLoginNavigation.kt
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2024 - 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 .
+ *
+ */
+
+package com.instructure.parentapp.features.login
+
+import android.content.Intent
+import android.webkit.CookieManager
+import androidx.fragment.app.FragmentActivity
+import com.instructure.loginapi.login.LoginNavigation
+import com.instructure.loginapi.login.tasks.LogoutTask
+import com.instructure.parentapp.features.main.MainActivity
+import com.instructure.parentapp.util.ParentLogoutTask
+
+
+class ParentLoginNavigation(
+ private val activity: FragmentActivity
+) : LoginNavigation(activity) {
+
+ override val checkElementary: Boolean = false
+
+ override fun logout() {
+ ParentLogoutTask(LogoutTask.Type.LOGOUT).execute()
+ }
+
+ override fun initMainActivityIntent(): Intent {
+ CookieManager.getInstance().flush()
+
+ val intent = Intent(activity, MainActivity::class.java)
+ activity.intent?.extras?.let { intent.putExtras(it) }
+ return intent
+ }
+}
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/features/login/ParentLoginWithQRActivity.kt b/apps/parent/src/main/java/com/instructure/parentapp/features/login/ParentLoginWithQRActivity.kt
new file mode 100644
index 0000000000..5bddff745f
--- /dev/null
+++ b/apps/parent/src/main/java/com/instructure/parentapp/features/login/ParentLoginWithQRActivity.kt
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2024 - 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 .
+ *
+ */
+
+package com.instructure.parentapp.features.login
+
+import android.net.Uri
+import com.instructure.loginapi.login.activities.LoginWithQRActivity
+import com.instructure.parentapp.features.login.routevalidator.RouteValidatorActivity
+
+
+class ParentLoginWithQRActivity : LoginWithQRActivity() {
+
+ override fun launchApplicationWithQRLogin(loginUri: Uri) {
+ // The RouteValidatorActivity is set up to handle the QR code url from inside or outside the app
+ startActivity(RouteValidatorActivity.createIntent(this, loginUri))
+ }
+}
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/features/login/SignInActivity.kt b/apps/parent/src/main/java/com/instructure/parentapp/features/login/SignInActivity.kt
new file mode 100644
index 0000000000..4804b2b478
--- /dev/null
+++ b/apps/parent/src/main/java/com/instructure/parentapp/features/login/SignInActivity.kt
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2024 - 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 .
+ *
+ */
+
+package com.instructure.parentapp.features.login
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import com.instructure.canvasapi2.models.AccountDomain
+import com.instructure.loginapi.login.activities.BaseLoginSignInActivity
+import com.instructure.pandautils.utils.Const
+import dagger.hilt.android.AndroidEntryPoint
+
+
+@AndroidEntryPoint
+class SignInActivity : BaseLoginSignInActivity() {
+
+ override fun refreshWidgets() = Unit
+
+ override fun userAgent() = Const.PARENT_USER_AGENT
+
+ companion object {
+ fun createIntent(context: Context, accountDomain: AccountDomain): Intent {
+ val intent = Intent(context, SignInActivity::class.java)
+ val extras = Bundle()
+ extras.putParcelable(ACCOUNT_DOMAIN, accountDomain)
+ intent.putExtras(extras)
+ return intent
+ }
+ }
+}
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/features/login/routevalidator/RouteValidatorAction.kt b/apps/parent/src/main/java/com/instructure/parentapp/features/login/routevalidator/RouteValidatorAction.kt
new file mode 100644
index 0000000000..b04a3bab8f
--- /dev/null
+++ b/apps/parent/src/main/java/com/instructure/parentapp/features/login/routevalidator/RouteValidatorAction.kt
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2024 - 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 .
+ *
+ */
+
+package com.instructure.parentapp.features.login.routevalidator
+
+import android.net.Uri
+import com.instructure.canvasapi2.models.AccountDomain
+
+
+sealed class RouteValidatorAction {
+
+ data object Finish : RouteValidatorAction()
+ data class LoadWebViewUrl(val url: String) : RouteValidatorAction()
+ data class StartMainActivity(val masqueradeId: Long? = null, val data: Uri? = null) : RouteValidatorAction()
+ data class ShowToast(val message: String) : RouteValidatorAction()
+ data class StartSignInActivity(val accountDomain: AccountDomain) : RouteValidatorAction()
+ data object StartLoginActivity : RouteValidatorAction()
+}
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/features/login/routevalidator/RouteValidatorActivity.kt b/apps/parent/src/main/java/com/instructure/parentapp/features/login/routevalidator/RouteValidatorActivity.kt
new file mode 100644
index 0000000000..8fe7a1587b
--- /dev/null
+++ b/apps/parent/src/main/java/com/instructure/parentapp/features/login/routevalidator/RouteValidatorActivity.kt
@@ -0,0 +1,100 @@
+/*
+ * Copyright (C) 2024 - 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 .
+ *
+ */
+
+package com.instructure.parentapp.features.login.routevalidator
+
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import android.os.Bundle
+import android.widget.Toast
+import androidx.activity.viewModels
+import androidx.appcompat.app.AppCompatActivity
+import androidx.lifecycle.lifecycleScope
+import com.instructure.canvasapi2.models.AccountDomain
+import com.instructure.pandautils.binding.viewBinding
+import com.instructure.pandautils.utils.collectOneOffEvents
+import com.instructure.parentapp.databinding.ActivityRouteValidatorBinding
+import com.instructure.parentapp.features.login.LoginActivity
+import com.instructure.parentapp.features.login.SignInActivity
+import com.instructure.parentapp.features.main.MainActivity
+import dagger.hilt.android.AndroidEntryPoint
+
+
+@AndroidEntryPoint
+class RouteValidatorActivity : AppCompatActivity() {
+
+ private val binding by viewBinding(ActivityRouteValidatorBinding::inflate)
+
+ private val viewModel by viewModels()
+
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+ setContentView(binding.root)
+
+ lifecycleScope.collectOneOffEvents(viewModel.events, ::handleAction)
+
+ viewModel.loadRoute(intent.dataString)
+ }
+
+ private fun handleAction(action: RouteValidatorAction) {
+ when (action) {
+ is RouteValidatorAction.Finish -> finish()
+ is RouteValidatorAction.LoadWebViewUrl -> binding.dummyWebView.loadUrl(action.url)
+ is RouteValidatorAction.StartMainActivity -> startMainActivity(action.masqueradeId, action.data)
+ is RouteValidatorAction.ShowToast -> Toast.makeText(this, action.message, Toast.LENGTH_LONG).show()
+ is RouteValidatorAction.StartSignInActivity -> startSignInActivity(action.accountDomain)
+ is RouteValidatorAction.StartLoginActivity -> startLoginActivity()
+ }
+ }
+
+ private fun startMainActivity(masqueradeId: Long?, data: Uri?) {
+ if (data != null) {
+ val intent = MainActivity.createIntent(this, data)
+ startActivity(intent)
+ } else {
+ val intent = if (masqueradeId != null) {
+ MainActivity.createIntent(this, masqueradeId)
+ } else {
+ Intent(this, MainActivity::class.java)
+ }
+ intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
+ startActivity(intent)
+ }
+ finish()
+ }
+
+ private fun startSignInActivity(accountDomain: AccountDomain) {
+ val intent = SignInActivity.createIntent(this, accountDomain)
+ startActivity(intent)
+ finish()
+ }
+
+ private fun startLoginActivity() {
+ val intent = LoginActivity.createIntent(this)
+ startActivity(intent)
+ finish()
+ }
+
+ companion object {
+ fun createIntent(context: Context, uri: Uri): Intent {
+ val intent = Intent(context, RouteValidatorActivity::class.java)
+ intent.data = uri
+ return intent
+ }
+ }
+}
\ No newline at end of file
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/features/login/routevalidator/RouteValidatorViewModel.kt b/apps/parent/src/main/java/com/instructure/parentapp/features/login/routevalidator/RouteValidatorViewModel.kt
new file mode 100644
index 0000000000..837784bf05
--- /dev/null
+++ b/apps/parent/src/main/java/com/instructure/parentapp/features/login/routevalidator/RouteValidatorViewModel.kt
@@ -0,0 +1,160 @@
+/*
+ * Copyright (C) 2024 - 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 .
+ *
+ */
+
+package com.instructure.parentapp.features.login.routevalidator
+
+import android.content.Context
+import android.net.Uri
+import android.os.Bundle
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.instructure.canvasapi2.apis.OAuthAPI
+import com.instructure.canvasapi2.builders.RestParams
+import com.instructure.canvasapi2.models.AccountDomain
+import com.instructure.canvasapi2.utils.Analytics
+import com.instructure.canvasapi2.utils.AnalyticsEventConstants
+import com.instructure.canvasapi2.utils.AnalyticsParamConstants
+import com.instructure.canvasapi2.utils.ApiPrefs
+import com.instructure.canvasapi2.utils.weave.catch
+import com.instructure.canvasapi2.utils.weave.tryLaunch
+import com.instructure.loginapi.login.tasks.LogoutTask
+import com.instructure.loginapi.login.util.QRLogin
+import com.instructure.pandautils.utils.AppType
+import com.instructure.pandautils.utils.Const
+import com.instructure.pandautils.utils.Utils
+import com.instructure.parentapp.R
+import com.instructure.parentapp.util.ParentLogoutTask
+import dagger.hilt.android.lifecycle.HiltViewModel
+import dagger.hilt.android.qualifiers.ApplicationContext
+import kotlinx.coroutines.channels.Channel
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.receiveAsFlow
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+
+@HiltViewModel
+class RouteValidatorViewModel @Inject constructor(
+ @ApplicationContext private val context: Context,
+ private val apiPrefs: ApiPrefs,
+ private val oAuthApi: OAuthAPI.OAuthInterface,
+ private val qrLogin: QRLogin,
+ private val analytics: Analytics
+) : ViewModel() {
+
+ private val _events = Channel()
+ val events = _events.receiveAsFlow()
+
+ fun loadRoute(url: String?) {
+ viewModelScope.tryLaunch {
+ val data = Uri.parse(url.orEmpty())
+ if (url.isNullOrEmpty() || data == null) {
+ _events.send(RouteValidatorAction.Finish)
+ return@tryLaunch
+ }
+
+ val host = data.host.orEmpty() // example: "mobiledev.instructure.com"
+ val token = apiPrefs.getValidToken()
+ val signedIn = token.isNotEmpty()
+ val domain = apiPrefs.domain
+
+ if (qrLogin.verifySSOLoginUri(data)) {
+ // This is an App Link from a QR code, let's try to login the user and launch MainActivity
+ try {
+ if (signedIn) { // If the user is already signed in, use the QR Switch
+ ParentLogoutTask(type = LogoutTask.Type.QR_CODE_SWITCH, uri = data).execute()
+ _events.send(RouteValidatorAction.Finish)
+ return@tryLaunch
+ }
+
+ if (apiPrefs.userAgent.isEmpty()) {
+ apiPrefs.userAgent = Utils.generateUserAgent(context, Const.PARENT_USER_AGENT)
+ }
+
+ val tokenResponse = qrLogin.performSSOLogin(data, context, AppType.PARENT)
+
+ val authResult = oAuthApi.getAuthenticatedSession(ApiPrefs.fullDomain, RestParams(isForceReadFromNetwork = true))
+ if (authResult.isSuccess) {
+ _events.send(RouteValidatorAction.LoadWebViewUrl(authResult.dataOrNull?.sessionUrl.orEmpty()))
+ }
+
+ // If we have a real user, this is a QR code from a masquerading web user
+ if (tokenResponse.realUser != null && tokenResponse.user != null) {
+ // We need to set the masquerade request to the user (masqueradee), the real user it the admin user currently masquerading
+ val masqueradeId = tokenResponse.user!!.id
+ apiPrefs.isMasqueradingFromQRCode = true
+ apiPrefs.masqueradeId = masqueradeId
+ postActionWithDelay(RouteValidatorAction.StartMainActivity(masqueradeId))
+ } else {
+ // Log the analytics - only for real logins, not masquerading
+ logQREvent(apiPrefs.domain, true)
+ postActionWithDelay(RouteValidatorAction.StartMainActivity())
+ }
+ return@tryLaunch
+ } catch (e: Throwable) {
+ // If the user wasn't already signed in, let's clear the prefs in case it was a partial success
+ if (!signedIn) {
+ apiPrefs.clearAllData()
+ }
+
+ // Log the analytics
+ logQREvent(apiPrefs.domain, false)
+
+ _events.send(RouteValidatorAction.ShowToast(context.getString(R.string.loginWithQRCodeError)))
+ _events.send(RouteValidatorAction.Finish)
+ return@tryLaunch
+ }
+ }
+
+ if (!signedIn) {
+ if (host.isNotBlank()) {
+ postActionWithDelay(RouteValidatorAction.StartSignInActivity(AccountDomain(host)))
+ } else {
+ postActionWithDelay(RouteValidatorAction.StartLoginActivity)
+ }
+ return@tryLaunch
+ }
+
+ if (!domain.contains(host)) {
+ // TODO: Handle different domain
+ _events.send(RouteValidatorAction.Finish)
+ } else {
+ postActionWithDelay(RouteValidatorAction.StartMainActivity(data = data))
+ }
+ } catch {
+ viewModelScope.launch {
+ _events.send(RouteValidatorAction.Finish)
+ }
+ }
+ }
+
+ private suspend fun postActionWithDelay(event: RouteValidatorAction, delay: Long = 700L) {
+ delay(delay) // Allow the UI to show
+ _events.send(event)
+ }
+
+ private fun logQREvent(domain: String, isSuccess: Boolean) {
+ val bundle = Bundle().apply {
+ putString(AnalyticsParamConstants.DOMAIN_PARAM, domain)
+ }
+ if (isSuccess) {
+ analytics.logEvent(AnalyticsEventConstants.QR_CODE_LOGIN_SUCCESS, bundle)
+ } else {
+ analytics.logEvent(AnalyticsEventConstants.QR_CODE_LOGIN_FAILURE, bundle)
+ }
+ }
+}
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/features/main/MainActivity.kt b/apps/parent/src/main/java/com/instructure/parentapp/features/main/MainActivity.kt
new file mode 100644
index 0000000000..b794d87545
--- /dev/null
+++ b/apps/parent/src/main/java/com/instructure/parentapp/features/main/MainActivity.kt
@@ -0,0 +1,123 @@
+/*
+ * Copyright (C) 2024 - 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 .
+ *
+ */
+
+package com.instructure.parentapp.features.main
+
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import android.os.Bundle
+import android.util.Log
+import androidx.appcompat.app.AppCompatActivity
+import androidx.lifecycle.lifecycleScope
+import androidx.navigation.NavController
+import androidx.navigation.fragment.NavHostFragment
+import com.instructure.pandautils.binding.viewBinding
+import com.instructure.pandautils.features.inbox.list.OnUnreadCountInvalidated
+import com.instructure.pandautils.interfaces.NavigationCallbacks
+import com.instructure.pandautils.utils.Const
+import com.instructure.parentapp.R
+import com.instructure.parentapp.databinding.ActivityMainBinding
+import com.instructure.parentapp.features.dashboard.InboxCountUpdater
+import com.instructure.parentapp.features.splash.SplashFragment
+import com.instructure.parentapp.util.navigation.Navigation
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+
+@AndroidEntryPoint
+class MainActivity : AppCompatActivity(), OnUnreadCountInvalidated {
+
+ private val binding by viewBinding(ActivityMainBinding::inflate)
+
+ @Inject
+ lateinit var navigation: Navigation
+
+ @Inject
+ lateinit var inboxCountUpdater: InboxCountUpdater
+
+ private lateinit var navController: NavController
+
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+ setContentView(binding.root)
+ setupNavigation()
+ }
+
+ override fun onNewIntent(intent: Intent?) {
+ super.onNewIntent(intent)
+ handleDeeplink(intent?.data)
+ }
+
+ private fun setupNavigation() {
+ val deeplinkUri = intent.data
+ intent.data = null
+
+ val navHostFragment = supportFragmentManager.findFragmentById(R.id.nav_host_fragment) as NavHostFragment
+ navController = navHostFragment.navController
+ navController.graph = navigation.crateMainNavGraph(navController)
+
+ navController.currentBackStackEntry?.savedStateHandle?.getLiveData(SplashFragment.INITIAL_DATA_LOADED_KEY)?.observe(this) {
+ // If the initial data has been loaded, we can navigate to courses, remove splash from backstack
+ navController.popBackStack()
+ navController.navigate(navigation.courses)
+ navController.graph.setStartDestination(navigation.courses)
+
+ handleDeeplink(deeplinkUri)
+ }
+ }
+
+ private fun handleDeeplink(uri: Uri?) {
+ try {
+ navController.navigate(uri ?: return)
+ } catch (e: Exception) {
+ Log.e(this.javaClass.simpleName, e.message.orEmpty())
+ }
+ }
+
+ override fun onBackPressed() {
+ // supportFragmentManager.fragments.last() is always the NavHostFragment
+ val topFragment = supportFragmentManager.fragments.last().childFragmentManager.fragments.last()
+ if (topFragment is NavigationCallbacks && topFragment.onHandleBackPressed()) {
+ return
+ } else {
+ super.onBackPressed()
+ }
+ }
+
+ override fun invalidateUnreadCount() {
+ lifecycleScope.launch {
+ inboxCountUpdater.updateShouldRefreshInboxCount(true)
+ }
+ }
+
+ companion object {
+ fun createIntent(context: Context, uri: Uri): Intent {
+ val intent = Intent(context, MainActivity::class.java)
+ intent.data = uri
+ return intent
+ }
+
+ fun createIntent(context: Context, masqueradingUserId: Long): Intent {
+ val intent = Intent(context, MainActivity::class.java)
+ // TODO: Implement masquerading
+ intent.putExtra(Const.QR_CODE_MASQUERADE_ID, masqueradingUserId)
+ return intent
+ }
+ }
+}
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/features/managestudents/ManageStudentViewModel.kt b/apps/parent/src/main/java/com/instructure/parentapp/features/managestudents/ManageStudentViewModel.kt
new file mode 100644
index 0000000000..3bf6ac449a
--- /dev/null
+++ b/apps/parent/src/main/java/com/instructure/parentapp/features/managestudents/ManageStudentViewModel.kt
@@ -0,0 +1,198 @@
+/*
+ * Copyright (C) 2024 - 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 .
+ *
+ */
+
+package com.instructure.parentapp.features.managestudents
+
+import android.content.Context
+import androidx.core.content.ContextCompat
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.instructure.canvasapi2.utils.weave.catch
+import com.instructure.canvasapi2.utils.weave.tryLaunch
+import com.instructure.pandautils.utils.ColorKeeper
+import com.instructure.pandautils.utils.createThemedColor
+import com.instructure.pandautils.utils.orDefault
+import com.instructure.parentapp.R
+import dagger.hilt.android.lifecycle.HiltViewModel
+import dagger.hilt.android.qualifiers.ApplicationContext
+import kotlinx.coroutines.channels.Channel
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.receiveAsFlow
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+
+@HiltViewModel
+class ManageStudentViewModel @Inject constructor(
+ @ApplicationContext private val context: Context,
+ private val colorKeeper: ColorKeeper,
+ private val repository: ManageStudentsRepository
+) : ViewModel() {
+
+ private val _uiState = MutableStateFlow(ManageStudentsUiState())
+ val uiState = _uiState.asStateFlow()
+
+ private val _events = Channel()
+ val events = _events.receiveAsFlow()
+
+ init {
+ loadStudents()
+ }
+
+ private val userColorContentDescriptionMap = mapOf(
+ R.color.studentBlue to R.string.studentColorContentDescriptionBlue,
+ R.color.studentPurple to R.string.studentColorContentDescriptionPurple,
+ R.color.studentPink to R.string.studentColorContentDescriptionPink,
+ R.color.studentRed to R.string.studentColorContentDescriptionRed,
+ R.color.studentOrange to R.string.studentColorContentDescriptionOrange,
+ R.color.studentGreen to R.string.studentColorContentDescriptionGreen,
+ )
+
+ private val userColors by lazy {
+ colorKeeper.userColors.map {
+ UserColor(
+ colorRes = it,
+ color = createThemedColor(context.getColor(it)),
+ contentDescriptionRes = userColorContentDescriptionMap[it].orDefault()
+ )
+ }
+ }
+
+ private fun loadStudents(forceRefresh: Boolean = false) {
+ viewModelScope.tryLaunch {
+ _uiState.update {
+ it.copy(
+ isLoading = true,
+ isLoadError = false
+ )
+ }
+
+ val students = repository.getStudents(forceRefresh)
+
+ _uiState.update { state ->
+ state.copy(
+ isLoading = false,
+ studentListItems = students.map {
+ StudentItemUiState(
+ studentId = it.id,
+ avatarUrl = it.avatarUrl,
+ studentName = it.shortName ?: it.name,
+ studentPronouns = it.pronouns,
+ studentColor = colorKeeper.getOrGenerateUserColor(it)
+ )
+ }
+ )
+ }
+ } catch {
+ _uiState.update {
+ it.copy(
+ isLoading = false,
+ isLoadError = true
+ )
+ }
+ }
+ }
+
+ private fun saveStudentColor(studentId: Long, selected: UserColor) {
+ viewModelScope.tryLaunch {
+ val contextId = "user_$studentId"
+ val color = ContextCompat.getColor(context, selected.colorRes)
+
+ _uiState.update {
+ it.copy(
+ colorPickerDialogUiState = it.colorPickerDialogUiState.copy(
+ isSavingColor = true
+ )
+ )
+ }
+
+ val result = repository.saveStudentColor(contextId, getHexString(color))
+ if (result != null) {
+ colorKeeper.addToCache(contextId, color)
+ _uiState.update {
+ it.copy(
+ colorPickerDialogUiState = ColorPickerDialogUiState(),
+ studentListItems = it.studentListItems.map { studentItem ->
+ if (studentItem.studentId == studentId) {
+ studentItem.copy(studentColor = selected.color)
+ } else {
+ studentItem
+ }
+ }
+ )
+ }
+ } else {
+ showSavingError()
+ }
+ } catch {
+ showSavingError()
+ }
+ }
+
+ private fun getHexString(color: Int): String {
+ var hexColor = Integer.toHexString(color)
+ hexColor = hexColor.substring(hexColor.length - 6)
+ if (hexColor.contains("#")) {
+ hexColor = hexColor.replace("#".toRegex(), "")
+ }
+ return hexColor
+ }
+
+ private fun showSavingError() {
+ _uiState.update {
+ it.copy(
+ colorPickerDialogUiState = it.colorPickerDialogUiState.copy(
+ isSavingColor = false,
+ isSavingColorError = true
+ )
+ )
+ }
+ }
+
+ fun handleAction(action: ManageStudentsAction) {
+ when (action) {
+ is ManageStudentsAction.StudentTapped -> {
+ viewModelScope.launch {
+ _events.send(ManageStudentsViewModelAction.NavigateToAlertSettings(action.studentId))
+ }
+ }
+
+ is ManageStudentsAction.Refresh -> loadStudents(true)
+ is ManageStudentsAction.AddStudent -> {} //TODO: Add student flow
+ is ManageStudentsAction.ShowColorPickerDialog -> _uiState.update {
+ it.copy(
+ colorPickerDialogUiState = it.colorPickerDialogUiState.copy(
+ showColorPickerDialog = true,
+ studentId = action.studentId,
+ initialUserColor = userColors.find { userColor ->
+ userColor.color == action.studentColor
+ },
+ userColors = userColors
+ )
+ )
+ }
+
+ is ManageStudentsAction.HideColorPickerDialog -> _uiState.update {
+ it.copy(colorPickerDialogUiState = ColorPickerDialogUiState())
+ }
+
+ is ManageStudentsAction.StudentColorChanged -> saveStudentColor(action.studentId, action.userColor)
+ }
+ }
+}
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/features/managestudents/ManageStudentsFragment.kt b/apps/parent/src/main/java/com/instructure/parentapp/features/managestudents/ManageStudentsFragment.kt
new file mode 100644
index 0000000000..0777715802
--- /dev/null
+++ b/apps/parent/src/main/java/com/instructure/parentapp/features/managestudents/ManageStudentsFragment.kt
@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2024 - 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 .
+ *
+ */
+
+package com.instructure.parentapp.features.managestudents
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.platform.ComposeView
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.viewModels
+import androidx.lifecycle.lifecycleScope
+import androidx.navigation.fragment.findNavController
+import com.instructure.pandautils.utils.ThemePrefs
+import com.instructure.pandautils.utils.ViewStyler
+import com.instructure.pandautils.utils.collectOneOffEvents
+import dagger.hilt.android.AndroidEntryPoint
+
+
+@AndroidEntryPoint
+class ManageStudentsFragment : Fragment() {
+
+ private val viewModel: ManageStudentViewModel by viewModels()
+
+ override fun onCreateView(
+ inflater: LayoutInflater,
+ container: ViewGroup?,
+ savedInstanceState: Bundle?
+ ): View {
+ ViewStyler.setStatusBarDark(requireActivity(), ThemePrefs.primaryColor)
+
+ lifecycleScope.collectOneOffEvents(viewModel.events, ::handleAction)
+
+ return ComposeView(requireActivity()).apply {
+ setContent {
+ val uiState by viewModel.uiState.collectAsState()
+ ManageStudentsScreen(
+ uiState,
+ viewModel::handleAction,
+ navigationActionClick = {
+ findNavController().popBackStack()
+ }
+ )
+ }
+ }
+ }
+
+ private fun handleAction(action: ManageStudentsViewModelAction) {
+ when (action) {
+ is ManageStudentsViewModelAction.NavigateToAlertSettings -> {
+ //TODO: Navigate to alert settings
+ }
+ }
+ }
+}
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/features/managestudents/ManageStudentsRepository.kt b/apps/parent/src/main/java/com/instructure/parentapp/features/managestudents/ManageStudentsRepository.kt
new file mode 100644
index 0000000000..f36fdb3495
--- /dev/null
+++ b/apps/parent/src/main/java/com/instructure/parentapp/features/managestudents/ManageStudentsRepository.kt
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2024 - 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 .
+ *
+ */
+
+package com.instructure.parentapp.features.managestudents
+
+import com.instructure.canvasapi2.apis.EnrollmentAPI
+import com.instructure.canvasapi2.apis.UserAPI
+import com.instructure.canvasapi2.builders.RestParams
+import com.instructure.canvasapi2.models.User
+import com.instructure.canvasapi2.utils.depaginate
+
+
+class ManageStudentsRepository(
+ private val enrollmentApi: EnrollmentAPI.EnrollmentInterface,
+ private val userApi: UserAPI.UsersInterface
+) {
+
+ suspend fun getStudents(forceRefresh: Boolean): List {
+ val params = RestParams(usePerPageQueryParam = true, isForceReadFromNetwork = forceRefresh)
+ return enrollmentApi.firstPageObserveeEnrollmentsParent(params).depaginate {
+ enrollmentApi.getNextPage(it, params)
+ }.dataOrNull
+ .orEmpty()
+ .mapNotNull { it.observedUser }
+ .distinct()
+ .sortedBy { it.sortableName }
+ }
+
+ suspend fun saveStudentColor(contextId: String, color: String): String? {
+ val params = RestParams()
+ return userApi.setColor(contextId, color, params).dataOrNull?.hexCode
+ }
+}
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/features/managestudents/ManageStudentsScreen.kt b/apps/parent/src/main/java/com/instructure/parentapp/features/managestudents/ManageStudentsScreen.kt
new file mode 100644
index 0000000000..d7fa920977
--- /dev/null
+++ b/apps/parent/src/main/java/com/instructure/parentapp/features/managestudents/ManageStudentsScreen.kt
@@ -0,0 +1,296 @@
+/*
+ * Copyright (C) 2024 - 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 .
+ *
+ */
+
+package com.instructure.parentapp.features.managestudents
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.material.ExperimentalMaterialApi
+import androidx.compose.material.FloatingActionButton
+import androidx.compose.material.Icon
+import androidx.compose.material.Scaffold
+import androidx.compose.material.Text
+import androidx.compose.material.pullrefresh.PullRefreshIndicator
+import androidx.compose.material.pullrefresh.pullRefresh
+import androidx.compose.material.pullrefresh.rememberPullRefreshState
+import androidx.compose.material.ripple.rememberRipple
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.testTag
+import androidx.compose.ui.res.colorResource
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.semantics.contentDescription
+import androidx.compose.ui.semantics.semantics
+import androidx.compose.ui.text.SpanStyle
+import androidx.compose.ui.text.buildAnnotatedString
+import androidx.compose.ui.text.font.FontStyle
+import androidx.compose.ui.text.withStyle
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import com.instructure.canvasapi2.utils.ContextKeeper
+import com.instructure.pandautils.R
+import com.instructure.pandautils.compose.CanvasTheme
+import com.instructure.pandautils.compose.composables.CanvasThemedAppBar
+import com.instructure.pandautils.compose.composables.EmptyContent
+import com.instructure.pandautils.compose.composables.ErrorContent
+import com.instructure.pandautils.compose.composables.UserAvatar
+import com.instructure.pandautils.utils.ThemePrefs
+
+
+@Composable
+internal fun ManageStudentsScreen(
+ uiState: ManageStudentsUiState,
+ actionHandler: (ManageStudentsAction) -> Unit,
+ navigationActionClick: () -> Unit,
+ modifier: Modifier = Modifier
+) {
+ CanvasTheme {
+ Scaffold(
+ backgroundColor = colorResource(id = R.color.backgroundLightest),
+ topBar = {
+ CanvasThemedAppBar(
+ title = stringResource(id = R.string.screenTitleManageStudents),
+ navigationActionClick = {
+ navigationActionClick()
+ }
+ )
+ },
+ content = { padding ->
+ if (uiState.isLoadError) {
+ ErrorContent(
+ errorMessage = stringResource(id = R.string.errorLoadingStudents),
+ retryClick = {
+ actionHandler(ManageStudentsAction.Refresh)
+ },
+ modifier = Modifier.fillMaxSize()
+ )
+ } else if (uiState.studentListItems.isEmpty() && !uiState.isLoading) {
+ EmptyContent(
+ emptyMessage = stringResource(id = R.string.noStudentsErrorDescription),
+ imageRes = R.drawable.panda_manage_students,
+ buttonText = stringResource(id = R.string.retry),
+ buttonClick = {
+ actionHandler(ManageStudentsAction.Refresh)
+ },
+ modifier = Modifier.fillMaxSize()
+ )
+ } else {
+ StudentListContent(
+ uiState = uiState,
+ actionHandler = actionHandler,
+ modifier = Modifier
+ .padding(padding)
+ .fillMaxSize()
+ )
+ }
+ },
+ floatingActionButton = {
+ FloatingActionButton(
+ backgroundColor = Color(ThemePrefs.buttonColor),
+ onClick = {
+ actionHandler(ManageStudentsAction.AddStudent)
+ }
+ ) {
+ Icon(
+ painter = painterResource(id = R.drawable.ic_add),
+ tint = Color(ThemePrefs.buttonTextColor),
+ contentDescription = stringResource(id = R.string.addNewStudent)
+ )
+ }
+ },
+ modifier = modifier
+ )
+ }
+}
+
+@OptIn(ExperimentalMaterialApi::class)
+@Composable
+private fun StudentListContent(
+ uiState: ManageStudentsUiState,
+ actionHandler: (ManageStudentsAction) -> Unit,
+ modifier: Modifier = Modifier
+) {
+ val pullRefreshState = rememberPullRefreshState(
+ refreshing = uiState.isLoading,
+ onRefresh = {
+ actionHandler(ManageStudentsAction.Refresh)
+ }
+ )
+
+ val dialogUiState = uiState.colorPickerDialogUiState
+ if (dialogUiState.showColorPickerDialog) {
+ StudentColorPickerDialog(
+ initialUserColor = dialogUiState.initialUserColor,
+ userColors = dialogUiState.userColors,
+ saving = dialogUiState.isSavingColor,
+ error = dialogUiState.isSavingColorError,
+ onDismiss = {
+ actionHandler(ManageStudentsAction.HideColorPickerDialog)
+ },
+ onColorSelected = {
+ actionHandler(ManageStudentsAction.StudentColorChanged(dialogUiState.studentId, it))
+ }
+ )
+ }
+
+ Box(
+ modifier = modifier.pullRefresh(pullRefreshState)
+ ) {
+ LazyColumn(
+ modifier = Modifier.fillMaxSize()
+ ) {
+ items(uiState.studentListItems) {
+ StudentListItem(it, actionHandler)
+ }
+ }
+
+ PullRefreshIndicator(
+ refreshing = uiState.isLoading,
+ state = pullRefreshState,
+ modifier = Modifier
+ .align(Alignment.TopCenter)
+ .testTag("pullRefreshIndicator"),
+ contentColor = Color(ThemePrefs.primaryColor)
+ )
+ }
+}
+
+@Composable
+private fun StudentListItem(
+ uiState: StudentItemUiState,
+ actionHandler: (ManageStudentsAction) -> Unit,
+ modifier: Modifier = Modifier
+) {
+ Row(
+ modifier = modifier
+ .fillMaxWidth()
+ .clickable {
+ actionHandler(ManageStudentsAction.StudentTapped(uiState.studentId))
+ }
+ .padding(top = 16.dp, bottom = 16.dp, start = 16.dp)
+ .testTag("studentListItem"),
+ verticalAlignment = Alignment.CenterVertically
+ ) {
+ UserAvatar(
+ imageUrl = uiState.avatarUrl,
+ name = uiState.studentName,
+ modifier = Modifier.size(40.dp)
+ )
+ Spacer(modifier = Modifier.width(16.dp))
+ Text(
+ text = buildAnnotatedString {
+ append(uiState.studentName)
+ if (!uiState.studentPronouns.isNullOrEmpty()) {
+ withStyle(style = SpanStyle(fontStyle = FontStyle.Italic)) {
+ append(" (${uiState.studentPronouns})")
+ }
+ }
+ },
+ color = colorResource(id = R.color.textDarkest),
+ fontSize = 16.sp
+ )
+ Spacer(modifier = Modifier.weight(1f))
+ val changeColorContentDescription = stringResource(id = R.string.changeStudentColorLabel, uiState.studentName)
+ Box(
+ contentAlignment = Alignment.Center,
+ modifier = Modifier
+ .size(48.dp)
+ .clip(CircleShape)
+ .testTag("studentColor")
+ .semantics(mergeDescendants = true) {
+ contentDescription = changeColorContentDescription
+ }
+ .clickable(
+ interactionSource = remember { MutableInteractionSource() },
+ indication = rememberRipple(color = Color(uiState.studentColor.backgroundColor()))
+ ) {
+ actionHandler(ManageStudentsAction.ShowColorPickerDialog(uiState.studentId, uiState.studentColor))
+ }
+ ) {
+ Box(
+ modifier = Modifier
+ .size(20.dp)
+ .clip(CircleShape)
+ .background(color = Color(uiState.studentColor.backgroundColor()))
+ )
+ }
+ }
+}
+
+@Preview(showBackground = true)
+@Composable
+private fun ManageStudentsPreview() {
+ ContextKeeper.appContext = LocalContext.current
+ ManageStudentsScreen(
+ uiState = ManageStudentsUiState(
+ isLoading = false,
+ studentListItems = listOf(
+ StudentItemUiState(studentId = 1, studentName = "Student 1", studentPronouns = "They/Them"),
+ StudentItemUiState(studentId = 2, studentName = "Student 2"),
+ StudentItemUiState(studentId = 3, studentName = "Student 3"),
+ )
+ ),
+ actionHandler = {},
+ navigationActionClick = {}
+ )
+}
+
+@Preview(showBackground = true)
+@Composable
+private fun ManageStudentsEmptyPreview() {
+ ContextKeeper.appContext = LocalContext.current
+ ManageStudentsScreen(
+ uiState = ManageStudentsUiState(
+ isLoading = false,
+ studentListItems = emptyList()
+ ),
+ actionHandler = {},
+ navigationActionClick = {}
+ )
+}
+
+@Preview(showBackground = true)
+@Composable
+private fun ManageStudentsErrorPreview() {
+ ContextKeeper.appContext = LocalContext.current
+ ManageStudentsScreen(
+ uiState = ManageStudentsUiState(
+ isLoadError = true
+ ),
+ actionHandler = {},
+ navigationActionClick = {}
+ )
+}
\ No newline at end of file
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/features/managestudents/ManageStudentsUiState.kt b/apps/parent/src/main/java/com/instructure/parentapp/features/managestudents/ManageStudentsUiState.kt
new file mode 100644
index 0000000000..443778be57
--- /dev/null
+++ b/apps/parent/src/main/java/com/instructure/parentapp/features/managestudents/ManageStudentsUiState.kt
@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2024 - 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 .
+ *
+ */
+
+package com.instructure.parentapp.features.managestudents
+
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.toArgb
+import com.instructure.pandautils.utils.ThemedColor
+
+
+data class ManageStudentsUiState(
+ val isLoading: Boolean = false,
+ val isLoadError: Boolean = false,
+ val studentListItems: List = emptyList(),
+ val colorPickerDialogUiState: ColorPickerDialogUiState = ColorPickerDialogUiState()
+)
+
+data class UserColor(
+ val colorRes: Int = 0,
+ val color: ThemedColor = ThemedColor(Color.Black.toArgb()),
+ val contentDescriptionRes: Int = 0
+)
+
+data class ColorPickerDialogUiState(
+ val showColorPickerDialog: Boolean = false,
+ val studentId: Long = 0,
+ val initialUserColor: UserColor? = null,
+ val userColors: List = emptyList(),
+ val isSavingColor: Boolean = false,
+ val isSavingColorError: Boolean = false
+)
+
+data class StudentItemUiState(
+ val studentId: Long = 0,
+ val avatarUrl: String? = null,
+ val studentName: String = "",
+ val studentPronouns: String? = null,
+ val studentColor: ThemedColor = ThemedColor(Color.Black.toArgb())
+)
+
+sealed class ManageStudentsAction {
+ data class StudentTapped(val studentId: Long) : ManageStudentsAction()
+ data object Refresh : ManageStudentsAction()
+ data object AddStudent : ManageStudentsAction()
+ data class ShowColorPickerDialog(val studentId: Long, val studentColor: ThemedColor) : ManageStudentsAction()
+ data object HideColorPickerDialog : ManageStudentsAction()
+ data class StudentColorChanged(val studentId: Long, val userColor: UserColor) : ManageStudentsAction()
+}
+
+sealed class ManageStudentsViewModelAction {
+ data class NavigateToAlertSettings(val studentId: Long) : ManageStudentsViewModelAction()
+}
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/features/managestudents/StudentColorPickerDialog.kt b/apps/parent/src/main/java/com/instructure/parentapp/features/managestudents/StudentColorPickerDialog.kt
new file mode 100644
index 0000000000..e54352b8ce
--- /dev/null
+++ b/apps/parent/src/main/java/com/instructure/parentapp/features/managestudents/StudentColorPickerDialog.kt
@@ -0,0 +1,199 @@
+/*
+ * Copyright (C) 2024 - 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 .
+ *
+ */
+
+package com.instructure.parentapp.features.managestudents
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.lazy.LazyRow
+import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.material.CircularProgressIndicator
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Surface
+import androidx.compose.material.Text
+import androidx.compose.material.TextButton
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.colorResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.semantics.contentDescription
+import androidx.compose.ui.semantics.semantics
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.compose.ui.window.Dialog
+import com.instructure.canvasapi2.utils.ContextKeeper
+import com.instructure.pandautils.R
+import com.instructure.pandautils.utils.ColorKeeper
+import com.instructure.pandautils.utils.ThemePrefs
+import com.instructure.pandautils.utils.createThemedColor
+
+
+@Composable
+internal fun StudentColorPickerDialog(
+ initialUserColor: UserColor?,
+ userColors: List,
+ saving: Boolean,
+ error: Boolean,
+ onDismiss: () -> Unit,
+ onColorSelected: (UserColor) -> Unit,
+ modifier: Modifier = Modifier
+) {
+ var selected by remember { mutableStateOf(initialUserColor) }
+
+ Dialog(
+ onDismissRequest = {
+ onDismiss()
+ }
+ ) {
+ Surface(
+ modifier = modifier,
+ shape = MaterialTheme.shapes.medium,
+ color = colorResource(id = R.color.backgroundLightestElevated)
+ ) {
+ Column {
+ Text(
+ text = stringResource(id = R.string.selectStudentColor),
+ color = colorResource(id = R.color.textDarkest),
+ fontSize = 18.sp,
+ modifier = Modifier.padding(20.dp)
+ )
+ LazyRow(
+ horizontalArrangement = Arrangement.spacedBy(4.dp),
+ contentPadding = PaddingValues(horizontal = 12.dp)
+ ) {
+ items(userColors) {
+ val colorContentDescription = stringResource(id = it.contentDescriptionRes)
+ val selectedContentDescription = stringResource(id = R.string.selectedListItem, colorContentDescription)
+ Box(
+ modifier = Modifier
+ .size(48.dp)
+ .let { modifier ->
+ if (selected == it) {
+ modifier
+ .border(3.dp, Color(it.color.backgroundColor()), CircleShape)
+ .semantics {
+ contentDescription = selectedContentDescription
+ }
+ } else {
+ modifier.semantics {
+ contentDescription = colorContentDescription
+ }
+ }
+ }
+ .padding(8.dp)
+ .clip(shape = CircleShape)
+ .background(color = Color(it.color.backgroundColor()))
+ .clickable {
+ selected = it
+ }
+ )
+ }
+ }
+ if (error) {
+ Text(
+ text = stringResource(id = R.string.errorSavingColor),
+ color = colorResource(id = R.color.textDanger),
+ fontSize = 16.sp,
+ modifier = Modifier.padding(start = 20.dp, end = 20.dp, top = 16.dp)
+ )
+ }
+ Row(
+ modifier = Modifier.padding(end = 8.dp)
+ ) {
+ Spacer(modifier = Modifier.weight(1f))
+ if (saving) {
+ Column(
+ modifier = Modifier.padding(16.dp)
+ ) {
+ CircularProgressIndicator(
+ color = Color(ThemePrefs.textButtonColor),
+ strokeWidth = 3.dp,
+ modifier = Modifier.size(32.dp)
+ )
+ }
+ } else {
+ TextButton(
+ onClick = {
+ onDismiss()
+ }
+ ) {
+ Text(
+ text = stringResource(id = R.string.cancel),
+ color = Color(ThemePrefs.textButtonColor)
+ )
+ }
+ TextButton(
+ onClick = {
+ if (selected == null || selected == initialUserColor) {
+ onDismiss()
+ } else {
+ onColorSelected(selected!!)
+ }
+ },
+ ) {
+ Text(
+ text = stringResource(id = R.string.ok),
+ color = Color(ThemePrefs.textButtonColor),
+ )
+ }
+ }
+ }
+ }
+ }
+ }
+}
+
+@Preview
+@Composable
+fun StudentColorPickerDialogPreview() {
+ val context = LocalContext.current
+ ContextKeeper.appContext = context
+ val colors = ColorKeeper.userColors.map {
+ UserColor(
+ colorRes = it,
+ color = createThemedColor(context.getColor(it)),
+ contentDescriptionRes = 0
+ )
+ }
+
+ StudentColorPickerDialog(
+ initialUserColor = colors.first(),
+ userColors = colors,
+ error = false,
+ saving = false,
+ onDismiss = {},
+ onColorSelected = {}
+ )
+}
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/features/notaparent/NotAParentFragment.kt b/apps/parent/src/main/java/com/instructure/parentapp/features/notaparent/NotAParentFragment.kt
new file mode 100644
index 0000000000..e616c8f91c
--- /dev/null
+++ b/apps/parent/src/main/java/com/instructure/parentapp/features/notaparent/NotAParentFragment.kt
@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2024 - 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 .
+ *
+ */
+
+package com.instructure.parentapp.features.notaparent
+
+import android.content.ActivityNotFoundException
+import android.content.Intent
+import android.net.Uri
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.compose.ui.platform.ComposeView
+import androidx.fragment.app.Fragment
+import com.instructure.loginapi.login.tasks.LogoutTask
+import com.instructure.parentapp.util.ParentLogoutTask
+import dagger.hilt.android.AndroidEntryPoint
+
+
+@AndroidEntryPoint
+class NotAParentFragment : Fragment() {
+
+ override fun onCreateView(
+ inflater: LayoutInflater,
+ container: ViewGroup?,
+ savedInstanceState: Bundle?
+ ): View {
+ return ComposeView(requireActivity()).apply {
+ setContent {
+ NotAParentScreen(
+ returnToLoginClick = {
+ ParentLogoutTask(LogoutTask.Type.LOGOUT).execute()
+ },
+ onStudentClick = {
+ openStore("com.instructure.candroid")
+ },
+ onTeacherClick = {
+ openStore("com.instructure.teacher")
+ }
+ )
+ }
+ }
+ }
+
+ private fun openStore(packageName: String) {
+ try {
+ startActivity(Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id=$packageName")))
+ } catch (e: ActivityNotFoundException) {
+ startActivity(Intent(Intent.ACTION_VIEW, Uri.parse("https://play.google.com/store/apps/details?id=$packageName")))
+ }
+ }
+}
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/features/notaparent/NotAParentScreen.kt b/apps/parent/src/main/java/com/instructure/parentapp/features/notaparent/NotAParentScreen.kt
new file mode 100644
index 0000000000..01f7ce1118
--- /dev/null
+++ b/apps/parent/src/main/java/com/instructure/parentapp/features/notaparent/NotAParentScreen.kt
@@ -0,0 +1,196 @@
+/*
+ * Copyright (C) 2024 - 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 .
+ *
+ */
+
+package com.instructure.parentapp.features.notaparent
+
+import androidx.compose.animation.animateContentSize
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.Divider
+import androidx.compose.material.Icon
+import androidx.compose.material.Surface
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.colorResource
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.semantics.contentDescription
+import androidx.compose.ui.semantics.semantics
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import com.instructure.pandautils.compose.composables.EmptyContent
+import com.instructure.parentapp.R
+
+
+@Composable
+internal fun NotAParentScreen(
+ returnToLoginClick: () -> Unit,
+ onStudentClick: () -> Unit,
+ onTeacherClick: () -> Unit,
+ modifier: Modifier = Modifier
+) {
+ Surface(
+ color = colorResource(id = R.color.backgroundLightest),
+ modifier = modifier
+ .fillMaxSize()
+ .verticalScroll(rememberScrollState())
+ ) {
+ var bottomExpanded by remember { mutableStateOf(false) }
+
+ Column(
+ horizontalAlignment = Alignment.CenterHorizontally,
+ modifier = Modifier.padding(horizontal = 16.dp)
+ ) {
+ Spacer(modifier = Modifier.weight(1f))
+ EmptyContent(
+ emptyTitle = stringResource(id = R.string.notAParentTitle),
+ emptyMessage = stringResource(id = R.string.notAParentSubtitle),
+ imageRes = R.drawable.ic_panda_book,
+ buttonText = stringResource(id = R.string.returnToLogin),
+ buttonClick = returnToLoginClick
+ )
+ Spacer(modifier = Modifier.weight(1f))
+ Spacer(modifier = Modifier.height(16.dp))
+ if (bottomExpanded) {
+ Spacer(modifier = Modifier.height(16.dp))
+ Divider(
+ color = colorResource(id = R.color.backgroundMedium),
+ thickness = 1.dp
+ )
+ Spacer(modifier = Modifier.height(16.dp))
+ }
+ Text(
+ text = stringResource(id = R.string.studentOrTeacherTitle),
+ color = colorResource(id = R.color.textDarkest),
+ fontSize = 12.sp,
+ modifier = Modifier.clickable(
+ interactionSource = remember { MutableInteractionSource() },
+ indication = null
+ ) {
+ bottomExpanded = !bottomExpanded
+ }
+ )
+ Spacer(modifier = Modifier.height(16.dp))
+ AppOptions(bottomExpanded, onStudentClick, onTeacherClick)
+ }
+ }
+}
+
+@Composable
+private fun AppOptions(
+ bottomExpanded: Boolean,
+ onStudentClick: () -> Unit,
+ onTeacherClick: () -> Unit,
+ modifier: Modifier = Modifier
+) {
+ Column(
+ horizontalAlignment = Alignment.CenterHorizontally,
+ modifier = modifier
+ .animateContentSize()
+ .height(if (bottomExpanded) 180.dp else 0.dp)
+ ) {
+ Text(
+ text = stringResource(id = R.string.studentOrTeacherSubtitle),
+ color = colorResource(id = R.color.textDarkest),
+ fontSize = 12.sp,
+ textAlign = TextAlign.Center
+ )
+ Spacer(modifier = Modifier.height(16.dp))
+ AppOption(
+ stringResource(id = R.string.studentApp),
+ stringResource(id = R.string.canvasStudentApp),
+ colorResource(id = R.color.login_studentAppTheme),
+ { onStudentClick() }
+ )
+ Spacer(modifier = Modifier.height(12.dp))
+ AppOption(
+ stringResource(id = R.string.teacherApp),
+ stringResource(id = R.string.canvasTeacherApp),
+ colorResource(id = R.color.login_teacherAppTheme),
+ { onTeacherClick() }
+ )
+ }
+}
+
+@Composable
+private fun AppOption(
+ name: String,
+ label: String,
+ color: Color,
+ onClick: () -> Unit,
+ modifier: Modifier = Modifier
+) {
+ Row(
+ verticalAlignment = Alignment.CenterVertically,
+ modifier = modifier
+ .clickable(onClick = onClick)
+ .semantics(mergeDescendants = true) {
+ contentDescription = label
+ }
+ ) {
+ Icon(
+ painter = painterResource(id = R.drawable.ic_canvas_logo),
+ tint = color,
+ contentDescription = null,
+ modifier = Modifier.size(48.dp)
+ )
+ Spacer(modifier = Modifier.width(8.dp))
+ Column {
+ Icon(
+ painter = painterResource(id = R.drawable.ic_canvas_wordmark),
+ tint = colorResource(id = R.color.backgroundMedium),
+ contentDescription = null,
+ modifier = Modifier.height(24.dp)
+ )
+ Text(
+ text = name,
+ color = color,
+ fontSize = 10.sp,
+ textAlign = TextAlign.Center
+ )
+ }
+ }
+}
+
+@Preview
+@Composable
+fun NotAParentScreenPreview() {
+ NotAParentScreen(
+ returnToLoginClick = {},
+ onStudentClick = {},
+ onTeacherClick = {}
+ )
+}
\ No newline at end of file
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/features/settings/ParentSettingsBehaviour.kt b/apps/parent/src/main/java/com/instructure/parentapp/features/settings/ParentSettingsBehaviour.kt
new file mode 100644
index 0000000000..bba51876eb
--- /dev/null
+++ b/apps/parent/src/main/java/com/instructure/parentapp/features/settings/ParentSettingsBehaviour.kt
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2024 - 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 .
+ *
+ */ package com.instructure.parentapp.features.settings
+
+import com.instructure.pandautils.features.settings.SettingsBehaviour
+import com.instructure.pandautils.features.settings.SettingsItem
+import com.instructure.parentapp.R
+
+class ParentSettingsBehaviour : SettingsBehaviour {
+ override val settingsItems: Map>
+ get() = mapOf(
+ R.string.preferences to listOf(SettingsItem.APP_THEME),
+ R.string.legal to listOf(SettingsItem.ABOUT, SettingsItem.LEGAL)
+ )
+}
\ No newline at end of file
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/features/settings/ParentSettingsRouter.kt b/apps/parent/src/main/java/com/instructure/parentapp/features/settings/ParentSettingsRouter.kt
new file mode 100644
index 0000000000..aff1ffda29
--- /dev/null
+++ b/apps/parent/src/main/java/com/instructure/parentapp/features/settings/ParentSettingsRouter.kt
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2024 - 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 .
+ *
+ */
+package com.instructure.parentapp.features.settings
+
+import com.instructure.pandautils.features.settings.SettingsRouter
+
+class ParentSettingsRouter : SettingsRouter {
+ override fun navigateToProfileSettings() {
+ throw IllegalStateException("Profile settings item not available")
+ }
+
+ override fun navigateToPushNotificationsSettings() {
+ throw IllegalStateException("Push settings item not available")
+ }
+
+ override fun navigateToEmailNotificationsSettings() {
+ throw IllegalStateException("Email settings item not available")
+ }
+
+ override fun navigateToPairWithObserver() {
+ throw IllegalStateException("Pair with observer item not available")
+ }
+}
\ No newline at end of file
diff --git a/apps/teacher/src/main/java/com/instructure/teacher/viewinterface/DiscussionsReplyView.kt b/apps/parent/src/main/java/com/instructure/parentapp/features/splash/SplashAction.kt
similarity index 60%
rename from apps/teacher/src/main/java/com/instructure/teacher/viewinterface/DiscussionsReplyView.kt
rename to apps/parent/src/main/java/com/instructure/parentapp/features/splash/SplashAction.kt
index 6ad48a29f2..fe76d7d5e5 100644
--- a/apps/teacher/src/main/java/com/instructure/teacher/viewinterface/DiscussionsReplyView.kt
+++ b/apps/parent/src/main/java/com/instructure/parentapp/features/splash/SplashAction.kt
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2017 - present Instructure, Inc.
+ * Copyright (C) 2024 - 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
@@ -14,13 +14,12 @@
* along with this program. If not, see .
*
*/
-package com.instructure.teacher.viewinterface
-import com.instructure.canvasapi2.models.DiscussionEntry
-import com.instructure.teacher.interfaces.RceMediaUploadView
-import instructure.androidblueprint.FragmentViewInterface
+package com.instructure.parentapp.features.splash
-interface DiscussionsReplyView : FragmentViewInterface, RceMediaUploadView {
- fun messageSuccess(entry: DiscussionEntry)
- fun messageFailure(reason: Int)
+
+sealed class SplashAction {
+ data object LocaleChanged : SplashAction()
+ data object InitialDataLoadingFinished : SplashAction()
+ data object NavigateToNotAParentScreen : SplashAction()
}
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/features/splash/SplashFragment.kt b/apps/parent/src/main/java/com/instructure/parentapp/features/splash/SplashFragment.kt
new file mode 100644
index 0000000000..3d3946067b
--- /dev/null
+++ b/apps/parent/src/main/java/com/instructure/parentapp/features/splash/SplashFragment.kt
@@ -0,0 +1,101 @@
+/*
+ * Copyright (C) 2024 - 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 .
+ *
+ */
+
+package com.instructure.parentapp.features.splash
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.size
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.ComposeView
+import androidx.compose.ui.res.colorResource
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.viewinterop.AndroidView
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.viewModels
+import androidx.lifecycle.lifecycleScope
+import androidx.navigation.fragment.findNavController
+import com.instructure.canvasapi2.utils.LocaleUtils
+import com.instructure.loginapi.login.view.CanvasLoadingView
+import com.instructure.pandautils.utils.collectOneOffEvents
+import com.instructure.parentapp.R
+import com.instructure.parentapp.util.navigation.Navigation
+import dagger.hilt.android.AndroidEntryPoint
+import javax.inject.Inject
+
+
+@AndroidEntryPoint
+class SplashFragment : Fragment() {
+
+ private val viewModel: SplashViewModel by viewModels()
+
+ @Inject
+ lateinit var navigation: Navigation
+
+ override fun onCreateView(
+ inflater: LayoutInflater,
+ container: ViewGroup?,
+ savedInstanceState: Bundle?
+ ): View {
+ lifecycleScope.collectOneOffEvents(viewModel.events, ::handleAction)
+
+ return ComposeView(requireActivity()).apply {
+ setContent {
+ Box(
+ contentAlignment = Alignment.Center,
+ modifier = Modifier
+ .fillMaxSize()
+ .background(color = colorResource(id = R.color.backgroundLightest))
+ ) {
+ AndroidView(
+ factory = {
+ CanvasLoadingView(it).apply {
+ setOverrideColor(it.getColor(R.color.login_parentAppTheme))
+ }
+ },
+ modifier = Modifier.size(120.dp)
+ )
+ }
+ }
+ }
+ }
+
+ private fun handleAction(action: SplashAction) {
+ when (action) {
+ is SplashAction.LocaleChanged -> LocaleUtils.restartApp(requireContext())
+
+ is SplashAction.InitialDataLoadingFinished -> {
+ findNavController().currentBackStackEntry?.savedStateHandle?.set(INITIAL_DATA_LOADED_KEY, true)
+ }
+
+ is SplashAction.NavigateToNotAParentScreen -> {
+ findNavController().popBackStack()
+ navigation.navigate(activity, navigation.notAParent)
+ }
+ }
+ }
+
+ companion object {
+ const val INITIAL_DATA_LOADED_KEY = "initialDataLoaded"
+ }
+}
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/features/splash/SplashRepository.kt b/apps/parent/src/main/java/com/instructure/parentapp/features/splash/SplashRepository.kt
new file mode 100644
index 0000000000..50318bb742
--- /dev/null
+++ b/apps/parent/src/main/java/com/instructure/parentapp/features/splash/SplashRepository.kt
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2024 - 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 .
+ *
+ */
+
+package com.instructure.parentapp.features.splash
+
+import com.instructure.canvasapi2.apis.EnrollmentAPI
+import com.instructure.canvasapi2.apis.ThemeAPI
+import com.instructure.canvasapi2.apis.UserAPI
+import com.instructure.canvasapi2.builders.RestParams
+import com.instructure.canvasapi2.models.CanvasColor
+import com.instructure.canvasapi2.models.CanvasTheme
+import com.instructure.canvasapi2.models.User
+import com.instructure.canvasapi2.utils.depaginate
+
+
+class SplashRepository(
+ private val userApi: UserAPI.UsersInterface,
+ private val themeApi: ThemeAPI.ThemeInterface,
+ private val enrollmentApi: EnrollmentAPI.EnrollmentInterface
+) {
+
+ suspend fun getSelf(): User? {
+ val params = RestParams(isForceReadFromNetwork = true)
+ return userApi.getSelf(params).dataOrNull
+ }
+
+ suspend fun getColors(): CanvasColor? {
+ val params = RestParams(isForceReadFromNetwork = true)
+ return userApi.getColors(params).dataOrNull
+ }
+
+ suspend fun getTheme(): CanvasTheme? {
+ val params = RestParams(isForceReadFromNetwork = true)
+ return themeApi.getTheme(params).dataOrNull
+ }
+
+ suspend fun getStudents(): List {
+ val params = RestParams(usePerPageQueryParam = true, isForceReadFromNetwork = true)
+ return enrollmentApi.firstPageObserveeEnrollmentsParent(params).depaginate {
+ enrollmentApi.getNextPage(it, params)
+ }.dataOrNull
+ .orEmpty()
+ .mapNotNull { it.observedUser }
+ }
+}
\ No newline at end of file
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/features/splash/SplashViewModel.kt b/apps/parent/src/main/java/com/instructure/parentapp/features/splash/SplashViewModel.kt
new file mode 100644
index 0000000000..dbb8f658f4
--- /dev/null
+++ b/apps/parent/src/main/java/com/instructure/parentapp/features/splash/SplashViewModel.kt
@@ -0,0 +1,84 @@
+/*
+ * Copyright (C) 2024 - 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 .
+ *
+ */
+
+package com.instructure.parentapp.features.splash
+
+import android.content.Context
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.instructure.canvasapi2.models.User
+import com.instructure.canvasapi2.utils.ApiPrefs
+import com.instructure.canvasapi2.utils.weave.catch
+import com.instructure.canvasapi2.utils.weave.tryLaunch
+import com.instructure.pandautils.utils.ColorKeeper
+import com.instructure.pandautils.utils.ThemePrefs
+import dagger.hilt.android.lifecycle.HiltViewModel
+import dagger.hilt.android.qualifiers.ApplicationContext
+import kotlinx.coroutines.channels.Channel
+import kotlinx.coroutines.flow.receiveAsFlow
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+
+@HiltViewModel
+class SplashViewModel @Inject constructor(
+ @ApplicationContext private val context: Context,
+ private val repository: SplashRepository,
+ private val apiPrefs: ApiPrefs,
+ private val colorKeeper: ColorKeeper,
+ private val themePrefs: ThemePrefs,
+) : ViewModel() {
+
+ private val _events = Channel()
+ val events = _events.receiveAsFlow()
+
+ init {
+ loadInitialData()
+ }
+
+ private fun loadInitialData() {
+ viewModelScope.tryLaunch {
+ val user = repository.getSelf()
+ user?.let { saveUserInfo(it) }
+
+ val colors = repository.getColors()
+ colors?.let { colorKeeper.addToCache(it) }
+
+ val theme = repository.getTheme()
+ theme?.let { themePrefs.applyCanvasTheme(it, context) }
+
+ val students = repository.getStudents()
+ if (students.isEmpty()) {
+ _events.send(SplashAction.NavigateToNotAParentScreen)
+ } else {
+ _events.send(SplashAction.InitialDataLoadingFinished)
+ }
+ } catch {
+ viewModelScope.launch {
+ _events.send(SplashAction.InitialDataLoadingFinished)
+ }
+ }
+ }
+
+ private suspend fun saveUserInfo(user: User) {
+ val oldLocale = apiPrefs.effectiveLocale
+ apiPrefs.user = user
+ if (apiPrefs.effectiveLocale != oldLocale) {
+ _events.send(SplashAction.LocaleChanged)
+ }
+ }
+}
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/util/AppManager.kt b/apps/parent/src/main/java/com/instructure/parentapp/util/AppManager.kt
new file mode 100644
index 0000000000..cb46101abb
--- /dev/null
+++ b/apps/parent/src/main/java/com/instructure/parentapp/util/AppManager.kt
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2024 - 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 .
+ *
+ */
+
+package com.instructure.parentapp.util
+
+import androidx.hilt.work.HiltWorkerFactory
+import com.instructure.canvasapi2.AppManager
+import com.instructure.canvasapi2.utils.RemoteConfigUtils
+import dagger.hilt.android.HiltAndroidApp
+import javax.inject.Inject
+
+
+@HiltAndroidApp
+class AppManager : BaseAppManager() {
+
+ @Inject
+ lateinit var workerFactory: HiltWorkerFactory
+
+ override fun performLogoutOnAuthError() {
+ // TODO: Implement
+ }
+
+ override fun getWorkManagerFactory() = workerFactory
+}
\ No newline at end of file
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/util/BaseAppManager.kt b/apps/parent/src/main/java/com/instructure/parentapp/util/BaseAppManager.kt
new file mode 100644
index 0000000000..58d284cfe6
--- /dev/null
+++ b/apps/parent/src/main/java/com/instructure/parentapp/util/BaseAppManager.kt
@@ -0,0 +1,64 @@
+/*
+ * Copyright (C) 2024 - 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 .
+ *
+ */
+
+package com.instructure.parentapp.util
+
+import android.os.Build
+import android.webkit.WebView
+import androidx.appcompat.app.AppCompatDelegate
+import androidx.core.content.ContextCompat
+import com.google.firebase.crashlytics.FirebaseCrashlytics
+import com.instructure.canvasapi2.AppManager
+import com.instructure.canvasapi2.utils.Analytics
+import com.instructure.canvasapi2.utils.AnalyticsEventConstants
+import com.instructure.canvasapi2.utils.RemoteConfigUtils
+import com.instructure.pandautils.utils.AppTheme
+import com.instructure.pandautils.utils.ColorKeeper
+import com.instructure.pandautils.utils.ThemePrefs
+import com.instructure.parentapp.BuildConfig
+import com.instructure.parentapp.R
+
+abstract class BaseAppManager : AppManager() {
+
+ override fun onCreate() {
+ super.onCreate()
+
+ val appTheme = AppTheme.fromIndex(ThemePrefs.appTheme)
+ AppCompatDelegate.setDefaultNightMode(appTheme.nightModeType)
+
+ Analytics.setUserProperty(AnalyticsEventConstants.USER_PROPERTY_BUILD_TYPE, if (BuildConfig.DEBUG) "debug" else "release")
+ Analytics.setUserProperty(AnalyticsEventConstants.USER_PROPERTY_OS_VERSION, Build.VERSION.SDK_INT.toString())
+
+ RemoteConfigUtils.initialize()
+
+ if (BuildConfig.DEBUG) {
+ FirebaseCrashlytics.getInstance().setCrashlyticsCollectionEnabled(false)
+ } else {
+ FirebaseCrashlytics.getInstance().setCrashlyticsCollectionEnabled(true)
+ }
+
+ ColorKeeper.defaultColor = ContextCompat.getColor(this, R.color.textDarkest)
+
+ try {
+ WebView.setWebContentsDebuggingEnabled(true)
+ } catch (e: Exception) {
+ FirebaseCrashlytics.getInstance().log("Exception trying to setWebContentsDebuggingEnabled")
+ }
+ }
+
+ override fun performLogoutOnAuthError() = Unit
+}
\ No newline at end of file
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/util/ParentLogoutHelper.kt b/apps/parent/src/main/java/com/instructure/parentapp/util/ParentLogoutHelper.kt
new file mode 100644
index 0000000000..e7b31b504c
--- /dev/null
+++ b/apps/parent/src/main/java/com/instructure/parentapp/util/ParentLogoutHelper.kt
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2024 - 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 .
+ *
+ */
+
+package com.instructure.parentapp.util
+
+import com.instructure.loginapi.login.tasks.LogoutTask
+import com.instructure.pandautils.room.offline.DatabaseProvider
+import com.instructure.pandautils.utils.LogoutHelper
+
+class ParentLogoutHelper : LogoutHelper {
+ override fun logout(databaseProvider: DatabaseProvider) {
+ ParentLogoutTask(LogoutTask.Type.LOGOUT).execute()
+ }
+}
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/util/ParentLogoutTask.kt b/apps/parent/src/main/java/com/instructure/parentapp/util/ParentLogoutTask.kt
new file mode 100644
index 0000000000..ccfbabf637
--- /dev/null
+++ b/apps/parent/src/main/java/com/instructure/parentapp/util/ParentLogoutTask.kt
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2024 - 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 .
+ *
+ */
+
+package com.instructure.parentapp.util
+
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import com.google.firebase.messaging.FirebaseMessaging
+import com.instructure.canvasapi2.utils.tryOrNull
+import com.instructure.loginapi.login.tasks.LogoutTask
+import com.instructure.parentapp.features.login.LoginActivity
+
+
+class ParentLogoutTask(type: Type, uri: Uri? = null) : LogoutTask(type, uri) {
+
+ override fun onCleanup() {
+ ParentPrefs.safeClearPrefs()
+ }
+
+ override fun createLoginIntent(context: Context): Intent {
+ return LoginActivity.createIntent(context)
+ }
+
+ override fun createQRLoginIntent(context: Context, uri: Uri): Intent {
+ return LoginActivity.createIntent(context, uri)
+ }
+
+ override fun getFcmToken(listener: (registrationId: String?) -> Unit) {
+ FirebaseMessaging.getInstance().token.addOnCompleteListener { task ->
+ // Task.getResult() can throw exceptions, such as java.io.IOException: SERVICE_NOT_AVAILABLE. We want
+ // to catch the exception here and pass a null string to the listener to allow the LogoutTask to continue
+ // with the remaining logout and cleanup tasks.
+ val registrationId: String? = tryOrNull { task.result }
+ listener(registrationId)
+ }
+ }
+
+ override fun removeOfflineData(userId: Long?) {
+ // No-op
+ }
+}
\ No newline at end of file
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/util/ParentPrefs.kt b/apps/parent/src/main/java/com/instructure/parentapp/util/ParentPrefs.kt
new file mode 100644
index 0000000000..11e847620a
--- /dev/null
+++ b/apps/parent/src/main/java/com/instructure/parentapp/util/ParentPrefs.kt
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2024 - 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 .
+ *
+ */
+
+package com.instructure.parentapp.util
+
+import com.instructure.canvasapi2.models.User
+import com.instructure.canvasapi2.utils.GsonPref
+import com.instructure.canvasapi2.utils.PrefManager
+
+
+object ParentPrefs : PrefManager("parentSP") {
+
+ var currentStudent: User? by GsonPref(User::class.java, null, "current_student", false)
+
+}
\ No newline at end of file
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/util/navigation/Navigation.kt b/apps/parent/src/main/java/com/instructure/parentapp/util/navigation/Navigation.kt
new file mode 100644
index 0000000000..e9a5976ed4
--- /dev/null
+++ b/apps/parent/src/main/java/com/instructure/parentapp/util/navigation/Navigation.kt
@@ -0,0 +1,228 @@
+package com.instructure.parentapp.util.navigation
+
+import android.app.Activity
+import android.net.Uri
+import android.os.Bundle
+import android.util.Log
+import androidx.navigation.NavController
+import androidx.navigation.NavGraph
+import androidx.navigation.NavType
+import androidx.navigation.createGraph
+import androidx.navigation.findNavController
+import androidx.navigation.fragment.fragment
+import com.instructure.canvasapi2.models.CanvasContext
+import com.instructure.canvasapi2.models.PlannerItem
+import com.instructure.canvasapi2.models.ScheduleItem
+import com.instructure.canvasapi2.utils.ApiPrefs
+import com.instructure.pandautils.features.calendarevent.createupdate.CreateUpdateEventFragment
+import com.instructure.pandautils.features.calendarevent.details.EventFragment
+import com.instructure.pandautils.features.calendartodo.createupdate.CreateUpdateToDoFragment
+import com.instructure.pandautils.features.calendartodo.details.ToDoFragment
+import com.instructure.pandautils.features.inbox.list.InboxFragment
+import com.instructure.pandautils.utils.fromJson
+import com.instructure.pandautils.utils.toJson
+import com.instructure.parentapp.R
+import com.instructure.parentapp.features.alerts.list.AlertsFragment
+import com.instructure.parentapp.features.calendar.ParentCalendarFragment
+import com.instructure.parentapp.features.courses.details.CourseDetailsFragment
+import com.instructure.parentapp.features.courses.list.CoursesFragment
+import com.instructure.parentapp.features.dashboard.DashboardFragment
+import com.instructure.parentapp.features.managestudents.ManageStudentsFragment
+import com.instructure.parentapp.features.notaparent.NotAParentFragment
+import com.instructure.pandautils.features.settings.SettingsFragment
+import com.instructure.parentapp.features.splash.SplashFragment
+
+
+class Navigation(apiPrefs: ApiPrefs) {
+
+ private val baseUrl = apiPrefs.fullDomain
+
+ private val courseId = "course-id"
+ private val courseDetails = "$baseUrl/courses/{$courseId}"
+
+ val splash = "$baseUrl/splash"
+ val notAParent = "$baseUrl/not-a-parent"
+ val courses = "$baseUrl/courses"
+ val calendar = "$baseUrl/calendar"
+ val alerts = "$baseUrl/alerts"
+ val inbox = "$baseUrl/conversations"
+ val manageStudents = "$baseUrl/manage-students"
+ val settings = "$baseUrl/settings"
+
+ private val calendarEvent =
+ "$baseUrl/{${EventFragment.CONTEXT_TYPE}}/{${EventFragment.CONTEXT_ID}}/calendar_events/{${EventFragment.SCHEDULE_ITEM_ID}}"
+ private val createEvent = "$baseUrl/create-event/{${CreateUpdateEventFragment.INITIAL_DATE}}"
+ private val updateEvent = "$baseUrl/update-event/{${CreateUpdateEventFragment.SCHEDULE_ITEM}}"
+
+ private val todo = "$baseUrl/todos/{${ToDoFragment.PLANNER_ITEM}}"
+ private val createToDo = "$baseUrl/create-todo/{${CreateUpdateToDoFragment.INITIAL_DATE}}"
+ private val updateToDo = "$baseUrl/update-todo/{${CreateUpdateToDoFragment.PLANNER_ITEM}}"
+
+ fun courseDetailsRoute(id: Long) = "$baseUrl/courses/$id"
+
+ fun calendarEventRoute(contextTypeString: String, contextId: Long, eventId: Long) = "$baseUrl/$contextTypeString/$contextId/calendar_events/$eventId"
+ fun createEventRoute(initialDate: String?) = "$baseUrl/create-event/${Uri.encode(initialDate.orEmpty())}"
+ fun updateEventRoute(scheduleItem: ScheduleItem) = "$baseUrl/update-event/${ScheduleItemParametersType.serializeAsValue(scheduleItem)}"
+
+ fun toDoRoute(plannerItem: PlannerItem) = "$baseUrl/todos/${PlannerItemParametersType.serializeAsValue(plannerItem)}"
+ fun createToDoRoute(initialDate: String?) = "$baseUrl/create-todo/${Uri.encode(initialDate.orEmpty())}"
+ fun updateToDoRoute(plannerItem: PlannerItem) = "$baseUrl/update-todo/${PlannerItemParametersType.serializeAsValue(plannerItem)}"
+
+ fun crateMainNavGraph(navController: NavController): NavGraph {
+ return navController.createGraph(
+ splash
+ ) {
+ fragment(splash)
+ fragment(notAParent)
+ fragment(courses) {
+ deepLink {
+ uriPattern = courses
+ }
+ }
+ fragment(calendar) {
+ deepLink {
+ uriPattern = calendar
+ }
+ }
+ fragment(alerts) {
+ deepLink {
+ uriPattern = alerts
+ }
+ }
+ fragment(inbox) {
+ deepLink {
+ uriPattern = inbox
+ }
+ }
+ fragment(manageStudents)
+ fragment(settings)
+ fragment(courseDetails) {
+ argument(courseId) {
+ type = NavType.LongType
+ nullable = false
+ }
+ deepLink {
+ uriPattern = courseDetails
+ }
+ }
+ fragment(calendarEvent) {
+ argument(EventFragment.CONTEXT_TYPE) {
+ type = NavType.StringType
+ nullable = false
+ }
+ argument(EventFragment.CONTEXT_ID) {
+ type = NavType.LongType
+ nullable = false
+ }
+ argument(EventFragment.SCHEDULE_ITEM_ID) {
+ type = NavType.LongType
+ nullable = false
+ }
+ deepLink {
+ uriPattern = calendarEvent
+ }
+ }
+ fragment(todo) {
+ argument(ToDoFragment.PLANNER_ITEM) {
+ type = PlannerItemParametersType
+ nullable = false
+ }
+ }
+ fragment(createToDo) {
+ argument(CreateUpdateToDoFragment.INITIAL_DATE) {
+ type = NavType.StringType
+ nullable = true
+ }
+ }
+ fragment(updateToDo) {
+ argument(CreateUpdateToDoFragment.PLANNER_ITEM) {
+ type = PlannerItemParametersType
+ nullable = false
+ }
+ }
+ fragment(createEvent) {
+ argument(CreateUpdateEventFragment.INITIAL_DATE) {
+ type = NavType.StringType
+ nullable = true
+ }
+ }
+ fragment(updateEvent) {
+ argument(CreateUpdateEventFragment.SCHEDULE_ITEM) {
+ type = ScheduleItemParametersType
+ nullable = false
+ }
+ }
+ }
+ }
+
+ fun createDashboardNavGraph(navController: NavController): NavGraph {
+ return navController.createGraph(
+ courses
+ ) {
+ fragment(courses) {
+ deepLink {
+ uriPattern = courses
+ }
+ }
+ fragment(calendar) {
+ deepLink {
+ uriPattern = calendar
+ }
+ }
+ fragment(alerts) {
+ deepLink {
+ uriPattern = alerts
+ }
+ }
+ }
+ }
+
+ fun navigate(activity: Activity?, route: String) {
+ val navController = activity?.findNavController(R.id.nav_host_fragment) ?: return
+ try {
+ navController.navigate(route)
+ } catch (e: Exception) {
+ Log.e(this.javaClass.simpleName, e.message.orEmpty())
+ }
+ }
+}
+
+private val PlannerItemParametersType = object : NavType(
+ isNullableAllowed = false
+) {
+ override fun put(bundle: Bundle, key: String, value: PlannerItem) {
+ bundle.putParcelable(key, value)
+ }
+
+ override fun get(bundle: Bundle, key: String): PlannerItem? {
+ return bundle.getParcelable(key) as? PlannerItem
+ }
+
+ override fun serializeAsValue(value: PlannerItem): String {
+ return Uri.encode(value.toJson())
+ }
+
+ override fun parseValue(value: String): PlannerItem {
+ return value.fromJson()
+ }
+}
+
+private val ScheduleItemParametersType = object : NavType(
+ isNullableAllowed = false
+) {
+ override fun put(bundle: Bundle, key: String, value: ScheduleItem) {
+ bundle.putParcelable(key, value)
+ }
+
+ override fun get(bundle: Bundle, key: String): ScheduleItem? {
+ return bundle.getParcelable(key) as? ScheduleItem
+ }
+
+ override fun serializeAsValue(value: ScheduleItem): String {
+ return Uri.encode(value.toJson())
+ }
+
+ override fun parseValue(value: String): ScheduleItem {
+ return value.fromJson()
+ }
+}
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/util/navigation/ParentWebViewRouter.kt b/apps/parent/src/main/java/com/instructure/parentapp/util/navigation/ParentWebViewRouter.kt
new file mode 100644
index 0000000000..faf62d1622
--- /dev/null
+++ b/apps/parent/src/main/java/com/instructure/parentapp/util/navigation/ParentWebViewRouter.kt
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2024 - 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 .
+ *
+ */
+package com.instructure.parentapp.util.navigation
+
+import androidx.fragment.app.FragmentActivity
+import com.instructure.canvasapi2.models.CanvasContext
+import com.instructure.pandautils.navigation.WebViewRouter
+
+class ParentWebViewRouter(val activity: FragmentActivity) : WebViewRouter {
+
+ override fun canRouteInternally(url: String, routeIfPossible: Boolean): Boolean {
+ TODO("Not yet implemented")
+ }
+
+ override fun routeInternally(url: String) {
+ TODO("Not yet implemented")
+ }
+
+ override fun openMedia(url: String, mime: String, filename: String, canvasContext: CanvasContext?) {
+ TODO("Not yet implemented")
+ }
+
+ override fun routeExternally(url: String) {
+ TODO("Not yet implemented")
+ }
+
+ override fun openLtiScreen(canvasContext: CanvasContext?, url: String) {
+ TODO("Not yet implemented")
+ }
+
+ override fun launchInternalWebViewFragment(url: String, canvasContext: CanvasContext?) {
+ TODO("Not yet implemented")
+ }
+}
\ No newline at end of file
diff --git a/apps/student/src/main/res/layout/fragment_calendar.xml b/apps/parent/src/main/res/layout/activity_main.xml
similarity index 62%
rename from apps/student/src/main/res/layout/fragment_calendar.xml
rename to apps/parent/src/main/res/layout/activity_main.xml
index 7e7b720b61..8877a64b49 100644
--- a/apps/student/src/main/res/layout/fragment_calendar.xml
+++ b/apps/parent/src/main/res/layout/activity_main.xml
@@ -1,5 +1,5 @@
-
-
-
-
-
-
+ app:defaultNavHost="true" />
diff --git a/apps/parent/src/main/res/layout/activity_route_validator.xml b/apps/parent/src/main/res/layout/activity_route_validator.xml
new file mode 100644
index 0000000000..47dd4fd893
--- /dev/null
+++ b/apps/parent/src/main/res/layout/activity_route_validator.xml
@@ -0,0 +1,33 @@
+
+
+
+
+
+
+
diff --git a/apps/parent/src/main/res/layout/fragment_dashboard.xml b/apps/parent/src/main/res/layout/fragment_dashboard.xml
new file mode 100644
index 0000000000..e1f3559934
--- /dev/null
+++ b/apps/parent/src/main/res/layout/fragment_dashboard.xml
@@ -0,0 +1,248 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/apps/parent/src/main/res/layout/item_student.xml b/apps/parent/src/main/res/layout/item_student.xml
new file mode 100644
index 0000000000..526266e407
--- /dev/null
+++ b/apps/parent/src/main/res/layout/item_student.xml
@@ -0,0 +1,60 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/apps/parent/src/main/res/layout/navigation_drawer_header_layout.xml b/apps/parent/src/main/res/layout/navigation_drawer_header_layout.xml
new file mode 100644
index 0000000000..d8ebcd1e53
--- /dev/null
+++ b/apps/parent/src/main/res/layout/navigation_drawer_header_layout.xml
@@ -0,0 +1,67 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/apps/parent/src/main/res/menu/bottom_nav.xml b/apps/parent/src/main/res/menu/bottom_nav.xml
new file mode 100644
index 0000000000..8e9767c99b
--- /dev/null
+++ b/apps/parent/src/main/res/menu/bottom_nav.xml
@@ -0,0 +1,32 @@
+
+
diff --git a/apps/parent/src/main/res/menu/nav_drawer.xml b/apps/parent/src/main/res/menu/nav_drawer.xml
new file mode 100644
index 0000000000..c7006e295e
--- /dev/null
+++ b/apps/parent/src/main/res/menu/nav_drawer.xml
@@ -0,0 +1,53 @@
+
+
diff --git a/apps/parent/src/main/res/mipmap-anydpi/ic_launcher.xml b/apps/parent/src/main/res/mipmap-anydpi/ic_launcher.xml
new file mode 100644
index 0000000000..92a1cd5ec4
--- /dev/null
+++ b/apps/parent/src/main/res/mipmap-anydpi/ic_launcher.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/apps/parent/src/main/res/mipmap-anydpi/ic_launcher_round.xml b/apps/parent/src/main/res/mipmap-anydpi/ic_launcher_round.xml
new file mode 100644
index 0000000000..92a1cd5ec4
--- /dev/null
+++ b/apps/parent/src/main/res/mipmap-anydpi/ic_launcher_round.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/apps/parent/src/main/res/mipmap-hdpi/ic_launcher.png b/apps/parent/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100755
index 0000000000..86600ff32d
Binary files /dev/null and b/apps/parent/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/apps/parent/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/apps/parent/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000000..81f5782742
Binary files /dev/null and b/apps/parent/src/main/res/mipmap-hdpi/ic_launcher_foreground.png differ
diff --git a/apps/parent/src/main/res/mipmap-hdpi/ic_launcher_round.png b/apps/parent/src/main/res/mipmap-hdpi/ic_launcher_round.png
new file mode 100644
index 0000000000..e8839d8b78
Binary files /dev/null and b/apps/parent/src/main/res/mipmap-hdpi/ic_launcher_round.png differ
diff --git a/apps/parent/src/main/res/mipmap-mdpi/ic_launcher.png b/apps/parent/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100755
index 0000000000..69728a86a2
Binary files /dev/null and b/apps/parent/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/apps/parent/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/apps/parent/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000000..5b4e689ff0
Binary files /dev/null and b/apps/parent/src/main/res/mipmap-mdpi/ic_launcher_foreground.png differ
diff --git a/apps/parent/src/main/res/mipmap-mdpi/ic_launcher_round.png b/apps/parent/src/main/res/mipmap-mdpi/ic_launcher_round.png
new file mode 100644
index 0000000000..dadbcfe481
Binary files /dev/null and b/apps/parent/src/main/res/mipmap-mdpi/ic_launcher_round.png differ
diff --git a/apps/parent/src/main/res/mipmap-xhdpi/ic_launcher.png b/apps/parent/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100755
index 0000000000..1659918bf0
Binary files /dev/null and b/apps/parent/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/apps/parent/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/apps/parent/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000000..153438e4bd
Binary files /dev/null and b/apps/parent/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png differ
diff --git a/apps/parent/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/apps/parent/src/main/res/mipmap-xhdpi/ic_launcher_round.png
new file mode 100644
index 0000000000..84a791514b
Binary files /dev/null and b/apps/parent/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ
diff --git a/apps/parent/src/main/res/mipmap-xxhdpi/ic_launcher.png b/apps/parent/src/main/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100755
index 0000000000..ab904213ba
Binary files /dev/null and b/apps/parent/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/apps/parent/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/apps/parent/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000000..e429830ccc
Binary files /dev/null and b/apps/parent/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png differ
diff --git a/apps/parent/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/apps/parent/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
new file mode 100644
index 0000000000..7201844714
Binary files /dev/null and b/apps/parent/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ
diff --git a/apps/parent/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/apps/parent/src/main/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100755
index 0000000000..ca45784621
Binary files /dev/null and b/apps/parent/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/apps/parent/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/apps/parent/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000000..ba160342ea
Binary files /dev/null and b/apps/parent/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ
diff --git a/apps/parent/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/apps/parent/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
new file mode 100644
index 0000000000..a3bb2df095
Binary files /dev/null and b/apps/parent/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ
diff --git a/apps/parent/src/main/res/values/ic_launcher_background.xml b/apps/parent/src/main/res/values/ic_launcher_background.xml
new file mode 100644
index 0000000000..823c8914e6
--- /dev/null
+++ b/apps/parent/src/main/res/values/ic_launcher_background.xml
@@ -0,0 +1,19 @@
+
+
+
+ #FFFFFF
+
\ No newline at end of file
diff --git a/apps/parent/src/main/res/values/strings.xml b/apps/parent/src/main/res/values/strings.xml
new file mode 100644
index 0000000000..aed01a6587
--- /dev/null
+++ b/apps/parent/src/main/res/values/strings.xml
@@ -0,0 +1,3 @@
+
+ Canvas Parent
+
\ No newline at end of file
diff --git a/apps/parent/src/main/res/values/themes.xml b/apps/parent/src/main/res/values/themes.xml
new file mode 100644
index 0000000000..30898fd769
--- /dev/null
+++ b/apps/parent/src/main/res/values/themes.xml
@@ -0,0 +1,36 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/apps/parent/src/test/java/com/instructure/parentapp/features/alerts/list/AlertsRepositoryTest.kt b/apps/parent/src/test/java/com/instructure/parentapp/features/alerts/list/AlertsRepositoryTest.kt
new file mode 100644
index 0000000000..0861ad0d2b
--- /dev/null
+++ b/apps/parent/src/test/java/com/instructure/parentapp/features/alerts/list/AlertsRepositoryTest.kt
@@ -0,0 +1,379 @@
+/*
+ * Copyright (C) 2024 - 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 .
+ *
+ */
+package com.instructure.parentapp.features.alerts.list
+
+import com.instructure.canvasapi2.apis.CourseAPI
+import com.instructure.canvasapi2.apis.ObserverApi
+import com.instructure.canvasapi2.models.Alert
+import com.instructure.canvasapi2.models.AlertThreshold
+import com.instructure.canvasapi2.models.AlertType
+import com.instructure.canvasapi2.models.AlertWorkflowState
+import com.instructure.canvasapi2.models.Course
+import com.instructure.canvasapi2.models.CourseSettings
+import com.instructure.canvasapi2.utils.DataResult
+import com.instructure.canvasapi2.utils.LinkHeaders
+import io.mockk.coEvery
+import io.mockk.coVerify
+import io.mockk.mockk
+import kotlinx.coroutines.test.runTest
+import org.junit.Assert.assertEquals
+import org.junit.Before
+import org.junit.Test
+import java.lang.IllegalStateException
+import java.time.Instant
+import java.util.Date
+
+class AlertsRepositoryTest {
+
+ private val observerApi: ObserverApi = mockk(relaxed = true)
+ private val courseApi: CourseAPI.CoursesInterface = mockk(relaxed = true)
+
+ private lateinit var alertsRepository: AlertsRepository
+
+ @Before
+ fun setup() {
+ createRepository()
+
+ coEvery { courseApi.getCourse(any(), any()) } returns DataResult.Success(Course(id = 1L))
+ }
+
+ @Test
+ fun `getAlertsForStudent should return an ordered list of alerts`() = runTest {
+ val alerts = listOf(
+ Alert(
+ id = 1,
+ actionDate = Date.from(
+ Instant.parse("2024-01-03T00:00:00Z")
+ ),
+ title = "Alert 1",
+ workflowState = AlertWorkflowState.READ,
+ alertType = AlertType.ASSIGNMENT_MISSING,
+ htmlUrl = "https://example.com/alert1",
+ contextId = 1L,
+ contextType = "Course",
+ lockedForUser = false,
+ observerAlertThresholdId = 1L,
+ observerId = 1L,
+ userId = 2L
+ ),
+ Alert(
+ id = 1,
+ actionDate = Date.from(
+ Instant.parse("2024-01-01T00:00:00Z")
+ ),
+ title = "Alert 2",
+ workflowState = AlertWorkflowState.READ,
+ alertType = AlertType.ASSIGNMENT_MISSING,
+ htmlUrl = "https://example.com/alert2",
+ contextId = 1L,
+ contextType = "Course",
+ lockedForUser = false,
+ observerAlertThresholdId = 1L,
+ observerId = 1L,
+ userId = 2L
+ ),
+ Alert(
+ id = 1,
+ actionDate = Date.from(
+ Instant.parse("2024-01-02T00:00:00Z")
+ ),
+ title = "Alert 3",
+ workflowState = AlertWorkflowState.READ,
+ alertType = AlertType.ASSIGNMENT_MISSING,
+ htmlUrl = "https://example.com/alert3",
+ contextId = 1L,
+ contextType = "Course",
+ lockedForUser = false,
+ observerAlertThresholdId = 1L,
+ observerId = 1L,
+ userId = 2L
+ ),
+ )
+ val expected = alerts.sortedByDescending { it.actionDate }
+
+ coEvery { observerApi.getObserverAlerts(1L, any()) } returns DataResult.Success(alerts)
+
+ val result = alertsRepository.getAlertsForStudent(1L, false)
+
+ assertEquals(expected, result)
+ }
+
+ @Test
+ fun `get alerts depaginates`() = runTest {
+ val page1 = listOf(
+ Alert(
+ id = 1,
+ actionDate = Date.from(
+ Instant.parse("2024-01-01T00:00:00Z")
+ ),
+ title = "Alert 1",
+ workflowState = AlertWorkflowState.READ,
+ alertType = AlertType.ASSIGNMENT_MISSING,
+ htmlUrl = "https://example.com/alert1",
+ contextId = 1L,
+ contextType = "Course",
+ lockedForUser = false,
+ observerAlertThresholdId = 1L,
+ observerId = 1L,
+ userId = 2L
+ )
+ )
+ val page2 = listOf(
+ Alert(
+ id = 2,
+ actionDate = Date.from(
+ Instant.parse("2024-01-03T00:00:00Z")
+ ),
+ title = "Alert 2",
+ workflowState = AlertWorkflowState.READ,
+ alertType = AlertType.ASSIGNMENT_MISSING,
+ htmlUrl = "https://example.com/alert2",
+ contextId = 1L,
+ contextType = "Course",
+ lockedForUser = false,
+ observerAlertThresholdId = 1L,
+ observerId = 1L,
+ userId = 2L
+ )
+ )
+
+ val expected = (page1 + page2).sortedByDescending { it.actionDate }
+
+ coEvery { observerApi.getObserverAlerts(1L, any()) } returns DataResult.Success(page1, linkHeaders = LinkHeaders(nextUrl = "page_2_url"))
+ coEvery { observerApi.getNextPageObserverAlerts("page_2_url", any()) } returns DataResult.Success(page2)
+
+ val result = alertsRepository.getAlertsForStudent(1L, false)
+
+ assertEquals(expected, result)
+ }
+
+ @Test(expected = IllegalStateException::class)
+ fun `get alerts throw exception if call fails`() = runTest {
+ coEvery { observerApi.getObserverAlerts(1L, any()) } returns DataResult.Fail()
+
+ alertsRepository.getAlertsForStudent(1L, false)
+ }
+
+ @Test
+ fun `get alert thresholds`() = runTest {
+ val expected = listOf(
+ AlertThreshold(
+ id = 1,
+ observerId = 1,
+ threshold = "3",
+ alertType = AlertType.ASSIGNMENT_GRADE_LOW,
+ userId = 2
+ ),
+ AlertThreshold(
+ id = 2,
+ observerId = 1,
+ threshold = "5",
+ alertType = AlertType.ASSIGNMENT_GRADE_HIGH,
+ userId = 2
+ )
+ )
+
+ coEvery { observerApi.getObserverAlertThresholds(1L, any()) } returns DataResult.Success(expected)
+
+ val result = alertsRepository.getAlertThresholdForStudent(1L, false)
+
+ assertEquals(expected, result)
+ }
+
+ @Test
+ fun `get alert thresholds returns empty list if call fails`() = runTest {
+ coEvery { observerApi.getObserverAlertThresholds(1L, any()) } returns DataResult.Fail()
+
+ val result = alertsRepository.getAlertThresholdForStudent(1L, false)
+
+ assertEquals(emptyList(), result)
+ }
+
+ @Test
+ fun `update alert workflow state`() = runTest {
+ val alert = Alert(
+ id = 1,
+ actionDate = Date.from(
+ Instant.parse("2024-01-01T00:00:00Z")
+ ),
+ title = "Alert 1",
+ workflowState = AlertWorkflowState.READ,
+ alertType = AlertType.ASSIGNMENT_MISSING,
+ htmlUrl = "https://example.com/alert1",
+ contextId = 1L,
+ contextType = "Course",
+ lockedForUser = false,
+ observerAlertThresholdId = 1L,
+ observerId = 1L,
+ userId = 2L
+ )
+ val expected = alert.copy(workflowState = AlertWorkflowState.UNREAD)
+
+ coEvery { observerApi.updateAlertWorkflow(1L, "unread", any()) } returns DataResult.Success(expected)
+
+ val result = alertsRepository.updateAlertWorkflow(1L, AlertWorkflowState.UNREAD)
+
+ coVerify {
+ observerApi.updateAlertWorkflow(1L, "unread", any())
+ }
+
+ assertEquals(expected, result)
+ }
+
+ @Test(expected = IllegalStateException::class)
+ fun `update alert workflow state throws exception if call fails`() = runTest {
+ coEvery { observerApi.updateAlertWorkflow(1L, "unread", any()) } returns DataResult.Fail()
+
+ alertsRepository.updateAlertWorkflow(1L, AlertWorkflowState.UNREAD)
+ }
+
+ @Test
+ fun `get alerts count`() = runTest {
+ val alerts = listOf(
+ Alert(
+ id = 1,
+ actionDate = Date.from(
+ Instant.parse("2024-01-03T00:00:00Z")
+ ),
+ title = "Alert 1",
+ workflowState = AlertWorkflowState.READ,
+ alertType = AlertType.ASSIGNMENT_MISSING,
+ htmlUrl = "https://example.com/alert1",
+ contextId = 1L,
+ contextType = "Course",
+ lockedForUser = false,
+ observerAlertThresholdId = 1L,
+ observerId = 1L,
+ userId = 2L
+ ),
+ Alert(
+ id = 1,
+ actionDate = Date.from(
+ Instant.parse("2024-01-01T00:00:00Z")
+ ),
+ title = "Alert 2",
+ workflowState = AlertWorkflowState.UNREAD,
+ alertType = AlertType.ASSIGNMENT_MISSING,
+ htmlUrl = "https://example.com/alert2",
+ contextId = 1L,
+ contextType = "Course",
+ lockedForUser = false,
+ observerAlertThresholdId = 1L,
+ observerId = 1L,
+ userId = 2L
+ ),
+ Alert(
+ id = 1,
+ actionDate = Date.from(
+ Instant.parse("2024-01-02T00:00:00Z")
+ ),
+ title = "Alert 3",
+ workflowState = AlertWorkflowState.UNREAD,
+ alertType = AlertType.ASSIGNMENT_MISSING,
+ htmlUrl = "https://example.com/alert3",
+ contextId = 1L,
+ contextType = "Course",
+ lockedForUser = false,
+ observerAlertThresholdId = 1L,
+ observerId = 1L,
+ userId = 2L
+ ),
+ )
+ coEvery { observerApi.getObserverAlerts(any(), any()) } returns DataResult.Success(alerts)
+
+ val result = alertsRepository.getUnreadAlertCount(1L)
+
+ assertEquals(2, result)
+ }
+
+ @Test
+ fun `alert count set to 0 if call fails`() = runTest {
+
+ coEvery { observerApi.getObserverAlerts(any(), any()) } returns DataResult.Fail()
+
+ val result = alertsRepository.getUnreadAlertCount(1L)
+
+ assertEquals(0, result)
+ }
+
+ @Test
+ fun `filter quantitative data if restricted`() = runTest {
+ val alerts = listOf(
+ Alert(
+ id = 1,
+ actionDate = Date.from(
+ Instant.parse("2024-01-03T00:00:00Z")
+ ),
+ title = "Alert 1",
+ workflowState = AlertWorkflowState.READ,
+ alertType = AlertType.COURSE_GRADE_LOW,
+ htmlUrl = "https://example.com/alert1",
+ contextId = 1L,
+ contextType = "Course",
+ lockedForUser = false,
+ observerAlertThresholdId = 1L,
+ observerId = 1L,
+ userId = 2L
+ ),
+ Alert(
+ id = 2,
+ actionDate = Date.from(
+ Instant.parse("2024-01-01T00:00:00Z")
+ ),
+ title = "Alert 2",
+ workflowState = AlertWorkflowState.UNREAD,
+ alertType = AlertType.ASSIGNMENT_MISSING,
+ htmlUrl = "https://example.com/alert2",
+ contextId = 2L,
+ contextType = "Course",
+ lockedForUser = false,
+ observerAlertThresholdId = 2L,
+ observerId = 1L,
+ userId = 2L
+ ),
+ Alert(
+ id = 3,
+ actionDate = Date.from(
+ Instant.parse("2024-01-02T00:00:00Z")
+ ),
+ title = "Alert 3",
+ workflowState = AlertWorkflowState.UNREAD,
+ alertType = AlertType.COURSE_GRADE_HIGH,
+ htmlUrl = "https://example.com/alert3",
+ contextId = 2L,
+ contextType = "Course",
+ lockedForUser = false,
+ observerAlertThresholdId = 3L,
+ observerId = 1L,
+ userId = 2L
+ ),
+ )
+
+ coEvery { observerApi.getObserverAlerts(any(), any()) } returns DataResult.Success(alerts)
+ coEvery { courseApi.getCourseSettings(1L, any()) } returns DataResult.Success(CourseSettings(restrictQuantitativeData = false))
+ coEvery { courseApi.getCourseSettings(2L, any()) } returns DataResult.Success(CourseSettings(restrictQuantitativeData = true))
+
+ val result = alertsRepository.getAlertsForStudent(1L, false)
+
+ assertEquals(2, result.size)
+ assertEquals(alerts.subList(0, 2), result)
+ }
+
+ private fun createRepository() {
+ alertsRepository = AlertsRepository(observerApi, courseApi)
+ }
+}
\ No newline at end of file
diff --git a/apps/parent/src/test/java/com/instructure/parentapp/features/alerts/list/AlertsViewModelTest.kt b/apps/parent/src/test/java/com/instructure/parentapp/features/alerts/list/AlertsViewModelTest.kt
new file mode 100644
index 0000000000..a09c62ecf6
--- /dev/null
+++ b/apps/parent/src/test/java/com/instructure/parentapp/features/alerts/list/AlertsViewModelTest.kt
@@ -0,0 +1,730 @@
+/*
+ * Copyright (C) 2024 - 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 .
+ *
+ */
+package com.instructure.parentapp.features.alerts.list
+
+import android.graphics.Color
+import androidx.arch.core.executor.testing.InstantTaskExecutorRule
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.LifecycleRegistry
+import com.instructure.canvasapi2.models.Alert
+import com.instructure.canvasapi2.models.AlertThreshold
+import com.instructure.canvasapi2.models.AlertType
+import com.instructure.canvasapi2.models.AlertWorkflowState
+import com.instructure.canvasapi2.models.User
+import com.instructure.pandautils.utils.ColorKeeper
+import com.instructure.pandautils.utils.ThemedColor
+import com.instructure.parentapp.R
+import com.instructure.parentapp.features.dashboard.AlertCountUpdater
+import com.instructure.parentapp.features.dashboard.TestSelectStudentHolder
+import io.mockk.coEvery
+import io.mockk.coVerify
+import io.mockk.mockk
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.toList
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.test.UnconfinedTestDispatcher
+import kotlinx.coroutines.test.resetMain
+import kotlinx.coroutines.test.runTest
+import kotlinx.coroutines.test.setMain
+import org.junit.After
+import org.junit.Assert.assertEquals
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import java.time.Instant
+import java.util.Date
+
+@ExperimentalCoroutinesApi
+class AlertsViewModelTest {
+
+ @get:Rule
+ val instantExecutorRule = InstantTaskExecutorRule()
+
+ private val lifecycleOwner: LifecycleOwner = mockk(relaxed = true)
+ private val lifecycleRegistry = LifecycleRegistry(lifecycleOwner)
+ private val testDispatcher = UnconfinedTestDispatcher()
+
+ private val repository: AlertsRepository = mockk(relaxed = true)
+ private val colorKeeper: ColorKeeper = mockk(relaxed = true)
+ private val alertCountUpdater: AlertCountUpdater = mockk(relaxed = true)
+ private val selectedStudentFlow = MutableStateFlow(null)
+ private val selectedStudentHolder = TestSelectStudentHolder(selectedStudentFlow)
+
+ private lateinit var viewModel: AlertsViewModel
+
+ @Before
+ fun setup() {
+ lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_CREATE)
+ Dispatchers.setMain(testDispatcher)
+
+ coEvery { colorKeeper.getOrGenerateUserColor(any()) } returns ThemedColor(1, 1)
+ coEvery { repository.getAlertThresholdForStudent(any(), any()) } returns emptyList()
+ }
+
+ @After
+ fun tearDown() {
+ Dispatchers.resetMain()
+ }
+
+ @Test
+ fun `Load alerts on student change`() = runTest {
+ val student = User(1L)
+
+ val alerts = listOf(
+ Alert(
+ id = 1,
+ actionDate = Date.from(
+ Instant.parse("2024-01-03T00:00:00Z")
+ ),
+ title = "Alert 1",
+ workflowState = AlertWorkflowState.READ,
+ alertType = AlertType.ASSIGNMENT_MISSING,
+ htmlUrl = "https://example.com/alert1",
+ contextId = 1L,
+ contextType = "Course",
+ lockedForUser = false,
+ observerAlertThresholdId = 1L,
+ observerId = 1L,
+ userId = 2L
+ ),
+ Alert(
+ id = 1,
+ actionDate = Date.from(
+ Instant.parse("2024-01-01T00:00:00Z")
+ ),
+ title = "Alert 2",
+ workflowState = AlertWorkflowState.UNREAD,
+ alertType = AlertType.ASSIGNMENT_GRADE_LOW,
+ htmlUrl = "https://example.com/alert2",
+ contextId = 1L,
+ contextType = "Course",
+ lockedForUser = false,
+ observerAlertThresholdId = 2L,
+ observerId = 1L,
+ userId = 2L
+ ),
+ )
+
+ val thresholds = listOf(
+ AlertThreshold(
+ id = 1L,
+ observerId = 1L,
+ threshold = null,
+ alertType = AlertType.ASSIGNMENT_MISSING,
+ userId = 1L
+ ),
+ AlertThreshold(
+ id = 2L,
+ observerId = 1L,
+ threshold = "50%",
+ alertType = AlertType.ASSIGNMENT_GRADE_LOW,
+ userId = 1L
+ )
+ )
+
+ coEvery {
+ repository.getAlertsForStudent(student.id, any())
+ } returns alerts
+
+ coEvery { repository.getAlertThresholdForStudent(student.id, any()) } returns thresholds
+
+
+ createViewModel()
+ selectedStudentFlow.emit(student)
+
+ val expected = AlertsUiState(
+ isLoading = false,
+ isError = false,
+ alerts = alerts.map {
+ AlertsItemUiState(
+ alertId = it.id,
+ title = it.title,
+ alertType = it.alertType,
+ date = it.actionDate,
+ observerAlertThreshold = thresholds.find { threshold -> threshold.alertType == it.alertType }?.threshold,
+ lockedForUser = it.lockedForUser,
+ unread = it.workflowState == AlertWorkflowState.UNREAD,
+ htmlUrl = it.htmlUrl
+ )
+ }.sortedByDescending { it.date },
+ studentColor = 1
+ )
+
+ assertEquals(expected, viewModel.uiState.value)
+ }
+
+ @Test
+ fun `Empty state`() = runTest {
+ val student = User(1L)
+
+ coEvery {
+ repository.getAlertsForStudent(student.id, any())
+ } returns emptyList()
+
+ createViewModel()
+ selectedStudentFlow.emit(student)
+
+ val expected = AlertsUiState(
+ isLoading = false,
+ isError = false,
+ alerts = emptyList(),
+ studentColor = 1
+ )
+
+ assertEquals(expected, viewModel.uiState.value)
+ }
+
+ @Test
+ fun `Error state if the student is not set`() = runTest {
+ createViewModel()
+
+ viewModel.handleAction(AlertsAction.Refresh)
+
+ val expected = AlertsUiState(
+ isLoading = false,
+ isError = true,
+ alerts = emptyList(),
+ studentColor = Color.BLACK
+ )
+
+ assertEquals(expected, viewModel.uiState.value)
+ }
+
+ @Test
+ fun `Error state if getting alerts fail`() = runTest {
+ val student = User(1L)
+
+ coEvery {
+ repository.getAlertsForStudent(student.id, any())
+ } throws Exception()
+
+ createViewModel()
+ selectedStudentFlow.emit(student)
+
+ val expected = AlertsUiState(
+ isLoading = false,
+ isError = true,
+ alerts = emptyList(),
+ studentColor = 1
+ )
+
+ assertEquals(expected, viewModel.uiState.value)
+ }
+
+ @Test
+ fun `Refresh data`() = runTest {
+ val student = User(1L)
+
+ val alerts = listOf(
+ Alert(
+ id = 1,
+ actionDate = Date.from(
+ Instant.parse("2024-01-03T00:00:00Z")
+ ),
+ title = "Alert 1",
+ workflowState = AlertWorkflowState.READ,
+ alertType = AlertType.ASSIGNMENT_MISSING,
+ htmlUrl = "https://example.com/alert1",
+ contextId = 1L,
+ contextType = "Course",
+ lockedForUser = false,
+ observerAlertThresholdId = 1L,
+ observerId = 1L,
+ userId = 2L
+ )
+ )
+
+ coEvery { repository.getAlertsForStudent(student.id, any()) } returns emptyList()
+
+ createViewModel()
+ selectedStudentFlow.emit(student)
+
+ val expected = AlertsUiState(
+ isLoading = false,
+ isError = false,
+ alerts = emptyList(),
+ studentColor = 1
+ )
+ assertEquals(expected, viewModel.uiState.value)
+
+ coEvery { repository.getAlertsForStudent(student.id, any()) } returns alerts
+
+ viewModel.handleAction(AlertsAction.Refresh)
+
+ val expectedRefreshed = AlertsUiState(
+ isLoading = false,
+ isError = false,
+ alerts = alerts.map {
+ AlertsItemUiState(
+ alertId = it.id,
+ title = it.title,
+ alertType = it.alertType,
+ date = it.actionDate,
+ observerAlertThreshold = null,
+ lockedForUser = it.lockedForUser,
+ unread = it.workflowState == AlertWorkflowState.UNREAD,
+ htmlUrl = it.htmlUrl
+ )
+ }.sortedByDescending { it.date },
+ studentColor = 1
+ )
+
+ assertEquals(expectedRefreshed, viewModel.uiState.value)
+ }
+
+ @Test
+ fun `Dismiss alert`() = runTest {
+ val student = User(1L)
+
+ val alerts = listOf(
+ Alert(
+ id = 1,
+ actionDate = Date.from(
+ Instant.parse("2024-01-03T00:00:00Z")
+ ),
+ title = "Alert 1",
+ workflowState = AlertWorkflowState.READ,
+ alertType = AlertType.ASSIGNMENT_MISSING,
+ htmlUrl = "https://example.com/alert1",
+ contextId = 1L,
+ contextType = "Course",
+ lockedForUser = false,
+ observerAlertThresholdId = 1L,
+ observerId = 1L,
+ userId = 2L
+ )
+ )
+
+ coEvery { repository.getAlertsForStudent(student.id, any()) } returns alerts
+ coEvery { repository.updateAlertWorkflow(any(), any()) } returns mockk()
+
+ createViewModel()
+ selectedStudentFlow.emit(student)
+
+ val expected = AlertsUiState(
+ isLoading = false,
+ isError = false,
+ alerts = alerts.map {
+ AlertsItemUiState(
+ alertId = it.id,
+ title = it.title,
+ alertType = it.alertType,
+ date = it.actionDate,
+ observerAlertThreshold = null,
+ lockedForUser = it.lockedForUser,
+ unread = it.workflowState == AlertWorkflowState.UNREAD,
+ htmlUrl = it.htmlUrl
+ )
+ }.sortedByDescending { it.date },
+ studentColor = 1
+ )
+
+ assertEquals(expected, viewModel.uiState.value)
+
+ viewModel.handleAction(AlertsAction.DismissAlert(1L))
+ assertEquals(emptyList(), viewModel.uiState.value.alerts)
+
+ val events = mutableListOf()
+
+ backgroundScope.launch(testDispatcher) {
+ viewModel.events.toList(events)
+ }
+
+ assertEquals(R.string.alertDismissMessage, (events.last() as AlertsViewModelAction.ShowSnackbar).message)
+ assertEquals(R.string.alertDismissAction, (events.last() as AlertsViewModelAction.ShowSnackbar).action)
+ }
+
+ @Test
+ fun `Dismiss error resets event`() = runTest {
+ val student = User(1L)
+
+ val alerts = listOf(
+ Alert(
+ id = 1,
+ actionDate = Date.from(
+ Instant.parse("2024-01-03T00:00:00Z")
+ ),
+ title = "Alert 1",
+ workflowState = AlertWorkflowState.READ,
+ alertType = AlertType.ASSIGNMENT_MISSING,
+ htmlUrl = "https://example.com/alert1",
+ contextId = 1L,
+ contextType = "Course",
+ lockedForUser = false,
+ observerAlertThresholdId = 1L,
+ observerId = 1L,
+ userId = 2L
+ )
+ )
+
+ coEvery { repository.getAlertsForStudent(student.id, any()) } returns alerts
+ coEvery { repository.updateAlertWorkflow(any(), any()) } throws Exception()
+
+ createViewModel()
+ selectedStudentFlow.emit(student)
+
+ val expected = AlertsUiState(
+ isLoading = false,
+ isError = false,
+ alerts = alerts.map {
+ AlertsItemUiState(
+ alertId = it.id,
+ title = it.title,
+ alertType = it.alertType,
+ date = it.actionDate,
+ observerAlertThreshold = null,
+ lockedForUser = it.lockedForUser,
+ unread = it.workflowState == AlertWorkflowState.UNREAD,
+ htmlUrl = it.htmlUrl
+ )
+ }.sortedByDescending { it.date },
+ studentColor = 1
+ )
+
+ assertEquals(expected, viewModel.uiState.value)
+
+ viewModel.handleAction(AlertsAction.DismissAlert(1L))
+
+ val events = mutableListOf()
+
+ backgroundScope.launch(testDispatcher) {
+ viewModel.events.toList(events)
+ }
+
+ assertEquals(R.string.alertDismissErrorMessage, (events.last() as AlertsViewModelAction.ShowSnackbar).message)
+ assertEquals(expected, viewModel.uiState.value)
+ }
+
+ @Test
+ fun `Undo dismissal`() = runTest {
+ val student = User(1L)
+
+ val alerts = listOf(
+ Alert(
+ id = 1,
+ actionDate = Date.from(
+ Instant.parse("2024-01-03T00:00:00Z")
+ ),
+ title = "Alert 1",
+ workflowState = AlertWorkflowState.READ,
+ alertType = AlertType.ASSIGNMENT_MISSING,
+ htmlUrl = "https://example.com/alert1",
+ contextId = 1L,
+ contextType = "Course",
+ lockedForUser = false,
+ observerAlertThresholdId = 1L,
+ observerId = 1L,
+ userId = 2L
+ )
+ )
+
+ coEvery { repository.getAlertsForStudent(student.id, any()) } returns alerts
+ coEvery { repository.updateAlertWorkflow(any(), any()) } returns mockk()
+
+ createViewModel()
+ selectedStudentFlow.emit(student)
+
+ val expected = AlertsUiState(
+ isLoading = false,
+ isError = false,
+ alerts = alerts.map {
+ AlertsItemUiState(
+ alertId = it.id,
+ title = it.title,
+ alertType = it.alertType,
+ date = it.actionDate,
+ observerAlertThreshold = null,
+ lockedForUser = it.lockedForUser,
+ unread = it.workflowState == AlertWorkflowState.UNREAD,
+ htmlUrl = it.htmlUrl
+ )
+ }.sortedByDescending { it.date },
+ studentColor = 1
+ )
+
+ assertEquals(expected, viewModel.uiState.value)
+
+ viewModel.handleAction(AlertsAction.DismissAlert(1L))
+ assertEquals(emptyList(), viewModel.uiState.value.alerts)
+
+ val events = mutableListOf()
+
+ backgroundScope.launch(testDispatcher) {
+ viewModel.events.toList(events)
+ }
+
+ assertEquals(R.string.alertDismissMessage, (events.last() as AlertsViewModelAction.ShowSnackbar).message)
+ assertEquals(R.string.alertDismissAction, (events.last() as AlertsViewModelAction.ShowSnackbar).action)
+
+ (events.last() as AlertsViewModelAction.ShowSnackbar).actionCallback?.invoke()
+
+ assertEquals(expected, viewModel.uiState.value)
+ }
+
+ @Test
+ fun `Undo does not reset event on error`() = runTest {
+ val student = User(1L)
+
+ val alerts = listOf(
+ Alert(
+ id = 1,
+ actionDate = Date.from(
+ Instant.parse("2024-01-03T00:00:00Z")
+ ),
+ title = "Alert 1",
+ workflowState = AlertWorkflowState.READ,
+ alertType = AlertType.ASSIGNMENT_MISSING,
+ htmlUrl = "https://example.com/alert1",
+ contextId = 1L,
+ contextType = "Course",
+ lockedForUser = false,
+ observerAlertThresholdId = 1L,
+ observerId = 1L,
+ userId = 2L
+ )
+ )
+
+ coEvery { repository.getAlertsForStudent(student.id, any()) } returns alerts
+ coEvery { repository.updateAlertWorkflow(any(), any()) } returns mockk()
+
+ createViewModel()
+ selectedStudentFlow.emit(student)
+
+ val expected = AlertsUiState(
+ isLoading = false,
+ isError = false,
+ alerts = alerts.map {
+ AlertsItemUiState(
+ alertId = it.id,
+ title = it.title,
+ alertType = it.alertType,
+ date = it.actionDate,
+ observerAlertThreshold = null,
+ lockedForUser = it.lockedForUser,
+ unread = it.workflowState == AlertWorkflowState.UNREAD,
+ htmlUrl = it.htmlUrl
+ )
+ }.sortedByDescending { it.date },
+ studentColor = 1
+ )
+
+ assertEquals(expected, viewModel.uiState.value)
+
+ viewModel.handleAction(AlertsAction.DismissAlert(1L))
+ assertEquals(emptyList(), viewModel.uiState.value.alerts)
+
+ val events = mutableListOf()
+
+ backgroundScope.launch(testDispatcher) {
+ viewModel.events.toList(events)
+ }
+
+ coEvery { repository.updateAlertWorkflow(any(), any()) } throws Exception()
+ (events.last() as AlertsViewModelAction.ShowSnackbar).actionCallback?.invoke()
+
+ assertEquals(emptyList(), viewModel.uiState.value.alerts)
+ }
+
+ @Test
+ fun `Navigate to URL`() = runTest {
+ val student = User(1L)
+
+ val alerts = listOf(
+ Alert(
+ id = 1,
+ actionDate = Date.from(
+ Instant.parse("2024-01-03T00:00:00Z")
+ ),
+ title = "Alert 1",
+ workflowState = AlertWorkflowState.READ,
+ alertType = AlertType.ASSIGNMENT_MISSING,
+ htmlUrl = "https://example.com/alert1",
+ contextId = 1L,
+ contextType = "Course",
+ lockedForUser = false,
+ observerAlertThresholdId = 1L,
+ observerId = 1L,
+ userId = 2L
+ )
+ )
+
+ coEvery { repository.getAlertsForStudent(student.id, any()) } returns alerts
+
+ createViewModel()
+ selectedStudentFlow.emit(student)
+
+ val expected = AlertsUiState(
+ isLoading = false,
+ isError = false,
+ alerts = alerts.map {
+ AlertsItemUiState(
+ alertId = it.id,
+ title = it.title,
+ alertType = it.alertType,
+ date = it.actionDate,
+ observerAlertThreshold = null,
+ lockedForUser = it.lockedForUser,
+ unread = it.workflowState == AlertWorkflowState.UNREAD,
+ htmlUrl = it.htmlUrl
+ )
+ }.sortedByDescending { it.date },
+ studentColor = 1
+ )
+
+ assertEquals(expected, viewModel.uiState.value)
+
+ viewModel.handleAction(AlertsAction.Navigate(1L, "https://example.com/alert1"))
+
+ val events = mutableListOf()
+
+ backgroundScope.launch(testDispatcher) {
+ viewModel.events.toList(events)
+ }
+
+ assertEquals(AlertsViewModelAction.Navigate("https://example.com/alert1"), events.last())
+ }
+
+ @Test
+ fun `Navigation to alert marks it read`() = runTest {
+ val student = User(1L)
+
+ val alerts = listOf(
+ Alert(
+ id = 1,
+ actionDate = Date.from(
+ Instant.parse("2024-01-03T00:00:00Z")
+ ),
+ title = "Alert 1",
+ workflowState = AlertWorkflowState.UNREAD,
+ alertType = AlertType.ASSIGNMENT_MISSING,
+ htmlUrl = "https://example.com/alert1",
+ contextId = 1L,
+ contextType = "Course",
+ lockedForUser = false,
+ observerAlertThresholdId = 1L,
+ observerId = 1L,
+ userId = 2L
+ )
+ )
+
+ coEvery { repository.updateAlertWorkflow(1L, AlertWorkflowState.READ) } returns mockk()
+ coEvery { repository.getAlertsForStudent(student.id, any()) } returns alerts
+
+ createViewModel()
+ selectedStudentFlow.emit(student)
+
+ val expected = AlertsUiState(
+ isLoading = false,
+ isError = false,
+ alerts = alerts.map {
+ AlertsItemUiState(
+ alertId = it.id,
+ title = it.title,
+ alertType = it.alertType,
+ date = it.actionDate,
+ observerAlertThreshold = null,
+ lockedForUser = it.lockedForUser,
+ unread = false,
+ htmlUrl = it.htmlUrl
+ )
+ }.sortedByDescending { it.date },
+ studentColor = 1
+ )
+
+ viewModel.handleAction(AlertsAction.Navigate(1L, "https://example.com/alert1"))
+
+ val events = mutableListOf()
+ backgroundScope.launch(testDispatcher) {
+ viewModel.events.toList(events)
+ }
+
+ assertEquals(AlertsViewModelAction.Navigate("https://example.com/alert1"), events.last())
+
+ assertEquals(expected, viewModel.uiState.value)
+ coVerify {
+ repository.updateAlertWorkflow(1L, AlertWorkflowState.READ)
+ }
+ }
+
+ @Test
+ fun `If marking the alert read fails the alert will remain read until refresh`() = runTest {
+ val student = User(1L)
+
+ val alerts = listOf(
+ Alert(
+ id = 1,
+ actionDate = Date.from(
+ Instant.parse("2024-01-03T00:00:00Z")
+ ),
+ title = "Alert 1",
+ workflowState = AlertWorkflowState.UNREAD,
+ alertType = AlertType.ASSIGNMENT_MISSING,
+ htmlUrl = "https://example.com/alert1",
+ contextId = 1L,
+ contextType = "Course",
+ lockedForUser = false,
+ observerAlertThresholdId = 1L,
+ observerId = 1L,
+ userId = 2L
+ )
+ )
+
+ coEvery { repository.updateAlertWorkflow(1L, AlertWorkflowState.READ) } throws Exception()
+ coEvery { repository.getAlertsForStudent(student.id, any()) } returns alerts
+
+ createViewModel()
+ selectedStudentFlow.emit(student)
+
+ val expected = AlertsUiState(
+ isLoading = false,
+ isError = false,
+ alerts = alerts.map {
+ AlertsItemUiState(
+ alertId = it.id,
+ title = it.title,
+ alertType = it.alertType,
+ date = it.actionDate,
+ observerAlertThreshold = null,
+ lockedForUser = it.lockedForUser,
+ unread = false,
+ htmlUrl = it.htmlUrl
+ )
+ }.sortedByDescending { it.date },
+ studentColor = 1
+ )
+
+ viewModel.handleAction(AlertsAction.Navigate(1L, "https://example.com/alert1"))
+
+ val events = mutableListOf()
+ backgroundScope.launch(testDispatcher) {
+ viewModel.events.toList(events)
+ }
+
+ assertEquals(AlertsViewModelAction.Navigate("https://example.com/alert1"), events.last())
+
+ assertEquals(expected, viewModel.uiState.value)
+
+ }
+
+ private fun createViewModel() {
+ viewModel =
+ AlertsViewModel(repository, colorKeeper, selectedStudentHolder, alertCountUpdater)
+ }
+}
\ No newline at end of file
diff --git a/apps/parent/src/test/java/com/instructure/parentapp/features/calendar/ParentCalendarRepositoryTest.kt b/apps/parent/src/test/java/com/instructure/parentapp/features/calendar/ParentCalendarRepositoryTest.kt
new file mode 100644
index 0000000000..9c1f73176e
--- /dev/null
+++ b/apps/parent/src/test/java/com/instructure/parentapp/features/calendar/ParentCalendarRepositoryTest.kt
@@ -0,0 +1,274 @@
+/*
+ * Copyright (C) 2024 - present Instructure, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.instructure.parentapp.features.calendar
+
+import com.instructure.canvasapi2.apis.CalendarEventAPI
+import com.instructure.canvasapi2.apis.CourseAPI
+import com.instructure.canvasapi2.apis.FeaturesAPI
+import com.instructure.canvasapi2.apis.PlannerAPI
+import com.instructure.canvasapi2.models.Assignment
+import com.instructure.canvasapi2.models.CanvasContext
+import com.instructure.canvasapi2.models.Course
+import com.instructure.canvasapi2.models.Enrollment
+import com.instructure.canvasapi2.models.Plannable
+import com.instructure.canvasapi2.models.ScheduleItem
+import com.instructure.canvasapi2.models.User
+import com.instructure.canvasapi2.utils.ApiPrefs
+import com.instructure.canvasapi2.utils.DataResult
+import com.instructure.canvasapi2.utils.toApiString
+import com.instructure.pandautils.features.calendar.CalendarRepository
+import com.instructure.pandautils.room.calendar.daos.CalendarFilterDao
+import com.instructure.pandautils.room.calendar.entities.CalendarFilterEntity
+import com.instructure.parentapp.util.ParentPrefs
+import io.mockk.coEvery
+import io.mockk.coVerify
+import io.mockk.mockk
+import kotlinx.coroutines.test.runTest
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import org.threeten.bp.LocalDateTime
+import java.util.Date
+
+class ParentCalendarRepositoryTest {
+
+ private val plannerApi: PlannerAPI.PlannerInterface = mockk(relaxed = true)
+ private val coursesApi: CourseAPI.CoursesInterface = mockk(relaxed = true)
+ private val calendarEventApi: CalendarEventAPI.CalendarEventInterface = mockk(relaxed = true)
+ private val apiPrefs: ApiPrefs = mockk(relaxed = true)
+ private val featuresApi: FeaturesAPI.FeaturesInterface = mockk(relaxed = true)
+ private val parentPrefs: ParentPrefs = mockk(relaxed = true)
+ private val calendarFilterDao: CalendarFilterDao = mockk(relaxed = true)
+
+ private val calendarRepository: CalendarRepository =
+ ParentCalendarRepository(plannerApi, coursesApi, calendarEventApi, apiPrefs, featuresApi, parentPrefs, calendarFilterDao)
+
+ @Test(expected = Exception::class)
+ fun `Throw exception when calendar event request fails`() = runTest {
+ coEvery { calendarEventApi.getCalendarEvents(any(), any(), any(), any(), any(), any()) } returns DataResult.Fail()
+
+ calendarRepository.getPlannerItems("2023-1-1", "2023-1-2", listOf("course_1"), true)
+ }
+
+ @Test(expected = Exception::class)
+ fun `Throw exception when planner items request fails`() = runTest {
+ coEvery { plannerApi.getPlannerNotes(any(), any(), any(), any()) } returns DataResult.Fail()
+
+ calendarRepository.getPlannerItems("2023-1-1", "2023-1-2", listOf("course_1"), true)
+ }
+
+ @Test
+ fun `getPlannerItems returns correct items sorted by date`() = runTest {
+ val assignment = ScheduleItem(
+ itemId = "123",
+ title = "assignment",
+ assignment = Assignment(id = 123L, dueAt = LocalDateTime.now().plusHours(1).toApiString()),
+ itemType = ScheduleItem.Type.TYPE_ASSIGNMENT,
+ contextCode = "course_1"
+ )
+
+ val calendarEvent = ScheduleItem(
+ itemId = "0",
+ title = "calendar event",
+ assignment = null,
+ startAt = LocalDateTime.now().plusHours(2).toApiString(),
+ endAt = LocalDateTime.now().toApiString(),
+ itemType = ScheduleItem.Type.TYPE_CALENDAR,
+ contextCode = "course_1"
+ )
+
+ val plannerNote = Plannable(
+ id = 2,
+ title = "To Do",
+ null,
+ null,
+ null,
+ null,
+ Date(),
+ null,
+ LocalDateTime.now().toApiString(),
+ null,
+ null,
+ null,
+ null
+ )
+
+ coEvery {
+ calendarEventApi.getCalendarEvents(
+ any(),
+ CalendarEventAPI.CalendarEventType.ASSIGNMENT.apiName,
+ any(), any(), any(), any()
+ )
+ } returns DataResult.Success(listOf(assignment))
+
+ coEvery {
+ calendarEventApi.getCalendarEvents(
+ any(),
+ CalendarEventAPI.CalendarEventType.CALENDAR.apiName,
+ any(), any(), any(), any()
+ )
+ } returns DataResult.Success(listOf(calendarEvent))
+
+ coEvery { plannerApi.getPlannerNotes(any(), any(), any(), any()) } returns DataResult.Success(listOf(plannerNote))
+
+ val result = calendarRepository.getPlannerItems("2023-1-1", "2023-1-2", listOf("course_1"), true)
+
+ assertEquals(3, result.size)
+ // Planner items should be sorted by date
+ val plannerNoteResult = result[0]
+ val assignmentResult = result[1]
+ val calendarEventResult = result[2]
+
+ assertEquals(assignment.assignment?.id, assignmentResult.plannable.id)
+ assertEquals(assignment.title, assignmentResult.plannable.title)
+ assertEquals(assignment.contextCode, assignmentResult.canvasContext.contextId)
+
+ assertEquals(calendarEvent.itemId, calendarEventResult.plannable.id.toString())
+ assertEquals(calendarEvent.title, calendarEventResult.plannable.title)
+ assertEquals(calendarEvent.contextCode, calendarEventResult.canvasContext.contextId)
+
+ assertEquals(plannerNote.id, plannerNoteResult.plannable.id)
+ assertEquals(plannerNote.title, plannerNoteResult.plannable.title)
+
+ coVerify(exactly = 1) {
+ calendarEventApi.getCalendarEvents(
+ any(),
+ CalendarEventAPI.CalendarEventType.CALENDAR.apiName,
+ any(),
+ any(),
+ any(),
+ any()
+ )
+ }
+ coVerify(exactly = 1) {
+ calendarEventApi.getCalendarEvents(
+ any(),
+ CalendarEventAPI.CalendarEventType.ASSIGNMENT.apiName,
+ any(),
+ any(),
+ any(),
+ any()
+ )
+ }
+ coVerify(exactly = 1) { plannerApi.getPlannerNotes(any(), any(), any(), any()) }
+ }
+
+ @Test
+ fun `getPlannerItems returns empty list when no canvas contexts are given`() = runTest {
+ val assignment = ScheduleItem(
+ itemId = "123",
+ title = "assignment",
+ assignment = Assignment(id = 123L, dueAt = LocalDateTime.now().toApiString()),
+ itemType = ScheduleItem.Type.TYPE_ASSIGNMENT,
+ contextCode = "course_1"
+ )
+
+ coEvery {
+ calendarEventApi.getCalendarEvents(
+ any(),
+ CalendarEventAPI.CalendarEventType.ASSIGNMENT.apiName,
+ any(), any(), any(), any()
+ )
+ } returns DataResult.Success(listOf(assignment))
+
+ val result = calendarRepository.getPlannerItems("2023-1-1", "2023-1-2", emptyList(), true)
+
+ assertEquals(0, result.size)
+ }
+
+ @Test
+ fun `Get contexts return failed results if course request is failed`() = runTest {
+ coEvery { coursesApi.firstPageObserveeCourses(any()) } returns DataResult.Fail()
+
+ val canvasContextsResults = calendarRepository.getCanvasContexts()
+
+ assertEquals(DataResult.Fail(), canvasContextsResults)
+ }
+
+ @Test
+ fun `Get contexts adds user context and returns it with valid courses when course request is successful`() = runTest {
+ val courses = listOf(
+ Course(44, enrollments = mutableListOf(Enrollment(type = Enrollment.EnrollmentType.Teacher))),
+ Course(1, enrollments = mutableListOf(Enrollment(type = Enrollment.EnrollmentType.Observer, userId = 55))),
+ Course(2, enrollments = mutableListOf(Enrollment(type = Enrollment.EnrollmentType.Observer, userId = 77)))
+ )
+ coEvery { parentPrefs.currentStudent } returns User(55, "Test Student")
+ coEvery { coursesApi.firstPageObserveeCourses(any()) } returns DataResult.Success(courses)
+ coEvery { apiPrefs.user } returns User(1, "Test User")
+
+ val canvasContextsResults = calendarRepository.getCanvasContexts()
+
+ val userResult = canvasContextsResults.dataOrThrow[CanvasContext.Type.USER] ?: emptyList()
+ assertEquals(1, userResult.size)
+ assertEquals(1, userResult[0].id)
+ assertEquals("Test User", userResult[0].name)
+
+ val coursesResult = canvasContextsResults.dataOrThrow[CanvasContext.Type.COURSE] ?: emptyList()
+ assertEquals(1, coursesResult.size)
+ assertEquals(1, coursesResult[0].id)
+ }
+
+ @Test
+ fun `Return 20 for calendar filter limit when context limit is increased`() = runTest {
+ coEvery { featuresApi.getAccountSettingsFeatures(any()) } returns DataResult.Success(mapOf("calendar_contexts_limit" to true))
+
+ val result = calendarRepository.getCalendarFilterLimit()
+
+ assertEquals(20, result)
+ }
+
+ @Test
+ fun `Return 10 for calendar filter limit when context limit is not increased`() = runTest {
+ coEvery { featuresApi.getAccountSettingsFeatures(any()) } returns DataResult.Success(mapOf("calendar_contexts_limit" to false))
+
+ val result = calendarRepository.getCalendarFilterLimit()
+
+ assertEquals(10, result)
+ }
+
+ @Test
+ fun `Return 10 for calendar filter limit when features request fails`() = runTest {
+ coEvery { featuresApi.getAccountSettingsFeatures(any()) } returns DataResult.Fail()
+
+ val result = calendarRepository.getCalendarFilterLimit()
+
+ assertEquals(10, result)
+ }
+
+ @Test
+ fun `getCalendarFilters calls dao with the correct params and returns results frm db`() = runTest {
+ val filters = CalendarFilterEntity(1, "domain", "1", -1, setOf("filter1"))
+ coEvery { calendarFilterDao.findByUserIdAndDomainAndObserveeId(any(), any(), any()) } returns filters
+ coEvery { apiPrefs.user } returns User(1, "Test User")
+ coEvery { apiPrefs.fullDomain } returns "domain"
+ coEvery { parentPrefs.currentStudent } returns User(55, "Test Student")
+
+ val result = calendarRepository.getCalendarFilters()
+
+ assertEquals(filters, result)
+ coVerify { calendarFilterDao.findByUserIdAndDomainAndObserveeId(1, "domain", 55) }
+ }
+
+ @Test
+ fun `Update calendar filters updates db and adds observee id to the Entity`() = runTest {
+ coEvery { parentPrefs.currentStudent } returns User(55, "Test student")
+ val filters = CalendarFilterEntity(1, "domain", "1", -1, setOf("filter1"))
+
+ calendarRepository.updateCalendarFilters(filters)
+
+ val expectedArgument = filters.copy(observeeId = 55)
+ coVerify { calendarFilterDao.insertOrUpdate(expectedArgument) }
+ }
+}
\ No newline at end of file
diff --git a/apps/parent/src/test/java/com/instructure/parentapp/features/calendarevent/createupdate/ParentCreateUpdateEventRepositoryTest.kt b/apps/parent/src/test/java/com/instructure/parentapp/features/calendarevent/createupdate/ParentCreateUpdateEventRepositoryTest.kt
new file mode 100644
index 0000000000..78eee851e0
--- /dev/null
+++ b/apps/parent/src/test/java/com/instructure/parentapp/features/calendarevent/createupdate/ParentCreateUpdateEventRepositoryTest.kt
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2024 - present Instructure, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.instructure.parentapp.features.calendarevent.createupdate
+
+import com.instructure.canvasapi2.apis.CalendarEventAPI
+import com.instructure.canvasapi2.utils.ApiPrefs
+import com.instructure.parentapp.features.calendarevent.ParentCreateUpdateEventRepository
+import io.mockk.mockk
+import kotlinx.coroutines.test.runTest
+import org.junit.Assert.assertEquals
+import org.junit.Test
+
+class ParentCreateUpdateEventRepositoryTest {
+
+ private val eventsApi: CalendarEventAPI.CalendarEventInterface = mockk(relaxed = true)
+ private val apiPrefs: ApiPrefs = mockk(relaxed = true)
+
+ private val repository = ParentCreateUpdateEventRepository(eventsApi, apiPrefs)
+
+ @Test
+ fun `Get contexts returns the user only`() = runTest {
+ val result = repository.getCanvasContexts()
+
+ assertEquals(1, result.size)
+ }
+}
\ No newline at end of file
diff --git a/apps/parent/src/test/java/com/instructure/parentapp/features/calendartodo/ParentCreateUpdateToDoRepositoryTest.kt b/apps/parent/src/test/java/com/instructure/parentapp/features/calendartodo/ParentCreateUpdateToDoRepositoryTest.kt
new file mode 100644
index 0000000000..2c7726eec0
--- /dev/null
+++ b/apps/parent/src/test/java/com/instructure/parentapp/features/calendartodo/ParentCreateUpdateToDoRepositoryTest.kt
@@ -0,0 +1,79 @@
+/*
+ * Copyright (C) 2024 - present Instructure, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.instructure.parentapp.features.calendartodo
+
+import com.instructure.canvasapi2.apis.CourseAPI
+import com.instructure.canvasapi2.apis.PlannerAPI
+import com.instructure.canvasapi2.models.Course
+import com.instructure.canvasapi2.models.Enrollment
+import com.instructure.canvasapi2.models.User
+import com.instructure.canvasapi2.utils.DataResult
+import com.instructure.canvasapi2.utils.LinkHeaders
+import com.instructure.parentapp.util.ParentPrefs
+import io.mockk.coEvery
+import io.mockk.mockk
+import kotlinx.coroutines.test.runTest
+import org.junit.Assert.assertEquals
+import org.junit.Test
+
+class ParentCreateUpdateToDoRepositoryTest {
+
+ private val coursesApi: CourseAPI.CoursesInterface = mockk(relaxed = true)
+ private val parentPrefs: ParentPrefs = mockk(relaxed = true)
+ private val plannerApi: PlannerAPI.PlannerInterface = mockk(relaxed = true)
+
+ private val repository = ParentCreateUpdateToDoRepository(coursesApi, parentPrefs, plannerApi)
+
+ @Test
+ fun `Returns empty list when request fails`() = runTest {
+ coEvery { coursesApi.firstPageObserveeCourses(any()) } returns DataResult.Fail()
+
+ val courses = repository.getCourses()
+
+ assertEquals(emptyList(), courses)
+ }
+
+ @Test
+ fun `Returns courses filtered by enrollment type and observee id`() = runTest {
+ val courses = listOf(
+ Course(id = 1),
+ Course(id = 2, enrollments = mutableListOf(Enrollment(type = Enrollment.EnrollmentType.Teacher, userId = 55))),
+ Course(id = 3, enrollments = mutableListOf(Enrollment(type = Enrollment.EnrollmentType.Observer, userId = 77))),
+ Course(id = 4, enrollments = mutableListOf(Enrollment(type = Enrollment.EnrollmentType.Observer, userId = 55))),
+ )
+
+ coEvery { parentPrefs.currentStudent } returns User(id = 55)
+ coEvery { coursesApi.firstPageObserveeCourses(any()) } returns DataResult.Success(courses)
+
+ val result = repository.getCourses()
+
+ assertEquals(courses.takeLast(1), result)
+ }
+
+ @Test
+ fun `Returns depaginated result when has next page`() = runTest {
+ val courses1 = listOf(Course(id = 4, enrollments = mutableListOf(Enrollment(type = Enrollment.EnrollmentType.Observer, userId = 55))))
+ val courses2 = listOf(Course(id = 5, enrollments = mutableListOf(Enrollment(type = Enrollment.EnrollmentType.Observer, userId = 55))))
+
+ coEvery { parentPrefs.currentStudent } returns User(id = 55)
+ coEvery { coursesApi.firstPageObserveeCourses(any()) } returns DataResult.Success(courses1, linkHeaders = LinkHeaders(nextUrl = "next"))
+ coEvery { coursesApi.next("next", any()) } returns DataResult.Success(courses2)
+
+ val result = repository.getCourses()
+
+ assertEquals(courses1 + courses2, result)
+ }
+}
\ No newline at end of file
diff --git a/apps/parent/src/test/java/com/instructure/parentapp/features/courses/list/CourseGradeFormatterTest.kt b/apps/parent/src/test/java/com/instructure/parentapp/features/courses/list/CourseGradeFormatterTest.kt
new file mode 100644
index 0000000000..38a3396ac2
--- /dev/null
+++ b/apps/parent/src/test/java/com/instructure/parentapp/features/courses/list/CourseGradeFormatterTest.kt
@@ -0,0 +1,116 @@
+/*
+ * Copyright (C) 2024 - 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 .
+ *
+ */
+
+package com.instructure.parentapp.features.courses.list
+
+import android.content.Context
+import com.instructure.canvasapi2.models.Course
+import com.instructure.canvasapi2.models.CourseGrade
+import com.instructure.canvasapi2.models.CourseSettings
+import com.instructure.canvasapi2.models.Enrollment
+import com.instructure.canvasapi2.models.User
+import com.instructure.parentapp.R
+import io.mockk.every
+import io.mockk.mockk
+import io.mockk.spyk
+import kotlinx.coroutines.test.runTest
+import org.junit.Assert
+import org.junit.Test
+
+
+class CourseGradeFormatterTest {
+
+ private val context: Context = mockk(relaxed = true)
+ private val courseGradeFormatter = CourseGradeFormatter(context)
+
+ @Test
+ fun `Course grade maps correctly when locked`() = runTest {
+ val student = User(1L)
+ val course = spyk(Course(id = 1L, name = "Course 1", courseCode = "code-1", enrollments = mutableListOf(Enrollment(userId = student.id))))
+ every { course.parentGetCourseGradeFromEnrollment(any(), any()) } returns CourseGrade(isLocked = true)
+
+ val result = courseGradeFormatter.getGradeText(course, student.id)
+
+ Assert.assertEquals(null, result)
+ }
+
+ @Test
+ fun `Course grade maps correctly when restricted without grade string`() = runTest {
+ val student = User(1L)
+ val course = spyk(
+ Course(
+ id = 1L, name = "Course 1", courseCode = "code-1",
+ enrollments = mutableListOf(Enrollment(userId = student.id)),
+ settings = CourseSettings(restrictQuantitativeData = true)
+ )
+ )
+ every { course.parentGetCourseGradeFromEnrollment(any(), any()) } returns CourseGrade()
+
+ val result = courseGradeFormatter.getGradeText(course, student.id)
+
+ Assert.assertEquals(null, result)
+ }
+
+ @Test
+ fun `Course grade maps correctly when restricted with grade string`() = runTest {
+ val student = User(1L)
+ val course = spyk(
+ Course(
+ id = 1L, name = "Course 1", courseCode = "code-1",
+ enrollments = mutableListOf(Enrollment(userId = student.id)),
+ settings = CourseSettings(restrictQuantitativeData = true)
+ )
+ )
+ every { course.parentGetCourseGradeFromEnrollment(any(), any()) } returns CourseGrade(
+ currentScore = 100.0,
+ currentGrade = "A"
+ )
+
+ val result = courseGradeFormatter.getGradeText(course, student.id)
+
+ Assert.assertEquals("A ", result)
+ }
+
+ @Test
+ fun `Course grade maps correctly without grade`() = runTest {
+ every { context.getString(R.string.noGrade) } returns "No Grade"
+ val student = User(1L)
+ val course = spyk(Course(id = 1L, name = "Course 1", courseCode = "code-1", enrollments = mutableListOf(Enrollment(userId = student.id))))
+ every { context.getString(R.string.noGrade) } returns "No Grade"
+ every { course.parentGetCourseGradeFromEnrollment(any(), any()) } returns CourseGrade(
+ noCurrentGrade = true
+ )
+
+ val result = courseGradeFormatter.getGradeText(course, student.id)
+
+ Assert.assertEquals("No Grade", result)
+ }
+
+ @Test
+ fun `Course grade maps correctly with score and grade string`() = runTest {
+ val student = User(1L)
+ val course = spyk(Course(id = 1L, name = "Course 1", courseCode = "code-1", enrollments = mutableListOf(Enrollment(userId = student.id))))
+ every { course.parentGetCourseGradeFromEnrollment(any(), any()) } returns CourseGrade(
+ currentScore = 100.0,
+ currentGrade = "A"
+ )
+
+ val result = courseGradeFormatter.getGradeText(course, student.id)
+
+ Assert.assertEquals("A 100%", result)
+ }
+}
diff --git a/apps/parent/src/test/java/com/instructure/parentapp/features/courses/list/CoursesRepositoryTest.kt b/apps/parent/src/test/java/com/instructure/parentapp/features/courses/list/CoursesRepositoryTest.kt
new file mode 100644
index 0000000000..47ac51a3be
--- /dev/null
+++ b/apps/parent/src/test/java/com/instructure/parentapp/features/courses/list/CoursesRepositoryTest.kt
@@ -0,0 +1,81 @@
+/*
+ * Copyright (C) 2024 - present Instructure, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package com.instructure.parentapp.features.courses.list
+
+import com.instructure.canvasapi2.apis.CourseAPI
+import com.instructure.canvasapi2.builders.RestParams
+import com.instructure.canvasapi2.models.Course
+import com.instructure.canvasapi2.models.Enrollment
+import com.instructure.canvasapi2.utils.DataResult
+import com.instructure.canvasapi2.utils.LinkHeaders
+import io.mockk.coEvery
+import io.mockk.mockk
+import kotlinx.coroutines.test.runTest
+import org.junit.Assert
+import org.junit.Test
+
+
+class CoursesRepositoryTest {
+
+ private val courseApi: CourseAPI.CoursesInterface = mockk(relaxed = true)
+
+ private val repository = CoursesRepository(courseApi)
+
+ @Test
+ fun `Get courses successfully returns data`() = runTest {
+ val expected = listOf(Course(id = 1L, enrollments = mutableListOf(Enrollment(userId = 1L))))
+
+ coEvery { courseApi.firstPageObserveeCourses(RestParams(isForceReadFromNetwork = false)) } returns DataResult.Success(expected)
+
+ val result = repository.getCourses(1L, false)
+ Assert.assertEquals(expected, result)
+ }
+
+ @Test
+ fun `Get courses with pagination successfully returns data`() = runTest {
+ val page1 = listOf(Course(id = 1L, enrollments = mutableListOf(Enrollment(userId = 1L))))
+ val page2 = listOf(Course(id = 2L, enrollments = mutableListOf(Enrollment(userId = 1L))))
+
+ coEvery { courseApi.firstPageObserveeCourses(RestParams(isForceReadFromNetwork = true)) } returns DataResult.Success(
+ page1,
+ linkHeaders = LinkHeaders(nextUrl = "page_2_url")
+ )
+ coEvery { courseApi.next("page_2_url", any()) } returns DataResult.Success(page2)
+
+ val result = repository.getCourses(1L, true)
+ Assert.assertEquals(page1 + page2, result)
+ }
+
+ @Test
+ fun `Get courses filters out courses not belonging to student`() = runTest {
+ val expected = listOf(Course(id = 1L, enrollments = mutableListOf(Enrollment(userId = 1L))))
+ val unexpected = listOf(Course(id = 2L, enrollments = mutableListOf(Enrollment(userId = 2L))))
+
+ coEvery { courseApi.firstPageObserveeCourses(any()) } returns DataResult.Success(expected + unexpected)
+
+ val result = repository.getCourses(1L, true)
+ Assert.assertEquals(expected, result)
+ }
+
+ @Test(expected = IllegalArgumentException::class)
+ fun `Get courses throws exception when call fails`() = runTest {
+ coEvery { courseApi.firstPageObserveeCourses(any()) } throws IllegalArgumentException()
+
+ repository.getCourses(1L, true)
+ }
+}
diff --git a/apps/parent/src/test/java/com/instructure/parentapp/features/courses/list/CoursesViewModelTest.kt b/apps/parent/src/test/java/com/instructure/parentapp/features/courses/list/CoursesViewModelTest.kt
new file mode 100644
index 0000000000..1081e88c20
--- /dev/null
+++ b/apps/parent/src/test/java/com/instructure/parentapp/features/courses/list/CoursesViewModelTest.kt
@@ -0,0 +1,181 @@
+/*
+ * Copyright (C) 2024 - present Instructure, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package com.instructure.parentapp.features.courses.list
+
+import androidx.arch.core.executor.testing.InstantTaskExecutorRule
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.LifecycleRegistry
+import com.instructure.canvasapi2.models.Course
+import com.instructure.canvasapi2.models.User
+import com.instructure.pandautils.utils.ColorKeeper
+import com.instructure.pandautils.utils.ThemedColor
+import com.instructure.parentapp.features.dashboard.TestSelectStudentHolder
+import io.mockk.coEvery
+import io.mockk.coVerify
+import io.mockk.every
+import io.mockk.mockk
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.toList
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.test.UnconfinedTestDispatcher
+import kotlinx.coroutines.test.resetMain
+import kotlinx.coroutines.test.runTest
+import kotlinx.coroutines.test.setMain
+import org.junit.After
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+
+
+@ExperimentalCoroutinesApi
+class CoursesViewModelTest {
+
+ @get:Rule
+ val instantExecutorRule = InstantTaskExecutorRule()
+
+ private val lifecycleOwner: LifecycleOwner = mockk(relaxed = true)
+ private val lifecycleRegistry = LifecycleRegistry(lifecycleOwner)
+ private val testDispatcher = UnconfinedTestDispatcher()
+
+ private val repository: CoursesRepository = mockk(relaxed = true)
+ private val colorKeeper: ColorKeeper = mockk(relaxed = true)
+ private val selectedStudentFlow = MutableStateFlow(null)
+ private val selectedStudentHolder = TestSelectStudentHolder(selectedStudentFlow)
+ private val courseGradeFormatter: CourseGradeFormatter = mockk(relaxed = true)
+
+ private lateinit var viewModel: CoursesViewModel
+
+ @Before
+ fun setup() {
+ lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_CREATE)
+ Dispatchers.setMain(testDispatcher)
+ coEvery { colorKeeper.getOrGenerateUserColor(any()) } returns ThemedColor(1, 1)
+ }
+
+ @After
+ fun tearDown() {
+ Dispatchers.resetMain()
+ }
+
+ @Test
+ fun `Load courses when student changes`() = runTest {
+ val student = User(1L)
+ coEvery { repository.getCourses(student.id, any()) } returns listOf(Course(id = 1L, name = "Course 1", courseCode = "code-1"))
+ every { courseGradeFormatter.getGradeText(any(), any()) } returns "A+"
+
+ createViewModel()
+ selectedStudentFlow.emit(student)
+
+ val expectedState = CoursesUiState(
+ isLoading = false,
+ isError = false,
+ courseListItems = listOf(
+ CourseListItemUiState(
+ courseId = 1L,
+ courseName = "Course 1",
+ courseCode = "code-1",
+ grade = "A+"
+ )
+ ),
+ studentColor = 1
+ )
+
+ Assert.assertEquals(expectedState, viewModel.uiState.value)
+ }
+
+ @Test
+ fun `Courses map correctly`() = runTest {
+ val student = User(1L)
+ val courses = listOf(
+ Course(id = 1L, name = "Course 1", courseCode = "code-1"),
+ Course(id = 2L, name = "Course 2", courseCode = "code-2"),
+ Course(id = 3L, name = "Course 3", courseCode = "code-3")
+ )
+ coEvery { repository.getCourses(any(), any()) } returns courses
+ every { courseGradeFormatter.getGradeText(any(), any()) } returns "A+"
+
+ createViewModel()
+ selectedStudentFlow.emit(student)
+
+ val expectedState = CoursesUiState(
+ isLoading = false,
+ isError = false,
+ courseListItems = courses.map {
+ CourseListItemUiState(
+ courseId = it.id,
+ courseName = it.name,
+ courseCode = it.courseCode,
+ grade = "A+"
+ )
+ },
+ studentColor = 1
+ )
+
+ Assert.assertEquals(expectedState, viewModel.uiState.value)
+ }
+
+ @Test
+ fun `Error load courses`() = runTest {
+ val student = User(1L)
+ coEvery { repository.getCourses(student.id, any()) } throws Exception()
+
+ createViewModel()
+ selectedStudentFlow.emit(student)
+
+ val expectedState = CoursesUiState(
+ isLoading = false,
+ isError = true,
+ studentColor = 1
+ )
+
+ Assert.assertEquals(expectedState, viewModel.uiState.value)
+ }
+
+ @Test
+ fun `Refresh reloads courses`() = runTest {
+ createViewModel()
+ selectedStudentHolder.updateSelectedStudent(User(1L))
+
+ viewModel.handleAction(CoursesAction.Refresh)
+
+ coVerify { repository.getCourses(any(), true) }
+ }
+
+ @Test
+ fun `Navigate to course details`() = runTest {
+ createViewModel()
+
+ val events = mutableListOf()
+ backgroundScope.launch(testDispatcher) {
+ viewModel.events.toList(events)
+ }
+
+ viewModel.handleAction(CoursesAction.CourseTapped(1L))
+
+ val expected = CoursesViewModelAction.NavigateToCourseDetails(1L)
+ Assert.assertEquals(expected, events.last())
+ }
+
+ private fun createViewModel() {
+ viewModel = CoursesViewModel(repository, colorKeeper, selectedStudentHolder, courseGradeFormatter)
+ }
+}
diff --git a/apps/parent/src/test/java/com/instructure/parentapp/features/dashboard/DashboardRepositoryTest.kt b/apps/parent/src/test/java/com/instructure/parentapp/features/dashboard/DashboardRepositoryTest.kt
new file mode 100644
index 0000000000..12927db75a
--- /dev/null
+++ b/apps/parent/src/test/java/com/instructure/parentapp/features/dashboard/DashboardRepositoryTest.kt
@@ -0,0 +1,107 @@
+/*
+ * Copyright (C) 2024 - present Instructure, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package com.instructure.parentapp.features.dashboard
+
+import com.instructure.canvasapi2.apis.EnrollmentAPI
+import com.instructure.canvasapi2.apis.UnreadCountAPI
+import com.instructure.canvasapi2.models.Enrollment
+import com.instructure.canvasapi2.models.UnreadConversationCount
+import com.instructure.canvasapi2.models.User
+import com.instructure.canvasapi2.utils.DataResult
+import com.instructure.canvasapi2.utils.LinkHeaders
+import io.mockk.coEvery
+import io.mockk.mockk
+import kotlinx.coroutines.test.runTest
+import org.junit.Assert.assertEquals
+import org.junit.Test
+
+
+class DashboardRepositoryTest {
+
+ private val enrollmentApi: EnrollmentAPI.EnrollmentInterface = mockk(relaxed = true)
+ private val unreadCountApi: UnreadCountAPI.UnreadCountsInterface = mockk(relaxed = true)
+
+ private val repository = DashboardRepository(enrollmentApi, unreadCountApi)
+
+ @Test
+ fun `Get students successfully returns data`() = runTest {
+ val expected = listOf(User(id = 1L))
+ val enrollments = expected.map { Enrollment(observedUser = it) }
+
+ coEvery { enrollmentApi.firstPageObserveeEnrollmentsParent(any()) } returns DataResult.Success(enrollments)
+
+ val result = repository.getStudents()
+ assertEquals(expected, result)
+ }
+
+ @Test
+ fun `Get students with pagination successfully returns data`() = runTest {
+ val page1 = listOf(User(id = 1L))
+ val enrollments1 = page1.map { Enrollment(observedUser = it) }
+ val page2 = listOf(User(id = 2L))
+ val enrollments2 = page2.map { Enrollment(observedUser = it) }
+
+ coEvery { enrollmentApi.firstPageObserveeEnrollmentsParent(any()) } returns DataResult.Success(
+ enrollments1,
+ linkHeaders = LinkHeaders(nextUrl = "page_2_url")
+ )
+ coEvery { enrollmentApi.getNextPage("page_2_url", any()) } returns DataResult.Success(enrollments2)
+
+ val result = repository.getStudents()
+ assertEquals(page1 + page2, result)
+ }
+
+ @Test
+ fun `Get students returns data distinctly and sorted`() = runTest {
+ val expected = listOf(User(id = 1L, sortableName = "First"), User(id = 2L, sortableName = "Second"))
+ val enrollments = expected.asReversed().map { Enrollment(observedUser = it) }
+ val otherEnrollments = listOf(
+ Enrollment(user = User(id = 3L)),
+ Enrollment(observedUser = User(id = 1L))
+ )
+
+ coEvery { enrollmentApi.firstPageObserveeEnrollmentsParent(any()) } returns DataResult.Success(enrollments + otherEnrollments)
+
+ val result = repository.getStudents()
+ assertEquals(expected, result)
+ }
+
+ @Test
+ fun `Get unread count return 0 when the request fails`() = runTest {
+ coEvery { unreadCountApi.getUnreadConversationCount(any()) } returns DataResult.Fail()
+
+ val result = repository.getUnreadCounts()
+ assertEquals(0, result)
+ }
+
+ @Test
+ fun `Get unread count return 0 when the response cannot be parsed`() = runTest {
+ coEvery { unreadCountApi.getUnreadConversationCount(any()) } returns DataResult.Success(UnreadConversationCount(unreadCount = "not a number"))
+
+ val result = repository.getUnreadCounts()
+ assertEquals(0, result)
+ }
+
+ @Test
+ fun `Get unread count return the unread count when the response is successful`() = runTest {
+ coEvery { unreadCountApi.getUnreadConversationCount(any()) } returns DataResult.Success(UnreadConversationCount(unreadCount = "42"))
+
+ val result = repository.getUnreadCounts()
+ assertEquals(42, result)
+ }
+}
diff --git a/apps/parent/src/test/java/com/instructure/parentapp/features/dashboard/DashboardViewModelTest.kt b/apps/parent/src/test/java/com/instructure/parentapp/features/dashboard/DashboardViewModelTest.kt
new file mode 100644
index 0000000000..3117b233f8
--- /dev/null
+++ b/apps/parent/src/test/java/com/instructure/parentapp/features/dashboard/DashboardViewModelTest.kt
@@ -0,0 +1,278 @@
+/*
+ * Copyright (C) 2024 - present Instructure, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package com.instructure.parentapp.features.dashboard
+
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import androidx.arch.core.executor.testing.InstantTaskExecutorRule
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.LifecycleRegistry
+import androidx.lifecycle.SavedStateHandle
+import androidx.navigation.NavController.Companion.KEY_DEEP_LINK_INTENT
+import com.instructure.canvasapi2.models.User
+import com.instructure.canvasapi2.utils.ApiPrefs
+import com.instructure.canvasapi2.utils.ContextKeeper
+import com.instructure.loginapi.login.model.SignedInUser
+import com.instructure.loginapi.login.util.PreviousUsersUtils
+import com.instructure.pandautils.mvvm.ViewState
+import com.instructure.parentapp.R
+import com.instructure.parentapp.features.alerts.list.AlertsRepository
+import com.instructure.parentapp.util.ParentPrefs
+import io.mockk.coEvery
+import io.mockk.coVerify
+import io.mockk.every
+import io.mockk.mockk
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.toList
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.test.UnconfinedTestDispatcher
+import kotlinx.coroutines.test.resetMain
+import kotlinx.coroutines.test.runTest
+import kotlinx.coroutines.test.setMain
+import org.junit.After
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+
+
+@ExperimentalCoroutinesApi
+class DashboardViewModelTest {
+
+ @get:Rule
+ val instantExecutorRule = InstantTaskExecutorRule()
+
+ private val lifecycleOwner: LifecycleOwner = mockk(relaxed = true)
+ private val lifecycleRegistry = LifecycleRegistry(lifecycleOwner)
+ private val testDispatcher = UnconfinedTestDispatcher()
+
+ private val context: Context = mockk(relaxed = true)
+ private val repository: DashboardRepository = mockk(relaxed = true)
+ private val alertsRepository: AlertsRepository = mockk(relaxed = true)
+ private val previousUsersUtils: PreviousUsersUtils = mockk(relaxed = true)
+ private val apiPrefs: ApiPrefs = mockk(relaxed = true)
+ private val parentPrefs: ParentPrefs = mockk(relaxed = true)
+ private val selectedStudentHolder: SelectedStudentHolder = mockk(relaxed = true)
+ private val inboxCountUpdaterFlow = MutableSharedFlow()
+ private val inboxCountUpdater: InboxCountUpdater = TestInboxCountUpdater(inboxCountUpdaterFlow)
+ private val alertCountUpdaterFlow = MutableSharedFlow()
+ private val alertCountUpdater: AlertCountUpdater = TestAlertCountUpdater(alertCountUpdaterFlow)
+ private val savedStateHandle: SavedStateHandle = mockk(relaxed = true)
+
+ private lateinit var viewModel: DashboardViewModel
+
+ @Before
+ fun setup() {
+ every { savedStateHandle.get(KEY_DEEP_LINK_INTENT) } returns null
+ lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_CREATE)
+ Dispatchers.setMain(testDispatcher)
+ ContextKeeper.appContext = context
+ }
+
+ @After
+ fun tearDown() {
+ Dispatchers.resetMain()
+ }
+
+ @Test
+ fun `Load user info correctly`() {
+ val user = User(
+ id = 1L,
+ name = "Test Name",
+ shortName = "Short Name",
+ pronouns = "Pronouns",
+ primaryEmail = "primary@email.com",
+ avatarUrl = "avatar"
+ )
+
+ val expected = UserViewData(
+ user.name,
+ user.pronouns,
+ user.shortName,
+ user.avatarUrl,
+ user.primaryEmail
+ )
+ coEvery { apiPrefs.user } returns user
+
+ createViewModel()
+
+ assertEquals(expected, viewModel.data.value.userViewData)
+ }
+
+ @Test
+ fun `Students map correctly`() {
+ val students = listOf(
+ User(id = 1L, shortName = "Student One", avatarUrl = "avatar1"),
+ User(id = 2L, shortName = "Student Two", avatarUrl = "avatar2"),
+ )
+
+ coEvery { repository.getStudents() } returns students
+
+ createViewModel()
+
+ val expected = listOf(
+ StudentItemViewData(1L, "Student One", "avatar1"),
+ StudentItemViewData(2L, "Student Two", "avatar2")
+ )
+
+ assertEquals(expected, viewModel.data.value.studentItems.map { it.studentItemViewData })
+ }
+
+ @Test
+ fun `Empty student list`() {
+ coEvery { repository.getStudents() } returns emptyList()
+
+ createViewModel()
+
+ val expected = ViewState.Empty(
+ R.string.noStudentsError,
+ R.string.noStudentsErrorDescription,
+ R.drawable.panda_manage_students
+ )
+
+ assertEquals(expected, viewModel.state.value)
+ }
+
+ @Test
+ fun `Selected student set up correctly when it was selected before`() {
+ val students = listOf(User(id = 1L), User(id = 2L))
+ val expected = students[1]
+ coEvery { repository.getStudents() } returns students
+ coEvery { previousUsersUtils.getSignedInUser(any(), any(), any()) } returns SignedInUser(
+ user = User(),
+ domain = "",
+ protocol = "",
+ token = "",
+ accessToken = null,
+ refreshToken = "",
+ clientId = null,
+ clientSecret = null,
+ calendarFilterPrefs = null,
+ lastLogoutDate = null,
+ canvasForElementary = false,
+ selectedStudentId = 2L
+ )
+
+ createViewModel()
+
+ assertEquals(expected, viewModel.data.value.selectedStudent)
+ }
+
+ @Test
+ fun `Change selected student`() {
+ val students = listOf(
+ User(id = 1L, name = "Student One", avatarUrl = "avatar1"),
+ User(id = 2L, name = "Student Two", avatarUrl = "avatar2"),
+ )
+
+ coEvery { repository.getStudents() } returns students
+
+ createViewModel()
+
+ assertEquals(students.first(), viewModel.data.value.selectedStudent)
+
+ viewModel.data.value.studentItems.last().onStudentClick()
+
+ assertEquals(students.last(), viewModel.data.value.selectedStudent)
+ assertFalse(viewModel.data.value.studentSelectorExpanded)
+ coVerify { selectedStudentHolder.updateSelectedStudent(students.last()) }
+ }
+
+ @Test
+ fun `Toggle student selector`() {
+ createViewModel()
+
+ viewModel.toggleStudentSelector()
+ assertTrue(viewModel.data.value.studentSelectorExpanded)
+
+ viewModel.toggleStudentSelector()
+ assertFalse(viewModel.data.value.studentSelectorExpanded)
+ }
+
+ @Test
+ fun `Update unread count when the update unread count flow triggers an update`() = runTest {
+ val students = listOf(User(id = 1L), User(id = 2L))
+ coEvery { repository.getStudents() } returns students
+ coEvery { repository.getUnreadCounts() } returns 0
+
+ createViewModel()
+
+ assertEquals(0, viewModel.data.value.unreadCount)
+
+ coEvery { repository.getUnreadCounts() } returns 1
+ inboxCountUpdaterFlow.emit(true)
+
+ assertEquals(1, viewModel.data.value.unreadCount)
+ }
+
+ @Test
+ fun `Update alert count when the update alert count flow triggers`() = runTest {
+ val students = listOf(User(id = 1L), User(id = 2L))
+ coEvery { repository.getStudents() } returns students
+ coEvery { alertsRepository.getUnreadAlertCount(1L) } returns 0
+
+ createViewModel()
+
+ assertEquals(0, viewModel.data.value.alertCount)
+
+ coEvery { alertsRepository.getUnreadAlertCount(1L) } returns 1
+ alertCountUpdaterFlow.emit(true)
+
+ assertEquals(1, viewModel.data.value.alertCount)
+ }
+
+ @Test
+ fun `Initializing viewModel with a deeplink sends navigate deep link event`() = runTest {
+ val uri = mockk()
+ val deepLinkIntent = mockk(relaxed = true).also {
+ every { it.data } returns uri
+ }
+ every { savedStateHandle.get(KEY_DEEP_LINK_INTENT) } returns deepLinkIntent
+
+ createViewModel()
+
+ val events = mutableListOf()
+
+ backgroundScope.launch(testDispatcher) {
+ viewModel.events.toList(events)
+ }
+
+ assertEquals(DashboardAction.NavigateDeepLink(uri), events.first())
+ }
+
+ private fun createViewModel() {
+ viewModel = DashboardViewModel(
+ context = context,
+ repository = repository,
+ alertsRepository = alertsRepository,
+ previousUsersUtils = previousUsersUtils,
+ apiPrefs = apiPrefs,
+ parentPrefs = parentPrefs,
+ selectedStudentHolder = selectedStudentHolder,
+ inboxCountUpdater = inboxCountUpdater,
+ alertCountUpdater = alertCountUpdater,
+ savedStateHandle = savedStateHandle
+ )
+ }
+}
diff --git a/apps/parent/src/test/java/com/instructure/parentapp/features/dashboard/TestAlertCountUpdater.kt b/apps/parent/src/test/java/com/instructure/parentapp/features/dashboard/TestAlertCountUpdater.kt
new file mode 100644
index 0000000000..30deab629e
--- /dev/null
+++ b/apps/parent/src/test/java/com/instructure/parentapp/features/dashboard/TestAlertCountUpdater.kt
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2024 - 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 .
+ *
+ */
+package com.instructure.parentapp.features.dashboard
+
+import kotlinx.coroutines.flow.MutableSharedFlow
+
+class TestAlertCountUpdater(override val shouldRefreshAlertCountFlow: MutableSharedFlow) :
+ AlertCountUpdater {
+ override suspend fun updateShouldRefreshAlertCount(shouldRefresh: Boolean) {
+ shouldRefreshAlertCountFlow.emit(shouldRefresh)
+ }
+}
\ No newline at end of file
diff --git a/apps/parent/src/test/java/com/instructure/parentapp/features/dashboard/TestInboxCountUpdater.kt b/apps/parent/src/test/java/com/instructure/parentapp/features/dashboard/TestInboxCountUpdater.kt
new file mode 100644
index 0000000000..1c61105423
--- /dev/null
+++ b/apps/parent/src/test/java/com/instructure/parentapp/features/dashboard/TestInboxCountUpdater.kt
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2024 - 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 .
+ *
+ */
+package com.instructure.parentapp.features.dashboard
+
+import kotlinx.coroutines.flow.MutableSharedFlow
+
+class TestInboxCountUpdater(
+ override val shouldRefreshInboxCountFlow: MutableSharedFlow
+) : InboxCountUpdater {
+ override suspend fun updateShouldRefreshInboxCount(shouldRefresh: Boolean) {
+ shouldRefreshInboxCountFlow.emit(shouldRefresh)
+ }
+}
\ No newline at end of file
diff --git a/apps/parent/src/test/java/com/instructure/parentapp/features/dashboard/TestSelectStudentHolder.kt b/apps/parent/src/test/java/com/instructure/parentapp/features/dashboard/TestSelectStudentHolder.kt
new file mode 100644
index 0000000000..ae5bceb205
--- /dev/null
+++ b/apps/parent/src/test/java/com/instructure/parentapp/features/dashboard/TestSelectStudentHolder.kt
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2024 - present Instructure, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package com.instructure.parentapp.features.dashboard
+
+import com.instructure.canvasapi2.models.User
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.SharedFlow
+
+
+class TestSelectStudentHolder(
+ override val selectedStudentState: MutableStateFlow,
+ override val selectedStudentChangedFlow: SharedFlow = MutableSharedFlow()
+) : SelectedStudentHolder {
+ override suspend fun updateSelectedStudent(user: User) {
+ selectedStudentState.emit(user)
+ }
+}
diff --git a/apps/parent/src/test/java/com/instructure/parentapp/features/help/ParentHelpLinkFilterTest.kt b/apps/parent/src/test/java/com/instructure/parentapp/features/help/ParentHelpLinkFilterTest.kt
new file mode 100644
index 0000000000..02b5798bd1
--- /dev/null
+++ b/apps/parent/src/test/java/com/instructure/parentapp/features/help/ParentHelpLinkFilterTest.kt
@@ -0,0 +1,64 @@
+package com.instructure.parentapp.features.help
+
+import com.instructure.canvasapi2.models.HelpLink
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
+import org.junit.Before
+import org.junit.Test
+
+class ParentHelpLinkFilterTest {
+ private lateinit var filter: ParentHelpLinkFilter
+
+ @Before
+ fun setup() {
+ filter = ParentHelpLinkFilter()
+ }
+
+ @Test
+ fun `Test if available options are filtered properly`() {
+ val mockData = getMockHelpLinks()
+ val filteredData = mockData.filter { filter.isLinkAllowed(it, emptyList()) }
+
+ assertTrue(filteredData.contains(mockData[0]))
+ assertTrue(filteredData.contains(mockData[1]))
+ assertTrue(filteredData.contains(mockData[2]))
+ assertFalse(filteredData.contains(mockData[3]))
+ }
+
+ private fun getMockHelpLinks(): List {
+ return listOf(
+ HelpLink(
+ id = "1",
+ type = "type",
+ availableTo = listOf("observer", "user"),
+ url = "url",
+ text = "text",
+ subtext = "subtext"
+ ),
+ HelpLink(
+ id = "2",
+ type = "type",
+ availableTo = listOf("user"),
+ url = "url",
+ text = "text",
+ subtext = "subtext"
+ ),
+ HelpLink(
+ id = "3",
+ type = "type",
+ availableTo = listOf("observer"),
+ url = "url",
+ text = "text",
+ subtext = "subtext"
+ ),
+ HelpLink(
+ id = "4",
+ type = "type",
+ availableTo = listOf("other"),
+ url = "url",
+ text = "text",
+ subtext = "subtext"
+ )
+ )
+ }
+}
\ No newline at end of file
diff --git a/apps/parent/src/test/java/com/instructure/parentapp/features/inbox/list/ParentInboxRepositoryTest.kt b/apps/parent/src/test/java/com/instructure/parentapp/features/inbox/list/ParentInboxRepositoryTest.kt
new file mode 100644
index 0000000000..bd984d65d1
--- /dev/null
+++ b/apps/parent/src/test/java/com/instructure/parentapp/features/inbox/list/ParentInboxRepositoryTest.kt
@@ -0,0 +1,63 @@
+package com.instructure.parentapp.features.inbox.list/*
+ * Copyright (C) 2024 - present Instructure, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import com.instructure.canvasapi2.apis.CourseAPI
+import com.instructure.canvasapi2.apis.EnrollmentAPI
+import com.instructure.canvasapi2.apis.GroupAPI
+import com.instructure.canvasapi2.apis.InboxApi
+import com.instructure.canvasapi2.apis.ProgressAPI
+import com.instructure.canvasapi2.models.Course
+import com.instructure.canvasapi2.models.Enrollment
+import com.instructure.canvasapi2.utils.DataResult
+import io.mockk.coEvery
+import io.mockk.mockk
+import kotlinx.coroutines.test.runTest
+import org.junit.Assert.assertEquals
+import org.junit.Test
+
+class ParentInboxRepositoryTest {
+
+ private val inboxApi: InboxApi.InboxInterface = mockk(relaxed = true)
+ private val coursesApi: CourseAPI.CoursesInterface = mockk(relaxed = true)
+ private val groupsApi: GroupAPI.GroupInterface = mockk(relaxed = true)
+ private val progressApi: ProgressAPI.ProgressInterface = mockk(relaxed = true)
+
+ private val inboxRepository =
+ ParentInboxRepository(inboxApi, coursesApi, groupsApi, progressApi)
+
+ @Test
+ fun `Get contexts returns only valid courses`() = runTest {
+ val courses = listOf(
+ Course(44, enrollments = mutableListOf(Enrollment(enrollmentState = EnrollmentAPI.STATE_ACTIVE))),
+ Course(11) // no active enrollment
+ )
+ coEvery { coursesApi.getCoursesByEnrollmentType(any(), any()) } returns DataResult.Success(courses)
+ coEvery { groupsApi.getFirstPageGroups(any()) } returns DataResult.Success(emptyList())
+
+ val canvasContextsResults = inboxRepository.getCanvasContexts()
+
+ assertEquals(1, canvasContextsResults.dataOrNull!!.size)
+ assertEquals(courses[0].id, canvasContextsResults.dataOrNull!![0].id)
+ }
+
+ @Test
+ fun `Get contexts returns failed results when request fails`() = runTest {
+ coEvery { coursesApi.getCoursesByEnrollmentType(any(), any()) } returns DataResult.Fail()
+
+ val canvasContextsResults = inboxRepository.getCanvasContexts()
+
+ assertEquals(DataResult.Fail(), canvasContextsResults)
+ }
+}
\ No newline at end of file
diff --git a/apps/parent/src/test/java/com/instructure/parentapp/features/managestudents/ManageStudentsRepositoryTest.kt b/apps/parent/src/test/java/com/instructure/parentapp/features/managestudents/ManageStudentsRepositoryTest.kt
new file mode 100644
index 0000000000..d0550cc0e4
--- /dev/null
+++ b/apps/parent/src/test/java/com/instructure/parentapp/features/managestudents/ManageStudentsRepositoryTest.kt
@@ -0,0 +1,114 @@
+/*
+ * Copyright (C) 2024 - present Instructure, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package com.instructure.parentapp.features.managestudents
+
+import com.instructure.canvasapi2.apis.EnrollmentAPI
+import com.instructure.canvasapi2.apis.UserAPI
+import com.instructure.canvasapi2.models.ColorChangeResponse
+import com.instructure.canvasapi2.models.Enrollment
+import com.instructure.canvasapi2.models.User
+import com.instructure.canvasapi2.utils.DataResult
+import com.instructure.canvasapi2.utils.LinkHeaders
+import io.mockk.coEvery
+import io.mockk.mockk
+import kotlinx.coroutines.test.runTest
+import org.junit.Assert
+import org.junit.Test
+
+
+class ManageStudentsRepositoryTest {
+
+ private val enrollmentApi: EnrollmentAPI.EnrollmentInterface = mockk(relaxed = true)
+ private val userApi: UserAPI.UsersInterface = mockk(relaxed = true)
+
+ private val repository = ManageStudentsRepository(enrollmentApi, userApi)
+
+ @Test
+ fun `Get students successfully returns data`() = runTest {
+ val expected = listOf(User(id = 1L))
+ val enrollments = expected.map { Enrollment(observedUser = it) }
+
+ coEvery { enrollmentApi.firstPageObserveeEnrollmentsParent(any()) } returns DataResult.Success(enrollments)
+
+ val result = repository.getStudents(true)
+ Assert.assertEquals(expected, result)
+ }
+
+ @Test
+ fun `Get students with pagination successfully returns data`() = runTest {
+ val page1 = listOf(User(id = 1L))
+ val enrollments1 = page1.map { Enrollment(observedUser = it) }
+ val page2 = listOf(User(id = 2L))
+ val enrollments2 = page2.map { Enrollment(observedUser = it) }
+
+ coEvery { enrollmentApi.firstPageObserveeEnrollmentsParent(any()) } returns DataResult.Success(
+ enrollments1,
+ linkHeaders = LinkHeaders(nextUrl = "page_2_url")
+ )
+ coEvery { enrollmentApi.getNextPage("page_2_url", any()) } returns DataResult.Success(enrollments2)
+
+ val result = repository.getStudents(true)
+ Assert.assertEquals(page1 + page2, result)
+ }
+
+ @Test
+ fun `Get students returns data distinctly and sorted`() = runTest {
+ val expected = listOf(User(id = 1L, sortableName = "First"), User(id = 2L, sortableName = "Second"))
+ val enrollments = expected.asReversed().map { Enrollment(observedUser = it) }
+ val otherEnrollments = listOf(
+ Enrollment(user = User(id = 3L)),
+ Enrollment(observedUser = User(id = 1L))
+ )
+
+ coEvery { enrollmentApi.firstPageObserveeEnrollmentsParent(any()) } returns DataResult.Success(enrollments + otherEnrollments)
+
+ val result = repository.getStudents(true)
+ Assert.assertEquals(expected, result)
+ }
+
+ @Test
+ fun `Get students returns empty list when enrollments call fails`() = runTest {
+ coEvery { enrollmentApi.firstPageObserveeEnrollmentsParent(any()) } returns DataResult.Fail()
+
+ val result = repository.getStudents(true)
+ Assert.assertTrue(result.isEmpty())
+ }
+
+ @Test
+ fun `Save student color successfully returns data`() = runTest {
+ val contextId = "user_1"
+ val color = "#000000"
+ val expected = ColorChangeResponse(hexCode = color)
+
+ coEvery { userApi.setColor(contextId, color, any()) } returns DataResult.Success(expected)
+
+ val result = repository.saveStudentColor(contextId, color)
+ Assert.assertEquals(color, result)
+ }
+
+ @Test
+ fun `Save student color returns null when call fails`() = runTest {
+ val contextId = "user_1"
+ val color = "000000"
+
+ coEvery { userApi.setColor(contextId, color, any()) } returns DataResult.Fail()
+
+ val result = repository.saveStudentColor(contextId, color)
+ Assert.assertNull(result)
+ }
+}
diff --git a/apps/parent/src/test/java/com/instructure/parentapp/features/managestudents/ManageStudentsViewModelTest.kt b/apps/parent/src/test/java/com/instructure/parentapp/features/managestudents/ManageStudentsViewModelTest.kt
new file mode 100644
index 0000000000..d4ea8b7c12
--- /dev/null
+++ b/apps/parent/src/test/java/com/instructure/parentapp/features/managestudents/ManageStudentsViewModelTest.kt
@@ -0,0 +1,269 @@
+/*
+ * Copyright (C) 2024 - present Instructure, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package com.instructure.parentapp.features.managestudents
+
+import android.content.Context
+import androidx.arch.core.executor.testing.InstantTaskExecutorRule
+import androidx.core.content.ContextCompat
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.LifecycleRegistry
+import com.instructure.canvasapi2.models.User
+import com.instructure.canvasapi2.utils.ContextKeeper
+import com.instructure.pandautils.utils.ColorKeeper
+import com.instructure.pandautils.utils.ColorUtils
+import com.instructure.pandautils.utils.ThemedColor
+import com.instructure.pandautils.utils.createThemedColor
+import com.instructure.parentapp.R
+import io.mockk.coEvery
+import io.mockk.coVerify
+import io.mockk.every
+import io.mockk.mockk
+import io.mockk.mockkObject
+import io.mockk.spyk
+import io.mockk.unmockkObject
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.toList
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.test.UnconfinedTestDispatcher
+import kotlinx.coroutines.test.resetMain
+import kotlinx.coroutines.test.runTest
+import kotlinx.coroutines.test.setMain
+import org.junit.After
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+
+
+@ExperimentalCoroutinesApi
+class ManageStudentsViewModelTest {
+
+ @get:Rule
+ val instantExecutorRule = InstantTaskExecutorRule()
+
+ private val lifecycleOwner: LifecycleOwner = mockk(relaxed = true)
+ private val lifecycleRegistry = LifecycleRegistry(lifecycleOwner)
+ private val testDispatcher = UnconfinedTestDispatcher()
+
+ private val context: Context = mockk(relaxed = true)
+ private val repository: ManageStudentsRepository = mockk(relaxed = true)
+ private val colorKeeper: ColorKeeper = spyk()
+
+ private lateinit var viewModel: ManageStudentViewModel
+
+ @Before
+ fun setup() {
+ lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_CREATE)
+ Dispatchers.setMain(testDispatcher)
+ ContextKeeper.appContext = context
+ mockkObject(ColorUtils)
+ every { ColorUtils.correctContrastForText(any(), any()) } answers { firstArg() }
+ every { ColorUtils.correctContrastForButtonBackground(any(), any(), any()) } answers { firstArg() }
+ every { context.getColor(any()) } answers { firstArg() }
+ every { createThemedColor(any()) } answers { ThemedColor(firstArg()) }
+ }
+
+ @After
+ fun tearDown() {
+ Dispatchers.resetMain()
+ unmockkObject(ColorUtils)
+ }
+
+ @Test
+ fun `Load students`() {
+ val students = listOf(User(id = 1, shortName = "Student 1", pronouns = "He/Him"))
+ val expectedState = ManageStudentsUiState(
+ studentListItems = listOf(
+ StudentItemUiState(1, null, "Student 1", "He/Him", ThemedColor(1))
+ )
+ )
+ coEvery { repository.getStudents(any()) } returns students
+ coEvery { colorKeeper.getOrGenerateUserColor(any()) } returns ThemedColor(1)
+
+ createViewModel()
+
+ Assert.assertEquals(expectedState, viewModel.uiState.value)
+ }
+
+ @Test
+ fun `Load students error`() {
+ val expectedState = ManageStudentsUiState(isLoadError = true)
+ coEvery { repository.getStudents(any()) } throws Exception()
+
+ createViewModel()
+
+ Assert.assertEquals(expectedState, viewModel.uiState.value)
+ }
+
+ @Test
+ fun `Load students empty`() {
+ val expectedState = ManageStudentsUiState(isLoading = false, isLoadError = false, studentListItems = emptyList())
+ coEvery { repository.getStudents(any()) } returns emptyList()
+
+ createViewModel()
+
+ Assert.assertEquals(expectedState, viewModel.uiState.value)
+ }
+
+ @Test
+ fun `Navigate to alert settings screen`() = runTest {
+ createViewModel()
+
+ val events = mutableListOf()
+ backgroundScope.launch(testDispatcher) {
+ viewModel.events.toList(events)
+ }
+
+ viewModel.handleAction(ManageStudentsAction.StudentTapped(1L))
+
+ val expected = ManageStudentsViewModelAction.NavigateToAlertSettings(1L)
+ Assert.assertEquals(expected, events.last())
+ }
+
+ @Test
+ fun `Refresh reloads students`() {
+ createViewModel()
+
+ viewModel.handleAction(ManageStudentsAction.Refresh)
+
+ coVerify { repository.getStudents(true) }
+ }
+
+ @Test
+ fun `Show color picker dialog`() {
+ val userColors = listOf(
+ UserColor(
+ colorRes = R.color.studentBlue,
+ color = ThemedColor(R.color.studentBlue),
+ contentDescriptionRes = R.string.studentColorContentDescriptionBlue
+ ),
+ UserColor(
+ colorRes = R.color.studentPurple,
+ color = ThemedColor(R.color.studentPurple),
+ contentDescriptionRes = R.string.studentColorContentDescriptionPurple
+ ),
+ UserColor(
+ colorRes = R.color.studentPink,
+ color = ThemedColor(R.color.studentPink),
+ contentDescriptionRes = R.string.studentColorContentDescriptionPink
+ ),
+ UserColor(
+ colorRes = R.color.studentRed,
+ color = ThemedColor(R.color.studentRed),
+ contentDescriptionRes = R.string.studentColorContentDescriptionRed
+ ),
+ UserColor(
+ colorRes = R.color.studentOrange,
+ color = ThemedColor(R.color.studentOrange),
+ contentDescriptionRes = R.string.studentColorContentDescriptionOrange
+ ),
+ UserColor(
+ colorRes = R.color.studentGreen,
+ color = ThemedColor(R.color.studentGreen),
+ contentDescriptionRes = R.string.studentColorContentDescriptionGreen
+ ),
+ )
+
+ createViewModel()
+
+ val initialUserColor = userColors[2]
+ viewModel.handleAction(ManageStudentsAction.ShowColorPickerDialog(1L, initialUserColor.color))
+
+ val expected = ManageStudentsUiState(
+ colorPickerDialogUiState = ColorPickerDialogUiState(
+ showColorPickerDialog = true,
+ studentId = 1L,
+ initialUserColor = initialUserColor,
+ userColors = userColors
+ )
+ )
+
+ Assert.assertEquals(expected, viewModel.uiState.value)
+ }
+
+ @Test
+ fun `Hide color picker dialog`() = runTest {
+ every { colorKeeper.userColors } returns emptyList()
+
+ createViewModel()
+
+ viewModel.handleAction(ManageStudentsAction.ShowColorPickerDialog(1L, ThemedColor(1)))
+ Assert.assertTrue(viewModel.uiState.value.colorPickerDialogUiState.showColorPickerDialog)
+
+ viewModel.handleAction(ManageStudentsAction.HideColorPickerDialog)
+ Assert.assertFalse(viewModel.uiState.value.colorPickerDialogUiState.showColorPickerDialog)
+ }
+
+ @Test
+ fun `Save student color`() {
+ val expectedUiState = ManageStudentsUiState(
+ colorPickerDialogUiState = ColorPickerDialogUiState(),
+ studentListItems = listOf(
+ StudentItemUiState(1, null, "Student 1", null, ThemedColor(2))
+ )
+ )
+ val selectedUserColor = UserColor(
+ colorRes = R.color.studentBlue,
+ color = ThemedColor(2),
+ contentDescriptionRes = R.string.studentColorContentDescriptionBlue
+ )
+
+ every { colorKeeper.getOrGenerateUserColor(any()) } returns ThemedColor(1)
+ coEvery { repository.getStudents(any()) } returns listOf(User(id = 1, shortName = "Student 1"))
+ coEvery { repository.saveStudentColor(any(), any()) } returns "#000000"
+ every { ContextCompat.getColor(context, any()) } answers { firstArg() }
+
+ createViewModel()
+
+ viewModel.handleAction(ManageStudentsAction.StudentColorChanged(1L, selectedUserColor))
+
+ Assert.assertEquals(expectedUiState, viewModel.uiState.value)
+ }
+
+ @Test
+ fun `Save student color error`() {
+ val expectedUiState = ManageStudentsUiState(
+ colorPickerDialogUiState = ColorPickerDialogUiState(isSavingColorError = true),
+ studentListItems = listOf(
+ StudentItemUiState(1, null, "Student 1", null, ThemedColor(1))
+ )
+ )
+ val selectedUserColor = UserColor(
+ colorRes = R.color.studentBlue,
+ color = ThemedColor(1),
+ contentDescriptionRes = R.string.studentColorContentDescriptionBlue
+ )
+
+ every { colorKeeper.getOrGenerateUserColor(any()) } returns ThemedColor(1)
+ coEvery { repository.getStudents(any()) } returns listOf(User(id = 1, shortName = "Student 1"))
+ every { ContextCompat.getColor(context, any()) } answers { firstArg() }
+ coEvery { repository.saveStudentColor(any(), any()) } throws Exception()
+
+ createViewModel()
+
+ viewModel.handleAction(ManageStudentsAction.StudentColorChanged(1L, selectedUserColor))
+
+ Assert.assertEquals(expectedUiState, viewModel.uiState.value)
+ }
+
+ private fun createViewModel() {
+ viewModel = ManageStudentViewModel(context, colorKeeper, repository)
+ }
+}
diff --git a/apps/parent/src/test/java/com/instructure/parentapp/features/settings/ParentSettingsBehaviourTest.kt b/apps/parent/src/test/java/com/instructure/parentapp/features/settings/ParentSettingsBehaviourTest.kt
new file mode 100644
index 0000000000..a7deac8c56
--- /dev/null
+++ b/apps/parent/src/test/java/com/instructure/parentapp/features/settings/ParentSettingsBehaviourTest.kt
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2024 - 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 .
+ *
+ */
+package com.instructure.parentapp.features.settings
+
+import com.instructure.pandautils.features.settings.SettingsItem
+import org.junit.Test
+import com.instructure.parentapp.R
+import junit.framework.TestCase.assertEquals
+
+class ParentSettingsBehaviourTest {
+
+ @Test
+ fun `Settings behaviour has the correct items`() {
+ val settingsBehaviour = ParentSettingsBehaviour()
+
+ val expected = mapOf(
+ R.string.preferences to listOf(SettingsItem.APP_THEME),
+ R.string.legal to listOf(
+ SettingsItem.ABOUT,
+ SettingsItem.LEGAL
+ )
+ )
+
+ assertEquals(expected, settingsBehaviour.settingsItems)
+ }
+}
\ No newline at end of file
diff --git a/apps/parent/src/test/java/com/instructure/parentapp/features/splash/SplashRepositoryTest.kt b/apps/parent/src/test/java/com/instructure/parentapp/features/splash/SplashRepositoryTest.kt
new file mode 100644
index 0000000000..f27d515db4
--- /dev/null
+++ b/apps/parent/src/test/java/com/instructure/parentapp/features/splash/SplashRepositoryTest.kt
@@ -0,0 +1,133 @@
+/*
+ * Copyright (C) 2024 - present Instructure, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package com.instructure.parentapp.features.splash
+
+import com.instructure.canvasapi2.apis.EnrollmentAPI
+import com.instructure.canvasapi2.apis.ThemeAPI
+import com.instructure.canvasapi2.apis.UserAPI
+import com.instructure.canvasapi2.models.CanvasColor
+import com.instructure.canvasapi2.models.CanvasTheme
+import com.instructure.canvasapi2.models.Enrollment
+import com.instructure.canvasapi2.models.User
+import com.instructure.canvasapi2.utils.DataResult
+import com.instructure.canvasapi2.utils.LinkHeaders
+import io.mockk.coEvery
+import io.mockk.mockk
+import kotlinx.coroutines.test.runTest
+import org.junit.Assert
+import org.junit.Test
+
+
+class SplashRepositoryTest {
+
+ private val themeApi: ThemeAPI.ThemeInterface = mockk(relaxed = true)
+ private val userApi: UserAPI.UsersInterface = mockk(relaxed = true)
+ private val enrollmentApi: EnrollmentAPI.EnrollmentInterface = mockk(relaxed = true)
+
+ private val repository = SplashRepository(userApi, themeApi, enrollmentApi)
+
+ @Test
+ fun `Get students successfully returns data`() = runTest {
+ val expected = listOf(User(id = 1L))
+ val enrollments = expected.map { Enrollment(observedUser = it) }
+
+ coEvery { enrollmentApi.firstPageObserveeEnrollmentsParent(any()) } returns DataResult.Success(enrollments)
+
+ val result = repository.getStudents()
+ Assert.assertEquals(expected, result)
+ }
+
+ @Test
+ fun `Get students with pagination successfully returns data`() = runTest {
+ val page1 = listOf(User(id = 1L))
+ val enrollments1 = page1.map { Enrollment(observedUser = it) }
+ val page2 = listOf(User(id = 2L))
+ val enrollments2 = page2.map { Enrollment(observedUser = it) }
+
+ coEvery { enrollmentApi.firstPageObserveeEnrollmentsParent(any()) } returns DataResult.Success(
+ enrollments1,
+ linkHeaders = LinkHeaders(nextUrl = "page_2_url")
+ )
+ coEvery { enrollmentApi.getNextPage("page_2_url", any()) } returns DataResult.Success(enrollments2)
+
+ val result = repository.getStudents()
+ Assert.assertEquals(page1 + page2, result)
+ }
+
+ @Test
+ fun `Get students returns empty list when enrollments call fails`() = runTest {
+ coEvery { enrollmentApi.firstPageObserveeEnrollmentsParent(any()) } returns DataResult.Fail()
+
+ val result = repository.getStudents()
+ Assert.assertTrue(result.isEmpty())
+ }
+
+ @Test
+ fun `Get self successfully returns data`() = runTest {
+ val expected = User(id = 1L)
+
+ coEvery { userApi.getSelf(any()) } returns DataResult.Success(expected)
+
+ val result = repository.getSelf()
+ Assert.assertEquals(expected, result)
+ }
+
+ @Test
+ fun `Get self returns null when call fails`() = runTest {
+ coEvery { userApi.getSelf(any()) } returns DataResult.Fail()
+
+ val result = repository.getSelf()
+ Assert.assertNull(result)
+ }
+
+ @Test
+ fun `Get colors successfully returns data`() = runTest {
+ val expected = CanvasColor()
+
+ coEvery { userApi.getColors(any()) } returns DataResult.Success(expected)
+
+ val result = repository.getColors()
+ Assert.assertEquals(expected, result)
+ }
+
+ @Test
+ fun `Get colors returns null when call fails`() = runTest {
+ coEvery { userApi.getColors(any()) } returns DataResult.Fail()
+
+ val result = repository.getColors()
+ Assert.assertNull(result)
+ }
+
+ @Test
+ fun `Get theme successfully returns data`() = runTest {
+ val expected = CanvasTheme("", "", "", "", "", "", "", "")
+
+ coEvery { themeApi.getTheme(any()) } returns DataResult.Success(expected)
+
+ val result = repository.getTheme()
+ Assert.assertEquals(expected, result)
+ }
+
+ @Test
+ fun `Get theme returns null when call fails`() = runTest {
+ coEvery { themeApi.getTheme(any()) } returns DataResult.Fail()
+
+ val result = repository.getTheme()
+ Assert.assertNull(result)
+ }
+}
diff --git a/apps/parent/src/test/java/com/instructure/parentapp/features/splash/SplashViewModelTest.kt b/apps/parent/src/test/java/com/instructure/parentapp/features/splash/SplashViewModelTest.kt
new file mode 100644
index 0000000000..69695cb976
--- /dev/null
+++ b/apps/parent/src/test/java/com/instructure/parentapp/features/splash/SplashViewModelTest.kt
@@ -0,0 +1,173 @@
+/*
+ * Copyright (C) 2024 - present Instructure, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package com.instructure.parentapp.features.splash
+
+import android.content.Context
+import androidx.arch.core.executor.testing.InstantTaskExecutorRule
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.LifecycleRegistry
+import com.instructure.canvasapi2.models.CanvasColor
+import com.instructure.canvasapi2.models.CanvasTheme
+import com.instructure.canvasapi2.models.User
+import com.instructure.canvasapi2.utils.ApiPrefs
+import com.instructure.canvasapi2.utils.ContextKeeper
+import com.instructure.pandautils.utils.ColorKeeper
+import com.instructure.pandautils.utils.ThemePrefs
+import io.mockk.coEvery
+import io.mockk.coVerify
+import io.mockk.every
+import io.mockk.mockk
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.toList
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.test.UnconfinedTestDispatcher
+import kotlinx.coroutines.test.resetMain
+import kotlinx.coroutines.test.runTest
+import kotlinx.coroutines.test.setMain
+import org.junit.After
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+
+
+@ExperimentalCoroutinesApi
+class SplashViewModelTest {
+
+ @get:Rule
+ val instantExecutorRule = InstantTaskExecutorRule()
+
+ private val lifecycleOwner: LifecycleOwner = mockk(relaxed = true)
+ private val lifecycleRegistry = LifecycleRegistry(lifecycleOwner)
+ private val testDispatcher = UnconfinedTestDispatcher()
+
+ private val context: Context = mockk(relaxed = true)
+ private val repository: SplashRepository = mockk(relaxed = true)
+ private val apiPrefs: ApiPrefs = mockk(relaxed = true)
+ private val colorKeeper: ColorKeeper = mockk(relaxed = true)
+ private val themePrefs: ThemePrefs = mockk(relaxed = true)
+
+ private lateinit var viewModel: SplashViewModel
+
+ @Before
+ fun setup() {
+ lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_CREATE)
+ Dispatchers.setMain(testDispatcher)
+ ContextKeeper.appContext = context
+ }
+
+ @After
+ fun tearDown() {
+ Dispatchers.resetMain()
+ }
+
+ @Test
+ fun `Load and store initial data successfully`() = runTest {
+ val user = User(id = 1L)
+ coEvery { repository.getSelf() } returns user
+
+ val colors = CanvasColor()
+ coEvery { repository.getColors() } returns colors
+
+ val theme = CanvasTheme("", "", "", "", "", "", "", "")
+ coEvery { repository.getTheme() } returns theme
+
+ val students = User(id = 2L)
+ coEvery { repository.getStudents() } returns listOf(students)
+
+ createViewModel()
+
+ coVerify { apiPrefs.user = user }
+ coVerify { colorKeeper.addToCache(colors) }
+ coVerify { themePrefs.applyCanvasTheme(theme, context) }
+
+ val events = mutableListOf()
+ backgroundScope.launch(testDispatcher) {
+ viewModel.events.toList(events)
+ }
+
+ Assert.assertEquals(SplashAction.InitialDataLoadingFinished, events.last())
+ }
+
+ @Test
+ fun `Load and store initial data fails`() = runTest {
+ coEvery { repository.getSelf() } throws Exception()
+
+ createViewModel()
+
+ val events = mutableListOf()
+ backgroundScope.launch(testDispatcher) {
+ viewModel.events.toList(events)
+ }
+
+ Assert.assertEquals(SplashAction.InitialDataLoadingFinished, events.last())
+ }
+
+ @Test
+ fun `No observed students`() = runTest {
+ val user = User(id = 1L)
+ coEvery { repository.getSelf() } returns user
+
+ val colors = CanvasColor()
+ coEvery { repository.getColors() } returns colors
+
+ val theme = CanvasTheme("", "", "", "", "", "", "", "")
+ coEvery { repository.getTheme() } returns theme
+
+ coEvery { repository.getStudents() } returns emptyList()
+
+ createViewModel()
+
+ val events = mutableListOf()
+ backgroundScope.launch(testDispatcher) {
+ viewModel.events.toList(events)
+ }
+
+ Assert.assertEquals(SplashAction.NavigateToNotAParentScreen, events.last())
+ }
+
+ @Test
+ fun `User stored and locale changed`() = runTest {
+ val user = User(id = 1L, effective_locale = "en")
+ coEvery { repository.getSelf() } returns user
+ every { apiPrefs.user = any() } answers {
+ every { apiPrefs.effectiveLocale } returns user.effective_locale.orEmpty()
+ }
+
+ createViewModel()
+
+ val events = mutableListOf()
+ backgroundScope.launch(testDispatcher) {
+ viewModel.events.toList(events)
+ }
+
+ Assert.assertEquals(SplashAction.LocaleChanged, events.first())
+ }
+
+ private fun createViewModel() {
+ viewModel = SplashViewModel(
+ context = context,
+ repository = repository,
+ apiPrefs = apiPrefs,
+ colorKeeper = colorKeeper,
+ themePrefs = themePrefs,
+ )
+ }
+}
diff --git a/apps/parent/src/test/java/com/instructure/parentapp/login/routevalidator/RouteValidatorViewModelTest.kt b/apps/parent/src/test/java/com/instructure/parentapp/login/routevalidator/RouteValidatorViewModelTest.kt
new file mode 100644
index 0000000000..67aabbe841
--- /dev/null
+++ b/apps/parent/src/test/java/com/instructure/parentapp/login/routevalidator/RouteValidatorViewModelTest.kt
@@ -0,0 +1,271 @@
+/*
+ * Copyright (C) 2024 - present Instructure, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package com.instructure.parentapp.login.routevalidator
+
+import android.content.Context
+import android.net.Uri
+import android.os.Bundle
+import androidx.arch.core.executor.testing.InstantTaskExecutorRule
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.LifecycleRegistry
+import com.instructure.canvasapi2.apis.OAuthAPI
+import com.instructure.canvasapi2.models.AccountDomain
+import com.instructure.canvasapi2.models.AuthenticatedSession
+import com.instructure.canvasapi2.models.OAuthTokenResponse
+import com.instructure.canvasapi2.models.TokenUser
+import com.instructure.canvasapi2.utils.Analytics
+import com.instructure.canvasapi2.utils.ApiPrefs
+import com.instructure.canvasapi2.utils.ContextKeeper
+import com.instructure.canvasapi2.utils.DataResult
+import com.instructure.loginapi.login.util.QRLogin
+import com.instructure.parentapp.features.login.routevalidator.RouteValidatorAction
+import com.instructure.parentapp.features.login.routevalidator.RouteValidatorViewModel
+import com.instructure.parentapp.util.ParentLogoutTask
+import io.mockk.coEvery
+import io.mockk.every
+import io.mockk.just
+import io.mockk.mockk
+import io.mockk.mockkConstructor
+import io.mockk.mockkStatic
+import io.mockk.runs
+import io.mockk.unmockkAll
+import io.mockk.verify
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.toList
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.test.UnconfinedTestDispatcher
+import kotlinx.coroutines.test.resetMain
+import kotlinx.coroutines.test.runTest
+import kotlinx.coroutines.test.setMain
+import org.junit.After
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+
+
+@ExperimentalCoroutinesApi
+class RouteValidatorViewModelTest {
+
+ @get:Rule
+ val instantExecutorRule = InstantTaskExecutorRule()
+
+ private val lifecycleOwner: LifecycleOwner = mockk(relaxed = true)
+ private val lifecycleRegistry = LifecycleRegistry(lifecycleOwner)
+ private val testDispatcher = UnconfinedTestDispatcher()
+
+ private val context: Context = mockk(relaxed = true)
+ private val apiPrefs: ApiPrefs = mockk(relaxed = true)
+ private val oAuthApi: OAuthAPI.OAuthInterface = mockk(relaxed = true)
+ private val qrLogin: QRLogin = mockk(relaxed = true)
+ private val analytics: Analytics = mockk(relaxed = true)
+ private val mockUri = mockk(relaxed = true) {
+ every { host } returns "mobiledev.instructure.com"
+ }
+
+ private lateinit var viewModel: RouteValidatorViewModel
+
+ @Before
+ fun setup() {
+ lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_CREATE)
+ Dispatchers.setMain(testDispatcher)
+ mockkStatic(Uri::class)
+ every { Uri.parse(any()) } returns mockUri
+ ContextKeeper.appContext = context
+ mockkConstructor(Bundle::class)
+ every { anyConstructed().putString(any(), any()) } just runs
+ mockkConstructor(ParentLogoutTask::class)
+ every { anyConstructed().execute() } just runs
+ }
+
+ @After
+ fun tearDown() {
+ unmockkAll()
+ Dispatchers.resetMain()
+ }
+
+ @Test
+ fun `Load route with null url`() = runTest {
+ createViewModel()
+ viewModel.loadRoute(null)
+
+ val events = mutableListOf()
+ backgroundScope.launch(testDispatcher) {
+ viewModel.events.toList(events)
+ }
+
+ Assert.assertEquals(RouteValidatorAction.Finish, events.last())
+ }
+
+ @Test
+ fun `Load route with empty url`() = runTest {
+ createViewModel()
+ viewModel.loadRoute("")
+
+ val events = mutableListOf()
+ backgroundScope.launch(testDispatcher) {
+ viewModel.events.toList(events)
+ }
+
+ Assert.assertEquals(RouteValidatorAction.Finish, events.last())
+ }
+
+ @Test
+ fun `Load route with QR login url when user is already signed in`() = runTest {
+ every { apiPrefs.getValidToken() } returns "token"
+ every { qrLogin.verifySSOLoginUri(any()) } returns true
+
+ createViewModel()
+
+ val events = mutableListOf()
+ backgroundScope.launch(testDispatcher) {
+ viewModel.events.toList(events)
+ }
+
+ viewModel.loadRoute("https://mobiledev.instructure.com/qrlogin")
+
+ Assert.assertEquals(RouteValidatorAction.Finish, events.last())
+ }
+
+ @Test
+ fun `Load route with QR login url`() = runTest {
+ every { apiPrefs.getValidToken() } returns ""
+ every { qrLogin.verifySSOLoginUri(any()) } returns true
+ coEvery { qrLogin.performSSOLogin(any(), any(), any()) } returns OAuthTokenResponse()
+ coEvery { oAuthApi.getAuthenticatedSession(any(), any()) } returns DataResult.Success(AuthenticatedSession("sessionUrl"))
+
+ createViewModel()
+
+ val events = mutableListOf()
+ backgroundScope.launch(testDispatcher) {
+ viewModel.events.toList(events)
+ }
+
+ viewModel.loadRoute("https://mobiledev.instructure.com/qrlogin")
+
+ Assert.assertEquals(RouteValidatorAction.LoadWebViewUrl("sessionUrl"), events.last())
+ delay(800)
+ Assert.assertEquals(RouteValidatorAction.StartMainActivity(), events.last())
+ }
+
+ @Test
+ fun `Load route with masquerade QR login url`() = runTest {
+ every { apiPrefs.getValidToken() } returns ""
+ every { qrLogin.verifySSOLoginUri(any()) } returns true
+ coEvery { qrLogin.performSSOLogin(any(), any(), any()) } returns OAuthTokenResponse(
+ realUser = TokenUser(1, "", ""),
+ user = TokenUser(1, "", "")
+ )
+ coEvery { oAuthApi.getAuthenticatedSession(any(), any()) } returns DataResult.Success(AuthenticatedSession("sessionUrl"))
+
+ createViewModel()
+
+ val events = mutableListOf()
+ backgroundScope.launch(testDispatcher) {
+ viewModel.events.toList(events)
+ }
+
+ viewModel.loadRoute("https://mobiledev.instructure.com/qrlogin")
+
+ Assert.assertEquals(RouteValidatorAction.LoadWebViewUrl("sessionUrl"), events.last())
+ delay(800)
+ Assert.assertEquals(RouteValidatorAction.StartMainActivity(1), events.last())
+ }
+
+ @Test
+ fun `Load route with QR login url when error happens`() = runTest {
+ every { apiPrefs.getValidToken() } returns ""
+ every { qrLogin.verifySSOLoginUri(any()) } returns true
+ coEvery { qrLogin.performSSOLogin(any(), any(), any()) } throws Exception()
+
+ createViewModel()
+
+ val events = mutableListOf()
+ backgroundScope.launch(testDispatcher) {
+ viewModel.events.toList(events)
+ }
+
+ viewModel.loadRoute("https://mobiledev.instructure.com/qrlogin")
+
+ verify { apiPrefs.clearAllData() }
+ Assert.assertEquals(RouteValidatorAction.Finish, events.last())
+ }
+
+ @Test
+ fun `Load route when user is not logged in`() = runTest {
+ every { apiPrefs.getValidToken() } returns ""
+
+ createViewModel()
+
+ val events = mutableListOf()
+ backgroundScope.launch(testDispatcher) {
+ viewModel.events.toList(events)
+ }
+
+ viewModel.loadRoute("https://mobiledev.instructure.com/courses")
+
+ delay(800)
+ Assert.assertEquals(
+ RouteValidatorAction.StartSignInActivity(AccountDomain("mobiledev.instructure.com")),
+ events.last()
+ )
+ }
+
+ @Test
+ fun `Load route when user is not logged in and no host found in url`() = runTest {
+ every { apiPrefs.getValidToken() } returns ""
+ every { mockUri.host } returns ""
+
+ createViewModel()
+
+ val events = mutableListOf()
+ backgroundScope.launch(testDispatcher) {
+ viewModel.events.toList(events)
+ }
+
+ viewModel.loadRoute("https://mobiledev.instructure.com/courses")
+
+ delay(800)
+ Assert.assertEquals(RouteValidatorAction.StartLoginActivity, events.last())
+ }
+
+ @Test
+ fun `Load route when user is logged in`() = runTest {
+ every { apiPrefs.domain } returns "mobiledev.instructure.com"
+ every { apiPrefs.getValidToken() } returns "token"
+
+ createViewModel()
+
+ val events = mutableListOf()
+ backgroundScope.launch(testDispatcher) {
+ viewModel.events.toList(events)
+ }
+
+ viewModel.loadRoute("https://mobiledev.instructure.com/courses")
+
+ delay(800)
+ Assert.assertEquals(RouteValidatorAction.StartMainActivity(data = mockUri), events.last())
+ }
+
+ private fun createViewModel() {
+ viewModel = RouteValidatorViewModel(context, apiPrefs, oAuthApi, qrLogin, analytics)
+ }
+}
diff --git a/apps/settings.gradle b/apps/settings.gradle
index 8486e179b4..9df6cdc40f 100644
--- a/apps/settings.gradle
+++ b/apps/settings.gradle
@@ -15,12 +15,7 @@ pluginManagement {
/* Top-level project modules */
include ':student'
include ':teacher'
-/* Flutter embed modules */
-setBinding(new Binding([gradle: this]))
-
-evaluate(new File(settingsDir.parentFile, 'libs/flutter_student_embed/include_student_embed.groovy'))
-include ':flutter_student_embed'
-project(':flutter_student_embed').projectDir = new File(rootProject.projectDir, '/../libs/flutter_student_embed')
+include ':parent'
/* Library modules */
include ':annotations'
diff --git a/apps/student/build.gradle b/apps/student/build.gradle
index 815299e864..ea3d3f85e0 100644
--- a/apps/student/build.gradle
+++ b/apps/student/build.gradle
@@ -21,22 +21,12 @@ apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
apply plugin: 'kotlin-kapt'
apply plugin: 'com.google.firebase.crashlytics'
-apply plugin: 'com.squareup.sqldelight'
apply plugin: 'dagger.hilt.android.plugin'
apply plugin: 'com.heapanalytics.android'
def updatePriority = 2
def coverageEnabled = project.hasProperty('coverage')
-sqldelight {
- StudentDb {
- packageName = "com.instructure.student.db"
- sourceFolders = ["db"]
- schemaOutputDirectory = file("src/main/db/schemas")
- }
-}
-
-
configurations {
all*.exclude group: 'commons-logging', module: 'commons-logging'
all*.exclude group: 'org.apache.httpcomponents', module: 'httpclient'
@@ -50,8 +40,8 @@ android {
applicationId "com.instructure.candroid"
minSdkVersion Versions.MIN_SDK
targetSdkVersion Versions.TARGET_SDK
- versionCode = 260
- versionName = '7.2.0'
+ versionCode = 265
+ versionName = '7.5.2'
vectorDrawables.useSupportLibrary = true
multiDexEnabled = true
@@ -64,6 +54,14 @@ android {
buildConfigField "String", "PSPDFKIT_LICENSE_KEY", "\"$pspdfkitLicenseKey\""
testBuildType = "debug"
+
+ javaCompileOptions {
+ annotationProcessorOptions {
+ compilerArgumentProviders(
+ new RoomSchemaArgProvider(new File(projectDir, "schemas"))
+ )
+ }
+ }
}
bundle {
@@ -87,9 +85,6 @@ android {
lintOptions {
abortOnError false
- // Work around for AGP issue related to release mode, see:
- // https://github.com/flutter/flutter/issues/58247#issuecomment-636253593
- checkReleaseBuilds false
}
signingConfigs {
@@ -116,13 +111,11 @@ android {
mappingFileUploadEnabled false
}
- ndk {
- // Filter for architectures supported by Flutter. Include x86 in debug builds so we don't crash on FTL.
- abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86_64', 'x86'
- }
-
buildConfigField "String", "HEAP_APP_ID", "\"$heapStagingId\""
+ buildConfigField "String", "PRONOUN_STUDENT_TEST_USER", "\"$pronounTestStudent\""
+ buildConfigField "String", "PRONOUN_STUDENT_TEST_PASSWORD", "\"$pronounTestStudentPassword\""
+
ext {
heapEnabled = true
}
@@ -150,11 +143,6 @@ android {
unstrippedNativeLibsDir 'build/intermediates/merged_native_libs/release/out/lib'
}
- ndk {
- // Filter for architectures supported by Flutter. Exclude x86 in release builds to avoid missing lib crash on x86 devices.
- abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86_64'
- }
-
buildConfigField "String", "HEAP_APP_ID", "\"$heapProductionId\""
ext {
@@ -226,8 +214,7 @@ android {
new MasqueradeUITransformer('com.instructure.student.activity.NavigationActivity.class'),
new PageViewTransformer(),
new ScreenViewTransformer("student"),
- new LocaleTransformer(project),
- new FlutterA11yOffsetTransformer()
+ new LocaleTransformer(project)
)
)
@@ -250,6 +237,10 @@ android {
enableAggregatingTask = false
enableExperimentalClasspathAggregation = true
}
+
+ sourceSets {
+ debug.assets.srcDirs += files("$projectDir/schemas".toString())
+ }
}
dependencies {
@@ -263,12 +254,6 @@ dependencies {
implementation project(path: ':interactions')
implementation project(path: ':DocumentScanner')
- /* Flutter embed */
- implementation (project(path: ':flutter-student-embed')) {
- exclude group: 'com.google.firebase'
- exclude group: 'com.google.android.gms'
- }
-
/* Android Test Dependencies */
androidTestImplementation project(path: ':espresso')
androidTestImplementation project(':dataseedingapi')
@@ -323,9 +308,6 @@ dependencies {
implementation Libs.ANDROIDX_PALETTE
implementation Libs.PLAY_IN_APP_UPDATES
- /* Database */
- implementation Libs.SQLDELIGHT
-
/* Qr Code */
implementation (Libs.JOURNEY_ZXING) { transitive = false }
implementation Libs.JOURNEY_ZXING_CORE
diff --git a/apps/student/flank_e2e.yml b/apps/student/flank_e2e.yml
index 3bf18a37ee..621608d4d8 100644
--- a/apps/student/flank_e2e.yml
+++ b/apps/student/flank_e2e.yml
@@ -21,6 +21,6 @@ gcloud:
orientation: portrait
flank:
- testShards: 1
+ testShards: 10
testRuns: 1
diff --git a/apps/student/proguard-rules.txt b/apps/student/proguard-rules.txt
index f969a463d7..1098925302 100644
--- a/apps/student/proguard-rules.txt
+++ b/apps/student/proguard-rules.txt
@@ -262,6 +262,3 @@
-dontwarn okio.**
-keep class retrofit2.** { *; }
-dontwarn retrofit2.**
-
-# Flutter embed
--keep class io.flutter.** { *; }
diff --git a/apps/student/schemas/com.instructure.student.room.StudentDb/5.json b/apps/student/schemas/com.instructure.student.room.StudentDb/5.json
new file mode 100644
index 0000000000..393183a5d8
--- /dev/null
+++ b/apps/student/schemas/com.instructure.student.room.StudentDb/5.json
@@ -0,0 +1,364 @@
+{
+ "formatVersion": 1,
+ "database": {
+ "version": 5,
+ "identityHash": "e53938dfbba782807335de22069861d4",
+ "entities": [
+ {
+ "tableName": "CreateSubmissionEntity",
+ "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `submissionEntry` TEXT, `lastActivityDate` INTEGER, `assignmentName` TEXT, `assignmentId` INTEGER NOT NULL, `canvasContext` TEXT NOT NULL, `submissionType` TEXT NOT NULL, `errorFlag` INTEGER NOT NULL, `assignmentGroupCategoryId` INTEGER, `userId` INTEGER NOT NULL, `currentFile` INTEGER NOT NULL, `fileCount` INTEGER NOT NULL, `progress` REAL, `annotatableAttachmentId` INTEGER, `isDraft` INTEGER NOT NULL)",
+ "fields": [
+ {
+ "fieldPath": "id",
+ "columnName": "id",
+ "affinity": "INTEGER",
+ "notNull": true
+ },
+ {
+ "fieldPath": "submissionEntry",
+ "columnName": "submissionEntry",
+ "affinity": "TEXT",
+ "notNull": false
+ },
+ {
+ "fieldPath": "lastActivityDate",
+ "columnName": "lastActivityDate",
+ "affinity": "INTEGER",
+ "notNull": false
+ },
+ {
+ "fieldPath": "assignmentName",
+ "columnName": "assignmentName",
+ "affinity": "TEXT",
+ "notNull": false
+ },
+ {
+ "fieldPath": "assignmentId",
+ "columnName": "assignmentId",
+ "affinity": "INTEGER",
+ "notNull": true
+ },
+ {
+ "fieldPath": "canvasContext",
+ "columnName": "canvasContext",
+ "affinity": "TEXT",
+ "notNull": true
+ },
+ {
+ "fieldPath": "submissionType",
+ "columnName": "submissionType",
+ "affinity": "TEXT",
+ "notNull": true
+ },
+ {
+ "fieldPath": "errorFlag",
+ "columnName": "errorFlag",
+ "affinity": "INTEGER",
+ "notNull": true
+ },
+ {
+ "fieldPath": "assignmentGroupCategoryId",
+ "columnName": "assignmentGroupCategoryId",
+ "affinity": "INTEGER",
+ "notNull": false
+ },
+ {
+ "fieldPath": "userId",
+ "columnName": "userId",
+ "affinity": "INTEGER",
+ "notNull": true
+ },
+ {
+ "fieldPath": "currentFile",
+ "columnName": "currentFile",
+ "affinity": "INTEGER",
+ "notNull": true
+ },
+ {
+ "fieldPath": "fileCount",
+ "columnName": "fileCount",
+ "affinity": "INTEGER",
+ "notNull": true
+ },
+ {
+ "fieldPath": "progress",
+ "columnName": "progress",
+ "affinity": "REAL",
+ "notNull": false
+ },
+ {
+ "fieldPath": "annotatableAttachmentId",
+ "columnName": "annotatableAttachmentId",
+ "affinity": "INTEGER",
+ "notNull": false
+ },
+ {
+ "fieldPath": "isDraft",
+ "columnName": "isDraft",
+ "affinity": "INTEGER",
+ "notNull": true
+ }
+ ],
+ "primaryKey": {
+ "autoGenerate": true,
+ "columnNames": [
+ "id"
+ ]
+ },
+ "indices": [],
+ "foreignKeys": []
+ },
+ {
+ "tableName": "CreatePendingSubmissionCommentEntity",
+ "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `accountDomain` TEXT NOT NULL, `canvasContext` TEXT NOT NULL, `assignmentName` TEXT NOT NULL, `assignmentId` INTEGER NOT NULL, `lastActivityDate` INTEGER NOT NULL, `isGroupMessage` INTEGER NOT NULL, `message` TEXT, `mediaPath` TEXT, `currentFile` INTEGER NOT NULL, `fileCount` INTEGER NOT NULL, `progress` REAL, `errorFlag` INTEGER NOT NULL, `attemptId` INTEGER)",
+ "fields": [
+ {
+ "fieldPath": "id",
+ "columnName": "id",
+ "affinity": "INTEGER",
+ "notNull": true
+ },
+ {
+ "fieldPath": "accountDomain",
+ "columnName": "accountDomain",
+ "affinity": "TEXT",
+ "notNull": true
+ },
+ {
+ "fieldPath": "canvasContext",
+ "columnName": "canvasContext",
+ "affinity": "TEXT",
+ "notNull": true
+ },
+ {
+ "fieldPath": "assignmentName",
+ "columnName": "assignmentName",
+ "affinity": "TEXT",
+ "notNull": true
+ },
+ {
+ "fieldPath": "assignmentId",
+ "columnName": "assignmentId",
+ "affinity": "INTEGER",
+ "notNull": true
+ },
+ {
+ "fieldPath": "lastActivityDate",
+ "columnName": "lastActivityDate",
+ "affinity": "INTEGER",
+ "notNull": true
+ },
+ {
+ "fieldPath": "isGroupMessage",
+ "columnName": "isGroupMessage",
+ "affinity": "INTEGER",
+ "notNull": true
+ },
+ {
+ "fieldPath": "message",
+ "columnName": "message",
+ "affinity": "TEXT",
+ "notNull": false
+ },
+ {
+ "fieldPath": "mediaPath",
+ "columnName": "mediaPath",
+ "affinity": "TEXT",
+ "notNull": false
+ },
+ {
+ "fieldPath": "currentFile",
+ "columnName": "currentFile",
+ "affinity": "INTEGER",
+ "notNull": true
+ },
+ {
+ "fieldPath": "fileCount",
+ "columnName": "fileCount",
+ "affinity": "INTEGER",
+ "notNull": true
+ },
+ {
+ "fieldPath": "progress",
+ "columnName": "progress",
+ "affinity": "REAL",
+ "notNull": false
+ },
+ {
+ "fieldPath": "errorFlag",
+ "columnName": "errorFlag",
+ "affinity": "INTEGER",
+ "notNull": true
+ },
+ {
+ "fieldPath": "attemptId",
+ "columnName": "attemptId",
+ "affinity": "INTEGER",
+ "notNull": false
+ }
+ ],
+ "primaryKey": {
+ "autoGenerate": true,
+ "columnNames": [
+ "id"
+ ]
+ },
+ "indices": [],
+ "foreignKeys": []
+ },
+ {
+ "tableName": "CreateFileSubmissionEntity",
+ "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `dbSubmissionId` INTEGER NOT NULL, `attachmentId` INTEGER, `name` TEXT, `size` INTEGER, `contentType` TEXT, `fullPath` TEXT, `error` TEXT, `errorFlag` INTEGER NOT NULL, FOREIGN KEY(`dbSubmissionId`) REFERENCES `CreateSubmissionEntity`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+ "fields": [
+ {
+ "fieldPath": "id",
+ "columnName": "id",
+ "affinity": "INTEGER",
+ "notNull": true
+ },
+ {
+ "fieldPath": "dbSubmissionId",
+ "columnName": "dbSubmissionId",
+ "affinity": "INTEGER",
+ "notNull": true
+ },
+ {
+ "fieldPath": "attachmentId",
+ "columnName": "attachmentId",
+ "affinity": "INTEGER",
+ "notNull": false
+ },
+ {
+ "fieldPath": "name",
+ "columnName": "name",
+ "affinity": "TEXT",
+ "notNull": false
+ },
+ {
+ "fieldPath": "size",
+ "columnName": "size",
+ "affinity": "INTEGER",
+ "notNull": false
+ },
+ {
+ "fieldPath": "contentType",
+ "columnName": "contentType",
+ "affinity": "TEXT",
+ "notNull": false
+ },
+ {
+ "fieldPath": "fullPath",
+ "columnName": "fullPath",
+ "affinity": "TEXT",
+ "notNull": false
+ },
+ {
+ "fieldPath": "error",
+ "columnName": "error",
+ "affinity": "TEXT",
+ "notNull": false
+ },
+ {
+ "fieldPath": "errorFlag",
+ "columnName": "errorFlag",
+ "affinity": "INTEGER",
+ "notNull": true
+ }
+ ],
+ "primaryKey": {
+ "autoGenerate": true,
+ "columnNames": [
+ "id"
+ ]
+ },
+ "indices": [],
+ "foreignKeys": [
+ {
+ "table": "CreateSubmissionEntity",
+ "onDelete": "CASCADE",
+ "onUpdate": "NO ACTION",
+ "columns": [
+ "dbSubmissionId"
+ ],
+ "referencedColumns": [
+ "id"
+ ]
+ }
+ ]
+ },
+ {
+ "tableName": "CreateSubmissionCommentFileEntity",
+ "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `pendingCommentId` INTEGER NOT NULL, `attachmentId` INTEGER, `name` TEXT NOT NULL, `size` INTEGER NOT NULL, `contentType` TEXT NOT NULL, `fullPath` TEXT NOT NULL, FOREIGN KEY(`pendingCommentId`) REFERENCES `CreatePendingSubmissionCommentEntity`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+ "fields": [
+ {
+ "fieldPath": "id",
+ "columnName": "id",
+ "affinity": "INTEGER",
+ "notNull": true
+ },
+ {
+ "fieldPath": "pendingCommentId",
+ "columnName": "pendingCommentId",
+ "affinity": "INTEGER",
+ "notNull": true
+ },
+ {
+ "fieldPath": "attachmentId",
+ "columnName": "attachmentId",
+ "affinity": "INTEGER",
+ "notNull": false
+ },
+ {
+ "fieldPath": "name",
+ "columnName": "name",
+ "affinity": "TEXT",
+ "notNull": true
+ },
+ {
+ "fieldPath": "size",
+ "columnName": "size",
+ "affinity": "INTEGER",
+ "notNull": true
+ },
+ {
+ "fieldPath": "contentType",
+ "columnName": "contentType",
+ "affinity": "TEXT",
+ "notNull": true
+ },
+ {
+ "fieldPath": "fullPath",
+ "columnName": "fullPath",
+ "affinity": "TEXT",
+ "notNull": true
+ }
+ ],
+ "primaryKey": {
+ "autoGenerate": true,
+ "columnNames": [
+ "id"
+ ]
+ },
+ "indices": [],
+ "foreignKeys": [
+ {
+ "table": "CreatePendingSubmissionCommentEntity",
+ "onDelete": "CASCADE",
+ "onUpdate": "NO ACTION",
+ "columns": [
+ "pendingCommentId"
+ ],
+ "referencedColumns": [
+ "id"
+ ]
+ }
+ ]
+ }
+ ],
+ "views": [],
+ "setupQueries": [
+ "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+ "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'e53938dfbba782807335de22069861d4')"
+ ]
+ }
+}
\ No newline at end of file
diff --git a/apps/student/src/androidTest/java/com/instructure/student/db/CreateFileSubmissionDaoTest.kt b/apps/student/src/androidTest/java/com/instructure/student/db/CreateFileSubmissionDaoTest.kt
new file mode 100644
index 0000000000..fdf690cae5
--- /dev/null
+++ b/apps/student/src/androidTest/java/com/instructure/student/db/CreateFileSubmissionDaoTest.kt
@@ -0,0 +1,250 @@
+/*
+ * Copyright (C) 2024 - present Instructure, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.instructure.student.db
+
+import android.database.sqlite.SQLiteConstraintException
+import androidx.room.Room
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.instructure.canvasapi2.models.CanvasContext
+import com.instructure.student.room.StudentDb
+import com.instructure.student.room.entities.CreateFileSubmissionEntity
+import com.instructure.student.room.entities.CreateSubmissionEntity
+import com.instructure.student.room.entities.daos.CreateFileSubmissionDao
+import com.instructure.student.room.entities.daos.CreateSubmissionDao
+import junit.framework.TestCase.assertEquals
+import junit.framework.TestCase.assertNull
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.runTest
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@ExperimentalCoroutinesApi
+@RunWith(AndroidJUnit4::class)
+class CreateFileSubmissionDaoTest {
+
+ private lateinit var db: StudentDb
+ private lateinit var dao: CreateFileSubmissionDao
+ private lateinit var submissionDao: CreateSubmissionDao
+
+ @Before
+ fun setup() {
+ db = Room.inMemoryDatabaseBuilder(
+ ApplicationProvider.getApplicationContext(),
+ StudentDb::class.java
+ ).build()
+ dao = db.fileSubmissionDao()
+ submissionDao = db.submissionDao()
+ }
+
+ @Test(expected = SQLiteConstraintException::class)
+ fun testSubmissionForeignKey() = runTest {
+ val fileSubmission = CreateFileSubmissionEntity(
+ id = 1L,
+ dbSubmissionId = 1L
+ )
+
+ dao.insert(fileSubmission)
+ }
+
+ @Test
+ fun testFindFilesForSubmissionId() = runTest {
+ val files = listOf(
+ CreateFileSubmissionEntity(
+ id = 1L,
+ dbSubmissionId = 1L
+ ),
+ CreateFileSubmissionEntity(
+ id = 2L,
+ dbSubmissionId = 1L
+ ),
+ CreateFileSubmissionEntity(
+ id = 3L,
+ dbSubmissionId = 2L
+ )
+ )
+ addSubmission(1L)
+ addSubmission(2L)
+
+ files.forEach { dao.insert(it) }
+
+ val result = dao.findFilesForSubmissionId(1L)
+
+ assertEquals(files.subList(0, 2), result)
+ }
+
+ @Test
+ fun testFindFileForSubmissionId() = runTest {
+ val files = listOf(
+ CreateFileSubmissionEntity(
+ id = 1L,
+ dbSubmissionId = 1L
+ ),
+ CreateFileSubmissionEntity(
+ id = 2L,
+ dbSubmissionId = 1L
+ ),
+ CreateFileSubmissionEntity(
+ id = 3L,
+ dbSubmissionId = 2L
+ )
+ )
+ addSubmission(1L)
+ addSubmission(2L)
+
+ files.forEach { dao.insert(it) }
+
+ val result = dao.findFileForSubmissionId(1L)
+
+ assertEquals(files[0], result)
+ }
+
+ @Test
+ fun testFindFilesForPath() = runTest {
+ val files = listOf(
+ CreateFileSubmissionEntity(
+ id = 1L,
+ dbSubmissionId = 1L,
+ fullPath = "/path/to/file1"
+ ),
+ CreateFileSubmissionEntity(
+ id = 2L,
+ dbSubmissionId = 1L,
+ fullPath = "/path/to/file1"
+ ),
+ CreateFileSubmissionEntity(
+ id = 3L,
+ dbSubmissionId = 2L,
+ fullPath = "/path/to/file1"
+ )
+ )
+
+ addSubmission(1L)
+ addSubmission(2L)
+
+ files.forEach { dao.insert(it) }
+
+ val result = dao.findFilesForPath(3L, "/path/to/file1")
+
+ assertEquals(files.subList(0, 2), result)
+ }
+
+ @Test
+ fun testDeleteFilesForSubmissionId() = runTest {
+ val files = listOf(
+ CreateFileSubmissionEntity(
+ id = 1L,
+ dbSubmissionId = 1L
+ ),
+ CreateFileSubmissionEntity(
+ id = 2L,
+ dbSubmissionId = 1L
+ ),
+ CreateFileSubmissionEntity(
+ id = 3L,
+ dbSubmissionId = 2L
+ )
+ )
+
+ addSubmission(1L)
+ addSubmission(2L)
+
+ files.forEach { dao.insert(it) }
+
+ dao.deleteFilesForSubmissionId(1L)
+
+ val result = dao.findFileForSubmissionId(1L)
+
+ assertNull(result)
+ }
+
+ @Test
+ fun testSetFileAttachmentIdAndError() = runTest {
+ val file = CreateFileSubmissionEntity(
+ id = 1L,
+ dbSubmissionId = 1L
+ )
+
+ addSubmission(1L)
+
+ dao.insert(file)
+
+ dao.setFileAttachmentIdAndError(1L,true, "error message", 1L)
+
+ val result = dao.findFileForSubmissionId(1L)
+
+ assertEquals(1L, result?.attachmentId)
+ assertEquals(true, result?.errorFlag)
+ assertEquals("error message", result?.error)
+ }
+
+ @Test
+ fun setFileError() = runTest {
+ val file = CreateFileSubmissionEntity(
+ id = 1L,
+ dbSubmissionId = 1L
+ )
+
+ addSubmission(1L)
+
+ dao.insert(file)
+
+ dao.setFileError(true, "error message", 1L)
+
+ val result = dao.findFileForSubmissionId(1L)
+
+ assertEquals(true, result?.errorFlag)
+ assertEquals("error message", result?.error)
+ }
+
+ @Test
+ fun testDeleteFileById() = runTest {
+ val files = listOf(
+ CreateFileSubmissionEntity(
+ id = 1L,
+ dbSubmissionId = 1L
+ ),
+ CreateFileSubmissionEntity(
+ id = 2L,
+ dbSubmissionId = 2L
+ )
+ )
+
+ addSubmission(1L)
+ addSubmission(2L)
+
+ files.forEach { dao.insert(it) }
+
+ dao.deleteFileById(1L)
+
+ val result = dao.findFileForSubmissionId(1L)
+
+ assertNull(result)
+ }
+
+ private suspend fun addSubmission(id: Long) {
+ submissionDao.insert(
+ CreateSubmissionEntity(
+ id = id,
+ submissionType = "online_text_entry",
+ userId = 1L,
+ canvasContext = CanvasContext.defaultCanvasContext(),
+ assignmentId = 1L
+ )
+ )
+ }
+}
\ No newline at end of file
diff --git a/apps/student/src/androidTest/java/com/instructure/student/db/CreatePendingSubmissionCommentDaoTest.kt b/apps/student/src/androidTest/java/com/instructure/student/db/CreatePendingSubmissionCommentDaoTest.kt
new file mode 100644
index 0000000000..ff7104a3c8
--- /dev/null
+++ b/apps/student/src/androidTest/java/com/instructure/student/db/CreatePendingSubmissionCommentDaoTest.kt
@@ -0,0 +1,207 @@
+/*
+ * Copyright (C) 2024 - present Instructure, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.instructure.student.db
+
+import androidx.room.Room
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.instructure.canvasapi2.models.CanvasContext
+import com.instructure.student.room.StudentDb
+import com.instructure.student.room.entities.CreatePendingSubmissionCommentEntity
+import com.instructure.student.room.entities.daos.CreatePendingSubmissionCommentDao
+import junit.framework.TestCase.assertEquals
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.runTest
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import java.util.Date
+
+@ExperimentalCoroutinesApi
+@RunWith(AndroidJUnit4::class)
+class CreatePendingSubmissionCommentDaoTest {
+
+ private lateinit var db: StudentDb
+ private lateinit var dao: CreatePendingSubmissionCommentDao
+
+ @Before
+ fun setup() {
+ db = Room.inMemoryDatabaseBuilder(
+ ApplicationProvider.getApplicationContext(),
+ StudentDb::class.java
+ ).build()
+ dao = db.pendingSubmissionCommentDao()
+ }
+
+ @After
+ fun teardown() {
+ db.close()
+ }
+
+ @Test
+ fun testFindAll() = runTest {
+ val comments = listOf(
+ CreatePendingSubmissionCommentEntity(
+ id = 1L,
+ accountDomain = "test",
+ canvasContext = CanvasContext.defaultCanvasContext(),
+ assignmentName = "test",
+ assignmentId = 1L,
+ lastActivityDate = Date(),
+ isGroupMessage = false
+ ),
+ CreatePendingSubmissionCommentEntity(
+ id = 2L,
+ accountDomain = "test",
+ canvasContext = CanvasContext.defaultCanvasContext(),
+ assignmentName = "test",
+ assignmentId = 2L,
+ lastActivityDate = Date(),
+ isGroupMessage = false
+ )
+ )
+
+ comments.forEach { dao.insert(it) }
+
+ val result = dao.findAll()
+ assertEquals(comments, result)
+ }
+
+ @Test
+ fun testFindCommentById() = runTest {
+ val comments = listOf(
+ CreatePendingSubmissionCommentEntity(
+ id = 1L,
+ accountDomain = "test",
+ canvasContext = CanvasContext.defaultCanvasContext(),
+ assignmentName = "test",
+ assignmentId = 1L,
+ lastActivityDate = Date(),
+ isGroupMessage = false
+ ),
+ CreatePendingSubmissionCommentEntity(
+ id = 2L,
+ accountDomain = "test",
+ canvasContext = CanvasContext.defaultCanvasContext(),
+ assignmentName = "test",
+ assignmentId = 2L,
+ lastActivityDate = Date(),
+ isGroupMessage = false
+ )
+ )
+
+ comments.forEach { dao.insert(it) }
+
+ val result = dao.findCommentById(1L)
+
+ assertEquals(comments[0], result)
+ }
+
+ @Test
+ fun testSetCommentError() = runTest {
+ val comment = CreatePendingSubmissionCommentEntity(
+ id = 1L,
+ accountDomain = "test",
+ canvasContext = CanvasContext.defaultCanvasContext(),
+ assignmentName = "test",
+ assignmentId = 1L,
+ lastActivityDate = Date(),
+ isGroupMessage = false
+ )
+
+ dao.insert(comment)
+
+ dao.setCommentError(true, 1L)
+
+ val result = dao.findCommentById(1L)
+
+ assertEquals(true, result?.errorFlag)
+ }
+
+ @Test
+ fun testUpdateCommentProgress() = runTest {
+ val comment = CreatePendingSubmissionCommentEntity(
+ id = 1L,
+ accountDomain = "test",
+ canvasContext = CanvasContext.defaultCanvasContext(),
+ assignmentName = "test",
+ assignmentId = 1L,
+ lastActivityDate = Date(),
+ isGroupMessage = false,
+ )
+
+ dao.insert(comment)
+
+ dao.updateCommentProgress(1L, 4L, 5L, 0.8)
+
+ val result = dao.findCommentById(1L)
+
+ assertEquals(0.8f, result?.progress)
+ assertEquals(4, result?.currentFile)
+ assertEquals(5, result?.fileCount)
+ }
+
+ @Test
+ fun testFindIdByRowId() = runTest {
+ val comment = CreatePendingSubmissionCommentEntity(
+ id = 1L,
+ accountDomain = "test",
+ canvasContext = CanvasContext.defaultCanvasContext(),
+ assignmentName = "test",
+ assignmentId = 1L,
+ lastActivityDate = Date(),
+ isGroupMessage = false,
+ )
+
+ val rowId = dao.insert(comment)
+
+ val result = dao.findIdByRowId(rowId)
+
+ assertEquals(1L, result)
+ }
+
+ @Test
+ fun testFindCommentsByAccountAndAssignmentId() = runTest {
+ val comments = listOf(
+ CreatePendingSubmissionCommentEntity(
+ id = 1L,
+ accountDomain = "test",
+ canvasContext = CanvasContext.defaultCanvasContext(),
+ assignmentName = "test",
+ assignmentId = 1L,
+ lastActivityDate = Date(),
+ isGroupMessage = false
+ ),
+ CreatePendingSubmissionCommentEntity(
+ id = 2L,
+ accountDomain = "test",
+ canvasContext = CanvasContext.defaultCanvasContext(),
+ assignmentName = "test",
+ assignmentId = 2L,
+ lastActivityDate = Date(),
+ isGroupMessage = false
+ )
+ )
+
+ comments.forEach { dao.insert(it) }
+
+ val result = dao.findCommentsByAccountAndAssignmentId("test", 1L)
+
+ assertEquals(1, result.size)
+ assertEquals(comments[0], result[0])
+ }
+}
\ No newline at end of file
diff --git a/apps/student/src/androidTest/java/com/instructure/student/db/CreateSubmissionCommentFileDaoTest.kt b/apps/student/src/androidTest/java/com/instructure/student/db/CreateSubmissionCommentFileDaoTest.kt
new file mode 100644
index 0000000000..8dc2b1afdd
--- /dev/null
+++ b/apps/student/src/androidTest/java/com/instructure/student/db/CreateSubmissionCommentFileDaoTest.kt
@@ -0,0 +1,196 @@
+/*
+ * Copyright (C) 2024 - present Instructure, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.instructure.student.db
+
+import android.database.sqlite.SQLiteConstraintException
+import androidx.room.Room
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.instructure.canvasapi2.models.CanvasContext
+import com.instructure.student.room.StudentDb
+import com.instructure.student.room.entities.CreatePendingSubmissionCommentEntity
+import com.instructure.student.room.entities.CreateSubmissionCommentFileEntity
+import com.instructure.student.room.entities.daos.CreatePendingSubmissionCommentDao
+import com.instructure.student.room.entities.daos.CreateSubmissionCommentFileDao
+import junit.framework.TestCase.assertEquals
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.runTest
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import java.util.Date
+
+@ExperimentalCoroutinesApi
+@RunWith(AndroidJUnit4::class)
+class CreateSubmissionCommentFileDaoTest {
+
+ private lateinit var db: StudentDb
+ private lateinit var dao: CreateSubmissionCommentFileDao
+ private lateinit var commentDao: CreatePendingSubmissionCommentDao
+
+ @Before
+ fun setup() {
+ db = Room.inMemoryDatabaseBuilder(
+ ApplicationProvider.getApplicationContext(),
+ StudentDb::class.java
+ ).build()
+ dao = db.submissionCommentFileDao()
+ commentDao = db.pendingSubmissionCommentDao()
+ }
+
+ @After
+ fun teardown() {
+ db.close()
+ }
+
+ @Test(expected = SQLiteConstraintException::class)
+ fun testSubmissionCommentForeignKey() = runTest {
+ val entity = CreateSubmissionCommentFileEntity(
+ pendingCommentId = 1,
+ attachmentId = 1,
+ name = "file",
+ size = 100,
+ contentType = "text/plain",
+ fullPath = "/path/to/file"
+ )
+
+ dao.insert(entity)
+ }
+
+ @Test
+ fun testFindFilesForPendingComment() = runTest {
+ val files = listOf(
+ CreateSubmissionCommentFileEntity(
+ id = 1L,
+ pendingCommentId = 1L,
+ attachmentId = 1,
+ name = "file1",
+ size = 100,
+ contentType = "text/plain",
+ fullPath = "/path/to/file1"
+ ),
+ CreateSubmissionCommentFileEntity(
+ id = 2L,
+ pendingCommentId = 1L,
+ attachmentId = 2,
+ name = "file2",
+ size = 200,
+ contentType = "text/plain",
+ fullPath = "/path/to/file2"
+ ),
+ CreateSubmissionCommentFileEntity(
+ id = 3L,
+ pendingCommentId = 2L,
+ attachmentId = 3,
+ name = "file3",
+ size = 300,
+ contentType = "text/plain",
+ fullPath = "/path/to/file3"
+ )
+ )
+
+ addPendingComment(1L)
+ addPendingComment(2L)
+
+ files.forEach { dao.insert(it) }
+
+ val result = dao.findFilesForPendingComment(1L)
+
+ assertEquals(2, result.size)
+ assertEquals(files.subList(0, 2), result)
+ }
+
+ @Test
+ fun testSetFileAttachmentId() = runTest {
+ val file = CreateSubmissionCommentFileEntity(
+ id = 1L,
+ pendingCommentId = 1L,
+ name = "file",
+ size = 100,
+ contentType = "text/plain",
+ fullPath = "/path/to/file"
+ )
+
+ addPendingComment(1L)
+
+ dao.insert(file)
+
+ dao.setFileAttachmentId(1L, 1L)
+
+ val result = dao.findFilesForPendingComment(1L)
+
+ assertEquals(1L, result[0].attachmentId)
+ }
+
+ @Test
+ fun testDeleteFilesForCommentId() = runTest {
+ val files = listOf(
+ CreateSubmissionCommentFileEntity(
+ id = 1L,
+ pendingCommentId = 1L,
+ attachmentId = 1,
+ name = "file1",
+ size = 100,
+ contentType = "text/plain",
+ fullPath = "/path/to/file1"
+ ),
+ CreateSubmissionCommentFileEntity(
+ id = 2L,
+ pendingCommentId = 1L,
+ attachmentId = 2,
+ name = "file2",
+ size = 200,
+ contentType = "text/plain",
+ fullPath = "/path/to/file2"
+ ),
+ CreateSubmissionCommentFileEntity(
+ id = 3L,
+ pendingCommentId = 2L,
+ attachmentId = 3,
+ name = "file3",
+ size = 300,
+ contentType = "text/plain",
+ fullPath = "/path/to/file3"
+ )
+ )
+
+ addPendingComment(1L)
+ addPendingComment(2L)
+
+ files.forEach { dao.insert(it) }
+
+ dao.deleteFilesForCommentId(1L)
+
+ val result = dao.findFilesForPendingComment(1L)
+
+ assertEquals(0, result.size)
+ }
+
+ private suspend fun addPendingComment(id: Long) {
+ commentDao.insert(
+ CreatePendingSubmissionCommentEntity(
+ id = id,
+ accountDomain = "domain",
+ canvasContext = CanvasContext.defaultCanvasContext(),
+ assignmentName = "assignment",
+ assignmentId = 1,
+ lastActivityDate = Date(),
+ isGroupMessage = false
+ )
+ )
+ }
+}
\ No newline at end of file
diff --git a/apps/student/src/androidTest/java/com/instructure/student/db/CreateSubmissionDaoTest.kt b/apps/student/src/androidTest/java/com/instructure/student/db/CreateSubmissionDaoTest.kt
new file mode 100644
index 0000000000..f6c44cdcae
--- /dev/null
+++ b/apps/student/src/androidTest/java/com/instructure/student/db/CreateSubmissionDaoTest.kt
@@ -0,0 +1,259 @@
+/*
+ * Copyright (C) 2024 - present Instructure, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.instructure.student.db
+
+import android.content.Context
+import android.database.sqlite.SQLiteConstraintException
+import androidx.room.Room
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.instructure.canvasapi2.models.CanvasContext
+import com.instructure.student.room.StudentDb
+import com.instructure.student.room.entities.CreateSubmissionEntity
+import com.instructure.student.room.entities.daos.CreateSubmissionDao
+import junit.framework.TestCase.assertEquals
+import junit.framework.TestCase.assertNull
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.runTest
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+
+
+@ExperimentalCoroutinesApi
+@RunWith(AndroidJUnit4::class)
+class CreateSubmissionDaoTest {
+
+ private lateinit var db: StudentDb
+ private lateinit var dao: CreateSubmissionDao
+
+ @Before
+ fun setup() {
+ val context = ApplicationProvider.getApplicationContext()
+ db = Room.inMemoryDatabaseBuilder(context, StudentDb::class.java).build()
+ dao = db.submissionDao()
+ }
+
+ @After
+ fun teardown() {
+ db.close()
+ }
+
+ @Test(expected = SQLiteConstraintException::class)
+ fun testInsertDuplicate() = runTest {
+ val entity = CreateSubmissionEntity(
+ id = 1,
+ assignmentId = 1,
+ userId = 1,
+ errorFlag = false,
+ submissionType = "online_text_entry",
+ canvasContext = CanvasContext.defaultCanvasContext(),
+ )
+
+ dao.insert(entity)
+ dao.insert(entity)
+ }
+
+ @Test
+ fun testFindSubmissionById() = runTest {
+ val entity = CreateSubmissionEntity(
+ id = 1,
+ assignmentId = 1,
+ userId = 1,
+ errorFlag = false,
+ submissionType = "online_text_entry",
+ canvasContext = CanvasContext.defaultCanvasContext(),
+ )
+
+ dao.insert(entity)
+
+ val result = dao.findSubmissionById(1)
+ assertEquals(entity, result)
+ }
+
+ @Test
+ fun testSetSubmissionError() = runTest {
+ val entity = CreateSubmissionEntity(
+ id = 1,
+ assignmentId = 1,
+ userId = 1,
+ errorFlag = false,
+ submissionType = "online_text_entry",
+ canvasContext = CanvasContext.defaultCanvasContext(),
+ )
+
+ dao.insert(entity)
+
+ dao.setSubmissionError(true, 1)
+
+ val result = dao.findSubmissionById(1)
+ assertEquals(true, result?.errorFlag)
+ }
+
+ @Test
+ fun testFindSubmissionsByAssignmentId() = runTest {
+ val entities = listOf(
+ CreateSubmissionEntity(
+ id = 1,
+ assignmentId = 1,
+ userId = 1,
+ errorFlag = false,
+ submissionType = "online_text_entry",
+ canvasContext = CanvasContext.defaultCanvasContext(),
+ ),
+ CreateSubmissionEntity(
+ id = 2,
+ assignmentId = 1,
+ userId = 1,
+ errorFlag = false,
+ submissionType = "online_text_entry",
+ canvasContext = CanvasContext.defaultCanvasContext(),
+ ),
+ CreateSubmissionEntity(
+ id = 3,
+ assignmentId = 2,
+ userId = 1,
+ errorFlag = false,
+ submissionType = "online_text_entry",
+ canvasContext = CanvasContext.defaultCanvasContext(),
+ )
+ )
+
+ entities.forEach { dao.insert(it) }
+
+ val result = dao.findSubmissionsByAssignmentId(1, 1)
+ assertEquals(entities.subList(0, 2), result)
+ }
+
+ @Test
+ fun testDeleteSubmissionsForAssignmentId() = runTest {
+ val entities = listOf(
+ CreateSubmissionEntity(
+ id = 1,
+ assignmentId = 1,
+ userId = 1,
+ errorFlag = false,
+ submissionType = "online_text_entry",
+ canvasContext = CanvasContext.defaultCanvasContext(),
+ ),
+ CreateSubmissionEntity(
+ id = 2,
+ assignmentId = 1,
+ userId = 1,
+ errorFlag = false,
+ submissionType = "online_text_entry",
+ canvasContext = CanvasContext.defaultCanvasContext(),
+ ),
+ CreateSubmissionEntity(
+ id = 3,
+ assignmentId = 2,
+ userId = 1,
+ errorFlag = false,
+ submissionType = "online_text_entry",
+ canvasContext = CanvasContext.defaultCanvasContext(),
+ )
+ )
+
+ entities.forEach { dao.insert(it) }
+
+ dao.deleteSubmissionsForAssignmentId(1L, 1L)
+
+ val result = dao.findSubmissionById(3L)
+ assertEquals(entities[2], result)
+ }
+
+ @Test
+ fun testUpdateProgress() = runTest {
+ val entity = CreateSubmissionEntity(
+ id = 1,
+ assignmentId = 1,
+ userId = 1,
+ errorFlag = false,
+ submissionType = "online_text_entry",
+ canvasContext = CanvasContext.defaultCanvasContext(),
+ )
+
+ dao.insert(entity)
+
+ dao.updateProgress(1, 1, 0.5, 1)
+
+ val result = dao.findSubmissionById(1)
+ assertEquals(1L, result?.currentFile)
+ assertEquals(1, result?.fileCount)
+ assertEquals(0.5f, result?.progress)
+ }
+
+ @Test
+ fun testFindSubmissionsByRowId() = runTest {
+ val entity = CreateSubmissionEntity(
+ id = 1,
+ assignmentId = 1,
+ userId = 1,
+ errorFlag = false,
+ submissionType = "online_text_entry",
+ canvasContext = CanvasContext.defaultCanvasContext(),
+ )
+
+ val rowId = dao.insert(entity)
+
+ val result = dao.findSubmissionByRowId(rowId)
+ assertEquals(entity, result)
+ }
+
+ @Test
+ fun testDeleteDraftById() = runTest {
+ val entities = listOf(
+ CreateSubmissionEntity(
+ id = 1,
+ assignmentId = 1,
+ userId = 1,
+ errorFlag = false,
+ submissionType = "online_text_entry",
+ canvasContext = CanvasContext.defaultCanvasContext(),
+ isDraft = true
+ ),
+ CreateSubmissionEntity(
+ id = 2,
+ assignmentId = 1,
+ userId = 1,
+ errorFlag = false,
+ submissionType = "online_text_entry",
+ canvasContext = CanvasContext.defaultCanvasContext(),
+ isDraft = false
+ ),
+ CreateSubmissionEntity(
+ id = 3,
+ assignmentId = 2,
+ userId = 1,
+ errorFlag = false,
+ submissionType = "online_text_entry",
+ canvasContext = CanvasContext.defaultCanvasContext(),
+ isDraft = true
+ )
+ )
+
+ entities.forEach { dao.insert(it) }
+
+ dao.deleteDraftById(1L, 1L)
+
+ val result = dao.findSubmissionById(1L)
+ assertNull(result)
+
+ val result2 = dao.findSubmissionById(3L)
+ assertEquals(entities[2], result2)
+ }
+}
\ No newline at end of file
diff --git a/apps/student/src/androidTest/java/com/instructure/student/espresso/StudentHiltTestApplication.kt b/apps/student/src/androidTest/java/com/instructure/student/espresso/StudentHiltTestApplication.kt
index 9792367f9b..72245df9ef 100644
--- a/apps/student/src/androidTest/java/com/instructure/student/espresso/StudentHiltTestApplication.kt
+++ b/apps/student/src/androidTest/java/com/instructure/student/espresso/StudentHiltTestApplication.kt
@@ -16,6 +16,7 @@
package com.instructure.student.espresso
+import com.instructure.canvas.espresso.TestAppManager
import dagger.hilt.android.testing.CustomTestApplication
@CustomTestApplication(TestAppManager::class)
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 29646fe3f9..84189f2ea9 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
@@ -24,7 +24,6 @@ import com.instructure.canvas.espresso.Priority
import com.instructure.canvas.espresso.TestCategory
import com.instructure.canvas.espresso.TestMetaData
import com.instructure.canvas.espresso.refresh
-import com.instructure.canvasapi2.models.DiscussionEntry
import com.instructure.dataseeding.api.DiscussionTopicsApi
import com.instructure.student.ui.utils.StudentTest
import com.instructure.student.ui.utils.seedData
@@ -49,48 +48,52 @@ class AnnouncementsE2ETest : StudentTest() {
val student = data.studentsList[0]
val teacher = data.teachersList[0]
val course = data.coursesList[0]
+ val replyMessage = "Reply text"
+
+ Log.d(PREPARATION_TAG, "Seed an announcement for '${course.name}' course and a (message) entry for this announcement with the '$replyMessage' as a student.")
val announcement = data.announcementsList[0]
+ DiscussionTopicsApi.createEntryToDiscussionTopic(student.token, course.id, announcement.id, replyMessage)
+ Log.d(PREPARATION_TAG, "Seed another announcement for '${course.name}' which is locked so replies not allowed for it.")
val lockedAnnouncement = DiscussionTopicsApi.createAnnouncement(course.id, teacher.token, locked = true)
- Log.d(STEP_TAG,"Login with user: ${student.name}, login id: ${student.loginId}.")
+ Log.d(STEP_TAG,"Login with user: '${student.name}', login id: '${student.loginId}'.")
tokenLogin(student)
dashboardPage.waitForRender()
- Log.d(STEP_TAG,"Navigate to ${course.name} course's announcements page.")
+ Log.d(STEP_TAG,"Navigate to '${course.name}' course's announcements page.")
dashboardPage.assertDisplaysCourse(course)
dashboardPage.selectCourse(course)
courseBrowserPage.selectAnnouncements()
- Log.d(STEP_TAG,"Assert that ${announcement.title} announcement is displayed.")
+ Log.d(STEP_TAG,"Assert that '${announcement.title}' announcement is displayed.")
announcementListPage.assertTopicDisplayed(announcement.title)
- Log.d(STEP_TAG, "Assert that ${lockedAnnouncement.title} announcement is really locked so that the 'locked' icon is displayed.")
+ Log.d(STEP_TAG, "Assert that '${lockedAnnouncement.title}' announcement is really locked so that the 'locked' icon is displayed.")
announcementListPage.assertAnnouncementLocked(lockedAnnouncement.title)
- Log.d(STEP_TAG, "Select ${lockedAnnouncement.title} announcement and assert if we are landing on the Discussion Details Page.")
+ Log.d(STEP_TAG, "Select '${lockedAnnouncement.title}' announcement.")
announcementListPage.selectTopic(lockedAnnouncement.title)
- discussionDetailsPage.assertTitleText(lockedAnnouncement.title)
+
+ Log.d(STEP_TAG, "Assert that the '${lockedAnnouncement.title}' announcement's title is displayed on the toolbar.")
+ discussionDetailsPage.assertToolbarDiscussionTitle(lockedAnnouncement.title)
Log.d(STEP_TAG, "Assert that the 'Reply' button is not available on a locked announcement. Navigate back to Announcement List Page.")
discussionDetailsPage.assertReplyButtonNotDisplayed()
Espresso.pressBack()
- Log.d(STEP_TAG,"Select ${announcement.title} announcement and assert if we are landing on the Discussion Details Page.")
+ Log.d(STEP_TAG,"Select '${announcement.title}' announcement.")
announcementListPage.selectTopic(announcement.title)
- discussionDetailsPage.assertTitleText(announcement.title)
- val replyMessage = "Reply text"
- Log.d(STEP_TAG,"Send a reply to the selected announcement with message: $replyMessage.")
- discussionDetailsPage.sendReply(replyMessage)
- discussionDetailsPage.assertPageObjects()
+ Log.d(STEP_TAG, "Assert that the '${announcement.title}' announcement's title is displayed on the toolbar and the 'Reply' button is displayed as this announcement is not locked.")
+ discussionDetailsPage.assertToolbarDiscussionTitle(announcement.title)
+ discussionDetailsPage.waitForReplyButton()
+ discussionDetailsPage.assertReplyButtonDisplayed()
- Log.d(STEP_TAG,"Assert that the previously sent reply has been displayed.")
- val announcementReply = DiscussionEntry(message = replyMessage)
- discussionDetailsPage.assertIfThereIsAReply()
- discussionDetailsPage.assertReplyDisplayed(announcementReply)
+ Log.d(STEP_TAG,"Assert the the previously seeded reply, '$replyMessage', is displayed on the (online) details page.")
+ discussionDetailsPage.assertEntryDisplayed(replyMessage)
- Log.d(STEP_TAG,"Click on Search button and type ${announcement.title} to the search input field.")
+ Log.d(STEP_TAG,"Click on Search button and type '${announcement.title}' to the search input field.")
Espresso.pressBack()
announcementListPage.searchable.clickOnSearchButton()
announcementListPage.searchable.typeToSearchBar(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 c61b83cc1e..aa4ad7278a 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
@@ -39,6 +39,7 @@ import com.instructure.dataseeding.util.ago
import com.instructure.dataseeding.util.days
import com.instructure.dataseeding.util.fromNow
import com.instructure.dataseeding.util.iso8601
+import com.instructure.espresso.retryWithIncreasingDelay
import com.instructure.student.R
import com.instructure.student.ui.pages.AssignmentListPage
import com.instructure.student.ui.utils.StudentTest
@@ -785,8 +786,10 @@ class AssignmentsE2ETest: StudentTest() {
CoursesApi.updateCourseSettings(course.id, restrictQuantitativeDataMap)
Log.d(STEP_TAG, "Refresh the Dashboard page. Assert that the course grade is B-, as it is converted to letter grade because of the restriction.")
- dashboardPage.refresh()
- dashboardPage.assertCourseGrade(course.name, "B-")
+ retryWithIncreasingDelay(times = 10, maxDelay = 4000) {
+ dashboardPage.refresh()
+ dashboardPage.assertCourseGrade(course.name, "B-")
+ }
Log.d(PREPARATION_TAG,"Seeding 'Text Entry' assignment for ${course.name} course.")
val percentageAssignment = AssignmentsApi.createAssignment(course.id, teacher.token, gradingType = GradingType.PERCENT, pointsPossible = 15.0, dueAt = 1.days.fromNow.iso8601, submissionTypes = listOf(SubmissionType.ONLINE_TEXT_ENTRY))
@@ -937,8 +940,10 @@ class AssignmentsE2ETest: StudentTest() {
CoursesApi.updateCourseSettings(course.id, restrictQuantitativeDataMap)
Log.d(STEP_TAG, "Refresh the Dashboard page. Assert that the course grade is B-, as it is converted to letter grade because of the restriction.")
- dashboardPage.refresh()
- dashboardPage.assertCourseGrade(course.name, "B-")
+ retryWithIncreasingDelay(times = 10, maxDelay = 4000) {
+ dashboardPage.refresh()
+ dashboardPage.assertCourseGrade(course.name, "B-")
+ }
Log.d(PREPARATION_TAG, "Seeding 'Text Entry' assignment for '${course.name}' course.")
val percentageAssignment = AssignmentsApi.createAssignment(course.id, teacher.token, gradingType = GradingType.PERCENT, pointsPossible = 15.0, dueAt = 1.days.fromNow.iso8601, submissionTypes = listOf(SubmissionType.ONLINE_TEXT_ENTRY))
diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/ConferencesE2ETest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/ConferencesE2ETest.kt
index b79cfa0ae7..bf905483ca 100644
--- a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/ConferencesE2ETest.kt
+++ b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/ConferencesE2ETest.kt
@@ -20,14 +20,6 @@ class ConferencesE2ETest: StudentTest() {
override fun enableAndConfigureAccessibilityChecks() = Unit
- // Fairly basic test that we can create and view a conference with the app.
- // I didn't attempt to actually start the conference because that goes through
- // an external web browser and would be really gross (if not impossible) to
- // test.
- //
- // Re-stubbing for now because the interface has changed from webview to native
- // and this test no longer passes. MBL-14127 is being tracked to re-write this
- // test against the new native interface.
@E2E
@Test
@TestMetaData(Priority.MANDATORY, FeatureCategory.CONFERENCES, TestCategory.E2E)
@@ -39,15 +31,15 @@ class ConferencesE2ETest: StudentTest() {
val teacher = data.teachersList[0]
val course = data.coursesList[0]
- Log.d(STEP_TAG,"Login with user: ${student.name}, login id: ${student.loginId}.")
+ Log.d(STEP_TAG, "Login with user: ${student.name}, login id: ${student.loginId}.")
tokenLogin(student)
dashboardPage.waitForRender()
- Log.d(STEP_TAG,"Navigate to ${course.name} course's Conferences Page.")
+ Log.d(STEP_TAG, "Navigate to ${course.name} course's Conferences Page.")
dashboardPage.selectCourse(course)
courseBrowserPage.selectConferences()
- Log.d(STEP_TAG,"Assert that the empty view is displayed since we did not make any conference yet.")
+ Log.d(STEP_TAG, "Assert that the empty view is displayed since we did not make any conference yet.")
conferenceListPage.assertEmptyView()
val testConferenceTitle = "E2E test conference"
@@ -57,24 +49,40 @@ class ConferencesE2ETest: StudentTest() {
val testConferenceTitle2 = "E2E test conference 2"
val testConferenceDescription2 = "Nightly E2E Test conference description 2"
+ Log.d(PREPARATION_TAG,"Create a conference with '$testConferenceTitle2' title and '$testConferenceDescription2' description.")
ConferencesApi.createCourseConference(course.id, teacher.token, testConferenceTitle2, testConferenceDescription2, longRunning = true, duration = 120, recipientUserIds = listOf(student.id))
- Log.d(STEP_TAG,"Refresh the page. Assert that $testConferenceTitle conference is displayed on the Conference List Page with the corresponding status.")
+ Log.d(STEP_TAG, "Refresh the page. Assert that '$testConferenceTitle' conference is displayed on the Conference List Page with the corresponding status and description.")
refresh()
conferenceListPage.assertConferenceDisplayed(testConferenceTitle)
conferenceListPage.assertConferenceStatus(testConferenceTitle,"Not Started")
+ conferenceListPage.assertConferenceDescription(testConferenceTitle, testConferenceDescription)
- Log.d(STEP_TAG,"Assert that $testConferenceTitle2 conference is displayed on the Conference List Page with the corresponding status.")
+ Log.d(STEP_TAG, "Assert that the toolbar title is 'Conferences' and there is the '${course.name}' course's name displayed as a subtitle.")
+ conferenceListPage.assertConferencesToolbarText(course.name)
+
+ Log.d(STEP_TAG, "Assert that the 'New Conferences' text is displayed as a conference group type on the Conferences List Page.")
+ conferenceListPage.assertNewConferencesDisplayed()
+
+ Log.d(STEP_TAG, "Assert that the 'Open Externally' icon (button) is displayed on the top-right corner of the Conferences List Page.")
+ conferenceListPage.assertOpenExternallyButtonDisplayed()
+
+ Log.d(STEP_TAG, "Assert that '$testConferenceTitle2' conference is displayed on the Conference List Page with the corresponding status and description.")
conferenceListPage.assertConferenceDisplayed(testConferenceTitle2)
conferenceListPage.assertConferenceStatus(testConferenceTitle2,"Not Started")
+ conferenceListPage.assertConferenceDescription(testConferenceTitle2, testConferenceDescription2)
- Log.d(STEP_TAG,"Open '$testConferenceTitle' conference details page.")
+ Log.d(STEP_TAG, "Open '$testConferenceTitle' conference's detailer page.")
conferenceListPage.openConferenceDetails(testConferenceTitle)
- Log.d(STEP_TAG,"Assert that the proper conference title '$testConferenceTitle', status and description '$testConferenceDescription' are displayed.")
- conferenceDetailsPage.assertConferenceTitleDisplayed()
+ Log.d(STEP_TAG, "Assert that the toolbar title is 'Conference Details' and there is the '${course.name}' course's name displayed as a subtitle.")
+ conferenceDetailsPage.assertConferenceDetailsToolbarText(course.name)
+
+ Log.d(STEP_TAG, "Assert that the proper conference title '$testConferenceTitle', status ('Not Started') and description, '$testConferenceDescription' are displayed.")
+ conferenceDetailsPage.assertConferenceTitleDisplayed(testConferenceTitle)
conferenceDetailsPage.assertConferenceStatus("Not Started")
conferenceDetailsPage.assertDescription(testConferenceDescription)
}
+
}
\ No newline at end of file
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 cd1c0ae152..90febc40bd 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
@@ -80,7 +80,7 @@ class DiscussionsE2ETest: StudentTest() {
Log.d(STEP_TAG,"Select '${announcement.title}' announcement and assert if the Discussion Details Page is displayed.")
discussionListPage.selectTopic(announcement.title)
- discussionDetailsPage.assertTitleText(announcement.title)
+ discussionDetailsPage.assertToolbarDiscussionTitle(announcement.title)
Log.d(STEP_TAG,"Navigate back to the Discussion List Page.")
Espresso.pressBack()
@@ -108,8 +108,7 @@ class DiscussionsE2ETest: StudentTest() {
Log.d(STEP_TAG,"Select '${topic1.title}' discussion and assert if the details page is displayed and there is no reply for the discussion yet.")
discussionListPage.assertTopicDisplayed(topic1.title)
discussionListPage.selectTopic(topic1.title)
- discussionDetailsPage.assertTitleText(topic1.title)
- discussionDetailsPage.assertNoRepliesDisplayed()
+ discussionDetailsPage.assertToolbarDiscussionTitle(topic1.title)
Log.d(STEP_TAG,"Navigate back to Discussion List Page.")
Espresso.pressBack()
@@ -117,8 +116,7 @@ class DiscussionsE2ETest: StudentTest() {
Log.d(STEP_TAG,"Select '${topic1.title}' discussion and assert if the details page is displayed and there is no reply for the discussion yet.")
discussionListPage.assertTopicDisplayed(topic2.title)
discussionListPage.selectTopic(topic2.title)
- discussionDetailsPage.assertTitleText(topic2.title)
- discussionDetailsPage.assertNoRepliesDisplayed()
+ discussionDetailsPage.assertToolbarDiscussionTitle(topic2.title)
Log.d(STEP_TAG,"Navigate back to Discussion List Page.")
Espresso.pressBack()
@@ -133,29 +131,29 @@ class DiscussionsE2ETest: StudentTest() {
discussionListPage.assertTopicDisplayed(newTopicName)
discussionListPage.assertReplyCount(newTopicName, 0)
- Log.d(STEP_TAG,"Select '$newTopicName' topic and assert that there is no reply on the details page as well.")
- discussionListPage.selectTopic(newTopicName)
- discussionDetailsPage.assertNoRepliesDisplayed()
-
val replyMessage = "My reply"
- Log.d(STEP_TAG,"Send a reply with text: '$replyMessage'.")
- discussionDetailsPage.sendReply(replyMessage)
- sleep(2000) // Allow some time for reply to propagate
+ Log.d(PREPARATION_TAG, "Seed a discussion topic (message) entry for the '${topic1.title}' discussion with the '$replyMessage' message as a student.")
+ DiscussionTopicsApi.createEntryToDiscussionTopic(student.token, course.id, topic1.id, replyMessage)
+ sleep(2000) // Allow some time for entry creation to propagate
+
+ Log.d(STEP_TAG,"Select '${topic1.title}' topic.")
+ discussionListPage.selectTopic(topic1.title)
- Log.d(STEP_TAG,"Assert the the previously sent reply ($replyMessage) is displayed on the details page.")
- discussionDetailsPage.assertRepliesDisplayed()
+ Log.d(STEP_TAG,"Assert the the previously sent entry message, '$replyMessage')' is displayed on the details (web view) page.")
+ discussionDetailsPage.waitForEntryDisplayed(replyMessage)
+ discussionDetailsPage.assertEntryDisplayed(replyMessage)
Log.d(STEP_TAG,"Navigate back to Discussion List Page.")
Espresso.pressBack()
Log.d(STEP_TAG,"Refresh the page. Assert that the previously sent reply has been counted, and there are no unread replies.")
discussionListPage.pullToUpdate()
- discussionListPage.assertReplyCount(newTopicName, 1)
- discussionListPage.assertUnreadReplyCount(newTopicName, 0)
+ discussionListPage.assertReplyCount(topic1.title, 1)
+ discussionListPage.assertUnreadReplyCount(topic1.title, 0)
Log.d(STEP_TAG, "Assert that the due date is the current date (in the expected format).")
val currentDate = getDateInCanvasFormat()
- discussionListPage.assertDueDate(newTopicName, currentDate)
+ discussionListPage.assertDueDate(topic1.title, currentDate)
}
}
\ No newline at end of file
diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/InboxE2ETest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/InboxE2ETest.kt
index 7ee14b2b5e..021257449e 100644
--- a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/InboxE2ETest.kt
+++ b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/InboxE2ETest.kt
@@ -76,10 +76,10 @@ class InboxE2ETest: StudentTest() {
Log.d(STEP_TAG,"Refresh the page. Assert that there is a conversation and it is the previously seeded one.")
refresh()
inboxPage.assertHasConversation()
- inboxPage.assertConversationDisplayed(seededConversation)
+ inboxPage.assertConversationDisplayed(seededConversation.subject)
Log.d(STEP_TAG,"Select '${seededConversation.subject}' conversation. Assert that is has not been starred already.")
- inboxPage.openConversation(seededConversation)
+ inboxPage.openConversation(seededConversation.subject)
inboxConversationPage.assertNotStarred()
Log.d(STEP_TAG,"Toggle Starred to mark '${seededConversation.subject}' conversation as favourite. Assert that it has became starred.")
@@ -92,29 +92,64 @@ class InboxE2ETest: StudentTest() {
Log.d(STEP_TAG,"Select '${seededConversation.subject}' conversation. Mark as Unread by clicking on the 'More Options' menu, 'Mark as Unread' menu point.")
inboxPage.assertUnreadMarkerVisibility(seededConversation.subject, ViewMatchers.Visibility.GONE)
- inboxPage.openConversation(seededConversation)
+ inboxPage.openConversation(seededConversation.subject)
inboxConversationPage.markUnread() //After select 'Mark as Unread', we will be navigated back to Inbox Page
Log.d(STEP_TAG,"Assert that '${seededConversation.subject}' conversation has been marked as unread.")
inboxPage.assertUnreadMarkerVisibility(seededConversation.subject, ViewMatchers.Visibility.VISIBLE)
Log.d(STEP_TAG,"Select '${seededConversation.subject}' conversation. Archive it by clicking on the 'More Options' menu, 'Archive' menu point.")
- inboxPage.openConversation(seededConversation)
+ inboxPage.openConversation(seededConversation.subject)
inboxConversationPage.archive() //After select 'Archive', we will be navigated back to Inbox Page
- Log.d(STEP_TAG,"Assert that '${seededConversation.subject}' conversation has removed from 'All' tab.") //TODO: Discuss this logic if it's ok if we don't show Archived messages on 'All' tab...
- inboxPage.assertConversationNotDisplayed(seededConversation)
+ Log.d(STEP_TAG,"Assert that '${seededConversation.subject}' conversation has removed from 'Inbox' tab.")
+ inboxPage.assertConversationNotDisplayed(seededConversation.subject)
Log.d(STEP_TAG,"Select 'Archived' conversation filter.")
inboxPage.filterInbox("Archived")
Log.d(STEP_TAG,"Assert that '${seededConversation.subject}' conversation is displayed by the 'Archived' filter.")
- inboxPage.assertConversationDisplayed(seededConversation)
+ inboxPage.assertConversationDisplayed(seededConversation.subject)
Log.d(STEP_TAG, "Select '${seededConversation.subject}' conversation. Assert that the selected number of conversations on the toolbar is 1." +
"Unarchive it, and assert that it is not displayed in the 'ARCHIVED' scope any more.")
- inboxPage.selectConversation(seededConversation)
+ inboxPage.selectConversation(seededConversation.subject)
inboxPage.assertSelectedConversationNumber("1")
+
+ Log.d(STEP_TAG, "Click on the 'Mark as Unread' button and assert that the empty view will be displayed and the '${seededConversation.subject}' conversation is not because it should disappear from 'Archived' list.")
+ inboxPage.clickMarkAsUnread()
+ inboxPage.assertInboxEmpty()
+ inboxPage.assertConversationNotDisplayed(seededConversation.subject)
+
+ Log.d(STEP_TAG,"Select 'Unread' conversation filter.")
+ inboxPage.filterInbox("Unread")
+
+ Log.d(STEP_TAG,"Assert that '${seededConversation.subject}' conversation is displayed on the 'Inbox' tab.")
+ inboxPage.assertConversationDisplayed(seededConversation.subject)
+
+ Log.d(STEP_TAG,"Assert that '${seededConversation.subject}' conversation has been marked as unread.")
+ inboxPage.assertUnreadMarkerVisibility(seededConversation.subject, ViewMatchers.Visibility.VISIBLE)
+
+ Log.d(STEP_TAG,"Select '${seededConversation.subject}' conversation. Archive it by clicking on the 'More Options' menu, 'Archive' menu point.")
+ inboxPage.openConversation(seededConversation.subject)
+ inboxConversationPage.archive() //After select 'Archive', we will be navigated back to Inbox Page
+
+ Log.d(STEP_TAG,"Assert that '${seededConversation.subject}' conversation has removed from 'Inbox' tab.")
+ inboxPage.assertConversationNotDisplayed(seededConversation.subject)
+
+ Log.d(STEP_TAG,"Select 'Archived' conversation filter.")
+ inboxPage.filterInbox("Archived")
+
+ Log.d(STEP_TAG,"Assert that '${seededConversation.subject}' conversation is displayed by the 'Archived' filter.")
+ inboxPage.assertConversationDisplayed(seededConversation.subject)
+
+ Log.d(STEP_TAG,"Assert that '${seededConversation.subject}' conversation does not have the unread mark because an archived conversation cannot be unread.")
+ inboxPage.assertUnreadMarkerVisibility(seededConversation.subject, ViewMatchers.Visibility.GONE)
+
+ Log.d(STEP_TAG,"Select '${seededConversation.subject}' conversation.")
+ inboxPage.selectConversation(seededConversation.subject)
+
+ Log.d(STEP_TAG, "Click on the 'Unarchive' button and assert that the empty view will be displayed and the '${seededConversation.subject}' conversation is not because it should disappear from 'Archived' list.")
inboxPage.clickUnArchive()
inboxPage.assertInboxEmpty()
inboxPage.assertConversationNotDisplayed(seededConversation.subject)
@@ -156,6 +191,7 @@ class InboxE2ETest: StudentTest() {
Log.d(STEP_TAG,"Navigate to 'INBOX' scope and assert that '${seededConversation.subject}' conversation is NOT displayed because it is archived yet.")
inboxPage.filterInbox("Inbox")
+ sleep(2000)
inboxPage.assertConversationNotDisplayed(seededConversation.subject)
Log.d(STEP_TAG, "Navigate to 'ARCHIVED' scope and Select the conversation. Star it, and assert that it has displayed in the 'STARRED' scope.")
@@ -216,7 +252,7 @@ class InboxE2ETest: StudentTest() {
Log.d(STEP_TAG,"Refresh the page. Assert that there is a conversation and it is the previously seeded one.")
refresh()
inboxPage.assertHasConversation()
- inboxPage.assertConversationDisplayed(seededConversation)
+ inboxPage.assertConversationDisplayed(seededConversation.subject)
Log.d(STEP_TAG,"Click on 'New Message' button.")
inboxPage.pressNewMessageButton()
@@ -243,7 +279,7 @@ class InboxE2ETest: StudentTest() {
sleep(2000) // Allow time for messages to propagate
Log.d(STEP_TAG,"Navigate back to Dashboard Page.")
- inboxPage.goToDashboard()
+ dashboardPage.goToDashboard()
dashboardPage.waitForRender()
Log.d(STEP_TAG,"Log out with '${student1.name}' student.")
@@ -255,7 +291,7 @@ class InboxE2ETest: StudentTest() {
Log.d(STEP_TAG,"Open Inbox Page. Assert that both, the previously seeded 'normal' conversation and the group conversation are displayed.")
dashboardPage.clickInboxTab()
- inboxPage.assertConversationDisplayed(seededConversation)
+ inboxPage.assertConversationDisplayed(seededConversation.subject)
inboxPage.assertConversationDisplayed(newMessageSubject)
inboxPage.assertConversationDisplayed("Group Message")
@@ -272,7 +308,7 @@ class InboxE2ETest: StudentTest() {
Log.d(STEP_TAG,"Delete the whole '$newGroupMessageSubject' subject and assert that it has been removed from the conversation list on the Inbox Page.")
inboxConversationPage.deleteConversation() //After deletion we will be navigated back to Inbox Page
inboxPage.assertConversationNotDisplayed(newMessageSubject)
- inboxPage.assertConversationDisplayed(seededConversation)
+ inboxPage.assertConversationDisplayed(seededConversation.subject)
inboxPage.assertConversationDisplayed("Group Message")
Log.d(STEP_TAG, "Navigate to 'INBOX' scope and select '$newGroupMessageSubject' conversation.")
@@ -320,19 +356,19 @@ class InboxE2ETest: StudentTest() {
Log.d(STEP_TAG,"Refresh the page. Assert that there is a conversation and it is the previously seeded one.")
refresh()
inboxPage.assertHasConversation()
- inboxPage.assertConversationDisplayed(seededConversation)
+ inboxPage.assertConversationDisplayed(seededConversation.subject)
Log.d(STEP_TAG, "Select '${seededConversation.subject}' conversation and swipe it right to make it read. Assert that the conversation became read.")
inboxPage.selectConversation(seededConversation.subject)
- inboxPage.swipeConversationRight(seededConversation)
+ inboxPage.swipeConversationRight(seededConversation.subject)
inboxPage.assertUnreadMarkerVisibility(seededConversation.subject, ViewMatchers.Visibility.GONE)
Log.d(STEP_TAG, "Select '${seededConversation.subject}' conversation and swipe it right again to make it unread. Assert that the conversation became unread.")
- inboxPage.swipeConversationRight(seededConversation)
+ inboxPage.swipeConversationRight(seededConversation.subject)
inboxPage.assertUnreadMarkerVisibility(seededConversation.subject, ViewMatchers.Visibility.VISIBLE)
Log.d(STEP_TAG, "Swipe '${seededConversation.subject}' left and assert it is removed from the 'INBOX' scope because it has became archived.")
- inboxPage.swipeConversationLeft(seededConversation)
+ inboxPage.swipeConversationLeft(seededConversation.subject)
inboxPage.assertConversationNotDisplayed(seededConversation.subject)
Log.d(STEP_TAG, "Navigate to 'ARCHIVED' scope. Assert that the '${seededConversation.subject}' conversation is displayed in the 'ARCHIVED' scope.")
@@ -340,7 +376,7 @@ class InboxE2ETest: StudentTest() {
inboxPage.assertConversationDisplayed(seededConversation.subject)
Log.d(STEP_TAG, "Swipe '${seededConversation.subject}' left and assert it is removed from the 'ARCHIVED' scope because it has became unarchived.")
- inboxPage.swipeConversationLeft(seededConversation)
+ inboxPage.swipeConversationLeft(seededConversation.subject)
inboxPage.assertConversationNotDisplayed(seededConversation.subject)
Log.d(STEP_TAG, "Navigate to 'INBOX' scope. Assert that the '${seededConversation.subject}' conversation is displayed in the 'INBOX' scope.")
@@ -362,7 +398,7 @@ class InboxE2ETest: StudentTest() {
}
Log.d(STEP_TAG, "Swipe '${seededConversation.subject}' left and assert it is removed from the 'STARRED' scope because it has became unstarred.")
- inboxPage.swipeConversationLeft(seededConversation)
+ inboxPage.swipeConversationLeft(seededConversation.subject)
inboxPage.assertConversationNotDisplayed(seededConversation.subject)
Log.d(STEP_TAG, "Navigate to 'UNREAD' scope. Assert that the conversation is displayed in the 'Unread' scope.")
diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/LoginE2ETest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/LoginE2ETest.kt
index 12526c1bac..93ac0030eb 100644
--- a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/LoginE2ETest.kt
+++ b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/LoginE2ETest.kt
@@ -211,7 +211,7 @@ class LoginE2ETest : StudentTest() {
val INVALID_USERNAME = "invalidusercred@test.com"
val INVALID_PASSWORD = "invalidpw"
- val INVALID_CREDENTIALS_ERROR_MESSAGE = "Invalid username or password. Trouble logging in?"
+ val INVALID_CREDENTIALS_ERROR_MESSAGE = "Please verify your username or password and try again. Trouble logging in? Check out our Login FAQs."
val NO_PASSWORD_GIVEN_ERROR_MESSAGE = "No password was given"
val DOMAIN = "mobileqa.beta"
diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/ModulesE2ETest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/ModulesE2ETest.kt
index ad88ae8ba2..08ef0e00c8 100644
--- a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/ModulesE2ETest.kt
+++ b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/ModulesE2ETest.kt
@@ -95,7 +95,7 @@ class ModulesE2ETest: StudentTest() {
Log.d(PREPARATION_TAG,"Associate '${quiz1.title}' page with '${module2.name}' module.")
ModulesApi.createModuleItem(course.id, teacher.token, module2.id, page1.title, ModuleItemTypes.PAGE.stringVal, pageUrl = page1.url)
- Log.d(STEP_TAG, "Login with user: ${teacher.name}, login id: ${teacher.loginId}.")
+ Log.d(STEP_TAG, "Login with user: '${student.name}', login id: '${student.loginId}'.")
tokenLogin(student)
dashboardPage.waitForRender()
@@ -186,7 +186,7 @@ class ModulesE2ETest: StudentTest() {
Log.d(STEP_TAG, "Click on the next arrow button and assert that the '${discussionTopic1.title}' discussion topic module item's details page is displayed.")
assignmentDetailsPage.moduleItemInteractions.clickOnNextArrow()
- discussionDetailsPage.assertTitleText(discussionTopic1.title)
+ discussionDetailsPage.assertModulesToolbarDiscussionTitle(discussionTopic1.title)
Log.d(STEP_TAG, "Assert that the second module name, '${module2.name}' is displayed at the bottom.")
discussionDetailsPage.moduleItemInteractions.assertModuleNameDisplayed(module2.name)
diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/SettingsE2ETest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/SettingsE2ETest.kt
index ca431ea2ab..b6c2bd8da2 100644
--- a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/SettingsE2ETest.kt
+++ b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/SettingsE2ETest.kt
@@ -28,7 +28,11 @@ import com.instructure.canvas.espresso.TestCategory
import com.instructure.canvas.espresso.TestMetaData
import com.instructure.canvasapi2.utils.RemoteConfigParam
import com.instructure.canvasapi2.utils.RemoteConfigUtils
+import com.instructure.dataseeding.api.ConversationsApi
+import com.instructure.dataseeding.api.CoursesApi
+import com.instructure.dataseeding.api.EnrollmentsApi
import com.instructure.espresso.ViewUtils
+import com.instructure.student.BuildConfig
import com.instructure.student.R
import com.instructure.student.ui.utils.IntentActionMatcher
import com.instructure.student.ui.utils.StudentTest
@@ -294,4 +298,69 @@ class SettingsE2ETest : StudentTest() {
Log.d(PREPARATION_TAG, "Release Intents.")
Intents.release()
}
+
+ @E2E
+ @Test
+ @TestMetaData(Priority.MANDATORY, FeatureCategory.SETTINGS, TestCategory.E2E)
+ fun testPronounsE2E() {
+
+ Log.d(PREPARATION_TAG, "Seeding data.")
+ val data = seedData(courses = 1, teachers = 1)
+ val course = data.coursesList[0]
+ val teacher = data.teachersList[0]
+
+ Log.d(STEP_TAG, "Click 'Find My School' button.")
+ loginLandingPage.clickFindMySchoolButton()
+
+ Log.d(STEP_TAG,"Enter domain: 'mobileqa.beta.instructure.com'.")
+ loginFindSchoolPage.enterDomain("mobileqa.beta.instructure.com")
+
+ Log.d(PREPARATION_TAG,"Enroll '${BuildConfig.PRONOUN_STUDENT_TEST_USER}' student to '${course.name}' course.")
+ val pronounStudentId: Long = 12594913
+ EnrollmentsApi.enrollUserAsStudent(course.id, pronounStudentId)
+
+ Log.d(STEP_TAG,"Click on 'Next' button on the Toolbar.")
+ loginFindSchoolPage.clickToolbarNextMenuItem()
+
+ Log.d(STEP_TAG, "Log in with the dedicated student for testing the pronouns.")
+ loginSignInPage.loginAs(BuildConfig.PRONOUN_STUDENT_TEST_USER, BuildConfig.PRONOUN_STUDENT_TEST_PASSWORD)
+ dashboardPage.waitForRender()
+
+ Log.d(PREPARATION_TAG,"Seed an email from the '${teacher.name}' teacher to Pronoun Student.")
+ ConversationsApi.createConversation(teacher.token, listOf(pronounStudentId.toString()))[0]
+
+ Log.d(STEP_TAG, "Open the Left Side Menu.")
+ dashboardPage.openLeftSideMenu()
+
+ val testPronoun = "(She/Her)"
+ Log.d(STEP_TAG, "Assert that the corresponding user info, so does the 'Pronoun Student (She/Her)' as username and 'pronounstudent@gmail.com' as user email are displayed.")
+ leftSideNavigationDrawerPage.assertUserInfo("Pronoun Student $testPronoun", "pronounstudent@gmail.com")
+ Espresso.pressBack()
+
+ Log.d(STEP_TAG, "Select '${course.name}' course and open 'People' tab.")
+ dashboardPage.selectCourse(course)
+ courseBrowserPage.selectPeople()
+ peopleListPage.assertPageObjects()
+
+ Log.d(STEP_TAG, "Assert that the '$testPronoun' pronouns are displayed next to the 'Pronoun Student' user's name.")
+ peopleListPage.assertPersonPronouns("Pronoun Student", testPronoun)
+
+ Log.d(STEP_TAG, "Click on the 'Pronoun Student' user.")
+ peopleListPage.selectPerson("Pronoun Student $testPronoun")
+
+ Log.d(STEP_TAG, "Assert that the Person Context Page also displays the '$testPronoun' pronouns besides all the corresponding information about the user.")
+ personDetailsPage.assertIsPerson("Pronoun Student $testPronoun")
+
+ CoursesApi.concludeCourse(course.id) // Need to conclude the course because otherwise there would be too much course with time on the dedicated user's dashboard.
+
+ Log.d(STEP_TAG, "Navigate back to Dashboard.")
+ ViewUtils.pressBackButton(3)
+
+ Log.d(STEP_TAG, "Open the Left Side Menu.")
+ dashboardPage.openLeftSideMenu()
+
+ Log.d(STEP_TAG, "Click on 'Change User' menu and assert on the Login Landing Page that the '$testPronoun' pronouns are displayed besides the 'Pronoun Student' user's name.")
+ leftSideNavigationDrawerPage.clickChangeUserMenu()
+ loginLandingPage.assertPreviousLoginUserDisplayed("Pronoun Student $testPronoun")
+ }
}
\ No newline at end of file
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 245e3c135d..06f3873648 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
@@ -58,10 +58,11 @@ class SyllabusE2ETest: StudentTest() {
dashboardPage.waitForRender()
dashboardPage.selectCourse(course)
- Log.d(STEP_TAG,"Navigate to Syllabus Page. Assert that the syllabus body string is displayed, and there are no tabs yet.")
+ Log.d(STEP_TAG,"Navigate to Syllabus Page. Assert that the syllabus body string is displayed, and there are no tabs yet, and the toolbar subtitle is the '${course.name}' course name.")
courseBrowserPage.selectSyllabus()
syllabusPage.assertNoTabs()
syllabusPage.assertSyllabusBody("this is the syllabus body")
+ syllabusPage.assertToolbarCourseTitle(course.name)
Log.d(PREPARATION_TAG,"Seed an assignment for '${course.name}' course.")
val assignment = AssignmentsApi.createAssignment(course.id, teacher.token, submissionTypes = listOf(SubmissionType.ON_PAPER), withDescription = true, pointsPossible = 15.0, dueAt = 1.days.fromNow.iso8601)
diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/compose/CalendarE2ETest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/compose/CalendarE2ETest.kt
new file mode 100644
index 0000000000..082a04d8ab
--- /dev/null
+++ b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/compose/CalendarE2ETest.kt
@@ -0,0 +1,308 @@
+/*
+ * Copyright (C) 2024 - present Instructure, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.instructure.student.ui.e2e.compose
+
+import android.util.Log
+import com.instructure.canvas.espresso.E2E
+import com.instructure.canvas.espresso.FeatureCategory
+import com.instructure.canvas.espresso.Priority
+import com.instructure.canvas.espresso.TestCategory
+import com.instructure.canvas.espresso.TestMetaData
+import com.instructure.espresso.getCurrentDateInCanvasCalendarFormat
+import com.instructure.pandautils.features.calendar.CalendarPrefs
+import com.instructure.student.ui.utils.StudentComposeTest
+import com.instructure.student.ui.utils.seedData
+import com.instructure.student.ui.utils.tokenLogin
+import dagger.hilt.android.testing.HiltAndroidTest
+import org.junit.Before
+import org.junit.Test
+import java.time.Year
+import java.util.Calendar
+
+@HiltAndroidTest
+class CalendarE2ETest : StudentComposeTest() {
+
+ override fun displaysPageObjects() = Unit
+
+ override fun enableAndConfigureAccessibilityChecks() = Unit
+
+ @Before
+ fun clearPreferences() {
+ CalendarPrefs.clearPrefs()
+ }
+
+ @E2E
+ @Test
+ @TestMetaData(Priority.MANDATORY, FeatureCategory.CALENDAR, TestCategory.E2E)
+ fun testCalendarEventScreenE2E() {
+
+ Log.d(PREPARATION_TAG, "Seeding data.")
+ val data = seedData(students = 1, courses = 1)
+ val student = data.studentsList[0]
+
+ Log.d(STEP_TAG, "Login with user: '${student.name}', login id: '${student.loginId}'.")
+ tokenLogin(student)
+ dashboardPage.waitForRender()
+
+ Log.d(STEP_TAG, "Click on the 'Calendar' bottom menu to navigate to the Calendar page. Assert that the page title is 'Calendar'.")
+ dashboardPage.clickCalendarTab()
+ calendarScreenPage.assertCalendarPageTitle()
+
+ Log.d(STEP_TAG, "Click on the 'Add' (FAB) button and 'Add Event' to create a new event.")
+ calendarScreenPage.clickOnAddButton()
+ calendarScreenPage.clickAddEvent()
+
+ Log.d(STEP_TAG, "Assert that the Calendar Event Page is displayed and the title is 'New Event' as we are making a new one.")
+ calendarEventCreateEditPage.assertTitle("New Event")
+
+ Log.d(STEP_TAG, "Type 'New Test Event' to the title input field and click on 'Save'.")
+ val newEventTitle = "New Test Event"
+ calendarEventCreateEditPage.typeTitle(newEventTitle)
+ calendarEventCreateEditPage.clickSave()
+
+ Log.d(STEP_TAG, "Assert that the event is displayed with the corresponding details (title, context name, date, status) on the page.")
+ var currentDate = getCurrentDateInCanvasCalendarFormat()
+ calendarScreenPage.assertItemDetails(newEventTitle, student.name, currentDate)
+
+ Log.d(STEP_TAG, "Click on the previously created '$newEventTitle' event and assert the event details.")
+ calendarScreenPage.clickOnItem(newEventTitle)
+
+ Log.d(STEP_TAG, "Assert that the Calendar Event Details Page is displayed and the title is 'Event'.")
+ calendarEventDetailsPage.assertEventDetailsPageTitle()
+
+ Log.d(STEP_TAG, "Assert that the event title is '$newEventTitle' and the date is the current day (and current year).")
+ calendarEventDetailsPage.assertEventTitle(newEventTitle)
+ currentDate += ", " + Year.now().toString()
+ calendarEventDetailsPage.assertEventDateContains(currentDate)
+
+ Log.d(STEP_TAG, "Assert that neither the 'Location' and 'Address' sections are not displayed since they are not filled.")
+ calendarEventDetailsPage.assertLocationNotDisplayed()
+ calendarEventDetailsPage.assertAddressNotDisplayed()
+
+ Log.d(STEP_TAG, "Click on the 'Edit' overflow menu.")
+ calendarEventDetailsPage.clickOverflowMenu()
+ calendarEventDetailsPage.clickEditMenu()
+
+ Log.d(STEP_TAG, "Assert that the Calendar Event Page is displayed and the title is 'New Event' as we are editing an existing one.")
+ calendarEventCreateEditPage.assertTitle("Edit Event")
+
+ val modifiedEventTitle = "Modified Test Event"
+ Log.d(STEP_TAG, "Type '$modifiedEventTitle' to the title, 'Test Room 1' to the 'Location', 'Test Address 1' to the 'Address' input fields.")
+ calendarEventCreateEditPage.typeTitle(modifiedEventTitle)
+ calendarEventCreateEditPage.typeLocation("Test Room 1")
+ calendarEventCreateEditPage.typeAddress("Test Address 1")
+ calendarEventCreateEditPage.clickSave()
+
+ Log.d(STEP_TAG, "Assert that the event is displayed with the corresponding modified details (title, context name, date) on the page.")
+ currentDate = getCurrentDateInCanvasCalendarFormat()
+ calendarScreenPage.assertItemDetails(modifiedEventTitle, student.name, currentDate)
+
+ Log.d(STEP_TAG, "Click on the previously created '$modifiedEventTitle' event and assert the event details.")
+ calendarScreenPage.clickOnItem(modifiedEventTitle)
+
+ Log.d(STEP_TAG, "Assert that previously given location and address values are displayed on the Event Details Page.")
+ calendarEventDetailsPage.assertLocationDisplayed("Test Room 1")
+ calendarEventDetailsPage.assertAddressDisplayed("Test Address 1")
+
+ Log.d(STEP_TAG, "Click on the 'Delete' overflow menu and confirm the deletion.")
+ calendarEventDetailsPage.clickOverflowMenu()
+ calendarEventDetailsPage.clickDeleteMenu()
+ calendarEventDetailsPage.confirmDelete()
+
+ Log.d(STEP_TAG, "Assert that after the deletion the empty view will be displayed since we don't have any events on the current day.")
+ calendarScreenPage.assertEmptyView()
+ }
+
+ @E2E
+ @Test
+ @TestMetaData(Priority.MANDATORY, FeatureCategory.CALENDAR, TestCategory.E2E)
+ fun testCalendarToDoScreenE2E() {
+
+ Log.d(PREPARATION_TAG, "Seeding data.")
+ val data = seedData(students = 1, courses = 1)
+ val student = data.studentsList[0]
+
+ Log.d(STEP_TAG, "Login with user: '${student.name}', login id: '${student.loginId}'.")
+ tokenLogin(student)
+ dashboardPage.waitForRender()
+
+ Log.d(STEP_TAG, "Click on the 'Calendar' bottom menu to navigate to the Calendar page. Assert that the page title is 'Calendar'.")
+ dashboardPage.clickCalendarTab()
+ calendarScreenPage.assertCalendarPageTitle()
+
+ Log.d(STEP_TAG, "Click on the 'Add' (FAB) button and 'Add To Do' to create a new To Do.")
+ calendarScreenPage.clickOnAddButton()
+ calendarScreenPage.clickAddTodo()
+
+ Log.d(STEP_TAG, "Assert that the page title is 'New To Do' as we are clicked on the 'Add To Do' button to create a new one.")
+ calendarToDoCreateUpdatePage.assertPageTitle("New To Do")
+
+ val testTodoTitle = "Test ToDo Title"
+ val testTodoDescription = "Details of ToDo"
+ Log.d(STEP_TAG, "Fill the title with '$testTodoTitle' and the details/description with '$testTodoDescription' and click on the 'Save' button.")
+ calendarToDoCreateUpdatePage.typeTodoTitle(testTodoTitle)
+ calendarToDoCreateUpdatePage.typeDetails(testTodoDescription)
+ calendarToDoCreateUpdatePage.clickSave()
+
+ Log.d(STEP_TAG, "Assert that the user has been navigated back to the Calendar Screen Page and that the previously created To Do item is displayed with the corresponding title, context and date.")
+ val currentDate = getCurrentDateInCanvasCalendarFormat()
+ calendarScreenPage.assertItemDetails(testTodoTitle, "To Do", "$currentDate at 12:00 PM")
+
+ Log.d(STEP_TAG, "Clicks on the '$testTodoTitle' To Do item.")
+ calendarScreenPage.clickOnItem(testTodoTitle)
+
+ Log.d(STEP_TAG, "Assert that the title is '$testTodoTitle', the context is 'To Do', the date is the current day with 12:00 PM time and the description is '$testTodoDescription'.")
+ calendarToDoDetailsPage.assertTitle(testTodoTitle)
+ calendarToDoDetailsPage.assertPageTitle("To Do")
+ calendarToDoDetailsPage.assertDate("$currentDate at 12:00 PM")
+ calendarToDoDetailsPage.assertDescription(testTodoDescription)
+
+ Log.d(STEP_TAG, "Click on the 'Edit To Do' within the toolbar more menu and confirm the editing.")
+ calendarToDoDetailsPage.clickToolbarMenu()
+ calendarToDoDetailsPage.clickEditMenu()
+
+ Log.d(STEP_TAG, "Assert that the page title is 'Edit To Do' as we are editing an existing To Do item.")
+ calendarToDoCreateUpdatePage.assertPageTitle("Edit To Do")
+
+ Log.d(STEP_TAG, "Assert that the 'original' To Do Title and details has been filled into the input fields as we on the edit screen.")
+ calendarToDoCreateUpdatePage.assertTodoTitle(testTodoTitle)
+ calendarToDoCreateUpdatePage.assertDetails(testTodoDescription)
+
+ val modifiedTestTodoTitle = "Test ToDo Title Mod"
+ val modifiedTestTodoDescription = "Details of ToDo Mod"
+ Log.d(STEP_TAG, "Modify the title with '$modifiedTestTodoTitle' and the details/description with '$modifiedTestTodoDescription' and click on the 'Save' button.")
+ calendarToDoCreateUpdatePage.typeTodoTitle(modifiedTestTodoTitle)
+ calendarToDoCreateUpdatePage.typeDetails(modifiedTestTodoDescription)
+ calendarToDoCreateUpdatePage.clickSave()
+
+ Log.d(STEP_TAG, "Assert that the user has been navigated back to the Calendar Screen Page and that the previously modified To Do item is displayed with the corresponding title, context and with the same date as we haven't changed it.")
+ calendarScreenPage.assertItemDetails(modifiedTestTodoTitle, "To Do", "$currentDate at 12:00 PM")
+
+ Log.d(STEP_TAG, "Clicks on the '$modifiedTestTodoTitle' To Do item.")
+ calendarScreenPage.clickOnItem(modifiedTestTodoTitle)
+
+ Log.d(STEP_TAG, "Assert that the To Do title is '$modifiedTestTodoTitle', the page title is 'To Do', the date remained current day with 12:00 PM time (as we haven't modified it) and the description is '$modifiedTestTodoDescription'.")
+ calendarToDoDetailsPage.assertTitle(modifiedTestTodoTitle)
+ calendarToDoDetailsPage.assertPageTitle("To Do")
+ calendarToDoDetailsPage.assertDate("$currentDate at 12:00 PM")
+ calendarToDoDetailsPage.assertDescription(modifiedTestTodoDescription)
+
+ Log.d(STEP_TAG, "Click on the 'Delete To Do' within the toolbar more menu and confirm the deletion.")
+ calendarToDoDetailsPage.clickToolbarMenu()
+ calendarToDoDetailsPage.clickDeleteMenu()
+ calendarToDoDetailsPage.confirmDeletion()
+
+ Log.d(STEP_TAG, "Assert that the deleted item does not exist anymore on the Calendar Screen Page.")
+ calendarScreenPage.assertItemNotExist(modifiedTestTodoTitle)
+
+ Log.d(STEP_TAG, "Assert that after the deletion the empty view will be displayed since we don't have any To Do items on the current day.")
+ calendarScreenPage.assertEmptyView()
+ }
+
+ @E2E
+ @Test
+ @TestMetaData(Priority.MANDATORY, FeatureCategory.CALENDAR, TestCategory.E2E)
+ fun testCalendarScreenE2E() {
+
+ Log.d(PREPARATION_TAG, "Seeding data.")
+ val data = seedData(students = 1, courses = 2)
+ val student = data.studentsList[0]
+ val course = data.coursesList[0]
+
+ Log.d(STEP_TAG, "Login with user: '${student.name}', login id: '${student.loginId}'.")
+ tokenLogin(student)
+ dashboardPage.waitForRender()
+
+ Log.d(STEP_TAG, "Click on the 'Calendar' bottom menu to navigate to the Calendar page. Assert that the page title is 'Calendar' and there is no item in it yet.")
+ dashboardPage.clickCalendarTab()
+ calendarScreenPage.assertCalendarPageTitle()
+ calendarScreenPage.assertEmptyView()
+
+ Log.d(STEP_TAG, "Assert that the Calendar is collapsed and only 1 week is displayed in this state.")
+ calendarScreenPage.assertCalendarCollapsed()
+
+ Log.d(STEP_TAG, "Click on the calendar header (Year and month string) to collapse the calendar. Assert that the Calendar is expanded and multiple weeks are displayed in this state.")
+ calendarScreenPage.clickCalendarHeader()
+ calendarScreenPage.assertCalendarExpanded()
+
+ Log.d(STEP_TAG, "Click on the 'Add' (FAB) button and 'Add Event' to create a new event.")
+ calendarScreenPage.clickOnAddButton()
+ calendarScreenPage.clickAddEvent()
+
+ Log.d(STEP_TAG, "Assert that the Calendar Event Page is displayed and the title is 'New Event' as we are making a new one.")
+ calendarEventCreateEditPage.assertTitle("New Event")
+
+ Log.d(STEP_TAG, "Type 'New Test Event' to the title input field and click on 'Save'.")
+ val newEventTitle = "New Test Event"
+ calendarEventCreateEditPage.typeTitle(newEventTitle)
+ calendarEventCreateEditPage.clickSave()
+
+ Log.d(STEP_TAG, "Assert that the event is displayed with the corresponding details (title, context name, date, status) on the page.")
+ val currentDate = getCurrentDateInCanvasCalendarFormat()
+ calendarScreenPage.assertItemDetails(newEventTitle, student.name, currentDate)
+
+ Log.d(STEP_TAG, "Click on the 'Add' (FAB) button and 'Add To Do' to create a new To Do.")
+ calendarScreenPage.clickOnAddButton()
+ calendarScreenPage.clickAddTodo()
+
+ Log.d(STEP_TAG, "Assert that the page title is 'New To Do' as we are clicked on the 'Add To Do' button to create a new one.")
+ calendarToDoCreateUpdatePage.assertPageTitle("New To Do")
+
+ val testTodoTitle = "Test ToDo Title"
+ val testTodoDescription = "Details of ToDo"
+
+ Log.d(STEP_TAG, "Fill the title with '$testTodoTitle' and the details/description with '$testTodoDescription'.")
+ calendarToDoCreateUpdatePage.typeTodoTitle(testTodoTitle)
+ calendarToDoCreateUpdatePage.typeDetails(testTodoDescription)
+
+ 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)
+ calendarToDoCreateUpdatePage.selectCanvasContext(course.name)
+
+ Log.d(STEP_TAG, "Click on the 'Save' button.")
+ calendarToDoCreateUpdatePage.clickSave()
+
+ Log.d(STEP_TAG, "Assert that the created To Do item is not displayed on today's calendar.")
+ calendarScreenPage.assertItemNotExist(testTodoTitle) //It's created for 2 days from today so it shouldn't displayed for today.
+
+ Log.d(STEP_TAG, "Swipe the calendar item 'body' to 2 days in the future from now.")
+ calendarScreenPage.swipeEventsLeft()
+ calendarScreenPage.swipeEventsLeft()
+
+ Log.d(STEP_TAG, "Assert that the '$testTodoTitle' To Do item is displayed because we created it to this particular day. Assert that '$newEventTitle' calendar event is not displayed because it's created for today.")
+ calendarScreenPage.assertItemDisplayed(testTodoTitle)
+ calendarScreenPage.assertItemNotExist(newEventTitle)
+
+ Log.d(STEP_TAG, "Click on 'Calendars' to open the Calendar Filter Page.")
+ calendarScreenPage.clickCalendarFilters()
+
+ Log.d(STEP_TAG, "Click on the checkbox before the '${course.name}' course to filter it out from the calendar and close the Calendar Filter Page.")
+ calendarFilterPage.clickOnFilterItem(course.name)
+ calendarFilterPage.closeFilterPage()
+
+ Log.d(STEP_TAG, "Assert that the '$testTodoTitle' To Do item is not displayed because we filtered out from the calendar. Assert that the empty view is displayed because there are no items for today.")
+ calendarScreenPage.assertItemNotExist(testTodoTitle)
+ calendarScreenPage.assertEmptyView()
+
+ Log.d(STEP_TAG, "Click on the 'Today' button to navigate back to the current day.")
+ calendarScreenPage.clickTodayButton()
+
+ Log.d(STEP_TAG, "Assert that the event is displayed with the corresponding details (title, context name, date, status) on the page.")
+ calendarScreenPage.assertItemDetails(newEventTitle, student.name, currentDate)
+
+ }
+}
\ No newline at end of file
diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/k5/HomeroomE2ETest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/k5/HomeroomE2ETest.kt
index b9d1d7d138..ed32b8e2e2 100644
--- a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/k5/HomeroomE2ETest.kt
+++ b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/k5/HomeroomE2ETest.kt
@@ -126,8 +126,8 @@ class HomeroomE2ETest : StudentTest() {
homeroomPage.assertPageObjects()
homeroomPage.openCourseAnnouncement(data.announcementsList[1].title)
- Log.d(STEP_TAG, "Assert that the '${data.announcementsList[1].title}' announcement's details page is displayed.")
- discussionDetailsPage.assertTitleText(data.announcementsList[1].title)
+ Log.d(STEP_TAG, "Assert that the '${data.announcementsList[1].title}' discussion's details page is displayed.")
+ discussionDetailsPage.assertHomeroomToolbarDiscussionTitle(data.announcementsList[1].title)
Log.d(STEP_TAG, "Navigate back to Homeroom Page. Open the Assignment List Page of '${nonHomeroomCourses[2].name}' course.")
Espresso.pressBack()
diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/offline/OfflineAnnouncementsE2ETest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/offline/OfflineAnnouncementsE2ETest.kt
index 77c31f5877..2ad62be5ac 100644
--- a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/offline/OfflineAnnouncementsE2ETest.kt
+++ b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/offline/OfflineAnnouncementsE2ETest.kt
@@ -95,18 +95,18 @@ class OfflineAnnouncementsE2ETest : StudentTest() {
Log.d(STEP_TAG, "Select '${lockedAnnouncement.title}' announcement and assert if we are landing on the Discussion Details Page.")
announcementListPage.selectTopic(lockedAnnouncement.title)
- discussionDetailsPage.assertTitleText(lockedAnnouncement.title)
+ nativeDiscussionDetailsPage.assertTitleText(lockedAnnouncement.title)
Log.d(STEP_TAG, "Assert that the 'Reply' button is not available on a locked announcement. Navigate back to Announcement List Page.")
- discussionDetailsPage.assertReplyButtonNotDisplayed()
+ nativeDiscussionDetailsPage.assertReplyButtonNotDisplayed()
Espresso.pressBack()
Log.d(STEP_TAG,"Select '${announcement.title}' announcement and assert if we are landing on the Discussion Details Page.")
announcementListPage.selectTopic(announcement.title)
- discussionDetailsPage.assertTitleText(announcement.title)
+ nativeDiscussionDetailsPage.assertTitleText(announcement.title)
Log.d(STEP_TAG, "Click on the 'Reply' button and assert that the 'No Internet Connection' dialog has displayed. Dismiss the dialog.")
- discussionDetailsPage.clickReply()
+ nativeDiscussionDetailsPage.clickReply()
OfflineTestUtils.assertNoInternetConnectionDialog()
OfflineTestUtils.dismissNoInternetConnectionDialog()
diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/offline/OfflineConferencesE2ETest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/offline/OfflineConferencesE2ETest.kt
new file mode 100644
index 0000000000..4337246ad8
--- /dev/null
+++ b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/offline/OfflineConferencesE2ETest.kt
@@ -0,0 +1,135 @@
+/*
+ * Copyright (C) 2024 - present Instructure, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package com.instructure.student.ui.e2e.offline
+
+import android.util.Log
+import com.google.android.material.checkbox.MaterialCheckBox
+import com.instructure.canvas.espresso.FeatureCategory
+import com.instructure.canvas.espresso.OfflineE2E
+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.dataseeding.api.ConferencesApi
+import com.instructure.student.ui.e2e.offline.utils.OfflineTestUtils.assertOfflineIndicator
+import com.instructure.student.ui.e2e.offline.utils.OfflineTestUtils.waitForNetworkToGoOffline
+import com.instructure.student.ui.utils.StudentTest
+import com.instructure.student.ui.utils.seedData
+import com.instructure.student.ui.utils.tokenLogin
+import dagger.hilt.android.testing.HiltAndroidTest
+import org.junit.After
+import org.junit.Test
+
+@HiltAndroidTest
+class OfflineConferencesE2ETest : StudentTest() {
+
+ override fun displaysPageObjects() = Unit
+
+ override fun enableAndConfigureAccessibilityChecks() = Unit
+
+ @OfflineE2E
+ @Test
+ @TestMetaData(Priority.MANDATORY, FeatureCategory.CONFERENCES, TestCategory.E2E, SecondaryFeatureCategory.OFFLINE_MODE)
+ fun testOfflineConferencesE2E() {
+
+ Log.d(PREPARATION_TAG,"Seeding data.")
+ val data = seedData(students = 1, teachers = 1, courses = 1)
+ val student = data.studentsList[0]
+ val teacher = data.teachersList[0]
+ val course = data.coursesList[0]
+
+ val testConferenceTitle = "E2E test conference"
+ val testConferenceDescription = "Nightly E2E Test conference description"
+ Log.d(PREPARATION_TAG, "Create a conference with '$testConferenceTitle' title and '$testConferenceDescription' description.")
+ ConferencesApi.createCourseConference(course.id, teacher.token, testConferenceTitle, testConferenceDescription, recipientUserIds = listOf(student.id))
+
+ val testConferenceTitle2 = "E2E test conference 2"
+ val testConferenceDescription2 = "Nightly E2E Test conference description 2"
+ Log.d(PREPARATION_TAG, "Create a conference with '$testConferenceTitle2' title and '$testConferenceDescription2' description.")
+ ConferencesApi.createCourseConference(course.id, teacher.token, testConferenceTitle2, testConferenceDescription2, longRunning = true, duration = 120, recipientUserIds = listOf(student.id))
+
+ Log.d(STEP_TAG, "Login with user: ${student.name}, login id: ${student.loginId}.")
+ tokenLogin(student)
+ dashboardPage.waitForRender()
+
+ Log.d(STEP_TAG, "Open the '${course.name}' course's 'Manage Offline Content' page via the more menu of the Dashboard Page.")
+ dashboardPage.clickCourseOverflowMenu(course.name, "Manage Offline Content")
+
+ Log.d(STEP_TAG, "Assert that the '${course.name}' course's checkbox state is 'Unchecked'.")
+ manageOfflineContentPage.assertCheckedStateOfItem(course.name, MaterialCheckBox.STATE_UNCHECKED)
+
+ Log.d(STEP_TAG, "Expand the course. Select the 'BigBlueButton' (Conferences) of '${course.name}' course for sync. Click on the 'Sync' button.")
+ manageOfflineContentPage.expandCollapseItem(course.name)
+ manageOfflineContentPage.changeItemSelectionState("BigBlueButton")
+ manageOfflineContentPage.clickOnSyncButtonAndConfirm()
+
+ Log.d(STEP_TAG, "Assert that the offline sync icon only displayed on the synced course's course card.")
+ dashboardPage.assertCourseOfflineSyncIconVisible(course.name)
+ device.waitForIdle()
+
+ Log.d(PREPARATION_TAG, "Turn off the Wi-Fi and Mobile Data on the device, so it will go offline.")
+ turnOffConnectionViaADB()
+ waitForNetworkToGoOffline(device)
+
+ Log.d(STEP_TAG, "Wait for the Dashboard Page to be rendered.")
+ dashboardPage.waitForRender()
+
+ Log.d(STEP_TAG, "Select '${course.name}' course and click on 'BigBlueButton' (Conferences) tab to navigate to the Conferences List Page.")
+ dashboardPage.selectCourse(course)
+ courseBrowserPage.selectConferences()
+
+ Log.d(STEP_TAG, "Assert that the Offline Indicator (bottom banner) is displayed on the Page List Page.")
+ assertOfflineIndicator()
+
+ Log.d(STEP_TAG, "Assert that '$testConferenceTitle' conference is displayed on the Conference List Page with the corresponding status and description.")
+ conferenceListPage.assertConferenceDisplayed(testConferenceTitle)
+ conferenceListPage.assertConferenceStatus(testConferenceTitle,"Not Started")
+ conferenceListPage.assertConferenceDescription(testConferenceTitle, testConferenceDescription)
+
+ Log.d(STEP_TAG, "Assert that the toolbar title is 'Conferences' and there is the '${course.name}' course's name displayed as a subtitle.")
+ conferenceListPage.assertConferencesToolbarText(course.name)
+
+ Log.d(STEP_TAG, "Assert that the 'New Conferences' text is displayed as a conference group type on the Conferences List Page.")
+ conferenceListPage.assertNewConferencesDisplayed()
+
+ Log.d(STEP_TAG, "Assert that the 'Open Externally' icon (button) is displayed on the top-right corner of the Conferences List Page.")
+ conferenceListPage.assertOpenExternallyButtonDisplayed()
+
+ Log.d(STEP_TAG, "Assert that '$testConferenceTitle2' conference is displayed on the Conference List Page with the corresponding status and description.")
+ conferenceListPage.assertConferenceDisplayed(testConferenceTitle2)
+ conferenceListPage.assertConferenceStatus(testConferenceTitle2,"Not Started")
+ conferenceListPage.assertConferenceDescription(testConferenceTitle2, testConferenceDescription2)
+
+ Log.d(STEP_TAG, "Open '$testConferenceTitle' conference's detailer page.")
+ conferenceListPage.openConferenceDetails(testConferenceTitle)
+
+ Log.d(STEP_TAG, "Assert that the toolbar title is 'Conference Details' and there is the '${course.name}' course's name displayed as a subtitle.")
+ conferenceDetailsPage.assertConferenceDetailsToolbarText(course.name)
+
+ Log.d(STEP_TAG, "Assert that the proper conference title '$testConferenceTitle', status ('Not Started') and description, '$testConferenceDescription' are displayed.")
+ conferenceDetailsPage.assertConferenceTitleDisplayed(testConferenceTitle)
+ conferenceDetailsPage.assertConferenceStatus("Not Started")
+ conferenceDetailsPage.assertDescription(testConferenceDescription)
+ }
+
+ @After
+ fun tearDown() {
+ Log.d(PREPARATION_TAG, "Turn back on the Wi-Fi and Mobile Data on the device, so it will come back online.")
+ turnOnConnectionViaADB()
+ }
+
+}
\ No newline at end of file
diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/offline/OfflineDiscussionsE2ETest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/offline/OfflineDiscussionsE2ETest.kt
index 37fad33e9d..814edaf48e 100644
--- a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/offline/OfflineDiscussionsE2ETest.kt
+++ b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/offline/OfflineDiscussionsE2ETest.kt
@@ -37,7 +37,6 @@ import com.instructure.student.ui.utils.tokenLogin
import dagger.hilt.android.testing.HiltAndroidTest
import org.junit.After
import org.junit.Test
-import java.lang.Thread.sleep
@HiltAndroidTest
class OfflineDiscussionsE2ETest : StudentTest() {
@@ -63,6 +62,9 @@ class OfflineDiscussionsE2ETest : StudentTest() {
Log.d(PREPARATION_TAG,"Seed another discussion topic for '${course.name}' course.")
val discussion2 = DiscussionTopicsApi.createDiscussion(course.id, teacher.token)
+ Log.d(PREPARATION_TAG,"Seed an entry ('main reply') for the '${course.name}' course's '${discussion1.title}' discussion topic.")
+ DiscussionTopicsApi.createEntryToDiscussionTopic(student.token, course.id, discussion1.id, "My reply")
+
Log.d(STEP_TAG,"Login with user: '${student.name}', login id: '${student.loginId}'.")
tokenLogin(student)
@@ -75,15 +77,13 @@ class OfflineDiscussionsE2ETest : StudentTest() {
Log.d(STEP_TAG,"Select '$discussion1' discussion topic and assert that there is no reply on the details page as well.")
discussionListPage.selectTopic(discussion1.title)
- discussionDetailsPage.assertNoRepliesDisplayed()
- val replyMessage = "My reply"
- Log.d(STEP_TAG,"Send a reply with text: '$replyMessage'.")
- discussionDetailsPage.sendReply(replyMessage)
- sleep(2000) // Allow some time for reply to propagate
+ Log.d(STEP_TAG, "Assert that the 'Reply' button is displayed on the Discussion Details (Web view) Page.")
+ discussionDetailsPage.waitForReplyButton()
+ discussionDetailsPage.assertReplyButtonDisplayed()
- Log.d(STEP_TAG,"Assert the the previously sent reply '$replyMessage', is displayed on the details page.")
- discussionDetailsPage.assertRepliesDisplayed()
+ Log.d(STEP_TAG,"Assert the the previously sent reply 'My reply', is displayed on the (online) details page.")
+ discussionDetailsPage.assertEntryDisplayed("My reply")
Log.d(STEP_TAG, "Navigate back to the Dashboard page.")
ViewUtils.pressBackButton(3)
@@ -145,15 +145,15 @@ class OfflineDiscussionsE2ETest : StudentTest() {
Log.d(STEP_TAG,"Select '${discussion1.title}' discussion and assert if the corresponding discussion title is displayed.")
discussionListPage.selectTopic(discussion1.title)
- discussionDetailsPage.assertTitleText(discussion1.title)
+ nativeDiscussionDetailsPage.assertTitleText(discussion1.title)
Log.d(STEP_TAG, "Try to click on the (main) 'Reply' button and assert that the 'No Internet Connection' dialog has displayed. Dismiss the dialog.")
- discussionDetailsPage.clickReply()
+ nativeDiscussionDetailsPage.clickReply()
OfflineTestUtils.assertNoInternetConnectionDialog()
OfflineTestUtils.dismissNoInternetConnectionDialog()
Log.d(STEP_TAG, "Try to click on the (inner) 'Reply' button (so try to 'reply to a reply') and assert that the 'No Internet Connection' dialog has displayed. Dismiss the dialog.")
- discussionDetailsPage.clickOnInnerReply()
+ nativeDiscussionDetailsPage.clickOnInnerReply()
OfflineTestUtils.assertNoInternetConnectionDialog()
OfflineTestUtils.dismissNoInternetConnectionDialog()
@@ -162,12 +162,12 @@ class OfflineDiscussionsE2ETest : StudentTest() {
Log.d(STEP_TAG,"Select '${discussion2.title}' discussion and assert if the Discussion Details page is displayed and there is no reply for the discussion yet.")
discussionListPage.selectTopic(discussion2.title)
- discussionDetailsPage.assertTitleText(discussion2.title)
- discussionDetailsPage.assertNoRepliesDisplayed()
+ nativeDiscussionDetailsPage.assertTitleText(discussion2.title)
+ nativeDiscussionDetailsPage.assertNoRepliesDisplayed()
Log.d(STEP_TAG, "Try to click on 'Add Bookmark' overflow menu and assert that the 'Functionality unavailable while offline' toast message is displayed.")
openOverflowMenu()
- discussionDetailsPage.clickOnAddBookmarkMenu()
+ nativeDiscussionDetailsPage.clickOnAddBookmarkMenu()
checkToastText(R.string.notAvailableOffline, activityRule.activity)
}
diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/offline/OfflineModulesE2ETest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/offline/OfflineModulesE2ETest.kt
new file mode 100644
index 0000000000..5249c2f29c
--- /dev/null
+++ b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/offline/OfflineModulesE2ETest.kt
@@ -0,0 +1,235 @@
+/*
+ * Copyright (C) 2024 - present Instructure, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package com.instructure.student.ui.e2e.offline
+
+import android.util.Log
+import com.google.android.material.checkbox.MaterialCheckBox
+import com.instructure.canvas.espresso.FeatureCategory
+import com.instructure.canvas.espresso.OfflineE2E
+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.dataseeding.api.AssignmentsApi
+import com.instructure.dataseeding.api.DiscussionTopicsApi
+import com.instructure.dataseeding.api.ModulesApi
+import com.instructure.dataseeding.api.PagesApi
+import com.instructure.dataseeding.api.QuizzesApi
+import com.instructure.dataseeding.model.GradingType
+import com.instructure.dataseeding.model.ModuleItemTypes
+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.student.ui.e2e.offline.utils.OfflineTestUtils
+import com.instructure.student.ui.e2e.offline.utils.OfflineTestUtils.assertOfflineIndicator
+import com.instructure.student.ui.e2e.offline.utils.OfflineTestUtils.waitForNetworkToGoOffline
+import com.instructure.student.ui.utils.StudentTest
+import com.instructure.student.ui.utils.seedData
+import com.instructure.student.ui.utils.tokenLogin
+import dagger.hilt.android.testing.HiltAndroidTest
+import org.junit.After
+import org.junit.Test
+
+@HiltAndroidTest
+class OfflineModulesE2ETest : StudentTest() {
+
+ override fun displaysPageObjects() = Unit
+
+ override fun enableAndConfigureAccessibilityChecks() = Unit
+
+ @OfflineE2E
+ @Test
+ @TestMetaData(Priority.MANDATORY, FeatureCategory.MODULES, TestCategory.E2E, SecondaryFeatureCategory.OFFLINE_MODE)
+ fun testOfflineModulesE2E() {
+
+ Log.d(PREPARATION_TAG,"Seeding data.")
+ val data = seedData(students = 1, teachers = 1, courses = 1, modules = 2)
+ val student = data.studentsList[0]
+ val teacher = data.teachersList[0]
+ val course = data.coursesList[0]
+ val testModule1 = data.modulesList[0]
+ val testModule2 = data.modulesList[1]
+
+ Log.d(PREPARATION_TAG,"Seeding assignment for '${course.name}' course.")
+ val testAssignment1 = AssignmentsApi.createAssignment(course.id, teacher.token, withDescription = true, gradingType = GradingType.POINTS, pointsPossible = 15.0, dueAt = 1.days.fromNow.iso8601, submissionTypes = listOf(
+ SubmissionType.ONLINE_TEXT_ENTRY))
+
+ Log.d(PREPARATION_TAG,"Seeding another assignment for '${course.name}' course.")
+ val testAssignment2 = AssignmentsApi.createAssignment(course.id, teacher.token, dueAt = 2.days.fromNow.iso8601, withDescription = true, gradingType = GradingType.POINTS, pointsPossible = 15.0, submissionTypes = listOf(
+ SubmissionType.ONLINE_TEXT_ENTRY))
+
+ Log.d(PREPARATION_TAG,"Create a PUBLISHED quiz for '${course.name}' course.")
+ val testQuiz = QuizzesApi.createQuiz(course.id, teacher.token, dueAt = 3.days.fromNow.iso8601)
+
+ Log.d(PREPARATION_TAG,"Create a page for '${course.name}' course.")
+ val testPage = PagesApi.createCoursePage(course.id, teacher.token)
+
+ Log.d(PREPARATION_TAG,"Create a discussion topic for '${course.name}' course.")
+ val testDiscussionTopic = DiscussionTopicsApi.createDiscussion(course.id, teacher.token)
+
+ Log.d(PREPARATION_TAG,"Associate '${testAssignment1.name}' assignment with '${testModule1.name}' module.")
+ ModulesApi.createModuleItem(course.id, teacher.token, testModule1.id, testAssignment1.name, ModuleItemTypes.ASSIGNMENT.stringVal, contentId = testAssignment1.id.toString())
+
+ Log.d(PREPARATION_TAG,"Associate '${testQuiz.title}' quiz with '${testModule1.name}' module.")
+ ModulesApi.createModuleItem(course.id, teacher.token, testModule1.id, testQuiz.title, ModuleItemTypes.QUIZ.stringVal, contentId = testQuiz.id.toString())
+
+ Log.d(PREPARATION_TAG,"Associate '${testAssignment2.name}' assignment with '${testModule2.name}' module.")
+ ModulesApi.createModuleItem(course.id, teacher.token, testModule2.id, testAssignment2.name, ModuleItemTypes.ASSIGNMENT.stringVal, contentId = testAssignment2.id.toString())
+
+ Log.d(PREPARATION_TAG,"Associate '${testDiscussionTopic.title}' discussion topic with '${testModule2.name}' module.")
+ ModulesApi.createModuleItem(course.id, teacher.token, testModule2.id, testDiscussionTopic.title, ModuleItemTypes.DISCUSSION.stringVal, contentId = testDiscussionTopic.id.toString())
+
+ Log.d(PREPARATION_TAG,"Associate '${testQuiz.title}' page with '${testModule2.name}' module.")
+ ModulesApi.createModuleItem(course.id, teacher.token, testModule2.id, testPage.title, ModuleItemTypes.PAGE.stringVal, pageUrl = testPage.url)
+
+ Log.d(PREPARATION_TAG,"Publish '${testModule1.name}' module.")
+ ModulesApi.updateModule(course.id, teacher.token, testModule1.id, published = true)
+
+ Log.d(PREPARATION_TAG,"Publish '${testModule2.name}' module.")
+ ModulesApi.updateModule(course.id, teacher.token, testModule2.id, published = true)
+
+ Log.d(STEP_TAG,"Login with user: '${student.name}', login id: '${student.loginId}'.")
+ tokenLogin(student)
+ dashboardPage.waitForRender()
+
+ Log.d(STEP_TAG, "Open the '${course.name}' course's 'Manage Offline Content' page via the more menu of the Dashboard Page.")
+ dashboardPage.clickCourseOverflowMenu(course.name, "Manage Offline Content")
+
+ Log.d(STEP_TAG, "Assert that the '${course.name}' course's checkbox state is 'Unchecked'.")
+ manageOfflineContentPage.assertCheckedStateOfItem(course.name, MaterialCheckBox.STATE_UNCHECKED)
+
+ Log.d(STEP_TAG, "Expand the course. Select the 'Modules' of '${course.name}' course for sync. Click on the 'Sync' button.")
+ manageOfflineContentPage.expandCollapseItem(course.name)
+ manageOfflineContentPage.changeItemSelectionState("Modules")
+ manageOfflineContentPage.clickOnSyncButtonAndConfirm()
+
+ Log.d(STEP_TAG, "Assert that the offline sync icon only displayed on the synced course's course card.")
+ dashboardPage.assertCourseOfflineSyncIconVisible(course.name)
+ device.waitForIdle()
+
+ Log.d(PREPARATION_TAG, "Turn off the Wi-Fi and Mobile Data on the device, so it will go offline.")
+ turnOffConnectionViaADB()
+ waitForNetworkToGoOffline(device)
+
+ Log.d(STEP_TAG, "Wait for the Dashboard Page to be rendered. Refresh the page.")
+ dashboardPage.waitForRender()
+
+ Log.d(STEP_TAG, "Select '${course.name}' course and click on 'Modules' tab to navigate to the Module List Page.")
+ dashboardPage.selectCourse(course)
+ courseBrowserPage.selectModules()
+
+ Log.d(STEP_TAG, "Assert that the Offline Indicator (bottom banner) is displayed on the Module List Page.")
+ assertOfflineIndicator()
+
+ Log.d(STEP_TAG,"Assert that '${testModule1.name}' module is displayed with the following items: '${testAssignment1.name}' assignment, '${testQuiz.title}' quiz.")
+ modulesPage.assertModuleDisplayed(testModule1)
+ modulesPage.assertModuleItemDisplayed(testModule1, testAssignment1.name)
+ modulesPage.assertModuleItemDisplayed(testModule1, testQuiz.title)
+
+ Log.d(STEP_TAG,"Assert that '${testModule2.name}' module is displayed with the following items: '${testAssignment2.name}' assignment," +
+ " '${testPage.title}' page, '${testDiscussionTopic.title}' discussion topic.")
+ modulesPage.assertModuleDisplayed(testModule2)
+ modulesPage.assertModuleItemDisplayed(testModule2, testAssignment2.name)
+ modulesPage.assertModuleItemDisplayed(testModule2, testPage.title)
+ modulesPage.assertModuleItemDisplayed(testModule2, testDiscussionTopic.title)
+
+ Log.d(STEP_TAG, "Collapse the '${testModule2.name}' module. Assert that there will be 4 countable items on the screen.")
+ modulesPage.clickOnModuleExpandCollapseIcon(testModule2.name)
+ modulesPage.assertModulesAndItemsCount(4) // 2 modules titles and 2 module item in first module
+
+ Log.d(STEP_TAG, "Expand the '${testModule2.name}' module. Assert that there will be 7 countable items on the screen.")
+ modulesPage.clickOnModuleExpandCollapseIcon(testModule2.name)
+ modulesPage.assertModulesAndItemsCount(7) // 2 modules titles, 2 module items in first module, 3 items in second module
+
+ Log.d(STEP_TAG, "Assert that '${testAssignment1.name}' module item is displayed and open it.")
+ modulesPage.assertAndClickModuleItem(testModule1.name, testAssignment1.name, true)
+ assignmentDetailsPage.assertDisplayToolbarTitle(testAssignment1.name)
+
+ Log.d(STEP_TAG, "Assert that the 'Not Available Offline' content is displayed.")
+ assignmentDetailsPage.assertDetailsNotAvailableOffline()
+
+ Log.d(STEP_TAG, "Assert that the module name, '${testModule1.name}' is displayed at the bottom.")
+ assignmentDetailsPage.moduleItemInteractions.assertModuleNameDisplayed(testModule1.name)
+
+ Log.d(STEP_TAG, "Assert that the previous arrow button is not displayed because the user is on the first module item's details page, but the next arrow button is displayed.")
+ assignmentDetailsPage.moduleItemInteractions.assertPreviousArrowNotDisplayed()
+ assignmentDetailsPage.moduleItemInteractions.assertNextArrowDisplayed()
+
+ Log.d(STEP_TAG, "Click on the next arrow button and assert that the '${testQuiz.title}' quiz module item's 'Go To Quiz' page is displayed.")
+ assignmentDetailsPage.moduleItemInteractions.clickOnNextArrow()
+ goToQuizPage.assertQuizTitle(testQuiz.title)
+
+ Log.d(STEP_TAG, "Click on the 'Go To Quiz' button and assert that the 'No Internet Connection' dialog is displayed. Dismiss the dialog.")
+ goToQuizPage.clickGoToQuizButton()
+ OfflineTestUtils.assertNoInternetConnectionDialog()
+ OfflineTestUtils.dismissNoInternetConnectionDialog()
+
+ Log.d(STEP_TAG, "Assert that the module name, '${testModule1.name}' is displayed at the bottom.")
+ goToQuizPage.moduleItemInteractions.assertModuleNameDisplayed(testModule1.name)
+
+ Log.d(STEP_TAG, "Assert that both the previous and the next buttons are displayed (since we are not at the first or the last module item details page).")
+ goToQuizPage.moduleItemInteractions.assertPreviousArrowDisplayed()
+ goToQuizPage.moduleItemInteractions.assertNextArrowDisplayed()
+
+ Log.d(STEP_TAG, "Click on the next arrow button and assert that the Assignment Details Page is displayed with the corresponding assignment name: '${testAssignment2.name}'.")
+ goToQuizPage.moduleItemInteractions.clickOnNextArrow()
+ assignmentDetailsPage.assertDisplayToolbarTitle(testAssignment2.name)
+
+ Log.d(STEP_TAG, "Assert that the 'Not Available Offline' content is displayed.")
+ assignmentDetailsPage.assertDetailsNotAvailableOffline()
+
+ Log.d(STEP_TAG, "Assert that the second module name, '${testModule2.name}' is displayed at the bottom since we can navigate even between modules with these arrows.")
+ assignmentDetailsPage.moduleItemInteractions.assertModuleNameDisplayed(testModule2.name)
+
+ Log.d(STEP_TAG, "Assert that both the previous and the next buttons are displayed (since we are not at the first or the last module item details page, even if it's a first item of a module, but of the second module).")
+ assignmentDetailsPage.moduleItemInteractions.assertPreviousArrowDisplayed()
+ assignmentDetailsPage.moduleItemInteractions.assertNextArrowDisplayed()
+
+ Log.d(STEP_TAG, "Click on the next arrow button and assert that the '${testDiscussionTopic.title}' discussion topic module item's details page is displayed.")
+ assignmentDetailsPage.moduleItemInteractions.clickOnNextArrow()
+ discussionDetailsPage.assertModulesToolbarDiscussionTitle(testDiscussionTopic.title)
+
+ Log.d(STEP_TAG, "Assert that the 'Not Available Offline' content is displayed.")
+ discussionDetailsPage.assertDetailsNotAvailableOffline()
+
+ Log.d(STEP_TAG, "Assert that the second module name, '${testModule2.name}' is displayed at the bottom.")
+ discussionDetailsPage.moduleItemInteractions.assertModuleNameDisplayed(testModule2.name)
+
+ Log.d(STEP_TAG, "Assert that both the previous and the next buttons are displayed.")
+ discussionDetailsPage.moduleItemInteractions.assertPreviousArrowDisplayed()
+ discussionDetailsPage.moduleItemInteractions.assertNextArrowDisplayed()
+
+ Log.d(STEP_TAG, "Click on the next arrow button and assert that the '${testPage.url}' page module item's details page is displayed.")
+ discussionDetailsPage.moduleItemInteractions.clickOnNextArrow()
+ pageDetailsPage.webAssertPageUrl(testPage.url)
+
+ Log.d(STEP_TAG, "Assert that the second module name, '${testModule2.name}' is displayed at the bottom.")
+ pageDetailsPage.moduleItemInteractions.assertModuleNameDisplayed(testModule2.name)
+
+ Log.d(STEP_TAG, "Assert that the previous arrow button is displayed but the next arrow button is not displayed because the user is on the last module item's details page.")
+ pageDetailsPage.moduleItemInteractions.assertPreviousArrowDisplayed()
+ pageDetailsPage.moduleItemInteractions.assertNextArrowNotDisplayed()
+ }
+
+ @After
+ fun tearDown() {
+ Log.d(PREPARATION_TAG, "Turn back on the Wi-Fi and Mobile Data on the device, so it will come back online.")
+ turnOnConnectionViaADB()
+ }
+
+}
\ No newline at end of file
diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/offline/OfflineSyllabusE2ETest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/offline/OfflineSyllabusE2ETest.kt
new file mode 100644
index 0000000000..d801e4177d
--- /dev/null
+++ b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/offline/OfflineSyllabusE2ETest.kt
@@ -0,0 +1,105 @@
+/*
+ * Copyright (C) 2024 - present Instructure, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package com.instructure.student.ui.e2e.offline
+
+import android.util.Log
+import com.instructure.canvas.espresso.FeatureCategory
+import com.instructure.canvas.espresso.OfflineE2E
+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.dataseeding.api.AssignmentsApi
+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.student.ui.e2e.offline.utils.OfflineTestUtils
+import com.instructure.student.ui.utils.StudentTest
+import com.instructure.student.ui.utils.seedData
+import com.instructure.student.ui.utils.tokenLogin
+import dagger.hilt.android.testing.HiltAndroidTest
+import org.junit.After
+import org.junit.Test
+
+@HiltAndroidTest
+class OfflineSyllabusE2ETest : StudentTest() {
+
+ override fun displaysPageObjects() = Unit
+
+ override fun enableAndConfigureAccessibilityChecks() = Unit
+
+ @OfflineE2E
+ @Test
+ @TestMetaData(Priority.MANDATORY, FeatureCategory.SYLLABUS, TestCategory.E2E, SecondaryFeatureCategory.OFFLINE_MODE)
+ fun testOfflineSyllabusE2E() {
+
+ Log.d(PREPARATION_TAG,"Seeding data.")
+ val testSyllabusBody = "This is the syllabus body."
+ val data = seedData(students = 1, teachers = 1, courses = 1, syllabusBody = testSyllabusBody)
+ val student = data.studentsList[0]
+ val teacher = data.teachersList[0]
+ val course = data.coursesList[0]
+
+ Log.d(PREPARATION_TAG,"Seed an assignment for '${course.name}' course.")
+ val assignment = AssignmentsApi.createAssignment(course.id, teacher.token, submissionTypes = listOf(
+ SubmissionType.ON_PAPER), withDescription = true, pointsPossible = 15.0, dueAt = 1.days.fromNow.iso8601)
+
+ Log.d(STEP_TAG,"Login with user: '${student.name}', login id: '${student.loginId}'.")
+ tokenLogin(student)
+ dashboardPage.waitForRender()
+
+ Log.d(STEP_TAG, "Open the '${course.name}' course's 'Manage Offline Content' page via the more menu of the Dashboard Page.")
+ dashboardPage.clickCourseOverflowMenu(course.name, "Manage Offline Content")
+
+ Log.d(STEP_TAG, "Expand '${course.name}' course.")
+ manageOfflineContentPage.expandCollapseItem(course.name)
+
+ Log.d(STEP_TAG, "Select the 'Announcements' of '${course.name}' course for sync. Click on the 'Sync' button.")
+ manageOfflineContentPage.changeItemSelectionState("Syllabus")
+ manageOfflineContentPage.clickOnSyncButtonAndConfirm()
+
+ Log.d(STEP_TAG, "Assert that the offline sync icon only displayed on the synced course's course card.")
+ dashboardPage.assertCourseOfflineSyncIconVisible(course.name)
+ device.waitForIdle()
+
+ Log.d(PREPARATION_TAG, "Turn off the Wi-Fi and Mobile Data on the device, so it will go offline.")
+ turnOffConnectionViaADB()
+ OfflineTestUtils.waitForNetworkToGoOffline(device)
+
+ Log.d(STEP_TAG,"Wait for the Dashboard Page to be rendered. Select '${course.name}' course.")
+ dashboardPage.waitForRender()
+ dashboardPage.selectCourse(course)
+
+ Log.d(STEP_TAG,"Navigate to Syllabus Page. Assert that the syllabus body string is displayed. Assert that the toolbar subtitle is the '${course.name}' course name.")
+ courseBrowserPage.selectSyllabus()
+ syllabusPage.assertSyllabusBody(testSyllabusBody)
+ syllabusPage.assertToolbarCourseTitle(course.name)
+
+ Log.d(STEP_TAG,"Navigate to 'Summary' tab. Assert that all of the items, so '${assignment.name}' assignment is displayed.")
+ syllabusPage.selectSummaryTab()
+ syllabusPage.assertItemDisplayed(assignment.name)
+
+ Log.d(STEP_TAG, "Assert that the Offline Indicator (bottom banner) is displayed on the Page List Page.")
+ OfflineTestUtils.assertOfflineIndicator()
+ }
+ @After
+ fun tearDown() {
+ Log.d(PREPARATION_TAG, "Turn back on the Wi-Fi and Mobile Data on the device, so it will come back online.")
+ turnOnConnectionViaADB()
+ }
+}
\ 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 75dd998301..582ece4af2 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
@@ -19,6 +19,7 @@ import androidx.test.espresso.Espresso
import androidx.test.espresso.web.webdriver.Locator
import com.instructure.canvas.espresso.FeatureCategory
import com.instructure.canvas.espresso.Priority
+import com.instructure.canvas.espresso.Stub
import com.instructure.canvas.espresso.TestCategory
import com.instructure.canvas.espresso.TestMetaData
import com.instructure.canvas.espresso.mockCanvas.MockCanvas
@@ -53,6 +54,7 @@ class AnnouncementInteractionTest : StudentTest() {
// (This kind of seems like more of a test of the mocked endpoint, but we'll go with it.)
@Test
@TestMetaData(Priority.MANDATORY, FeatureCategory.ANNOUNCEMENTS, TestCategory.INTERACTION)
+ @Stub("This can only test the old discussions, will be modified later to test the old discussions in offline mode")
fun testAnnouncement_replyToSectionSpecificAnnouncement() {
val data = getToCourse(createSections = true)
@@ -70,11 +72,11 @@ class AnnouncementInteractionTest : StudentTest() {
// the discussion list page / discussion details page
discussionListPage.assertTopicDisplayed(announcement.title!!)
discussionListPage.selectTopic(announcement.title!!)
- discussionDetailsPage.assertTopicInfoShowing(announcement)
- discussionDetailsPage.sendReply("Will do!")
+ nativeDiscussionDetailsPage.assertTopicInfoShowing(announcement)
+ nativeDiscussionDetailsPage.sendReply("Will do!")
//Find our DiscussionReply
val reply = data.discussionTopics[announcement.id]?.views?.find {it.message == "Will do!"} !!
- discussionDetailsPage.assertReplyDisplayed(reply)
+ nativeDiscussionDetailsPage.assertReplyDisplayed(reply)
// Just for fun, let's change the user to be enrolled in a section of the course to which
// the announcement does not apply, and make sure that the user no longer sees the announcement.
@@ -91,6 +93,7 @@ class AnnouncementInteractionTest : StudentTest() {
// User can preview an announcement attachment
@Test
@TestMetaData(Priority.MANDATORY, FeatureCategory.ANNOUNCEMENTS, TestCategory.INTERACTION)
+ @Stub("This can only test the old discussions, will be modified later to test the old discussions in offline mode")
fun testAnnouncement_previewAttachment() {
val data = getToCourse()
@@ -123,8 +126,8 @@ class AnnouncementInteractionTest : StudentTest() {
// Now let's test
courseBrowserPage.selectAnnouncements()
discussionListPage.selectTopic(announcement.title!!)
- discussionDetailsPage.assertMainAttachmentDisplayed()
- discussionDetailsPage.previewAndCheckMainAttachment(
+ nativeDiscussionDetailsPage.assertMainAttachmentDisplayed()
+ nativeDiscussionDetailsPage.previewAndCheckMainAttachment(
WebViewTextCheck(Locator.ID, "p1", "Et tu, Brute?")
)
@@ -133,6 +136,7 @@ class AnnouncementInteractionTest : StudentTest() {
// View/reply to an announcement
@Test
@TestMetaData(Priority.MANDATORY, FeatureCategory.ANNOUNCEMENTS, TestCategory.INTERACTION)
+ @Stub("This can only test the old discussions, will be modified later to test the old discussions in offline mode")
fun testAnnouncement_reply() {
val data = getToCourse()
@@ -147,11 +151,11 @@ class AnnouncementInteractionTest : StudentTest() {
courseBrowserPage.selectAnnouncements()
discussionListPage.assertTopicDisplayed(announcement.title!!)
discussionListPage.selectTopic(announcement.title!!)
- discussionDetailsPage.assertTopicInfoShowing(announcement)
- discussionDetailsPage.sendReply("Roger!")
+ nativeDiscussionDetailsPage.assertTopicInfoShowing(announcement)
+ nativeDiscussionDetailsPage.sendReply("Roger!")
//Find our DiscussionReply
val reply = data.discussionTopics[announcement.id]?.views?.find {it.message == "Roger!"} !!
- discussionDetailsPage.assertReplyDisplayed(reply)
+ nativeDiscussionDetailsPage.assertReplyDisplayed(reply)
}
// Tests that we can create an announcement (as teacher).
diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/DashboardInteractionTest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/DashboardInteractionTest.kt
index 8392395b13..baf444bf42 100644
--- a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/DashboardInteractionTest.kt
+++ b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/DashboardInteractionTest.kt
@@ -63,7 +63,7 @@ class DashboardInteractionTest : StudentTest() {
val data = setUpData(courseCount = 1, favoriteCourseCount = 1)
goToDashboard(data)
dashboardPage.clickInboxTab()
- inboxPage.goToDashboard()
+ dashboardPage.goToDashboard()
dashboardPage.assertDisplaysCourse(data.courses.values.first()) // disambiguates via isDisplayed()
// These get confused by the existence of multiple DashboardPages in the layout
diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/DiscussionsInteractionTest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/DiscussionsInteractionTest.kt
index 25310d5be8..7aa0d73eb2 100644
--- a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/DiscussionsInteractionTest.kt
+++ b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/DiscussionsInteractionTest.kt
@@ -21,6 +21,7 @@ import androidx.test.espresso.Espresso
import androidx.test.espresso.web.webdriver.Locator
import com.instructure.canvas.espresso.FeatureCategory
import com.instructure.canvas.espresso.Priority
+import com.instructure.canvas.espresso.Stub
import com.instructure.canvas.espresso.TestCategory
import com.instructure.canvas.espresso.TestMetaData
import com.instructure.canvas.espresso.mockCanvas.MockCanvas
@@ -51,6 +52,7 @@ class DiscussionsInteractionTest : StudentTest() {
// Verify that a discussion header shows up properly after discussion creation
@Test
@TestMetaData(Priority.MANDATORY, FeatureCategory.DISCUSSIONS, TestCategory.INTERACTION)
+ @Stub("This can only test the old discussions, will be modified later to test the old discussions in offline mode")
fun testDiscussionCreate_base() {
val data = getToCourse(studentCount = 1, courseCount = 1, enableDiscussionTopicCreation = true)
@@ -61,8 +63,8 @@ class DiscussionsInteractionTest : StudentTest() {
discussionListPage.pullToUpdate()
discussionListPage.assertTopicDisplayed(topicName)
discussionListPage.selectTopic(topicName)
- discussionDetailsPage.assertTitleText(topicName)
- discussionDetailsPage.assertDescriptionText(topicDescription)
+ nativeDiscussionDetailsPage.assertTitleText(topicName)
+ nativeDiscussionDetailsPage.assertDescriptionText(topicDescription)
}
// Tests the creation of a discussion with an attachment.
@@ -70,6 +72,7 @@ class DiscussionsInteractionTest : StudentTest() {
// so the attachment is done behind the scenes, after the fact.
@Test
@TestMetaData(Priority.MANDATORY, FeatureCategory.DISCUSSIONS, TestCategory.INTERACTION)
+ @Stub("This can only test the old discussions, will be modified later to test the old discussions in offline mode")
fun testDiscussionCreate_withAttachment() {
val data = getToCourse(studentCount = 1, courseCount = 1, enableDiscussionTopicCreation = true)
val course = data.courses.values.first()
@@ -101,10 +104,10 @@ class DiscussionsInteractionTest : StudentTest() {
discussionListPage.pullToUpdate()
discussionListPage.assertTopicDisplayed(topicName)
discussionListPage.selectTopic(topicName)
- discussionDetailsPage.assertTitleText(topicName)
- discussionDetailsPage.assertDescriptionText(topicDescription)
- discussionDetailsPage.assertMainAttachmentDisplayed()
- discussionDetailsPage.previewAndCheckMainAttachment(
+ nativeDiscussionDetailsPage.assertTitleText(topicName)
+ nativeDiscussionDetailsPage.assertDescriptionText(topicDescription)
+ nativeDiscussionDetailsPage.assertMainAttachmentDisplayed()
+ nativeDiscussionDetailsPage.previewAndCheckMainAttachment(
WebViewTextCheck(Locator.ID, "header1", "Famous Quote"),
WebViewTextCheck(Locator.ID, "p1", "-- Socrates")
)
@@ -125,6 +128,7 @@ class DiscussionsInteractionTest : StudentTest() {
// Tests that links to other Canvas content routes properly
@Test
@TestMetaData(Priority.IMPORTANT, FeatureCategory.DISCUSSIONS, TestCategory.INTERACTION)
+ @Stub("This can only test the old discussions, will be modified later to test the old discussions in offline mode")
fun testDiscussion_linksRouteInApp() {
val data = getToCourse(studentCount = 2, courseCount = 2, enableDiscussionTopicCreation = true)
val course1 = data.courses.values.first()
@@ -145,7 +149,7 @@ class DiscussionsInteractionTest : StudentTest() {
courseBrowserPage.selectDiscussions()
discussionListPage.pullToUpdate()
discussionListPage.selectTopic(topicName)
- discussionDetailsPage.clickLinkInDescription(course2LinkElementId) // Should navigate to course2
+ nativeDiscussionDetailsPage.clickLinkInDescription(course2LinkElementId) // Should navigate to course2
courseBrowserPage.assertTitleCorrect(course2)
}
@@ -153,6 +157,7 @@ class DiscussionsInteractionTest : StudentTest() {
// Replies automatically get marked as read as the user scrolls through the list
@Test
@TestMetaData(Priority.IMPORTANT, FeatureCategory.DISCUSSIONS, TestCategory.INTERACTION)
+ @Stub("This can only test the old discussions, will be modified later to test the old discussions in offline mode")
fun testDiscussion_postsGetMarkedAsRead() {
val data = getToCourse(studentCount = 1, courseCount = 1, enableDiscussionTopicCreation = true)
val course = data.courses.values.first()
@@ -180,8 +185,8 @@ class DiscussionsInteractionTest : StudentTest() {
discussionListPage.assertUnreadCount(topicHeader.title!!, 1)
discussionListPage.selectTopic(topicHeader.title!!)
sleep(3000) // let's allow time for the webview to become populated/visible before we scroll to it
- discussionDetailsPage.scrollToRepliesWebview() // may be necessary on shorter screens / landscape
- discussionDetailsPage.waitForUnreadIndicatorToDisappear(discussionEntry)
+ nativeDiscussionDetailsPage.scrollToRepliesWebview() // may be necessary on shorter screens / landscape
+ nativeDiscussionDetailsPage.waitForUnreadIndicatorToDisappear(discussionEntry)
Espresso.pressBack() // Back to discussionListPage
discussionListPage.pullToUpdate()
discussionListPage.assertUnreadCount(topicHeader.title!!, 0)
@@ -192,6 +197,7 @@ class DiscussionsInteractionTest : StudentTest() {
// NOTE: Very similar to testDiscussionCreate_withAttachment
@Test
@TestMetaData(Priority.MANDATORY, FeatureCategory.DISCUSSIONS, TestCategory.INTERACTION)
+ @Stub("This can only test the old discussions, will be modified later to test the old discussions in offline mode")
fun testDiscussion_previewAttachment() {
val data = getToCourse(studentCount = 1, courseCount = 1, enableDiscussionTopicCreation = true)
@@ -222,9 +228,9 @@ class DiscussionsInteractionTest : StudentTest() {
courseBrowserPage.selectDiscussions()
discussionListPage.selectTopic(topicHeader.title!!)
- discussionDetailsPage.assertTopicInfoShowing(topicHeader)
- discussionDetailsPage.assertMainAttachmentDisplayed()
- discussionDetailsPage.previewAndCheckMainAttachment(
+ nativeDiscussionDetailsPage.assertTopicInfoShowing(topicHeader)
+ nativeDiscussionDetailsPage.assertMainAttachmentDisplayed()
+ nativeDiscussionDetailsPage.previewAndCheckMainAttachment(
WebViewTextCheck(Locator.ID, "header1", "Famous Quote"),
WebViewTextCheck(Locator.ID, "p1", "No matter where you go")
)
@@ -234,6 +240,7 @@ class DiscussionsInteractionTest : StudentTest() {
// Tests that users can like entries and the correct like count is displayed, if the liking is enabled
@Test
@TestMetaData(Priority.MANDATORY, FeatureCategory.DISCUSSIONS, TestCategory.INTERACTION)
+ @Stub("This can only test the old discussions, will be modified later to test the old discussions in offline mode")
fun testDiscussionLikePost_base() {
val data = getToCourse(studentCount = 1, courseCount = 1, enableDiscussionTopicCreation = true)
@@ -262,19 +269,20 @@ class DiscussionsInteractionTest : StudentTest() {
discussionListPage.selectTopic(topicName)
// Check that favoriting works as expected
- discussionDetailsPage.assertFavoritingEnabled(discussionEntry)
- discussionDetailsPage.assertLikeCount(discussionEntry, 0)
- discussionDetailsPage.clickLikeOnEntry(discussionEntry)
+ nativeDiscussionDetailsPage.assertFavoritingEnabled(discussionEntry)
+ nativeDiscussionDetailsPage.assertLikeCount(discussionEntry, 0)
+ nativeDiscussionDetailsPage.clickLikeOnEntry(discussionEntry)
sleep(1000) // Small wait to allow "like" to propagate
- discussionDetailsPage.assertLikeCount(discussionEntry, 1, refreshesAllowed = 2)
- discussionDetailsPage.clickLikeOnEntry(discussionEntry)
+ nativeDiscussionDetailsPage.assertLikeCount(discussionEntry, 1, refreshesAllowed = 2)
+ nativeDiscussionDetailsPage.clickLikeOnEntry(discussionEntry)
sleep(1000) // Small wait to allow "unlike" to propagate
- discussionDetailsPage.assertLikeCount(discussionEntry, 0)
+ nativeDiscussionDetailsPage.assertLikeCount(discussionEntry, 0)
}
// Tests that like count is shown if only graders can like
@Test
@TestMetaData(Priority.IMPORTANT, FeatureCategory.DISCUSSIONS, TestCategory.INTERACTION)
+ @Stub("This can only test the old discussions, will be modified later to test the old discussions in offline mode")
fun testDiscussionLikes_whenOnlyGradersCanRate() {
val data = getToCourse(studentCount = 1, courseCount = 1, enableDiscussionTopicCreation = true)
val course = data.courses.values.first()
@@ -305,8 +313,8 @@ class DiscussionsInteractionTest : StudentTest() {
discussionListPage.selectTopic(topicName)
// Check that ratings show
- discussionDetailsPage.assertFavoritingDisabled(discussionEntry)
- discussionDetailsPage.assertLikeCount(discussionEntry, 1)
+ nativeDiscussionDetailsPage.assertFavoritingDisabled(discussionEntry)
+ nativeDiscussionDetailsPage.assertLikeCount(discussionEntry, 1)
}
// Tests that discussion entry liking is not available when disabled
@@ -335,12 +343,13 @@ class DiscussionsInteractionTest : StudentTest() {
discussionListPage.assertTopicDisplayed(topicHeader.title!!)
discussionListPage.selectTopic(topicHeader.title!!)
- discussionDetailsPage.assertFavoritingDisabled(discussionEntry)
+ nativeDiscussionDetailsPage.assertFavoritingDisabled(discussionEntry)
}
// Test basic discussion view
@Test
@TestMetaData(Priority.MANDATORY, FeatureCategory.DISCUSSIONS, TestCategory.INTERACTION)
+ @Stub("This can only test the old discussions, will be modified later to test the old discussions in offline mode")
fun testDiscussionView_base() {
val data = getToCourse(studentCount = 1, courseCount = 1, enableDiscussionTopicCreation = true)
val course1 = data.courses.values.first()
@@ -355,12 +364,13 @@ class DiscussionsInteractionTest : StudentTest() {
discussionListPage.pullToUpdate()
discussionListPage.assertTopicDisplayed(topicHeader.title!!)
discussionListPage.selectTopic(topicHeader.title!!)
- discussionDetailsPage.assertTopicInfoShowing(topicHeader)
+ nativeDiscussionDetailsPage.assertTopicInfoShowing(topicHeader)
}
// Test that you can reply to a discussion (if enabled)
@Test
@TestMetaData(Priority.MANDATORY, FeatureCategory.DISCUSSIONS, TestCategory.INTERACTION)
+ @Stub("This can only test the old discussions, will be modified later to test the old discussions in offline mode")
fun testDiscussionView_replies() {
val data = getToCourse(studentCount = 1, courseCount = 1, enableDiscussionTopicCreation = true)
val course1 = data.courses.values.first()
@@ -380,14 +390,15 @@ class DiscussionsInteractionTest : StudentTest() {
courseBrowserPage.selectDiscussions()
discussionListPage.pullToUpdate()
discussionListPage.selectTopic(topicHeader.title!!)
- discussionDetailsPage.assertRepliesDisplayed()
+ nativeDiscussionDetailsPage.assertRepliesDisplayed()
- discussionDetailsPage.assertReplyDisplayed(discussionEntry)
+ nativeDiscussionDetailsPage.assertReplyDisplayed(discussionEntry)
}
// Test that replies are not possible when they are not enabled
@Test
@TestMetaData(Priority.MANDATORY, FeatureCategory.DISCUSSIONS, TestCategory.INTERACTION)
+ @Stub("This can only test the old discussions, will be modified later to test the old discussions in offline mode")
fun testDiscussionView_repliesHiddenWhenNotPermitted() {
val data = getToCourse(studentCount = 1, courseCount = 1, enableDiscussionTopicCreation = true)
val course1 = data.courses.values.first()
@@ -403,12 +414,13 @@ class DiscussionsInteractionTest : StudentTest() {
courseBrowserPage.selectDiscussions()
discussionListPage.pullToUpdate()
discussionListPage.selectTopic(topicHeader.title!!)
- discussionDetailsPage.assertRepliesDisabled()
+ nativeDiscussionDetailsPage.assertRepliesDisabled()
}
// Test that a reply is displayed properly
@Test
@TestMetaData(Priority.MANDATORY, FeatureCategory.DISCUSSIONS, TestCategory.INTERACTION)
+ @Stub("This can only test the old discussions, will be modified later to test the old discussions in offline mode")
fun testDiscussionReply_base() {
val data = getToCourse(studentCount = 1, courseCount = 1, enableDiscussionTopicCreation = true)
val course1 = data.courses.values.first()
@@ -422,14 +434,14 @@ class DiscussionsInteractionTest : StudentTest() {
courseBrowserPage.selectDiscussions()
discussionListPage.pullToUpdate()
discussionListPage.selectTopic(topicHeader.title!!)
- discussionDetailsPage.assertTopicInfoShowing(topicHeader)
- discussionDetailsPage.assertRepliesEnabled()
+ nativeDiscussionDetailsPage.assertTopicInfoShowing(topicHeader)
+ nativeDiscussionDetailsPage.assertRepliesEnabled()
// Let's reply via the app
val replyText = "I'm a reply"
- discussionDetailsPage.sendReply(replyText)
+ nativeDiscussionDetailsPage.sendReply(replyText)
val discussionEntry = findDiscussionEntry(data, topicHeader.title!!, replyText)
- discussionDetailsPage.assertReplyDisplayed(discussionEntry, refreshesAllowed = 2)
+ nativeDiscussionDetailsPage.assertReplyDisplayed(discussionEntry, refreshesAllowed = 2)
}
// Tests replying with an attachment.
@@ -437,6 +449,7 @@ class DiscussionsInteractionTest : StudentTest() {
// so we add the attachments programmatically.
@Test
@TestMetaData(Priority.MANDATORY, FeatureCategory.DISCUSSIONS, TestCategory.INTERACTION)
+ @Stub("This can only test the old discussions, will be modified later to test the old discussions in offline mode")
fun testDiscussionReply_withAttachment() {
val data = getToCourse(studentCount = 1, courseCount = 1, enableDiscussionTopicCreation = true)
val course1 = data.courses.values.first()
@@ -454,7 +467,7 @@ class DiscussionsInteractionTest : StudentTest() {
// Let's reply via the app
val replyText = "I'm a reply"
- discussionDetailsPage.sendReply(replyText)
+ nativeDiscussionDetailsPage.sendReply(replyText)
// Now let's append the attachment after-the-fact, since it is very hard
// to manually attach anything via Espresso, since it would require manipulating
@@ -480,9 +493,9 @@ class DiscussionsInteractionTest : StudentTest() {
Espresso.pressBack()
discussionListPage.selectTopic(topicHeader.title!!)
- discussionDetailsPage.assertReplyDisplayed(discussionEntry)
- discussionDetailsPage.assertReplyAttachment(discussionEntry)
- discussionDetailsPage.previewAndCheckReplyAttachment(
+ nativeDiscussionDetailsPage.assertReplyDisplayed(discussionEntry)
+ nativeDiscussionDetailsPage.assertReplyAttachment(discussionEntry)
+ nativeDiscussionDetailsPage.previewAndCheckReplyAttachment(
discussionEntry,
WebViewTextCheck(Locator.ID, "header1", "Famous Quote"),
WebViewTextCheck(Locator.ID, "p1", "That's one small step")
@@ -492,6 +505,7 @@ class DiscussionsInteractionTest : StudentTest() {
// Tests that we can make a threaded reply to a reply
@Test
@TestMetaData(Priority.MANDATORY, FeatureCategory.DISCUSSIONS, TestCategory.INTERACTION)
+ @Stub("This can only test the old discussions, will be modified later to test the old discussions in offline mode")
fun testDiscussionReply_threaded() {
val data = getToCourse(studentCount = 1, courseCount = 1, enableDiscussionTopicCreation = true)
val course1 = data.courses.values.first()
@@ -509,19 +523,19 @@ class DiscussionsInteractionTest : StudentTest() {
// Let's reply via the app
val replyText = "I'm a reply"
- discussionDetailsPage.sendReply(replyText)
+ nativeDiscussionDetailsPage.sendReply(replyText)
// Verify that our reply has made it to the screen
val replyEntry = findDiscussionEntry(data, topicHeader.title!!, replyText)
- discussionDetailsPage.assertReplyDisplayed(replyEntry, refreshesAllowed = 2)
+ nativeDiscussionDetailsPage.assertReplyDisplayed(replyEntry, refreshesAllowed = 2)
// Now let's reply to the reply (i.e., threaded reply)
val replyReplyText = "Threaded Reply"
- discussionDetailsPage.replyToReply(replyEntry, replyReplyText)
+ nativeDiscussionDetailsPage.replyToReply(replyEntry, replyReplyText)
// And verify that our reply-to-reply is showing
val replyReplyEntry = findDiscussionEntry(data, topicHeader.title!!, replyReplyText)
- discussionDetailsPage.assertReplyDisplayed(replyReplyEntry, refreshesAllowed = 2)
+ nativeDiscussionDetailsPage.assertReplyDisplayed(replyReplyEntry, refreshesAllowed = 2)
}
// Tests that we can make a threaded reply with an attachment
@@ -529,6 +543,7 @@ class DiscussionsInteractionTest : StudentTest() {
// so we add the attachments programmatically.
@Test
@TestMetaData(Priority.MANDATORY, FeatureCategory.DISCUSSIONS, TestCategory.INTERACTION)
+ @Stub("This can only test the old discussions, will be modified later to test the old discussions in offline mode")
fun testDiscussionReply_threadedWithAttachment() {
val data = getToCourse(studentCount = 1, courseCount = 1, enableDiscussionTopicCreation = true)
val course1 = data.courses.values.first()
@@ -546,15 +561,15 @@ class DiscussionsInteractionTest : StudentTest() {
// Let's reply via the app
val replyText = "I'm a reply"
- discussionDetailsPage.sendReply(replyText)
+ nativeDiscussionDetailsPage.sendReply(replyText)
// Make sure that the reply is displayed, so that we can reply to it
val replyEntry = findDiscussionEntry(data, topicHeader.title!!, replyText)
- discussionDetailsPage.assertReplyDisplayed(replyEntry, refreshesAllowed = 2)
+ nativeDiscussionDetailsPage.assertReplyDisplayed(replyEntry, refreshesAllowed = 2)
// Now let's reply to the reply (i.e., threaded reply)
val replyReplyText = "Threaded Reply"
- discussionDetailsPage.replyToReply(replyEntry, replyReplyText)
+ nativeDiscussionDetailsPage.replyToReply(replyEntry, replyReplyText)
// And verify that our reply-to-reply is showing
val replyReplyEntry = findDiscussionEntry(data, topicHeader.title!!, replyReplyText)
@@ -580,9 +595,9 @@ class DiscussionsInteractionTest : StudentTest() {
Espresso.pressBack()
discussionListPage.selectTopic(topicHeader.title!!)
- discussionDetailsPage.assertReplyDisplayed(replyReplyEntry)
- discussionDetailsPage.assertReplyAttachment(replyReplyEntry)
- discussionDetailsPage.previewAndCheckReplyAttachment(
+ nativeDiscussionDetailsPage.assertReplyDisplayed(replyReplyEntry)
+ nativeDiscussionDetailsPage.assertReplyAttachment(replyReplyEntry)
+ nativeDiscussionDetailsPage.previewAndCheckReplyAttachment(
replyReplyEntry,
WebViewTextCheck(Locator.ID, "header1", "Famous Quote"),
WebViewTextCheck(Locator.ID, "p1", "The only thing we have to fear")
@@ -593,6 +608,7 @@ class DiscussionsInteractionTest : StudentTest() {
// Tests a discussion with a linked assignment.
@Test
@TestMetaData(Priority.MANDATORY, FeatureCategory.DISCUSSIONS, TestCategory.INTERACTION)
+ @Stub("This can only test the old discussions, will be modified later to test the old discussions in offline mode")
fun testDiscussion_linkedAssignment() {
val data = MockCanvas.init(teacherCount = 1, studentCount = 1, courseCount = 1, favoriteCourseCount = 1)
@@ -628,12 +644,13 @@ class DiscussionsInteractionTest : StudentTest() {
dashboardPage.selectCourse(course)
courseBrowserPage.selectDiscussions()
discussionListPage.selectTopic(discussion.title!!)
- discussionDetailsPage.assertPointsPossibleDisplayed(assignment.pointsPossible.toInt().toString())
+ nativeDiscussionDetailsPage.assertPointsPossibleDisplayed(assignment.pointsPossible.toInt().toString())
}
// Tests a discussion with a linked assignment, show possible points if not restricted
@Test
@TestMetaData(Priority.MANDATORY, FeatureCategory.DISCUSSIONS, TestCategory.INTERACTION)
+ @Stub("This can only test the old discussions, will be modified later to test the old discussions in offline mode")
fun testDiscussion_showPointsIfNotRestricted() {
val data = MockCanvas.init(teacherCount = 1, studentCount = 1, courseCount = 1, favoriteCourseCount = 1)
@@ -672,13 +689,14 @@ class DiscussionsInteractionTest : StudentTest() {
dashboardPage.selectCourse(course)
courseBrowserPage.selectDiscussions()
discussionListPage.selectTopic(discussion.title!!)
- discussionDetailsPage.assertPointsPossibleDisplayed(assignment.pointsPossible.toInt().toString())
+ nativeDiscussionDetailsPage.assertPointsPossibleDisplayed(assignment.pointsPossible.toInt().toString())
}
// Tests a discussion with a linked assignment, hide possible points if restricted
@Test
@TestMetaData(Priority.MANDATORY, FeatureCategory.DISCUSSIONS, TestCategory.INTERACTION)
+ @Stub("This can only test the old discussions, will be modified later to test the old discussions in offline mode")
fun testDiscussion_hidePointsIfRestricted() {
val data = MockCanvas.init(teacherCount = 1, studentCount = 1, courseCount = 1, favoriteCourseCount = 1)
@@ -717,7 +735,7 @@ class DiscussionsInteractionTest : StudentTest() {
dashboardPage.selectCourse(course)
courseBrowserPage.selectDiscussions()
discussionListPage.selectTopic(discussion.title!!)
- discussionDetailsPage.assertPointsPossibleNotDisplayed()
+ nativeDiscussionDetailsPage.assertPointsPossibleNotDisplayed()
}
//
diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/ElementaryDashboardInteractionTest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/ElementaryDashboardInteractionTest.kt
index e1762cd4be..c77a537379 100644
--- a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/ElementaryDashboardInteractionTest.kt
+++ b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/ElementaryDashboardInteractionTest.kt
@@ -40,7 +40,7 @@ class ElementaryDashboardInteractionTest : StudentTest() {
goToElementaryDashboard(courseCount = 1, favoriteCourseCount = 1)
elementaryDashboardPage.assertPageObjects()
elementaryDashboardPage.clickOnBottomNavigationBarInbox()
- inboxPage.goToDashboard()
+ dashboardPage.goToDashboard()
elementaryDashboardPage.assertToolbarTitle()
elementaryDashboardPage.assertElementaryTabVisibleAndSelected(ElementaryDashboardPage.ElementaryTabType.HOMEROOM)
}
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 007b295f5f..16579a02bd 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
@@ -134,7 +134,7 @@ class GroupLinksInteractionTest : StudentTest() {
dashboardPage.selectGroup(group)
courseBrowserPage.selectAnnouncements()
discussionListPage.selectTopic(announcement.title!!)
- discussionDetailsPage.assertTopicInfoShowing(announcement)
+ discussionDetailsPage.assertToolbarDiscussionTitle(announcement.title!!)
}
@@ -156,7 +156,7 @@ class GroupLinksInteractionTest : StudentTest() {
dashboardPage.selectGroup(group)
courseBrowserPage.selectDiscussions()
discussionListPage.selectTopic(discussion.title!!)
- discussionDetailsPage.assertTopicInfoShowing(discussion)
+ discussionDetailsPage.assertToolbarDiscussionTitle(discussion.title!!)
}
// Link to group discussion list opens list - eg: "/groups/:id/discussion_topics"
diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/HomeroomInteractionTest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/HomeroomInteractionTest.kt
index fc2ed7ace6..8fe96b8638 100644
--- a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/HomeroomInteractionTest.kt
+++ b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/HomeroomInteractionTest.kt
@@ -198,8 +198,7 @@ class HomeroomInteractionTest : StudentTest() {
homeroomPage.openCourseAnnouncement(courseAnnouncement.title!!)
- discussionDetailsPage.assertPageObjects()
- discussionDetailsPage.assertTitleText(courseAnnouncement.title!!)
+ discussionDetailsPage.assertToolbarDiscussionTitle(courseAnnouncement.title!!)
}
@Test
diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/ImportantDatesInteractionTest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/ImportantDatesInteractionTest.kt
index 2262539a98..e032f94ff0 100644
--- a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/ImportantDatesInteractionTest.kt
+++ b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/ImportantDatesInteractionTest.kt
@@ -27,19 +27,21 @@ import com.instructure.canvas.espresso.mockCanvas.addAssignmentCalendarEvent
import com.instructure.canvas.espresso.mockCanvas.addCourseCalendarEvent
import com.instructure.canvas.espresso.mockCanvas.init
import com.instructure.canvasapi2.models.Assignment
+import com.instructure.canvasapi2.models.CanvasContextPermission
import com.instructure.dataseeding.util.days
import com.instructure.dataseeding.util.fromNow
import com.instructure.dataseeding.util.iso8601
import com.instructure.student.ui.pages.ElementaryDashboardPage
-import com.instructure.student.ui.utils.StudentTest
+import com.instructure.student.ui.utils.StudentComposeTest
import com.instructure.student.ui.utils.tokenLoginElementary
import dagger.hilt.android.testing.HiltAndroidTest
import org.junit.Test
import java.text.SimpleDateFormat
-import java.util.*
+import java.util.Date
+import java.util.Locale
@HiltAndroidTest
-class ImportantDatesInteractionTest : StudentTest() {
+class ImportantDatesInteractionTest : StudentComposeTest() {
override fun displaysPageObjects() = Unit
@Test
@@ -49,7 +51,7 @@ class ImportantDatesInteractionTest : StudentTest() {
val data = createMockData(courseCount = 1)
val course = data.courses.values.toList()[0]
- val event = data.addCourseCalendarEvent(course.id, 2.days.fromNow.iso8601, "Important event", "Important event description", true)
+ val event = data.addCourseCalendarEvent(course, 2.days.fromNow.iso8601, "Important event", "Important event description", true)
goToImportantDatesTab(data)
importantDatesPage.assertItemDisplayed(event.title!!)
@@ -90,10 +92,10 @@ class ImportantDatesInteractionTest : StudentTest() {
fun testPullToRefresh() {
val data = createMockData(courseCount = 1)
val course = data.courses.values.toList()[0]
- val existedEventBeforeRefresh = data.addCourseCalendarEvent(course.id, 2.days.fromNow.iso8601, "Important event", "Important event description", true)
+ val existedEventBeforeRefresh = data.addCourseCalendarEvent(course, 2.days.fromNow.iso8601, "Important event", "Important event description", true)
goToImportantDatesTab(data)
- val eventToCheck = data.addCourseCalendarEvent(course.id, 2.days.fromNow.iso8601, "Important event 2", "Important event 2 description", true)
+ val eventToCheck = data.addCourseCalendarEvent(course, 2.days.fromNow.iso8601, "Important event 2", "Important event 2 description", true)
importantDatesPage.assertRecyclerViewItemCount(1)
importantDatesPage.assertDayTextIsDisplayed(generateDayString(existedEventBeforeRefresh.startDate))
@@ -111,7 +113,8 @@ class ImportantDatesInteractionTest : StudentTest() {
fun testOpenCalendarEvent() {
val data = createMockData(courseCount = 1)
val course = data.courses.values.toList()[0]
- val event = data.addCourseCalendarEvent(course.id, 2.days.fromNow.iso8601, "Important event", "Important event description", true)
+ data.coursePermissions[course.id] = CanvasContextPermission(manageCalendar = true)
+ val event = data.addCourseCalendarEvent(course, 2.days.fromNow.iso8601, "Important event", "Important event description", true)
goToImportantDatesTab(data)
@@ -120,8 +123,8 @@ class ImportantDatesInteractionTest : StudentTest() {
//Opening the calendar event
importantDatesPage.clickImportantDatesItem(event.title!!)
- calendarEventPage.verifyTitle(event.title!!)
- calendarEventPage.verifyDescription(event.description!!)
+ calendarEventDetailsPage.assertEventTitle(event.title!!)
+ calendarEventDetailsPage.verifyDescription(event.description!!)
importantDatesPage.assertDayTextIsDisplayed(generateDayString(event.startDate))
}
@@ -154,7 +157,7 @@ class ImportantDatesInteractionTest : StudentTest() {
val assignment = data.addAssignment(courseId = course.id, submissionTypeList = listOf(Assignment.SubmissionType.ONLINE_TEXT_ENTRY))
data.addAssignmentCalendarEvent(course.id, 2.days.fromNow.iso8601, assignment.name!!, assignment.description!!, true, assignment)
- val calendarEvent = data.addCourseCalendarEvent(course.id, 2.days.fromNow.iso8601, "Important event", "Important event description", true)
+ val calendarEvent = data.addCourseCalendarEvent(course, 2.days.fromNow.iso8601, "Important event", "Important event description", true)
val items = data.courseCalendarEvents
@@ -179,9 +182,9 @@ class ImportantDatesInteractionTest : StudentTest() {
val assignment = data.addAssignment(courseId = course.id, submissionTypeList = listOf(Assignment.SubmissionType.ONLINE_TEXT_ENTRY))
val twoDaysFromNowEvent = data.addAssignmentCalendarEvent(course.id,
2.days.fromNow.iso8601, "Important event two days later", "Important event two days later description", true, assignment)
- val threeDaysFromNowEvent = data.addCourseCalendarEvent(course.id,
+ val threeDaysFromNowEvent = data.addCourseCalendarEvent(course,
3.days.fromNow.iso8601, "Important event three days later", "Important event three days later description", true)
- val todayEvent = data.addCourseCalendarEvent(course.id,
+ val todayEvent = data.addCourseCalendarEvent(course,
0.days.fromNow.iso8601, "Important event Today", "Important event today description", true)
val items = data.courseCalendarEvents
diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/InboxInteractionTest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/InboxConversationInteractionTest.kt
similarity index 53%
rename from apps/student/src/androidTest/java/com/instructure/student/ui/interaction/InboxInteractionTest.kt
rename to apps/student/src/androidTest/java/com/instructure/student/ui/interaction/InboxConversationInteractionTest.kt
index bf6fbcdcec..e399c0c5ac 100644
--- a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/InboxInteractionTest.kt
+++ b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/InboxConversationInteractionTest.kt
@@ -24,11 +24,9 @@ import com.instructure.canvas.espresso.TestMetaData
import com.instructure.canvas.espresso.mockCanvas.MockCanvas
import com.instructure.canvas.espresso.mockCanvas.addConversation
import com.instructure.canvas.espresso.mockCanvas.addConversations
-import com.instructure.canvas.espresso.mockCanvas.addConversationsToCourseMap
import com.instructure.canvas.espresso.mockCanvas.addCoursePermissions
import com.instructure.canvas.espresso.mockCanvas.addRecipientsToCourse
import com.instructure.canvas.espresso.mockCanvas.addSentConversation
-import com.instructure.canvas.espresso.mockCanvas.createBasicConversation
import com.instructure.canvas.espresso.mockCanvas.init
import com.instructure.canvasapi2.models.Attachment
import com.instructure.canvasapi2.models.CanvasContextPermission
@@ -41,7 +39,7 @@ import dagger.hilt.android.testing.HiltAndroidTest
import org.junit.Test
@HiltAndroidTest
-class InboxInteractionTest : StudentTest() {
+class InboxConversationInteractionTest : StudentTest() {
override fun displaysPageObjects() = Unit // Not used for interaction tests
@Test
@@ -222,85 +220,6 @@ class InboxInteractionTest : StudentTest() {
inboxConversationPage.assertAttachmentDisplayed(attachmentName)
}
- @Test
- @TestMetaData(Priority.IMPORTANT, FeatureCategory.INBOX, TestCategory.INTERACTION)
- fun testInbox_filterMessagesByTypeAll() {
- // Should be able to filter messages by All
- val data = createInitialData()
- data.addConversations(userId = student1.id, messageBody = "Short body")
- val conversation = getFirstConversation(data)
- dashboardPage.clickInboxTab()
- inboxPage.assertConversationDisplayed(conversation.subject!!)
- }
-
- @Test
- @TestMetaData(Priority.IMPORTANT, FeatureCategory.INBOX, TestCategory.INTERACTION)
- fun testInbox_filterMessagesByTypeUnread() {
- // Should be able to filter messages by Unread
- val data = createInitialData()
- data.addConversations(userId = student1.id, messageBody = "Short body")
- dashboardPage.clickInboxTab()
- val conversation = data.conversations.values.first {
- it.workflowState == Conversation.WorkflowState.UNREAD
- }
- inboxPage.filterInbox("Unread")
- inboxPage.assertConversationDisplayed(conversation.subject!!)
- }
-
- @Test
- @TestMetaData(Priority.IMPORTANT, FeatureCategory.INBOX, TestCategory.INTERACTION)
- fun testInbox_filterMessagesByTypeStarred() {
- // Should be able to filter messages by Starred
- val data = createInitialData()
- data.addConversations(userId = student1.id, messageBody = "Short body")
- dashboardPage.clickInboxTab()
- val conversation = data.conversations.values.first {
- it.isStarred
- }
- inboxPage.filterInbox("Starred")
- inboxPage.assertConversationDisplayed(conversation.subject!!)
- }
-
- @Test
- @TestMetaData(Priority.IMPORTANT, FeatureCategory.INBOX, TestCategory.INTERACTION)
- fun testInbox_filterMessagesByTypeSend() {
- // Should be able to filter messages by Send
- val data = createInitialData()
- data.addConversations(userId = student1.id, messageBody = "Short body")
- dashboardPage.clickInboxTab()
- val conversation = data.conversations.values.first {
- it.workflowState == Conversation.WorkflowState.UNREAD
- }
- inboxPage.filterInbox("Sent")
- inboxPage.assertConversationDisplayed(conversation.subject!!)
- }
-
- @Test
- @TestMetaData(Priority.IMPORTANT, FeatureCategory.INBOX, TestCategory.INTERACTION)
- fun testInbox_filterMessagesByTypeArchived() {
- // Should be able to filter messages by Archived
- val data = createInitialData()
- data.addConversations(userId = student1.id, messageBody = "Short body")
- dashboardPage.clickInboxTab()
- val conversation = data.conversations.values.first {
- it.workflowState == Conversation.WorkflowState.ARCHIVED
- }
- inboxPage.filterInbox("Archived")
- inboxPage.assertConversationDisplayed(conversation.subject!!)
- }
-
- @Test
- @TestMetaData(Priority.IMPORTANT, FeatureCategory.INBOX, TestCategory.INTERACTION)
- fun testInbox_filterMessagesByContext() {
- // Should be able to filter messages by course or group
- val data = createInitialData(courseCount = 2)
- data.addConversationsToCourseMap(student1.id, data.courses.values.toList(), messageBody = "Short body")
- val conversation = data.conversationCourseMap[course1.id]!!.first()
- dashboardPage.clickInboxTab()
- inboxPage.selectInboxFilter(course1)
- inboxPage.assertConversationDisplayed(conversation.subject!!)
- }
-
@Test
@TestMetaData(Priority.IMPORTANT, FeatureCategory.INBOX, TestCategory.INTERACTION)
fun testInbox_canComposeAndSendToRoleGroupsIfPermissionEnabled() {
@@ -495,348 +414,6 @@ class InboxInteractionTest : StudentTest() {
inboxConversationPage.assertMessageNotDisplayed(replyMessage)
}
- @Test
- @TestMetaData(Priority.IMPORTANT, FeatureCategory.INBOX, TestCategory.INTERACTION)
- fun testInbox_showEditToolbarWhenConversationIsSelected() {
- val data = createInitialData()
- val conversation = data.addConversation(
- senderId = data.teachers.first().id,
- receiverIds = listOf(data.students.first().id),
- messageBody = "Body",
- messageSubject = "Subject")
- dashboardPage.clickInboxTab()
- inboxPage.selectConversation(conversation)
- inboxPage.assertEditToolbarIs(ViewMatchers.Visibility.VISIBLE)
- inboxPage.assertSelectedConversationNumber("1")
- }
-
- @Test
- @TestMetaData(Priority.IMPORTANT, FeatureCategory.INBOX, TestCategory.INTERACTION)
- fun testInbox_archiveMultipleConversations() {
- val data = createInitialData()
- data.addConversations(userId = student1.id, messageBody = "Short body")
- val conversation1 = data.addConversation(
- senderId = data.teachers.first().id,
- receiverIds = listOf(data.students.first().id),
- messageBody = "Body",
- messageSubject = "Subject")
- val conversation2 = data.addConversation(
- senderId = data.teachers.first().id,
- receiverIds = listOf(data.students.first().id),
- messageBody = "Body 2",
- messageSubject = "Subject 2")
- dashboardPage.clickInboxTab()
- inboxPage.selectConversations(listOf(conversation1.subject!!, conversation2.subject!!))
- inboxPage.clickArchive()
- inboxPage.assertConversationNotDisplayed(conversation1.subject!!)
- inboxPage.assertConversationNotDisplayed(conversation2.subject!!)
- inboxPage.assertEditToolbarIs(ViewMatchers.Visibility.GONE)
-
- inboxPage.filterInbox("Archived")
- inboxPage.assertConversationDisplayed(conversation1.subject!!)
- inboxPage.assertConversationDisplayed(conversation2.subject!!)
- }
-
- @Test
- @TestMetaData(Priority.IMPORTANT, FeatureCategory.INBOX, TestCategory.INTERACTION)
- fun testInbox_starMultipleConversations() {
- val data = createInitialData()
- val conversation1 = data.addConversation(
- senderId = data.teachers.first().id,
- receiverIds = listOf(data.students.first().id),
- messageBody = "Body",
- messageSubject = "Subject")
- val conversation2 = data.addConversation(
- senderId = data.teachers.first().id,
- receiverIds = listOf(data.students.first().id),
- messageBody = "Body 2",
- messageSubject = "Subject 2")
- data.addConversations(userId = student1.id, messageBody = "Short body")
- dashboardPage.clickInboxTab()
- inboxPage.selectConversations(listOf(conversation1.subject!!, conversation2.subject!!))
- inboxPage.clickStar()
- inboxPage.assertConversationStarred(conversation1.subject!!)
- inboxPage.assertConversationStarred(conversation2.subject!!)
- inboxPage.assertEditToolbarIs(ViewMatchers.Visibility.VISIBLE)
- }
-
- @Test
- @TestMetaData(Priority.IMPORTANT, FeatureCategory.INBOX, TestCategory.INTERACTION)
- fun testInbox_unstarMultipleConversations() {
- val data = createInitialData()
- data.addConversations(userId = student1.id, messageBody = "Short body")
- val conversation1 = data.addConversation(
- senderId = data.teachers.first().id,
- receiverIds = listOf(data.students.first().id),
- messageBody = "Body",
- messageSubject = "Subject")
- data.conversations[conversation1.id] = conversation1.copy(isStarred = true)
- val conversation2 = data.addConversation(
- senderId = data.teachers.first().id,
- receiverIds = listOf(data.students.first().id),
- messageBody = "Body 2",
- messageSubject = "Subject 2")
- data.conversations[conversation2.id] = conversation2.copy(isStarred = true)
-
- dashboardPage.clickInboxTab()
- inboxPage.filterInbox("Starred")
- inboxPage.selectConversations(listOf(conversation1.subject!!, conversation2.subject!!))
- inboxPage.assertSelectedConversationNumber("2")
- inboxPage.clickUnstar()
- inboxPage.assertConversationNotDisplayed(conversation1.subject!!)
- inboxPage.assertConversationNotDisplayed(conversation2.subject!!)
- inboxPage.assertEditToolbarIs(ViewMatchers.Visibility.GONE)
- }
-
- @Test
- @TestMetaData(Priority.COMMON, FeatureCategory.INBOX, TestCategory.INTERACTION)
- fun testInbox_starMultipleConversationWithDifferentStates() {
- val data = createInitialData()
- val conversation1 = data.addConversation(
- senderId = data.teachers.first().id,
- receiverIds = listOf(data.students.first().id),
- messageBody = "Body",
- messageSubject = "Subject")
- data.conversations[conversation1.id] = conversation1.copy(isStarred = true)
- val conversation2 = data.addConversation(
- senderId = data.teachers.first().id,
- receiverIds = listOf(data.students.first().id),
- messageBody = "Body 2",
- messageSubject = "Subject 2")
- data.conversations[conversation2.id] = conversation2.copy(isStarred = false)
- data.addConversations(userId = student1.id, messageBody = "Short body")
-
- dashboardPage.clickInboxTab()
- inboxPage.selectConversations(listOf(conversation1.subject!!, conversation2.subject!!))
- inboxPage.assertSelectedConversationNumber("2")
-
- inboxPage.assertStarDisplayed()
- inboxPage.clickStar()
-
- inboxPage.assertConversationStarred(conversation1.subject!!)
- inboxPage.assertConversationStarred(conversation2.subject!!)
- inboxPage.assertSelectedConversationNumber("2")
- inboxPage.assertEditToolbarIs(ViewMatchers.Visibility.VISIBLE)
-
- inboxPage.assertUnStarDisplayed()
- inboxPage.clickUnstar()
-
- inboxPage.assertConversationNotStarred(conversation1.subject!!)
- inboxPage.assertConversationNotStarred(conversation2.subject!!)
- }
-
- @Test
- @TestMetaData(Priority.IMPORTANT, FeatureCategory.INBOX, TestCategory.INTERACTION)
- fun testInbox_markAsReadUnreadMultipleConversations() {
- val data = createInitialData()
- data.addConversations(userId = student1.id, messageBody = "Short body")
- val conversation1 = data.addConversation(
- senderId = data.teachers.first().id,
- receiverIds = listOf(data.students.first().id),
- messageBody = "Body",
- messageSubject = "Subject")
- val conversation2 = data.addConversation(
- senderId = data.teachers.first().id,
- receiverIds = listOf(data.students.first().id),
- messageBody = "Body 2",
- messageSubject = "Subject 2")
-
- dashboardPage.clickInboxTab()
-
- inboxPage.selectConversations(listOf(conversation1.subject!!, conversation2.subject!!))
- inboxPage.assertSelectedConversationNumber("2")
-
- inboxPage.clickMarkAsRead()
- inboxPage.assertUnreadMarkerVisibility(conversation1.subject!!, ViewMatchers.Visibility.GONE)
- inboxPage.assertUnreadMarkerVisibility(conversation2.subject!!, ViewMatchers.Visibility.GONE)
- inboxPage.assertEditToolbarIs(ViewMatchers.Visibility.VISIBLE)
-
- inboxPage.clickMarkAsUnread()
- inboxPage.assertUnreadMarkerVisibility(conversation1.subject!!, ViewMatchers.Visibility.VISIBLE)
- inboxPage.assertUnreadMarkerVisibility(conversation2.subject!!, ViewMatchers.Visibility.VISIBLE)
- inboxPage.assertEditToolbarIs(ViewMatchers.Visibility.VISIBLE)
-
- inboxPage.selectConversation(conversation1)
- inboxPage.clickMarkAsRead()
-
- inboxPage.assertUnreadMarkerVisibility(conversation1.subject!!, ViewMatchers.Visibility.VISIBLE)
- inboxPage.assertUnreadMarkerVisibility(conversation2.subject!!, ViewMatchers.Visibility.GONE)
- inboxPage.assertEditToolbarIs(ViewMatchers.Visibility.VISIBLE)
-
- inboxPage.selectConversation(conversation1)
- inboxPage.clickMarkAsRead()
-
- inboxPage.assertUnreadMarkerVisibility(conversation1.subject!!, ViewMatchers.Visibility.GONE)
- inboxPage.assertUnreadMarkerVisibility(conversation2.subject!!, ViewMatchers.Visibility.GONE)
- }
-
- @Test
- @TestMetaData(Priority.IMPORTANT, FeatureCategory.INBOX, TestCategory.INTERACTION)
- fun testInbox_deleteMultipleConversations() {
- val data = createInitialData()
- data.addConversations(userId = student1.id, messageBody = "Short body")
- val conversation1 = data.addConversation(
- senderId = data.teachers.first().id,
- receiverIds = listOf(data.students.first().id),
- messageBody = "Body",
- messageSubject = "Subject")
- val conversation2 = data.addConversation(
- senderId = data.teachers.first().id,
- receiverIds = listOf(data.students.first().id),
- messageBody = "Body 2",
- messageSubject = "Subject 2")
-
- dashboardPage.clickInboxTab()
-
- inboxPage.selectConversations(listOf(conversation1.subject!!, conversation2.subject!!))
- inboxPage.assertSelectedConversationNumber("2")
-
- inboxPage.clickDelete()
- inboxPage.confirmDelete()
-
- inboxPage.assertConversationNotDisplayed(conversation1.subject!!)
- inboxPage.assertConversationNotDisplayed(conversation2.subject!!)
- inboxPage.assertEditToolbarIs(ViewMatchers.Visibility.GONE)
- }
-
- @Test
- @TestMetaData(Priority.IMPORTANT, FeatureCategory.INBOX, TestCategory.INTERACTION)
- fun testInbox_swipeToReadUnread() {
- val data = createInitialData()
- data.addConversations(userId = student1.id, messageBody = "Short body")
- val conversation = data.addConversation(
- senderId = data.teachers.first().id,
- receiverIds = listOf(data.students.first().id),
- messageBody = "Body",
- messageSubject = "Subject")
-
- dashboardPage.clickInboxTab()
- inboxPage.swipeConversationRight(conversation)
- inboxPage.assertUnreadMarkerVisibility(conversation.subject!!, ViewMatchers.Visibility.GONE)
-
- inboxPage.swipeConversationRight(conversation)
- inboxPage.assertUnreadMarkerVisibility(conversation.subject!!, ViewMatchers.Visibility.VISIBLE)
- }
-
- @Test
- @TestMetaData(Priority.COMMON, FeatureCategory.INBOX, TestCategory.INTERACTION)
- fun testInbox_swipeGesturesInUnreadScope() {
- val data = createInitialData()
- val conversation = data.addConversation(
- senderId = data.teachers.first().id,
- receiverIds = listOf(data.students.first().id),
- messageBody = "Unread body",
- messageSubject = "Unread Subject")
- val unreadConversation = data.createBasicConversation(data.teachers.first().id, workflowState = Conversation.WorkflowState.UNREAD, messageBody = "Unread Body 2")
- data.conversations[unreadConversation.id] = unreadConversation
-
- dashboardPage.clickInboxTab()
- inboxPage.filterInbox("Unread")
- inboxPage.swipeConversationRight(conversation)
- inboxPage.assertConversationNotDisplayed(conversation.subject!!)
-
- inboxPage.swipeConversationLeft(unreadConversation)
- inboxPage.assertConversationNotDisplayed(unreadConversation.subject!!)
-
- inboxPage.filterInbox("Archived")
- inboxPage.assertConversationDisplayed(unreadConversation.subject!!)
- }
-
- @Test
- @TestMetaData(Priority.NICE_TO_HAVE, FeatureCategory.INBOX, TestCategory.INTERACTION)
- fun testInbox_swipeGesturesInSentScope() {
- val data = createInitialData()
- val sentConversation = data.addConversation(
- senderId = data.students.first().id,
- receiverIds = listOf(data.teachers.first().id),
- messageBody = "Sent body",
- messageSubject = "Sent Subject")
- val sentConversation2 = data.createBasicConversation(data.students.first().id, messageBody = "Sent Body 2")
- data.conversations[sentConversation2.id] = sentConversation2
-
- dashboardPage.clickInboxTab()
- inboxPage.filterInbox("Sent")
- inboxPage.swipeConversationRight(sentConversation)
- inboxPage.assertUnreadMarkerVisibility(sentConversation.subject!!, ViewMatchers.Visibility.GONE)
-
- inboxPage.swipeConversationRight(sentConversation)
- inboxPage.assertUnreadMarkerVisibility(sentConversation.subject!!, ViewMatchers.Visibility.VISIBLE)
-
- inboxPage.filterInbox("Unread")
- inboxPage.assertConversationDisplayed(sentConversation.subject!!)
- }
-
- @Test
- @TestMetaData(Priority.IMPORTANT, FeatureCategory.INBOX, TestCategory.INTERACTION)
- fun testInbox_swipeToArchive() {
- val data = createInitialData()
- val conversation = data.addConversation(
- senderId = data.teachers.first().id,
- receiverIds = listOf(data.students.first().id),
- messageBody = "Body",
- messageSubject = "Subject")
-
- dashboardPage.clickInboxTab()
- inboxPage.swipeConversationLeft(conversation)
- inboxPage.assertConversationNotDisplayed(conversation.subject!!)
-
- inboxPage.filterInbox("Archived")
- inboxPage.assertConversationDisplayed(conversation.subject!!)
- }
-
- @Test
- @TestMetaData(Priority.IMPORTANT, FeatureCategory.INBOX, TestCategory.INTERACTION)
- fun testInbox_swipeGesturesInArchivedScope() {
- val data = createInitialData()
- val conversation = data.addConversation(
- senderId = data.teachers.first().id,
- receiverIds = listOf(data.students.first().id),
- messageBody = "Body",
- messageSubject = "Subject")
- val archivedConversation = data.createBasicConversation(data.teachers.first().id, subject = "Archived subject", workflowState = Conversation.WorkflowState.ARCHIVED, messageBody = "Body 2")
- data.conversations[archivedConversation.id] = archivedConversation
-
- dashboardPage.clickInboxTab()
- inboxPage.swipeConversationLeft(conversation)
-
- inboxPage.filterInbox("Archived")
- inboxPage.assertConversationDisplayed(conversation.subject!!)
- inboxPage.swipeConversationRight(conversation)
- inboxPage.assertConversationNotDisplayed(conversation.subject!!) //Because an Unread conversation cannot be Archived.
-
- inboxPage.swipeConversationLeft(archivedConversation)
- inboxPage.assertConversationNotDisplayed(archivedConversation.subject!!)
-
- inboxPage.filterInbox("Inbox")
- inboxPage.assertConversationDisplayed(conversation.subject!!)
- inboxPage.assertUnreadMarkerVisibility(conversation.subject!!, ViewMatchers.Visibility.VISIBLE)
- inboxPage.assertConversationDisplayed(archivedConversation.subject!!)
- }
-
- @Test
- @TestMetaData(Priority.IMPORTANT, FeatureCategory.INBOX, TestCategory.INTERACTION)
- fun testInbox_swipeToUnstar() {
- val data = createInitialData()
- val conversation = data.addConversation(
- senderId = data.teachers.first().id,
- receiverIds = listOf(data.students.first().id),
- messageBody = "Body",
- messageSubject = "Subject")
- data.addConversations(userId = student1.id, messageBody = "Short body")
- data.conversations[conversation.id] = conversation.copy(isStarred = true)
-
- dashboardPage.clickInboxTab()
- inboxPage.filterInbox("Starred")
- inboxPage.assertUnreadMarkerVisibility(conversation.subject!!, ViewMatchers.Visibility.VISIBLE)
- inboxPage.swipeConversationRight(conversation)
- inboxPage.assertUnreadMarkerVisibility(conversation.subject!!, ViewMatchers.Visibility.GONE)
- inboxPage.swipeConversationRight(conversation)
- inboxPage.assertUnreadMarkerVisibility(conversation.subject!!, ViewMatchers.Visibility.VISIBLE)
-
- inboxPage.swipeConversationLeft(conversation)
- inboxPage.assertConversationNotDisplayed(conversation.subject!!)
- }
-
private fun getFirstConversation(data: MockCanvas, includeIsAuthor: Boolean = false): Conversation {
return data.conversations.values.toList()
.filter { it.workflowState != Conversation.WorkflowState.ARCHIVED }
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 a4af822a17..5564b86d71 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
@@ -126,7 +126,7 @@ class ModuleInteractionTest : StudentTest() {
modulesPage.assertModuleDisplayed(module)
modulesPage.assertModuleItemDisplayed(module, topicHeader!!.title!!)
modulesPage.clickModuleItem(module, topicHeader!!.title!!)
- discussionDetailsPage.assertTopicInfoShowing(topicHeader!!)
+ discussionDetailsPage.assertToolbarDiscussionTitle(topicHeader!!.title!!)
}
@Test
diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/ScheduleInteractionTest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/ScheduleInteractionTest.kt
index 79f23cc8c2..c8ba13f4eb 100644
--- a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/ScheduleInteractionTest.kt
+++ b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/ScheduleInteractionTest.kt
@@ -19,6 +19,7 @@ package com.instructure.student.ui.interaction
import com.instructure.canvas.espresso.FeatureCategory
import com.instructure.canvas.espresso.Priority
import com.instructure.canvas.espresso.StubLandscape
+import com.instructure.canvas.espresso.StubTablet
import com.instructure.canvas.espresso.TestCategory
import com.instructure.canvas.espresso.TestMetaData
import com.instructure.canvas.espresso.mockCanvas.MockCanvas
@@ -257,6 +258,7 @@ class ScheduleInteractionTest : StudentTest() {
@Test
@TestMetaData(Priority.COMMON, FeatureCategory.CANVAS_FOR_ELEMENTARY, TestCategory.INTERACTION)
+ @StubTablet
fun testTodayButton() {
setDate(2021, Calendar.AUGUST, 11)
val data = createMockData(courseCount = 1)
@@ -274,7 +276,7 @@ class ScheduleInteractionTest : StudentTest() {
try {
schedulePage.assertTodayButtonDisplayed()
} catch(e: AssertionFailedError) {
- schedulePage.swipeDown()
+ schedulePage.swipeUp()
schedulePage.assertTodayButtonDisplayed()
}
schedulePage.clickOnTodayButton()
diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/StudentCalendarInteractionTest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/StudentCalendarInteractionTest.kt
new file mode 100644
index 0000000000..21e87bf305
--- /dev/null
+++ b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/StudentCalendarInteractionTest.kt
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2024 - present Instructure, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.instructure.student.ui.interaction
+
+import com.instructure.canvas.espresso.common.interaction.CalendarInteractionTest
+import com.instructure.canvas.espresso.mockCanvas.MockCanvas
+import com.instructure.canvas.espresso.mockCanvas.init
+import com.instructure.canvasapi2.models.User
+import com.instructure.espresso.ModuleItemInteractions
+import com.instructure.student.BuildConfig
+import com.instructure.student.R
+import com.instructure.student.activity.LoginActivity
+import com.instructure.student.ui.pages.AssignmentDetailsPage
+import com.instructure.student.ui.pages.DashboardPage
+import com.instructure.student.ui.pages.DiscussionDetailsPage
+import com.instructure.student.ui.utils.StudentActivityTestRule
+import com.instructure.student.ui.utils.tokenLogin
+import dagger.hilt.android.testing.HiltAndroidTest
+
+@HiltAndroidTest
+class StudentCalendarInteractionTest : CalendarInteractionTest() {
+
+ override val isTesting = BuildConfig.IS_TESTING
+
+ override val activityRule = StudentActivityTestRule(LoginActivity::class.java)
+
+ private val dashboardPage = DashboardPage()
+ private val assignmentDetailsPage = AssignmentDetailsPage(ModuleItemInteractions())
+ private val discussionDetailsPage = DiscussionDetailsPage(ModuleItemInteractions(R.id.moduleName, R.id.next_item, R.id.prev_item))
+
+ override fun goToCalendar(data: MockCanvas) {
+ val student = data.students[0]
+ val token = data.tokenFor(student)!!
+ tokenLogin(data.domain, token, student)
+
+ dashboardPage.clickCalendarTab()
+
+ composeTestRule.waitForIdle()
+ }
+
+ override fun initData(): MockCanvas {
+ return MockCanvas.init(
+ studentCount = 1,
+ teacherCount = 1,
+ courseCount = 2,
+ favoriteCourseCount = 1
+ )
+ }
+
+ override fun getLoggedInUser(): User {
+ return MockCanvas.data.students[0]
+ }
+
+ override fun assertAssignmentDetailsTitle(title: String) {
+ assignmentDetailsPage.assertAssignmentTitle(title)
+ }
+
+ override fun assertDiscussionDetailsTitle(title: String) {
+ discussionDetailsPage.assertToolbarDiscussionTitle(title)
+ }
+
+ override fun clickTodayButton() {
+ calendarScreenPage.clickTodayButton()
+ }
+}
\ No newline at end of file
diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/StudentCreateUpdateEventInteractionTest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/StudentCreateUpdateEventInteractionTest.kt
new file mode 100644
index 0000000000..31ae49008e
--- /dev/null
+++ b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/StudentCreateUpdateEventInteractionTest.kt
@@ -0,0 +1,75 @@
+/*
+ * Copyright (C) 2024 - present Instructure, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.instructure.student.ui.interaction
+
+import com.instructure.canvas.espresso.common.interaction.CreateUpdateEventInteractionTest
+import com.instructure.canvas.espresso.mockCanvas.MockCanvas
+import com.instructure.canvas.espresso.mockCanvas.init
+import com.instructure.canvasapi2.models.User
+import com.instructure.student.BuildConfig
+import com.instructure.student.activity.LoginActivity
+import com.instructure.student.ui.pages.DashboardPage
+import com.instructure.student.ui.utils.StudentActivityTestRule
+import com.instructure.student.ui.utils.tokenLogin
+import dagger.hilt.android.testing.HiltAndroidTest
+
+@HiltAndroidTest
+class StudentCreateUpdateEventInteractionTest : CreateUpdateEventInteractionTest() {
+
+ override val isTesting = BuildConfig.IS_TESTING
+
+ override val activityRule = StudentActivityTestRule(LoginActivity::class.java)
+
+ private val dashboardPage = DashboardPage()
+
+ override fun goToCreateEvent(data: MockCanvas) {
+ val student = data.students[0]
+ val token = data.tokenFor(student)!!
+ tokenLogin(data.domain, token, student)
+
+ dashboardPage.clickCalendarTab()
+
+ composeTestRule.waitForIdle()
+ calendarScreenPage.clickOnAddButton()
+ calendarScreenPage.clickAddEvent()
+ }
+
+ override fun goToEditEvent(data: MockCanvas) {
+ val student = data.students[0]
+ val token = data.tokenFor(student)!!
+ tokenLogin(data.domain, token, student)
+
+ dashboardPage.clickCalendarTab()
+
+ val event = data.userCalendarEvents.values.first().first()
+
+ composeTestRule.waitForIdle()
+ calendarScreenPage.clickOnItem(event.title!!)
+ calendarEventDetailsPage.clickOverflowMenu()
+ calendarEventDetailsPage.clickEditMenu()
+ }
+
+ override fun initData(): MockCanvas {
+ return MockCanvas.init(
+ studentCount = 1,
+ teacherCount = 0,
+ courseCount = 1,
+ favoriteCourseCount = 1
+ )
+ }
+
+ override fun getLoggedInUser(): User = MockCanvas.data.students.first()
+}
diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/StudentCreateUpdateToDoInteractionTest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/StudentCreateUpdateToDoInteractionTest.kt
new file mode 100644
index 0000000000..93d37f50ac
--- /dev/null
+++ b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/StudentCreateUpdateToDoInteractionTest.kt
@@ -0,0 +1,75 @@
+/*
+ * Copyright (C) 2024 - present Instructure, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.instructure.student.ui.interaction
+
+import com.instructure.canvas.espresso.common.interaction.CreateUpdateToDoInteractionTest
+import com.instructure.canvas.espresso.mockCanvas.MockCanvas
+import com.instructure.canvas.espresso.mockCanvas.init
+import com.instructure.canvasapi2.models.User
+import com.instructure.student.BuildConfig
+import com.instructure.student.activity.LoginActivity
+import com.instructure.student.ui.pages.DashboardPage
+import com.instructure.student.ui.utils.StudentActivityTestRule
+import com.instructure.student.ui.utils.tokenLogin
+import dagger.hilt.android.testing.HiltAndroidTest
+
+@HiltAndroidTest
+class StudentCreateUpdateToDoInteractionTest : CreateUpdateToDoInteractionTest() {
+
+ override val isTesting = BuildConfig.IS_TESTING
+
+ override val activityRule = StudentActivityTestRule(LoginActivity::class.java)
+
+ private val dashboardPage = DashboardPage()
+
+ override fun goToCreateToDo(data: MockCanvas) {
+ val student = data.students[0]
+ val token = data.tokenFor(student)!!
+ tokenLogin(data.domain, token, student)
+
+ dashboardPage.clickCalendarTab()
+
+ composeTestRule.waitForIdle()
+ calendarScreenPage.clickOnAddButton()
+ calendarScreenPage.clickAddTodo()
+ }
+
+ override fun goToEditToDo(data: MockCanvas) {
+ val student = data.students[0]
+ val token = data.tokenFor(student)!!
+ tokenLogin(data.domain, token, student)
+
+ dashboardPage.clickCalendarTab()
+
+ val todo = data.todos.first()
+
+ composeTestRule.waitForIdle()
+ calendarScreenPage.clickOnItem(todo.plannable.title)
+ calendarToDoDetailsPage.clickToolbarMenu()
+ calendarToDoDetailsPage.clickEditMenu()
+ }
+
+ override fun initData(): MockCanvas {
+ return MockCanvas.init(
+ studentCount = 1,
+ teacherCount = 0,
+ courseCount = 1,
+ favoriteCourseCount = 1
+ )
+ }
+
+ override fun getLoggedInUser(): User = MockCanvas.data.students.first()
+}
diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/StudentEventDetailsInteractionTest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/StudentEventDetailsInteractionTest.kt
new file mode 100644
index 0000000000..41e571f398
--- /dev/null
+++ b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/StudentEventDetailsInteractionTest.kt
@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) 2024 - present Instructure, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.instructure.student.ui.interaction
+
+import com.instructure.canvas.espresso.common.interaction.EventDetailsInteractionTest
+import com.instructure.canvas.espresso.mockCanvas.MockCanvas
+import com.instructure.canvas.espresso.mockCanvas.init
+import com.instructure.student.BuildConfig
+import com.instructure.student.activity.LoginActivity
+import com.instructure.student.ui.pages.DashboardPage
+import com.instructure.student.ui.utils.StudentActivityTestRule
+import com.instructure.student.ui.utils.tokenLogin
+import dagger.hilt.android.testing.HiltAndroidTest
+
+@HiltAndroidTest
+class StudentEventDetailsInteractionTest : EventDetailsInteractionTest() {
+
+ override val isTesting = BuildConfig.IS_TESTING
+
+ override val activityRule = StudentActivityTestRule(LoginActivity::class.java)
+
+ private val dashboardPage = DashboardPage()
+
+ override fun goToEventDetails(data: MockCanvas) {
+ val student = data.students[0]
+ val token = data.tokenFor(student)!!
+ tokenLogin(data.domain, token, student)
+
+ dashboardPage.clickCalendarTab()
+
+ val event = data.courseCalendarEvents.values.first().first()
+
+ composeTestRule.waitForIdle()
+ calendarScreenPage.clickOnItem(event.title!!)
+ }
+
+ override fun initData(): MockCanvas {
+ return MockCanvas.init(
+ studentCount = 1,
+ teacherCount = 1,
+ courseCount = 1,
+ favoriteCourseCount = 1
+ )
+ }
+}
diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/StudentInboxListInteractionsTest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/StudentInboxListInteractionsTest.kt
new file mode 100644
index 0000000000..33f3ca7445
--- /dev/null
+++ b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/StudentInboxListInteractionsTest.kt
@@ -0,0 +1,79 @@
+/*
+ * Copyright (C) 2024 - present Instructure, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.instructure.student.ui.interaction
+
+import com.instructure.canvas.espresso.common.interaction.InboxListInteractionTest
+import com.instructure.canvas.espresso.mockCanvas.MockCanvas
+import com.instructure.canvas.espresso.mockCanvas.addCoursePermissions
+import com.instructure.canvas.espresso.mockCanvas.addRecipientsToCourse
+import com.instructure.canvas.espresso.mockCanvas.init
+import com.instructure.canvasapi2.models.CanvasContextPermission
+import com.instructure.canvasapi2.models.User
+import com.instructure.student.BuildConfig
+import com.instructure.student.activity.LoginActivity
+import com.instructure.student.ui.pages.DashboardPage
+import com.instructure.student.ui.utils.StudentActivityTestRule
+import com.instructure.student.ui.utils.tokenLogin
+import dagger.hilt.android.testing.HiltAndroidTest
+
+@HiltAndroidTest
+class StudentInboxListInteractionsTest : InboxListInteractionTest() {
+
+ override val isTesting = BuildConfig.IS_TESTING
+ override val activityRule = StudentActivityTestRule(LoginActivity::class.java)
+
+ private val dashboardPage = DashboardPage()
+
+ override fun goToInbox(data: MockCanvas) {
+ val student = data.students[0]
+ val token = data.tokenFor(student)!!
+ tokenLogin(data.domain, token, student)
+
+ dashboardPage.clickInboxTab()
+ }
+
+ override fun createInitialData(courseCount: Int): MockCanvas {
+ val data = MockCanvas.init(
+ studentCount = 1,
+ courseCount = courseCount,
+ teacherCount = 1,
+ favoriteCourseCount = courseCount
+ )
+
+ val course1 = data.courses.values.first()
+
+ data.addCoursePermissions(
+ course1.id,
+ CanvasContextPermission(send_messages_all = true, send_messages = true)
+ )
+
+ data.addRecipientsToCourse(
+ course = course1,
+ students = data.students,
+ teachers = data.teachers
+ )
+
+ return data
+ }
+
+ override fun getLoggedInUser(): User {
+ return MockCanvas.data.students[0]
+ }
+
+ override fun getOtherUser(): User {
+ return MockCanvas.data.teachers[0]
+ }
+}
\ No newline at end of file
diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/StudentToDoDetailsInteractionTest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/StudentToDoDetailsInteractionTest.kt
new file mode 100644
index 0000000000..d666ea9436
--- /dev/null
+++ b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/StudentToDoDetailsInteractionTest.kt
@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2024 - present Instructure, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.instructure.student.ui.interaction
+
+import android.app.Activity
+import com.instructure.canvas.espresso.common.interaction.ToDoDetailsInteractionTest
+import com.instructure.canvas.espresso.mockCanvas.MockCanvas
+import com.instructure.canvas.espresso.mockCanvas.init
+import com.instructure.canvasapi2.models.User
+import com.instructure.espresso.InstructureActivityTestRule
+import com.instructure.student.BuildConfig
+import com.instructure.student.activity.LoginActivity
+import com.instructure.student.ui.pages.DashboardPage
+import com.instructure.student.ui.utils.StudentActivityTestRule
+import com.instructure.student.ui.utils.tokenLogin
+import dagger.hilt.android.testing.HiltAndroidTest
+
+@HiltAndroidTest
+class StudentToDoDetailsInteractionTest : ToDoDetailsInteractionTest() {
+
+ override val isTesting = BuildConfig.IS_TESTING
+
+ override val activityRule: InstructureActivityTestRule =
+ StudentActivityTestRule(LoginActivity::class.java)
+
+ private val dashboardPage = DashboardPage()
+
+ override fun displaysPageObjects() = Unit
+
+ override fun goToToDoDetails(data: MockCanvas) {
+ val student = data.students[0]
+ val token = data.tokenFor(student)!!
+ tokenLogin(data.domain, token, student)
+
+ dashboardPage.clickCalendarTab()
+
+ val todo = data.todos.first()
+
+ composeTestRule.waitForIdle()
+ calendarScreenPage.clickOnItem(todo.plannable.title)
+ }
+
+ override fun initData(): MockCanvas {
+ return MockCanvas.init(
+ studentCount = 1,
+ teacherCount = 1,
+ courseCount = 1,
+ favoriteCourseCount = 1
+ )
+ }
+
+ override fun getLoggedInUser(): User = MockCanvas.data.students.first()
+}
\ No newline at end of file
diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/SyllabusInteractionTest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/SyllabusInteractionTest.kt
index 8b9b613563..723b246689 100644
--- a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/SyllabusInteractionTest.kt
+++ b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/SyllabusInteractionTest.kt
@@ -25,18 +25,19 @@ import com.instructure.canvas.espresso.mockCanvas.addCourseCalendarEvent
import com.instructure.canvas.espresso.mockCanvas.addCourseSettings
import com.instructure.canvas.espresso.mockCanvas.init
import com.instructure.canvasapi2.models.Assignment
+import com.instructure.canvasapi2.models.CanvasContextPermission
import com.instructure.canvasapi2.models.CourseSettings
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.student.ui.utils.StudentTest
+import com.instructure.student.ui.utils.StudentComposeTest
import com.instructure.student.ui.utils.tokenLogin
import dagger.hilt.android.testing.HiltAndroidTest
import org.junit.Test
@HiltAndroidTest
-class SyllabusInteractionTest : StudentTest() {
+class SyllabusInteractionTest : StudentComposeTest() {
override fun displaysPageObjects() = Unit // Not used for interaction tests
@@ -48,13 +49,29 @@ class SyllabusInteractionTest : StudentTest() {
val data = goToSyllabus(eventCount = 1, assignmentCount = 0)
val course = data.courses.values.first()
+ data.coursePermissions[course.id] = CanvasContextPermission(manageCalendar = true)
val event = data.courseCalendarEvents[course.id]!!.first()
syllabusPage.selectSummaryTab()
syllabusPage.assertItemDisplayed(event.title!!)
syllabusPage.selectSummaryEvent(event.title!!)
- calendarEventPage.verifyTitle(event.title!!)
- calendarEventPage.verifyDescription(event.description!!)
+ calendarEventDetailsPage.assertEventTitle(event.title!!)
+ calendarEventDetailsPage.verifyDescription(event.description!!)
+ }
+
+ @Test
+ @TestMetaData(Priority.MANDATORY, FeatureCategory.SYLLABUS, TestCategory.INTERACTION)
+ fun testSyllabus_assignment() {
+ val data = goToSyllabus(eventCount = 0, assignmentCount = 1)
+
+ val course = data.courses.values.first()
+ data.coursePermissions[course.id] = CanvasContextPermission(manageCalendar = true)
+ val assignment = data.assignments.entries.firstOrNull()!!.value
+
+ syllabusPage.selectSummaryTab()
+ syllabusPage.assertItemDisplayed(assignment.name!!)
+ syllabusPage.selectSummaryEvent(assignment.name!!)
+ assignmentDetailsPage.assertAssignmentTitle(assignment.name!!)
}
private fun goToSyllabus(eventCount: Int, assignmentCount: Int) : MockCanvas {
@@ -77,8 +94,8 @@ class SyllabusInteractionTest : StudentTest() {
repeat(eventCount) {
data.addCourseCalendarEvent(
- courseId = course.id,
- date = 2.days.fromNow.iso8601,
+ course = course,
+ startDate = 2.days.fromNow.iso8601,
title = "Test Calendar Event",
description = "The calendar event to end all calendar events"
)
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 b001e424f2..77e9f21747 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
@@ -77,6 +77,10 @@ open class AssignmentDetailsPage(val moduleItemInteractions: ModuleItemInteracti
onView(allOf(withText(R.string.assignmentDetails), withParent(R.id.toolbar))).assertDisplayed()
}
+ fun assertDisplayToolbarTitle(toolbarTitle: String) {
+ onView(allOf(withText(toolbarTitle), withParent(R.id.toolbar))).assertDisplayed()
+ }
+
fun assertDisplayToolbarSubtitle(courseNameText: String) {
onView(allOf(withText(courseNameText), withParent(R.id.toolbar))).assertDisplayed()
}
@@ -310,6 +314,13 @@ open class AssignmentDetailsPage(val moduleItemInteractions: ModuleItemInteracti
fun clickDone() {
onView(withText(R.string.done)).click()
}
+
+ //OfflineMethod
+ fun assertDetailsNotAvailableOffline() {
+ onView(withId(R.id.notAvailableIcon) + withAncestor(R.id.moduleProgressionPage)).assertDisplayed()
+ onView(withId(R.id.title) + withText(R.string.notAvailableOfflineScreenTitle) + withParent(R.id.textViews) + withAncestor(R.id.moduleProgressionPage)).assertDisplayed()
+ onView(withId(R.id.description) + withText(R.string.notAvailableOfflineDescriptionForTabs) + withParent(R.id.textViews) + withAncestor(R.id.moduleProgressionPage)).assertDisplayed()
+ }
}
/**
diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/pages/CalendarEventPage.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/pages/CalendarEventPage.kt
deleted file mode 100644
index 8568d8ec99..0000000000
--- a/apps/student/src/androidTest/java/com/instructure/student/ui/pages/CalendarEventPage.kt
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2020 - 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 .
- *
- */
-package com.instructure.student.ui.pages
-
-import androidx.test.espresso.Espresso.onView
-import androidx.test.espresso.matcher.ViewMatchers.withId
-import androidx.test.espresso.matcher.ViewMatchers.withParent
-import androidx.test.espresso.web.assertion.WebViewAssertions.webMatches
-import androidx.test.espresso.web.sugar.Web.onWebView
-import androidx.test.espresso.web.webdriver.DriverAtoms.findElement
-import androidx.test.espresso.web.webdriver.DriverAtoms.getText
-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.withAncestor
-import com.instructure.student.R
-import org.hamcrest.Matchers
-import org.hamcrest.Matchers.allOf
-
-class CalendarEventPage : BasePage(R.id.calendarEventFragment) {
-
- fun verifyTitle(title: String) {
- onView(allOf(withParent(withId(R.id.toolbar)), containsTextCaseInsensitive(title))).assertDisplayed()
- }
-
- fun verifyDescription(description: String) {
- onWebView(withId(R.id.contentWebView) + withAncestor(R.id.calendarEventWebViewWrapper))
- .withElement(findElement(Locator.ID,"content"))
- .check(webMatches(getText(), Matchers.comparesEqualTo(description)))
- }
-}
\ No newline at end of file
diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/pages/ConferenceDetailsPage.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/pages/ConferenceDetailsPage.kt
index 556eee1ea6..e18d491a3c 100644
--- a/apps/student/src/androidTest/java/com/instructure/student/ui/pages/ConferenceDetailsPage.kt
+++ b/apps/student/src/androidTest/java/com/instructure/student/ui/pages/ConferenceDetailsPage.kt
@@ -18,14 +18,20 @@ package com.instructure.student.ui.pages
import androidx.test.espresso.matcher.ViewMatchers.hasSibling
import com.instructure.espresso.assertDisplayed
-import com.instructure.espresso.page.*
+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.page.withParent
+import com.instructure.espresso.page.withText
import com.instructure.student.R
import org.hamcrest.CoreMatchers.allOf
open class ConferenceDetailsPage : BasePage(R.id.conferenceDetailsPage) {
- fun assertConferenceTitleDisplayed() {
- onView(allOf(withId(R.id.title), hasSibling(withId(R.id.statusDetails)))).assertDisplayed()
+ fun assertConferenceTitleDisplayed(conferenceTitle: String) {
+ onView(allOf(withId(R.id.title), withText(conferenceTitle), hasSibling(withId(R.id.statusDetails)))).assertDisplayed()
}
fun assertConferenceStatus(expectedStatus: String) {
@@ -33,6 +39,13 @@ open class ConferenceDetailsPage : BasePage(R.id.conferenceDetailsPage) {
}
fun assertDescription(expectedDescription: String) {
+ onView(allOf(withText(R.string.description), hasSibling(withId(R.id.statusDetails)), hasSibling(withId(R.id.description)))).assertDisplayed()
onView(allOf(withId(R.id.description) + withText(expectedDescription), hasSibling(withId(R.id.statusDetails)))).assertDisplayed()
}
+
+ fun assertConferenceDetailsToolbarText(courseName: String) {
+ onView(withText(R.string.conferenceDetails) + withParent(R.id.toolbar) + withAncestor(R.id.conferenceDetailsPage)).assertDisplayed()
+ onView(withText(courseName) + withParent(R.id.toolbar) + withAncestor(R.id.conferenceDetailsPage)).assertDisplayed()
+ }
+
}
diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/pages/ConferenceListPage.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/pages/ConferenceListPage.kt
index e41269af5c..2d7c19a8f8 100644
--- a/apps/student/src/androidTest/java/com/instructure/student/ui/pages/ConferenceListPage.kt
+++ b/apps/student/src/androidTest/java/com/instructure/student/ui/pages/ConferenceListPage.kt
@@ -22,7 +22,10 @@ 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.page.withParent
import com.instructure.espresso.page.withText
import com.instructure.student.R
import org.hamcrest.CoreMatchers.allOf
@@ -44,6 +47,10 @@ open class ConferenceListPage : BasePage(R.id.conferenceListPage) {
onView(allOf(withId(R.id.title), withText(conferenceTitle))).assertDisplayed()
}
+ fun assertConferenceDescription(conferenceTitle: String, expectedDescription: String) {
+ onView(allOf(withId(R.id.subtitle), withText(expectedDescription), hasSibling(allOf(withId(R.id.title), withText(conferenceTitle)))))
+ }
+
fun clickOnOpenExternallyButton() {
onView(withId(R.id.openExternallyButton)).click()
}
@@ -52,8 +59,20 @@ open class ConferenceListPage : BasePage(R.id.conferenceListPage) {
onView(withId(R.id.openExternallyButton)).check(doesNotExist())
}
+ fun assertOpenExternallyButtonDisplayed() {
+ onView(withId(R.id.openExternallyButton)).assertDisplayed()
+ }
+
fun openConferenceDetails(conferenceTitle: String) {
onView(withText(conferenceTitle)).click()
}
+ fun assertConferencesToolbarText(courseName: String) {
+ onView(withText(R.string.conferences) + withParent(R.id.toolbar) + withAncestor(R.id.conferenceListPage)).assertDisplayed()
+ onView(withText(courseName) + withParent(R.id.toolbar) + withAncestor(R.id.conferenceListPage)).assertDisplayed()
+ }
+
+ fun assertNewConferencesDisplayed() {
+ onView(withId(R.id.title) + withText(R.string.newConferences) + withAncestor(R.id.conferenceListPage)).assertDisplayed()
+ }
}
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 4ede8e10ec..bcd4fadcbe 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
@@ -426,6 +426,11 @@ class DashboardPage : BasePage(R.id.dashboardPage) {
onView(withId(R.id.bottomNavigationNotifications)).check(matches(isNotEnabled()))
onView(withId(R.id.bottomNavigationInbox)).check(matches(isNotEnabled()))
}
+
+ fun goToDashboard() {
+ onView(withId(R.id.bottomNavigationHome)).click()
+ }
+
}
/**
diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/pages/DiscussionDetailsPage.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/pages/DiscussionDetailsPage.kt
index 63bc20c3ff..db61d656e4 100644
--- a/apps/student/src/androidTest/java/com/instructure/student/ui/pages/DiscussionDetailsPage.kt
+++ b/apps/student/src/androidTest/java/com/instructure/student/ui/pages/DiscussionDetailsPage.kt
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2019 - present Instructure, Inc.
+ * Copyright (C) 2024 - present Instructure, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -16,333 +16,85 @@
*/
package com.instructure.student.ui.pages
-import android.os.SystemClock.sleep
-import androidx.test.espresso.Espresso
-import androidx.test.espresso.Espresso.onView
-import androidx.test.espresso.action.ViewActions.swipeDown
-import androidx.test.espresso.assertion.ViewAssertions.matches
-import androidx.test.espresso.matcher.ViewMatchers
-import androidx.test.espresso.matcher.ViewMatchers.isDisplayingAtLeast
-import androidx.test.espresso.web.assertion.WebViewAssertions.webMatches
+import androidx.test.espresso.matcher.ViewMatchers.hasSibling
+import androidx.test.espresso.web.assertion.WebViewAssertions.webContent
+import androidx.test.espresso.web.matcher.DomMatchers.hasElementWithXpath
import androidx.test.espresso.web.sugar.Web.onWebView
-import androidx.test.espresso.web.webdriver.DriverAtoms.findElement
-import androidx.test.espresso.web.webdriver.DriverAtoms.getText
-import androidx.test.espresso.web.webdriver.DriverAtoms.webClick
import androidx.test.espresso.web.webdriver.Locator
-import com.instructure.canvas.espresso.containsTextCaseInsensitive
-import com.instructure.canvas.espresso.isElementDisplayed
-import com.instructure.canvas.espresso.waitForMatcherWithSleeps
-import com.instructure.canvas.espresso.withCustomConstraints
-import com.instructure.canvas.espresso.withElementRepeat
-import com.instructure.canvasapi2.models.DiscussionEntry
-import com.instructure.canvasapi2.models.DiscussionTopicHeader
import com.instructure.espresso.ModuleItemInteractions
-import com.instructure.espresso.OnViewWithId
import com.instructure.espresso.assertDisplayed
-import com.instructure.espresso.assertGone
-import com.instructure.espresso.assertHasText
-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.plus
-import com.instructure.espresso.page.waitForViewWithId
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.waitForWebElement
import com.instructure.student.R
-import com.instructure.student.ui.utils.TypeInRCETextEditor
-import org.hamcrest.Matchers.allOf
-import org.hamcrest.Matchers.containsString
-import org.junit.Assert.assertTrue
+import org.junit.Assert
class DiscussionDetailsPage(val moduleItemInteractions: ModuleItemInteractions) : BasePage(R.id.discussionDetailsPage) {
- private val discussionTopicTitle by OnViewWithId(R.id.discussionTopicTitle)
- private val replyButton by OnViewWithId(R.id.replyToDiscussionTopic)
- fun assertTitleText(titleText: String) {
- discussionTopicTitle.assertHasText(titleText)
+ fun assertReplyButtonDisplayed() {
+ onWebView().check(webContent(hasElementWithXpath("//button[@data-testid='discussion-topic-reply']")))
}
- fun assertDescriptionText(descriptionText: String) {
- onWebView(withId(R.id.contentWebView) + withAncestor(R.id.discussionTopicHeaderWebViewWrapper))
- .withElement(findElement(Locator.ID, "content"))
- .check(webMatches(getText(), containsString(descriptionText)))
- }
-
- fun assertTopicInfoShowing(topicHeader: DiscussionTopicHeader) {
- assertTitleText(topicHeader.title!!)
- assertDescriptionText(topicHeader.message!!)
- }
-
- fun clickLinkInDescription(linkElementId: String) {
- onWebView(withId(R.id.contentWebView) + withAncestor(R.id.discussionTopicHeaderWebViewWrapper))
- .withElement(findElement(Locator.ID, linkElementId))
- .perform(webClick())
- }
-
- fun refresh() {
- scrollToTop()
- onView(allOf(withId(R.id.swipeRefreshLayout), isDisplayingAtLeast(10)))
- .perform(withCustomConstraints(swipeDown(), isDisplayingAtLeast(10)))
- }
-
- fun scrollToRepliesWebview() {
- waitForMatcherWithSleeps(withId(R.id.contentWebView) + withAncestor(R.id.discussionRepliesWebViewWrapper), timeout = 20000)
- onView(withId(R.id.contentWebView) + withAncestor(R.id.discussionRepliesWebViewWrapper)).scrollTo()
- }
-
- fun clickReply() {
- replyButton.click()
- }
-
- fun assertReplyButtonNotDisplayed() {
- replyButton.check(matches(ViewMatchers.withEffectiveVisibility(ViewMatchers.Visibility.GONE)))
- }
-
- fun assertRepliesEnabled() {
- replyButton.assertDisplayed()
- }
-
- fun assertRepliesDisabled() {
- replyButton.assertGone()
- }
-
- fun assertRepliesDisplayed() {
- onView(withId(R.id.discussionTopicRepliesTitle)).scrollTo().assertDisplayed()
- }
-
- fun assertNoRepliesDisplayed() {
- onView(withId(R.id.discussionTopicRepliesTitle)).assertNotDisplayed()
- }
-
- fun sendReply(replyMessage: String) {
- clickReply()
- waitForViewWithId(R.id.rce_webView).perform(TypeInRCETextEditor(replyMessage))
- clickOnSendReplyButton()
-
- sleep(3000) // wait out the toast message
- }
-
- private fun clickOnSendReplyButton() {
- onView(withId(R.id.menu_send)).click()
- }
-
- fun assertReplyDisplayed(reply: DiscussionEntry, refreshesAllowed: Int = 0) {
-
- // Allow up to refreshesAllowed attempt/refresh cycles
- for (i in 0 until refreshesAllowed) {
- try {
- onWebView(withId(R.id.contentWebView) + withAncestor(R.id.discussionRepliesWebViewWrapper))
- .withElement(findElement(Locator.ID, "message_content_${reply.id}"))
- .check(webMatches(getText(), containsString(reply.message)))
- return
- } catch (t: Throwable) {
- refresh()
- }
- }
-
- // If we have not yet seen the desired reply, try one more time, allowing up to
- // 3 retries for the page to render and the reply to appear. (Each attempt
- // waits ~10 secs before failing.)
- // (It can take a *long* time for the reply to get rendered to the webview on
- // tablets (in FTL, anyway).)
- onWebView(withId(R.id.contentWebView) + withAncestor(R.id.discussionRepliesWebViewWrapper))
- .withElementRepeat(findElement(Locator.ID, "message_content_${reply.id}"), 3)
- .check(webMatches(getText(), containsString(reply.message)))
- }
-
- fun assertReplyDisplayed(reply: DiscussionEntry) {
- onWebView(withId(R.id.contentWebView) + withAncestor(R.id.discussionRepliesWebViewWrapper))
- .withElement(findElement(Locator.TAG_NAME, "html"))
- .check(webMatches(getText(), containsString(reply.message)))
- }
-
- fun assertIfThereIsAReply() {
- onView(withId(R.id.discussionTopicRepliesTitle)).assertDisplayed()
- onView(withId(R.id.contentWebView) + withAncestor(R.id.discussionRepliesWebViewWrapper)).assertDisplayed()
- }
-
- fun assertFavoritingEnabled(reply: DiscussionEntry) {
- try {
- onWebView(withId(R.id.contentWebView) + withAncestor(R.id.discussionRepliesWebViewWrapper))
- .withElement(findElement(Locator.CLASS_NAME, "likes_icon_wrapper_${reply.id}"))
- } catch (t: Throwable) {
- assertTrue("Favoriting icon is disabled", false)
- }
- }
-
- fun assertFavoritingDisabled(reply: DiscussionEntry) {
- try {
- onWebView(withId(R.id.contentWebView) + withAncestor(R.id.discussionRepliesWebViewWrapper))
- .withElement(findElement(Locator.CLASS_NAME, "likes_icon_wrapper_${reply.id}"))
- // We shouldn't reach this point if the favoriting icon is disabled -- we should throw
- assertTrue("Favoriting icon is enabled", false)
- } catch (_: Throwable) {}
- }
-
- fun clickLikeOnEntry(reply: DiscussionEntry) {
- onWebView(withId(R.id.contentWebView) + withAncestor(R.id.discussionRepliesWebViewWrapper))
- .withElement(findElement(Locator.CLASS_NAME, "likes_icon_wrapper_${reply.id}"))
- .perform(webClick())
- }
-
- fun assertLikeCount(reply: DiscussionEntry, count: Int, refreshesAllowed: Int = 0) {
- if (count > 0) {
-
- for (i in 0 until refreshesAllowed) {
- try {
- onWebView(withId(R.id.contentWebView) + withAncestor(R.id.discussionRepliesWebViewWrapper))
- .withElement(findElement(Locator.CLASS_NAME, "likes_count_${reply.id}"))
- .check(webMatches(getText(), containsString(count.toString())))
- return
- } catch (t: Throwable) {
- refresh()
- }
- }
-
- // If we haven't verified our info by now, let's make one last call to either
- // (1) succeed or (2) throw a sensible error.
- onWebView(withId(R.id.contentWebView) + withAncestor(R.id.discussionRepliesWebViewWrapper))
- .withElement(findElement(Locator.CLASS_NAME, "likes_count_${reply.id}"))
- .check(webMatches(getText(), containsString(count.toString())))
- } else {
- try {
- onWebView(withId(R.id.contentWebView) + withAncestor(R.id.discussionRepliesWebViewWrapper))
- .withElement(findElement(Locator.CLASS_NAME, "likes_count_${reply.id}"))
- assertTrue("Didn't expect to see like count with 0 count", false)
- } catch (_: Throwable) {}
- }
- }
-
- fun assertReplyAttachment(reply: DiscussionEntry) {
- try {
- onWebView(withId(R.id.contentWebView) + withAncestor(R.id.discussionRepliesWebViewWrapper))
- .withElement(findElement(Locator.CLASS_NAME, "attachments_${reply.id}"))
- } catch (t: Throwable) {
- assertTrue("Discussion entry did not have an attachment", false)
- }
- }
-
- fun previewAndCheckReplyAttachment(reply: DiscussionEntry, vararg checks: WebViewTextCheck) {
-
- // Sometimes clicking the attachment logo fails to do anything.
- // We'll give it 3 chances.
- var triesRemaining = 3;
- while (!isElementDisplayed(R.id.canvasWebViewWrapper) && triesRemaining > 0) {
- if (triesRemaining < 3) {
- refresh() // Maybe web content was incorrectly rendered? Try again
- sleep(1500) // Allow webview some time to render
- }
- onWebView(withId(R.id.contentWebView) + withAncestor(R.id.discussionRepliesWebViewWrapper))
- .withElementRepeat(findElement(Locator.CLASS_NAME, "attachments_${reply.id}"), 20)
- .perform(webClick())
- triesRemaining -= 1
- }
-
- assertTrue("FAILED to bring up reply attachment", isElementDisplayed(R.id.canvasWebViewWrapper));
-
- for (check in checks) {
- onWebView(withId(R.id.contentWebView) + withAncestor(R.id.canvasWebViewWrapper))
- .withElement(findElement(check.locatorType, check.locatorValue))
- .check(webMatches(getText(), containsString(check.textValue)))
+ private fun replyButtonNotDisplayed(): Boolean {
+ return try {
+ onWebView().check(webContent(hasElementWithXpath("//button[@data-testid='discussion-topic-reply']")))
+ false
}
- Espresso.pressBack()
-
- }
-
- fun replyToReply(reply: DiscussionEntry, replyMessage: String) {
-
- // It appears that sometimes the click to reply doesn't work.
- // Let's give it 3 chances.
- var triesRemaining = 3
- while (!isElementDisplayed(R.id.rce_webView) && triesRemaining > 0) {
- if (triesRemaining < 3) {
- refresh() // maybe the html was rendered badly and needs refreshing?
- sleep(2000) // A little time for the webview to render
- }
- onWebView(withId(R.id.contentWebView) + withAncestor(R.id.discussionRepliesWebViewWrapper))
- .withElementRepeat(findElement(Locator.ID, "reply_${reply.id}"), 20)
- .perform(webClick())
- triesRemaining -= 1
+ catch (e: AssertionError) {
+ true
}
-
- assertTrue("FAILED to bring up rce / reply editor", isElementDisplayed(R.id.rce_webView));
-
- onView(withId(R.id.rce_webView)).perform(TypeInRCETextEditor(replyMessage))
- onView(withId(R.id.menu_send)).click()
-
- sleep(3000) // wait out the toast message
}
- fun assertMainAttachmentDisplayed() {
- onView(withId(R.id.attachmentIcon)).assertDisplayed()
- }
-
- /**
- * Assumes that the attachment is html
- */
- fun previewAndCheckMainAttachment(vararg checks: WebViewTextCheck) {
- onView(withId(R.id.attachmentIcon)).click()
- for (check in checks) {
- onWebView(withId(R.id.contentWebView) + withAncestor(R.id.canvasWebViewWrapper))
- .withElement(findElement(check.locatorType, check.locatorValue))
- .check(webMatches(getText(), containsString(check.textValue)))
- }
- Espresso.pressBack()
+ fun assertReplyButtonNotDisplayed() {
+ Assert.assertTrue("Reply button has displayed but it should not.",replyButtonNotDisplayed())
}
- /**
- * It can take a *long* time (much longer than the advertised 2.5 seconds) for
- * the unread indicator to disappear when running tests on FTL. Rather than
- * use an ever-increasing timeout, I figured I would just programmatically
- * wait until the unread indicator disappeared, for up to 10 seconds.
- *
- * The downside is that we are relying on webview elements to not change.
- * If that is something that happens often (or maybe even once), we will
- * need to go back to using a timeout.
- */
- fun waitForUnreadIndicatorToDisappear(reply: DiscussionEntry) {
- repeat(10) {
- if (!isUnreadIndicatorVisible(reply)) return
- sleep(1000)
- }
-
- assertTrue("Timed out waiting for unread indicator to disappear", false)
+ fun assertEntryDisplayed(entryMessage: String) {
+ onWebView().check(webContent(hasElementWithXpath("//span[text()='$entryMessage']")))
}
- fun assertPointsPossibleDisplayed(points: String) {
- onView(withId(R.id.pointsTextView)).check(matches(containsTextCaseInsensitive(points)))
+ fun assertModulesToolbarDiscussionTitle(discussionTitle: String) {
+ onView(withText(discussionTitle) + withAncestor(R.id.moduleProgressionPage)).assertDisplayed()
}
- fun assertPointsPossibleNotDisplayed() {
- onView(withId(R.id.pointsTextView)).assertNotDisplayed()
+ fun assertHomeroomToolbarDiscussionTitle(discussionTitle: String) {
+ onView(withText(discussionTitle) + withAncestor(R.id.toolbar) + withAncestor(R.id.fullScreenCoordinatorLayout)).assertDisplayed()
}
- fun clickOnInnerReply() {
- onWebView(withId(R.id.contentWebView) + withAncestor(R.id.discussionRepliesWebViewWrapper))
- .withElement(findElement(Locator.XPATH, "//div[@class='reply_wrapper' and contains(@id, 'reply')]"))
- .perform(webClick())
+ fun assertToolbarDiscussionTitle(discussionTitle: String) {
+ onView(withText(discussionTitle) + withAncestor(withId(R.id.toolbar) + hasSibling(withId(R.id.discussionWebView)))).assertDisplayed()
}
- fun clickOnAddBookmarkMenu() {
- onView(withText("Add Bookmark")).click()
+ //OfflineMethod
+ fun assertDetailsNotAvailableOffline() {
+ onView(withId(R.id.notAvailableIcon) + withAncestor(R.id.moduleProgressionPage)).assertDisplayed()
+ onView(withId(R.id.title) + withText(R.string.notAvailableOfflineScreenTitle) + withParent(R.id.textViews) + withAncestor(R.id.moduleProgressionPage)).assertDisplayed()
+ onView(withId(R.id.description) + withText(R.string.notAvailableOfflineDescriptionForTabs) + withParent(R.id.textViews) + withAncestor(R.id.moduleProgressionPage)).assertDisplayed()
}
- private fun isUnreadIndicatorVisible(reply: DiscussionEntry): Boolean {
- return try {
- onWebView(withId(R.id.contentWebView) + withAncestor(R.id.discussionRepliesWebViewWrapper))
- .withElement(findElement(Locator.ID, "unread_indicator_${reply.id}"))
- .withElement(findElement(Locator.CLASS_NAME, "unread"))
- true
- } catch (t: Throwable) {
- false
- }
+ fun waitForReplyButton() {
+ waitForWebElement(
+ webViewMatcher = withId(R.id.discussionWebView),
+ locator = Locator.XPATH,
+ value = "//button[@data-testid='discussion-topic-reply']",
+ timeoutMillis = 10000,
+ intervalMillis = 500
+ )
}
- private fun scrollToTop() {
- onView(allOf(withId(R.id.swipeRefreshLayout), isDisplayingAtLeast(10)))
- .perform(withCustomConstraints(swipeDown(), isDisplayingAtLeast(10)))
+ fun waitForEntryDisplayed(entryMessage: String) {
+ waitForWebElement(
+ webViewMatcher = withId(R.id.discussionWebView),
+ locator = Locator.XPATH,
+ value = "//span[text()='$entryMessage']",
+ timeoutMillis = 10000,
+ intervalMillis = 500
+ )
}
}
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 0fa4f1c98e..552231af27 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
@@ -15,6 +15,7 @@ import com.instructure.dataseeding.model.CanvasUserApiModel
import com.instructure.espresso.OnViewWithContentDescription
import com.instructure.espresso.OnViewWithId
import com.instructure.espresso.ViewAlphaAssertion
+import com.instructure.espresso.assertContainsText
import com.instructure.espresso.assertDisplayed
import com.instructure.espresso.assertNotDisplayed
import com.instructure.espresso.click
@@ -142,6 +143,11 @@ class LeftSideNavigationDrawerPage : BasePage() {
Espresso.pressBack()
}
+ fun assertUserInfo(shortName: String, email: String) {
+ userName.assertContainsText(shortName)
+ userEmail.assertContainsText(email)
+ }
+
fun assertMenuItems(isElementaryStudent: Boolean) {
hamburgerButton.click()
userName.assertDisplayed()
diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/pages/PeopleListPage.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/pages/PeopleListPage.kt
index 5c6c163386..6254ddc991 100644
--- a/apps/student/src/androidTest/java/com/instructure/student/ui/pages/PeopleListPage.kt
+++ b/apps/student/src/androidTest/java/com/instructure/student/ui/pages/PeopleListPage.kt
@@ -92,6 +92,10 @@ class PeopleListPage: BasePage(R.id.peopleListPage) {
onView(matcher).click()
}
+ fun selectPerson(userName: String) {
+ onView(withText(userName) + withAncestor(R.id.peopleListPage)).click()
+ }
+
private fun scrollToMatch(matcher: Matcher) {
onView(allOf(withId(R.id.listView), isDisplayed(), withAncestor(R.id.peopleListPage)))
.perform(RecyclerViewActions.scrollTo(hasDescendant(matcher)))
@@ -110,4 +114,8 @@ class PeopleListPage: BasePage(R.id.peopleListPage) {
waitForView(withText(R.string.coursePeople))
}
+ fun assertPersonPronouns(personName: String, pronounString: String) {
+ onView(withId(R.id.title) + withAncestor(R.id.peopleListPage) + withText("$personName $pronounString")).assertDisplayed()
+ }
+
}
\ No newline at end of file
diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/pages/PersonDetailsPage.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/pages/PersonDetailsPage.kt
index 6a73ea9746..c955c7fd1a 100644
--- a/apps/student/src/androidTest/java/com/instructure/student/ui/pages/PersonDetailsPage.kt
+++ b/apps/student/src/androidTest/java/com/instructure/student/ui/pages/PersonDetailsPage.kt
@@ -44,6 +44,10 @@ class PersonDetailsPage: BasePage(R.id.clickContainer) {
userName.assertContainsText(user.name)
}
+ fun assertIsPerson(userNameString: String) {
+ userName.assertContainsText(userNameString)
+ }
+
//OfflineMethod
fun assertComposeMessageIcon(visibility: ViewMatchers.Visibility) {
onView(Matchers.allOf(withId(R.id.compose))).check(matches(withEffectiveVisibility(visibility)))
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 df6acc3af8..00114048ff 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
@@ -25,10 +25,12 @@ 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.matchToolbarText
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.getStringFromResource
import com.instructure.espresso.page.plus
import com.instructure.espresso.page.withAncestor
import com.instructure.espresso.swipeDown
@@ -38,6 +40,11 @@ import org.hamcrest.Matchers.allOf
open class SyllabusPage : BasePage(R.id.syllabusPage) {
+ fun assertToolbarCourseTitle(courseName: String) {
+ onView(withId(R.id.toolbar) + withAncestor(R.id.syllabusPage)).assertDisplayed().check(ViewAssertions.matches(matchToolbarText(Matchers.`is`(getStringFromResource(R.string.syllabus)), true)))
+ onView(withId(R.id.toolbar) + withAncestor(R.id.syllabusPage)).assertDisplayed().check(ViewAssertions.matches(matchToolbarText(Matchers.`is`(courseName), false)))
+ }
+
fun assertItemDisplayed(itemText: String) {
scrollRecyclerView(R.id.syllabusEventsRecycler, itemText)
}
diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/pages/offline/NativeDiscussionDetailsPage.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/pages/offline/NativeDiscussionDetailsPage.kt
new file mode 100644
index 0000000000..8cc3233183
--- /dev/null
+++ b/apps/student/src/androidTest/java/com/instructure/student/ui/pages/offline/NativeDiscussionDetailsPage.kt
@@ -0,0 +1,349 @@
+/*
+ * Copyright (C) 2019 - present Instructure, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package com.instructure.student.ui.pages.offline
+
+import android.os.SystemClock.sleep
+import androidx.test.espresso.Espresso
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.action.ViewActions.swipeDown
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.matcher.ViewMatchers
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayingAtLeast
+import androidx.test.espresso.web.assertion.WebViewAssertions.webMatches
+import androidx.test.espresso.web.sugar.Web.onWebView
+import androidx.test.espresso.web.webdriver.DriverAtoms.findElement
+import androidx.test.espresso.web.webdriver.DriverAtoms.getText
+import androidx.test.espresso.web.webdriver.DriverAtoms.webClick
+import androidx.test.espresso.web.webdriver.Locator
+import com.instructure.canvas.espresso.containsTextCaseInsensitive
+import com.instructure.canvas.espresso.isElementDisplayed
+import com.instructure.canvas.espresso.waitForMatcherWithSleeps
+import com.instructure.canvas.espresso.withCustomConstraints
+import com.instructure.canvas.espresso.withElementRepeat
+import com.instructure.canvasapi2.models.DiscussionEntry
+import com.instructure.canvasapi2.models.DiscussionTopicHeader
+import com.instructure.espresso.ModuleItemInteractions
+import com.instructure.espresso.OnViewWithId
+import com.instructure.espresso.assertDisplayed
+import com.instructure.espresso.assertGone
+import com.instructure.espresso.assertHasText
+import com.instructure.espresso.assertNotDisplayed
+import com.instructure.espresso.click
+import com.instructure.espresso.page.BasePage
+import com.instructure.espresso.page.plus
+import com.instructure.espresso.page.waitForViewWithId
+import com.instructure.espresso.page.withAncestor
+import com.instructure.espresso.page.withId
+import com.instructure.espresso.page.withText
+import com.instructure.espresso.scrollTo
+import com.instructure.student.R
+import com.instructure.student.ui.pages.WebViewTextCheck
+import com.instructure.student.ui.utils.TypeInRCETextEditor
+import org.hamcrest.Matchers.allOf
+import org.hamcrest.Matchers.containsString
+import org.junit.Assert.assertTrue
+
+
+class NativeDiscussionDetailsPage(val moduleItemInteractions: ModuleItemInteractions) : BasePage(R.id.discussionDetailsPage) {
+ private val discussionTopicTitle by OnViewWithId(R.id.discussionTopicTitle)
+ private val replyButton by OnViewWithId(R.id.replyToDiscussionTopic)
+
+ fun assertTitleText(titleText: String) {
+ discussionTopicTitle.assertHasText(titleText)
+ }
+
+ fun assertDescriptionText(descriptionText: String) {
+ onWebView(withId(R.id.contentWebView) + withAncestor(R.id.discussionTopicHeaderWebViewWrapper))
+ .withElement(findElement(Locator.ID, "content"))
+ .check(webMatches(getText(), containsString(descriptionText)))
+ }
+
+ fun assertTopicInfoShowing(topicHeader: DiscussionTopicHeader) {
+ assertTitleText(topicHeader.title!!)
+ assertDescriptionText(topicHeader.message!!)
+ }
+
+ fun clickLinkInDescription(linkElementId: String) {
+ onWebView(withId(R.id.contentWebView) + withAncestor(R.id.discussionTopicHeaderWebViewWrapper))
+ .withElement(findElement(Locator.ID, linkElementId))
+ .perform(webClick())
+ }
+
+ fun refresh() {
+ scrollToTop()
+ onView(allOf(withId(R.id.swipeRefreshLayout), isDisplayingAtLeast(10)))
+ .perform(withCustomConstraints(swipeDown(), isDisplayingAtLeast(10)))
+ }
+
+ fun scrollToRepliesWebview() {
+ waitForMatcherWithSleeps(withId(R.id.contentWebView) + withAncestor(R.id.discussionRepliesWebViewWrapper), timeout = 20000)
+ onView(withId(R.id.contentWebView) + withAncestor(R.id.discussionRepliesWebViewWrapper)).scrollTo()
+ }
+
+ fun clickReply() {
+ replyButton.click()
+ }
+
+ fun assertReplyButtonNotDisplayed() {
+ replyButton.check(matches(ViewMatchers.withEffectiveVisibility(ViewMatchers.Visibility.GONE)))
+ }
+
+ fun assertRepliesEnabled() {
+ replyButton.assertDisplayed()
+ }
+
+ fun assertRepliesDisabled() {
+ replyButton.assertGone()
+ }
+
+ fun assertRepliesDisplayed() {
+ onView(withId(R.id.discussionTopicRepliesTitle)).scrollTo().assertDisplayed()
+ }
+
+ fun assertNoRepliesDisplayed() {
+ onView(withId(R.id.discussionTopicRepliesTitle)).assertNotDisplayed()
+ }
+
+ fun sendReply(replyMessage: String) {
+ clickReply()
+ waitForViewWithId(R.id.rce_webView).perform(TypeInRCETextEditor(replyMessage))
+ clickOnSendReplyButton()
+
+ sleep(3000) // wait out the toast message
+ }
+
+ private fun clickOnSendReplyButton() {
+ onView(withId(R.id.menu_send)).click()
+ }
+
+ fun assertReplyDisplayed(reply: DiscussionEntry, refreshesAllowed: Int = 0) {
+
+ // Allow up to refreshesAllowed attempt/refresh cycles
+ for (i in 0 until refreshesAllowed) {
+ try {
+ onWebView(withId(R.id.contentWebView) + withAncestor(R.id.discussionRepliesWebViewWrapper))
+ .withElement(findElement(Locator.ID, "message_content_${reply.id}"))
+ .check(webMatches(getText(), containsString(reply.message)))
+ return
+ } catch (t: Throwable) {
+ refresh()
+ }
+ }
+
+ // If we have not yet seen the desired reply, try one more time, allowing up to
+ // 3 retries for the page to render and the reply to appear. (Each attempt
+ // waits ~10 secs before failing.)
+ // (It can take a *long* time for the reply to get rendered to the webview on
+ // tablets (in FTL, anyway).)
+ onWebView(withId(R.id.contentWebView) + withAncestor(R.id.discussionRepliesWebViewWrapper))
+ .withElementRepeat(findElement(Locator.ID, "message_content_${reply.id}"), 3)
+ .check(webMatches(getText(), containsString(reply.message)))
+ }
+
+ fun assertReplyDisplayed(reply: DiscussionEntry) {
+ onWebView(withId(R.id.contentWebView) + withAncestor(R.id.discussionRepliesWebViewWrapper))
+ .withElement(findElement(Locator.TAG_NAME, "html"))
+ .check(webMatches(getText(), containsString(reply.message)))
+ }
+
+ fun assertIfThereIsAReply() {
+ onView(withId(R.id.discussionTopicRepliesTitle)).assertDisplayed()
+ onView(withId(R.id.contentWebView) + withAncestor(R.id.discussionRepliesWebViewWrapper)).assertDisplayed()
+ }
+
+ fun assertFavoritingEnabled(reply: DiscussionEntry) {
+ try {
+ onWebView(withId(R.id.contentWebView) + withAncestor(R.id.discussionRepliesWebViewWrapper))
+ .withElement(findElement(Locator.CLASS_NAME, "likes_icon_wrapper_${reply.id}"))
+ } catch (t: Throwable) {
+ assertTrue("Favoriting icon is disabled", false)
+ }
+ }
+
+ fun assertFavoritingDisabled(reply: DiscussionEntry) {
+ try {
+ onWebView(withId(R.id.contentWebView) + withAncestor(R.id.discussionRepliesWebViewWrapper))
+ .withElement(findElement(Locator.CLASS_NAME, "likes_icon_wrapper_${reply.id}"))
+ // We shouldn't reach this point if the favoriting icon is disabled -- we should throw
+ assertTrue("Favoriting icon is enabled", false)
+ } catch (_: Throwable) {}
+ }
+
+ fun clickLikeOnEntry(reply: DiscussionEntry) {
+ onWebView(withId(R.id.contentWebView) + withAncestor(R.id.discussionRepliesWebViewWrapper))
+ .withElement(findElement(Locator.CLASS_NAME, "likes_icon_wrapper_${reply.id}"))
+ .perform(webClick())
+ }
+
+ fun assertLikeCount(reply: DiscussionEntry, count: Int, refreshesAllowed: Int = 0) {
+ if (count > 0) {
+
+ for (i in 0 until refreshesAllowed) {
+ try {
+ onWebView(withId(R.id.contentWebView) + withAncestor(R.id.discussionRepliesWebViewWrapper))
+ .withElement(findElement(Locator.CLASS_NAME, "likes_count_${reply.id}"))
+ .check(webMatches(getText(), containsString(count.toString())))
+ return
+ } catch (t: Throwable) {
+ refresh()
+ }
+ }
+
+ // If we haven't verified our info by now, let's make one last call to either
+ // (1) succeed or (2) throw a sensible error.
+ onWebView(withId(R.id.contentWebView) + withAncestor(R.id.discussionRepliesWebViewWrapper))
+ .withElement(findElement(Locator.CLASS_NAME, "likes_count_${reply.id}"))
+ .check(webMatches(getText(), containsString(count.toString())))
+ } else {
+ try {
+ onWebView(withId(R.id.contentWebView) + withAncestor(R.id.discussionRepliesWebViewWrapper))
+ .withElement(findElement(Locator.CLASS_NAME, "likes_count_${reply.id}"))
+ assertTrue("Didn't expect to see like count with 0 count", false)
+ } catch (_: Throwable) {}
+ }
+ }
+
+ fun assertReplyAttachment(reply: DiscussionEntry) {
+ try {
+ onWebView(withId(R.id.contentWebView) + withAncestor(R.id.discussionRepliesWebViewWrapper))
+ .withElement(findElement(Locator.CLASS_NAME, "attachments_${reply.id}"))
+ } catch (t: Throwable) {
+ assertTrue("Discussion entry did not have an attachment", false)
+ }
+ }
+
+ fun previewAndCheckReplyAttachment(reply: DiscussionEntry, vararg checks: WebViewTextCheck) {
+
+ // Sometimes clicking the attachment logo fails to do anything.
+ // We'll give it 3 chances.
+ var triesRemaining = 3;
+ while (!isElementDisplayed(R.id.canvasWebViewWrapper) && triesRemaining > 0) {
+ if (triesRemaining < 3) {
+ refresh() // Maybe web content was incorrectly rendered? Try again
+ sleep(1500) // Allow webview some time to render
+ }
+ onWebView(withId(R.id.contentWebView) + withAncestor(R.id.discussionRepliesWebViewWrapper))
+ .withElementRepeat(findElement(Locator.CLASS_NAME, "attachments_${reply.id}"), 20)
+ .perform(webClick())
+ triesRemaining -= 1
+ }
+
+ assertTrue("FAILED to bring up reply attachment", isElementDisplayed(R.id.canvasWebViewWrapper));
+
+ for (check in checks) {
+ onWebView(withId(R.id.contentWebView) + withAncestor(R.id.canvasWebViewWrapper))
+ .withElement(findElement(check.locatorType, check.locatorValue))
+ .check(webMatches(getText(), containsString(check.textValue)))
+ }
+ Espresso.pressBack()
+
+ }
+
+ fun replyToReply(reply: DiscussionEntry, replyMessage: String) {
+
+ // It appears that sometimes the click to reply doesn't work.
+ // Let's give it 3 chances.
+ var triesRemaining = 3
+ while (!isElementDisplayed(R.id.rce_webView) && triesRemaining > 0) {
+ if (triesRemaining < 3) {
+ refresh() // maybe the html was rendered badly and needs refreshing?
+ sleep(2000) // A little time for the webview to render
+ }
+ onWebView(withId(R.id.contentWebView) + withAncestor(R.id.discussionRepliesWebViewWrapper))
+ .withElementRepeat(findElement(Locator.ID, "reply_${reply.id}"), 20)
+ .perform(webClick())
+ triesRemaining -= 1
+ }
+
+ assertTrue("FAILED to bring up rce / reply editor", isElementDisplayed(R.id.rce_webView));
+
+ onView(withId(R.id.rce_webView)).perform(TypeInRCETextEditor(replyMessage))
+ onView(withId(R.id.menu_send)).click()
+
+ sleep(3000) // wait out the toast message
+ }
+
+ fun assertMainAttachmentDisplayed() {
+ onView(withId(R.id.attachmentIcon)).assertDisplayed()
+ }
+
+ /**
+ * Assumes that the attachment is html
+ */
+ fun previewAndCheckMainAttachment(vararg checks: WebViewTextCheck) {
+ onView(withId(R.id.attachmentIcon)).click()
+ for (check in checks) {
+ onWebView(withId(R.id.contentWebView) + withAncestor(R.id.canvasWebViewWrapper))
+ .withElement(findElement(check.locatorType, check.locatorValue))
+ .check(webMatches(getText(), containsString(check.textValue)))
+ }
+ Espresso.pressBack()
+ }
+
+ /**
+ * It can take a *long* time (much longer than the advertised 2.5 seconds) for
+ * the unread indicator to disappear when running tests on FTL. Rather than
+ * use an ever-increasing timeout, I figured I would just programmatically
+ * wait until the unread indicator disappeared, for up to 10 seconds.
+ *
+ * The downside is that we are relying on webview elements to not change.
+ * If that is something that happens often (or maybe even once), we will
+ * need to go back to using a timeout.
+ */
+ fun waitForUnreadIndicatorToDisappear(reply: DiscussionEntry) {
+ repeat(10) {
+ if (!isUnreadIndicatorVisible(reply)) return
+ sleep(1000)
+ }
+
+ assertTrue("Timed out waiting for unread indicator to disappear", false)
+ }
+
+ fun assertPointsPossibleDisplayed(points: String) {
+ onView(withId(R.id.pointsTextView)).check(matches(containsTextCaseInsensitive(points)))
+ }
+
+ fun assertPointsPossibleNotDisplayed() {
+ onView(withId(R.id.pointsTextView)).assertNotDisplayed()
+ }
+
+ fun clickOnInnerReply() {
+ onWebView(withId(R.id.contentWebView) + withAncestor(R.id.discussionRepliesWebViewWrapper))
+ .withElement(findElement(Locator.XPATH, "//div[@class='reply_wrapper' and contains(@id, 'reply')]"))
+ .perform(webClick())
+ }
+
+ fun clickOnAddBookmarkMenu() {
+ onView(withText("Add Bookmark")).click()
+ }
+
+ private fun isUnreadIndicatorVisible(reply: DiscussionEntry): Boolean {
+ return try {
+ onWebView(withId(R.id.contentWebView) + withAncestor(R.id.discussionRepliesWebViewWrapper))
+ .withElement(findElement(Locator.ID, "unread_indicator_${reply.id}"))
+ .withElement(findElement(Locator.CLASS_NAME, "unread"))
+ true
+ } catch (t: Throwable) {
+ false
+ }
+ }
+
+ private fun scrollToTop() {
+ onView(allOf(withId(R.id.swipeRefreshLayout), isDisplayingAtLeast(10)))
+ .perform(withCustomConstraints(swipeDown(), isDisplayingAtLeast(10)))
+ }
+}
diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/pages/renderPages/SubmissionCommentsRenderPage.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/pages/renderPages/SubmissionCommentsRenderPage.kt
index cc41c4f90d..146c09bae5 100644
--- a/apps/student/src/androidTest/java/com/instructure/student/ui/pages/renderPages/SubmissionCommentsRenderPage.kt
+++ b/apps/student/src/androidTest/java/com/instructure/student/ui/pages/renderPages/SubmissionCommentsRenderPage.kt
@@ -27,6 +27,7 @@ import com.instructure.canvas.espresso.scrollRecyclerView
import com.instructure.canvasapi2.utils.Pronouns
import com.instructure.espresso.*
import com.instructure.espresso.page.BasePage
+import com.instructure.espresso.page.onView
import com.instructure.espresso.page.onViewWithId
import com.instructure.espresso.page.onViewWithText
import com.instructure.student.R
@@ -61,7 +62,7 @@ class SubmissionCommentsRenderPage: BasePage(R.id.submissionCommentsPage) {
// Make sure that the message is on the screen
val message = getMessage(commentState)
val messageMatcher = allOf(withText(containsString(message)), anyOf(withId(R.id.commentTextView), withId(R.id.subtitleTextView)))
- scrollAndAssertDisplayed(messageMatcher)
+ onView(messageMatcher).scrollTo().assertDisplayed()
if (failed) {
// Make sure the fail message is on the screen and the sending layout is gone
diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/renderTests/MediaSubmissionViewRenderTest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/renderTests/MediaSubmissionViewRenderTest.kt
index 0fb971524d..7444707979 100644
--- a/apps/student/src/androidTest/java/com/instructure/student/ui/renderTests/MediaSubmissionViewRenderTest.kt
+++ b/apps/student/src/androidTest/java/com/instructure/student/ui/renderTests/MediaSubmissionViewRenderTest.kt
@@ -17,16 +17,11 @@
package com.instructure.student.ui.renderTests
import android.net.Uri
-import androidx.test.espresso.assertion.ViewAssertions.matches
-import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
import androidx.test.ext.junit.runners.AndroidJUnit4
import com.instructure.canvas.espresso.Stub
-import com.instructure.canvasapi2.utils.NetworkUtils
import com.instructure.espresso.assertDisplayed
import com.instructure.espresso.assertNotDisplayed
import com.instructure.espresso.click
-import com.instructure.espresso.page.waitForViewWithText
-import com.instructure.espresso.waitForCheck
import com.instructure.pandautils.utils.PandaPrefs
import com.instructure.student.espresso.StudentRenderTest
import com.instructure.student.mobius.assignmentDetails.submissionDetails.SubmissionDetailsContentType
diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/renderTests/SubmissionCommentsRenderTest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/renderTests/SubmissionCommentsRenderTest.kt
index c3ddebf0ee..7b8b8e5d09 100644
--- a/apps/student/src/androidTest/java/com/instructure/student/ui/renderTests/SubmissionCommentsRenderTest.kt
+++ b/apps/student/src/androidTest/java/com/instructure/student/ui/renderTests/SubmissionCommentsRenderTest.kt
@@ -15,6 +15,7 @@
*/
package com.instructure.student.ui.renderTests
+import androidx.room.Room
import androidx.test.core.app.ApplicationProvider
import androidx.test.espresso.Espresso
import androidx.test.ext.junit.runners.AndroidJUnit4
@@ -27,23 +28,24 @@ import com.instructure.canvasapi2.models.Assignment
import com.instructure.canvasapi2.models.CanvasContext
import com.instructure.canvasapi2.models.Submission
import com.instructure.canvasapi2.models.User
-import com.instructure.student.PendingSubmissionComment
-import com.instructure.student.db.Db
-import com.instructure.student.db.getInstance
-import com.instructure.student.db.sqlColAdapters.Date
import com.instructure.student.espresso.StudentRenderTest
import com.instructure.student.mobius.assignmentDetails.submissionDetails.drawer.comments.CommentItemState
import com.instructure.student.mobius.assignmentDetails.submissionDetails.drawer.comments.SubmissionCommentsViewState
import com.instructure.student.mobius.assignmentDetails.submissionDetails.drawer.comments.ui.SubmissionCommentsFragment
import com.instructure.student.mobius.assignmentDetails.submissionDetails.ui.SubmissionDetailsTabData
+import com.instructure.student.room.StudentDb
+import com.instructure.student.room.entities.CreatePendingSubmissionCommentEntity
import com.instructure.student.ui.pages.renderPages.SubmissionCommentsRenderPage
import com.spotify.mobius.runners.WorkRunner
import dagger.hilt.android.testing.HiltAndroidTest
import junit.framework.Assert.assertTrue
+import kotlinx.coroutines.test.runTest
+import org.junit.After
import org.junit.Before
import org.junit.Test
import org.junit.runner.RunWith
import java.util.*
+import javax.inject.Inject
@HiltAndroidTest
@RunWith(AndroidJUnit4::class)
@@ -56,12 +58,14 @@ class SubmissionCommentsRenderTest: StudentRenderTest() {
private lateinit var commentItemIsAudience: CommentItemState.CommentItem
private lateinit var submissionItem: CommentItemState.SubmissionItem
private lateinit var pendingCommentItem: CommentItemState.PendingCommentItem
- private val db = Db.getInstance(ApplicationProvider.getApplicationContext()).pendingSubmissionCommentQueries
+
+ @Inject
+ lateinit var db: StudentDb
val page = SubmissionCommentsRenderPage()
@Before
- fun setUp() {
+ fun setUp() = runTest {
user = User(id=100,name="Bart Simpson",shortName="Bart",avatarUrl="BartAvatarUrl")
teacher = User(id=101,name="Edna Krabapple",shortName="Edna",avatarUrl="EdnaAvatarUrl")
@@ -126,7 +130,7 @@ class SubmissionCommentsRenderTest: StudentRenderTest() {
assignmentName = "Special assignment",
canvasContext = CanvasContext.defaultCanvasContext(),
isGroupMessage = false,
- lastActivityDate = Date.now(),
+ lastActivityDate = Date(),
mediaPath = "/media/path",
message = "Pending Message",
attemptId = 1
@@ -229,8 +233,8 @@ class SubmissionCommentsRenderTest: StudentRenderTest() {
Priority.COMMON,
FeatureCategory.ASSIGNMENTS,
TestCategory.RENDER,secondaryFeature = SecondaryFeatureCategory.ASSIGNMENT_COMMENTS)
- fun testFailedCommentDisplaysRetryAndDeleteOptions() {
- db.setCommentError(true, pendingCommentItem.pendingComment.id)
+ fun testFailedCommentDisplaysRetryAndDeleteOptions() = runTest {
+ db.pendingSubmissionCommentDao().setCommentError(true, pendingCommentItem.pendingComment.id)
val state = SubmissionCommentsViewState(
commentStates = listOf(pendingCommentItem)
)
@@ -295,7 +299,7 @@ class SubmissionCommentsRenderTest: StudentRenderTest() {
}
@Suppress("SameParameterValue")
- private fun makePendingComment(
+ private suspend fun makePendingComment(
accountDomain: String,
canvasContext: CanvasContext,
assignmentName: String,
@@ -305,20 +309,22 @@ class SubmissionCommentsRenderTest: StudentRenderTest() {
message: String?,
mediaPath: String?,
attemptId: Long?
- ) : PendingSubmissionComment {
- db.insertComment(
- accountDomain,
- canvasContext,
- assignmentName,
- assignmentId,
- lastActivityDate,
- isGroupMessage,
- message,
- mediaPath,
- attemptId
+ ): CreatePendingSubmissionCommentEntity {
+ val rowId = db.pendingSubmissionCommentDao().insert(
+ CreatePendingSubmissionCommentEntity(
+ accountDomain = accountDomain,
+ canvasContext = canvasContext,
+ assignmentName = assignmentName,
+ assignmentId = assignmentId,
+ lastActivityDate = lastActivityDate,
+ isGroupMessage = isGroupMessage,
+ message = message,
+ mediaPath = mediaPath,
+ attemptId = attemptId
+ )
)
- val id = db.getLastInsert().executeAsOne()
- return db.getCommentById(id).executeAsOne()
+ val id = db.pendingSubmissionCommentDao().findIdByRowId(rowId)
+ val comment = db.pendingSubmissionCommentDao().findCommentById(id)!!
+ return comment
}
-
}
diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/renderTests/UploadStatusSubmissionRenderTest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/renderTests/UploadStatusSubmissionRenderTest.kt
index 97b2ca7df8..43e387e62b 100644
--- a/apps/student/src/androidTest/java/com/instructure/student/ui/renderTests/UploadStatusSubmissionRenderTest.kt
+++ b/apps/student/src/androidTest/java/com/instructure/student/ui/renderTests/UploadStatusSubmissionRenderTest.kt
@@ -20,10 +20,10 @@ import com.instructure.canvas.espresso.FeatureCategory
import com.instructure.canvas.espresso.Priority
import com.instructure.canvas.espresso.TestCategory
import com.instructure.canvas.espresso.TestMetaData
-import com.instructure.student.FileSubmission
import com.instructure.student.espresso.StudentRenderTest
import com.instructure.student.mobius.assignmentDetails.submission.file.UploadStatusSubmissionModel
import com.instructure.student.mobius.assignmentDetails.submission.file.ui.UploadStatusSubmissionFragment
+import com.instructure.student.room.entities.CreateFileSubmissionEntity
import com.spotify.mobius.runners.WorkRunner
import dagger.hilt.android.testing.HiltAndroidTest
import org.junit.Before
@@ -69,7 +69,7 @@ class UploadStatusSubmissionRenderTest : StudentRenderTest() {
@TestMetaData(Priority.COMMON, FeatureCategory.SUBMISSIONS, TestCategory.RENDER)
fun displaysInProgressState() {
loadPageWithModel(baseModel.copy(files = listOf(
- FileSubmission(0, 0, null, null, null, null, null, null, false)
+ CreateFileSubmissionEntity(0, 0, null, null, null, null, null, null, false)
)))
uploadStatusSubmissionViewRenderPage.assertInProgressVisible()
}
diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/utils/StudentComposeTest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/utils/StudentComposeTest.kt
index 078ec98f70..b4b871784e 100644
--- a/apps/student/src/androidTest/java/com/instructure/student/ui/utils/StudentComposeTest.kt
+++ b/apps/student/src/androidTest/java/com/instructure/student/ui/utils/StudentComposeTest.kt
@@ -19,6 +19,12 @@
package com.instructure.student.ui.utils
import androidx.compose.ui.test.junit4.createAndroidComposeRule
+import com.instructure.canvas.espresso.common.pages.compose.CalendarEventCreateEditPage
+import com.instructure.canvas.espresso.common.pages.compose.CalendarEventDetailsPage
+import com.instructure.canvas.espresso.common.pages.compose.CalendarFilterPage
+import com.instructure.canvas.espresso.common.pages.compose.CalendarScreenPage
+import com.instructure.canvas.espresso.common.pages.compose.CalendarToDoCreateUpdatePage
+import com.instructure.canvas.espresso.common.pages.compose.CalendarToDoDetailsPage
import com.instructure.student.activity.LoginActivity
import org.junit.Rule
@@ -26,4 +32,11 @@ abstract class StudentComposeTest : StudentTest() {
@get:Rule(order = 1)
val composeTestRule = createAndroidComposeRule()
+
+ val calendarEventCreateEditPage = CalendarEventCreateEditPage(composeTestRule)
+ val calendarScreenPage = CalendarScreenPage(composeTestRule)
+ val calendarEventDetailsPage = CalendarEventDetailsPage(composeTestRule)
+ val calendarToDoCreateUpdatePage = CalendarToDoCreateUpdatePage(composeTestRule)
+ val calendarToDoDetailsPage = CalendarToDoDetailsPage(composeTestRule)
+ val calendarFilterPage = CalendarFilterPage(composeTestRule)
}
\ 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 2bdebb30ac..5ef1bd7f9d 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
@@ -21,10 +21,8 @@ import android.app.Instrumentation
import android.content.Intent
import android.net.Uri
import android.os.Environment
-import android.util.Log
import android.view.View
import androidx.core.content.FileProvider
-import androidx.hilt.work.HiltWorkerFactory
import androidx.test.espresso.Espresso
import androidx.test.espresso.UiController
import androidx.test.espresso.ViewAction
@@ -42,7 +40,6 @@ import com.instructure.pandautils.utils.Const
import com.instructure.student.BuildConfig
import com.instructure.student.R
import com.instructure.student.activity.LoginActivity
-import com.instructure.student.espresso.StudentHiltTestApplication_Application
import com.instructure.student.ui.pages.AboutPage
import com.instructure.student.ui.pages.AllCoursesPage
import com.instructure.student.ui.pages.AnnotationCommentListPage
@@ -50,14 +47,12 @@ import com.instructure.student.ui.pages.AnnouncementListPage
import com.instructure.student.ui.pages.AssignmentDetailsPage
import com.instructure.student.ui.pages.AssignmentListPage
import com.instructure.student.ui.pages.BookmarkPage
-import com.instructure.student.ui.pages.CalendarEventPage
import com.instructure.student.ui.pages.CanvasWebViewPage
import com.instructure.student.ui.pages.ConferenceDetailsPage
import com.instructure.student.ui.pages.ConferenceListPage
import com.instructure.student.ui.pages.CourseBrowserPage
import com.instructure.student.ui.pages.CourseGradesPage
import com.instructure.student.ui.pages.DashboardPage
-import com.instructure.student.ui.pages.DiscussionDetailsPage
import com.instructure.student.ui.pages.DiscussionListPage
import com.instructure.student.ui.pages.ElementaryCoursePage
import com.instructure.student.ui.pages.ElementaryDashboardPage
@@ -70,7 +65,7 @@ import com.instructure.student.ui.pages.HelpPage
import com.instructure.student.ui.pages.HomeroomPage
import com.instructure.student.ui.pages.ImportantDatesPage
import com.instructure.student.ui.pages.InboxConversationPage
-import com.instructure.student.ui.pages.InboxPage
+import com.instructure.canvas.espresso.common.pages.InboxPage
import com.instructure.student.ui.pages.LeftSideNavigationDrawerPage
import com.instructure.student.ui.pages.LegalPage
import com.instructure.student.ui.pages.LoginFindSchoolPage
@@ -103,51 +98,23 @@ import com.instructure.student.ui.pages.TextSubmissionUploadPage
import com.instructure.student.ui.pages.TodoPage
import com.instructure.student.ui.pages.UrlSubmissionUploadPage
import com.instructure.student.ui.pages.offline.ManageOfflineContentPage
+import com.instructure.student.ui.pages.offline.NativeDiscussionDetailsPage
import com.instructure.student.ui.pages.offline.OfflineSyncSettingsPage
import com.instructure.student.ui.pages.offline.SyncProgressPage
-import dagger.hilt.android.testing.HiltAndroidRule
import instructure.rceditor.RCETextEditor
import org.hamcrest.Matcher
import org.hamcrest.core.AllOf
-import org.junit.Before
-import org.junit.Rule
import java.io.File
-import javax.inject.Inject
abstract class StudentTest : CanvasTest() {
val device: UiDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())
+ override val isTesting = BuildConfig.IS_TESTING
+
override val activityRule: InstructureActivityTestRule =
StudentActivityTestRule(LoginActivity::class.java)
- lateinit var originalActivity : Activity
-
- @Inject
- lateinit var workerFactory: HiltWorkerFactory
-
- @get:Rule(order = 0)
- var hiltRule = HiltAndroidRule(this)
-
- // Sometimes activityRule.activity can get nulled out over time, probably as we
- // navigate away from the original login screen. Capture the activity here so
- // that we can reference it safely later.
- @Before
- fun recordOriginalActivity() {
- originalActivity = activityRule.activity
- try {
- hiltRule.inject()
- } catch (e: IllegalStateException) {
- // Catch this exception to avoid multiple injection
- Log.w("Test Inject", e.message ?: "")
- }
-
- val application = originalActivity.application as? StudentHiltTestApplication_Application
- application?.workerFactory = workerFactory
- }
-
- override val isTesting = BuildConfig.IS_TESTING
-
/**
* Required for auto complete of page objects within tests
*/
@@ -156,7 +123,6 @@ abstract class StudentTest : CanvasTest() {
val assignmentDetailsPage = AssignmentDetailsPage(ModuleItemInteractions(R.id.moduleName, R.id.next_item, R.id.prev_item))
val assignmentListPage = AssignmentListPage(Searchable(R.id.search, R.id.search_src_text))
val bookmarkPage = BookmarkPage()
- val calendarEventPage = CalendarEventPage()
val canvasWebViewPage = CanvasWebViewPage()
val courseBrowserPage = CourseBrowserPage()
val groupBrowserPage = GroupBrowserPage()
@@ -166,7 +132,8 @@ abstract class StudentTest : CanvasTest() {
val courseGradesPage = CourseGradesPage()
val dashboardPage = DashboardPage()
val leftSideNavigationDrawerPage = LeftSideNavigationDrawerPage()
- val discussionDetailsPage = DiscussionDetailsPage(ModuleItemInteractions(R.id.moduleName, R.id.next_item, R.id.prev_item))
+ val discussionDetailsPage = com.instructure.student.ui.pages.DiscussionDetailsPage(ModuleItemInteractions(R.id.moduleName, R.id.next_item, R.id.prev_item))
+ val nativeDiscussionDetailsPage = NativeDiscussionDetailsPage(ModuleItemInteractions(R.id.moduleName, R.id.next_item, R.id.prev_item))
val discussionListPage = DiscussionListPage(Searchable(R.id.search, R.id.search_src_text, R.id.search_close_btn))
val allCoursesPage = AllCoursesPage()
val fileListPage = FileListPage(Searchable(R.id.search, R.id.queryInput, R.id.clearButton, R.id.backButton))
diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/utils/StudentTestExtensions.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/utils/StudentTestExtensions.kt
index 02c6b4d5e4..e98329a47f 100644
--- a/apps/student/src/androidTest/java/com/instructure/student/ui/utils/StudentTestExtensions.kt
+++ b/apps/student/src/androidTest/java/com/instructure/student/ui/utils/StudentTestExtensions.kt
@@ -24,14 +24,30 @@ import android.net.Uri
import android.os.Environment
import androidx.fragment.app.FragmentActivity
import androidx.test.espresso.Espresso
+import androidx.test.espresso.assertion.ViewAssertions
import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.matcher.ViewMatchers
import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
import androidx.test.espresso.matcher.ViewMatchers.withId
import androidx.test.platform.app.InstrumentationRegistry
+import com.instructure.canvas.espresso.CanvasTest
import com.instructure.canvas.espresso.waitForMatcherWithSleeps
import com.instructure.canvasapi2.models.User
-import com.instructure.dataseeding.api.*
-import com.instructure.dataseeding.model.*
+import com.instructure.dataseeding.api.AssignmentsApi
+import com.instructure.dataseeding.api.CoursesApi
+import com.instructure.dataseeding.api.EnrollmentsApi
+import com.instructure.dataseeding.api.FileUploadsApi
+import com.instructure.dataseeding.api.SeedApi
+import com.instructure.dataseeding.api.SubmissionsApi
+import com.instructure.dataseeding.api.UserApi
+import com.instructure.dataseeding.model.AssignmentApiModel
+import com.instructure.dataseeding.model.AttachmentApiModel
+import com.instructure.dataseeding.model.CanvasUserApiModel
+import com.instructure.dataseeding.model.EnrollmentTypes
+import com.instructure.dataseeding.model.FileType
+import com.instructure.dataseeding.model.FileUploadType
+import com.instructure.dataseeding.model.SubmissionApiModel
+import com.instructure.dataseeding.model.SubmissionType
import com.instructure.dataseeding.util.CanvasNetworkAdapter
import com.instructure.dataseeding.util.Randomizer
import com.instructure.interactions.router.Route
@@ -106,7 +122,8 @@ fun seedData(
locked: Boolean = false,
discussions: Int = 0,
syllabusBody: String? = null,
- gradingPeriods: Boolean = false
+ gradingPeriods: Boolean = false,
+ modules: Int = 0
): SeedApi.SeededDataApiModel {
val request = SeedApi.SeedDataRequest (
@@ -121,7 +138,8 @@ fun seedData(
discussions = discussions,
announcements = announcements,
locked = locked,
- syllabusBody = syllabusBody
+ syllabusBody = syllabusBody,
+ modules = modules
)
return SeedApi.seedData(request)
}
@@ -178,6 +196,23 @@ fun StudentTest.tokenLogin(domain: String, token: String, user: User) {
dashboardPage.assertPageObjects()
}
+fun CanvasTest.tokenLogin(domain: String, token: String, user: User) {
+ activityRule.runOnUiThread {
+ (originalActivity as LoginActivity).loginWithToken(
+ token,
+ domain,
+ user
+ )
+ }
+ // Sometimes, especially on slow FTL emulators, it can take a bit for the dashboard to show
+ // up after a token login. Add some tolerance for that.
+ waitForMatcherWithSleeps(ViewMatchers.withId(R.id.dashboardPage), 20000).check(
+ ViewAssertions.matches(
+ ViewMatchers.isDisplayed()
+ )
+ )
+}
+
fun StudentTest.tokenLoginElementary(domain: String, token: String, user: User) {
activityRule.runOnUiThread {
(originalActivity as LoginActivity).loginWithToken(
diff --git a/apps/student/src/main/AndroidManifest.xml b/apps/student/src/main/AndroidManifest.xml
index 121b471855..aaf354eb0e 100644
--- a/apps/student/src/main/AndroidManifest.xml
+++ b/apps/student/src/main/AndroidManifest.xml
@@ -41,6 +41,7 @@
+
-
+
+
+
-
-
diff --git a/apps/student/src/main/db/com/instructure/student/1.sqm b/apps/student/src/main/db/com/instructure/student/1.sqm
deleted file mode 100644
index b9e0b6011b..0000000000
--- a/apps/student/src/main/db/com/instructure/student/1.sqm
+++ /dev/null
@@ -1,17 +0,0 @@
- --
- -- Copyright (C) 2019 - present Instructure, Inc.
- --
- -- Licensed under the Apache License, Version 2.0 (the "License");
- -- you may not use this file except in compliance with the License.
- -- You may obtain a copy of the License at
- --
- -- http://www.apache.org/licenses/LICENSE-2.0
- --
- -- Unless required by applicable law or agreed to in writing, software
- -- distributed under the License is distributed on an "AS IS" BASIS,
- -- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- -- See the License for the specific language governing permissions and
- -- limitations under the License.
- --
-
-ALTER TABLE submission ADD COLUMN annotatableAttachmentId INTEGER;
\ No newline at end of file
diff --git a/apps/student/src/main/db/com/instructure/student/2.sqm b/apps/student/src/main/db/com/instructure/student/2.sqm
deleted file mode 100644
index 7acb7308e2..0000000000
--- a/apps/student/src/main/db/com/instructure/student/2.sqm
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE submission ADD COLUMN isDraft INTEGER AS Boolean DEFAULT 0;
\ No newline at end of file
diff --git a/apps/student/src/main/db/com/instructure/student/3.sqm b/apps/student/src/main/db/com/instructure/student/3.sqm
deleted file mode 100644
index d52fc7c2de..0000000000
--- a/apps/student/src/main/db/com/instructure/student/3.sqm
+++ /dev/null
@@ -1,17 +0,0 @@
- --
- -- Copyright (C) 2023 - present Instructure, Inc.
- --
- -- Licensed under the Apache License, Version 2.0 (the "License");
- -- you may not use this file except in compliance with the License.
- -- You may obtain a copy of the License at
- --
- -- http://www.apache.org/licenses/LICENSE-2.0
- --
- -- Unless required by applicable law or agreed to in writing, software
- -- distributed under the License is distributed on an "AS IS" BASIS,
- -- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- -- See the License for the specific language governing permissions and
- -- limitations under the License.
- --
-
-ALTER TABLE pendingSubmissionComment ADD COLUMN attemptId INTEGER;
\ No newline at end of file
diff --git a/apps/student/src/main/db/com/instructure/student/FileSubmission.sq b/apps/student/src/main/db/com/instructure/student/FileSubmission.sq
deleted file mode 100644
index 046c3a157c..0000000000
--- a/apps/student/src/main/db/com/instructure/student/FileSubmission.sq
+++ /dev/null
@@ -1,87 +0,0 @@
- --
- -- Copyright (C) 2019 - present Instructure, Inc.
- --
- -- Licensed under the Apache License, Version 2.0 (the "License");
- -- you may not use this file except in compliance with the License.
- -- You may obtain a copy of the License at
- --
- -- http://www.apache.org/licenses/LICENSE-2.0
- --
- -- Unless required by applicable law or agreed to in writing, software
- -- distributed under the License is distributed on an "AS IS" BASIS,
- -- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- -- See the License for the specific language governing permissions and
- -- limitations under the License.
- --
-
-import com.instructure.canvasapi2.models.CanvasContext;
-import com.instructure.student.db.sqlColAdapters.ErrorColAdapter;
-import com.instructure.canvasapi2.models.postmodels.FileSubmitObject;
-
-CREATE TABLE fileSubmission (
- id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
- dbSubmissionId INTEGER NOT NULL,
- attachmentId INTEGER,
- name TEXT,
- size INTEGER,
- contentType TEXT,
- fullPath TEXT,
- error TEXT,
- errorFlag INTEGER AS Boolean NOT NULL DEFAULT 0,
- FOREIGN KEY (dbSubmissionId) REFERENCES submission(id) ON DELETE CASCADE
-);
-
-CREATE INDEX fileSubmission_dbSubmissionId ON fileSubmission(dbSubmissionId);
-
---
-insertFile:
-INSERT INTO fileSubmission (dbSubmissionId, name, size, contentType, fullPath)
-VALUES (?, ?, ?, ?, ?);
---
-
-getAllFiles:
-SELECT *
-FROM fileSubmission;
-
-getFileById:
-SELECT *
-FROM fileSubmission
-WHERE id = ?;
-
-getFilesForSubmissionId:
-SELECT *
-FROM fileSubmission
-WHERE dbSubmissionId = ?;
-
-getFilesForPath:
-SELECT *
-FROM fileSubmission
-WHERE id != ? AND fullPath = ?;
-
-getFilesWithoutAttachmentsForSubmissionId:
-SELECT *
-FROM fileSubmission
-WHERE dbSubmissionId = ? AND attachmentId IS NULL;
-
-deleteFileById:
-DELETE
-FROM fileSubmission
-WHERE id = ?;
-
-deleteFilesForSubmissionId:
-DELETE
-FROM fileSubmission
-WHERE dbSubmissionId = ?;
-
-setFileError:
-UPDATE fileSubmission
-SET errorFlag = ?, error = ?
-WHERE id = ?;
-
-setFileAttachmentIdAndError:
-UPDATE fileSubmission
-SET attachmentId = ?, errorFlag = ?, error = ?
-WHERE id = ?;
-
-getLastInsertId:
-SELECT last_insert_rowid();
diff --git a/apps/student/src/main/db/com/instructure/student/PendingSubmissionComment.sq b/apps/student/src/main/db/com/instructure/student/PendingSubmissionComment.sq
deleted file mode 100644
index 813f704353..0000000000
--- a/apps/student/src/main/db/com/instructure/student/PendingSubmissionComment.sq
+++ /dev/null
@@ -1,75 +0,0 @@
- --
- -- Copyright (C) 2019 - present Instructure, Inc.
- --
- -- Licensed under the Apache License, Version 2.0 (the "License");
- -- you may not use this file except in compliance with the License.
- -- You may obtain a copy of the License at
- --
- -- http://www.apache.org/licenses/LICENSE-2.0
- --
- -- Unless required by applicable law or agreed to in writing, software
- -- distributed under the License is distributed on an "AS IS" BASIS,
- -- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- -- See the License for the specific language governing permissions and
- -- limitations under the License.
- --
-
-import com.instructure.canvasapi2.models.CanvasContext;
-import com.instructure.student.db.sqlColAdapters.Date;
-import com.instructure.student.db.sqlColAdapters.ErrorColAdapter;
-
-CREATE TABLE pendingSubmissionComment (
- id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
- accountDomain TEXT NOT NULL,
- canvasContext TEXT AS CanvasContext NOT NULL,
- assignmentName TEXT NOT NULL,
- assignmentId INTEGER NOT NULL,
- lastActivityDate TEXT AS Date NOT NULL,
- isGroupMessage INTEGER AS Boolean NOT NULL,
- message TEXT,
- mediaPath TEXT,
- currentFile INTEGER NOT NULL DEFAULT 0,
- fileCount INTEGER NOT NULL DEFAULT 0,
- progress REAL,
- errorFlag INTEGER AS Boolean NOT NULL DEFAULT 0,
- attemptId INTEGER
-);
-
-insertComment:
-INSERT INTO pendingSubmissionComment (accountDomain, canvasContext, assignmentName, assignmentId, lastActivityDate, isGroupMessage, message, mediaPath, attemptId)
-VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?);
-
-getAllComments:
-SELECT *
-FROM pendingSubmissionComment;
-
-getCommentById:
-SELECT *
-FROM pendingSubmissionComment
-WHERE id = ?;
-
-getCommentsByAccountAssignment:
-SELECT *
-FROM pendingSubmissionComment
-WHERE accountDomain = ?
-AND assignmentId = ?;
-
-deleteCommentById:
-DELETE
-FROM pendingSubmissionComment
-WHERE id = ?;
-
-updateCommentProgress:
-UPDATE pendingSubmissionComment
-SET currentFile = ?,
- fileCount = ?,
- progress = ?
-WHERE id = ?;
-
-setCommentError:
-UPDATE pendingSubmissionComment
-SET errorFlag = ?
-WHERE id = ?;
-
-getLastInsert:
-SELECT last_insert_rowid();
diff --git a/apps/student/src/main/db/com/instructure/student/Submission.sq b/apps/student/src/main/db/com/instructure/student/Submission.sq
deleted file mode 100644
index 6daf7328c0..0000000000
--- a/apps/student/src/main/db/com/instructure/student/Submission.sq
+++ /dev/null
@@ -1,112 +0,0 @@
- --
- -- Copyright (C) 2019 - present Instructure, Inc.
- --
- -- Licensed under the Apache License, Version 2.0 (the "License");
- -- you may not use this file except in compliance with the License.
- -- You may obtain a copy of the License at
- --
- -- http://www.apache.org/licenses/LICENSE-2.0
- --
- -- Unless required by applicable law or agreed to in writing, software
- -- distributed under the License is distributed on an "AS IS" BASIS,
- -- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- -- See the License for the specific language governing permissions and
- -- limitations under the License.
- --
-
-import com.instructure.canvasapi2.models.CanvasContext;
-import com.instructure.student.db.sqlColAdapters.Date;
-
-CREATE TABLE submission (
- id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
- submissionEntry TEXT, -- Text, URL, or a URI pointing to a file
- lastActivityDate TEXT AS Date, -- Uploaded on, or day/time the upload failed
- assignmentName TEXT,
- assignmentId INTEGER NOT NULL,
- canvasContext TEXT AS CanvasContext NOT NULL,
- submissionType TEXT NOT NULL,
- errorFlag INTEGER AS Boolean NOT NULL DEFAULT 0,
- assignmentGroupCategoryId INTEGER,
- userId INTEGER NOT NULL,
- -- Used for progress
- currentFile INTEGER NOT NULL DEFAULT 0,
- fileCount INTEGER NOT NULL DEFAULT 0,
- progress REAL,
- annotatableAttachmentId INTEGER,
- isDraft INTEGER AS Boolean DEFAULT 0
-);
-
-insertOnlineTextSubmission:
-INSERT INTO submission (submissionEntry, assignmentName, assignmentId, canvasContext, userId, lastActivityDate, submissionType, isDraft)
-VALUES (?, ?, ?, ?, ?, ?, "online_text_entry", ?);
-
-insertOnlineUrlSubmission:
-INSERT INTO submission (submissionEntry, assignmentName, assignmentId, canvasContext, userId, lastActivityDate, submissionType, isDraft)
-VALUES (?, ?, ?, ?, ?, ?, "online_url", 0); --"basic_lti_launch" else "online_url"
-
-insertOnlineUploadSubmission:
-INSERT INTO submission (assignmentName, assignmentId, assignmentGroupCategoryId, canvasContext, userId, lastActivityDate, submissionType, isDraft)
-VALUES (?, ?, ?, ?, ?, ?, "online_upload", 0);
-
-insertMediaUploadSubmission:
-INSERT INTO submission (assignmentName, assignmentId, assignmentGroupCategoryId, canvasContext, userId, lastActivityDate, submissionType, isDraft)
-VALUES (?, ?, ?, ?, ?, ?, "media_recording", 0);
-
-insertStudentAnnotationSubmission:
-INSERT INTO submission (annotatableAttachmentId, assignmentName, assignmentId, canvasContext, userId, lastActivityDate, submissionType, isDraft)
-VALUES (?, ?, ?, ?, ?, ?, "student_annotation", 0);
-
-getAllSubmissions:
-SELECT *
-FROM submission;
-
-getSubmissionById:
-SELECT *
-FROM submission
-WHERE id = ?;
-
-getSubmissionsByAssignmentId:
-SELECT *
-FROM submission
-WHERE assignmentId = ?
-AND userId = ?;
-
-deleteSubmissionById:
-DELETE
-FROM submission
-WHERE id = ?;
-
-deleteSubmissionsForAssignmentId:
-DELETE
-FROM submission
-WHERE assignmentId = ?
-AND userId = ?;
-
-setSubmissionError:
-UPDATE submission
-SET errorFlag = ?
-WHERE id = ?;
-
-updateProgress:
-UPDATE submission
-SET currentFile = ?,
- fileCount = ?,
- progress = ?
-WHERE id = ?;
-
-getLastInsert:
-SELECT last_insert_rowid();
-
-getDraftById:
-SELECT *
-FROM submission
-WHERE assignmentId = ?
-AND userId = ?
-AND isDraft = 1;
-
-deleteDraftById:
-DELETE
-FROM submission
-WHERE assignmentId = ?
-AND userId = ?
-AND isDraft = 1;
\ No newline at end of file
diff --git a/apps/student/src/main/db/com/instructure/student/SubmissionCommentFile.sq b/apps/student/src/main/db/com/instructure/student/SubmissionCommentFile.sq
deleted file mode 100644
index 1e0e12768a..0000000000
--- a/apps/student/src/main/db/com/instructure/student/SubmissionCommentFile.sq
+++ /dev/null
@@ -1,75 +0,0 @@
- --
- -- Copyright (C) 2019 - present Instructure, Inc.
- --
- -- Licensed under the Apache License, Version 2.0 (the "License");
- -- you may not use this file except in compliance with the License.
- -- You may obtain a copy of the License at
- --
- -- http://www.apache.org/licenses/LICENSE-2.0
- --
- -- Unless required by applicable law or agreed to in writing, software
- -- distributed under the License is distributed on an "AS IS" BASIS,
- -- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- -- See the License for the specific language governing permissions and
- -- limitations under the License.
- --
-
-import com.instructure.canvasapi2.models.CanvasContext;
-import com.instructure.student.db.sqlColAdapters.ErrorColAdapter;
-import com.instructure.canvasapi2.models.postmodels.FileSubmitObject;
-
-CREATE TABLE submissionCommentFile (
- id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
- pendingCommentId INTEGER NOT NULL,
- attachmentId INTEGER, -- Will be null if file has not been successfully uploaded
- name TEXT NOT NULL,
- size INTEGER NOT NULL,
- contentType TEXT NOT NULL,
- fullPath TEXT NOT NULL,
- FOREIGN KEY (pendingCommentId) REFERENCES pendingSubmissionComment(id) ON DELETE CASCADE
-);
-
-CREATE INDEX submissionCommentFile_pendingCommentId ON submissionCommentFile(pendingCommentId);
-
---
-insertFile:
-INSERT INTO submissionCommentFile (pendingCommentId, name, size, contentType, fullPath)
-VALUES (?, ?, ?, ?, ?);
---
-
-getAllFiles:
-SELECT *
-FROM submissionCommentFile;
-
-getFileById:
-SELECT *
-FROM submissionCommentFile
-WHERE id = ?;
-
-getFilesForPendingComment:
-SELECT *
-FROM submissionCommentFile
-WHERE pendingCommentId = ?;
-
-getFilesWithoutAttachmentsForSubmissionId:
-SELECT *
-FROM submissionCommentFile
-WHERE pendingCommentId = ? AND attachmentId IS NULL;
-
-deleteFileById:
-DELETE
-FROM submissionCommentFile
-WHERE id = ?;
-
-deleteFilesForCommentId:
-DELETE
-FROM submissionCommentFile
-WHERE pendingCommentId = ?;
-
-setFileAttachmentId:
-UPDATE submissionCommentFile
-SET attachmentId = ?
-WHERE id = ?;
-
-getLastInsertId:
-SELECT last_insert_rowid();
diff --git a/apps/student/src/main/db/schemas/1.db b/apps/student/src/main/db/schemas/1.db
deleted file mode 100644
index f241f8d4de..0000000000
Binary files a/apps/student/src/main/db/schemas/1.db and /dev/null differ
diff --git a/apps/student/src/main/java/com/instructure/student/activity/CallbackActivity.kt b/apps/student/src/main/java/com/instructure/student/activity/CallbackActivity.kt
index 4eb72c7801..156405a11e 100644
--- a/apps/student/src/main/java/com/instructure/student/activity/CallbackActivity.kt
+++ b/apps/student/src/main/java/com/instructure/student/activity/CallbackActivity.kt
@@ -18,13 +18,30 @@
package com.instructure.student.activity
import android.os.Bundle
-import androidx.lifecycle.lifecycleScope
import com.google.firebase.crashlytics.FirebaseCrashlytics
import com.heapanalytics.android.Heap
import com.instructure.canvasapi2.StatusCallback
-import com.instructure.canvasapi2.managers.*
-import com.instructure.canvasapi2.models.*
-import com.instructure.canvasapi2.utils.*
+import com.instructure.canvasapi2.managers.FeaturesManager
+import com.instructure.canvasapi2.managers.LaunchDefinitionsManager
+import com.instructure.canvasapi2.managers.ThemeManager
+import com.instructure.canvasapi2.managers.UnreadCountManager
+import com.instructure.canvasapi2.managers.UserManager
+import com.instructure.canvasapi2.models.Account
+import com.instructure.canvasapi2.models.BecomeUserPermission
+import com.instructure.canvasapi2.models.CanvasColor
+import com.instructure.canvasapi2.models.CanvasTheme
+import com.instructure.canvasapi2.models.LaunchDefinition
+import com.instructure.canvasapi2.models.SelfRegistration
+import com.instructure.canvasapi2.models.TermsOfService
+import com.instructure.canvasapi2.models.UnreadConversationCount
+import com.instructure.canvasapi2.models.UnreadNotificationCount
+import com.instructure.canvasapi2.models.User
+import com.instructure.canvasapi2.utils.APIHelper
+import com.instructure.canvasapi2.utils.ApiPrefs
+import com.instructure.canvasapi2.utils.ApiType
+import com.instructure.canvasapi2.utils.LinkHeaders
+import com.instructure.canvasapi2.utils.LocaleUtils
+import com.instructure.canvasapi2.utils.Logger
import com.instructure.canvasapi2.utils.pageview.PandataInfo
import com.instructure.canvasapi2.utils.pageview.PandataManager
import com.instructure.canvasapi2.utils.weave.StatusCallbackError
@@ -33,16 +50,19 @@ import com.instructure.canvasapi2.utils.weave.catch
import com.instructure.canvasapi2.utils.weave.tryWeave
import com.instructure.pandautils.dialogs.RatingDialog
import com.instructure.pandautils.features.inbox.list.OnUnreadCountInvalidated
-import com.instructure.pandautils.utils.*
+import com.instructure.pandautils.utils.AppType
+import com.instructure.pandautils.utils.ColorKeeper
+import com.instructure.pandautils.utils.FeatureFlagProvider
+import com.instructure.pandautils.utils.ThemePrefs
+import com.instructure.pandautils.utils.orDefault
+import com.instructure.pandautils.utils.toast
import com.instructure.student.BuildConfig
import com.instructure.student.R
-import com.instructure.student.flutterChannels.FlutterComm
import com.instructure.student.fragment.NotificationListFragment
import com.instructure.student.service.StudentPageViewService
import com.instructure.student.util.StudentPrefs
import dagger.hilt.android.AndroidEntryPoint
import kotlinx.coroutines.Job
-import kotlinx.coroutines.launch
import retrofit2.Call
import retrofit2.Response
import javax.inject.Inject
@@ -129,7 +149,7 @@ abstract class CallbackActivity : ParentActivity(), OnUnreadCountInvalidated, No
if (!ApiPrefs.isMasquerading) {
// We don't know how the crashlytics stores the userId so we just set it to empty to make sure we don't log it.
- val crashlytics = FirebaseCrashlytics.getInstance();
+ val crashlytics = FirebaseCrashlytics.getInstance()
crashlytics.setUserId("")
}
@@ -172,9 +192,6 @@ abstract class CallbackActivity : ParentActivity(), OnUnreadCountInvalidated, No
override fun onResponse(response: Response, linkHeaders: LinkHeaders, type: ApiType) {
//store the theme
response.body()?.let { ThemePrefs.applyCanvasTheme(it, this@CallbackActivity) }
-
- // Update Flutter with the theme
- FlutterComm.sendUpdatedTheme()
}
}
@@ -193,7 +210,7 @@ abstract class CallbackActivity : ParentActivity(), OnUnreadCountInvalidated, No
val shouldRestartForLocaleChange = setupUser(user, type)
if (shouldRestartForLocaleChange) {
if (BuildConfig.DEBUG) toast(R.string.localeRestartMessage)
- LocaleUtils.restartApp(this@CallbackActivity, LoginActivity::class.java)
+ LocaleUtils.restartApp(this@CallbackActivity)
} else {
loadInitialData()
}
diff --git a/apps/student/src/main/java/com/instructure/student/activity/NavigationActivity.kt b/apps/student/src/main/java/com/instructure/student/activity/NavigationActivity.kt
index 59da6b00bd..bc8c995538 100644
--- a/apps/student/src/main/java/com/instructure/student/activity/NavigationActivity.kt
+++ b/apps/student/src/main/java/com/instructure/student/activity/NavigationActivity.kt
@@ -23,7 +23,6 @@ import android.content.Context
import android.content.Intent
import android.content.pm.PackageManager
import android.content.res.Configuration
-import android.graphics.Color
import android.os.Bundle
import android.os.Handler
import android.view.MenuItem
@@ -75,10 +74,11 @@ import com.instructure.interactions.Navigation
import com.instructure.interactions.router.Route
import com.instructure.interactions.router.RouteContext
import com.instructure.interactions.router.RouterParams
-import com.instructure.loginapi.login.dialog.ErrorReportDialog
import com.instructure.loginapi.login.dialog.MasqueradingDialog
import com.instructure.loginapi.login.tasks.LogoutTask
import com.instructure.pandautils.binding.viewBinding
+import com.instructure.pandautils.features.calendar.CalendarFragment
+import com.instructure.pandautils.features.calendarevent.details.EventFragment
import com.instructure.pandautils.features.help.HelpDialogFragment
import com.instructure.pandautils.features.inbox.list.InboxFragment
import com.instructure.pandautils.features.notification.preferences.PushNotificationPreferencesFragment
@@ -122,16 +122,12 @@ import com.instructure.student.events.CoreDataFinishedLoading
import com.instructure.student.events.CourseColorOverlayToggledEvent
import com.instructure.student.events.ShowConfettiEvent
import com.instructure.student.events.ShowGradesToggledEvent
-import com.instructure.student.events.StatusBarColorChangeEvent
import com.instructure.student.events.UserUpdatedEvent
import com.instructure.student.features.assignments.reminder.AlarmScheduler
import com.instructure.student.features.files.list.FileListFragment
import com.instructure.student.features.modules.progression.CourseModuleProgressionFragment
import com.instructure.student.features.navigation.NavigationRepository
-import com.instructure.student.flutterChannels.FlutterComm
import com.instructure.student.fragment.BookmarksFragment
-import com.instructure.student.fragment.CalendarEventFragment
-import com.instructure.student.fragment.CalendarFragment
import com.instructure.student.fragment.DashboardFragment
import com.instructure.student.fragment.InboxComposeMessageFragment
import com.instructure.student.fragment.InboxConversationFragment
@@ -170,8 +166,7 @@ private const val BOTTOM_SCREENS_BUNDLE_KEY = "bottomScreens"
@AndroidEntryPoint
@Suppress("DELEGATED_MEMBER_HIDES_SUPERTYPE_OVERRIDE")
class NavigationActivity : BaseRouterActivity(), Navigation, MasqueradingDialog.OnMasqueradingSet,
- FullScreenInteractions, ActivityCompat.OnRequestPermissionsResultCallback by PermissionReceiver(),
- ErrorReportDialog.ErrorReportDialogResultListener {
+ FullScreenInteractions, ActivityCompat.OnRequestPermissionsResultCallback by PermissionReceiver() {
private val binding by viewBinding(ActivityNavigationBinding::inflate)
private lateinit var navigationDrawerBinding: NavigationDrawerBinding
@@ -343,8 +338,6 @@ class NavigationActivity : BaseRouterActivity(), Navigation, MasqueradingDialog.
finish()
}
- FlutterComm.updateDarkMode(this)
-
binding.bottomBar.inflateMenu(navigationBehavior.bottomBarMenu)
supportFragmentManager.addOnBackStackChangedListener(onBackStackChangedListener)
@@ -439,10 +432,6 @@ class NavigationActivity : BaseRouterActivity(), Navigation, MasqueradingDialog.
}
override fun initialCoreDataLoadingComplete() {
- // Send updated info to Flutter
- FlutterComm.sendUpdatedLogin()
- FlutterComm.sendUpdatedTheme()
-
// We are ready to load our UI
if (currentFragment == null) {
loadLandingPage(true)
@@ -510,7 +499,8 @@ class NavigationActivity : BaseRouterActivity(), Navigation, MasqueradingDialog.
val route = BookmarksFragment.makeRoute(ApiPrefs.user)
addFragment(BookmarksFragment.newInstance(route) { RouteMatcher.routeUrl(this, it.url!!) }, route)
}
- AppShortcutManager.APP_SHORTCUT_CALENDAR -> selectBottomNavFragment(CalendarFragment::class.java)
+ AppShortcutManager.APP_SHORTCUT_CALENDAR -> selectBottomNavFragment(
+ CalendarFragment::class.java)
AppShortcutManager.APP_SHORTCUT_TODO -> selectBottomNavFragment(ToDoListFragment::class.java)
AppShortcutManager.APP_SHORTCUT_NOTIFICATIONS -> selectBottomNavFragment(NotificationListFragment::class.java)
AppShortcutManager.APP_SHORTCUT_INBOX -> {
@@ -760,7 +750,8 @@ class NavigationActivity : BaseRouterActivity(), Navigation, MasqueradingDialog.
val currentFragmentClass = it::class.java
when (item.itemId) {
R.id.bottomNavigationHome -> abortReselect = currentFragmentClass.isAssignableFrom(navigationBehavior.homeFragmentClass)
- R.id.bottomNavigationCalendar -> abortReselect = currentFragmentClass.isAssignableFrom(CalendarFragment::class.java)
+ R.id.bottomNavigationCalendar -> abortReselect = currentFragmentClass.isAssignableFrom(
+ CalendarFragment::class.java)
R.id.bottomNavigationToDo -> abortReselect = currentFragmentClass.isAssignableFrom(ToDoListFragment::class.java)
R.id.bottomNavigationNotifications -> abortReselect = currentFragmentClass.isAssignableFrom(NotificationListFragment::class.java)
R.id.bottomNavigationInbox -> abortReselect = currentFragmentClass.isAssignableFrom(InboxFragment::class.java)
@@ -821,7 +812,7 @@ class NavigationActivity : BaseRouterActivity(), Navigation, MasqueradingDialog.
when(fragment) {
//Calendar
is CalendarFragment -> setBottomBarItemSelected(R.id.bottomNavigationCalendar)
- is CalendarEventFragment -> setBottomBarItemSelected(R.id.bottomNavigationCalendar)
+ is EventFragment -> setBottomBarItemSelected(R.id.bottomNavigationCalendar)
//To-do
is ToDoListFragment -> setBottomBarItemSelected(R.id.bottomNavigationToDo)
//Notifications
@@ -1002,6 +993,10 @@ class NavigationActivity : BaseRouterActivity(), Navigation, MasqueradingDialog.
}
ft.show(fragment)
ft.commitAllowingStateLoss()
+
+ if (fragment is CalendarFragment) {
+ fragment.calendarTabSelected()
+ }
}
private fun getBottomBarFragments(selectedFragmentName: String): List {
@@ -1216,18 +1211,6 @@ class NavigationActivity : BaseRouterActivity(), Navigation, MasqueradingDialog.
}
}
- /** Handles status bar color change events posted by FlutterComm */
- @Subscribe
- fun updateStatusBarColor(event: StatusBarColorChangeEvent) {
- event.get { color ->
- if (color == Color.WHITE) {
- ViewStyler.setStatusBarLight(this)
- } else {
- ViewStyler.setStatusBarDark(this, color)
- }
- }
- }
-
/** Handles showing confetti on a successful assignment submission */
@Subscribe
fun showConfetti(event: ShowConfettiEvent) {
@@ -1245,15 +1228,6 @@ class NavigationActivity : BaseRouterActivity(), Navigation, MasqueradingDialog.
}
}
- override fun onTicketPost() {
- // The message is a little longer than normal, so show it for LENGTH_LONG instead of LENGTH_SHORT
- Toast.makeText(this, R.string.errorReportThankyou, Toast.LENGTH_LONG).show()
- }
-
- override fun onTicketError() {
- toast(R.string.errorOccurred)
- }
-
private fun createBottomNavFragment(name: String?): Fragment? {
return when (name) {
navigationBehavior.homeFragmentClass.name -> {
diff --git a/apps/student/src/main/java/com/instructure/student/activity/VideoViewActivity.kt b/apps/student/src/main/java/com/instructure/student/activity/VideoViewActivity.kt
index ec2c09f226..ccf3a18574 100644
--- a/apps/student/src/main/java/com/instructure/student/activity/VideoViewActivity.kt
+++ b/apps/student/src/main/java/com/instructure/student/activity/VideoViewActivity.kt
@@ -21,35 +21,37 @@ import android.content.Intent
import android.net.Uri
import android.os.Bundle
import android.os.Handler
+import androidx.annotation.OptIn
import androidx.appcompat.app.AppCompatActivity
-import com.google.android.exoplayer2.C
-import com.google.android.exoplayer2.DefaultLoadControl
-import com.google.android.exoplayer2.ExoPlayer
-import com.google.android.exoplayer2.MediaItem
-import com.google.android.exoplayer2.extractor.DefaultExtractorsFactory
-import com.google.android.exoplayer2.source.MediaSource
-import com.google.android.exoplayer2.source.ProgressiveMediaSource
-import com.google.android.exoplayer2.source.dash.DashMediaSource
-import com.google.android.exoplayer2.source.dash.DefaultDashChunkSource
-import com.google.android.exoplayer2.source.hls.DefaultHlsDataSourceFactory
-import com.google.android.exoplayer2.source.hls.HlsMediaSource
-import com.google.android.exoplayer2.source.smoothstreaming.DefaultSsChunkSource
-import com.google.android.exoplayer2.source.smoothstreaming.SsMediaSource
-import com.google.android.exoplayer2.trackselection.AdaptiveTrackSelection
-import com.google.android.exoplayer2.trackselection.DefaultTrackSelector
-import com.google.android.exoplayer2.trackselection.ExoTrackSelection
-import com.google.android.exoplayer2.upstream.DataSource
-import com.google.android.exoplayer2.upstream.DefaultBandwidthMeter
-import com.google.android.exoplayer2.upstream.DefaultDataSource
-import com.google.android.exoplayer2.upstream.DefaultHttpDataSource
-import com.google.android.exoplayer2.util.Util
+import androidx.media3.common.C
+import androidx.media3.common.MediaItem
+import androidx.media3.common.util.UnstableApi
+import androidx.media3.common.util.Util
+import androidx.media3.datasource.DataSource
+import androidx.media3.datasource.DefaultDataSource
+import androidx.media3.datasource.DefaultHttpDataSource
+import androidx.media3.exoplayer.DefaultLoadControl
+import androidx.media3.exoplayer.ExoPlayer
+import androidx.media3.exoplayer.dash.DashMediaSource
+import androidx.media3.exoplayer.dash.DefaultDashChunkSource
+import androidx.media3.exoplayer.hls.DefaultHlsDataSourceFactory
+import androidx.media3.exoplayer.hls.HlsMediaSource
+import androidx.media3.exoplayer.smoothstreaming.DefaultSsChunkSource
+import androidx.media3.exoplayer.smoothstreaming.SsMediaSource
+import androidx.media3.exoplayer.source.MediaSource
+import androidx.media3.exoplayer.source.ProgressiveMediaSource
+import androidx.media3.exoplayer.trackselection.AdaptiveTrackSelection
+import androidx.media3.exoplayer.trackselection.DefaultTrackSelector
+import androidx.media3.exoplayer.trackselection.ExoTrackSelection
+import androidx.media3.exoplayer.upstream.DefaultBandwidthMeter
+import androidx.media3.extractor.DefaultExtractorsFactory
import com.instructure.pandautils.analytics.SCREEN_VIEW_VIDEO_VIEW
import com.instructure.pandautils.analytics.ScreenView
import com.instructure.pandautils.binding.viewBinding
-import com.instructure.student.R
import com.instructure.student.databinding.ActivityVideoViewBinding
import com.instructure.student.util.Const
+@OptIn(UnstableApi::class)
@ScreenView(SCREEN_VIEW_VIDEO_VIEW)
class VideoViewActivity : AppCompatActivity() {
@@ -86,10 +88,10 @@ class VideoViewActivity : AppCompatActivity() {
private fun buildMediaSource(uri: Uri): MediaSource {
val mediaItem = MediaItem.fromUri(uri)
return when (val type = Util.inferContentType(uri.lastPathSegment ?: "")) {
- C.TYPE_SS -> SsMediaSource.Factory(DefaultSsChunkSource.Factory(mediaDataSourceFactory), buildDataSourceFactory(false)).createMediaSource(mediaItem)
- C.TYPE_DASH -> DashMediaSource.Factory(DefaultDashChunkSource.Factory(mediaDataSourceFactory), buildDataSourceFactory(false)).createMediaSource(mediaItem)
- C.TYPE_HLS -> HlsMediaSource.Factory(DefaultHlsDataSourceFactory(buildDataSourceFactory(false))).createMediaSource(mediaItem)
- C.TYPE_OTHER -> ProgressiveMediaSource.Factory(mediaDataSourceFactory, DefaultExtractorsFactory()).createMediaSource(mediaItem)
+ C.CONTENT_TYPE_SS -> SsMediaSource.Factory(DefaultSsChunkSource.Factory(mediaDataSourceFactory), buildDataSourceFactory(false)).createMediaSource(mediaItem)
+ C.CONTENT_TYPE_DASH -> DashMediaSource.Factory(DefaultDashChunkSource.Factory(mediaDataSourceFactory), buildDataSourceFactory(false)).createMediaSource(mediaItem)
+ C.CONTENT_TYPE_HLS -> HlsMediaSource.Factory(DefaultHlsDataSourceFactory(buildDataSourceFactory(false))).createMediaSource(mediaItem)
+ C.CONTENT_TYPE_OTHER -> ProgressiveMediaSource.Factory(mediaDataSourceFactory, DefaultExtractorsFactory()).createMediaSource(mediaItem)
else -> throw IllegalStateException("Unsupported type: $type")
}
}
diff --git a/apps/student/src/main/java/com/instructure/student/adapter/DashboardRecyclerAdapter.kt b/apps/student/src/main/java/com/instructure/student/adapter/DashboardRecyclerAdapter.kt
index 66b1837c5f..3c21acc52c 100644
--- a/apps/student/src/main/java/com/instructure/student/adapter/DashboardRecyclerAdapter.kt
+++ b/apps/student/src/main/java/com/instructure/student/adapter/DashboardRecyclerAdapter.kt
@@ -28,7 +28,6 @@ import com.instructure.pandarecycler.util.GroupSortedList
import com.instructure.pandautils.features.dashboard.DashboardCourseItem
import com.instructure.pandautils.utils.ColorApiHelper
import com.instructure.student.features.dashboard.DashboardRepository
-import com.instructure.student.flutterChannels.FlutterComm
import com.instructure.student.holders.*
import com.instructure.student.interfaces.CourseAdapterToFragmentCallback
import org.threeten.bp.OffsetDateTime
@@ -125,7 +124,6 @@ class DashboardRecyclerAdapter(
mApiCalls = tryWeave {
if (isRefresh && repository.isOnline()) {
ColorApiHelper.awaitSync()
- FlutterComm.sendUpdatedTheme()
}
isOfflineEnabled = repository.isOfflineEnabled()
diff --git a/apps/student/src/main/java/com/instructure/student/db/Extensions.kt b/apps/student/src/main/java/com/instructure/student/db/Extensions.kt
deleted file mode 100644
index a1bab2a4bb..0000000000
--- a/apps/student/src/main/java/com/instructure/student/db/Extensions.kt
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2019 - present Instructure, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package com.instructure.student.db
-
-import android.content.Context
-import androidx.sqlite.db.SupportSQLiteDatabase
-import com.squareup.sqldelight.android.AndroidSqliteDriver
-
-const val DB_NAME = "student.db"
-
-fun Db.getInstance(context: Context): StudentDb {
- if (!ready)
- // Note: To use an in-memory database (for testing purposes), pass in 'null' for the name argument or don't pass anything at all (null by default)
- dbSetup(AndroidSqliteDriver(Schema, context, DB_NAME, callback = object : AndroidSqliteDriver.Callback(Schema) {
- override fun onOpen(db: SupportSQLiteDatabase) {
- super.onOpen(db)
- db.execSQL("PRAGMA foreign_keys=ON;")
- }
- }))
-
- return instance
-}
diff --git a/apps/student/src/main/java/com/instructure/student/db/Schema.kt b/apps/student/src/main/java/com/instructure/student/db/Schema.kt
deleted file mode 100644
index 25c8fb41bf..0000000000
--- a/apps/student/src/main/java/com/instructure/student/db/Schema.kt
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2019 - present Instructure, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package com.instructure.student.db
-
-import com.instructure.student.PendingSubmissionComment
-import com.instructure.student.Submission
-import com.instructure.student.db.sqlColAdapters.CanvasContextColAdapter
-import com.instructure.student.db.sqlColAdapters.DateAdapter
-import com.squareup.sqldelight.db.SqlDriver
-
-fun createQueryWrapper(driver: SqlDriver): StudentDb {
- return StudentDb(
- driver = driver,
- submissionAdapter = Submission.Adapter(
- lastActivityDateAdapter = DateAdapter(),
- canvasContextAdapter = CanvasContextColAdapter()
- ),
- pendingSubmissionCommentAdapter = PendingSubmissionComment.Adapter(
- canvasContextAdapter = CanvasContextColAdapter(),
- lastActivityDateAdapter = DateAdapter()
- )
- )
-}
-
-object Schema : SqlDriver.Schema by StudentDb.Schema {
- override fun create(driver: SqlDriver) {
- StudentDb.Schema.create(driver)
- }
-}
diff --git a/apps/student/src/main/java/com/instructure/student/db/sqlColAdapters/DateColAdapter.kt b/apps/student/src/main/java/com/instructure/student/db/sqlColAdapters/DateColAdapter.kt
deleted file mode 100644
index f295a102c1..0000000000
--- a/apps/student/src/main/java/com/instructure/student/db/sqlColAdapters/DateColAdapter.kt
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (C) 2019 - present Instructure, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package com.instructure.student.db.sqlColAdapters
-
-import com.squareup.sqldelight.ColumnAdapter
-import org.threeten.bp.OffsetDateTime
-import org.threeten.bp.ZoneOffset
-import org.threeten.bp.format.DateTimeFormatter
-import java.text.SimpleDateFormat
-import java.util.*
-
-
-typealias Date = OffsetDateTime
-
-/**
- * Expectation is that the database will hold whatever datetime the server gives back to us.
- * When we pull it out, it will be converted to a local [OffsetDateTime].
- * When we put something in, it will be converted to a UTC-based ISO-8601 datetime (what the server currently uses).
- */
-class DateAdapter : ColumnAdapter {
- override fun decode(databaseValue: String) = Date.parse(databaseValue).withOffsetSameInstant(OffsetDateTime.now().offset) as Date
- override fun encode(value: Date): String = value.toApiString()
-}
-
-/**
- * Turns a local OffsetDateTime to a UTC-based ISO-8601 Datetime with timezone string
- */
-fun OffsetDateTime?.toApiString(): String {
- this ?: return ""
- val utcTime = this.withOffsetSameInstant(ZoneOffset.UTC)
- return utcTime.format(DateTimeFormatter.ISO_OFFSET_DATE_TIME)
-}
\ No newline at end of file
diff --git a/apps/student/src/main/java/com/instructure/student/di/CreateSubmissionModule.kt b/apps/student/src/main/java/com/instructure/student/di/CreateSubmissionModule.kt
new file mode 100644
index 0000000000..502964ecba
--- /dev/null
+++ b/apps/student/src/main/java/com/instructure/student/di/CreateSubmissionModule.kt
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2024 - present Instructure, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */package com.instructure.student.di
+
+import android.content.Context
+import com.instructure.canvasapi2.utils.ApiPrefs
+import com.instructure.student.mobius.common.ui.SubmissionHelper
+import com.instructure.student.room.StudentDb
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.android.qualifiers.ApplicationContext
+import dagger.hilt.components.SingletonComponent
+
+@Module
+@InstallIn(SingletonComponent::class)
+class CreateSubmissionModule {
+
+ @Provides
+ fun provideSubmissionHelper(
+ @ApplicationContext context: Context,
+ studentDb: StudentDb,
+ apiPrefs: ApiPrefs
+ ): SubmissionHelper {
+ return SubmissionHelper(context, studentDb, apiPrefs)
+ }
+}
\ No newline at end of file
diff --git a/apps/student/src/main/java/com/instructure/student/di/DatabaseModule.kt b/apps/student/src/main/java/com/instructure/student/di/DatabaseModule.kt
index 2d08671dfb..500a3a4127 100644
--- a/apps/student/src/main/java/com/instructure/student/di/DatabaseModule.kt
+++ b/apps/student/src/main/java/com/instructure/student/di/DatabaseModule.kt
@@ -4,9 +4,10 @@ import android.content.Context
import androidx.room.Room
import com.instructure.pandautils.room.appdatabase.AppDatabase
import com.instructure.pandautils.room.appdatabase.appDatabaseMigrations
-import com.instructure.student.db.Db
-import com.instructure.student.db.StudentDb
-import com.instructure.student.db.getInstance
+import com.instructure.pandautils.room.calendar.CalendarFilterDatabase
+import com.instructure.pandautils.room.calendar.calendarDatabaseMigrations
+import com.instructure.student.room.StudentDb
+import com.instructure.student.room.studentDbMigrations
import dagger.Module
import dagger.Provides
import dagger.hilt.InstallIn
@@ -28,7 +29,22 @@ class DatabaseModule {
@Provides
@Singleton
- fun provideSqlDelightDatabase(@ApplicationContext context: Context): StudentDb {
- return Db.getInstance(context)
+ fun provideCalendarDatabase(@ApplicationContext context: Context): CalendarFilterDatabase {
+ return Room.databaseBuilder(
+ context,
+ CalendarFilterDatabase::class.java,
+ "canvas_student_flutter.db"
+ ) // We need to have the same db name as in the Flutter calendar
+ .addMigrations(*calendarDatabaseMigrations)
+ .build()
+ }
+
+ @Provides
+ @Singleton
+ fun provideStudentDb(@ApplicationContext context: Context): StudentDb {
+ return Room.databaseBuilder(context, StudentDb::class.java, "student.db")
+ .addMigrations(*studentDbMigrations)
+ .fallbackToDestructiveMigration()
+ .build()
}
}
\ No newline at end of file
diff --git a/apps/student/src/main/java/com/instructure/student/di/feature/CalendarModule.kt b/apps/student/src/main/java/com/instructure/student/di/feature/CalendarModule.kt
new file mode 100644
index 0000000000..97bf951ec2
--- /dev/null
+++ b/apps/student/src/main/java/com/instructure/student/di/feature/CalendarModule.kt
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2024 - 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 .
+ *
+ */
+package com.instructure.student.di.feature
+
+import androidx.fragment.app.FragmentActivity
+import com.instructure.canvasapi2.apis.CourseAPI
+import com.instructure.canvasapi2.apis.GroupAPI
+import com.instructure.canvasapi2.apis.PlannerAPI
+import com.instructure.canvasapi2.utils.ApiPrefs
+import com.instructure.pandautils.features.calendar.CalendarRepository
+import com.instructure.pandautils.features.calendar.CalendarRouter
+import com.instructure.pandautils.room.calendar.daos.CalendarFilterDao
+import com.instructure.student.features.calendar.StudentCalendarRepository
+import com.instructure.student.features.calendar.StudentCalendarRouter
+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 CalendarModule {
+
+ @Provides
+ fun provideCalendarRouter(activity: FragmentActivity): CalendarRouter {
+ return StudentCalendarRouter(activity)
+ }
+}
+
+@Module
+@InstallIn(ViewModelComponent::class)
+class CalendarViewModelModule {
+
+ @Provides
+ fun provideCalendarRepository(
+ plannerApi: PlannerAPI.PlannerInterface,
+ coursesApi: CourseAPI.CoursesInterface,
+ groupsApi: GroupAPI.GroupInterface,
+ apiPrefs: ApiPrefs,
+ calendarFilterDao: CalendarFilterDao
+ ): CalendarRepository {
+ return StudentCalendarRepository(plannerApi, coursesApi, groupsApi, apiPrefs, calendarFilterDao)
+ }
+}
\ No newline at end of file
diff --git a/apps/student/src/main/java/com/instructure/student/di/feature/CreateUpdateEventModule.kt b/apps/student/src/main/java/com/instructure/student/di/feature/CreateUpdateEventModule.kt
new file mode 100644
index 0000000000..01a137dea9
--- /dev/null
+++ b/apps/student/src/main/java/com/instructure/student/di/feature/CreateUpdateEventModule.kt
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2024 - 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 .
+ *
+ */
+
+package com.instructure.student.di.feature
+
+import com.instructure.canvasapi2.apis.CalendarEventAPI
+import com.instructure.canvasapi2.apis.CourseAPI
+import com.instructure.canvasapi2.apis.GroupAPI
+import com.instructure.canvasapi2.utils.ApiPrefs
+import com.instructure.pandautils.features.calendarevent.createupdate.CreateUpdateEventRepository
+import com.instructure.student.features.calendarevent.StudentCreateUpdateEventRepository
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.android.components.ViewModelComponent
+
+
+@Module
+@InstallIn(ViewModelComponent::class)
+class CreateUpdateEventModule {
+
+ @Provides
+ fun provideCreateUpdateEventRepository(
+ calendarEventApi: CalendarEventAPI.CalendarEventInterface,
+ coursesApi: CourseAPI.CoursesInterface,
+ groupsApi: GroupAPI.GroupInterface,
+ apiPrefs: ApiPrefs
+ ): CreateUpdateEventRepository {
+ return StudentCreateUpdateEventRepository(calendarEventApi, coursesApi, groupsApi, apiPrefs)
+ }
+}
diff --git a/apps/student/src/main/java/com/instructure/student/di/feature/CreateUpdateToDoModule.kt b/apps/student/src/main/java/com/instructure/student/di/feature/CreateUpdateToDoModule.kt
new file mode 100644
index 0000000000..1d79658935
--- /dev/null
+++ b/apps/student/src/main/java/com/instructure/student/di/feature/CreateUpdateToDoModule.kt
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2024 - present Instructure, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.instructure.student.di.feature
+
+import com.instructure.canvasapi2.apis.CourseAPI
+import com.instructure.canvasapi2.apis.PlannerAPI
+import com.instructure.canvasapi2.di.PLANNER_API_SERIALIZE_NULLS
+import com.instructure.pandautils.features.calendartodo.createupdate.CreateUpdateToDoRepository
+import com.instructure.student.features.calendartodo.StudentCreateUpdateToDoRepository
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.android.components.ViewModelComponent
+import javax.inject.Named
+
+@Module
+@InstallIn(ViewModelComponent::class)
+class CreateUpdateToDoModule {
+
+ @Provides
+ fun provideCreateUpdateToDoRepository(
+ coursesApi: CourseAPI.CoursesInterface,
+ @Named(PLANNER_API_SERIALIZE_NULLS) plannerApi: PlannerAPI.PlannerInterface
+ ): CreateUpdateToDoRepository {
+ return StudentCreateUpdateToDoRepository(coursesApi, plannerApi)
+ }
+}
\ No newline at end of file
diff --git a/apps/student/src/main/java/com/instructure/student/di/feature/EventModule.kt b/apps/student/src/main/java/com/instructure/student/di/feature/EventModule.kt
new file mode 100644
index 0000000000..2f80d24e80
--- /dev/null
+++ b/apps/student/src/main/java/com/instructure/student/di/feature/EventModule.kt
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2024 - 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 .
+ *
+ */
+
+package com.instructure.student.di.feature
+
+import androidx.fragment.app.FragmentActivity
+import com.instructure.pandautils.features.calendarevent.details.EventRouter
+import com.instructure.student.features.calendarevent.StudentEventRouter
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.android.components.FragmentComponent
+
+@Module
+@InstallIn(FragmentComponent::class)
+class EventModule {
+
+ @Provides
+ fun provideEventRouter(activity: FragmentActivity): EventRouter {
+ return StudentEventRouter(activity)
+ }
+}
diff --git a/apps/student/src/main/java/com/instructure/student/di/feature/LegalModule.kt b/apps/student/src/main/java/com/instructure/student/di/feature/LegalModule.kt
new file mode 100644
index 0000000000..3d80fc4f8d
--- /dev/null
+++ b/apps/student/src/main/java/com/instructure/student/di/feature/LegalModule.kt
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2024 - present Instructure, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.instructure.student.di.feature
+
+import android.app.Activity
+import com.instructure.pandautils.features.legal.LegalRouter
+import com.instructure.student.features.legal.StudentLegalRouter
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.android.components.ActivityComponent
+
+@Module
+@InstallIn(ActivityComponent::class)
+class LegalModule {
+
+ @Provides
+ fun provideLegalRouter(activity: Activity): LegalRouter {
+ return StudentLegalRouter(activity)
+ }
+}
\ No newline at end of file
diff --git a/apps/student/src/main/java/com/instructure/student/di/feature/SettingsModule.kt b/apps/student/src/main/java/com/instructure/student/di/feature/SettingsModule.kt
new file mode 100644
index 0000000000..ec2906477d
--- /dev/null
+++ b/apps/student/src/main/java/com/instructure/student/di/feature/SettingsModule.kt
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2024 - present Instructure, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.instructure.student.di.feature
+
+import com.instructure.pandautils.features.settings.SettingsBehaviour
+import com.instructure.pandautils.features.settings.SettingsRouter
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+
+@Module
+@InstallIn(SingletonComponent::class)
+class SettingsModule {
+
+ @Provides
+ fun provideSettingsRouter(): SettingsRouter {
+ throw NotImplementedError("Not implemented")
+ }
+
+ @Provides
+ fun provideSettingsBehavior(): SettingsBehaviour {
+ throw NotImplementedError("Not implemented")
+ }
+}
\ No newline at end of file
diff --git a/apps/student/src/main/java/com/instructure/student/di/feature/ToDoModule.kt b/apps/student/src/main/java/com/instructure/student/di/feature/ToDoModule.kt
new file mode 100644
index 0000000000..bf1d495800
--- /dev/null
+++ b/apps/student/src/main/java/com/instructure/student/di/feature/ToDoModule.kt
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2024 - 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 .
+ *
+ */
+
+package com.instructure.student.di.feature
+
+import androidx.fragment.app.FragmentActivity
+import com.instructure.pandautils.features.calendartodo.details.ToDoRouter
+import com.instructure.student.features.calendartodo.StudentToDoRouter
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.android.components.FragmentComponent
+
+@Module
+@InstallIn(FragmentComponent::class)
+class ToDoModule {
+
+ @Provides
+ fun provideToDoRouter(activity: FragmentActivity): ToDoRouter {
+ return StudentToDoRouter(activity)
+ }
+}
\ No newline at end of file
diff --git a/apps/student/src/main/java/com/instructure/student/dialog/LegalDialogStyled.kt b/apps/student/src/main/java/com/instructure/student/dialog/LegalDialogStyled.kt
deleted file mode 100644
index d0e1a5018c..0000000000
--- a/apps/student/src/main/java/com/instructure/student/dialog/LegalDialogStyled.kt
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Copyright (C) 2016 - 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 .
- *
- */
-
-package com.instructure.student.dialog
-
-import android.annotation.SuppressLint
-import android.app.Dialog
-import android.content.Intent
-import android.net.Uri
-import android.os.Bundle
-import android.widget.ImageView
-import androidx.appcompat.app.AlertDialog
-import androidx.appcompat.app.AppCompatDialogFragment
-import com.instructure.canvasapi2.managers.UserManager
-import com.instructure.canvasapi2.models.TermsOfService
-import com.instructure.canvasapi2.utils.weave.awaitApi
-import com.instructure.canvasapi2.utils.weave.catch
-import com.instructure.canvasapi2.utils.weave.tryWeave
-import com.instructure.pandautils.analytics.SCREEN_VIEW_LEGAL
-import com.instructure.pandautils.analytics.ScreenView
-import com.instructure.pandautils.binding.viewBinding
-import com.instructure.pandautils.utils.ThemePrefs
-import com.instructure.pandautils.utils.descendants
-import com.instructure.pandautils.utils.onClick
-import com.instructure.pandautils.utils.setVisible
-import com.instructure.student.R
-import com.instructure.student.activity.InternalWebViewActivity
-import com.instructure.student.databinding.LegalBinding
-import kotlinx.coroutines.Job
-
-@ScreenView(SCREEN_VIEW_LEGAL)
-class LegalDialogStyled : AppCompatDialogFragment() {
-
- private val binding by viewBinding(LegalBinding::bind)
-
- private var termsJob: Job? = null
- private var html: String = ""
-
- init {
- retainInstance = true
- }
-
- @SuppressLint("InflateParams")
- override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
- val binding = LegalBinding.inflate(layoutInflater, null, false)
-
- binding.root.descendants().forEach {
- it.setColorFilter(ThemePrefs.brandColor)
- }
-
- // different institutions can have different terms of service, we need to get them from the api
- termsJob = tryWeave {
-
- val terms = awaitApi { UserManager.getTermsOfService(it,true) }
- terms.content?.let { html = it }
-
-
- // if the institution has set terms and conditions to be "no terms", just keep the item gone
- binding.termsOfUse.setVisible(html.isNotBlank())
- // now set the rest of the items visible
- binding.privacyPolicy.setVisible()
- binding.openSource.setVisible()
- } catch {
- // something went wrong, make everything visible
- binding.root.descendants.forEach { it.setVisible()}
- }
-
- binding.termsOfUse.onClick {
-
- val intent = InternalWebViewActivity.createIntent(activity, "http://www.canvaslms.com/policies/terms-of-use", html, getString(R.string.termsOfUse), false)
- requireContext().startActivity(intent)
- dialog?.dismiss()
- }
-
- binding.privacyPolicy.onClick {
- val intent = InternalWebViewActivity.createIntent(activity, "https://www.instructure.com/policies/product-privacy-policy", getString(R.string.privacyPolicy), false)
- requireContext().startActivity(intent)
- dialog?.dismiss()
- }
-
- binding.openSource.onClick {
- val intent = Intent(Intent.ACTION_VIEW, Uri.parse("https://github.com/instructure/canvas-android"))
- requireContext().startActivity(intent)
- dialog?.dismiss()
- }
-
- return AlertDialog.Builder(requireContext())
- .setTitle(R.string.legal)
- .setView(binding.root)
- .create()
- }
-
- override fun onDestroyView() {
- if (retainInstance) dialog?.setDismissMessage(null)
- super.onDestroyView()
- }
-
- override fun onDestroy() {
- super.onDestroy()
- termsJob?.cancel()
- }
-
- companion object {
- val TAG = "legalDialog"
- }
-
-}
diff --git a/apps/student/src/main/java/com/instructure/student/features/assignments/details/AssignmentDetailsFragment.kt b/apps/student/src/main/java/com/instructure/student/features/assignments/details/AssignmentDetailsFragment.kt
index d9cf249358..e87be8aa88 100644
--- a/apps/student/src/main/java/com/instructure/student/features/assignments/details/AssignmentDetailsFragment.kt
+++ b/apps/student/src/main/java/com/instructure/student/features/assignments/details/AssignmentDetailsFragment.kt
@@ -323,7 +323,7 @@ class AssignmentDetailsFragment : ParentFragment(), Bookmarkable {
setupDialogRow(
dialog,
dialogBinding.submissionEntryStudio,
- (submissionTypes.contains(SubmissionType.ONLINE_UPLOAD) && assignment.isStudioEnabled)
+ viewModel.isStudioAccepted()
) {
navigateToStudioScreen(assignment, studioLTITool)
}
@@ -383,6 +383,7 @@ class AssignmentDetailsFragment : ParentFragment(), Bookmarkable {
}
private fun setupDescriptionView() {
+ binding?.descriptionWebViewWrapper?.webView?.addVideoClient(requireActivity())
binding?.descriptionWebViewWrapper?.webView?.canvasWebViewClientCallback = object : CanvasWebView.CanvasWebViewClientCallback {
override fun openMediaFromWebView(mime: String, url: String, filename: String) {
RouteMatcher.openMedia(requireActivity(), url)
@@ -455,6 +456,7 @@ class AssignmentDetailsFragment : ParentFragment(), Bookmarkable {
} else {
Snackbar.make(requireView(), getString(R.string.reminderPermissionNotGrantedError), Snackbar.LENGTH_LONG).show()
}
+ viewModel.checkingReminderPermission = false
}
}
diff --git a/apps/student/src/main/java/com/instructure/student/features/assignments/details/AssignmentDetailsViewModel.kt b/apps/student/src/main/java/com/instructure/student/features/assignments/details/AssignmentDetailsViewModel.kt
index 603dc0c104..7ff7b258c4 100644
--- a/apps/student/src/main/java/com/instructure/student/features/assignments/details/AssignmentDetailsViewModel.kt
+++ b/apps/student/src/main/java/com/instructure/student/features/assignments/details/AssignmentDetailsViewModel.kt
@@ -27,8 +27,14 @@ import androidx.lifecycle.SavedStateHandle
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import com.instructure.canvasapi2.managers.SubmissionManager
-import com.instructure.canvasapi2.models.*
+import com.instructure.canvasapi2.models.Assignment
import com.instructure.canvasapi2.models.Assignment.SubmissionType
+import com.instructure.canvasapi2.models.Course
+import com.instructure.canvasapi2.models.GradingSchemeRow
+import com.instructure.canvasapi2.models.LTITool
+import com.instructure.canvasapi2.models.Quiz
+import com.instructure.canvasapi2.models.Submission
+import com.instructure.canvasapi2.models.isDiscussionAuthorNull
import com.instructure.canvasapi2.utils.Analytics
import com.instructure.canvasapi2.utils.AnalyticsEventConstants
import com.instructure.canvasapi2.utils.ApiPrefs
@@ -50,16 +56,18 @@ import com.instructure.pandautils.utils.AssignmentUtils2
import com.instructure.pandautils.utils.ColorKeeper
import com.instructure.pandautils.utils.Const
import com.instructure.pandautils.utils.HtmlContentFormatter
+import com.instructure.pandautils.utils.isAudioVisualExtension
import com.instructure.pandautils.utils.orDefault
import com.instructure.student.R
-import com.instructure.student.db.StudentDb
import com.instructure.student.features.assignments.details.gradecellview.GradeCellViewData
import com.instructure.student.features.assignments.details.itemviewmodels.ReminderItemViewModel
import com.instructure.student.features.assignments.reminder.AlarmScheduler
import com.instructure.student.mobius.assignmentDetails.getFormattedAttemptDate
import com.instructure.student.mobius.assignmentDetails.uploadAudioRecording
+import com.instructure.student.mobius.common.ui.SubmissionHelper
+import com.instructure.student.room.StudentDb
+import com.instructure.student.room.entities.CreateSubmissionEntity
import com.instructure.student.util.getStudioLTITool
-import com.squareup.sqldelight.Query
import dagger.hilt.android.lifecycle.HiltViewModel
import kotlinx.coroutines.launch
import java.io.File
@@ -67,20 +75,20 @@ import java.text.DateFormat
import java.util.Date
import java.util.Locale
import javax.inject.Inject
-import com.instructure.student.Submission as DatabaseSubmission
@HiltViewModel
class AssignmentDetailsViewModel @Inject constructor(
savedStateHandle: SavedStateHandle,
private val assignmentDetailsRepository: AssignmentDetailsRepository,
+ private val submissionHelper: SubmissionHelper,
private val resources: Resources,
private val htmlContentFormatter: HtmlContentFormatter,
private val colorKeeper: ColorKeeper,
private val application: Application,
private val apiPrefs: ApiPrefs,
private val alarmScheduler: AlarmScheduler,
- database: StudentDb
-) : ViewModel(), Query.Listener {
+ studentDb: StudentDb
+) : ViewModel() {
val state: LiveData
get() = _state
@@ -105,7 +113,7 @@ class AssignmentDetailsViewModel @Inject constructor(
private var externalLTITool: LTITool? = null
private var studioLTITool: LTITool? = null
- private var dbSubmission: DatabaseSubmission? = null
+ private var dbSubmission: CreateSubmissionEntity? = null
private var isUploading = false
private var restrictQuantitativeData = false
private var gradingScheme = emptyList()
@@ -115,7 +123,7 @@ class AssignmentDetailsViewModel @Inject constructor(
private var selectedSubmission: Submission? = null
- private val submissionQuery = database.submissionQueries.getSubmissionsByAssignmentId(assignmentId, apiPrefs.user?.id.orDefault())
+ private val submissionLiveData = studentDb.submissionDao().findSubmissionsByAssignmentIdLiveData(assignmentId, apiPrefs.user?.id.orDefault())
private val remindersObserver = Observer> {
_data.value?.reminders = mapReminders(it)
@@ -130,21 +138,9 @@ class AssignmentDetailsViewModel @Inject constructor(
var checkingReminderPermission = false
- init {
- markSubmissionAsRead()
- submissionQuery.addListener(this)
- _state.postValue(ViewState.Loading)
- loadData()
- }
-
- override fun onCleared() {
- super.onCleared()
- remindersLiveData.removeObserver(remindersObserver)
- }
-
- override fun queryResultsChanged() {
+ private val submissionObserver = Observer> {submissions ->
viewModelScope.launch {
- val submission = submissionQuery.executeAsList().lastOrNull()
+ val submission = submissions.lastOrNull()
dbSubmission = submission
val attempts = _data.value?.attempts
submission?.let { dbSubmission ->
@@ -191,6 +187,19 @@ class AssignmentDetailsViewModel @Inject constructor(
}
}
+ init {
+ markSubmissionAsRead()
+ submissionLiveData.observeForever(submissionObserver)
+ _state.postValue(ViewState.Loading)
+ loadData()
+ }
+
+ override fun onCleared() {
+ super.onCleared()
+ remindersLiveData.removeObserver(remindersObserver)
+ submissionLiveData.removeObserver(submissionObserver)
+ }
+
private fun markSubmissionAsRead() {
viewModelScope.launch {
SubmissionManager.markSubmissionAsReadAsync(course?.id.orDefault(), assignmentId).await()
@@ -238,7 +247,7 @@ class AssignmentDetailsViewModel @Inject constructor(
bookmarker = bookmarker.copy(url = assignmentResult.htmlUrl)
- val dbSubmission = submissionQuery.executeAsList().lastOrNull()
+ val dbSubmission = submissionLiveData.value?.lastOrNull()
this@AssignmentDetailsViewModel.dbSubmission = dbSubmission
val hasDraft = dbSubmission?.isDraft.orDefault()
@@ -607,7 +616,7 @@ class AssignmentDetailsViewModel @Inject constructor(
fun uploadAudioSubmission(context: Context?, file: File?) {
val assignment = assignment
if (context != null && file != null && assignment != null && course != null) {
- uploadAudioRecording(context, file, assignment, course)
+ uploadAudioRecording(submissionHelper, file, assignment, course)
} else {
postAction(AssignmentDetailAction.ShowToast(resources.getString(R.string.audioRecordingError)))
}
@@ -667,4 +676,14 @@ class AssignmentDetailsViewModel @Inject constructor(
val dueDate = assignment?.dueDate?.time ?: return null
return dueDate - reminderChoice.getTimeInMillis()
}
+
+ fun isStudioAccepted(): Boolean {
+ if (assignment?.isStudioEnabled == false) return false
+
+ if (assignment?.getSubmissionTypes()?.contains(SubmissionType.ONLINE_UPLOAD) == false) return false
+
+ if (assignment?.allowedExtensions?.isEmpty() == true) return true
+
+ return assignment?.allowedExtensions?.any { isAudioVisualExtension(it) } ?: true
+ }
}
diff --git a/apps/student/src/main/java/com/instructure/student/features/assignments/list/AssignmentListFragment.kt b/apps/student/src/main/java/com/instructure/student/features/assignments/list/AssignmentListFragment.kt
index 97c13658cc..cac1ea6e68 100644
--- a/apps/student/src/main/java/com/instructure/student/features/assignments/list/AssignmentListFragment.kt
+++ b/apps/student/src/main/java/com/instructure/student/features/assignments/list/AssignmentListFragment.kt
@@ -44,7 +44,18 @@ import com.instructure.interactions.router.RouterParams
import com.instructure.pandautils.analytics.SCREEN_VIEW_ASSIGNMENT_LIST
import com.instructure.pandautils.analytics.ScreenView
import com.instructure.pandautils.binding.viewBinding
-import com.instructure.pandautils.utils.*
+import com.instructure.pandautils.utils.Const
+import com.instructure.pandautils.utils.ParcelableArg
+import com.instructure.pandautils.utils.ViewStyler
+import com.instructure.pandautils.utils.addSearch
+import com.instructure.pandautils.utils.closeSearch
+import com.instructure.pandautils.utils.isCourse
+import com.instructure.pandautils.utils.isTablet
+import com.instructure.pandautils.utils.makeBundle
+import com.instructure.pandautils.utils.onClick
+import com.instructure.pandautils.utils.setupAsBackButton
+import com.instructure.pandautils.utils.toast
+import com.instructure.pandautils.utils.withArgs
import com.instructure.student.R
import com.instructure.student.adapter.TermSpinnerAdapter
import com.instructure.student.databinding.AssignmentListLayoutBinding
@@ -93,7 +104,7 @@ class AssignmentListFragment : ParentFragment(), Bookmarkable {
}
private val allTermsGradingPeriod by lazy {
- GradingPeriod().apply { title = getString(R.string.assignmentsListAllGradingPeriods) }
+ GradingPeriod().apply { title = getString(R.string.assignmentsListDisplayGradingPeriod) }
}
private val adapterToAssignmentsCallback = object : AdapterToAssignmentsCallback {
@@ -291,7 +302,7 @@ class AssignmentListFragment : ParentFragment(), Bookmarkable {
termSpinner.adapter = adapter
termSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
override fun onItemSelected(adapterView: AdapterView<*>, view: View?, i: Int, l: Long) {
- if (adapter.getItem(i)!!.title == getString(R.string.assignmentsListAllGradingPeriods)) {
+ if (adapter.getItem(i)!!.title == getString(R.string.assignmentsListDisplayGradingPeriod)) {
recyclerAdapter?.loadAssignment()
} else {
recyclerAdapter?.loadAssignmentsForGradingPeriod(adapter.getItem(i)!!.id, true)
diff --git a/apps/student/src/main/java/com/instructure/student/features/assignments/list/adapter/AssignmentListRecyclerAdapter.kt b/apps/student/src/main/java/com/instructure/student/features/assignments/list/adapter/AssignmentListRecyclerAdapter.kt
index 0dcb1d462a..fde92e41f2 100644
--- a/apps/student/src/main/java/com/instructure/student/features/assignments/list/adapter/AssignmentListRecyclerAdapter.kt
+++ b/apps/student/src/main/java/com/instructure/student/features/assignments/list/adapter/AssignmentListRecyclerAdapter.kt
@@ -126,7 +126,7 @@ abstract class AssignmentListRecyclerAdapter(
private fun loadAssignmentsData(course: Course) {
//This check is for the "all grading periods" option
if (currentGradingPeriod != null && currentGradingPeriod!!.title != null
- && currentGradingPeriod!!.title == context.getString(R.string.assignmentsListAllGradingPeriods)) {
+ && currentGradingPeriod!!.title == context.getString(R.string.assignmentsListDisplayGradingPeriod)) {
loadAssignment()
return
}
diff --git a/apps/student/src/main/java/com/instructure/student/features/calendar/StudentCalendarRepository.kt b/apps/student/src/main/java/com/instructure/student/features/calendar/StudentCalendarRepository.kt
new file mode 100644
index 0000000000..d288929a5d
--- /dev/null
+++ b/apps/student/src/main/java/com/instructure/student/features/calendar/StudentCalendarRepository.kt
@@ -0,0 +1,101 @@
+/*
+ * Copyright (C) 2024 - present Instructure, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.instructure.student.features.calendar
+
+import com.instructure.canvasapi2.apis.CourseAPI
+import com.instructure.canvasapi2.apis.GroupAPI
+import com.instructure.canvasapi2.apis.PlannerAPI
+import com.instructure.canvasapi2.builders.RestParams
+import com.instructure.canvasapi2.models.CanvasContext
+import com.instructure.canvasapi2.models.PlannableType
+import com.instructure.canvasapi2.models.PlannerItem
+import com.instructure.canvasapi2.utils.ApiPrefs
+import com.instructure.canvasapi2.utils.DataResult
+import com.instructure.canvasapi2.utils.depaginate
+import com.instructure.canvasapi2.utils.hasActiveEnrollment
+import com.instructure.canvasapi2.utils.isValidTerm
+import com.instructure.pandautils.features.calendar.CalendarRepository
+import com.instructure.pandautils.room.calendar.daos.CalendarFilterDao
+import com.instructure.pandautils.room.calendar.entities.CalendarFilterEntity
+import com.instructure.pandautils.utils.orDefault
+
+class StudentCalendarRepository(
+ private val plannerApi: PlannerAPI.PlannerInterface,
+ private val coursesApi: CourseAPI.CoursesInterface,
+ private val groupsApi: GroupAPI.GroupInterface,
+ private val apiPrefs: ApiPrefs,
+ private val calendarFilterDao: CalendarFilterDao
+) : CalendarRepository {
+
+ override suspend fun getPlannerItems(
+ startDate: String,
+ endDate: String,
+ contextCodes: List,
+ forceNetwork: Boolean
+ ): List {
+ val restParams =
+ RestParams(isForceReadFromNetwork = forceNetwork, usePerPageQueryParam = true)
+
+ // The calendar on web does not include announcements, so we filter them out here to match that behavior
+ return plannerApi.getPlannerItems(
+ startDate,
+ endDate,
+ emptyList(), // We always request all the events for students and filter locally
+ restParams
+ ).depaginate {
+ plannerApi.nextPagePlannerItems(it, restParams)
+ }.dataOrThrow
+ .filter { it.plannableType != PlannableType.ANNOUNCEMENT && it.plannableType != PlannableType.ASSESSMENT_REQUEST }
+ }
+
+ override suspend fun getCanvasContexts(): DataResult>> {
+ val params = RestParams(usePerPageQueryParam = true, isForceReadFromNetwork = false)
+
+ val coursesResult = coursesApi.getFirstPageCoursesCalendar(params)
+ .depaginate { nextUrl -> coursesApi.next(nextUrl, params) }
+
+ if (coursesResult.isFail) return DataResult.Fail()
+
+ val courses = (coursesResult as DataResult.Success).data
+ val validCourses = courses.filter { !it.accessRestrictedByDate && it.hasActiveEnrollment() }
+
+ val groupsResult = groupsApi.getFirstPageGroups(params)
+ .depaginate { nextUrl -> groupsApi.getNextPageGroups(nextUrl, params) }
+
+ val groups = groupsResult.dataOrNull ?: emptyList()
+
+ val courseMap = validCourses.associateBy { it.id }
+ val validGroups = groups.filter { it.courseId == 0L || courseMap[it.courseId] != null }
+
+ val users = apiPrefs.user?.let { listOf(it) } ?: emptyList()
+
+ val contexts = (users + validCourses + validGroups).groupBy { it.type }.filter { it.value.isNotEmpty() }
+
+ return DataResult.Success(contexts)
+ }
+
+ override suspend fun getCalendarFilterLimit(): Int {
+ return -1
+ }
+
+ override suspend fun getCalendarFilters(): CalendarFilterEntity? {
+ return calendarFilterDao.findByUserIdAndDomain(apiPrefs.user?.id.orDefault(), apiPrefs.fullDomain)
+ }
+
+ override suspend fun updateCalendarFilters(calendarFilterEntity: CalendarFilterEntity) {
+ calendarFilterDao.insertOrUpdate(calendarFilterEntity)
+ }
+}
\ No newline at end of file
diff --git a/apps/student/src/main/java/com/instructure/student/features/calendar/StudentCalendarRouter.kt b/apps/student/src/main/java/com/instructure/student/features/calendar/StudentCalendarRouter.kt
new file mode 100644
index 0000000000..8f90429e9e
--- /dev/null
+++ b/apps/student/src/main/java/com/instructure/student/features/calendar/StudentCalendarRouter.kt
@@ -0,0 +1,79 @@
+/*
+ * Copyright (C) 2024 - 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 .
+ *
+ */
+package com.instructure.student.features.calendar
+
+import androidx.fragment.app.FragmentActivity
+import com.instructure.canvasapi2.models.CanvasContext
+import com.instructure.canvasapi2.models.PlannerItem
+import com.instructure.canvasapi2.utils.ApiPrefs
+import com.instructure.pandautils.features.calendar.CalendarRouter
+import com.instructure.pandautils.features.calendarevent.createupdate.CreateUpdateEventFragment
+import com.instructure.pandautils.features.calendarevent.details.EventFragment
+import com.instructure.pandautils.features.calendartodo.createupdate.CreateUpdateToDoFragment
+import com.instructure.pandautils.features.calendartodo.details.ToDoFragment
+import com.instructure.pandautils.features.discussion.router.DiscussionRouterFragment
+import com.instructure.student.activity.NavigationActivity
+import com.instructure.student.features.assignments.details.AssignmentDetailsFragment
+import com.instructure.student.fragment.BasicQuizViewFragment
+import com.instructure.student.router.RouteMatcher
+
+class StudentCalendarRouter(private val activity: FragmentActivity) : CalendarRouter {
+ override fun openNavigationDrawer() {
+ (activity as? NavigationActivity)?.openNavigationDrawer()
+ }
+
+ override fun openAssignment(canvasContext: CanvasContext, assignmentId: Long) {
+ val route = AssignmentDetailsFragment.makeRoute(canvasContext, assignmentId)
+ RouteMatcher.route(activity, route)
+ }
+
+ override fun openDiscussion(canvasContext: CanvasContext, discussionId: Long) {
+ val route = DiscussionRouterFragment.makeRoute(canvasContext, discussionId)
+ RouteMatcher.route(activity, route)
+ }
+
+ override fun openQuiz(canvasContext: CanvasContext, htmlUrl: String) {
+ if (!RouteMatcher.canRouteInternally(activity, htmlUrl, ApiPrefs.domain, true)) {
+ val route = BasicQuizViewFragment.makeRoute(canvasContext, htmlUrl)
+ RouteMatcher.route(activity, route)
+ }
+ }
+
+ override fun openCalendarEvent(canvasContext: CanvasContext, eventId: Long) {
+ val route = EventFragment.makeRoute(canvasContext, eventId)
+ RouteMatcher.route(activity, route)
+ }
+
+ override fun openToDo(plannerItem: PlannerItem) {
+ val route = ToDoFragment.makeRoute(plannerItem)
+ RouteMatcher.route(activity, route)
+ }
+
+ override fun openCreateToDo(initialDateString: String?) {
+ val route = CreateUpdateToDoFragment.makeRoute(initialDateString)
+ RouteMatcher.route(activity, route)
+ }
+
+ override fun openCreateEvent(initialDateString: String?) {
+ val route = CreateUpdateEventFragment.makeRoute(initialDateString)
+ RouteMatcher.route(activity, route)
+ }
+
+ override fun attachNavigationDrawer() {
+ // This is a no-op in the Student app, navigation drawer is already handled in the Activity
+ }
+}
\ No newline at end of file
diff --git a/apps/student/src/main/java/com/instructure/student/features/calendarevent/StudentCreateUpdateEventRepository.kt b/apps/student/src/main/java/com/instructure/student/features/calendarevent/StudentCreateUpdateEventRepository.kt
new file mode 100644
index 0000000000..364c2ce22a
--- /dev/null
+++ b/apps/student/src/main/java/com/instructure/student/features/calendarevent/StudentCreateUpdateEventRepository.kt
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2024 - 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 .
+ *
+ */
+
+package com.instructure.student.features.calendarevent
+
+import com.instructure.canvasapi2.apis.CalendarEventAPI
+import com.instructure.canvasapi2.apis.CourseAPI
+import com.instructure.canvasapi2.apis.GroupAPI
+import com.instructure.canvasapi2.builders.RestParams
+import com.instructure.canvasapi2.models.CanvasContext
+import com.instructure.canvasapi2.utils.ApiPrefs
+import com.instructure.canvasapi2.utils.depaginate
+import com.instructure.canvasapi2.utils.hasActiveEnrollment
+import com.instructure.canvasapi2.utils.isValidTerm
+import com.instructure.pandautils.features.calendarevent.createupdate.CreateUpdateEventRepository
+
+
+class StudentCreateUpdateEventRepository(
+ calendarEventApi: CalendarEventAPI.CalendarEventInterface,
+ private val coursesApi: CourseAPI.CoursesInterface,
+ private val groupsApi: GroupAPI.GroupInterface,
+ private val apiPrefs: ApiPrefs
+) : CreateUpdateEventRepository(calendarEventApi) {
+
+ override suspend fun getCanvasContexts(): List {
+ val params = RestParams(usePerPageQueryParam = true, isForceReadFromNetwork = false)
+
+ val coursesResult = coursesApi.getFirstPageCoursesCalendar(params)
+ .depaginate { nextUrl -> coursesApi.next(nextUrl, params) }
+
+ val courses = coursesResult.dataOrNull.orEmpty()
+ val validCourses = courses.filter { !it.accessRestrictedByDate && it.hasActiveEnrollment() }
+
+ val groupsResult = groupsApi.getFirstPageGroups(params)
+ .depaginate { nextUrl -> groupsApi.getNextPageGroups(nextUrl, params) }
+
+ val groups = groupsResult.dataOrNull.orEmpty()
+
+ val courseMap = validCourses.associateBy { it.id }
+ val validGroups = groups.filter { it.courseId == 0L || courseMap[it.courseId] != null }
+
+ val users = listOfNotNull(apiPrefs.user)
+
+ return users + validGroups
+ }
+}
diff --git a/apps/student/src/main/java/com/instructure/student/features/calendarevent/StudentEventRouter.kt b/apps/student/src/main/java/com/instructure/student/features/calendarevent/StudentEventRouter.kt
new file mode 100644
index 0000000000..137fbd1a2c
--- /dev/null
+++ b/apps/student/src/main/java/com/instructure/student/features/calendarevent/StudentEventRouter.kt
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2024 - 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 .
+ *
+ */
+
+package com.instructure.student.features.calendarevent
+
+import androidx.fragment.app.FragmentActivity
+import com.instructure.canvasapi2.models.ScheduleItem
+import com.instructure.pandautils.features.calendarevent.createupdate.CreateUpdateEventFragment
+import com.instructure.pandautils.features.calendarevent.details.EventRouter
+import com.instructure.student.router.RouteMatcher
+
+class StudentEventRouter(private val activity: FragmentActivity) : EventRouter {
+
+ override fun openEditEvent(scheduleItem: ScheduleItem) {
+ val route = CreateUpdateEventFragment.makeRoute(scheduleItem)
+ RouteMatcher.route(activity, route)
+ }
+}
diff --git a/apps/student/src/main/java/com/instructure/student/features/calendartodo/StudentCreateUpdateToDoRepository.kt b/apps/student/src/main/java/com/instructure/student/features/calendartodo/StudentCreateUpdateToDoRepository.kt
new file mode 100644
index 0000000000..fa9e61a85d
--- /dev/null
+++ b/apps/student/src/main/java/com/instructure/student/features/calendartodo/StudentCreateUpdateToDoRepository.kt
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2024 - present Instructure, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.instructure.student.features.calendartodo
+
+import com.instructure.canvasapi2.apis.CourseAPI
+import com.instructure.canvasapi2.apis.PlannerAPI
+import com.instructure.canvasapi2.builders.RestParams
+import com.instructure.canvasapi2.models.Course
+import com.instructure.canvasapi2.utils.depaginate
+import com.instructure.canvasapi2.utils.hasActiveEnrollment
+import com.instructure.pandautils.features.calendartodo.createupdate.CreateUpdateToDoRepository
+
+class StudentCreateUpdateToDoRepository(
+ private val coursesApi: CourseAPI.CoursesInterface,
+ plannerApi: PlannerAPI.PlannerInterface
+) : CreateUpdateToDoRepository(plannerApi) {
+
+ override suspend fun getCourses(): List {
+ val params = RestParams()
+ return coursesApi.getFirstPageCoursesCalendar(params)
+ .depaginate { nextUrl ->
+ coursesApi.next(nextUrl, params)
+ }
+ .map {
+ it.filter { course ->
+ !course.accessRestrictedByDate && course.hasActiveEnrollment() && course.isStudent
+ }
+ }
+ .dataOrNull
+ .orEmpty()
+ }
+}
\ No newline at end of file
diff --git a/apps/student/src/main/java/com/instructure/student/features/calendartodo/StudentToDoRouter.kt b/apps/student/src/main/java/com/instructure/student/features/calendartodo/StudentToDoRouter.kt
new file mode 100644
index 0000000000..a2422d66bc
--- /dev/null
+++ b/apps/student/src/main/java/com/instructure/student/features/calendartodo/StudentToDoRouter.kt
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2024 - 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 .
+ *
+ */
+
+package com.instructure.student.features.calendartodo
+
+import androidx.fragment.app.FragmentActivity
+import com.instructure.canvasapi2.models.PlannerItem
+import com.instructure.pandautils.features.calendartodo.createupdate.CreateUpdateToDoFragment
+import com.instructure.pandautils.features.calendartodo.details.ToDoRouter
+
+import com.instructure.student.router.RouteMatcher
+
+class StudentToDoRouter(private val activity: FragmentActivity) : ToDoRouter {
+ override fun openEditToDo(plannerItem: PlannerItem) {
+ val route = CreateUpdateToDoFragment.makeRoute(plannerItem)
+ RouteMatcher.route(activity, route)
+ }
+}
diff --git a/apps/student/src/main/java/com/instructure/student/features/discussion/details/DiscussionDetailsFragment.kt b/apps/student/src/main/java/com/instructure/student/features/discussion/details/DiscussionDetailsFragment.kt
index bcc9257472..f9375ebec8 100644
--- a/apps/student/src/main/java/com/instructure/student/features/discussion/details/DiscussionDetailsFragment.kt
+++ b/apps/student/src/main/java/com/instructure/student/features/discussion/details/DiscussionDetailsFragment.kt
@@ -33,13 +33,29 @@ import androidx.lifecycle.lifecycleScope
import com.google.android.material.snackbar.Snackbar
import com.instructure.canvasapi2.StatusCallback
import com.instructure.canvasapi2.managers.DiscussionManager
-import com.instructure.canvasapi2.models.*
-import com.instructure.canvasapi2.utils.*
+import com.instructure.canvasapi2.models.Assignment
+import com.instructure.canvasapi2.models.CanvasContext
+import com.instructure.canvasapi2.models.Course
+import com.instructure.canvasapi2.models.CourseSettings
+import com.instructure.canvasapi2.models.DiscussionEntry
+import com.instructure.canvasapi2.models.DiscussionTopic
+import com.instructure.canvasapi2.models.DiscussionTopicHeader
+import com.instructure.canvasapi2.models.Group
+import com.instructure.canvasapi2.models.RemoteFile
+import com.instructure.canvasapi2.utils.ApiPrefs
+import com.instructure.canvasapi2.utils.DataResult
+import com.instructure.canvasapi2.utils.DateHelper
+import com.instructure.canvasapi2.utils.Logger
+import com.instructure.canvasapi2.utils.NumberHelper
+import com.instructure.canvasapi2.utils.Pronouns
+import com.instructure.canvasapi2.utils.isValid
+import com.instructure.canvasapi2.utils.mapToAttachment
import com.instructure.canvasapi2.utils.pageview.BeforePageView
import com.instructure.canvasapi2.utils.pageview.PageView
import com.instructure.canvasapi2.utils.pageview.PageViewUrlParam
import com.instructure.canvasapi2.utils.pageview.PageViewUrlQuery
-import com.instructure.canvasapi2.utils.weave.*
+import com.instructure.canvasapi2.utils.weave.catch
+import com.instructure.canvasapi2.utils.weave.tryLaunch
import com.instructure.interactions.bookmarks.Bookmarkable
import com.instructure.interactions.bookmarks.Bookmarker
import com.instructure.interactions.router.Route
@@ -51,7 +67,30 @@ import com.instructure.pandautils.binding.viewBinding
import com.instructure.pandautils.discussions.DiscussionCaching
import com.instructure.pandautils.discussions.DiscussionEntryHtmlConverter
import com.instructure.pandautils.discussions.DiscussionUtils
-import com.instructure.pandautils.utils.*
+import com.instructure.pandautils.utils.BooleanArg
+import com.instructure.pandautils.utils.DiscussionEntryEvent
+import com.instructure.pandautils.utils.LongArg
+import com.instructure.pandautils.utils.NullableParcelableArg
+import com.instructure.pandautils.utils.NullableStringArg
+import com.instructure.pandautils.utils.OnBackStackChangedEvent
+import com.instructure.pandautils.utils.ParcelableArg
+import com.instructure.pandautils.utils.ProfileUtils
+import com.instructure.pandautils.utils.ThemePrefs
+import com.instructure.pandautils.utils.ViewStyler
+import com.instructure.pandautils.utils.getModuleItemId
+import com.instructure.pandautils.utils.isAccessibilityEnabled
+import com.instructure.pandautils.utils.isGroup
+import com.instructure.pandautils.utils.isTablet
+import com.instructure.pandautils.utils.loadHtmlWithIframes
+import com.instructure.pandautils.utils.makeBundle
+import com.instructure.pandautils.utils.onClick
+import com.instructure.pandautils.utils.onClickWithRequireNetwork
+import com.instructure.pandautils.utils.orDefault
+import com.instructure.pandautils.utils.setGone
+import com.instructure.pandautils.utils.setInvisible
+import com.instructure.pandautils.utils.setVisible
+import com.instructure.pandautils.utils.setupAsBackButton
+import com.instructure.pandautils.utils.setupAvatarA11y
import com.instructure.pandautils.views.CanvasWebView
import com.instructure.student.BuildConfig
import com.instructure.student.R
@@ -61,7 +100,11 @@ import com.instructure.student.events.DiscussionUpdatedEvent
import com.instructure.student.events.ModuleUpdatedEvent
import com.instructure.student.events.post
import com.instructure.student.features.modules.progression.CourseModuleProgressionFragment
-import com.instructure.student.fragment.*
+import com.instructure.student.fragment.DiscussionsReplyFragment
+import com.instructure.student.fragment.DiscussionsUpdateFragment
+import com.instructure.student.fragment.InternalWebviewFragment
+import com.instructure.student.fragment.LtiLaunchFragment
+import com.instructure.student.fragment.ParentFragment
import com.instructure.student.router.RouteMatcher
import com.instructure.student.util.Const
import dagger.hilt.android.AndroidEntryPoint
@@ -73,7 +116,7 @@ import org.greenrobot.eventbus.EventBus
import org.greenrobot.eventbus.Subscribe
import org.greenrobot.eventbus.ThreadMode
import java.net.URLDecoder
-import java.util.*
+import java.util.Date
import java.util.regex.Pattern
import javax.inject.Inject
@@ -633,7 +676,8 @@ class DiscussionDetailsFragment : ParentFragment(), Bookmarkable {
openInBrowser.setVisible(discussionTopicHeader.htmlUrl?.isNotEmpty() == true)
replyToDiscussionTopic.setGone()
swipeRefreshLayout.isEnabled = false
- openInBrowser.onClick {
+
+ openInBrowser.onClickWithRequireNetwork {
discussionTopicHeader.htmlUrl?.let { url ->
InternalWebviewFragment.loadInternalWebView(
activity,
diff --git a/apps/student/src/main/java/com/instructure/student/features/discussion/list/adapter/DiscussionListRecyclerAdapter.kt b/apps/student/src/main/java/com/instructure/student/features/discussion/list/adapter/DiscussionListRecyclerAdapter.kt
index 62ffa37c47..b8b792dc03 100644
--- a/apps/student/src/main/java/com/instructure/student/features/discussion/list/adapter/DiscussionListRecyclerAdapter.kt
+++ b/apps/student/src/main/java/com/instructure/student/features/discussion/list/adapter/DiscussionListRecyclerAdapter.kt
@@ -33,6 +33,7 @@ import com.instructure.student.features.discussion.list.DiscussionListRepository
import com.instructure.student.holders.EmptyViewHolder
import com.instructure.student.holders.NoViewholder
import com.instructure.student.interfaces.AdapterToFragmentCallback
+import kotlinx.coroutines.CancellationException
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.launch
import java.util.*
@@ -107,6 +108,8 @@ open class DiscussionListRecyclerAdapter(
try {
discussions = repository.getDiscussionTopicHeaders(canvasContext, !isDiscussions, isRefresh)
populateData()
+ } catch (e: CancellationException) {
+ callback.onRefreshFinished()
} catch (e: Exception) {
callback.onRefreshFinished()
context.toast(R.string.errorOccurred)
diff --git a/apps/student/src/main/java/com/instructure/student/features/discussion/routing/DiscussionRouteHelperStudentRepository.kt b/apps/student/src/main/java/com/instructure/student/features/discussion/routing/DiscussionRouteHelperStudentRepository.kt
index 586dfa2ec2..c9397f04ad 100644
--- a/apps/student/src/main/java/com/instructure/student/features/discussion/routing/DiscussionRouteHelperStudentRepository.kt
+++ b/apps/student/src/main/java/com/instructure/student/features/discussion/routing/DiscussionRouteHelperStudentRepository.kt
@@ -13,16 +13,12 @@ import com.instructure.pandautils.utils.NetworkStateProvider
class DiscussionRouteHelperStudentRepository(
localDataSource: DiscussionRouteHelperLocalDataSource,
- private val networkDataSource: DiscussionRouteHelperNetworkDataSource,
+ networkDataSource: DiscussionRouteHelperNetworkDataSource,
networkStateProvider: NetworkStateProvider,
featureFlagProvider: FeatureFlagProvider
) : DiscussionRouteHelperRepository, Repository(localDataSource, networkDataSource, networkStateProvider, featureFlagProvider) {
- override suspend fun getEnabledFeaturesForCourse(
- canvasContext: CanvasContext,
- forceNetwork: Boolean
- ): Boolean {
- return networkDataSource.getEnabledFeaturesForCourse(canvasContext, forceNetwork)
- }
+
+ override suspend fun shouldShowDiscussionRedesign(): Boolean = isOnline() || !isOfflineEnabled()
override suspend fun getDiscussionTopicHeader(
canvasContext: CanvasContext,
diff --git a/apps/student/src/main/java/com/instructure/student/features/legal/StudentLegalRouter.kt b/apps/student/src/main/java/com/instructure/student/features/legal/StudentLegalRouter.kt
new file mode 100644
index 0000000000..9b46dc4305
--- /dev/null
+++ b/apps/student/src/main/java/com/instructure/student/features/legal/StudentLegalRouter.kt
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2024 - present Instructure, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.instructure.student.features.legal
+
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import com.instructure.pandautils.features.legal.LegalRouter
+import com.instructure.student.R
+import com.instructure.student.activity.InternalWebViewActivity
+
+class StudentLegalRouter(private val context: Context) : LegalRouter {
+ override fun routeToTermsOfService(html: String) {
+ val intent = InternalWebViewActivity.createIntent(
+ context, "http://www.canvaslms.com/policies/terms-of-use", html, context.getString(
+ R.string.termsOfUse
+ ), false
+ )
+ context.startActivity(intent)
+ }
+
+ override fun routeToPrivacyPolicy() {
+ val intent = InternalWebViewActivity.createIntent(
+ context,
+ "https://www.instructure.com/policies/product-privacy-policy",
+ context.getString(R.string.privacyPolicy),
+ false
+ )
+ context.startActivity(intent)
+ }
+
+ override fun routeToOpenSource() {
+ val intent =
+ Intent(Intent.ACTION_VIEW, Uri.parse("https://github.com/instructure/canvas-android"))
+ context.startActivity(intent)
+ }
+}
\ No newline at end of file
diff --git a/apps/student/src/main/java/com/instructure/student/features/modules/progression/CourseModuleProgressionFragment.kt b/apps/student/src/main/java/com/instructure/student/features/modules/progression/CourseModuleProgressionFragment.kt
index 7338f5d9a9..3b44d2bd71 100644
--- a/apps/student/src/main/java/com/instructure/student/features/modules/progression/CourseModuleProgressionFragment.kt
+++ b/apps/student/src/main/java/com/instructure/student/features/modules/progression/CourseModuleProgressionFragment.kt
@@ -105,8 +105,6 @@ class CourseModuleProgressionFragment : ParentFragment(), Bookmarkable {
// This will keep track of where we need to be.
private var currentPos = 0
- private var isDiscussionRedesignEnabled = false
-
private var snycedTabs = emptySet()
private var syncedFileIds = emptyList()
private var isOfflineEnabled = false
@@ -137,7 +135,6 @@ class CourseModuleProgressionFragment : ParentFragment(), Bookmarkable {
isOfflineEnabled = repository.isOfflineEnabled()
snycedTabs = repository.getSyncedTabs(canvasContext.id)
syncedFileIds = repository.getSyncedFileIds(canvasContext.id)
- isDiscussionRedesignEnabled = discussionRouteHelper.isDiscussionRedesignEnabled(canvasContext)
loadModuleProgression(savedInstanceState)
}
}
@@ -643,7 +640,6 @@ class CourseModuleProgressionFragment : ParentFragment(), Bookmarkable {
moduleItem!!,
canvasContext as Course,
modules[groupPos],
- isDiscussionRedesignEnabled,
navigatedFromModules,
repository.isOnline() || !isOfflineEnabled, // If the offline feature is disabled we always use the online behavior
snycedTabs,
diff --git a/apps/student/src/main/java/com/instructure/student/features/modules/progression/LockedModuleItemFragment.kt b/apps/student/src/main/java/com/instructure/student/features/modules/progression/LockedModuleItemFragment.kt
index d708d01bd6..806f82655c 100644
--- a/apps/student/src/main/java/com/instructure/student/features/modules/progression/LockedModuleItemFragment.kt
+++ b/apps/student/src/main/java/com/instructure/student/features/modules/progression/LockedModuleItemFragment.kt
@@ -75,7 +75,6 @@ class LockedModuleItemFragment : ParentFragment() {
canvasWebView.settings.loadWithOverviewMode = true
canvasWebView.settings.displayZoomControls = false
canvasWebView.settings.setSupportZoom(true)
- canvasWebView.settings.userAgentString = ApiPrefs.userAgent
canvasWebView.addVideoClient(requireActivity())
canvasWebView.setInitialScale(100)
diff --git a/apps/student/src/main/java/com/instructure/student/features/modules/util/ModuleUtility.kt b/apps/student/src/main/java/com/instructure/student/features/modules/util/ModuleUtility.kt
index fdea8d6c99..aed581b1e8 100644
--- a/apps/student/src/main/java/com/instructure/student/features/modules/util/ModuleUtility.kt
+++ b/apps/student/src/main/java/com/instructure/student/features/modules/util/ModuleUtility.kt
@@ -49,7 +49,6 @@ object ModuleUtility {
item: ModuleItem,
course: Course,
moduleObject: ModuleObject?,
- isDiscussionRedesignEnabled: Boolean,
navigatedFromModules: Boolean,
isOnline: Boolean,
syncedTabs: Set,
@@ -64,7 +63,7 @@ object ModuleUtility {
}
"Discussion" -> {
createFragmentWithOfflineCheck(isOnline, course, item, syncedTabs, context, setOf(Tab.DISCUSSIONS_ID)) {
- if (isDiscussionRedesignEnabled && isOnline) {
+ if (isOnline) {
DiscussionDetailsWebViewFragment.newInstance(getDiscussionRedesignRoute(item, course))
} else {
DiscussionDetailsFragment.newInstance(getDiscussionRoute(item, course))
diff --git a/apps/student/src/main/java/com/instructure/student/flutterChannels/FlutterComm.kt b/apps/student/src/main/java/com/instructure/student/flutterChannels/FlutterComm.kt
deleted file mode 100644
index 21725522ea..0000000000
--- a/apps/student/src/main/java/com/instructure/student/flutterChannels/FlutterComm.kt
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- * Copyright (C) 2020 - 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 .
- */
-
-package com.instructure.student.flutterChannels
-
-import android.app.Activity
-import android.content.Context
-import android.content.res.Configuration
-import android.graphics.Color
-import com.google.gson.Gson
-import com.instructure.canvasapi2.utils.ApiPrefs
-import com.instructure.canvasapi2.utils.isValid
-import com.instructure.canvasapi2.utils.toApiString
-import com.instructure.pandautils.utils.ColorKeeper
-import com.instructure.pandautils.utils.ThemePrefs
-import com.instructure.student.events.StatusBarColorChangeEvent
-import com.instructure.student.events.post
-import io.flutter.embedding.engine.FlutterEngine
-import io.flutter.plugin.common.MethodCall
-import io.flutter.plugin.common.MethodChannel
-import org.json.JSONObject
-import java.util.*
-
-object FlutterComm {
- private const val CHANNEL = "com.instructure.student/flutterComm"
-
- private const val METHOD_RESET = "reset"
- private const val METHOD_ROUTE_TO_CALENDAR = "routeToCalendar"
- private const val METHOD_SET_STATUS_BAR_COLOR = "setStatusBarColor"
- private const val METHOD_UPDATE_CALENDAR_DATES = "updateCalendarDates"
- private const val METHOD_UPDATE_LOGIN_DATA = "updateLoginData"
- private const val METHOD_UPDATE_SHOULD_POP = "updateShouldPop"
- private const val METHOD_UPDATE_THEME_DATA = "updateThemeData"
- private const val METHOD_UPDATE_DARK_MODE = "updateLightOrDarkMode"
-
- private lateinit var context: Context
- private lateinit var channel: MethodChannel
-
- var shouldPop: Boolean = true
- private set
-
- var statusBarColor: Int = 0
- private set(value) {
- field = value
- // We can't directly update the status bar color here because need an Activity reference. Instead, we'll
- // post a bus event with the color information and subscribe to it in NavigationActivity.
- StatusBarColorChangeEvent(value).post();
- }
-
- fun init(flutterEngine: FlutterEngine, context: Context) {
- this.context = context
- channel = MethodChannel(flutterEngine.dartExecutor.binaryMessenger, CHANNEL)
- channel.setMethodCallHandler(::handleCall)
- }
-
- private fun handleCall(call: MethodCall, result: MethodChannel.Result) {
- when(call.method) {
- METHOD_UPDATE_SHOULD_POP -> {
- shouldPop = call.arguments as? Boolean ?: true
- result.success(null)
- }
- METHOD_SET_STATUS_BAR_COLOR -> {
- val colorString = '#' + (call.arguments as String)
- statusBarColor = Color.parseColor(colorString)
- }
- }
- }
-
- fun sendUpdatedLogin() {
- // Send null if not logged in
- if (!ApiPrefs.getValidToken().isValid()) {
- channel.invokeMethod(METHOD_UPDATE_LOGIN_DATA, null)
- return
- }
-
- // Per a comment in NavigationActivity.initialCoreDataLoadingComplete, the user can be null in rare instances.
- // In these cases the user will be logged out automatically, so we don't need to send any data here.
- if (ApiPrefs.user == null) return
-
- val userJson = JSONObject(Gson().toJson(ApiPrefs.user)).apply {
- // Convert ID from Long to String
- put("id", getLong("id").toString())
- }
- val loginJson = JSONObject().apply {
- put("uuid", "")
- put("domain", ApiPrefs.fullDomain)
- put("accessToken", ApiPrefs.getValidToken())
- put("user", userJson)
- if (ApiPrefs.isMasquerading) put("masqueradeId", ApiPrefs.masqueradeId.toString())
- }
- channel.invokeMethod(METHOD_UPDATE_LOGIN_DATA, loginJson.toString())
- }
-
- fun sendUpdatedTheme() {
- val data = mutableMapOf()
- data["primaryColor"] = Integer.toHexString(ThemePrefs.primaryColor)
- data["accentColor"] = Integer.toHexString(ThemePrefs.brandColor)
- data["buttonColor"] = Integer.toHexString(ThemePrefs.buttonColor)
- data["textButtonColor"] = Integer.toHexString(ThemePrefs.textButtonColor)
- data["primaryTextColor"] = Integer.toHexString(ThemePrefs.primaryTextColor)
- data["contextColors"] = ColorKeeper.cachedThemedColors.map {
- val color = if (ColorKeeper.darkTheme) it.value.darkTextAndIconColor else it.value.light
- it.key.lowercase(Locale.US) to Integer.toHexString(color)
- }.toMap()
- channel.invokeMethod(METHOD_UPDATE_THEME_DATA, data)
- }
-
- fun routeToCalendar(channelId: String) = channel.invokeMethod(METHOD_ROUTE_TO_CALENDAR, channelId)
-
- fun reset() = channel.invokeMethod(METHOD_RESET, null)
-
- fun updateCalendarDates(dates: List) {
- val affectedDates = dates.filterNotNull().distinct() // Sanitize
- val isoDates = affectedDates.map { it.toApiString() }
- channel.invokeMethod(METHOD_UPDATE_CALENDAR_DATES, isoDates)
- }
-
- fun updateDarkMode(activity: Activity) {
- val nightModeFlags: Int = activity.resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK
- val darkMode = nightModeFlags == Configuration.UI_MODE_NIGHT_YES
-
- val data = mutableMapOf()
- data["darkMode"] = darkMode
- channel.invokeMethod(METHOD_UPDATE_DARK_MODE, data)
- }
-}
diff --git a/apps/student/src/main/java/com/instructure/student/fragment/AccountPreferencesFragment.kt b/apps/student/src/main/java/com/instructure/student/fragment/AccountPreferencesFragment.kt
index 74036bcfec..1a3357b3f3 100644
--- a/apps/student/src/main/java/com/instructure/student/fragment/AccountPreferencesFragment.kt
+++ b/apps/student/src/main/java/com/instructure/student/fragment/AccountPreferencesFragment.kt
@@ -31,14 +31,17 @@ import com.instructure.canvasapi2.utils.pageview.PageView
import com.instructure.pandautils.analytics.SCREEN_VIEW_ACCOUNT_PREFERENCES
import com.instructure.pandautils.analytics.ScreenView
import com.instructure.pandautils.binding.viewBinding
-import com.instructure.pandautils.utils.*
+import com.instructure.pandautils.utils.ColorKeeper
+import com.instructure.pandautils.utils.ThemePrefs
+import com.instructure.pandautils.utils.ViewStyler
+import com.instructure.pandautils.utils.setVisible
+import com.instructure.pandautils.utils.setupAsBackButton
import com.instructure.student.BuildConfig
import com.instructure.student.R
-import com.instructure.student.activity.LoginActivity
import com.instructure.student.databinding.FragmentAccountPreferencesBinding
import com.instructure.student.databinding.SettingsSpinnerBinding
import com.instructure.student.databinding.SettingsSpinnerItemBinding
-import java.util.*
+import java.util.Locale
@ScreenView(SCREEN_VIEW_ACCOUNT_PREFERENCES)
@PageView(url = "profile/settings")
@@ -125,7 +128,7 @@ class AccountPreferencesFragment : ParentFragment() {
.setPositiveButton(R.string.yes) { _, _ ->
// Set the language
ApiPrefs.selectedLocale = languages[position].first
- LocaleUtils.restartApp(requireContext(), LoginActivity::class.java)
+ LocaleUtils.restartApp(requireContext())
}
.setNegativeButton(R.string.no, null)
.setCancelable(true)
diff --git a/apps/student/src/main/java/com/instructure/student/fragment/ApplicationSettingsFragment.kt b/apps/student/src/main/java/com/instructure/student/fragment/ApplicationSettingsFragment.kt
index 3415885946..8a90f88748 100644
--- a/apps/student/src/main/java/com/instructure/student/fragment/ApplicationSettingsFragment.kt
+++ b/apps/student/src/main/java/com/instructure/student/fragment/ApplicationSettingsFragment.kt
@@ -32,6 +32,7 @@ import com.instructure.pandautils.analytics.SCREEN_VIEW_APPLICATION_SETTINGS
import com.instructure.pandautils.analytics.ScreenView
import com.instructure.pandautils.binding.viewBinding
import com.instructure.pandautils.features.about.AboutFragment
+import com.instructure.pandautils.features.legal.LegalDialogFragment
import com.instructure.pandautils.features.notification.preferences.EmailNotificationPreferencesFragment
import com.instructure.pandautils.features.notification.preferences.PushNotificationPreferencesFragment
import com.instructure.pandautils.features.offline.sync.settings.SyncSettingsFragment
@@ -43,7 +44,6 @@ import com.instructure.student.R
import com.instructure.student.activity.NothingToSeeHereFragment
import com.instructure.student.activity.SettingsActivity
import com.instructure.student.databinding.FragmentApplicationSettingsBinding
-import com.instructure.student.dialog.LegalDialogStyled
import com.instructure.student.mobius.settings.pairobserver.ui.PairObserverFragment
import dagger.hilt.android.AndroidEntryPoint
import kotlinx.coroutines.launch
@@ -112,7 +112,7 @@ class ApplicationSettingsFragment : ParentFragment() {
accountPreferences.onClick { addFragment(AccountPreferencesFragment.newInstance()) }
}
- legal.onClickWithRequireNetwork { LegalDialogStyled().show(requireFragmentManager(), LegalDialogStyled.TAG) }
+ legal.onClickWithRequireNetwork { LegalDialogFragment().show(requireFragmentManager(), null) }
pinAndFingerprint.setGone() // TODO: Wire up once implemented
if (ApiPrefs.canGeneratePairingCode == true) {
diff --git a/apps/student/src/main/java/com/instructure/student/fragment/CalendarEventFragment.kt b/apps/student/src/main/java/com/instructure/student/fragment/CalendarEventFragment.kt
deleted file mode 100644
index 17834112be..0000000000
--- a/apps/student/src/main/java/com/instructure/student/fragment/CalendarEventFragment.kt
+++ /dev/null
@@ -1,319 +0,0 @@
-/*
- * Copyright (C) 2016 - 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 .
- *
- */
-
-package com.instructure.student.fragment
-
-import android.graphics.Color
-import android.graphics.drawable.ColorDrawable
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.MenuItem
-import android.view.View
-import android.view.ViewGroup
-import android.webkit.WebView
-import androidx.appcompat.app.AlertDialog
-import androidx.appcompat.app.AppCompatDialog
-import androidx.core.content.ContextCompat
-import com.instructure.canvasapi2.StatusCallback
-import com.instructure.canvasapi2.managers.CalendarEventManager
-import com.instructure.canvasapi2.models.CanvasContext
-import com.instructure.canvasapi2.models.ScheduleItem
-import com.instructure.canvasapi2.utils.*
-import com.instructure.interactions.router.Route
-import com.instructure.pandautils.analytics.SCREEN_VIEW_CALENDAR_EVENT
-import com.instructure.pandautils.analytics.ScreenView
-import com.instructure.pandautils.binding.viewBinding
-import com.instructure.pandautils.utils.*
-import com.instructure.pandautils.views.CanvasWebView
-import com.instructure.student.R
-import com.instructure.student.databinding.FragmentCalendarEventBinding
-import com.instructure.student.flutterChannels.FlutterComm
-import com.instructure.student.router.RouteMatcher
-import kotlinx.coroutines.Job
-import org.greenrobot.eventbus.EventBus
-import org.greenrobot.eventbus.Subscribe
-import org.greenrobot.eventbus.ThreadMode
-import retrofit2.Response
-import java.util.*
-
-@ScreenView(SCREEN_VIEW_CALENDAR_EVENT)
-class CalendarEventFragment : ParentFragment() {
-
- private val binding by viewBinding(FragmentCalendarEventBinding::bind)
-
- // Bundle args
- var canvasContext: CanvasContext by ParcelableArg(key = Const.CANVAS_CONTEXT)
- private var scheduleItem: ScheduleItem? by NullableParcelableArg(key = SCHEDULE_ITEM)
- private var scheduleItemId: Long by LongArg(default = -1, key = SCHEDULE_ITEM_ID)
-
- private lateinit var scheduleItemCallback: StatusCallback
- private lateinit var deleteItemCallback: StatusCallback
-
- private var loadHtmlJob: Job? = null
-
- //region Fragment Lifecycle Overrides
- override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? =
- inflater.inflate(R.layout.fragment_calendar_event, container, false)
-
- override fun onActivityCreated(savedInstanceState: Bundle?) {
- super.onActivityCreated(savedInstanceState)
- setUpCallback()
- if (scheduleItem == null) {
- CalendarEventManager.getCalendarEvent(scheduleItemId, scheduleItemCallback, true)
- } else {
- initViews()
- }
- }
-
- override fun onStart() {
- super.onStart()
- EventBus.getDefault().register(this)
-
- if (isTablet) return // No styling for tablet
- dialog?.let {
- it.window?.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
- it.window?.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT)
- }
- }
-
- override fun onResume() {
- super.onResume()
- binding.calendarEventLayout.calendarEventWebViewWrapper.webView.onResume()
- }
-
- override fun onPause() {
- super.onPause()
- binding.calendarEventLayout.calendarEventWebViewWrapper.webView.onPause()
- }
-
- override fun onStop() {
- super.onStop()
- EventBus.getDefault().unregister(this)
- }
-
- override fun onDestroyView() {
- super.onDestroyView()
- loadHtmlJob?.cancel()
- }
-
- //endregion
-
- //region Fragment Interaction Overrides
- override fun applyTheme() = with(binding) {
- if (scheduleItem?.contextId ?: canvasContext.id == ApiPrefs.user?.id) {
- setupToolbarMenu(toolbar, R.menu.calendar_event_menu)
- }
-
- toolbar.setupAsBackButtonAsBackPressedOnly(this@CalendarEventFragment)
- ViewStyler.themeToolbarColored(requireActivity(), toolbar, canvasContext)
- }
-
- override fun title(): String = scheduleItem?.title ?: getString(R.string.Event)
- //endregion
-
- //region Parent Fragment Overrides
- override fun handleBackPressed(): Boolean = binding.calendarEventLayout.calendarEventWebViewWrapper.webView.handleGoBack()
- ?: super.handleBackPressed()
-
- override fun onOptionsItemSelected(item: MenuItem): Boolean =
- when (item.itemId) {
- R.id.menu_delete -> {
- if (!APIHelper.hasNetworkConnection()) {
- toast(R.string.notAvailableOffline)
- } else {
- deleteEvent()
- }
- true
- }
- else -> super.onOptionsItemSelected(item)
- }
- //endregion
-
- //region Bus Events
- @Suppress("unused")
- @Subscribe(threadMode = ThreadMode.MAIN)
- fun onBackStackChangedEvent(event: OnBackStackChangedEvent) {
- event.get { clazz ->
- if (clazz != null && clazz.isAssignableFrom(CalendarEventFragment::class.java)) {
- binding.calendarEventLayout.calendarEventWebViewWrapper?.webView?.onResume()
- } else {
- binding.calendarEventLayout.calendarEventWebViewWrapper?.webView?.onPause()
- }
- }
- }
- //endregion
-
- //region Setup
- private fun initViews() {
- with (binding.calendarEventLayout.calendarEventWebViewWrapper.webView) {
- addVideoClient(requireActivity())
- canvasEmbeddedWebViewCallback = object : CanvasWebView.CanvasEmbeddedWebViewCallback {
- override fun launchInternalWebViewFragment(url: String) = RouteMatcher.route(requireActivity(), InternalWebviewFragment.makeRoute(canvasContext, url, false))
- override fun shouldLaunchInternalWebViewFragment(url: String): Boolean = true
- }
-
- canvasWebViewClientCallback = object : CanvasWebView.CanvasWebViewClientCallback {
- override fun openMediaFromWebView(mime: String, url: String, filename: String) = openMedia(mime, url, filename, canvasContext)
- override fun onPageStartedCallback(webView: WebView, url: String) = Unit
- override fun onPageFinishedCallback(webView: WebView, url: String) = Unit
-
- override fun canRouteInternallyDelegate(url: String): Boolean = RouteMatcher.canRouteInternally(requireActivity(), url, ApiPrefs.domain, false)
-
- override fun routeInternallyCallback(url: String) {
- RouteMatcher.canRouteInternally(requireActivity(), url, ApiPrefs.domain, true)
- }
- }
- }
-
- populateViews()
- }
-
- private fun populateViews() = with(binding.calendarEventLayout) {
- scheduleItem?.let {
- binding.toolbar.title = title()
- val content: String? = it.description
-
- calendarView.setVisible()
- calendarEventWebViewWrapper.setGone()
-
- if (it.isAllDay) {
- date1.text = getString(R.string.allDayEvent)
- date2.text = getFullDateString(it.endDate)
- } else {
- // Setup the calendar event start/end times
- if (it.startDate != null && it.endDate != null) {
- // Our date times are different so we display two strings
- date1.text = getFullDateString(it.endDate)
- val startTime = DateHelper.getFormattedTime(context, it.startDate)
- val endTime = DateHelper.getFormattedTime(context, it.endDate)
-
- val isTimeIntervalEvent = (it.startDate?.time != it.endDate?.time)
- date2.text = if (isTimeIntervalEvent) "$startTime - $endTime" else startTime
- } else {
- date1.text = getFullDateString(it.startDate)
- date2.setInvisible()
- }
- }
-
- val noLocationTitle = it.locationName.isNullOrBlank()
- val noLocation = it.locationAddress.isNullOrBlank()
-
- if (noLocation && noLocationTitle) {
- address1.text = getString(R.string.noLocation)
- address2.setInvisible()
- } else {
- if (noLocationTitle) {
- address1.text = it.locationAddress
- } else {
- address1.text = it.locationName
- address2.text = it.locationAddress
- }
- }
-
- if (content?.isNotEmpty() == true) {
- loadHtmlJob = calendarEventWebViewWrapper?.webView?.loadHtmlWithIframes(requireContext(), content, { html ->
- loadCalendarHtml(html, it.title)
- }) { url ->
- LtiLaunchFragment.routeLtiLaunchFragment(requireActivity(), canvasContext, url)
- }
- }
- }
- }
-
- private fun loadCalendarHtml(html: String, contentDescription: String?) {
- binding.calendarEventLayout.calendarEventWebViewWrapper.apply {
- setVisible()
- setBackgroundColor(ContextCompat.getColor(requireContext(), R.color.backgroundLightest))
- loadHtml(html, contentDescription, baseUrl = scheduleItem?.htmlUrl)
- }
- }
-
- private fun setUpCallback() {
- scheduleItemCallback = object : StatusCallback() {
- override fun onResponse(response: Response, linkHeaders: LinkHeaders, type: ApiType) {
- if (!isAdded) return
- if (response.body() != null) {
- scheduleItem = response.body() as ScheduleItem
- initViews()
- }
- }
- }
-
- deleteItemCallback = object : StatusCallback() {
- override fun onResponse(response: Response, linkHeaders: LinkHeaders, type: ApiType) {
- if (!isAdded) {
- return
- }
-
- toast(R.string.eventSuccessfulDeletion)
- response.body()?.let {
- FlutterComm.updateCalendarDates(listOf(it.allDayDate, it.startDate, it.endDate))
- }
- requireActivity().onBackPressed()
- }
- }
- }
- //endregion
-
- //region Functionality
- private fun getFullDateString(date: Date?): String {
- if (scheduleItem == null || date == null) {
- return ""
- }
-
- val dayOfWeek = DateHelper.fullDayFormat.format(date)
- val dateString = DateHelper.getFormattedDate(requireContext(), date)
-
- return "$dayOfWeek $dateString"
- }
-
- private fun deleteEvent() {
- val dialog = AlertDialog.Builder(requireContext())
- .setMessage(getString(R.string.confirmDeleteEvent))
- .setNegativeButton(R.string.cancel, null)
- .setPositiveButton(R.string.delete) { _, _ ->
- CalendarEventManager.deleteCalendarEvent(scheduleItem!!.id, "", deleteItemCallback)
- }
- .create()
- dialog.setOnShowListener {
- dialog.getButton(AppCompatDialog.BUTTON_POSITIVE).setTextColor(ThemePrefs.textButtonColor)
- dialog.getButton(AppCompatDialog.BUTTON_NEGATIVE).setTextColor(ThemePrefs.textButtonColor)
- }
- dialog.show()
- }
- //endregion
-
- companion object {
-
- const val SCHEDULE_ITEM = "schedule_item"
- const val SCHEDULE_ITEM_ID = "schedule_item_id"
-
- fun makeRoute(canvasContext: CanvasContext, scheduleItem: ScheduleItem): Route =
- Route(null, CalendarEventFragment::class.java, canvasContext, canvasContext.makeBundle { putParcelable(SCHEDULE_ITEM, scheduleItem) })
-
- fun makeRoute(canvasContext: CanvasContext, scheduleItemId: Long): Route =
- Route(null, CalendarEventFragment::class.java, canvasContext, canvasContext.makeBundle { putLong(SCHEDULE_ITEM_ID, scheduleItemId) })
-
- fun newInstance(route: Route): CalendarEventFragment? =
- if (validRoute(route)) CalendarEventFragment().apply {
- arguments = route.arguments
- } else null
-
- private fun validRoute(route: Route): Boolean = route.canvasContext != null &&
- (route.arguments.containsKey(SCHEDULE_ITEM) || route.arguments.containsKey(SCHEDULE_ITEM_ID))
- }
-}
diff --git a/apps/student/src/main/java/com/instructure/student/fragment/CalendarFragment.kt b/apps/student/src/main/java/com/instructure/student/fragment/CalendarFragment.kt
deleted file mode 100644
index 0c3c583351..0000000000
--- a/apps/student/src/main/java/com/instructure/student/fragment/CalendarFragment.kt
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Copyright (C) 2020 - 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 .
- *
- */
-
-package com.instructure.student.fragment
-
-import android.graphics.Color
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.appcompat.app.AlertDialog
-import com.instructure.canvasapi2.models.PlannableType
-import com.instructure.canvasapi2.models.PlannerItem
-import com.instructure.canvasapi2.utils.ApiPrefs
-import com.instructure.canvasapi2.utils.pageview.PageView
-import com.instructure.interactions.router.Route
-import com.instructure.pandautils.analytics.SCREEN_VIEW_CALENDAR
-import com.instructure.pandautils.analytics.ScreenView
-import com.instructure.pandautils.features.discussion.router.DiscussionRouterFragment
-import com.instructure.pandautils.utils.ThemePrefs
-import com.instructure.pandautils.utils.ViewStyler
-import com.instructure.student.R
-import com.instructure.student.activity.NavigationActivity
-import com.instructure.student.features.assignments.details.AssignmentDetailsFragment
-import com.instructure.student.flutterChannels.FlutterComm
-import com.instructure.student.router.RouteMatcher
-import io.flutter.plugin.common.MethodCall
-import io.flutter.plugin.common.MethodChannel
-
-@ScreenView(SCREEN_VIEW_CALENDAR)
-@PageView(url = "calendar")
-class CalendarFragment : ParentFragment() {
- override fun title() = getString(R.string.calendar)
-
- override fun applyTheme() {
- val color = FlutterComm.statusBarColor.takeUnless { it == 0 } ?: ThemePrefs.primaryColor
- if (color == Color.WHITE) {
- ViewStyler.setStatusBarLight(requireActivity())
- } else {
- ViewStyler.setStatusBarDark(requireActivity(), color)
- }
- }
-
- override fun onHiddenChanged(hidden: Boolean) {
- flutterFragment?.onHiddenChanged(hidden)
- }
-
- override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
- return inflater.inflate(R.layout.fragment_calendar, container, false)
- }
-
- override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
- flutterFragment?.calendarScreenChannel?.let { setupChannelCallbacks(it) }
- super.onViewCreated(view, savedInstanceState)
- }
-
- private fun setupChannelCallbacks(channel: CalendarScreenChannel) {
- channel.onRouteToItem = ::routeToItem
- channel.onOpenDrawer = ::openDrawer
- channel.onShowDialog = ::showDialog
- }
-
- private fun openDrawer() {
- (navigation as? NavigationActivity?)?.openNavigationDrawer()
- }
-
- private fun routeToItem(item: PlannerItem) {
- val route: Route? = when (item.plannableType) {
- PlannableType.ASSIGNMENT -> {
- AssignmentDetailsFragment.makeRoute(item.canvasContext, item.plannable.id)
- }
- PlannableType.DISCUSSION_TOPIC -> {
- DiscussionRouterFragment.makeRoute(item.canvasContext, item.plannable.id)
- }
- PlannableType.QUIZ -> {
- if (item.plannable.assignmentId != null) {
- // This is a quiz assignment, go to the assignment page
- AssignmentDetailsFragment.makeRoute(item.canvasContext, item.plannable.assignmentId!!)
- } else {
- var htmlUrl = item.htmlUrl.orEmpty()
- if (htmlUrl.startsWith('/')) htmlUrl = ApiPrefs.fullDomain + htmlUrl
- if (!RouteMatcher.canRouteInternally(requireActivity(), htmlUrl, ApiPrefs.domain, true)) {
- BasicQuizViewFragment.makeRoute(item.canvasContext, htmlUrl)
- } else null
- }
- }
- PlannableType.CALENDAR_EVENT -> {
- CalendarEventFragment.makeRoute(item.canvasContext, item.plannable.id)
- }
- else -> {
- // This is a type that we don't handle - do nothing
- null
- }
- }
-
- route?.let { RouteMatcher.route(requireActivity(), it) }
- }
-
- private fun showDialog(call: MethodCall, result: MethodChannel.Result) {
- AlertDialog.Builder(requireActivity(), R.style.AccentDialogTheme)
- .setTitle(call.argument("title"))
- .setMessage(call.argument("message"))
- .setPositiveButton(call.argument("positiveButtonText")) { _, _ -> result.success(true) }
- .setNegativeButton(call.argument("negativeButtonText")) { _, _ -> result.success(false) }
- .create()
- .show()
- }
-
- override fun handleBackPressed(): Boolean = flutterFragment?.handleBackPressed() ?: false
-
- private val flutterFragment: FlutterCalendarFragment?
- get() = (childFragmentManager.findFragmentById(R.id.flutter_calendar_fragment) as? FlutterCalendarFragment?)
-
- companion object {
- fun newInstance(route: Route) = if (validRoute(route)) CalendarFragment() else null
-
- private fun validRoute(route: Route) = route.primaryClass == CalendarFragment::class.java
-
- fun makeRoute() = Route(CalendarFragment::class.java, null)
- }
-}
diff --git a/apps/student/src/main/java/com/instructure/student/fragment/DashboardFragment.kt b/apps/student/src/main/java/com/instructure/student/fragment/DashboardFragment.kt
index 9498e39d20..639c20e74c 100644
--- a/apps/student/src/main/java/com/instructure/student/fragment/DashboardFragment.kt
+++ b/apps/student/src/main/java/com/instructure/student/fragment/DashboardFragment.kt
@@ -69,7 +69,6 @@ import com.instructure.student.events.CourseColorOverlayToggledEvent
import com.instructure.student.events.ShowGradesToggledEvent
import com.instructure.student.features.coursebrowser.CourseBrowserFragment
import com.instructure.student.features.dashboard.DashboardRepository
-import com.instructure.student.flutterChannels.FlutterComm
import com.instructure.student.holders.CourseViewHolder
import com.instructure.student.interfaces.CourseAdapterToFragmentCallback
import com.instructure.student.router.RouteMatcher
@@ -215,7 +214,6 @@ class DashboardFragment : ParentFragment() {
tryWeave {
awaitApi { UserManager.setColors(it, course.contextId, color) }
ColorKeeper.addToCache(course.contextId, color)
- FlutterComm.sendUpdatedTheme()
recyclerAdapter?.notifyDataSetChanged()
} catch {
toast(R.string.colorPickerError)
diff --git a/apps/student/src/main/java/com/instructure/student/fragment/FlutterCalendarFragment.kt b/apps/student/src/main/java/com/instructure/student/fragment/FlutterCalendarFragment.kt
deleted file mode 100644
index c2ecc80e5c..0000000000
--- a/apps/student/src/main/java/com/instructure/student/fragment/FlutterCalendarFragment.kt
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * Copyright (C) 2020 - 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 .
- *
- */
-
-package com.instructure.student.fragment
-
-import android.content.Context
-import android.os.Bundle
-import androidx.fragment.app.Fragment
-import com.google.gson.Gson
-import com.instructure.canvasapi2.models.PlannerItem
-import com.instructure.student.flutterChannels.FlutterComm
-import com.instructure.student.util.BaseAppManager
-import io.flutter.embedding.android.FlutterFragment
-import io.flutter.embedding.android.FlutterView
-import io.flutter.embedding.android.RenderMode
-import io.flutter.embedding.engine.FlutterEngine
-import io.flutter.plugin.common.MethodCall
-import io.flutter.plugin.common.MethodChannel
-import java.util.*
-
-class FlutterCalendarFragment : FlutterFragment() {
- var calendarScreenChannel = CalendarScreenChannel()
- var hidden: Boolean = false
-
- override fun provideFlutterEngine(context: Context): FlutterEngine? = BaseAppManager.flutterEngine
-
- // Use texture mode instead of surface mode so the FlutterView doesn't render on top of the nav drawer and a11y borders
- override fun getRenderMode() = RenderMode.texture
-
- override fun onActivityCreated(savedInstanceState: Bundle?) {
- FlutterComm.routeToCalendar(calendarScreenChannel.channelId)
- super.onActivityCreated(savedInstanceState)
- }
-
- override fun onStart() {
- /* If there are multiple calendar fragments in the back stack, backgrounding and resuming the app
- will cause onStart and onResume to be called for all of them, causing each fragment's Flutter delegate
- to attempt to re-attach to the flutter engine nearly simultaneously. This places all but the top FlutterView
- into an invalid state where the view thinks it is attached, but is not.
-
- Because of this, subsequent calls to attach (triggered via onHiddenChanged) will be skipped and navigating
- back to previous fragments will result in a white screen. To work around this, we will only make the super
- call to onStart/onResume if this fragment not currently hidden. */
- if (hidden) skipLifecycleCall() else super.onStart()
- }
-
- override fun onResume() {
- // See comments in onStart
- if (hidden) skipLifecycleCall() else super.onResume()
- }
-
- /**
- * Fakes a super call to a lifecycle method by setting 'mCalled' to true, allowing us to skip the side effects
- * of the super call while also avoiding a SuperNotCalledException.
- */
- private fun skipLifecycleCall() {
- val field = Fragment::class.java.getDeclaredField("mCalled")
- field.isAccessible = true
- field.set(this, true)
- }
-
- override fun onHiddenChanged(hidden: Boolean) {
- this.hidden = hidden
- // Workaround for an issue where the engine does not re-attach after additional FlutterCalendarFragments have been added and removed
- val field = FlutterFragment::class.java.getDeclaredField("delegate")
- field.isAccessible = true
- val delegate = field.get(this)
-
- val resuming = !hidden
-
- fun getFlutterView(): FlutterView {
- val flutterViewField = delegate::class.java.getDeclaredField("flutterView")
- flutterViewField.isAccessible = true
- return flutterViewField.get(delegate) as FlutterView
- }
-
- if (resuming) getFlutterView().attachToFlutterEngine(BaseAppManager.flutterEngine)
-
- val lifecycle1 = delegate::class.java.getDeclaredMethod(if (resuming) "onStart" else "onPause")
- lifecycle1.isAccessible = true
- lifecycle1.invoke(delegate)
-
- val lifecycle2 = delegate::class.java.getDeclaredMethod(if (resuming) "onResume" else "onStop")
- lifecycle2.isAccessible = true
- lifecycle2.invoke(delegate)
-
- if (!resuming) getFlutterView().detachFromFlutterEngine()
- }
-
- fun handleBackPressed(): Boolean {
- // Get the current 'shouldPop' value. For now it is expected that 'shouldPop' will only be true if the
- // current Flutter route is a CalendarScreen.
- val shouldPop = FlutterComm.shouldPop
-
- // Perform onBackPressed on the FlutterFragment, which will attempt to pop the current route and update
- // the 'shouldPop' value for future use.
- if (!shouldPop) {
- onBackPressed()
- }
-
- // If 'shouldPop' was true it means we just popped a CalendarScreen in Flutter and that we should also
- // allow this fragment to be popped
- return !shouldPop
- }
-
- override fun onDestroyView() {
- super.onDestroyView()
- calendarScreenChannel.dispose()
- }
-}
-
-class CalendarScreenChannel {
- val channelId: String = UUID.randomUUID().toString()
- private val channel = MethodChannel(BaseAppManager.flutterEngine.dartExecutor.binaryMessenger, channelId)
-
- var onRouteToItem: ((item: PlannerItem) -> Unit)? = null
-
- var onOpenDrawer: (() -> Unit)? = null
-
- var onShowDialog: ((call: MethodCall, result: MethodChannel.Result) -> Unit)? = null
-
- init {
- channel.setMethodCallHandler { call: MethodCall, result: MethodChannel.Result ->
- when (call.method) {
- "openDrawer" -> onOpenDrawer?.invoke()
- "routeToItem" -> {
- val item = Gson().fromJson(call.arguments as String, PlannerItem::class.java)
- onRouteToItem?.invoke(item)
- }
- "showDialog" -> onShowDialog?.invoke(call, result)
- }
- }
- }
-
- fun dispose() {
- channel.setMethodCallHandler(null)
- }
-}
diff --git a/apps/student/src/main/java/com/instructure/student/fragment/InternalWebviewFragment.kt b/apps/student/src/main/java/com/instructure/student/fragment/InternalWebviewFragment.kt
index 0675d6fa6d..6ed6c3cff0 100644
--- a/apps/student/src/main/java/com/instructure/student/fragment/InternalWebviewFragment.kt
+++ b/apps/student/src/main/java/com/instructure/student/fragment/InternalWebviewFragment.kt
@@ -77,9 +77,6 @@ open class InternalWebviewFragment : ParentFragment() {
var hideToolbar: Boolean by BooleanArg(key = Const.HIDDEN_TOOLBAR)
- // Used for external urls that reject the candroid user agent string
- var originalUserAgentString: String = ""
-
/*
* Our router has some catch-all routes which open the UnsupportedFeatureFragment for urls that match the user's
* domain but don't match any other internal routes. In some cases, such as viewing an HTML file preview, we need to
@@ -112,8 +109,6 @@ open class InternalWebviewFragment : ParentFragment() {
override fun onViewCreated(view: View, savedInstanceState: Bundle?) = with(binding) {
super.onViewCreated(view, savedInstanceState)
canvasWebViewWrapper.webView.settings.loadWithOverviewMode = true
- originalUserAgentString = canvasWebViewWrapper.webView.settings.userAgentString
- canvasWebViewWrapper.webView.settings.userAgentString = ApiPrefs.userAgent
canvasWebViewWrapper.webView.setInitialScale(100)
webViewLoading.setVisible(true)
@@ -395,9 +390,6 @@ open class InternalWebviewFragment : ParentFragment() {
} catch (e: StatusCallbackError) {
e.printStackTrace()
}
- } else {
- // External URL, use the non-Canvas specific user agent string
- binding.canvasWebViewWrapper.webView.settings.userAgentString = originalUserAgentString
}
if (getIsUnsupportedFeature()) {
diff --git a/apps/student/src/main/java/com/instructure/student/fragment/StudioWebViewFragment.kt b/apps/student/src/main/java/com/instructure/student/fragment/StudioWebViewFragment.kt
index 7cd4b3bf2f..f092a5661f 100644
--- a/apps/student/src/main/java/com/instructure/student/fragment/StudioWebViewFragment.kt
+++ b/apps/student/src/main/java/com/instructure/student/fragment/StudioWebViewFragment.kt
@@ -31,18 +31,30 @@ import com.instructure.canvasapi2.utils.ApiPrefs
import com.instructure.interactions.router.Route
import com.instructure.pandautils.analytics.SCREEN_VIEW_STUDIO_WEB_VIEW
import com.instructure.pandautils.analytics.ScreenView
-import com.instructure.pandautils.utils.*
+import com.instructure.pandautils.utils.Const
+import com.instructure.pandautils.utils.LongArg
+import com.instructure.pandautils.utils.PermissionUtils
+import com.instructure.pandautils.utils.StringArg
+import com.instructure.pandautils.utils.enableAlgorithmicDarkening
+import com.instructure.pandautils.utils.getFragmentActivity
+import com.instructure.pandautils.utils.makeBundle
import com.instructure.pandautils.views.CanvasWebView
import com.instructure.student.R
-import com.instructure.student.mobius.common.ui.SubmissionService
+import com.instructure.student.mobius.common.ui.SubmissionHelper
import com.instructure.student.router.RouteMatcher
+import dagger.hilt.android.AndroidEntryPoint
import org.apache.commons.text.StringEscapeUtils
+import javax.inject.Inject
@ScreenView(SCREEN_VIEW_STUDIO_WEB_VIEW)
+@AndroidEntryPoint
class StudioWebViewFragment : InternalWebviewFragment() {
val assignmentId: Long by LongArg(key = Const.ASSIGNMENT_ID)
val assignmentName: String by StringArg(key = Const.ASSIGNMENT_NAME)
+ @Inject
+ lateinit var submissionHelper: SubmissionHelper
+
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
shouldRouteInternally = false
@@ -86,7 +98,7 @@ class StudioWebViewFragment : InternalWebviewFragment() {
}
override fun permissionsGranted(): Boolean {
- return if (PermissionUtils.hasPermissions(requireActivity(), *PermissionUtils.makeArray(PermissionUtils.WRITE_EXTERNAL_STORAGE))) {
+ return if (PermissionUtils.hasPermissions(requireActivity().getFragmentActivity(), *PermissionUtils.makeArray(PermissionUtils.WRITE_EXTERNAL_STORAGE, PermissionUtils.CAMERA))) {
true
} else {
requestFilePermissions()
@@ -111,7 +123,7 @@ class StudioWebViewFragment : InternalWebviewFragment() {
@TargetApi(Build.VERSION_CODES.LOLLIPOP)
private fun requestFilePermissions() {
- requestPermissions(PermissionUtils.makeArray(PermissionUtils.WRITE_EXTERNAL_STORAGE, PermissionUtils.CAMERA), PermissionUtils.PERMISSION_REQUEST_CODE)
+ requireContext().getFragmentActivity().requestPermissions(PermissionUtils.makeArray(PermissionUtils.WRITE_EXTERNAL_STORAGE, PermissionUtils.CAMERA), PermissionUtils.PERMISSION_REQUEST_CODE)
}
override fun onRequestPermissionsResult(requestCode: Int, permissions: Array, grantResults: IntArray) {
@@ -134,7 +146,7 @@ class StudioWebViewFragment : InternalWebviewFragment() {
url = StringEscapeUtils.unescapeJava(url)
// Upload the url as a submission
- SubmissionService.startStudioSubmission(requireContext(), canvasContext, assignmentId, assignmentName, url)
+ submissionHelper.startStudioSubmission(canvasContext, assignmentId, assignmentName, url)
// Close this page
navigation?.popCurrentFragment()
diff --git a/apps/student/src/main/java/com/instructure/student/fragment/ToDoListFragment.kt b/apps/student/src/main/java/com/instructure/student/fragment/ToDoListFragment.kt
index e223a0b533..c33c395596 100644
--- a/apps/student/src/main/java/com/instructure/student/fragment/ToDoListFragment.kt
+++ b/apps/student/src/main/java/com/instructure/student/fragment/ToDoListFragment.kt
@@ -32,8 +32,18 @@ import com.instructure.interactions.router.Route
import com.instructure.pandautils.analytics.SCREEN_VIEW_TO_DO_LIST
import com.instructure.pandautils.analytics.ScreenView
import com.instructure.pandautils.binding.viewBinding
+import com.instructure.pandautils.features.calendarevent.details.EventFragment
import com.instructure.pandautils.features.discussion.router.DiscussionRouterFragment
-import com.instructure.pandautils.utils.*
+import com.instructure.pandautils.utils.Const
+import com.instructure.pandautils.utils.ParcelableArg
+import com.instructure.pandautils.utils.ThemePrefs
+import com.instructure.pandautils.utils.ViewStyler
+import com.instructure.pandautils.utils.children
+import com.instructure.pandautils.utils.isTablet
+import com.instructure.pandautils.utils.makeBundle
+import com.instructure.pandautils.utils.setGone
+import com.instructure.pandautils.utils.setVisible
+import com.instructure.pandautils.utils.withArgs
import com.instructure.student.R
import com.instructure.student.adapter.TodoListRecyclerAdapter
import com.instructure.student.databinding.FragmentListTodoBinding
@@ -178,7 +188,7 @@ class ToDoListFragment : ParentFragment() {
}
}
toDo?.scheduleItem != null -> // It's a Calendar event from the Upcoming API.
- RouteMatcher.route(requireActivity(), CalendarEventFragment.makeRoute(toDo.canvasContext!!, toDo.scheduleItem!!))
+ RouteMatcher.route(requireActivity(), EventFragment.makeRoute(toDo.canvasContext!!, toDo.scheduleItem!!))
toDo?.quiz != null -> // It's a Quiz let's launch the quiz details fragment
RouteMatcher.route(requireActivity(), BasicQuizViewFragment.makeRoute(toDo.canvasContext!!, toDo.quiz!!, toDo.quiz!!.url!!))
}
diff --git a/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/SubmissionUtils.kt b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/SubmissionUtils.kt
index 696a40b0a8..c8c5f28f96 100644
--- a/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/SubmissionUtils.kt
+++ b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/SubmissionUtils.kt
@@ -30,11 +30,12 @@ import com.instructure.pandautils.utils.PermissionUtils
import com.instructure.pandautils.utils.requestPermissions
import com.instructure.student.mobius.assignmentDetails.submissionDetails.ui.SubmissionTypesVisibilities
import com.instructure.student.mobius.common.ConsumerQueueWrapper
-import com.instructure.student.mobius.common.ui.SubmissionService
+import com.instructure.student.mobius.common.ui.SubmissionHelper
import java.io.File
import java.text.DateFormat
import java.text.SimpleDateFormat
-import java.util.*
+import java.util.Date
+import java.util.Locale
fun Uri?.getVideoIntent(): Intent? = Intent(MediaStore.ACTION_VIDEO_CAPTURE).apply {
addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
@@ -100,9 +101,8 @@ fun Context.needsPermissions(successCallback: () -> Unit, failureCallback: () ->
return true
}
-fun uploadAudioRecording(context: Context, file: File, assignment: Assignment, course: Course) {
- SubmissionService.startMediaSubmission(
- context = context,
+fun uploadAudioRecording(submissionHelper: SubmissionHelper, file: File, assignment: Assignment, course: Course) {
+ submissionHelper.startMediaSubmission(
canvasContext = course,
assignmentId = assignment.id,
assignmentGroupCategoryId = assignment.groupCategoryId,
diff --git a/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/annnotation/AnnotationSubmissionUploadFragment.kt b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/annnotation/AnnotationSubmissionUploadFragment.kt
index d3e2e49510..874e628b38 100644
--- a/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/annnotation/AnnotationSubmissionUploadFragment.kt
+++ b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/annnotation/AnnotationSubmissionUploadFragment.kt
@@ -25,16 +25,27 @@ import androidx.fragment.app.Fragment
import androidx.fragment.app.viewModels
import com.instructure.canvasapi2.models.CanvasContext
import com.instructure.interactions.router.Route
-import com.instructure.pandautils.utils.*
+import com.instructure.pandautils.utils.Const
+import com.instructure.pandautils.utils.LongArg
+import com.instructure.pandautils.utils.ParcelableArg
+import com.instructure.pandautils.utils.StringArg
+import com.instructure.pandautils.utils.ViewStyler
+import com.instructure.pandautils.utils.setMenu
+import com.instructure.pandautils.utils.setupAsBackButton
+import com.instructure.pandautils.utils.withArgs
import com.instructure.student.R
import com.instructure.student.databinding.FragmentAnnotationSubmissionUploadBinding
import com.instructure.student.mobius.assignmentDetails.submissionDetails.content.PdfStudentSubmissionView
-import com.instructure.student.mobius.common.ui.SubmissionService
+import com.instructure.student.mobius.common.ui.SubmissionHelper
import dagger.hilt.android.AndroidEntryPoint
+import javax.inject.Inject
@AndroidEntryPoint
class AnnotationSubmissionUploadFragment : Fragment() {
+ @Inject
+ lateinit var submissionHelper: SubmissionHelper
+
private var submissionId by LongArg(key = SUBMISSION_ID)
private var annotatableAttachmentId by LongArg(key = ANNOTATABLE_ATTACHMENT_ID)
private var assignmentId by LongArg(key = Const.ASSIGNMENT_ID)
@@ -71,7 +82,7 @@ class AnnotationSubmissionUploadFragment : Fragment() {
toolbar.setMenu(R.menu.menu_submit_generic) {
when (it.itemId) {
R.id.menuSubmit -> {
- SubmissionService.startStudentAnnotationSubmission(requireContext(), canvasContext, assignmentId, assignmentName, annotatableAttachmentId)
+ submissionHelper.startStudentAnnotationSubmission(canvasContext, assignmentId, assignmentName, annotatableAttachmentId)
requireActivity().onBackPressed()
}
}
diff --git a/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/file/UploadStatusSubmissionEffectHandler.kt b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/file/UploadStatusSubmissionEffectHandler.kt
index 1d52831460..ee449d3e53 100644
--- a/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/file/UploadStatusSubmissionEffectHandler.kt
+++ b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/file/UploadStatusSubmissionEffectHandler.kt
@@ -16,31 +16,24 @@
*/
package com.instructure.student.mobius.assignmentDetails.submission.file
-import android.content.BroadcastReceiver
import android.content.Context
-import android.content.Intent
-import android.content.IntentFilter
import com.instructure.canvasapi2.utils.exhaustive
-import com.instructure.pandautils.utils.Const
-import com.instructure.student.FileSubmission
-import com.instructure.student.db.Db
-import com.instructure.student.db.getInstance
import com.instructure.student.mobius.assignmentDetails.submission.file.ui.UploadStatusSubmissionView
import com.instructure.student.mobius.common.ui.EffectHandler
-import com.instructure.student.mobius.common.ui.SubmissionService
-import com.spotify.mobius.Connection
-import com.spotify.mobius.functions.Consumer
+import com.instructure.student.mobius.common.ui.SubmissionHelper
+import com.instructure.student.room.StudentDb
+import com.instructure.student.room.entities.CreateFileSubmissionEntity
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
-class UploadStatusSubmissionEffectHandler(val context: Context, val submissionId: Long) :
+class UploadStatusSubmissionEffectHandler(val submissionId: Long, val submissionHelper: SubmissionHelper, val studentDb: StudentDb) :
EffectHandler() {
override fun accept(effect: UploadStatusSubmissionEffect) {
when (effect) {
is UploadStatusSubmissionEffect.LoadPersistedFiles -> {
launch(Dispatchers.Main) {
- val (name, error, files) = loadPersistedData(effect.submissionId, context)
+ val (name, error, files) = loadPersistedData(effect.submissionId)
consumer.accept(
UploadStatusSubmissionEvent.OnPersistedSubmissionLoaded(name, error, files)
)
@@ -61,33 +54,29 @@ class UploadStatusSubmissionEffectHandler(val context: Context, val submissionId
}.exhaustive
}
- private fun loadPersistedData(
+ private suspend fun loadPersistedData(
submissionId: Long,
- context: Context
- ): Triple> {
+ ): Triple> {
// If we can't find the submissionId, it was successful and was deleted from the database
val successSubmission =
- Triple>(null, false, emptyList())
+ Triple>(null, false, emptyList())
- val db = Db.getInstance(context)
- val submission = db.submissionQueries.getSubmissionById(submissionId).executeAsOneOrNull()
+ val submission = studentDb.submissionDao().findSubmissionById(submissionId)
?: return successSubmission
- val files = db.fileSubmissionQueries.getFilesForSubmissionId(submissionId).executeAsList()
+ val files = studentDb.fileSubmissionDao().findFilesForSubmissionId(submissionId)
return Triple(submission.assignmentName, submission.errorFlag, files)
}
- private fun deleteSubmission(submissionId: Long) {
- val db = Db.getInstance(context)
- db.fileSubmissionQueries.deleteFilesForSubmissionId(submissionId)
- db.submissionQueries.deleteSubmissionById(submissionId)
+ private suspend fun deleteSubmission(submissionId: Long) {
+ studentDb.fileSubmissionDao().deleteFilesForSubmissionId(submissionId)
+ studentDb.submissionDao().deleteSubmissionById(submissionId)
view?.submissionDeleted()
}
- private fun deleteFileForSubmission(fileId: Long) {
- val db = Db.getInstance(context)
- db.fileSubmissionQueries.deleteFileById(fileId)
+ private suspend fun deleteFileForSubmission(fileId: Long) {
+ studentDb.fileSubmissionDao().deleteFileById(fileId)
}
/**
@@ -96,7 +85,7 @@ class UploadStatusSubmissionEffectHandler(val context: Context, val submissionId
* has "finished" will fail as it can no longer find the file on the device.
*/
private fun retrySubmission(submissionId: Long) {
- SubmissionService.retryFileSubmission(context, submissionId)
+ submissionHelper.retryFileSubmission(submissionId)
view?.submissionRetrying()
}
diff --git a/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/file/UploadStatusSubmissionModels.kt b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/file/UploadStatusSubmissionModels.kt
index 53ce40a3ee..98548cc1b6 100644
--- a/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/file/UploadStatusSubmissionModels.kt
+++ b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/file/UploadStatusSubmissionModels.kt
@@ -16,7 +16,7 @@
*/
package com.instructure.student.mobius.assignmentDetails.submission.file
-import com.instructure.student.FileSubmission
+import com.instructure.student.room.entities.CreateFileSubmissionEntity
sealed class UploadStatusSubmissionEvent {
object OnRetryClicked : UploadStatusSubmissionEvent()
@@ -27,10 +27,10 @@ sealed class UploadStatusSubmissionEvent {
data class OnFilesRefreshed(
val failed: Boolean,
val submissionId: Long,
- val files: List
+ val files: List
) : UploadStatusSubmissionEvent()
- data class OnPersistedSubmissionLoaded(val assignmentName: String?, val failed: Boolean, val files: List) :
+ data class OnPersistedSubmissionLoaded(val assignmentName: String?, val failed: Boolean, val files: List) :
UploadStatusSubmissionEvent()
data class OnUploadProgressChanged(
@@ -56,5 +56,5 @@ data class UploadStatusSubmissionModel(
val isLoading: Boolean = false,
val isFailed: Boolean = false,
val uploadedBytes: Long? = null,
- val files: List = emptyList()
+ val files: List = emptyList()
)
diff --git a/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/file/ui/BaseUploadStatusSubmissionFragment.kt b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/file/ui/BaseUploadStatusSubmissionFragment.kt
new file mode 100644
index 0000000000..717c0d6758
--- /dev/null
+++ b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/file/ui/BaseUploadStatusSubmissionFragment.kt
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2019 - 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 .
+ *
+ */
+package com.instructure.student.mobius.assignmentDetails.submission.file.ui
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import com.instructure.pandautils.analytics.SCREEN_VIEW_UPLOAD_STATUS_SUBMISSION
+import com.instructure.pandautils.analytics.ScreenView
+import com.instructure.pandautils.utils.Const
+import com.instructure.pandautils.utils.LongArg
+import com.instructure.student.databinding.FragmentUploadStatusSubmissionBinding
+import com.instructure.student.mobius.assignmentDetails.submission.file.UploadStatusSubmissionEffect
+import com.instructure.student.mobius.assignmentDetails.submission.file.UploadStatusSubmissionEvent
+import com.instructure.student.mobius.assignmentDetails.submission.file.UploadStatusSubmissionModel
+import com.instructure.student.mobius.assignmentDetails.submission.file.UploadStatusSubmissionPresenter
+import com.instructure.student.mobius.assignmentDetails.submission.file.UploadStatusSubmissionUpdate
+import com.instructure.student.mobius.common.ui.MobiusFragment
+
+@ScreenView(SCREEN_VIEW_UPLOAD_STATUS_SUBMISSION)
+abstract class BaseUploadStatusSubmissionFragment :
+ MobiusFragment() {
+
+ protected val submissionId by LongArg(key = Const.SUBMISSION_ID)
+
+ override fun makeUpdate() = UploadStatusSubmissionUpdate()
+
+ override fun makeView(inflater: LayoutInflater, parent: ViewGroup) =
+ UploadStatusSubmissionView(inflater, parent)
+
+ override fun makePresenter() = UploadStatusSubmissionPresenter
+
+ override fun makeInitModel() = UploadStatusSubmissionModel(submissionId)
+}
\ No newline at end of file
diff --git a/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/file/ui/UploadStatusSubmissionFragment.kt b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/file/ui/UploadStatusSubmissionFragment.kt
index fdd077588f..23d39c9e64 100644
--- a/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/file/ui/UploadStatusSubmissionFragment.kt
+++ b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/file/ui/UploadStatusSubmissionFragment.kt
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2019 - present Instructure, Inc.
+ * Copyright (C) 2024 - 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
@@ -17,51 +17,41 @@
package com.instructure.student.mobius.assignmentDetails.submission.file.ui
import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import com.instructure.canvasapi2.utils.ContextKeeper
import com.instructure.interactions.router.Route
-import com.instructure.pandautils.analytics.SCREEN_VIEW_UPLOAD_STATUS_SUBMISSION
-import com.instructure.pandautils.analytics.ScreenView
import com.instructure.pandautils.utils.Const
-import com.instructure.pandautils.utils.LongArg
import com.instructure.pandautils.utils.withArgs
-import com.instructure.student.Submission
-import com.instructure.student.databinding.FragmentUploadStatusSubmissionBinding
-import com.instructure.student.db.Db
-import com.instructure.student.db.getInstance
-import com.instructure.student.mobius.assignmentDetails.submission.file.*
-import com.instructure.student.mobius.common.DBSource
-import com.instructure.student.mobius.common.ui.MobiusFragment
+import com.instructure.student.mobius.assignmentDetails.submission.file.UploadStatusSubmissionEffectHandler
+import com.instructure.student.mobius.assignmentDetails.submission.file.UploadStatusSubmissionEvent
+import com.instructure.student.mobius.common.LiveDataSource
+import com.instructure.student.mobius.common.ui.SubmissionHelper
+import com.instructure.student.room.StudentDb
+import com.instructure.student.room.entities.CreateSubmissionEntity
import com.spotify.mobius.EventSource
+import dagger.hilt.android.AndroidEntryPoint
+import javax.inject.Inject
-@ScreenView(SCREEN_VIEW_UPLOAD_STATUS_SUBMISSION)
-class UploadStatusSubmissionFragment :
- MobiusFragment() {
+@AndroidEntryPoint
+class UploadStatusSubmissionFragment : BaseUploadStatusSubmissionFragment() {
- private val submissionId by LongArg(key = Const.SUBMISSION_ID)
+ @Inject
+ lateinit var submissionHelper: SubmissionHelper
- override fun makeEffectHandler() =
- UploadStatusSubmissionEffectHandler(requireContext(), submissionId)
-
- override fun makeUpdate() = UploadStatusSubmissionUpdate()
-
- override fun makeView(inflater: LayoutInflater, parent: ViewGroup) =
- UploadStatusSubmissionView(inflater, parent)
+ @Inject
+ lateinit var studentDb: StudentDb
- override fun makePresenter() = UploadStatusSubmissionPresenter
-
- override fun makeInitModel() = UploadStatusSubmissionModel(submissionId)
+ override fun makeEffectHandler() =
+ UploadStatusSubmissionEffectHandler(submissionId, submissionHelper, studentDb)
- @Suppress("RemoveExplicitTypeArguments") // DBSource.ofSingle type arguments required, but linter thinks they aren't
override fun getExternalEventSources(): List> = listOf(
- DBSource.ofSingle(
- Db.getInstance(ContextKeeper.appContext)
- .submissionQueries
- .getSubmissionById(submissionId)
+ LiveDataSource.of(
+ studentDb.submissionDao().findSubmissionByIdLiveData(submissionId)
) { submission ->
if (submission != null && !submission.errorFlag) {
- UploadStatusSubmissionEvent.OnUploadProgressChanged(submission.currentFile.toInt(), submissionId, submission.progress ?: 0.0)
+ UploadStatusSubmissionEvent.OnUploadProgressChanged(
+ submission.currentFile.toInt(),
+ submissionId,
+ submission.progress?.toDouble() ?: 0.0
+ )
} else UploadStatusSubmissionEvent.RequestLoad
}
)
diff --git a/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/picker/PickerSubmissionUploadEffectHandler.kt b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/picker/PickerSubmissionUploadEffectHandler.kt
index 6ddca50952..f99647fdac 100644
--- a/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/picker/PickerSubmissionUploadEffectHandler.kt
+++ b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/picker/PickerSubmissionUploadEffectHandler.kt
@@ -23,14 +23,23 @@ import android.net.Uri
import androidx.core.content.FileProvider
import com.instructure.canvasapi2.models.postmodels.FileSubmitObject
import com.instructure.canvasapi2.utils.exhaustive
-import com.instructure.pandautils.utils.*
+import com.instructure.pandautils.utils.Const
+import com.instructure.pandautils.utils.FilePrefs
+import com.instructure.pandautils.utils.FileUploadUtils
+import com.instructure.pandautils.utils.OnActivityResults
+import com.instructure.pandautils.utils.PermissionUtils
+import com.instructure.pandautils.utils.getFragmentActivity
+import com.instructure.pandautils.utils.remove
+import com.instructure.pandautils.utils.requestPermissions
import com.instructure.student.R
import com.instructure.student.features.documentscanning.DocumentScanningActivity
import com.instructure.student.mobius.assignmentDetails.isIntentAvailable
-import com.instructure.student.mobius.assignmentDetails.submission.picker.PickerSubmissionMode.*
+import com.instructure.student.mobius.assignmentDetails.submission.picker.PickerSubmissionMode.CommentAttachment
+import com.instructure.student.mobius.assignmentDetails.submission.picker.PickerSubmissionMode.FileSubmission
+import com.instructure.student.mobius.assignmentDetails.submission.picker.PickerSubmissionMode.MediaSubmission
import com.instructure.student.mobius.assignmentDetails.submission.picker.ui.PickerSubmissionUploadView
import com.instructure.student.mobius.common.ui.EffectHandler
-import com.instructure.student.mobius.common.ui.SubmissionService
+import com.instructure.student.mobius.common.ui.SubmissionHelper
import com.spotify.mobius.Connection
import com.spotify.mobius.functions.Consumer
import kotlinx.coroutines.Dispatchers
@@ -41,8 +50,9 @@ import org.greenrobot.eventbus.Subscribe
import java.io.File
// We need a context in this class to register receivers and to access the database
-class PickerSubmissionUploadEffectHandler constructor(
- private val context: Context
+class PickerSubmissionUploadEffectHandler(
+ private val context: Context,
+ private val submissionHelper: SubmissionHelper
) : EffectHandler() {
override fun connect(output: Consumer): Connection {
@@ -116,14 +126,16 @@ class PickerSubmissionUploadEffectHandler constructor(
is PickerSubmissionUploadEffect.HandleSubmit -> {
handleSubmit(effect.model)
}
+ is PickerSubmissionUploadEffect.RemoveTempFile -> {
+ removeTempFile(effect.path)
+ }
}.exhaustive
}
private fun handleSubmit(model: PickerSubmissionUploadModel) {
when (model.mode) {
MediaSubmission -> {
- SubmissionService.startMediaSubmission(
- context = context,
+ submissionHelper.startMediaSubmission(
canvasContext = model.canvasContext,
assignmentId = model.assignmentId,
assignmentName = model.assignmentName,
@@ -132,8 +144,7 @@ class PickerSubmissionUploadEffectHandler constructor(
)
}
FileSubmission -> {
- SubmissionService.startFileSubmission(
- context = context,
+ submissionHelper.startFileSubmission(
canvasContext = model.canvasContext,
assignmentId = model.assignmentId,
assignmentName = model.assignmentName,
@@ -142,8 +153,7 @@ class PickerSubmissionUploadEffectHandler constructor(
)
}
CommentAttachment -> {
- SubmissionService.startCommentUpload(
- context = context,
+ submissionHelper.startCommentUpload(
canvasContext = model.canvasContext,
assignmentId = model.assignmentId,
assignmentName = model.assignmentName,
@@ -190,13 +200,13 @@ class PickerSubmissionUploadEffectHandler constructor(
)
view?.getGalleryIntent(uri)?.let {
- (context as Activity).startActivityForResult(it, REQUEST_PICK_IMAGE_GALLERY)
+ (context.getFragmentActivity()).startActivityForResult(it, REQUEST_PICK_IMAGE_GALLERY)
}
}
private fun launchSelectFile() {
view?.getSelectFileIntent()?.let {
- (context as Activity).startActivityForResult(it, REQUEST_PICK_FILE_FROM_DEVICE)
+ (context.getFragmentActivity()).startActivityForResult(it, REQUEST_PICK_FILE_FROM_DEVICE)
}
}
@@ -208,7 +218,7 @@ class PickerSubmissionUploadEffectHandler constructor(
)
) return
val intent = Intent(context, DocumentScanningActivity::class.java)
- (context as Activity).startActivityForResult(intent, REQUEST_DOCUMENT_SCANNING)
+ (context.getFragmentActivity()).startActivityForResult(intent, REQUEST_DOCUMENT_SCANNING)
}
private fun launchCamera() {
@@ -235,7 +245,7 @@ class PickerSubmissionUploadEffectHandler constructor(
val intent = view?.getCameraIntent(uri)
if (intent != null && context.isIntentAvailable(intent.action)) {
- (context as Activity).startActivityForResult(intent, REQUEST_CAMERA_PIC)
+ (context.getFragmentActivity()).startActivityForResult(intent, REQUEST_CAMERA_PIC)
}
}
@@ -245,11 +255,11 @@ class PickerSubmissionUploadEffectHandler constructor(
successEvent: PickerSubmissionUploadEvent,
vararg permissions: String
): Boolean {
- if (PermissionUtils.hasPermissions(context as Activity, *permissions)) {
+ if (PermissionUtils.hasPermissions(context.getFragmentActivity(), *permissions)) {
return false
}
- context.requestPermissions(setOf(*permissions)) { results ->
+ context.getFragmentActivity().requestPermissions(setOf(*permissions)) { results ->
if (results.isNotEmpty() && results.all { it.value }) {
// If permissions list is not empty and all are granted, send the success event
consumer.accept(successEvent)
@@ -282,6 +292,10 @@ class PickerSubmissionUploadEffectHandler constructor(
return false
}
+ private fun removeTempFile(path: String) {
+ FileUploadUtils.deleteTempFile(path)
+ }
+
companion object {
const val REQUEST_CAMERA_PIC = 5100
const val REQUEST_PICK_IMAGE_GALLERY = 5101
diff --git a/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/picker/PickerSubmissionUploadModels.kt b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/picker/PickerSubmissionUploadModels.kt
index 9ba138616d..0a2ca09bfa 100644
--- a/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/picker/PickerSubmissionUploadModels.kt
+++ b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/picker/PickerSubmissionUploadModels.kt
@@ -39,6 +39,7 @@ sealed class PickerSubmissionUploadEffect {
data class HandleSubmit(val model: PickerSubmissionUploadModel) : PickerSubmissionUploadEffect()
data class LoadFileContents(val uri: Uri, val allowedExtensions: List) :
PickerSubmissionUploadEffect()
+ data class RemoveTempFile(val path: String) : PickerSubmissionUploadEffect()
}
data class PickerSubmissionUploadModel(
diff --git a/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/picker/PickerSubmissionUploadUpdate.kt b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/picker/PickerSubmissionUploadUpdate.kt
index b53b07e2e7..00b68bcedb 100644
--- a/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/picker/PickerSubmissionUploadUpdate.kt
+++ b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/picker/PickerSubmissionUploadUpdate.kt
@@ -46,8 +46,9 @@ class PickerSubmissionUploadUpdate :
}
is PickerSubmissionUploadEvent.OnFileRemoved -> {
val files = model.files.toMutableList()
+ val tempFilePath = files[event.fileIndex].fullPath
files.removeAt(event.fileIndex)
- Next.next(model.copy(files = files.toList()))
+ Next.next(model.copy(files = files.toList()), setOf(PickerSubmissionUploadEffect.RemoveTempFile(tempFilePath)))
}
is PickerSubmissionUploadEvent.OnFileAdded -> {
val files = model.files.toMutableList()
diff --git a/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/picker/ui/BasePickerSubmissionUploadFragment.kt b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/picker/ui/BasePickerSubmissionUploadFragment.kt
new file mode 100644
index 0000000000..48c6196a96
--- /dev/null
+++ b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/picker/ui/BasePickerSubmissionUploadFragment.kt
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2019 - 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 .
+ *
+ */
+package com.instructure.student.mobius.assignmentDetails.submission.picker.ui
+
+import android.net.Uri
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import com.instructure.canvasapi2.models.Assignment
+import com.instructure.canvasapi2.models.Course
+import com.instructure.pandautils.analytics.SCREEN_VIEW_SUBMISSION_UPLOAD_PICKER
+import com.instructure.pandautils.analytics.ScreenView
+import com.instructure.pandautils.utils.Const
+import com.instructure.pandautils.utils.LongArg
+import com.instructure.pandautils.utils.NullableParcelableArg
+import com.instructure.pandautils.utils.ParcelableArg
+import com.instructure.pandautils.utils.SerializableArg
+import com.instructure.student.databinding.FragmentPickerSubmissionUploadBinding
+import com.instructure.student.mobius.assignmentDetails.submission.picker.PickerSubmissionMode
+import com.instructure.student.mobius.assignmentDetails.submission.picker.PickerSubmissionUploadEffect
+import com.instructure.student.mobius.assignmentDetails.submission.picker.PickerSubmissionUploadEvent
+import com.instructure.student.mobius.assignmentDetails.submission.picker.PickerSubmissionUploadModel
+import com.instructure.student.mobius.assignmentDetails.submission.picker.PickerSubmissionUploadPresenter
+import com.instructure.student.mobius.assignmentDetails.submission.picker.PickerSubmissionUploadUpdate
+import com.instructure.student.mobius.assignmentDetails.submission.picker.ui.PickerSubmissionUploadFragment.Companion.INVALID_ATTEMPT
+import com.instructure.student.mobius.assignmentDetails.submission.picker.ui.PickerSubmissionUploadFragment.Companion.PICKER_MODE
+import com.instructure.student.mobius.common.ui.MobiusFragment
+
+@ScreenView(SCREEN_VIEW_SUBMISSION_UPLOAD_PICKER)
+abstract class BasePickerSubmissionUploadFragment :
+ MobiusFragment() {
+
+ private val assignment by ParcelableArg(key = Const.ASSIGNMENT)
+ private val canvasContext by ParcelableArg(key = Const.CANVAS_CONTEXT)
+ private val mode by SerializableArg(key = PICKER_MODE, default = PickerSubmissionMode.FileSubmission)
+ private val mediaUri by NullableParcelableArg(key = Const.PASSED_URI, default = null)
+ private var attemptId by LongArg(key = Const.SUBMISSION_ATTEMPT)
+
+ override fun makeUpdate() = PickerSubmissionUploadUpdate()
+
+ override fun makeView(inflater: LayoutInflater, parent: ViewGroup) =
+ PickerSubmissionUploadView(inflater, parent, mode)
+
+ override fun makePresenter() = PickerSubmissionUploadPresenter
+
+ override fun makeInitModel() = PickerSubmissionUploadModel(
+ canvasContext,
+ assignment.id,
+ assignment.name ?: "",
+ assignment.groupCategoryId,
+ if (mode.isForComment || mode.isMediaSubmission) emptyList() else assignment.allowedExtensions,
+ mode,
+ mediaUri,
+ attemptId = attemptId.takeIf { it != INVALID_ATTEMPT }
+ )
+}
diff --git a/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/picker/ui/PickerSubmissionUploadFragment.kt b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/picker/ui/PickerSubmissionUploadFragment.kt
index 822c5ad2ee..710522708b 100644
--- a/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/picker/ui/PickerSubmissionUploadFragment.kt
+++ b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/picker/ui/PickerSubmissionUploadFragment.kt
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2019 - present Instructure, Inc.
+ * Copyright (C) 2024 - 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
@@ -17,57 +17,35 @@
package com.instructure.student.mobius.assignmentDetails.submission.picker.ui
import android.net.Uri
-import android.view.LayoutInflater
-import android.view.ViewGroup
import com.instructure.canvasapi2.models.Assignment
import com.instructure.canvasapi2.models.CanvasContext
-import com.instructure.canvasapi2.models.Course
import com.instructure.interactions.router.Route
-import com.instructure.pandautils.analytics.SCREEN_VIEW_SUBMISSION_UPLOAD_PICKER
-import com.instructure.pandautils.analytics.ScreenView
-import com.instructure.pandautils.utils.*
-import com.instructure.student.databinding.FragmentPickerSubmissionUploadBinding
-import com.instructure.student.mobius.assignmentDetails.submission.picker.*
-import com.instructure.student.mobius.common.ui.MobiusFragment
+import com.instructure.pandautils.utils.Const
+import com.instructure.pandautils.utils.isCourseOrGroup
+import com.instructure.pandautils.utils.makeBundle
+import com.instructure.pandautils.utils.withArgs
+import com.instructure.student.mobius.assignmentDetails.submission.picker.PickerSubmissionMode
+import com.instructure.student.mobius.assignmentDetails.submission.picker.PickerSubmissionUploadEffectHandler
+import com.instructure.student.mobius.common.ui.SubmissionHelper
+import dagger.hilt.android.AndroidEntryPoint
+import javax.inject.Inject
-@ScreenView(SCREEN_VIEW_SUBMISSION_UPLOAD_PICKER)
-class PickerSubmissionUploadFragment :
- MobiusFragment() {
+@AndroidEntryPoint
+class PickerSubmissionUploadFragment : BasePickerSubmissionUploadFragment() {
- private val assignment by ParcelableArg(key = Const.ASSIGNMENT)
- private val canvasContext by ParcelableArg(key = Const.CANVAS_CONTEXT)
- private val mode by SerializableArg(key = PICKER_MODE, default = PickerSubmissionMode.FileSubmission)
- private val mediaUri by NullableParcelableArg(key = Const.PASSED_URI, default = null)
- private var attemptId by LongArg(key = Const.SUBMISSION_ATTEMPT)
+ @Inject
+ lateinit var submissionHelper: SubmissionHelper
- override fun makeEffectHandler() = PickerSubmissionUploadEffectHandler(requireContext())
-
- override fun makeUpdate() = PickerSubmissionUploadUpdate()
-
- override fun makeView(inflater: LayoutInflater, parent: ViewGroup) =
- PickerSubmissionUploadView(inflater, parent, mode)
-
- override fun makePresenter() = PickerSubmissionUploadPresenter
-
- override fun makeInitModel() = PickerSubmissionUploadModel(
- canvasContext,
- assignment.id,
- assignment.name ?: "",
- assignment.groupCategoryId,
- if (mode.isForComment || mode.isMediaSubmission) emptyList() else assignment.allowedExtensions,
- mode,
- mediaUri,
- attemptId = attemptId.takeIf { it != INVALID_ATTEMPT }
- )
+ override fun makeEffectHandler() = PickerSubmissionUploadEffectHandler(requireContext(), submissionHelper)
companion object {
- private const val PICKER_MODE = "pickerMode"
- private const val INVALID_ATTEMPT = -1L
+ const val PICKER_MODE = "pickerMode"
+ const val INVALID_ATTEMPT = -1L
private fun validRoute(route: Route) = route.canvasContext?.isCourseOrGroup == true
- && route.arguments.containsKey(Const.ASSIGNMENT)
- && route.arguments.containsKey(PICKER_MODE)
+ && route.arguments.containsKey(Const.ASSIGNMENT)
+ && route.arguments.containsKey(PICKER_MODE)
fun makeRoute(
canvasContext: CanvasContext,
@@ -104,4 +82,4 @@ class PickerSubmissionUploadFragment :
return PickerSubmissionUploadFragment().withArgs(route.arguments)
}
}
-}
+}
\ No newline at end of file
diff --git a/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/text/TextSubmissionUploadEffectHandler.kt b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/text/TextSubmissionUploadEffectHandler.kt
index 7439d63ff1..70d7d68f6f 100644
--- a/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/text/TextSubmissionUploadEffectHandler.kt
+++ b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/text/TextSubmissionUploadEffectHandler.kt
@@ -19,28 +19,29 @@ package com.instructure.student.mobius.assignmentDetails.submission.text
import com.instructure.canvasapi2.utils.exhaustive
import com.instructure.student.mobius.assignmentDetails.submission.text.ui.TextSubmissionUploadView
import com.instructure.student.mobius.common.ui.EffectHandler
+import com.instructure.student.mobius.common.ui.SubmissionHelper
+import kotlinx.coroutines.launch
-class TextSubmissionUploadEffectHandler :
+class TextSubmissionUploadEffectHandler(private val submissionHelper: SubmissionHelper) :
EffectHandler() {
+ @Suppress("IMPLICIT_CAST_TO_ANY")
override fun accept(effect: TextSubmissionUploadEffect) {
when (effect) {
- is TextSubmissionUploadEffect.SubmitText -> view?.onTextSubmitted(
- effect.text,
- effect.canvasContext,
- effect.assignmentId,
- effect.assignmentName
- )
+ is TextSubmissionUploadEffect.SubmitText -> {
+ submissionHelper.startTextSubmission(effect.canvasContext, effect.assignmentId, effect.assignmentName, effect.text)
+ view?.goBack()
+ }
is TextSubmissionUploadEffect.InitializeText -> view?.setInitialSubmissionText(effect.text)
is TextSubmissionUploadEffect.AddImage -> view?.addImageToSubmission(
effect.uri,
effect.canvasContext
)
- is TextSubmissionUploadEffect.SaveDraft -> view?.saveDraft(
- effect.text,
- effect.canvasContext,
- effect.assignmentId,
- effect.assignmentName
- )
+ is TextSubmissionUploadEffect.SaveDraft -> {
+ launch {
+ submissionHelper.saveDraft(effect.canvasContext, effect.assignmentId, effect.assignmentName, effect.text)
+ view?.goBack()
+ }
+ }
TextSubmissionUploadEffect.ProcessCameraImage -> processCameraImage()
TextSubmissionUploadEffect.ShowFailedImageMessage -> view?.showFailedImageMessage()
}.exhaustive
diff --git a/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/text/ui/BaseTextSubmissionUploadFragment.kt b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/text/ui/BaseTextSubmissionUploadFragment.kt
new file mode 100644
index 0000000000..bb69b60e51
--- /dev/null
+++ b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/text/ui/BaseTextSubmissionUploadFragment.kt
@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2019 - present Instructure, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.instructure.student.mobius.assignmentDetails.submission.text.ui
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import com.instructure.canvasapi2.models.CanvasContext
+import com.instructure.pandautils.analytics.SCREEN_VIEW_TEXT_SUBMISSION_UPLOAD
+import com.instructure.pandautils.analytics.ScreenView
+import com.instructure.pandautils.utils.BooleanArg
+import com.instructure.pandautils.utils.Const
+import com.instructure.pandautils.utils.LongArg
+import com.instructure.pandautils.utils.ParcelableArg
+import com.instructure.pandautils.utils.StringArg
+import com.instructure.student.databinding.FragmentTextSubmissionUploadBinding
+import com.instructure.student.mobius.assignmentDetails.submission.text.TextSubmissionUploadEffect
+import com.instructure.student.mobius.assignmentDetails.submission.text.TextSubmissionUploadEvent
+import com.instructure.student.mobius.assignmentDetails.submission.text.TextSubmissionUploadEventBusSource
+import com.instructure.student.mobius.assignmentDetails.submission.text.TextSubmissionUploadModel
+import com.instructure.student.mobius.assignmentDetails.submission.text.TextSubmissionUploadPresenter
+import com.instructure.student.mobius.assignmentDetails.submission.text.TextSubmissionUploadUpdate
+import com.instructure.student.mobius.common.ui.MobiusFragment
+
+@ScreenView(SCREEN_VIEW_TEXT_SUBMISSION_UPLOAD)
+abstract class BaseTextSubmissionUploadFragment : MobiusFragment() {
+
+ private val course by ParcelableArg(key = Const.CANVAS_CONTEXT)
+ private val assignmentId by LongArg(key = Const.ASSIGNMENT_ID)
+ private val initialText by StringArg(key = Const.TEXT)
+ private val isFailure by BooleanArg(key = Const.IS_FAILURE)
+ private val assignmentName by StringArg(key = Const.ASSIGNMENT_NAME)
+
+ override fun makeUpdate() = TextSubmissionUploadUpdate()
+
+ override fun makeView(inflater: LayoutInflater, parent: ViewGroup) = TextSubmissionUploadView(inflater, parent)
+
+ override fun makePresenter() = TextSubmissionUploadPresenter
+
+ override fun makeInitModel(): TextSubmissionUploadModel {
+ return TextSubmissionUploadModel(course, assignmentId, assignmentName, initialText, isFailure)
+ }
+
+ override fun getExternalEventSources() = listOf(TextSubmissionUploadEventBusSource())
+
+ override fun handleBackPressed(): Boolean {
+ return view.onBackPressed()
+ }
+}
diff --git a/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/text/ui/TextSubmissionUploadFragment.kt b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/text/ui/TextSubmissionUploadFragment.kt
index 2916826e8a..105bb817f9 100644
--- a/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/text/ui/TextSubmissionUploadFragment.kt
+++ b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/text/ui/TextSubmissionUploadFragment.kt
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2019 - present Instructure, Inc.
+ * Copyright (C) 2024 - present Instructure, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -12,47 +12,26 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
-package com.instructure.student.mobius.assignmentDetails.submission.text.ui
+ */package com.instructure.student.mobius.assignmentDetails.submission.text.ui
-import android.view.LayoutInflater
-import android.view.ViewGroup
import com.instructure.canvasapi2.models.CanvasContext
import com.instructure.canvasapi2.models.Course
import com.instructure.interactions.router.Route
-import com.instructure.pandautils.analytics.SCREEN_VIEW_TEXT_SUBMISSION_UPLOAD
-import com.instructure.pandautils.analytics.ScreenView
-import com.instructure.pandautils.utils.*
-import com.instructure.student.databinding.FragmentTextSubmissionUploadBinding
-import com.instructure.student.mobius.assignmentDetails.submission.text.*
-import com.instructure.student.mobius.common.ui.MobiusFragment
+import com.instructure.pandautils.utils.Const
+import com.instructure.pandautils.utils.makeBundle
+import com.instructure.pandautils.utils.withArgs
+import com.instructure.student.mobius.assignmentDetails.submission.text.TextSubmissionUploadEffectHandler
+import com.instructure.student.mobius.common.ui.SubmissionHelper
+import dagger.hilt.android.AndroidEntryPoint
+import javax.inject.Inject
-@ScreenView(SCREEN_VIEW_TEXT_SUBMISSION_UPLOAD)
-class TextSubmissionUploadFragment : MobiusFragment() {
+@AndroidEntryPoint
+class TextSubmissionUploadFragment : BaseTextSubmissionUploadFragment() {
- private val course by ParcelableArg(key = Const.CANVAS_CONTEXT)
- private val assignmentId by LongArg(key = Const.ASSIGNMENT_ID)
- private val initialText by StringArg(key = Const.TEXT)
- private val isFailure by BooleanArg(key = Const.IS_FAILURE)
- private val assignmentName by StringArg(key = Const.ASSIGNMENT_NAME)
+ @Inject
+ lateinit var submissionHelper: SubmissionHelper
- override fun makeEffectHandler() = TextSubmissionUploadEffectHandler()
-
- override fun makeUpdate() = TextSubmissionUploadUpdate()
-
- override fun makeView(inflater: LayoutInflater, parent: ViewGroup) = TextSubmissionUploadView(inflater, parent)
-
- override fun makePresenter() = TextSubmissionUploadPresenter
-
- override fun makeInitModel(): TextSubmissionUploadModel {
- return TextSubmissionUploadModel(course, assignmentId, assignmentName, initialText, isFailure)
- }
-
- override fun getExternalEventSources() = listOf(TextSubmissionUploadEventBusSource())
-
- override fun handleBackPressed(): Boolean {
- return view.onBackPressed()
- }
+ override fun makeEffectHandler() = TextSubmissionUploadEffectHandler(submissionHelper)
companion object {
@@ -77,4 +56,4 @@ class TextSubmissionUploadFragment : MobiusFragment
MediaUploadUtils.handleCameraPicResult(activity, null)
@@ -151,4 +144,9 @@ class TextSubmissionUploadView(inflater: LayoutInflater, parent: ViewGroup) :
false
}
}
+
+ fun goBack() {
+ canPressBack = true
+ (context as? Activity)?.onBackPressed()
+ }
}
\ No newline at end of file
diff --git a/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/url/UrlSubmissionUploadEffectHandler.kt b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/url/UrlSubmissionUploadEffectHandler.kt
index fd337b9cba..b19d9f66a9 100644
--- a/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/url/UrlSubmissionUploadEffectHandler.kt
+++ b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/url/UrlSubmissionUploadEffectHandler.kt
@@ -18,16 +18,18 @@ package com.instructure.student.mobius.assignmentDetails.submission.url
import com.instructure.canvasapi2.utils.exhaustive
import com.instructure.student.mobius.assignmentDetails.submission.url.ui.UrlSubmissionUploadView
import com.instructure.student.mobius.common.ui.EffectHandler
+import com.instructure.student.mobius.common.ui.SubmissionHelper
-class UrlSubmissionUploadEffectHandler : EffectHandler() {
+class UrlSubmissionUploadEffectHandler(private val submissionHelper: SubmissionHelper) : EffectHandler() {
override fun accept(effect: UrlSubmissionUploadEffect) {
when (effect) {
is UrlSubmissionUploadEffect.ShowUrlPreview -> {
view?.showPreviewUrl(effect.url)
}
is UrlSubmissionUploadEffect.SubmitUrl -> {
- view?.onSubmitUrl(effect.course, effect.assignmentId, effect.assignmentName, effect.url)
+ submissionHelper.startUrlSubmission(effect.course, effect.assignmentId, effect.assignmentName, effect.url)
+ view?.goBack()
}
is UrlSubmissionUploadEffect.InitializeUrl -> {
view?.setInitialUrl(effect.url)
diff --git a/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/url/ui/BaseUrlSubmissionUploadFragment.kt b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/url/ui/BaseUrlSubmissionUploadFragment.kt
new file mode 100644
index 0000000000..6b2e4856f8
--- /dev/null
+++ b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/url/ui/BaseUrlSubmissionUploadFragment.kt
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2019 - present Instructure, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.instructure.student.mobius.assignmentDetails.submission.url.ui
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import com.instructure.canvasapi2.models.CanvasContext
+import com.instructure.pandautils.analytics.SCREEN_VIEW_URL_SUBMISSION_UPLOAD
+import com.instructure.pandautils.analytics.ScreenView
+import com.instructure.pandautils.utils.BooleanArg
+import com.instructure.pandautils.utils.Const
+import com.instructure.pandautils.utils.LongArg
+import com.instructure.pandautils.utils.ParcelableArg
+import com.instructure.pandautils.utils.StringArg
+import com.instructure.student.databinding.FragmentUrlSubmissionUploadBinding
+import com.instructure.student.mobius.assignmentDetails.submission.url.UrlSubmissionUploadEffect
+import com.instructure.student.mobius.assignmentDetails.submission.url.UrlSubmissionUploadEvent
+import com.instructure.student.mobius.assignmentDetails.submission.url.UrlSubmissionUploadModel
+import com.instructure.student.mobius.assignmentDetails.submission.url.UrlSubmissionUploadPresenter
+import com.instructure.student.mobius.assignmentDetails.submission.url.UrlSubmissionUploadUpdate
+import com.instructure.student.mobius.common.ui.MobiusFragment
+import com.instructure.student.mobius.common.ui.Presenter
+import com.instructure.student.mobius.common.ui.UpdateInit
+
+@ScreenView(SCREEN_VIEW_URL_SUBMISSION_UPLOAD)
+abstract class BaseUrlSubmissionUploadFragment : MobiusFragment() {
+
+ private val course by ParcelableArg(key = Const.CANVAS_CONTEXT)
+ private val assignmentId by LongArg(key = Const.ASSIGNMENT_ID)
+ private val initialUrl by StringArg(key = Const.URL)
+ private val assignmentName by StringArg(key = Const.ASSIGNMENT_NAME)
+ private val isFailure by BooleanArg(key = Const.IS_FAILURE)
+
+ override fun makeUpdate(): UpdateInit = UrlSubmissionUploadUpdate()
+
+ override fun makeView(inflater: LayoutInflater, parent: ViewGroup): UrlSubmissionUploadView = UrlSubmissionUploadView(inflater, parent)
+
+ override fun makePresenter(): Presenter = UrlSubmissionUploadPresenter
+
+ override fun makeInitModel(): UrlSubmissionUploadModel = UrlSubmissionUploadModel(course, assignmentId, assignmentName, initialUrl, isFailure)
+}
diff --git a/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/url/ui/UrlSubmissionUploadFragment.kt b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/url/ui/UrlSubmissionUploadFragment.kt
index 6e32ae37e5..30fdc7e969 100644
--- a/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/url/ui/UrlSubmissionUploadFragment.kt
+++ b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/url/ui/UrlSubmissionUploadFragment.kt
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2019 - present Instructure, Inc.
+ * Copyright (C) 2024 - present Instructure, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -12,42 +12,29 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
-package com.instructure.student.mobius.assignmentDetails.submission.url.ui
+ */package com.instructure.student.mobius.assignmentDetails.submission.url.ui
-import android.view.LayoutInflater
-import android.view.ViewGroup
import com.instructure.canvasapi2.models.CanvasContext
import com.instructure.canvasapi2.models.Course
import com.instructure.interactions.router.Route
-import com.instructure.pandautils.analytics.SCREEN_VIEW_URL_SUBMISSION_UPLOAD
-import com.instructure.pandautils.analytics.ScreenView
-import com.instructure.pandautils.utils.*
-import com.instructure.student.databinding.FragmentUrlSubmissionUploadBinding
-import com.instructure.student.mobius.assignmentDetails.submission.url.*
+import com.instructure.pandautils.utils.Const
+import com.instructure.pandautils.utils.makeBundle
+import com.instructure.pandautils.utils.withArgs
+import com.instructure.student.mobius.assignmentDetails.submission.url.UrlSubmissionUploadEffect
+import com.instructure.student.mobius.assignmentDetails.submission.url.UrlSubmissionUploadEffectHandler
+import com.instructure.student.mobius.assignmentDetails.submission.url.UrlSubmissionUploadEvent
import com.instructure.student.mobius.common.ui.EffectHandler
-import com.instructure.student.mobius.common.ui.MobiusFragment
-import com.instructure.student.mobius.common.ui.Presenter
-import com.instructure.student.mobius.common.ui.UpdateInit
+import com.instructure.student.mobius.common.ui.SubmissionHelper
+import dagger.hilt.android.AndroidEntryPoint
+import javax.inject.Inject
-@ScreenView(SCREEN_VIEW_URL_SUBMISSION_UPLOAD)
-class UrlSubmissionUploadFragment : MobiusFragment() {
+@AndroidEntryPoint
+class UrlSubmissionUploadFragment : BaseUrlSubmissionUploadFragment() {
- private val course by ParcelableArg(key = Const.CANVAS_CONTEXT)
- private val assignmentId by LongArg(key = Const.ASSIGNMENT_ID)
- private val initialUrl by StringArg(key = Const.URL)
- private val assignmentName by StringArg(key = Const.ASSIGNMENT_NAME)
- private val isFailure by BooleanArg(key = Const.IS_FAILURE)
+ @Inject
+ lateinit var submissionHelper: SubmissionHelper
- override fun makeEffectHandler(): EffectHandler = UrlSubmissionUploadEffectHandler()
-
- override fun makeUpdate(): UpdateInit = UrlSubmissionUploadUpdate()
-
- override fun makeView(inflater: LayoutInflater, parent: ViewGroup): UrlSubmissionUploadView = UrlSubmissionUploadView(inflater, parent)
-
- override fun makePresenter(): Presenter = UrlSubmissionUploadPresenter
-
- override fun makeInitModel(): UrlSubmissionUploadModel = UrlSubmissionUploadModel(course, assignmentId, assignmentName, initialUrl, isFailure)
+ override fun makeEffectHandler(): EffectHandler = UrlSubmissionUploadEffectHandler(submissionHelper)
companion object {
@@ -72,4 +59,4 @@ class UrlSubmissionUploadFragment : MobiusFragment(
@@ -81,9 +79,7 @@ class UrlSubmissionUploadView(inflater: LayoutInflater, parent: ViewGroup) : Mob
binding.editUrl.setText(url ?: "")
}
- fun onSubmitUrl(course: CanvasContext, assignmentId: Long, assignmentName: String?, url: String) {
- SubmissionService.startUrlSubmission(context, course, assignmentId, assignmentName, url)
-
+ fun goBack() {
(context as? Activity)?.onBackPressed()
}
diff --git a/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submissionDetails/content/MediaSubmissionViewFragment.kt b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submissionDetails/content/MediaSubmissionViewFragment.kt
index 2eac130e2c..258b2c8ac7 100644
--- a/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submissionDetails/content/MediaSubmissionViewFragment.kt
+++ b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submissionDetails/content/MediaSubmissionViewFragment.kt
@@ -21,21 +21,34 @@ import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
+import androidx.annotation.OptIn
import androidx.fragment.app.Fragment
+import androidx.media3.common.util.UnstableApi
+import androidx.media3.datasource.HttpDataSource
+import androidx.media3.exoplayer.source.UnrecognizedInputFormatException
import com.bumptech.glide.Glide
-import com.google.android.exoplayer2.source.UnrecognizedInputFormatException
-import com.google.android.exoplayer2.upstream.HttpDataSource
import com.instructure.interactions.router.Route
import com.instructure.interactions.router.RouteContext
import com.instructure.pandautils.activities.BaseViewMediaActivity
import com.instructure.pandautils.binding.viewBinding
import com.instructure.pandautils.dialogs.MobileDataWarningDialog
-import com.instructure.pandautils.utils.*
+import com.instructure.pandautils.utils.ExoAgent
+import com.instructure.pandautils.utils.ExoAgentState
+import com.instructure.pandautils.utils.ExoInfoListener
+import com.instructure.pandautils.utils.NullableStringArg
+import com.instructure.pandautils.utils.ParcelableArg
+import com.instructure.pandautils.utils.StringArg
+import com.instructure.pandautils.utils.ViewStyler
+import com.instructure.pandautils.utils.onClick
+import com.instructure.pandautils.utils.setGone
+import com.instructure.pandautils.utils.setVisible
+import com.instructure.pandautils.utils.viewExternally
import com.instructure.student.R
import com.instructure.student.databinding.FragmentMediaSubmissionViewBinding
import com.instructure.student.mobius.assignmentDetails.submissionDetails.SubmissionDetailsContentType
import com.instructure.student.router.RouteMatcher
+@OptIn(UnstableApi::class)
class MediaSubmissionViewFragment : Fragment() {
private val binding by viewBinding(FragmentMediaSubmissionViewBinding::bind)
diff --git a/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submissionDetails/content/emptySubmission/SubmissionDetailsEmptyContentEffectHandler.kt b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submissionDetails/content/emptySubmission/SubmissionDetailsEmptyContentEffectHandler.kt
index 16b20dbb38..3d9ea037c0 100644
--- a/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submissionDetails/content/emptySubmission/SubmissionDetailsEmptyContentEffectHandler.kt
+++ b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submissionDetails/content/emptySubmission/SubmissionDetailsEmptyContentEffectHandler.kt
@@ -22,19 +22,21 @@ import com.instructure.canvasapi2.models.DiscussionTopic
import com.instructure.canvasapi2.utils.APIHelper
import com.instructure.canvasapi2.utils.ApiPrefs
import com.instructure.canvasapi2.utils.exhaustive
+import com.instructure.pandautils.utils.getFragmentActivity
import com.instructure.student.mobius.assignmentDetails.*
import com.instructure.student.mobius.assignmentDetails.submissionDetails.content.emptySubmission.ui.SubmissionDetailsEmptyContentFragment
import com.instructure.student.mobius.assignmentDetails.submissionDetails.content.emptySubmission.ui.SubmissionDetailsEmptyContentView
import com.instructure.student.mobius.common.ui.EffectHandler
+import com.instructure.student.mobius.common.ui.SubmissionHelper
import com.instructure.student.util.getResourceSelectorUrl
-class SubmissionDetailsEmptyContentEffectHandler(val context: Context, val assignmentId: Long) :
+class SubmissionDetailsEmptyContentEffectHandler(val context: Context, val assignmentId: Long, val submissionHelper: SubmissionHelper) :
EffectHandler() {
override fun accept(effect: SubmissionDetailsEmptyContentEffect) {
when (effect) {
- SubmissionDetailsEmptyContentEffect.ShowVideoRecordingView -> context.launchVideo({SubmissionDetailsEmptyContentEvent.StoreVideoUri(it)}, { view?.showPermissionDeniedToast() }, consumer, SubmissionDetailsEmptyContentFragment.VIDEO_REQUEST_CODE)
- SubmissionDetailsEmptyContentEffect.ShowAudioRecordingView -> context.launchAudio({ view?.showPermissionDeniedToast() }, { view?.showAudioRecordingView() })
+ SubmissionDetailsEmptyContentEffect.ShowVideoRecordingView -> context.getFragmentActivity().launchVideo({SubmissionDetailsEmptyContentEvent.StoreVideoUri(it)}, { view?.showPermissionDeniedToast() }, consumer, SubmissionDetailsEmptyContentFragment.VIDEO_REQUEST_CODE)
+ SubmissionDetailsEmptyContentEffect.ShowAudioRecordingView -> context.getFragmentActivity().launchAudio({ view?.showPermissionDeniedToast() }, { view?.showAudioRecordingView() })
SubmissionDetailsEmptyContentEffect.ShowMediaPickerView -> launchMediaPicker()
SubmissionDetailsEmptyContentEffect.ShowVideoRecordingError -> view?.showVideoRecordingError()
SubmissionDetailsEmptyContentEffect.ShowAudioRecordingError -> view?.showAudioRecordingError()
@@ -53,7 +55,7 @@ class SubmissionDetailsEmptyContentEffectHandler(val context: Context, val assig
is SubmissionDetailsEmptyContentEffect.ShowQuizStartView -> view?.showQuizStartView(effect.course, effect.quiz)
is SubmissionDetailsEmptyContentEffect.ShowDiscussionDetailView -> view?.showDiscussionDetailView(effect.course, effect.discussionTopicHeaderId)
- is SubmissionDetailsEmptyContentEffect.UploadAudioSubmission -> uploadAudioRecording(context, effect.file, effect.assignment, effect.course)
+ is SubmissionDetailsEmptyContentEffect.UploadAudioSubmission -> uploadAudioRecording(submissionHelper, effect.file, effect.assignment, effect.course)
is SubmissionDetailsEmptyContentEffect.ShowCreateSubmissionView -> {
when (effect.submissionType) {
Assignment.SubmissionType.ONLINE_QUIZ -> {
@@ -78,7 +80,7 @@ class SubmissionDetailsEmptyContentEffectHandler(val context: Context, val assig
private fun launchMediaPicker() {
chooseMediaIntent.let {
- (context as Activity).startActivityForResult(it, SubmissionDetailsEmptyContentFragment.CHOOSE_MEDIA_REQUEST_CODE)
+ context.getFragmentActivity().startActivityForResult(it, SubmissionDetailsEmptyContentFragment.CHOOSE_MEDIA_REQUEST_CODE)
}
}
}
diff --git a/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submissionDetails/content/emptySubmission/ui/BaseSubmissionDetailsEmptyContentFragment.kt b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submissionDetails/content/emptySubmission/ui/BaseSubmissionDetailsEmptyContentFragment.kt
new file mode 100644
index 0000000000..16ed5d2e20
--- /dev/null
+++ b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submissionDetails/content/emptySubmission/ui/BaseSubmissionDetailsEmptyContentFragment.kt
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2019 - present Instructure, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.instructure.student.mobius.assignmentDetails.submissionDetails.content.emptySubmission.ui
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import com.instructure.canvasapi2.models.Assignment
+import com.instructure.canvasapi2.models.Course
+import com.instructure.canvasapi2.models.LTITool
+import com.instructure.canvasapi2.models.Quiz
+import com.instructure.pandautils.analytics.SCREEN_VIEW_SUBMISSION_DETAILS_EMPTY_CONTENT
+import com.instructure.pandautils.analytics.ScreenView
+import com.instructure.pandautils.utils.BooleanArg
+import com.instructure.pandautils.utils.Const
+import com.instructure.pandautils.utils.NullableParcelableArg
+import com.instructure.pandautils.utils.ParcelableArg
+import com.instructure.student.databinding.FragmentSubmissionDetailsEmptyContentBinding
+import com.instructure.student.mobius.assignmentDetails.submissionDetails.content.emptySubmission.SubmissionDetailsEmptyContentEffect
+import com.instructure.student.mobius.assignmentDetails.submissionDetails.content.emptySubmission.SubmissionDetailsEmptyContentEvent
+import com.instructure.student.mobius.assignmentDetails.submissionDetails.content.emptySubmission.SubmissionDetailsEmptyContentModel
+import com.instructure.student.mobius.assignmentDetails.submissionDetails.content.emptySubmission.SubmissionDetailsEmptyContentPresenter
+import com.instructure.student.mobius.assignmentDetails.submissionDetails.content.emptySubmission.SubmissionDetailsEmptyContentUpdate
+import com.instructure.student.mobius.common.ui.MobiusFragment
+
+@ScreenView(SCREEN_VIEW_SUBMISSION_DETAILS_EMPTY_CONTENT)
+abstract class BaseSubmissionDetailsEmptyContentFragment :
+ MobiusFragment() {
+
+ val assignment by ParcelableArg(key = Const.ASSIGNMENT)
+ val isStudioEnabled by BooleanArg(key = Const.IS_STUDIO_ENABLED)
+ val canvasContext by ParcelableArg(key = Const.CANVAS_CONTEXT)
+ val quiz by NullableParcelableArg(key = Const.QUIZ)
+ val studioLTITool by NullableParcelableArg(key = Const.STUDIO_LTI_TOOL)
+ val isObserver by BooleanArg(key = Const.IS_OBSERVER, default = false)
+ private var ltiTool: LTITool? by NullableParcelableArg(key = Const.LTI_TOOL, default = null)
+
+ override fun makeUpdate() = SubmissionDetailsEmptyContentUpdate()
+ override fun makeView(inflater: LayoutInflater, parent: ViewGroup) = SubmissionDetailsEmptyContentView(canvasContext, inflater, parent)
+ override fun makePresenter() = SubmissionDetailsEmptyContentPresenter
+ override fun makeInitModel() = SubmissionDetailsEmptyContentModel(assignment, canvasContext, isStudioEnabled, quiz, studioLTITool = studioLTITool, isObserver = isObserver, ltiTool = ltiTool)
+}
diff --git a/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submissionDetails/content/emptySubmission/ui/SubmissionDetailsEmptyContentFragment.kt b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submissionDetails/content/emptySubmission/ui/SubmissionDetailsEmptyContentFragment.kt
index 8c57774867..95fe0c3870 100644
--- a/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submissionDetails/content/emptySubmission/ui/SubmissionDetailsEmptyContentFragment.kt
+++ b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submissionDetails/content/emptySubmission/ui/SubmissionDetailsEmptyContentFragment.kt
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2019 - present Instructure, Inc.
+ * Copyright (C) 2024 - present Instructure, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -12,57 +12,46 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
-package com.instructure.student.mobius.assignmentDetails.submissionDetails.content.emptySubmission.ui
+ */package com.instructure.student.mobius.assignmentDetails.submissionDetails.content.emptySubmission.ui
-import android.view.LayoutInflater
-import android.view.ViewGroup
import com.instructure.canvasapi2.models.Assignment
import com.instructure.canvasapi2.models.Course
import com.instructure.canvasapi2.models.LTITool
import com.instructure.canvasapi2.models.Quiz
import com.instructure.canvasapi2.utils.ApiPrefs
-import com.instructure.canvasapi2.utils.ContextKeeper
-import com.instructure.pandautils.analytics.SCREEN_VIEW_SUBMISSION_DETAILS_EMPTY_CONTENT
-import com.instructure.pandautils.analytics.ScreenView
-import com.instructure.pandautils.utils.*
-import com.instructure.student.Submission
-import com.instructure.student.databinding.FragmentSubmissionDetailsEmptyContentBinding
-import com.instructure.student.db.Db
-import com.instructure.student.db.getInstance
+import com.instructure.pandautils.utils.Const
+import com.instructure.pandautils.utils.makeBundle
+import com.instructure.pandautils.utils.withArgs
import com.instructure.student.mobius.assignmentDetails.submissionDetails.SubmissionDetailsEmptyContentEventBusSource
-import com.instructure.student.mobius.assignmentDetails.submissionDetails.content.emptySubmission.*
-import com.instructure.student.mobius.common.DBSource
-import com.instructure.student.mobius.common.ui.MobiusFragment
+import com.instructure.student.mobius.assignmentDetails.submissionDetails.content.emptySubmission.SubmissionDetailsEmptyContentEffectHandler
+import com.instructure.student.mobius.assignmentDetails.submissionDetails.content.emptySubmission.SubmissionDetailsEmptyContentEvent
+import com.instructure.student.mobius.common.LiveDataSource
+import com.instructure.student.mobius.common.ui.SubmissionHelper
+import com.instructure.student.room.StudentDb
+import com.instructure.student.room.entities.CreateSubmissionEntity
+import dagger.hilt.android.AndroidEntryPoint
+import javax.inject.Inject
-@ScreenView(SCREEN_VIEW_SUBMISSION_DETAILS_EMPTY_CONTENT)
-class SubmissionDetailsEmptyContentFragment :
- MobiusFragment() {
+@AndroidEntryPoint
+class SubmissionDetailsEmptyContentFragment : BaseSubmissionDetailsEmptyContentFragment() {
- val assignment by ParcelableArg(key = Const.ASSIGNMENT)
- val isStudioEnabled by BooleanArg(key = Const.IS_STUDIO_ENABLED)
- val canvasContext by ParcelableArg(key = Const.CANVAS_CONTEXT)
- val quiz by NullableParcelableArg(key = Const.QUIZ)
- val studioLTITool by NullableParcelableArg(key = Const.STUDIO_LTI_TOOL)
- val isObserver by BooleanArg(key = Const.IS_OBSERVER, default = false)
- private var ltiTool: LTITool? by NullableParcelableArg(key = Const.LTI_TOOL, default = null)
+ @Inject
+ lateinit var submissionHelper: SubmissionHelper
+
+ @Inject
+ lateinit var studentDb: StudentDb
+
+ override fun makeEffectHandler() = SubmissionDetailsEmptyContentEffectHandler(requireContext(), assignment.id, submissionHelper)
- override fun makeEffectHandler() = SubmissionDetailsEmptyContentEffectHandler(requireContext(), assignment.id)
- override fun makeUpdate() = SubmissionDetailsEmptyContentUpdate()
- override fun makeView(inflater: LayoutInflater, parent: ViewGroup) = SubmissionDetailsEmptyContentView(canvasContext, inflater, parent)
- override fun makePresenter() = SubmissionDetailsEmptyContentPresenter
- override fun makeInitModel() = SubmissionDetailsEmptyContentModel(assignment, canvasContext, isStudioEnabled, quiz, studioLTITool = studioLTITool, isObserver = isObserver, ltiTool = ltiTool)
override fun getExternalEventSources() = listOf(
SubmissionDetailsEmptyContentEventBusSource(),
- DBSource.ofSingle(
- Db.getInstance(ContextKeeper.appContext)
- .submissionQueries
- .getSubmissionsByAssignmentId(assignment.id, ApiPrefs.user?.id ?: -1),
- performInitialQuery = false
+ LiveDataSource.of(
+ studentDb.submissionDao()
+ .findSubmissionByAssignmentIdLiveData(assignment.id, ApiPrefs.user?.id ?: -1)
) { submission ->
if (submission != null && submission.progress == null) {
// Submission was just inserted - back out to the assignment details screen
- SubmissionDetailsEmptyContentEvent.SubmissionStarted
+ SubmissionDetailsEmptyContentEvent.SubmissionStarted
} else // Submission is either currently being uploaded, or there is no submission being uploaded - do nothing
null
}
@@ -92,4 +81,4 @@ class SubmissionDetailsEmptyContentFragment :
)
}
}
-}
+}
\ No newline at end of file
diff --git a/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submissionDetails/drawer/comments/SubmissionCommentsEffectHandler.kt b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submissionDetails/drawer/comments/SubmissionCommentsEffectHandler.kt
index a142101a3a..235a3f6058 100644
--- a/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submissionDetails/drawer/comments/SubmissionCommentsEffectHandler.kt
+++ b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submissionDetails/drawer/comments/SubmissionCommentsEffectHandler.kt
@@ -24,14 +24,15 @@ import com.instructure.canvasapi2.models.CanvasContext
import com.instructure.canvasapi2.utils.AnalyticsEventConstants
import com.instructure.canvasapi2.utils.exhaustive
import com.instructure.pandautils.utils.PermissionUtils
+import com.instructure.pandautils.utils.getFragmentActivity
import com.instructure.pandautils.utils.requestPermissions
import com.instructure.student.mobius.assignmentDetails.submissionDetails.SubmissionDetailsSharedEvent
import com.instructure.student.mobius.assignmentDetails.submissionDetails.drawer.comments.ui.SubmissionCommentsView
import com.instructure.student.mobius.common.ChannelSource
import com.instructure.student.mobius.common.ui.EffectHandler
-import com.instructure.student.mobius.common.ui.SubmissionService
+import com.instructure.student.mobius.common.ui.SubmissionHelper
-class SubmissionCommentsEffectHandler(val context: Context) : EffectHandler() {
+class SubmissionCommentsEffectHandler(val context: Context, val submissionHelper: SubmissionHelper) : EffectHandler() {
override fun accept(effect: SubmissionCommentsEffect) {
when (effect) {
is SubmissionCommentsEffect.ShowMediaCommentDialog -> {
@@ -45,8 +46,7 @@ class SubmissionCommentsEffectHandler(val context: Context) : EffectHandler {
logEvent(AnalyticsEventConstants.SUBMISSION_COMMENTS_MEDIA_REPLY)
- SubmissionService.startMediaCommentUpload(
- context = context,
+ submissionHelper.startMediaCommentUpload(
canvasContext = CanvasContext.emptyCourseContext(effect.courseId),
assignmentId = effect.assignmentId,
assignmentName = effect.assignmentName,
@@ -63,8 +63,7 @@ class SubmissionCommentsEffectHandler(val context: Context) : EffectHandler {
logEvent(AnalyticsEventConstants.SUBMISSION_COMMENTS_TEXT_REPLY)
- SubmissionService.startCommentUpload(
- context,
+ submissionHelper.startCommentUpload(
CanvasContext.emptyCourseContext(effect.courseId),
effect.assignmentId,
effect.assignmentName,
@@ -75,10 +74,10 @@ class SubmissionCommentsEffectHandler(val context: Context) : EffectHandler {
- SubmissionService.retryCommentUpload(context, effect.commentId)
+ submissionHelper.retryCommentUpload(effect.commentId)
}
is SubmissionCommentsEffect.DeletePendingComment -> {
- SubmissionService.deletePendingComment(context, effect.commentId)
+ submissionHelper.deletePendingComment(effect.commentId)
}
SubmissionCommentsEffect.ScrollToBottom -> view?.scrollToBottom()
is SubmissionCommentsEffect.BroadcastSubmissionSelected -> {
@@ -113,11 +112,11 @@ class SubmissionCommentsEffectHandler(val context: Context) : EffectHandler