From e05e3c8c7df6f09d026876ef7497e1388da802c2 Mon Sep 17 00:00:00 2001 From: Jordan Marshall Date: Wed, 14 Oct 2020 08:30:00 -0600 Subject: [PATCH] Revert "[All] Consolidate vector resources into pandares (#1021)" (#1054) This reverts commit f9f07f859feb55aad06c452cea742ca6d5990835. --- .../student/ui/pages/InboxConversationPage.kt | 4 +- .../PickerSubmissionUploadRenderTest.kt | 4 +- .../renderTests/SubmissionFilesRenderTest.kt | 2 +- .../student/activity/NavigationActivity.kt | 2 +- .../student/adapter/CourseBrowserAdapter.kt | 40 +-- .../files/search/FileSearchFragment.kt | 2 +- .../fragment/AccountPreferencesFragment.kt | 2 +- .../fragment/AssignmentListFragment.kt | 2 +- .../student/fragment/BookmarksFragment.kt | 2 +- .../CourseModuleProgressionFragment.kt | 4 +- .../fragment/DiscussionListFragment.kt | 4 +- .../student/fragment/EditFavoritesFragment.kt | 2 +- .../student/fragment/FileDetailsFragment.kt | 2 +- .../student/fragment/FileListFragment.kt | 4 +- .../student/fragment/GradesListFragment.kt | 2 +- .../fragment/InboxConversationFragment.kt | 6 +- .../student/fragment/InboxFragment.kt | 12 +- .../student/fragment/ModuleListFragment.kt | 4 +- .../fragment/NotificationListFragment.kt | 2 +- .../student/fragment/PageListFragment.kt | 2 +- .../student/fragment/PeopleDetailsFragment.kt | 2 +- .../student/fragment/QuizListFragment.kt | 2 +- .../student/fragment/ToDoListFragment.kt | 2 +- .../fragment/ViewUnsupportedFileFragment.kt | 2 +- .../student/holders/AnnouncementViewHolder.kt | 8 +- .../student/holders/CourseViewHolder.kt | 2 +- .../student/holders/DiscussionListHolder.kt | 8 +- .../holders/EditFavoritesCourseViewHolder.kt | 2 +- .../holders/EditFavoritesGroupViewHolder.kt | 2 +- .../student/holders/FileViewHolder.kt | 16 +- .../student/holders/GradeViewHolder.kt | 4 +- .../student/holders/ModuleHeaderViewHolder.kt | 8 +- .../student/holders/ModuleViewHolder.kt | 22 +- .../student/holders/NotificationViewHolder.kt | 22 +- .../student/holders/PageViewHolder.kt | 4 +- .../student/holders/QuizViewHolder.kt | 2 +- .../student/holders/TodoViewHolder.kt | 8 +- .../AssignmentDetailsPresenter.kt | 6 +- .../file/UploadStatusSubmissionPresenter.kt | 2 +- .../picker/ui/PickerSubmissionUploadView.kt | 2 +- .../ui/views/CommentMediaAttachmentView.kt | 4 +- .../ui/views/CommentSubmissionView.kt | 14 +- .../drawer/files/SubmissionFilesPresenter.kt | 14 +- .../ui/SubmissionDetailsView.kt | 2 +- .../conference_list/ui/ConferenceListView.kt | 2 +- .../pairobserver/ui/PairObserverView.kt | 2 +- .../mobius/syllabus/SyllabusPresenter.kt | 10 +- .../mobius/syllabus/ui/SyllabusView.kt | 2 +- .../student/router/RouteMatcher.kt | 2 +- .../instructure/student/util/BinderUtils.kt | 6 +- .../com/instructure/student/util/FileUtils.kt | 12 +- .../instructure/student/util/ShortcutUtils.kt | 2 +- .../student/view/AttachmentView.kt | 26 +- .../student/widget/CanvasWidgetProvider.kt | 2 +- .../widget/NotificationViewWidgetService.kt | 20 +- .../student/widget/TodoViewWidgetService.kt | 8 +- .../ic_shortcut_bookmarks_foreground.xml | 12 +- .../ic_shortcut_calendar_foreground.xml | 0 .../ic_shortcut_notifications_foreground.xml | 0 .../drawable/ic_shortcut_todo_foreground.xml | 0 apps/student/src/main/res/drawable/vd_add.xml | 28 ++ .../src/main/res/drawable/vd_announcement.xml | 0 .../src/main/res/drawable/vd_assignment.xml | 0 .../src/main/res/drawable/vd_attachment.xml | 27 ++ .../src/main/res/drawable/vd_calendar.xml | 0 .../res/drawable/vd_calendar_announcement.xml | 12 + .../src/main/res/drawable/vd_camera.xml | 9 + .../main/res/drawable/vd_checkmark_large.xml | 28 ++ .../src/main/res/drawable/vd_clock.xml | 19 +- .../main/res/drawable/vd_collaborations.xml | 6 +- .../src/main/res/drawable/vd_conferences.xml | 6 +- .../student/src/main/res/drawable/vd_copy.xml | 0 .../src/main/res/drawable/vd_courses.xml | 0 .../src/main/res/drawable/vd_discussion.xml | 7 +- .../src/main/res/drawable/vd_document.xml | 6 +- .../src/main/res/drawable/vd_download.xml | 31 +- .../student/src/main/res/drawable/vd_edit.xml | 2 +- .../src/main/res/drawable/vd_expand.xml | 0 .../src/main/res/drawable/vd_file_upload.xml | 0 .../src/main/res/drawable/vd_files.xml | 17 +- .../src/main/res/drawable/vd_filter.xml | 0 .../src/main/res/drawable/vd_folder_solid.xml | 0 .../main/res/drawable/vd_forward_arrow.xml | 4 +- .../src/main/res/drawable/vd_grades.xml | 0 .../src/main/res/drawable/vd_hamburger.xml | 0 .../student/src/main/res/drawable/vd_home.xml | 41 +++ .../src/main/res/drawable/vd_image.xml | 33 ++ .../src/main/res/drawable/vd_inbox.xml | 0 .../student/src/main/res/drawable/vd_info.xml | 0 .../src/main/res/drawable/vd_invitation.xml | 0 .../student/src/main/res/drawable/vd_link.xml | 6 +- .../student/src/main/res/drawable/vd_lock.xml | 0 .../src/main/res/drawable/vd_lock_lined.xml | 0 .../student/src/main/res/drawable/vd_lti.xml | 0 .../src/main/res/drawable/vd_marker.xml | 0 .../src/main/res/drawable/vd_media.xml | 6 +- .../main/res/drawable/vd_media_recordings.xml | 0 .../main/res/drawable/vd_module_circle.xml | 0 .../src/main/res/drawable/vd_modules.xml | 0 .../res/drawable/vd_navigation_bookmarks.xml | 12 +- .../drawable/vd_navigation_change_user.xml | 168 +++++++++ .../main/res/drawable/vd_navigation_files.xml | 50 +++ .../main/res/drawable/vd_navigation_gauge.xml | 0 .../res/drawable/vd_navigation_logout.xml | 0 .../res/drawable/vd_navigation_settings.xml | 98 +++++ .../drawable/vd_navigation_show_grades.xml | 88 +++++ .../main/res/drawable/vd_no_pairing_code.xml | 0 .../main/res/drawable/vd_open_in_browser.xml | 4 +- .../src/main/res/drawable/vd_outcomes.xml | 0 .../res/drawable/vd_overflow_white_18dp.xml | 0 .../src/main/res/drawable/vd_pages.xml | 0 .../student/src/main/res/drawable/vd_pdf.xml | 6 +- .../src/main/res/drawable/vd_peer_review.xml | 0 .../src/main/res/drawable/vd_people.xml | 51 ++- .../student/src/main/res/drawable/vd_pin.xml | 0 .../student/src/main/res/drawable/vd_ppt.xml | 0 .../src/main/res/drawable/vd_published.xml | 15 +- .../main/res/drawable/vd_question_mark.xml | 0 .../student/src/main/res/drawable/vd_quiz.xml | 6 +- .../main/res/drawable/vd_refresh_material.xml | 0 .../src/main/res/drawable/vd_settings.xml | 60 ++++ .../src/main/res/drawable/vd_share.xml | 6 +- .../src/main/res/drawable/vd_spreadsheet.xml | 0 .../student/src/main/res/drawable/vd_star.xml | 31 ++ .../src/main/res/drawable/vd_star_filled.xml | 23 ++ .../src/main/res/drawable/vd_submitted.xml | 30 ++ .../src/main/res/drawable/vd_syllabus.xml | 0 .../main/res/drawable/vd_text_submission.xml | 0 .../src/main/res/drawable/vd_trash.xml | 24 +- .../src/main/res/drawable/vd_unsubmitted.xml | 21 ++ .../student/src/main/res/drawable/vd_user.xml | 48 ++- .../src/main/res/drawable/vd_warning.xml | 40 +++ .../main/res/drawable/vd_warning_filled.xml | 0 .../main/res/drawable/vd_website_address.xml | 0 .../src/main/res/drawable/vd_word_doc.xml | 0 .../src/main/res/drawable/vd_x_large.xml | 28 ++ .../student/src/main/res/drawable/vd_zip.xml | 0 .../res/layout/adapter_conference_item.xml | 2 +- .../layout/adapter_conference_list_empty.xml | 2 +- .../layout/adapter_conference_list_error.xml | 2 +- .../res/layout/adapter_course_browser.xml | 2 +- .../layout/adapter_course_browser_home.xml | 2 +- .../adapter_course_browser_web_view.xml | 2 +- .../main/res/layout/adapter_rubric_empty.xml | 2 +- .../adapter_submission_comment_pending.xml | 2 +- .../adapter_submission_comments_empty.xml | 2 +- .../res/layout/adapter_submission_file.xml | 4 +- .../main/res/layout/calendar_event_layout.xml | 6 +- .../res/layout/course_discussion_topic.xml | 2 +- .../res/layout/course_module_progression.xml | 6 +- .../res/layout/dialog_comment_file_picker.xml | 6 +- .../main/res/layout/dialog_photo_source.xml | 4 +- .../res/layout/dialog_submission_picker.xml | 10 +- .../layout/dialog_submission_picker_media.xml | 4 +- .../main/res/layout/empty_courses_view.xml | 2 +- .../src/main/res/layout/empty_inbox_view.xml | 2 +- .../src/main/res/layout/empty_view.xml | 2 +- .../fragment_annotation_comment_list.xml | 2 +- .../layout/fragment_assignment_details.xml | 12 +- .../layout/fragment_conference_details.xml | 2 +- .../res/layout/fragment_conference_list.xml | 2 +- .../res/layout/fragment_course_grades.xml | 2 +- .../res/layout/fragment_create_discussion.xml | 2 +- .../layout/fragment_discussions_details.xml | 4 +- .../main/res/layout/fragment_file_details.xml | 2 +- .../main/res/layout/fragment_file_list.xml | 7 +- .../main/res/layout/fragment_file_search.xml | 4 +- .../src/main/res/layout/fragment_inbox.xml | 3 +- .../layout/fragment_inbox_compose_message.xml | 2 +- .../layout/fragment_inbox_conversation.xml | 2 +- .../layout/fragment_lti_submission_view.xml | 2 +- .../layout/fragment_master_paths_locked.xml | 4 +- .../layout/fragment_media_submission_view.xml | 4 +- .../layout/fragment_nothing_to_see_here.xml | 2 +- .../res/layout/fragment_pair_observer.xml | 6 +- .../fragment_picker_submission_upload.xml | 8 +- .../layout/fragment_submission_comments.xml | 4 +- .../layout/fragment_submission_details.xml | 6 +- ...gment_submission_details_empty_content.xml | 2 +- .../res/layout/fragment_submission_files.xml | 2 +- .../layout/fragment_submission_message.xml | 2 +- ...fragment_submission_rubric_description.xml | 2 +- .../src/main/res/layout/fragment_syllabus.xml | 2 +- .../res/layout/fragment_syllabus_events.xml | 4 +- .../layout/fragment_unsupported_file_type.xml | 2 +- .../fragment_upload_status_submission.xml | 2 +- .../main/res/layout/fragment_view_image.xml | 2 +- apps/student/src/main/res/layout/legal.xml | 6 +- .../listview_widget_grades_item_row.xml | 2 +- ...istview_widget_grades_minimum_item_row.xml | 2 +- .../src/main/res/layout/navigation_drawer.xml | 24 +- .../src/main/res/layout/settings_spinner.xml | 2 +- .../res/layout/share_dialog_instructions.xml | 4 +- .../src/main/res/layout/term_spinner_view.xml | 2 +- .../src/main/res/layout/view_attachment.xml | 4 +- .../layout/view_pdf_student_submission.xml | 4 +- .../res/layout/view_student_grade_cell.xml | 10 +- .../layout/viewholder_annotation_comment.xml | 2 +- .../layout/viewholder_announcement_card.xml | 5 +- .../main/res/layout/viewholder_bookmark.xml | 4 +- .../res/layout/viewholder_card_generic.xml | 2 +- .../layout/viewholder_card_syllabus_item.xml | 2 +- .../res/layout/viewholder_course_card.xml | 2 +- .../layout/viewholder_course_invite_card.xml | 2 +- .../viewholder_dashboard_conference_card.xml | 4 +- .../main/res/layout/viewholder_discussion.xml | 4 +- .../viewholder_discussion_group_header.xml | 4 +- .../viewholder_discussion_topic_header.xml | 6 +- .../res/layout/viewholder_edit_favorites.xml | 2 +- .../src/main/res/layout/viewholder_file.xml | 4 +- .../res/layout/viewholder_file_upload.xml | 4 +- .../src/main/res/layout/viewholder_grade.xml | 4 +- .../layout/viewholder_header_expandable.xml | 2 +- .../res/layout/viewholder_header_module.xml | 6 +- .../res/layout/viewholder_header_people.xml | 2 +- .../src/main/res/layout/viewholder_inbox.xml | 4 +- .../main/res/layout/viewholder_message.xml | 2 +- .../src/main/res/layout/viewholder_module.xml | 4 +- .../res/layout/viewholder_notification.xml | 4 +- .../src/main/res/layout/viewholder_page.xml | 4 +- .../src/main/res/layout/viewholder_quiz.xml | 2 +- .../main/res/layout/viewholder_recipient.xml | 2 +- .../src/main/res/layout/viewholder_todo.xml | 2 +- .../src/main/res/layout/widget_homescreen.xml | 4 +- .../src/main/res/menu/bookmark_menu.xml | 4 +- .../src/main/res/menu/create_announcement.xml | 2 +- .../src/main/res/menu/create_discussion.xml | 4 +- .../src/main/res/menu/file_upload_menu.xml | 4 +- .../src/main/res/menu/fragment_list_todo.xml | 4 +- .../src/main/res/menu/menu_add_message.xml | 4 +- apps/student/src/main/res/menu/menu_copy.xml | 4 +- .../res/menu/menu_discussion_post_editing.xml | 27 ++ .../main/res/menu/menu_discussion_reply.xml | 4 +- .../menu/menu_discussion_reply_no_attach.xml | 2 +- .../src/main/res/menu/menu_done_generic.xml | 4 +- .../src/main/res/menu/menu_edit_generic.xml | 2 +- .../src/main/res/menu/menu_edit_page.xml | 4 +- .../src/main/res/menu/menu_favorite.xml | 2 +- .../src/main/res/menu/menu_file_list.xml | 2 +- .../src/main/res/menu/menu_filter_inbox.xml | 2 +- .../main/res/menu/menu_internal_webview.xml | 4 +- .../main/res/menu/menu_new_announcement.xml | 4 +- .../src/main/res/menu/menu_new_discussion.xml | 4 +- .../src/main/res/menu/menu_page_details.xml | 4 +- .../main/res/menu/menu_post_announcement.xml | 4 +- .../main/res/menu/menu_post_discussion.xml | 4 +- .../src/main/res/menu/pspdf_activity_menu.xml | 6 +- apps/student/src/main/res/values/styles.xml | 17 +- .../details/AssignmentDetailsPresenterTest.kt | 4 +- .../PickerSubmissionUploadPresenterTest.kt | 16 +- .../UploadStatusSubmissionPresenterTest.kt | 14 +- .../fileTab/SubmissionFilesPresenterTest.kt | 20 +- .../test/syllabus/SyllabusPresenterTest.kt | 14 +- .../student/test/util/FileUtilsTest.kt | 42 +-- .../ui/renderTests/ModuleListRenderTest.kt | 8 +- .../teacher/activities/FeedbackActivity.kt | 2 +- .../teacher/activities/InitActivity.kt | 2 +- .../adapters/AttendanceListRecyclerAdapter.kt | 2 +- .../teacher/binders/ReplyMessageBinder.kt | 43 +++ .../files/search/FileSearchFragment.kt | 6 +- .../modules/list/ModuleListPresenter.kt | 14 +- .../modules/list/ui/ModuleListView.kt | 4 +- .../fragments/AssignmentDetailsFragment.kt | 4 +- .../fragments/AssignmentListFragment.kt | 2 +- .../AssignmentSubmissionListFragment.kt | 2 +- .../teacher/fragments/CoursesFragment.kt | 2 +- .../fragments/DiscussionsDetailsFragment.kt | 4 +- .../fragments/DiscussionsListFragment.kt | 4 +- .../fragments/EditFavoritesFragment.kt | 2 +- .../teacher/fragments/FileListFragment.kt | 6 +- .../teacher/fragments/InboxFragment.kt | 8 +- .../fragments/MessageThreadFragment.kt | 4 +- .../teacher/fragments/PageListFragment.kt | 2 +- .../teacher/fragments/QuizDetailsFragment.kt | 4 +- .../teacher/fragments/QuizListFragment.kt | 2 +- .../teacher/fragments/ToDoFragment.kt | 2 +- .../fragments/ViewUnsupportedFileFragment.kt | 2 +- .../teacher/holders/AttendanceViewHolder.kt | 22 +- .../holders/CourseBrowserViewHolder.kt | 26 +- .../teacher/holders/DiscussionListHolder.kt | 4 +- .../holders/EditFavoritesViewHolder.kt | 4 +- .../teacher/holders/FileFolderViewHolder.kt | 16 +- .../teacher/holders/PageViewHolder.kt | 2 +- .../teacher/holders/QuizViewHolder.kt | 2 +- .../teacher/router/RouteMatcher.kt | 2 +- .../teacher/utils/AssignmentExtensions.kt | 14 +- .../teacher/utils/ModelExtensions.kt | 2 +- .../teacher/utils/ViewExtensions.kt | 10 +- .../view/CommentMediaAttachmentView.kt | 4 +- .../teacher/view/CommentSubmissionView.kt | 14 +- .../view/FileFolderPublishedStatusIconView.kt | 10 +- .../teacher/view/PublishedStatusIconView.kt | 8 +- .../view/edit_rubric/CriterionRatingButton.kt | 2 +- .../drawable-xxhdpi/vd_navigation_files.xml | 50 +++ .../res/drawable-xxhdpi/vd_universal_no.xml | 4 + apps/teacher/src/main/res/drawable/vd_add.xml | 22 ++ .../src/main/res/drawable/vd_announcement.xml | 86 +++++ .../main/res/drawable/vd_arrow_forward.xml | 10 + .../src/main/res/drawable/vd_assignment.xml | 56 +++ .../src/main/res/drawable/vd_attachment.xml | 58 +++ .../src/main/res/drawable/vd_attendance.xml | 44 ++- .../main/res/drawable/vd_attendance_late.xml | 20 ++ .../res/drawable/vd_attendance_missing.xml | 0 .../res/drawable/vd_attendance_present.xml | 30 ++ .../res/drawable/vd_attendance_unmarked.xml | 20 ++ .../src/main/res/drawable/vd_calendar.xml | 76 ++++ .../main/res/drawable/vd_calendarclock.xml | 42 ++- .../src/main/res/drawable/vd_camera.xml | 55 +++ .../src/main/res/drawable/vd_checkmark.xml | 11 +- .../src/main/res/drawable/vd_close.xml | 22 ++ .../main/res/drawable/vd_collapse_group.xml | 0 .../res/drawable/vd_collapse_horizontal.xml | 0 .../src/main/res/drawable/vd_course_name.xml | 6 +- .../src/main/res/drawable/vd_courses.xml | 58 +++ .../main/res/drawable/vd_courses_empty.xml | 48 +++ .../src/main/res/drawable/vd_discussion.xml | 25 ++ .../src/main/res/drawable/vd_document.xml | 33 ++ .../teacher/src/main/res/drawable/vd_edit.xml | 54 +++ .../res/drawable/vd_expand_horizontal.xml | 4 +- .../src/main/res/drawable/vd_file_upload.xml | 30 ++ .../src/main/res/drawable/vd_files.xml | 34 ++ .../src/main/res/drawable/vd_filter.xml | 26 ++ .../src/main/res/drawable/vd_folder_solid.xml | 6 + .../src/main/res/drawable/vd_hamburger.xml | 9 + .../teacher/src/main/res/drawable/vd_home.xml | 21 +- .../src/main/res/drawable/vd_image.xml | 70 ++++ .../teacher/src/main/res/drawable/vd_link.xml | 48 +++ apps/teacher/src/main/res/drawable/vd_lti.xml | 23 ++ .../src/main/res/drawable/vd_media.xml | 30 ++ .../src/main/res/drawable/vd_modules.xml | 56 +++ .../main/res/drawable/vd_navigation_arc.xml | 0 .../drawable/vd_navigation_change_user.xml | 94 +++++ .../main/res/drawable/vd_navigation_gauge.xml | 36 ++ .../res/drawable/vd_navigation_logout.xml | 39 ++ .../main/res/drawable/vd_open_in_browser.xml | 14 + .../src/main/res/drawable/vd_overflow.xml | 4 +- .../res/drawable/vd_overflow_white_18dp.xml | 16 + .../src/main/res/drawable/vd_pages.xml | 52 +++ apps/teacher/src/main/res/drawable/vd_pdf.xml | 45 +++ .../src/main/res/drawable/vd_people.xml | 102 ++++++ .../main/res/drawable/vd_play_arrow_36dp.xml | 0 apps/teacher/src/main/res/drawable/vd_ppt.xml | 6 + .../src/main/res/drawable/vd_profile.xml | 69 +++- .../src/main/res/drawable/vd_published.xml | 30 ++ .../teacher/src/main/res/drawable/vd_quiz.xml | 33 ++ .../src/main/res/drawable/vd_restricted.xml | 0 .../main/res/drawable/vd_send_white_24dp.xml | 4 + .../src/main/res/drawable/vd_settings.xml | 44 ++- .../src/main/res/drawable/vd_share.xml | 37 ++ .../src/main/res/drawable/vd_spreadsheet.xml | 6 + .../teacher/src/main/res/drawable/vd_star.xml | 66 ++++ .../src/main/res/drawable/vd_star_filled.xml | 50 +++ .../src/main/res/drawable/vd_unpublished.xml | 19 +- .../teacher/src/main/res/drawable/vd_user.xml | 119 ++++++ .../src/main/res/drawable/vd_warning.xml | 50 +++ .../src/main/res/drawable/vd_word_doc.xml | 9 + apps/teacher/src/main/res/drawable/vd_zip.xml | 6 + .../view_submission_content.xml | 4 +- .../view_submissions_donut_group.xml | 2 +- .../main/res/layout/activity_view_media.xml | 4 +- .../res/layout/adapter_annotation_comment.xml | 2 +- .../src/main/res/layout/adapter_assignee.xml | 2 +- .../adapter_assignment_group_header.xml | 4 +- .../main/res/layout/adapter_attachment.xml | 2 +- .../res/layout/adapter_course_browser.xml | 6 +- .../src/main/res/layout/adapter_courses.xml | 2 +- .../main/res/layout/adapter_discussion.xml | 2 +- .../res/layout/adapter_edit_favorites.xml | 2 +- .../adapter_gradeable_student_submission.xml | 2 +- .../src/main/res/layout/adapter_inbox.xml | 4 +- .../src/main/res/layout/adapter_message.xml | 2 +- .../src/main/res/layout/adapter_module.xml | 6 +- .../main/res/layout/adapter_module_item.xml | 6 +- .../res/layout/adapter_module_list_empty.xml | 2 +- .../layout/adapter_module_list_error_full.xml | 2 +- .../adapter_module_list_error_inline.xml | 2 +- .../adapter_student_context_submission.xml | 2 +- .../res/layout/adapter_submission_comment.xml | 4 +- .../layout/bottom_sheet_discussion_menu.xml | 8 +- .../src/main/res/layout/dialog_legal.xml | 6 +- .../dialog_sg_add_attachment_comment.xml | 4 +- .../main/res/layout/empty_courses_view.xml | 2 +- .../src/main/res/layout/empty_inbox_view.xml | 2 +- .../src/main/res/layout/empty_view.xml | 2 +- .../main/res/layout/fragment_add_message.xml | 2 +- .../fragment_annotation_comment_list.xml | 2 +- .../layout/fragment_assignment_details.xml | 8 +- .../fragment_assignment_submission_list.xml | 2 +- .../layout/fragment_course_browser_empty.xml | 3 +- .../src/main/res/layout/fragment_courses.xml | 2 +- .../res/layout/fragment_create_discussion.xml | 4 +- .../fragment_create_or_edit_announcement.xml | 2 +- .../layout/fragment_create_or_edit_page.xml | 2 +- .../res/layout/fragment_discussion_list.xml | 2 +- .../layout/fragment_discussions_details.xml | 10 +- .../fragment_edit_assignment_details.xml | 2 +- .../res/layout/fragment_edit_filefolder.xml | 2 +- .../res/layout/fragment_edit_quiz_details.xml | 2 +- .../src/main/res/layout/fragment_empty.xml | 2 +- .../main/res/layout/fragment_file_list.xml | 6 +- .../main/res/layout/fragment_file_search.xml | 5 +- .../src/main/res/layout/fragment_inbox.xml | 2 +- .../res/layout/fragment_message_thread.xml | 2 +- .../res/layout/fragment_not_a_teacher.xml | 4 +- .../main/res/layout/fragment_page_list.xml | 2 +- .../main/res/layout/fragment_post_grade.xml | 2 +- .../layout/fragment_post_policy_settings.xml | 2 +- .../main/res/layout/fragment_profile_edit.xml | 2 +- .../main/res/layout/fragment_quiz_details.xml | 6 +- .../src/main/res/layout/fragment_settings.xml | 2 +- .../fragment_speed_grader_lti_submission.xml | 2 +- .../layout/fragment_speed_grader_media.xml | 4 +- .../fragment_speed_grader_quiz_submission.xml | 2 +- .../layout/fragment_speedgrader_comments.xml | 4 +- .../res/layout/fragment_speedgrader_empty.xml | 2 +- .../res/layout/fragment_speedgrader_grade.xml | 4 +- .../fragment_speedgrader_url_submission.xml | 4 +- .../res/layout/fragment_student_context.xml | 2 +- .../layout/fragment_unsupported_file_type.xml | 2 +- .../main/res/layout/fragment_view_image.xml | 2 +- .../src/main/res/layout/navigation_drawer.xml | 21 +- .../res/layout/view_edit_course_homepage.xml | 4 +- .../res/layout/view_edit_grade_comment.xml | 2 +- .../main/res/layout/view_rename_course.xml | 4 +- .../res/layout/view_rubric_criterion_item.xml | 2 +- .../res/layout/view_submission_content.xml | 4 +- .../layout/view_submissions_donut_group.xml | 2 +- .../layout/viewholder_header_expandable.xml | 4 +- .../main/res/layout/viewholder_recipient.xml | 2 +- .../src/main/res/menu/courses_fragment.xml | 2 +- .../src/main/res/menu/create_announcement.xml | 4 +- .../src/main/res/menu/create_discussion.xml | 4 +- .../main/res/menu/menu_assignment_list.xml | 4 +- .../src/main/res/menu/menu_attendance.xml | 4 +- .../menu/menu_compose_message_activity.xml | 4 +- .../src/main/res/menu/menu_course_browser.xml | 2 +- .../res/menu/menu_create_or_edit_page.xml | 2 +- .../main/res/menu/menu_discussion_reply.xml | 4 +- .../src/main/res/menu/menu_edit_generic.xml | 2 +- .../src/main/res/menu/menu_file_list.xml | 4 +- .../src/main/res/menu/menu_filter_inbox.xml | 4 +- .../main/res/menu/menu_internal_webview.xml | 4 +- .../src/main/res/menu/menu_page_details.xml | 4 +- .../src/main/res/menu/menu_people_list.xml | 4 +- .../src/main/res/menu/menu_settings_edit.xml | 2 +- .../src/main/res/menu/menu_share_file.xml | 4 +- apps/teacher/src/main/res/values/styles.xml | 21 +- .../unit/modules/ModuleListPresenterTest.kt | 16 +- libs/annotations/build.gradle | 1 - .../annotations/PdfSubmissionView.kt | 2 +- .../src/main/res/drawable/vd_edit.xml | 70 ++++ .../res/drawable/vd_highlighter_icon.xml} | 0 .../src/main/res/drawable/vd_ink_icon.xml} | 0 .../src/main/res/drawable/vd_square_icon.xml} | 0 .../src/main/res/drawable/vd_stamp_icon.xml} | 0 .../res/drawable/vd_strike_through_icon.xml} | 0 .../main/res/drawable/vd_text_box_icon.xml} | 0 .../src/main/res/drawable/vd_trash.xml | 64 ++++ .../drawable-hdpi/ic_splash_icon_polls.png | Bin 0 -> 309 bytes .../drawable-mdpi/ic_splash_icon_polls.png | Bin 0 -> 234 bytes .../drawable-xhdpi/ic_splash_icon_polls.png | Bin 0 -> 509 bytes .../drawable-xxhdpi/ic_splash_icon_polls.png | Bin 0 -> 850 bytes .../drawable-xxxhdpi/ic_splash_icon_polls.png | Bin 0 -> 1180 bytes .../src/main/res/drawable/ic_qr_code.xml | 0 .../src/main/res/drawable/vd_back_arrow.xml} | 0 .../src/main/res/drawable/vd_canvas_logo.xml} | 0 .../main/res/drawable/vd_canvas_logo_red.xml} | 0 .../src/main/res/drawable/vd_close_gray.xml | 31 ++ .../src/main/res/drawable/vd_masquerade.xml} | 0 .../res/drawable/vd_masquerade_panda_red.xml} | 0 .../drawable/vd_masquerade_panda_white.xml} | 0 .../activity_login_landing_page.xml | 2 +- .../main/res/layout/accounts_adapter_item.xml | 4 +- .../layout/activity_login_landing_page.xml | 4 +- .../res/layout/adapter_previous_users.xml | 7 +- .../main/res/layout/dialog_masquerading.xml | 6 +- .../layout/layout_masquerade_notification.xml | 2 +- .../main/res/layout/login_toolbar_icon.xml | 4 +- .../main/res/drawable/bottom_nav_alerts.xml | 4 +- .../main/res/drawable/bottom_nav_calendar.xml | 4 +- .../main/res/drawable/bottom_nav_courses.xml | 4 +- .../res/drawable/bottom_nav_dashboard.xml | 4 +- .../main/res/drawable/bottom_nav_inbox.xml | 4 +- .../src/main/res/drawable/bottom_nav_todo.xml | 4 +- .../main/res/drawable/ic_filter_filled.xml | 1 + .../src/main/res/drawable/ic_mail_filled.xml | 26 ++ ...from_camera.xml => vd_add_from_camera.xml} | 0 ...from_device.xml => vd_add_from_device.xml} | 0 ...om_gallery.xml => vd_add_from_gallery.xml} | 0 .../drawable/{ic_audio.xml => vd_audio.xml} | 0 ....xml => vd_bottom_nav_alerts_selected.xml} | 0 ...ml => vd_bottom_nav_alerts_unselected.xml} | 0 ...ml => vd_bottom_nav_calendar_selected.xml} | 0 ... => vd_bottom_nav_calendar_unselected.xml} | 0 ...xml => vd_bottom_nav_courses_selected.xml} | 0 ...l => vd_bottom_nav_courses_unselected.xml} | 0 ...l => vd_bottom_nav_dashboard_selected.xml} | 0 ...=> vd_bottom_nav_dashboard_unselected.xml} | 0 ...d.xml => vd_bottom_nav_inbox_selected.xml} | 0 ...xml => vd_bottom_nav_inbox_unselected.xml} | 0 ...ed.xml => vd_bottom_nav_todo_selected.xml} | 0 ....xml => vd_bottom_nav_todo_unselected.xml} | 0 ...as_wordmark.xml => vd_canvas_wordmark.xml} | 0 ...c_chevron_left.xml => vd_chevron_left.xml} | 0 ...chevron_right.xml => vd_chevron_right.xml} | 0 .../res/drawable/{ic_drag.xml => vd_drag.xml} | 0 .../src/main/res/drawable/vd_error.xml | 28 ++ ...c_grade_hidden.xml => vd_grade_hidden.xml} | 0 .../{ic_info_solid.xml => vd_info_solid.xml} | 0 .../{ic_mail_solid.xml => vd_mail_solid.xml} | 0 ...on_studio.xml => vd_navigation_studio.xml} | 0 ..._externally.xml => vd_open_externally.xml} | 0 ...to_see.xml => vd_panda_nothing_to_see.xml} | 0 ...ns.xml => vd_panda_online_submissions.xml} | 0 .../src/main/res/drawable/vd_rubric.xml | 29 ++ .../src/main/res/drawable/vd_trash.xml | 48 +++ ...content.xml => vd_unsupported_content.xml} | 0 .../drawable/{ic_video.xml => vd_video.xml} | 0 .../pandautils/dialogs/UploadFilesDialog.kt | 4 +- .../pandautils/utils/AvatarCropUtils.kt | 2 +- .../pandautils/utils/ProfileUtils.kt | 2 +- .../pandautils/utils/ViewExtensions.kt | 22 +- .../pandautils/views/AttachmentView.kt | 26 +- .../pandautils/views/ColorPickerIcon.kt | 8 +- .../pandautils/views/NestedIconView.kt | 12 +- .../src/main/res/drawable-ldrtl/vd_send.xml} | 0 .../src/main/res/drawable/vd_add.xml} | 0 .../src/main/res/drawable/vd_camera.xml | 70 ++++ .../res/drawable/vd_check_white_24dp.xml} | 0 .../src/main/res/drawable/vd_close_white.xml} | 0 .../res/drawable/vd_color_picker_circle.xml} | 0 .../src/main/res/drawable/vd_edit.xml | 54 +++ .../res/drawable/vd_fullscreen_white.xml} | 0 .../src/main/res/drawable/vd_group.xml} | 6 +- .../src/main/res/drawable/vd_image.xml | 85 +++++ .../main/res/drawable/vd_panda_balloon.xml} | 0 .../res/drawable/vd_panda_choosefile.xml} | 0 .../res/drawable/vd_panda_inboxarchived.xml} | 0 .../main/res/drawable/vd_panda_inboxsent.xml} | 0 .../res/drawable/vd_panda_inboxstarred.xml} | 0 .../main/res/drawable/vd_panda_inboxzero.xml} | 0 .../main/res/drawable/vd_panda_locked.xml} | 0 .../main/res/drawable/vd_panda_noalerts.xml} | 0 .../drawable/vd_panda_noannouncements.xml} | 0 .../res/drawable/vd_panda_nobookmarks.xml} | 0 .../main/res/drawable/vd_panda_nocourses.xml} | 0 .../res/drawable/vd_panda_nodiscussions.xml} | 0 .../main/res/drawable/vd_panda_noevents.xml | 340 ++++++++++++++++++ .../main/res/drawable/vd_panda_nofiles.xml} | 0 .../main/res/drawable/vd_panda_nomodules.xml} | 0 .../res/drawable/vd_panda_nosyllabus.xml} | 0 .../res/drawable/vd_panda_notsupported.xml} | 0 .../res/drawable/vd_panda_quizzes_rocket.xml} | 0 .../main/res/drawable/vd_panda_sleeping.xml} | 0 .../src/main/res/drawable/vd_panda_space.xml} | 0 .../src/main/res/drawable/vd_play_arrow.xml | 10 + .../res/drawable/vd_search_white_24dp.xml} | 0 .../src/main/res/drawable/vd_send.xml} | 0 .../src/main/res/drawable/vd_super_panda.xml} | 0 .../src/main/res/drawable/vd_user.xml | 119 ++++++ .../main/res/drawable/vd_utils_attachment.xml | 74 ++++ .../src/main/res/drawable/vd_utils_audio.xml | 53 +++ .../src/main/res/drawable/vd_utils_camera.xml | 55 +++ .../main/res/drawable/vd_utils_checkmark.xml | 22 ++ .../src/main/res/drawable/vd_utils_close.xml | 22 ++ .../main/res/drawable/vd_utils_document.xml | 33 ++ .../main/res/drawable/vd_utils_download.xml | 62 ++++ .../src/main/res/drawable/vd_utils_image.xml | 70 ++++ .../src/main/res/drawable/vd_utils_media.xml | 30 ++ .../src/main/res/drawable/vd_utils_pdf.xml | 45 +++ .../main/res/layout/activity_view_media.xml | 4 +- .../main/res/layout/adapter_file_uploads.xml | 4 +- .../main/res/layout/avatar_crop_activity.xml | 2 +- .../main/res/layout/dialog_files_upload.xml | 8 +- .../main/res/layout/dialog_profile_source.xml | 4 +- .../src/main/res/layout/view_attachment.xml | 4 +- .../layout/view_floating_media_recorder.xml | 8 +- .../src/main/res/menu/avatar_crop_menu.xml | 2 +- libs/pandautils/src/main/res/menu/search.xml | 2 +- .../main/res/menu/utils_menu_edit_generic.xml | 2 +- .../pandautils/src/main/res/values/styles.xml | 2 +- .../java/instructure/rceditor/RCEFragment.kt | 2 +- ...ed.xml => vd_rce_format_list_numbered.xml} | 0 ...rder_color.xml => vd_rce_border_color.xml} | 0 .../{ic_rce_cancel.xml => vd_rce_cancel.xml} | 0 ...ter.xml => vd_rce_format_align_center.xml} | 0 ..._left.xml => vd_rce_format_align_left.xml} | 0 ...ight.xml => vd_rce_format_align_right.xml} | 0 ...format_bold.xml => vd_rce_format_bold.xml} | 0 ..._text.xml => vd_rce_format_color_text.xml} | 0 ....xml => vd_rce_format_indent_decrease.xml} | 0 ....xml => vd_rce_format_indent_increase.xml} | 0 ...at_italic.xml => vd_rce_format_italic.xml} | 0 ...ed.xml => vd_rce_format_list_bulleted.xml} | 0 ...ed.xml => vd_rce_format_list_numbered.xml} | 0 ...rmat_quote.xml => vd_rce_format_quote.xml} | 0 ...lined.xml => vd_rce_format_underlined.xml} | 0 ...insert_link.xml => vd_rce_insert_link.xml} | 0 ...sert_photo.xml => vd_rce_insert_photo.xml} | 0 .../{ic_rce_redo.xml => vd_rce_redo.xml} | 0 ...rough_s.xml => vd_rce_strikethrough_s.xml} | 0 ...e_text_black.xml => vd_rce_text_black.xml} | 0 ...rce_text_blue.xml => vd_rce_text_blue.xml} | 0 ...rce_text_gray.xml => vd_rce_text_gray.xml} | 0 ...e_text_green.xml => vd_rce_text_green.xml} | 0 ...text_orange.xml => vd_rce_text_orange.xml} | 0 ...text_purple.xml => vd_rce_text_purple.xml} | 0 ...c_rce_text_red.xml => vd_rce_text_red.xml} | 0 ...e_text_white.xml => vd_rce_text_white.xml} | 0 ...text_yellow.xml => vd_rce_text_yellow.xml} | 0 .../{ic_rce_undo.xml => vd_rce_undo.xml} | 0 .../src/main/res/layout/rce_controller.xml | 36 +- 612 files changed, 5535 insertions(+), 888 deletions(-) rename {libs/pandares => apps/student}/src/main/res/drawable/ic_shortcut_bookmarks_foreground.xml (74%) rename {libs/pandares => apps/student}/src/main/res/drawable/ic_shortcut_calendar_foreground.xml (100%) rename {libs/pandares => apps/student}/src/main/res/drawable/ic_shortcut_notifications_foreground.xml (100%) rename {libs/pandares => apps/student}/src/main/res/drawable/ic_shortcut_todo_foreground.xml (100%) create mode 100644 apps/student/src/main/res/drawable/vd_add.xml rename libs/pandares/src/main/res/drawable/ic_announcement.xml => apps/student/src/main/res/drawable/vd_announcement.xml (100%) rename libs/pandares/src/main/res/drawable/ic_assignment.xml => apps/student/src/main/res/drawable/vd_assignment.xml (100%) rename libs/pandares/src/main/res/drawable/ic_attachment.xml => apps/student/src/main/res/drawable/vd_attachment.xml (60%) rename libs/pandares/src/main/res/drawable/ic_calendar.xml => apps/student/src/main/res/drawable/vd_calendar.xml (100%) create mode 100644 apps/student/src/main/res/drawable/vd_calendar_announcement.xml rename libs/pandares/src/main/res/drawable/ic_camera.xml => apps/student/src/main/res/drawable/vd_camera.xml (92%) mode change 100644 => 100755 create mode 100644 apps/student/src/main/res/drawable/vd_checkmark_large.xml rename libs/pandares/src/main/res/drawable/ic_clock.xml => apps/student/src/main/res/drawable/vd_clock.xml (66%) rename libs/pandares/src/main/res/drawable/ic_collaborations.xml => apps/student/src/main/res/drawable/vd_collaborations.xml (96%) rename libs/pandares/src/main/res/drawable/ic_conferences.xml => apps/student/src/main/res/drawable/vd_conferences.xml (94%) rename libs/pandares/src/main/res/drawable/ic_copy.xml => apps/student/src/main/res/drawable/vd_copy.xml (100%) rename libs/pandares/src/main/res/drawable/ic_courses.xml => apps/student/src/main/res/drawable/vd_courses.xml (100%) rename libs/pandares/src/main/res/drawable/ic_discussion.xml => apps/student/src/main/res/drawable/vd_discussion.xml (92%) rename libs/pandares/src/main/res/drawable/ic_document.xml => apps/student/src/main/res/drawable/vd_document.xml (93%) rename libs/pandares/src/main/res/drawable/ic_download.xml => apps/student/src/main/res/drawable/vd_download.xml (59%) rename libs/pandares/src/main/res/drawable/ic_edit.xml => apps/student/src/main/res/drawable/vd_edit.xml (98%) rename libs/pandares/src/main/res/drawable/ic_expand.xml => apps/student/src/main/res/drawable/vd_expand.xml (100%) rename libs/pandares/src/main/res/drawable/ic_file_upload.xml => apps/student/src/main/res/drawable/vd_file_upload.xml (100%) rename libs/pandares/src/main/res/drawable/ic_files.xml => apps/student/src/main/res/drawable/vd_files.xml (66%) rename libs/pandares/src/main/res/drawable/ic_filter.xml => apps/student/src/main/res/drawable/vd_filter.xml (100%) rename libs/pandares/src/main/res/drawable/ic_folder_solid.xml => apps/student/src/main/res/drawable/vd_folder_solid.xml (100%) rename libs/pandares/src/main/res/drawable/ic_forward_arrow.xml => apps/student/src/main/res/drawable/vd_forward_arrow.xml (93%) rename libs/pandares/src/main/res/drawable/ic_grades.xml => apps/student/src/main/res/drawable/vd_grades.xml (100%) rename libs/pandares/src/main/res/drawable/ic_hamburger.xml => apps/student/src/main/res/drawable/vd_hamburger.xml (100%) create mode 100755 apps/student/src/main/res/drawable/vd_home.xml rename libs/pandares/src/main/res/drawable/ic_image.xml => apps/student/src/main/res/drawable/vd_image.xml (58%) rename libs/pandares/src/main/res/drawable/ic_inbox.xml => apps/student/src/main/res/drawable/vd_inbox.xml (100%) rename libs/pandares/src/main/res/drawable/ic_info.xml => apps/student/src/main/res/drawable/vd_info.xml (100%) rename libs/pandares/src/main/res/drawable/ic_invitation.xml => apps/student/src/main/res/drawable/vd_invitation.xml (100%) rename libs/pandares/src/main/res/drawable/ic_link.xml => apps/student/src/main/res/drawable/vd_link.xml (95%) rename libs/pandares/src/main/res/drawable/ic_lock.xml => apps/student/src/main/res/drawable/vd_lock.xml (100%) rename libs/pandares/src/main/res/drawable/ic_lock_lined.xml => apps/student/src/main/res/drawable/vd_lock_lined.xml (100%) rename libs/pandares/src/main/res/drawable/ic_lti.xml => apps/student/src/main/res/drawable/vd_lti.xml (100%) rename libs/pandares/src/main/res/drawable/ic_marker.xml => apps/student/src/main/res/drawable/vd_marker.xml (100%) rename libs/pandares/src/main/res/drawable/ic_media.xml => apps/student/src/main/res/drawable/vd_media.xml (92%) rename libs/pandares/src/main/res/drawable/ic_media_recordings.xml => apps/student/src/main/res/drawable/vd_media_recordings.xml (100%) rename libs/pandares/src/main/res/drawable/ic_module_circle.xml => apps/student/src/main/res/drawable/vd_module_circle.xml (100%) rename libs/pandares/src/main/res/drawable/ic_modules.xml => apps/student/src/main/res/drawable/vd_modules.xml (100%) rename libs/pandares/src/main/res/drawable/ic_navigation_bookmarks.xml => apps/student/src/main/res/drawable/vd_navigation_bookmarks.xml (74%) create mode 100644 apps/student/src/main/res/drawable/vd_navigation_change_user.xml create mode 100644 apps/student/src/main/res/drawable/vd_navigation_files.xml rename libs/pandares/src/main/res/drawable/ic_navigation_gauge.xml => apps/student/src/main/res/drawable/vd_navigation_gauge.xml (100%) rename libs/pandares/src/main/res/drawable/ic_navigation_logout.xml => apps/student/src/main/res/drawable/vd_navigation_logout.xml (100%) create mode 100644 apps/student/src/main/res/drawable/vd_navigation_settings.xml create mode 100644 apps/student/src/main/res/drawable/vd_navigation_show_grades.xml rename libs/pandares/src/main/res/drawable/ic_panda_no_pairing_code.xml => apps/student/src/main/res/drawable/vd_no_pairing_code.xml (100%) rename libs/pandares/src/main/res/drawable/ic_open_in_browser.xml => apps/student/src/main/res/drawable/vd_open_in_browser.xml (94%) rename libs/pandares/src/main/res/drawable/ic_outcomes.xml => apps/student/src/main/res/drawable/vd_outcomes.xml (100%) rename libs/pandares/src/main/res/drawable/ic_overflow_white_18dp.xml => apps/student/src/main/res/drawable/vd_overflow_white_18dp.xml (100%) rename libs/pandares/src/main/res/drawable/ic_pages.xml => apps/student/src/main/res/drawable/vd_pages.xml (100%) rename libs/pandares/src/main/res/drawable/ic_pdf.xml => apps/student/src/main/res/drawable/vd_pdf.xml (94%) rename libs/pandares/src/main/res/drawable/ic_peer_review.xml => apps/student/src/main/res/drawable/vd_peer_review.xml (100%) rename libs/pandares/src/main/res/drawable/ic_people.xml => apps/student/src/main/res/drawable/vd_people.xml (55%) rename libs/pandares/src/main/res/drawable/ic_pin.xml => apps/student/src/main/res/drawable/vd_pin.xml (100%) rename libs/pandares/src/main/res/drawable/ic_ppt.xml => apps/student/src/main/res/drawable/vd_ppt.xml (100%) rename libs/pandares/src/main/res/drawable/ic_complete_solid.xml => apps/student/src/main/res/drawable/vd_published.xml (70%) rename libs/pandares/src/main/res/drawable/ic_question_mark.xml => apps/student/src/main/res/drawable/vd_question_mark.xml (100%) rename libs/pandares/src/main/res/drawable/ic_quiz.xml => apps/student/src/main/res/drawable/vd_quiz.xml (94%) rename libs/pandares/src/main/res/drawable/ic_refresh_material.xml => apps/student/src/main/res/drawable/vd_refresh_material.xml (100%) create mode 100644 apps/student/src/main/res/drawable/vd_settings.xml rename libs/pandares/src/main/res/drawable/ic_share.xml => apps/student/src/main/res/drawable/vd_share.xml (92%) rename libs/pandares/src/main/res/drawable/ic_spreadsheet.xml => apps/student/src/main/res/drawable/vd_spreadsheet.xml (100%) rename libs/pandares/src/main/res/drawable/ic_star.xml => apps/student/src/main/res/drawable/vd_star.xml (59%) rename libs/pandares/src/main/res/drawable/ic_star_filled.xml => apps/student/src/main/res/drawable/vd_star_filled.xml (62%) create mode 100755 apps/student/src/main/res/drawable/vd_submitted.xml rename libs/pandares/src/main/res/drawable/ic_syllabus.xml => apps/student/src/main/res/drawable/vd_syllabus.xml (100%) rename libs/pandares/src/main/res/drawable/ic_text_submission.xml => apps/student/src/main/res/drawable/vd_text_submission.xml (100%) rename libs/pandares/src/main/res/drawable/ic_trash.xml => apps/student/src/main/res/drawable/vd_trash.xml (62%) create mode 100755 apps/student/src/main/res/drawable/vd_unsubmitted.xml rename libs/pandares/src/main/res/drawable/ic_user_avatar.xml => apps/student/src/main/res/drawable/vd_user.xml (61%) create mode 100755 apps/student/src/main/res/drawable/vd_warning.xml rename libs/pandares/src/main/res/drawable/ic_warning.xml => apps/student/src/main/res/drawable/vd_warning_filled.xml (100%) rename libs/pandares/src/main/res/drawable/ic_website_address.xml => apps/student/src/main/res/drawable/vd_website_address.xml (100%) rename libs/pandares/src/main/res/drawable/ic_word_doc.xml => apps/student/src/main/res/drawable/vd_word_doc.xml (100%) create mode 100644 apps/student/src/main/res/drawable/vd_x_large.xml rename libs/pandares/src/main/res/drawable/ic_zip.xml => apps/student/src/main/res/drawable/vd_zip.xml (100%) create mode 100644 apps/student/src/main/res/menu/menu_discussion_post_editing.xml create mode 100644 apps/teacher/src/main/java/com/instructure/teacher/binders/ReplyMessageBinder.kt create mode 100644 apps/teacher/src/main/res/drawable-xxhdpi/vd_navigation_files.xml rename libs/pandares/src/main/res/drawable/ic_no.xml => apps/teacher/src/main/res/drawable-xxhdpi/vd_universal_no.xml (90%) create mode 100755 apps/teacher/src/main/res/drawable/vd_add.xml create mode 100755 apps/teacher/src/main/res/drawable/vd_announcement.xml create mode 100644 apps/teacher/src/main/res/drawable/vd_arrow_forward.xml create mode 100755 apps/teacher/src/main/res/drawable/vd_assignment.xml create mode 100755 apps/teacher/src/main/res/drawable/vd_attachment.xml rename libs/pandares/src/main/res/drawable/ic_attendance.xml => apps/teacher/src/main/res/drawable/vd_attendance.xml (50%) create mode 100755 apps/teacher/src/main/res/drawable/vd_attendance_late.xml rename libs/pandares/src/main/res/drawable/ic_attendance_missing.xml => apps/teacher/src/main/res/drawable/vd_attendance_missing.xml (100%) create mode 100755 apps/teacher/src/main/res/drawable/vd_attendance_present.xml create mode 100755 apps/teacher/src/main/res/drawable/vd_attendance_unmarked.xml create mode 100755 apps/teacher/src/main/res/drawable/vd_calendar.xml rename libs/pandares/src/main/res/drawable/ic_calendarclock.xml => apps/teacher/src/main/res/drawable/vd_calendarclock.xml (50%) create mode 100755 apps/teacher/src/main/res/drawable/vd_camera.xml rename libs/pandares/src/main/res/drawable/ic_checkmark.xml => apps/teacher/src/main/res/drawable/vd_checkmark.xml (54%) create mode 100755 apps/teacher/src/main/res/drawable/vd_close.xml rename libs/pandares/src/main/res/drawable/ic_collapse_group.xml => apps/teacher/src/main/res/drawable/vd_collapse_group.xml (100%) rename libs/pandares/src/main/res/drawable/ic_collapse_horizontal.xml => apps/teacher/src/main/res/drawable/vd_collapse_horizontal.xml (100%) rename libs/pandares/src/main/res/drawable/ic_course_name.xml => apps/teacher/src/main/res/drawable/vd_course_name.xml (92%) create mode 100755 apps/teacher/src/main/res/drawable/vd_courses.xml create mode 100755 apps/teacher/src/main/res/drawable/vd_courses_empty.xml create mode 100755 apps/teacher/src/main/res/drawable/vd_discussion.xml create mode 100755 apps/teacher/src/main/res/drawable/vd_document.xml create mode 100755 apps/teacher/src/main/res/drawable/vd_edit.xml rename libs/pandares/src/main/res/drawable/ic_expand_horizontal.xml => apps/teacher/src/main/res/drawable/vd_expand_horizontal.xml (85%) create mode 100644 apps/teacher/src/main/res/drawable/vd_file_upload.xml create mode 100755 apps/teacher/src/main/res/drawable/vd_files.xml create mode 100755 apps/teacher/src/main/res/drawable/vd_filter.xml create mode 100644 apps/teacher/src/main/res/drawable/vd_folder_solid.xml create mode 100644 apps/teacher/src/main/res/drawable/vd_hamburger.xml rename libs/pandares/src/main/res/drawable/ic_home.xml => apps/teacher/src/main/res/drawable/vd_home.xml (67%) create mode 100755 apps/teacher/src/main/res/drawable/vd_image.xml create mode 100755 apps/teacher/src/main/res/drawable/vd_link.xml create mode 100755 apps/teacher/src/main/res/drawable/vd_lti.xml create mode 100755 apps/teacher/src/main/res/drawable/vd_media.xml create mode 100755 apps/teacher/src/main/res/drawable/vd_modules.xml rename libs/pandares/src/main/res/drawable/ic_navigation_arc.xml => apps/teacher/src/main/res/drawable/vd_navigation_arc.xml (100%) create mode 100644 apps/teacher/src/main/res/drawable/vd_navigation_change_user.xml create mode 100644 apps/teacher/src/main/res/drawable/vd_navigation_gauge.xml create mode 100644 apps/teacher/src/main/res/drawable/vd_navigation_logout.xml create mode 100644 apps/teacher/src/main/res/drawable/vd_open_in_browser.xml rename libs/pandares/src/main/res/drawable/ic_overflow.xml => apps/teacher/src/main/res/drawable/vd_overflow.xml (87%) create mode 100644 apps/teacher/src/main/res/drawable/vd_overflow_white_18dp.xml create mode 100755 apps/teacher/src/main/res/drawable/vd_pages.xml create mode 100755 apps/teacher/src/main/res/drawable/vd_pdf.xml create mode 100755 apps/teacher/src/main/res/drawable/vd_people.xml rename libs/pandares/src/main/res/drawable/ic_play_arrow.xml => apps/teacher/src/main/res/drawable/vd_play_arrow_36dp.xml (100%) create mode 100644 apps/teacher/src/main/res/drawable/vd_ppt.xml rename libs/pandares/src/main/res/drawable/ic_user.xml => apps/teacher/src/main/res/drawable/vd_profile.xml (50%) create mode 100755 apps/teacher/src/main/res/drawable/vd_published.xml create mode 100755 apps/teacher/src/main/res/drawable/vd_quiz.xml rename libs/pandares/src/main/res/drawable/ic_restricted.xml => apps/teacher/src/main/res/drawable/vd_restricted.xml (100%) create mode 100644 apps/teacher/src/main/res/drawable/vd_send_white_24dp.xml rename libs/pandares/src/main/res/drawable/ic_settings.xml => apps/teacher/src/main/res/drawable/vd_settings.xml (50%) create mode 100644 apps/teacher/src/main/res/drawable/vd_share.xml create mode 100644 apps/teacher/src/main/res/drawable/vd_spreadsheet.xml create mode 100755 apps/teacher/src/main/res/drawable/vd_star.xml create mode 100755 apps/teacher/src/main/res/drawable/vd_star_filled.xml rename libs/pandares/src/main/res/drawable/ic_complete.xml => apps/teacher/src/main/res/drawable/vd_unpublished.xml (52%) create mode 100755 apps/teacher/src/main/res/drawable/vd_user.xml create mode 100755 apps/teacher/src/main/res/drawable/vd_warning.xml create mode 100644 apps/teacher/src/main/res/drawable/vd_word_doc.xml create mode 100644 apps/teacher/src/main/res/drawable/vd_zip.xml create mode 100755 libs/annotations/src/main/res/drawable/vd_edit.xml rename libs/{pandares/src/main/res/drawable/ic_highlighter_icon.xml => annotations/src/main/res/drawable/vd_highlighter_icon.xml} (100%) rename libs/{pandares/src/main/res/drawable/ic_ink_icon.xml => annotations/src/main/res/drawable/vd_ink_icon.xml} (100%) rename libs/{pandares/src/main/res/drawable/ic_square_icon.xml => annotations/src/main/res/drawable/vd_square_icon.xml} (100%) rename libs/{pandares/src/main/res/drawable/ic_stamp_icon.xml => annotations/src/main/res/drawable/vd_stamp_icon.xml} (100%) rename libs/{pandares/src/main/res/drawable/ic_strike_through_icon.xml => annotations/src/main/res/drawable/vd_strike_through_icon.xml} (100%) rename libs/{pandares/src/main/res/drawable/ic_text_box_icon.xml => annotations/src/main/res/drawable/vd_text_box_icon.xml} (100%) create mode 100755 libs/annotations/src/main/res/drawable/vd_trash.xml create mode 100644 libs/login-api-2/src/main/res/drawable-hdpi/ic_splash_icon_polls.png create mode 100644 libs/login-api-2/src/main/res/drawable-mdpi/ic_splash_icon_polls.png create mode 100644 libs/login-api-2/src/main/res/drawable-xhdpi/ic_splash_icon_polls.png create mode 100644 libs/login-api-2/src/main/res/drawable-xxhdpi/ic_splash_icon_polls.png create mode 100644 libs/login-api-2/src/main/res/drawable-xxxhdpi/ic_splash_icon_polls.png rename libs/{pandares => login-api-2}/src/main/res/drawable/ic_qr_code.xml (100%) rename libs/{pandares/src/main/res/drawable/ic_back_arrow.xml => login-api-2/src/main/res/drawable/vd_back_arrow.xml} (100%) rename libs/{pandares/src/main/res/drawable/ic_canvas_logo.xml => login-api-2/src/main/res/drawable/vd_canvas_logo.xml} (100%) rename libs/{pandares/src/main/res/drawable/ic_canvas_logo_red.xml => login-api-2/src/main/res/drawable/vd_canvas_logo_red.xml} (100%) create mode 100644 libs/login-api-2/src/main/res/drawable/vd_close_gray.xml rename libs/{pandares/src/main/res/drawable/ic_masquerade.xml => login-api-2/src/main/res/drawable/vd_masquerade.xml} (100%) rename libs/{pandares/src/main/res/drawable/ic_masquerade_panda_red.xml => login-api-2/src/main/res/drawable/vd_masquerade_panda_red.xml} (100%) rename libs/{pandares/src/main/res/drawable/ic_masquerade_panda_white.xml => login-api-2/src/main/res/drawable/vd_masquerade_panda_white.xml} (100%) create mode 100644 libs/pandares/src/main/res/drawable/ic_mail_filled.xml rename libs/pandares/src/main/res/drawable/{ic_add_from_camera.xml => vd_add_from_camera.xml} (100%) rename libs/pandares/src/main/res/drawable/{ic_add_from_device.xml => vd_add_from_device.xml} (100%) rename libs/pandares/src/main/res/drawable/{ic_add_from_gallery.xml => vd_add_from_gallery.xml} (100%) rename libs/pandares/src/main/res/drawable/{ic_audio.xml => vd_audio.xml} (100%) rename libs/pandares/src/main/res/drawable/{ic_bottom_nav_alerts_selected.xml => vd_bottom_nav_alerts_selected.xml} (100%) rename libs/pandares/src/main/res/drawable/{ic_bottom_nav_alerts_unselected.xml => vd_bottom_nav_alerts_unselected.xml} (100%) rename libs/pandares/src/main/res/drawable/{ic_bottom_nav_calendar_selected.xml => vd_bottom_nav_calendar_selected.xml} (100%) rename libs/pandares/src/main/res/drawable/{ic_bottom_nav_calendar_unselected.xml => vd_bottom_nav_calendar_unselected.xml} (100%) rename libs/pandares/src/main/res/drawable/{ic_bottom_nav_courses_selected.xml => vd_bottom_nav_courses_selected.xml} (100%) rename libs/pandares/src/main/res/drawable/{ic_bottom_nav_courses_unselected.xml => vd_bottom_nav_courses_unselected.xml} (100%) rename libs/pandares/src/main/res/drawable/{ic_bottom_nav_dashboard_selected.xml => vd_bottom_nav_dashboard_selected.xml} (100%) rename libs/pandares/src/main/res/drawable/{ic_bottom_nav_dashboard_unselected.xml => vd_bottom_nav_dashboard_unselected.xml} (100%) rename libs/pandares/src/main/res/drawable/{ic_bottom_nav_inbox_selected.xml => vd_bottom_nav_inbox_selected.xml} (100%) rename libs/pandares/src/main/res/drawable/{ic_bottom_nav_inbox_unselected.xml => vd_bottom_nav_inbox_unselected.xml} (100%) rename libs/pandares/src/main/res/drawable/{ic_bottom_nav_todo_selected.xml => vd_bottom_nav_todo_selected.xml} (100%) rename libs/pandares/src/main/res/drawable/{ic_bottom_nav_todo_unselected.xml => vd_bottom_nav_todo_unselected.xml} (100%) rename libs/pandares/src/main/res/drawable/{ic_canvas_wordmark.xml => vd_canvas_wordmark.xml} (100%) rename libs/pandares/src/main/res/drawable/{ic_chevron_left.xml => vd_chevron_left.xml} (100%) rename libs/pandares/src/main/res/drawable/{ic_chevron_right.xml => vd_chevron_right.xml} (100%) rename libs/pandares/src/main/res/drawable/{ic_drag.xml => vd_drag.xml} (100%) create mode 100644 libs/pandares/src/main/res/drawable/vd_error.xml rename libs/pandares/src/main/res/drawable/{ic_grade_hidden.xml => vd_grade_hidden.xml} (100%) rename libs/pandares/src/main/res/drawable/{ic_info_solid.xml => vd_info_solid.xml} (100%) rename libs/pandares/src/main/res/drawable/{ic_mail_solid.xml => vd_mail_solid.xml} (100%) rename libs/pandares/src/main/res/drawable/{ic_navigation_studio.xml => vd_navigation_studio.xml} (100%) rename libs/pandares/src/main/res/drawable/{ic_open_externally.xml => vd_open_externally.xml} (100%) rename libs/pandares/src/main/res/drawable/{ic_panda_nothing_to_see.xml => vd_panda_nothing_to_see.xml} (100%) rename libs/pandares/src/main/res/drawable/{ic_panda_online_submissions.xml => vd_panda_online_submissions.xml} (100%) create mode 100644 libs/pandares/src/main/res/drawable/vd_rubric.xml create mode 100755 libs/pandares/src/main/res/drawable/vd_trash.xml rename libs/pandares/src/main/res/drawable/{ic_panda_unsupported_content.xml => vd_unsupported_content.xml} (100%) rename libs/pandares/src/main/res/drawable/{ic_video.xml => vd_video.xml} (100%) rename libs/{pandares/src/main/res/drawable-ldrtl/ic_send.xml => pandautils/src/main/res/drawable-ldrtl/vd_send.xml} (100%) rename libs/{pandares/src/main/res/drawable/ic_add.xml => pandautils/src/main/res/drawable/vd_add.xml} (100%) create mode 100644 libs/pandautils/src/main/res/drawable/vd_camera.xml rename libs/{pandares/src/main/res/drawable/ic_check_white_24dp.xml => pandautils/src/main/res/drawable/vd_check_white_24dp.xml} (100%) rename libs/{pandares/src/main/res/drawable/ic_close.xml => pandautils/src/main/res/drawable/vd_close_white.xml} (100%) rename libs/{pandares/src/main/res/drawable/ic_color_picker_circle.xml => pandautils/src/main/res/drawable/vd_color_picker_circle.xml} (100%) create mode 100644 libs/pandautils/src/main/res/drawable/vd_edit.xml rename libs/{pandares/src/main/res/drawable/ic_fullscreen_white.xml => pandautils/src/main/res/drawable/vd_fullscreen_white.xml} (100%) rename libs/{pandares/src/main/res/drawable/ic_group.xml => pandautils/src/main/res/drawable/vd_group.xml} (95%) create mode 100755 libs/pandautils/src/main/res/drawable/vd_image.xml rename libs/{pandares/src/main/res/drawable/ic_panda_balloon.xml => pandautils/src/main/res/drawable/vd_panda_balloon.xml} (100%) rename libs/{pandares/src/main/res/drawable/ic_panda_choosefile.xml => pandautils/src/main/res/drawable/vd_panda_choosefile.xml} (100%) rename libs/{pandares/src/main/res/drawable/ic_panda_inboxarchived.xml => pandautils/src/main/res/drawable/vd_panda_inboxarchived.xml} (100%) rename libs/{pandares/src/main/res/drawable/ic_panda_inboxsent.xml => pandautils/src/main/res/drawable/vd_panda_inboxsent.xml} (100%) rename libs/{pandares/src/main/res/drawable/ic_panda_inboxstarred.xml => pandautils/src/main/res/drawable/vd_panda_inboxstarred.xml} (100%) rename libs/{pandares/src/main/res/drawable/ic_panda_inboxzero.xml => pandautils/src/main/res/drawable/vd_panda_inboxzero.xml} (100%) rename libs/{pandares/src/main/res/drawable/ic_panda_locked.xml => pandautils/src/main/res/drawable/vd_panda_locked.xml} (100%) rename libs/{pandares/src/main/res/drawable/ic_panda_noalerts.xml => pandautils/src/main/res/drawable/vd_panda_noalerts.xml} (100%) rename libs/{pandares/src/main/res/drawable/ic_panda_noannouncements.xml => pandautils/src/main/res/drawable/vd_panda_noannouncements.xml} (100%) rename libs/{pandares/src/main/res/drawable/ic_panda_nobookmarks.xml => pandautils/src/main/res/drawable/vd_panda_nobookmarks.xml} (100%) rename libs/{pandares/src/main/res/drawable/ic_panda_nocourses.xml => pandautils/src/main/res/drawable/vd_panda_nocourses.xml} (100%) rename libs/{pandares/src/main/res/drawable/ic_panda_nodiscussions.xml => pandautils/src/main/res/drawable/vd_panda_nodiscussions.xml} (100%) create mode 100644 libs/pandautils/src/main/res/drawable/vd_panda_noevents.xml rename libs/{pandares/src/main/res/drawable/ic_panda_nofiles.xml => pandautils/src/main/res/drawable/vd_panda_nofiles.xml} (100%) rename libs/{pandares/src/main/res/drawable/ic_panda_nomodules.xml => pandautils/src/main/res/drawable/vd_panda_nomodules.xml} (100%) rename libs/{pandares/src/main/res/drawable/ic_panda_nosyllabus.xml => pandautils/src/main/res/drawable/vd_panda_nosyllabus.xml} (100%) rename libs/{pandares/src/main/res/drawable/ic_panda_notsupported.xml => pandautils/src/main/res/drawable/vd_panda_notsupported.xml} (100%) rename libs/{pandares/src/main/res/drawable/ic_panda_quizzes_rocket.xml => pandautils/src/main/res/drawable/vd_panda_quizzes_rocket.xml} (100%) rename libs/{pandares/src/main/res/drawable/ic_panda_sleeping.xml => pandautils/src/main/res/drawable/vd_panda_sleeping.xml} (100%) rename libs/{pandares/src/main/res/drawable/ic_panda_space.xml => pandautils/src/main/res/drawable/vd_panda_space.xml} (100%) create mode 100644 libs/pandautils/src/main/res/drawable/vd_play_arrow.xml rename libs/{pandares/src/main/res/drawable/ic_search_white_24dp.xml => pandautils/src/main/res/drawable/vd_search_white_24dp.xml} (100%) rename libs/{pandares/src/main/res/drawable/ic_send.xml => pandautils/src/main/res/drawable/vd_send.xml} (100%) rename libs/{pandares/src/main/res/drawable/ic_panda_super.xml => pandautils/src/main/res/drawable/vd_super_panda.xml} (100%) create mode 100644 libs/pandautils/src/main/res/drawable/vd_user.xml create mode 100755 libs/pandautils/src/main/res/drawable/vd_utils_attachment.xml create mode 100644 libs/pandautils/src/main/res/drawable/vd_utils_audio.xml create mode 100644 libs/pandautils/src/main/res/drawable/vd_utils_camera.xml create mode 100644 libs/pandautils/src/main/res/drawable/vd_utils_checkmark.xml create mode 100755 libs/pandautils/src/main/res/drawable/vd_utils_close.xml create mode 100644 libs/pandautils/src/main/res/drawable/vd_utils_document.xml create mode 100755 libs/pandautils/src/main/res/drawable/vd_utils_download.xml create mode 100644 libs/pandautils/src/main/res/drawable/vd_utils_image.xml create mode 100644 libs/pandautils/src/main/res/drawable/vd_utils_media.xml create mode 100644 libs/pandautils/src/main/res/drawable/vd_utils_pdf.xml rename libs/rceditor/src/main/res/drawable-ldrtl/{ic_rce_format_list_numbered.xml => vd_rce_format_list_numbered.xml} (100%) rename libs/rceditor/src/main/res/drawable/{ic_rce_border_color.xml => vd_rce_border_color.xml} (100%) rename libs/rceditor/src/main/res/drawable/{ic_rce_cancel.xml => vd_rce_cancel.xml} (100%) rename libs/rceditor/src/main/res/drawable/{ic_rce_format_align_center.xml => vd_rce_format_align_center.xml} (100%) rename libs/rceditor/src/main/res/drawable/{ic_rce_format_align_left.xml => vd_rce_format_align_left.xml} (100%) rename libs/rceditor/src/main/res/drawable/{ic_rce_format_align_right.xml => vd_rce_format_align_right.xml} (100%) rename libs/rceditor/src/main/res/drawable/{ic_rce_format_bold.xml => vd_rce_format_bold.xml} (100%) rename libs/rceditor/src/main/res/drawable/{ic_rce_format_color_text.xml => vd_rce_format_color_text.xml} (100%) rename libs/rceditor/src/main/res/drawable/{ic_rce_format_indent_decrease.xml => vd_rce_format_indent_decrease.xml} (100%) rename libs/rceditor/src/main/res/drawable/{ic_rce_format_indent_increase.xml => vd_rce_format_indent_increase.xml} (100%) rename libs/rceditor/src/main/res/drawable/{ic_rce_format_italic.xml => vd_rce_format_italic.xml} (100%) rename libs/rceditor/src/main/res/drawable/{ic_rce_format_list_bulleted.xml => vd_rce_format_list_bulleted.xml} (100%) rename libs/rceditor/src/main/res/drawable/{ic_rce_format_list_numbered.xml => vd_rce_format_list_numbered.xml} (100%) rename libs/rceditor/src/main/res/drawable/{ic_rce_format_quote.xml => vd_rce_format_quote.xml} (100%) rename libs/rceditor/src/main/res/drawable/{ic_rce_format_underlined.xml => vd_rce_format_underlined.xml} (100%) rename libs/rceditor/src/main/res/drawable/{ic_rce_insert_link.xml => vd_rce_insert_link.xml} (100%) rename libs/rceditor/src/main/res/drawable/{ic_rce_insert_photo.xml => vd_rce_insert_photo.xml} (100%) rename libs/rceditor/src/main/res/drawable/{ic_rce_redo.xml => vd_rce_redo.xml} (100%) rename libs/rceditor/src/main/res/drawable/{ic_rce_strikethrough_s.xml => vd_rce_strikethrough_s.xml} (100%) rename libs/rceditor/src/main/res/drawable/{ic_rce_text_black.xml => vd_rce_text_black.xml} (100%) rename libs/rceditor/src/main/res/drawable/{ic_rce_text_blue.xml => vd_rce_text_blue.xml} (100%) rename libs/rceditor/src/main/res/drawable/{ic_rce_text_gray.xml => vd_rce_text_gray.xml} (100%) rename libs/rceditor/src/main/res/drawable/{ic_rce_text_green.xml => vd_rce_text_green.xml} (100%) rename libs/rceditor/src/main/res/drawable/{ic_rce_text_orange.xml => vd_rce_text_orange.xml} (100%) rename libs/rceditor/src/main/res/drawable/{ic_rce_text_purple.xml => vd_rce_text_purple.xml} (100%) rename libs/rceditor/src/main/res/drawable/{ic_rce_text_red.xml => vd_rce_text_red.xml} (100%) rename libs/rceditor/src/main/res/drawable/{ic_rce_text_white.xml => vd_rce_text_white.xml} (100%) rename libs/rceditor/src/main/res/drawable/{ic_rce_text_yellow.xml => vd_rce_text_yellow.xml} (100%) rename libs/rceditor/src/main/res/drawable/{ic_rce_undo.xml => vd_rce_undo.xml} (100%) diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/pages/InboxConversationPage.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/pages/InboxConversationPage.kt index 738290be02..046346c0d6 100644 --- a/apps/student/src/androidTest/java/com/instructure/student/ui/pages/InboxConversationPage.kt +++ b/apps/student/src/androidTest/java/com/instructure/student/ui/pages/InboxConversationPage.kt @@ -146,11 +146,11 @@ class InboxConversationPage : BasePage(R.id.inboxConversationPage) { } fun assertStarred() { - onView(withId(R.id.starred)).check(matches(ImageButtonDrawableMatcher(R.drawable.ic_star_filled, ThemePrefs.brandColor))) + onView(withId(R.id.starred)).check(matches(ImageButtonDrawableMatcher(R.drawable.vd_star_filled, ThemePrefs.brandColor))) } fun assertNotStarred() { - onView(withId(R.id.starred)).check(matches(ImageButtonDrawableMatcher(R.drawable.ic_star, ThemePrefs.brandColor))) + onView(withId(R.id.starred)).check(matches(ImageButtonDrawableMatcher(R.drawable.vd_star, ThemePrefs.brandColor))) } } diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/renderTests/PickerSubmissionUploadRenderTest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/renderTests/PickerSubmissionUploadRenderTest.kt index 3013ed911b..f1f4c4ceda 100644 --- a/apps/student/src/androidTest/java/com/instructure/student/ui/renderTests/PickerSubmissionUploadRenderTest.kt +++ b/apps/student/src/androidTest/java/com/instructure/student/ui/renderTests/PickerSubmissionUploadRenderTest.kt @@ -82,7 +82,7 @@ class PickerSubmissionUploadRenderTest : StudentRenderTest() { @TestMetaData(Priority.P3, FeatureCategory.SUBMISSIONS, TestCategory.RENDER) fun displaysListState() { val fileItemStates = listOf( - PickerListItemViewState(0, R.drawable.ic_media_recordings, "title", "12.3 KB") + PickerListItemViewState(0, R.drawable.vd_media_recordings, "title", "12.3 KB") ) loadPageWithViewState( PickerSubmissionUploadViewState.FileList( @@ -108,7 +108,7 @@ class PickerSubmissionUploadRenderTest : StudentRenderTest() { } val fileItemStates = listOf( - PickerListItemViewState(0, R.drawable.ic_media_recordings, "title", "12.3 KB") + PickerListItemViewState(0, R.drawable.vd_media_recordings, "title", "12.3 KB") ) loadPageWithViewState( PickerSubmissionUploadViewState.FileList( diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/renderTests/SubmissionFilesRenderTest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/renderTests/SubmissionFilesRenderTest.kt index 3b1585b593..e0534dfb70 100644 --- a/apps/student/src/androidTest/java/com/instructure/student/ui/renderTests/SubmissionFilesRenderTest.kt +++ b/apps/student/src/androidTest/java/com/instructure/student/ui/renderTests/SubmissionFilesRenderTest.kt @@ -41,7 +41,7 @@ class SubmissionFilesRenderTest : StudentRenderTest() { private val dataTemplate = SubmissionFileData( id = 123L, name = "File name", - icon = R.drawable.ic_document, + icon = R.drawable.vd_document, thumbnailUrl = null, isSelected = false, iconColor = Color.BLUE, 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 be6bf223f4..f95efe5217 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 @@ -408,7 +408,7 @@ class NavigationActivity : BaseRouterActivity(), Navigation, MasqueradingDialog. Logger.e("Error getting version: " + e) } - toolbar.setNavigationIcon(R.drawable.ic_hamburger) + toolbar.setNavigationIcon(R.drawable.vd_hamburger) toolbar.navigationContentDescription = getString(R.string.navigation_drawer_open) toolbar.setNavigationOnClickListener { openNavigationDrawer() diff --git a/apps/student/src/main/java/com/instructure/student/adapter/CourseBrowserAdapter.kt b/apps/student/src/main/java/com/instructure/student/adapter/CourseBrowserAdapter.kt index b3650cef21..ff236d3a64 100644 --- a/apps/student/src/main/java/com/instructure/student/adapter/CourseBrowserAdapter.kt +++ b/apps/student/src/main/java/com/instructure/student/adapter/CourseBrowserAdapter.kt @@ -94,9 +94,9 @@ class CourseBrowserWebViewHolder(view: View, val color: Int) : RecyclerView.View fun bind(tab: Tab, clickedCallback: (Tab) -> Unit) { val res: Int = when (tab.tabId) { - Tab.OUTCOMES_ID -> R.drawable.ic_outcomes - Tab.CONFERENCES_ID -> R.drawable.ic_conferences - else /* Tab.COLLABORATIONS_ID */ -> R.drawable.ic_collaborations + Tab.OUTCOMES_ID -> R.drawable.vd_outcomes + Tab.CONFERENCES_ID -> R.drawable.vd_conferences + else /* Tab.COLLABORATIONS_ID */ -> R.drawable.vd_collaborations } var d = VectorDrawableCompat.create(itemView.context.resources, res, null) @@ -128,26 +128,26 @@ class CourseBrowserViewHolder(view: View, val color: Int) : RecyclerView.ViewHol fun bind(tab: Tab, clickedCallback: (Tab) -> Unit) { val res: Int = when (tab.tabId) { - Tab.ASSIGNMENTS_ID -> R.drawable.ic_assignment - Tab.QUIZZES_ID -> R.drawable.ic_quiz - Tab.DISCUSSIONS_ID -> R.drawable.ic_discussion - Tab.ANNOUNCEMENTS_ID -> R.drawable.ic_announcement - Tab.PEOPLE_ID -> R.drawable.ic_people - Tab.FILES_ID -> R.drawable.ic_files - Tab.PAGES_ID -> R.drawable.ic_pages - Tab.MODULES_ID -> R.drawable.ic_modules - Tab.SYLLABUS_ID -> R.drawable.ic_syllabus - Tab.OUTCOMES_ID -> R.drawable.ic_outcomes - Tab.GRADES_ID -> R.drawable.ic_grades - Tab.HOME_ID -> R.drawable.ic_home - Tab.CONFERENCES_ID -> R.drawable.ic_conferences - Tab.COLLABORATIONS_ID -> R.drawable.ic_collaborations - Tab.SETTINGS_ID -> R.drawable.ic_settings + Tab.ASSIGNMENTS_ID -> R.drawable.vd_assignment + Tab.QUIZZES_ID -> R.drawable.vd_quiz + Tab.DISCUSSIONS_ID -> R.drawable.vd_discussion + Tab.ANNOUNCEMENTS_ID -> R.drawable.vd_announcement + Tab.PEOPLE_ID -> R.drawable.vd_people + Tab.FILES_ID -> R.drawable.vd_files + Tab.PAGES_ID -> R.drawable.vd_pages + Tab.MODULES_ID -> R.drawable.vd_modules + Tab.SYLLABUS_ID -> R.drawable.vd_syllabus + Tab.OUTCOMES_ID -> R.drawable.vd_outcomes + Tab.GRADES_ID -> R.drawable.vd_grades + Tab.HOME_ID -> R.drawable.vd_home + Tab.CONFERENCES_ID -> R.drawable.vd_conferences + Tab.COLLABORATIONS_ID -> R.drawable.vd_collaborations + Tab.SETTINGS_ID -> R.drawable.vd_settings else -> { // Determine if it's the attendance tool if (tab.type == Tab.TYPE_EXTERNAL) { - R.drawable.ic_lti - } else R.drawable.ic_canvas_logo + R.drawable.vd_lti + } else R.drawable.vd_canvas_logo } } diff --git a/apps/student/src/main/java/com/instructure/student/features/files/search/FileSearchFragment.kt b/apps/student/src/main/java/com/instructure/student/features/files/search/FileSearchFragment.kt index 64b69842e1..97827f99f6 100644 --- a/apps/student/src/main/java/com/instructure/student/features/files/search/FileSearchFragment.kt +++ b/apps/student/src/main/java/com/instructure/student/features/files/search/FileSearchFragment.kt @@ -68,7 +68,7 @@ class FileSearchFragment : ParentFragment(), FileSearchView { ViewStyler.setStatusBarLight(requireActivity()) // Set up empty state - emptyPandaView.getEmptyViewImage()?.setImageResource(R.drawable.ic_panda_nofiles) + emptyPandaView.getEmptyViewImage()?.setImageResource(R.drawable.vd_panda_nofiles) emptyPandaView.setListEmpty() checkIfEmpty() 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 ff0d954ea4..90eab88a8f 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 @@ -97,7 +97,7 @@ class AccountPreferencesFragment : ParentFragment() { override fun getView(position: Int, convertView: View?, parent: ViewGroup): View { val view: View = convertView ?: inflater.inflate(R.layout.settings_spinner, parent, false) - view.indicator.setImageDrawable(ColorKeeper.getColoredDrawable(requireContext(), R.drawable.ic_expand, Color.WHITE)) + view.indicator.setImageDrawable(ColorKeeper.getColoredDrawable(requireContext(), R.drawable.vd_expand, Color.WHITE)) view.indicator.setColorFilter(ContextCompat.getColor(requireContext(), R.color.defaultTextGray)) view.title.text = getItem(position).toString() return view diff --git a/apps/student/src/main/java/com/instructure/student/fragment/AssignmentListFragment.kt b/apps/student/src/main/java/com/instructure/student/fragment/AssignmentListFragment.kt index 1b34ad4d1f..1124413732 100644 --- a/apps/student/src/main/java/com/instructure/student/fragment/AssignmentListFragment.kt +++ b/apps/student/src/main/java/com/instructure/student/fragment/AssignmentListFragment.kt @@ -72,7 +72,7 @@ class AssignmentListFragment : ParentFragment(), Bookmarkable { if(!isAdded) return // Refresh can finish after user has left screen, causing emptyView to be null setRefreshing(false) if (recyclerAdapter.size() == 0) { - setEmptyView(emptyView, R.drawable.ic_panda_space, R.string.noAssignments, R.string.noAssignmentsSubtext) + setEmptyView(emptyView, R.drawable.vd_panda_space, R.string.noAssignments, R.string.noAssignmentsSubtext) } } } diff --git a/apps/student/src/main/java/com/instructure/student/fragment/BookmarksFragment.kt b/apps/student/src/main/java/com/instructure/student/fragment/BookmarksFragment.kt index 73b12c06d1..a66ecffe8b 100644 --- a/apps/student/src/main/java/com/instructure/student/fragment/BookmarksFragment.kt +++ b/apps/student/src/main/java/com/instructure/student/fragment/BookmarksFragment.kt @@ -97,7 +97,7 @@ class BookmarksFragment : ParentFragment() { } private fun applyEmptyImage() { - emptyView.getEmptyViewImage()?.setImageResource(R.drawable.ic_panda_nobookmarks) + emptyView.getEmptyViewImage()?.setImageResource(R.drawable.vd_panda_nobookmarks) emptyView.setTitleText(R.string.noBookmarks) emptyView.setMessageText(R.string.noBookmarksSubtext) emptyView.setListEmpty() diff --git a/apps/student/src/main/java/com/instructure/student/fragment/CourseModuleProgressionFragment.kt b/apps/student/src/main/java/com/instructure/student/fragment/CourseModuleProgressionFragment.kt index 4be547e4dc..15b4eb6667 100644 --- a/apps/student/src/main/java/com/instructure/student/fragment/CourseModuleProgressionFragment.kt +++ b/apps/student/src/main/java/com/instructure/student/fragment/CourseModuleProgressionFragment.kt @@ -99,8 +99,8 @@ class CourseModuleProgressionFragment : ParentFragment(), Bookmarkable { override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) - prev_item.background = ColorKeeper.getColoredDrawable(requireActivity(), R.drawable.ic_chevron_left, canvasContext) - next_item.background = ColorKeeper.getColoredDrawable(requireActivity(), R.drawable.ic_chevron_right, canvasContext) + prev_item.background = ColorKeeper.getColoredDrawable(requireActivity(), R.drawable.vd_chevron_left, canvasContext) + next_item.background = ColorKeeper.getColoredDrawable(requireActivity(), R.drawable.vd_chevron_right, canvasContext) } override fun onActivityCreated(savedInstanceState: Bundle?) { diff --git a/apps/student/src/main/java/com/instructure/student/fragment/DiscussionListFragment.kt b/apps/student/src/main/java/com/instructure/student/fragment/DiscussionListFragment.kt index 4af2c981b6..6430e1925a 100644 --- a/apps/student/src/main/java/com/instructure/student/fragment/DiscussionListFragment.kt +++ b/apps/student/src/main/java/com/instructure/student/fragment/DiscussionListFragment.kt @@ -102,9 +102,9 @@ open class DiscussionListFragment : ParentFragment(), Bookmarkable { if(canPost) createNewDiscussion?.show() if (recyclerAdapter.size() == 0) { if (isAnnouncement) { - setEmptyView(emptyView, R.drawable.ic_panda_noannouncements, R.string.noAnnouncements, R.string.noAnnouncementsSubtext) + setEmptyView(emptyView, R.drawable.vd_panda_noannouncements, R.string.noAnnouncements, R.string.noAnnouncementsSubtext) } else { - setEmptyView(emptyView, R.drawable.ic_panda_nodiscussions, R.string.noDiscussions, R.string.noDiscussionsSubtext) + setEmptyView(emptyView, R.drawable.vd_panda_nodiscussions, R.string.noDiscussions, R.string.noDiscussionsSubtext) } } } diff --git a/apps/student/src/main/java/com/instructure/student/fragment/EditFavoritesFragment.kt b/apps/student/src/main/java/com/instructure/student/fragment/EditFavoritesFragment.kt index 9f71169057..1abcf72dd2 100644 --- a/apps/student/src/main/java/com/instructure/student/fragment/EditFavoritesFragment.kt +++ b/apps/student/src/main/java/com/instructure/student/fragment/EditFavoritesFragment.kt @@ -69,7 +69,7 @@ class EditFavoritesFragment : ParentFragment() { override fun onRefreshFinished() { setRefreshing(false) if (recyclerAdapter?.size() == 0) { - setEmptyView(emptyView, R.drawable.ic_panda_nocourses, R.string.noCourses, R.string.noCoursesSubtext) + setEmptyView(emptyView, R.drawable.vd_panda_nocourses, R.string.noCourses, R.string.noCoursesSubtext) } } diff --git a/apps/student/src/main/java/com/instructure/student/fragment/FileDetailsFragment.kt b/apps/student/src/main/java/com/instructure/student/fragment/FileDetailsFragment.kt index 9b2a01c4ff..dda46291b4 100644 --- a/apps/student/src/main/java/com/instructure/student/fragment/FileDetailsFragment.kt +++ b/apps/student/src/main/java/com/instructure/student/fragment/FileDetailsFragment.kt @@ -160,7 +160,7 @@ class FileDetailsFragment : ParentFragment() { file?.let { if (it.lockInfo != null) { // File is locked - fileIcon.setImageResource(R.drawable.ic_lock) + fileIcon.setImageResource(R.drawable.vd_lock) fileIcon.contentDescription = getString(R.string.locked_icon) openButton.visibility = View.GONE downloadButton.visibility = View.GONE diff --git a/apps/student/src/main/java/com/instructure/student/fragment/FileListFragment.kt b/apps/student/src/main/java/com/instructure/student/fragment/FileListFragment.kt index eb262dade3..4eb2754326 100644 --- a/apps/student/src/main/java/com/instructure/student/fragment/FileListFragment.kt +++ b/apps/student/src/main/java/com/instructure/student/fragment/FileListFragment.kt @@ -204,7 +204,7 @@ class FileListFragment : ParentFragment(), Bookmarkable { setRefreshing(false) if (recyclerAdapter?.size() == 0) { - setEmptyView(emptyView, R.drawable.ic_panda_nofiles, R.string.noFiles, getNoFileSubtextId()) + setEmptyView(emptyView, R.drawable.vd_panda_nofiles, R.string.noFiles, getNoFileSubtextId()) } } } @@ -394,7 +394,7 @@ class FileListFragment : ParentFragment(), Bookmarkable { } recyclerAdapter?.remove(deletedItem) if (recyclerAdapter?.size() == 0) { - setEmptyView(emptyView, R.drawable.ic_panda_nofiles, R.string.noFiles, getNoFileSubtextId()) + setEmptyView(emptyView, R.drawable.vd_panda_nofiles, R.string.noFiles, getNoFileSubtextId()) } StudentPrefs.staleFolderIds = StudentPrefs.staleFolderIds + folder!!.id } catch { diff --git a/apps/student/src/main/java/com/instructure/student/fragment/GradesListFragment.kt b/apps/student/src/main/java/com/instructure/student/fragment/GradesListFragment.kt index 0bab5bee5b..51b2a4f5b0 100644 --- a/apps/student/src/main/java/com/instructure/student/fragment/GradesListFragment.kt +++ b/apps/student/src/main/java/com/instructure/student/fragment/GradesListFragment.kt @@ -129,7 +129,7 @@ class GradesListFragment : ParentFragment(), Bookmarkable { private fun configureViews(rootView: View) { val appBarLayout = rootView.findViewById(R.id.appbar) - val lockDrawable = ColorKeeper.getColoredDrawable(requireContext(), R.drawable.ic_lock, ContextCompat.getColor(requireContext(), R.color.canvasTextDark)) + val lockDrawable = ColorKeeper.getColoredDrawable(requireContext(), R.drawable.vd_lock, ContextCompat.getColor(requireContext(), R.color.canvasTextDark)) lockedGradeImage.setImageDrawable(lockDrawable) setupListeners() diff --git a/apps/student/src/main/java/com/instructure/student/fragment/InboxConversationFragment.kt b/apps/student/src/main/java/com/instructure/student/fragment/InboxConversationFragment.kt index c018bd7eb4..420f80dad5 100644 --- a/apps/student/src/main/java/com/instructure/student/fragment/InboxConversationFragment.kt +++ b/apps/student/src/main/java/com/instructure/student/fragment/InboxConversationFragment.kt @@ -243,7 +243,7 @@ class InboxConversationFragment : ParentFragment() { } starred.setOnClickListener { toggleStarred() } - starred.setImageResource(if (conversation.isStarred) R.drawable.ic_star_filled else R.drawable.ic_star) + starred.setImageResource(if (conversation.isStarred) R.drawable.vd_star_filled else R.drawable.vd_star) ColorUtils.colorIt(ThemePrefs.brandColor, starred.drawable) starred.alpha = 1f starred.isEnabled = true @@ -265,7 +265,7 @@ class InboxConversationFragment : ParentFragment() { starCall?.cancel() val shouldStar = !conversation.isStarred tryWeave { - starred.setImageResource(if (shouldStar) R.drawable.ic_star_filled else R.drawable.ic_star) + starred.setImageResource(if (shouldStar) R.drawable.vd_star_filled else R.drawable.vd_star) ColorUtils.colorIt(ThemePrefs.brandColor, starred.drawable) starred.alpha = 0.35f starred.isEnabled = false @@ -275,7 +275,7 @@ class InboxConversationFragment : ParentFragment() { onConversationUpdated(false) } catch { toast(R.string.errorConversationGeneric) - starred.setImageResource(if (!shouldStar) R.drawable.ic_star_filled else R.drawable.ic_star) + starred.setImageResource(if (!shouldStar) R.drawable.vd_star_filled else R.drawable.vd_star) ColorUtils.colorIt(ThemePrefs.brandColor, starred.drawable) refreshConversationData() } diff --git a/apps/student/src/main/java/com/instructure/student/fragment/InboxFragment.kt b/apps/student/src/main/java/com/instructure/student/fragment/InboxFragment.kt index 76d6a38be8..6bcb873237 100644 --- a/apps/student/src/main/java/com/instructure/student/fragment/InboxFragment.kt +++ b/apps/student/src/main/java/com/instructure/student/fragment/InboxFragment.kt @@ -121,7 +121,7 @@ class InboxFragment : ParentFragment() { setupListeners() setupFilter() setupFilterText() - emptyInboxView.setEmptyViewImage(requireContext().getDrawableCompat(R.drawable.ic_panda_inboxzero)) + emptyInboxView.setEmptyViewImage(requireContext().getDrawableCompat(R.drawable.vd_panda_inboxzero)) emptyInboxView.setMessageText(R.string.nothingUnreadSubtext) emptyInboxView.getMessage().importantForAccessibility = View.IMPORTANT_FOR_ACCESSIBILITY_NO emptyInboxView.setTitleText(R.string.nothingUnread) @@ -204,19 +204,19 @@ class InboxFragment : ParentFragment() { return when (scope) { Scope.ALL -> ScopeParams(R.string.nothingUnread, R.string.nothingUnreadSubtext, - R.drawable.ic_panda_inboxzero) + R.drawable.vd_panda_inboxzero) Scope.UNREAD -> ScopeParams(R.string.nothingUnread, R.string.nothingUnreadSubtext, - R.drawable.ic_panda_inboxzero) + R.drawable.vd_panda_inboxzero) Scope.STARRED -> ScopeParams(R.string.nothingStarred, R.string.nothingStarredSubtext, - R.drawable.ic_panda_inboxstarred) + R.drawable.vd_panda_inboxstarred) Scope.SENT -> ScopeParams(R.string.nothingSent, R.string.nothingSentSubtext, - R.drawable.ic_panda_inboxsent) + R.drawable.vd_panda_inboxsent) Scope.ARCHIVED -> ScopeParams(R.string.nothingArchived, R.string.nothingArchivedSubtext, - R.drawable.ic_panda_inboxarchived) + R.drawable.vd_panda_inboxarchived) } } diff --git a/apps/student/src/main/java/com/instructure/student/fragment/ModuleListFragment.kt b/apps/student/src/main/java/com/instructure/student/fragment/ModuleListFragment.kt index dec525a078..b98fbdbde1 100644 --- a/apps/student/src/main/java/com/instructure/student/fragment/ModuleListFragment.kt +++ b/apps/student/src/main/java/com/instructure/student/fragment/ModuleListFragment.kt @@ -157,9 +157,9 @@ class ModuleListFragment : ParentFragment(), Bookmarkable { if(isError) { // We need to force the empty view to be visible to use it for errors on refresh emptyView?.setVisible() - setEmptyView(emptyView, R.drawable.ic_panda_nomodules, R.string.modulesLocked, R.string.modulesLockedSubtext) + setEmptyView(emptyView, R.drawable.vd_panda_nomodules, R.string.modulesLocked, R.string.modulesLockedSubtext) } else if (recyclerAdapter.size() == 0) { - setEmptyView(emptyView, R.drawable.ic_panda_nomodules, R.string.noModules, R.string.noModulesSubtext) + setEmptyView(emptyView, R.drawable.vd_panda_nomodules, R.string.noModules, R.string.noModulesSubtext) } else if (!arguments?.getString(MODULE_ID).isNullOrEmpty()) { val groupPosition = recyclerAdapter.getGroupItemPosition(arguments!!.getString(MODULE_ID)!!.toLong()) if (groupPosition >= 0) { diff --git a/apps/student/src/main/java/com/instructure/student/fragment/NotificationListFragment.kt b/apps/student/src/main/java/com/instructure/student/fragment/NotificationListFragment.kt index 38db342741..1081b4bd98 100644 --- a/apps/student/src/main/java/com/instructure/student/fragment/NotificationListFragment.kt +++ b/apps/student/src/main/java/com/instructure/student/fragment/NotificationListFragment.kt @@ -69,7 +69,7 @@ class NotificationListFragment : ParentFragment(), Bookmarkable { setRefreshing(false) editOptions.setGone() if (recyclerAdapter.size() == 0) { - setEmptyView(emptyView, R.drawable.ic_panda_noalerts, R.string.noNotifications, R.string.noNotificationsSubtext) + setEmptyView(emptyView, R.drawable.vd_panda_noalerts, R.string.noNotifications, R.string.noNotificationsSubtext) if (resources.configuration.orientation == Configuration.ORIENTATION_LANDSCAPE) { emptyView.setGuidelines(.2f, .7f, .74f, .15f, .85f) } else { diff --git a/apps/student/src/main/java/com/instructure/student/fragment/PageListFragment.kt b/apps/student/src/main/java/com/instructure/student/fragment/PageListFragment.kt index 927446c5c1..420d63750f 100644 --- a/apps/student/src/main/java/com/instructure/student/fragment/PageListFragment.kt +++ b/apps/student/src/main/java/com/instructure/student/fragment/PageListFragment.kt @@ -90,7 +90,7 @@ class PageListFragment : ParentFragment(), Bookmarkable { override fun onRefreshFinished() { setRefreshing(false) - setEmptyView(emptyView, R.drawable.ic_panda_nofiles, R.string.noPages, R.string.noPagesSubtext) + setEmptyView(emptyView, R.drawable.vd_panda_nofiles, R.string.noPages, R.string.noPagesSubtext) } }, defaultSelectedPageTitle) diff --git a/apps/student/src/main/java/com/instructure/student/fragment/PeopleDetailsFragment.kt b/apps/student/src/main/java/com/instructure/student/fragment/PeopleDetailsFragment.kt index c4a9ad9cf8..ffb0ad591b 100644 --- a/apps/student/src/main/java/com/instructure/student/fragment/PeopleDetailsFragment.kt +++ b/apps/student/src/main/java/com/instructure/student/fragment/PeopleDetailsFragment.kt @@ -72,7 +72,7 @@ class PeopleDetailsFragment : ParentFragment(), Bookmarkable { compose.colorNormal = color compose.colorPressed = color - compose.setIconDrawable(ColorKeeper.getColoredDrawable(requireContext(), R.drawable.ic_send, Color.WHITE)) + compose.setIconDrawable(ColorKeeper.getColoredDrawable(requireContext(), R.drawable.vd_send, Color.WHITE)) compose.setOnClickListener { // Messaging other users is not available in Student view val route = if (ApiPrefs.isStudentView) NothingToSeeHereFragment.makeRoute() else { diff --git a/apps/student/src/main/java/com/instructure/student/fragment/QuizListFragment.kt b/apps/student/src/main/java/com/instructure/student/fragment/QuizListFragment.kt index 6990b4a367..267bd3f7a4 100644 --- a/apps/student/src/main/java/com/instructure/student/fragment/QuizListFragment.kt +++ b/apps/student/src/main/java/com/instructure/student/fragment/QuizListFragment.kt @@ -52,7 +52,7 @@ class QuizListFragment : ParentFragment(), Bookmarkable { override fun onRefreshFinished() { setRefreshing(false) if (recyclerAdapter?.size() == 0) { - setEmptyView(emptyView, R.drawable.ic_panda_quizzes_rocket, R.string.noQuizzes, R.string.noQuizzesSubtext) + setEmptyView(emptyView, R.drawable.vd_panda_quizzes_rocket, R.string.noQuizzes, R.string.noQuizzesSubtext) } } } 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 df55dd7ab9..8bd2184e4e 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 @@ -59,7 +59,7 @@ class ToDoListFragment : ParentFragment() { setRefreshing(false) editOptions.setGone() if (recyclerAdapter.size() == 0) { - setEmptyView(emptyView, R.drawable.ic_panda_sleeping, R.string.noTodos, R.string.noTodosSubtext) + setEmptyView(emptyView, R.drawable.vd_panda_sleeping, R.string.noTodos, R.string.noTodosSubtext) } } diff --git a/apps/student/src/main/java/com/instructure/student/fragment/ViewUnsupportedFileFragment.kt b/apps/student/src/main/java/com/instructure/student/fragment/ViewUnsupportedFileFragment.kt index dd3262b191..36edff795c 100644 --- a/apps/student/src/main/java/com/instructure/student/fragment/ViewUnsupportedFileFragment.kt +++ b/apps/student/src/main/java/com/instructure/student/fragment/ViewUnsupportedFileFragment.kt @@ -40,7 +40,7 @@ class ViewUnsupportedFileFragment : Fragment() { private var mDisplayName by StringArg() private var mContentType by StringArg() private var mPreviewUri by ParcelableArg(Uri.EMPTY) - private var mFallbackIcon by IntArg(R.drawable.ic_attachment) + private var mFallbackIcon by IntArg(R.drawable.vd_utils_attachment) private var mEditableFile: EditableFile? by NullableParcelableArg() private var mToolbarColor by IntArg(0) diff --git a/apps/student/src/main/java/com/instructure/student/holders/AnnouncementViewHolder.kt b/apps/student/src/main/java/com/instructure/student/holders/AnnouncementViewHolder.kt index 13438d8b37..2acceb159e 100644 --- a/apps/student/src/main/java/com/instructure/student/holders/AnnouncementViewHolder.kt +++ b/apps/student/src/main/java/com/instructure/student/holders/AnnouncementViewHolder.kt @@ -52,10 +52,10 @@ class AnnouncementViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) val icon = when (announcement.icon) { AccountNotification.ACCOUNT_NOTIFICATION_ERROR, - AccountNotification.ACCOUNT_NOTIFICATION_WARNING -> R.drawable.ic_warning - AccountNotification.ACCOUNT_NOTIFICATION_CALENDAR -> R.drawable.ic_calendar - AccountNotification.ACCOUNT_NOTIFICATION_QUESTION -> R.drawable.ic_question_mark - else -> R.drawable.ic_info + AccountNotification.ACCOUNT_NOTIFICATION_WARNING -> R.drawable.vd_warning + AccountNotification.ACCOUNT_NOTIFICATION_CALENDAR -> R.drawable.vd_calendar_announcement + AccountNotification.ACCOUNT_NOTIFICATION_QUESTION -> R.drawable.vd_question_mark + else -> R.drawable.vd_info } announcementIcon.setImageResource(icon) diff --git a/apps/student/src/main/java/com/instructure/student/holders/CourseViewHolder.kt b/apps/student/src/main/java/com/instructure/student/holders/CourseViewHolder.kt index f7f7557783..d94fbfe160 100644 --- a/apps/student/src/main/java/com/instructure/student/holders/CourseViewHolder.kt +++ b/apps/student/src/main/java/com/instructure/student/holders/CourseViewHolder.kt @@ -86,7 +86,7 @@ class CourseViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { if(courseGrade.isLocked) { gradeTextView.setGone() lockedGradeImage.setVisible() - lockedGradeImage.setImageDrawable(ColorKeeper.getColoredDrawable(context, R.drawable.ic_lock, course.color)) + lockedGradeImage.setImageDrawable(ColorKeeper.getColoredDrawable(context, R.drawable.vd_lock, course.color)) } else { gradeTextView.setVisible() lockedGradeImage.setGone() diff --git a/apps/student/src/main/java/com/instructure/student/holders/DiscussionListHolder.kt b/apps/student/src/main/java/com/instructure/student/holders/DiscussionListHolder.kt index 0bc3a57a86..05a0c5ee34 100644 --- a/apps/student/src/main/java/com/instructure/student/holders/DiscussionListHolder.kt +++ b/apps/student/src/main/java/com/instructure/student/holders/DiscussionListHolder.kt @@ -64,16 +64,16 @@ class DiscussionListHolder(view: View) : RecyclerView.ViewHolder(view) { val isAssignmentType = discussionTopicHeader.assignment != null if(isDiscussion) { - discussionIcon.setIcon(if (isAssignmentType) R.drawable.ic_assignment - else R.drawable.ic_discussion, courseColor) + discussionIcon.setIcon(if (isAssignmentType) R.drawable.vd_assignment + else R.drawable.vd_discussion, courseColor) readUnreadCounts.setVisible() } else { - discussionIcon.setIcon(R.drawable.ic_announcement, courseColor) + discussionIcon.setIcon(R.drawable.vd_announcement, courseColor) readUnreadCounts.setGone() } if(discussionTopicHeader.lockedForUser) { - discussionIcon.setNestedIcon(R.drawable.ic_lock, ContextCompat.getColor(context, R.color.lockedDiscussionColor)) + discussionIcon.setNestedIcon(R.drawable.vd_lock, ContextCompat.getColor(context, R.color.lockedDiscussionColor)) discussionIcon.setNestedIconContentDescription(context.getString(R.string.locked)) } else { discussionIcon.hideNestedIcon() diff --git a/apps/student/src/main/java/com/instructure/student/holders/EditFavoritesCourseViewHolder.kt b/apps/student/src/main/java/com/instructure/student/holders/EditFavoritesCourseViewHolder.kt index c7327b0f33..92cd37773a 100644 --- a/apps/student/src/main/java/com/instructure/student/holders/EditFavoritesCourseViewHolder.kt +++ b/apps/student/src/main/java/com/instructure/student/holders/EditFavoritesCourseViewHolder.kt @@ -39,7 +39,7 @@ class EditFavoritesCourseViewHolder(itemView: View) : RecyclerView.ViewHolder(it val name = course.name val contentDescResId = if (isFavorite) R.string.courseFavorited else R.string.courseNotFavorited title.text = name - star.setImageResource(if (isFavorite) R.drawable.ic_star_filled else R.drawable.ic_star) + star.setImageResource(if (isFavorite) R.drawable.vd_star_filled else R.drawable.vd_star) title.contentDescription = context.getString(contentDescResId, name) DrawableCompat.setTint(DrawableCompat.wrap(star.drawable), ThemePrefs.brandColor) onClick { callback.onRowClicked(course, adapterPosition, !isFavorite) } diff --git a/apps/student/src/main/java/com/instructure/student/holders/EditFavoritesGroupViewHolder.kt b/apps/student/src/main/java/com/instructure/student/holders/EditFavoritesGroupViewHolder.kt index 8a44e9159a..1db4ca60fd 100644 --- a/apps/student/src/main/java/com/instructure/student/holders/EditFavoritesGroupViewHolder.kt +++ b/apps/student/src/main/java/com/instructure/student/holders/EditFavoritesGroupViewHolder.kt @@ -40,7 +40,7 @@ class EditFavoritesGroupViewHolder(itemView: View) : RecyclerView.ViewHolder(ite val name = group.name val contentDescResId = if (isFavorite) R.string.groupFavorited else R.string.groupNotFavorited title.text = name - star.setImageResource(if (isFavorite) R.drawable.ic_star_filled else R.drawable.ic_star) + star.setImageResource(if (isFavorite) R.drawable.vd_star_filled else R.drawable.vd_star) title.contentDescription = context.getString(contentDescResId, name) DrawableCompat.setTint(DrawableCompat.wrap(star.drawable), ThemePrefs.brandColor) onClick { callback.onRowClicked(group, adapterPosition, !isFavorite) } diff --git a/apps/student/src/main/java/com/instructure/student/holders/FileViewHolder.kt b/apps/student/src/main/java/com/instructure/student/holders/FileViewHolder.kt index 22bf1aadf2..3bb8b5a358 100644 --- a/apps/student/src/main/java/com/instructure/student/holders/FileViewHolder.kt +++ b/apps/student/src/main/java/com/instructure/student/holders/FileViewHolder.kt @@ -59,13 +59,13 @@ class FileViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { } else { val contentType = item.contentType.orEmpty() val iconRes = when { - contentType.contains("pdf") -> R.drawable.ic_pdf - contentType.contains("presentation") -> R.drawable.ic_ppt - contentType.contains("spreadsheet") -> R.drawable.ic_spreadsheet - contentType.contains("wordprocessing") -> R.drawable.ic_word_doc - contentType.contains("zip") -> R.drawable.ic_zip - contentType.contains("image") -> R.drawable.ic_image - else -> R.drawable.ic_document + contentType.contains("pdf") -> R.drawable.vd_pdf + contentType.contains("presentation") -> R.drawable.vd_ppt + contentType.contains("spreadsheet") -> R.drawable.vd_spreadsheet + contentType.contains("wordprocessing") -> R.drawable.vd_word_doc + contentType.contains("zip") -> R.drawable.vd_zip + contentType.contains("image") -> R.drawable.vd_image + else -> R.drawable.vd_document } fileIcon.setColoredResource(iconRes, tint) } @@ -75,7 +75,7 @@ class FileViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { fileName.contentDescription = itemView.resources.getString(R.string.folderTalkBack, item.name) val itemCount = item.filesCount + item.foldersCount; fileSize.text = context.resources.getQuantityString(R.plurals.item_count, itemCount, itemCount); - fileIcon.setColoredResource(R.drawable.ic_folder_solid, tint) + fileIcon.setColoredResource(R.drawable.vd_folder_solid, tint) } } diff --git a/apps/student/src/main/java/com/instructure/student/holders/GradeViewHolder.kt b/apps/student/src/main/java/com/instructure/student/holders/GradeViewHolder.kt index f2896cfbf0..d5c3fb0a78 100644 --- a/apps/student/src/main/java/com/instructure/student/holders/GradeViewHolder.kt +++ b/apps/student/src/main/java/com/instructure/student/holders/GradeViewHolder.kt @@ -63,7 +63,7 @@ class GradeViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { val submission = assignment.submission if (submission != null && Const.PENDING_REVIEW == submission.workflowState) { points.setGone() - icon.setNestedIcon(R.drawable.ic_complete_solid, courseColor) + icon.setNestedIcon(R.drawable.vd_published, courseColor) } else { points.setVisible() val (grade, contentDescription) = BinderUtils.getGrade(assignment, submission, context) @@ -76,7 +76,7 @@ class GradeViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { // Configures whatIf editing boxes and listener for dialog edit.setVisible(isEdit) if (isEdit) { - edit.setImageDrawable(ColorKeeper.getColoredDrawable(context, R.drawable.ic_edit, ContextCompat.getColor(context, R.color.defaultTextDark))) + edit.setImageDrawable(ColorKeeper.getColoredDrawable(context, R.drawable.vd_edit, ContextCompat.getColor(context, R.color.defaultTextDark))) edit.setOnClickListener { whatIfDialogCallback.onClick(assignment, adapterPosition) } } diff --git a/apps/student/src/main/java/com/instructure/student/holders/ModuleHeaderViewHolder.kt b/apps/student/src/main/java/com/instructure/student/holders/ModuleHeaderViewHolder.kt index 072e20808f..84f6d81652 100644 --- a/apps/student/src/main/java/com/instructure/student/holders/ModuleHeaderViewHolder.kt +++ b/apps/student/src/main/java/com/instructure/student/holders/ModuleHeaderViewHolder.kt @@ -74,12 +74,12 @@ class ModuleHeaderViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) // Reset the status text and drawable to default state val drawable: Int = if (moduleObject.state != null) { when { - moduleObject.state.equals(ModuleObject.State.Locked.apiString, ignoreCase = true) -> R.drawable.ic_lock - moduleObject.state.equals(ModuleObject.State.Completed.apiString, ignoreCase = true) -> R.drawable.ic_check_white_24dp - else -> R.drawable.ic_module_circle + moduleObject.state.equals(ModuleObject.State.Locked.apiString, ignoreCase = true) -> R.drawable.vd_lock + moduleObject.state.equals(ModuleObject.State.Completed.apiString, ignoreCase = true) -> R.drawable.vd_check_white_24dp + else -> R.drawable.vd_module_circle } } else { - if (isLocked) R.drawable.ic_lock else R.drawable.ic_module_circle + if (isLocked) R.drawable.vd_lock else R.drawable.vd_module_circle } moduleStatus.setImageDrawable(ColorUtils.colorIt(color, ContextCompat.getDrawable(context, drawable)!!)) } diff --git a/apps/student/src/main/java/com/instructure/student/holders/ModuleViewHolder.kt b/apps/student/src/main/java/com/instructure/student/holders/ModuleViewHolder.kt index a41db46fab..7f8c6b985d 100644 --- a/apps/student/src/main/java/com/instructure/student/holders/ModuleViewHolder.kt +++ b/apps/student/src/main/java/com/instructure/student/holders/ModuleViewHolder.kt @@ -92,28 +92,28 @@ class ModuleViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { // Indicator indicator.setGone() if (moduleItem.completionRequirement?.completed == true) { - val drawable = ColorKeeper.getColoredDrawable(context, R.drawable.ic_check_white_24dp, courseColor) + val drawable = ColorKeeper.getColoredDrawable(context, R.drawable.vd_check_white_24dp, courseColor) indicator.setImageDrawable(drawable) indicator.setVisible() } if (isLocked) { - val drawable = ColorKeeper.getColoredDrawable(context, R.drawable.ic_lock, courseColor) + val drawable = ColorKeeper.getColoredDrawable(context, R.drawable.vd_lock, courseColor) indicator.setImageDrawable(drawable) indicator.setVisible() } // Icon val drawableResource: Int = when { - ModuleItem.Type.Assignment.toString().equals(moduleItem.type, ignoreCase = true) -> R.drawable.ic_assignment - ModuleItem.Type.Discussion.toString().equals(moduleItem.type, ignoreCase = true) -> R.drawable.ic_discussion - ModuleItem.Type.File.toString().equals(moduleItem.type, ignoreCase = true) -> R.drawable.ic_download - ModuleItem.Type.Page.toString().equals(moduleItem.type, ignoreCase = true) -> R.drawable.ic_pages - ModuleItem.Type.Quiz.toString().equals(moduleItem.type, ignoreCase = true) -> R.drawable.ic_quiz - ModuleItem.Type.ExternalUrl.toString().equals(moduleItem.type, ignoreCase = true) -> R.drawable.ic_link - ModuleItem.Type.ExternalTool.toString().equals(moduleItem.type, ignoreCase = true) -> R.drawable.ic_lti - ModuleItem.Type.Locked.toString().equals(moduleItem.type, ignoreCase = true) -> R.drawable.ic_lock + ModuleItem.Type.Assignment.toString().equals(moduleItem.type, ignoreCase = true) -> R.drawable.vd_assignment + ModuleItem.Type.Discussion.toString().equals(moduleItem.type, ignoreCase = true) -> R.drawable.vd_discussion + ModuleItem.Type.File.toString().equals(moduleItem.type, ignoreCase = true) -> R.drawable.vd_download + ModuleItem.Type.Page.toString().equals(moduleItem.type, ignoreCase = true) -> R.drawable.vd_pages + ModuleItem.Type.Quiz.toString().equals(moduleItem.type, ignoreCase = true) -> R.drawable.vd_quiz + ModuleItem.Type.ExternalUrl.toString().equals(moduleItem.type, ignoreCase = true) -> R.drawable.vd_link + ModuleItem.Type.ExternalTool.toString().equals(moduleItem.type, ignoreCase = true) -> R.drawable.vd_lti + ModuleItem.Type.Locked.toString().equals(moduleItem.type, ignoreCase = true) -> R.drawable.vd_lock ModuleItem.Type.ChooseAssignmentGroup.toString() - .equals(moduleItem.type, ignoreCase = true) -> R.drawable.ic_pages + .equals(moduleItem.type, ignoreCase = true) -> R.drawable.vd_pages else -> -1 // Details } diff --git a/apps/student/src/main/java/com/instructure/student/holders/NotificationViewHolder.kt b/apps/student/src/main/java/com/instructure/student/holders/NotificationViewHolder.kt index 04ac95e963..c4240aece1 100644 --- a/apps/student/src/main/java/com/instructure/student/holders/NotificationViewHolder.kt +++ b/apps/student/src/main/java/com/instructure/student/holders/NotificationViewHolder.kt @@ -90,15 +90,15 @@ class NotificationViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) val drawableResId: Int when (item.getStreamItemType()) { StreamItem.Type.DISCUSSION_TOPIC -> { - drawableResId = R.drawable.ic_discussion + drawableResId = R.drawable.vd_discussion icon.contentDescription = context.getString(R.string.discussionIcon) } StreamItem.Type.ANNOUNCEMENT -> { - drawableResId = R.drawable.ic_announcement + drawableResId = R.drawable.vd_announcement icon.contentDescription = context.getString(R.string.announcementIcon) } StreamItem.Type.SUBMISSION -> { - drawableResId = R.drawable.ic_assignment + drawableResId = R.drawable.vd_assignment icon.contentDescription = context.getString(R.string.assignmentIcon) // Need to prepend "Grade" in the message if there is a valid score @@ -115,33 +115,33 @@ class NotificationViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) } } StreamItem.Type.CONVERSATION -> { - drawableResId = R.drawable.ic_inbox + drawableResId = R.drawable.vd_inbox icon.contentDescription = context.getString(R.string.conversationIcon) } StreamItem.Type.MESSAGE -> when { item.contextType === CanvasContext.Type.COURSE -> { - drawableResId = R.drawable.ic_assignment + drawableResId = R.drawable.vd_assignment icon.contentDescription = context.getString(R.string.assignmentIcon) } item.notificationCategory.contains("assignment graded", ignoreCase = true) -> { - drawableResId = R.drawable.ic_grades + drawableResId = R.drawable.vd_grades icon.contentDescription = context.getString(R.string.gradesIcon) } else -> { - drawableResId = R.drawable.ic_user + drawableResId = R.drawable.vd_navigation_change_user icon.contentDescription = context.getString(R.string.defaultIcon) } } StreamItem.Type.CONFERENCE -> { - drawableResId = R.drawable.ic_conferences + drawableResId = R.drawable.vd_conferences icon.contentDescription = context.getString(R.string.icon) } StreamItem.Type.COLLABORATION -> { - drawableResId = R.drawable.ic_collaborations + drawableResId = R.drawable.vd_collaborations icon.contentDescription = context.getString(R.string.icon) } - StreamItem.Type.COLLECTION_ITEM -> drawableResId = R.drawable.ic_peer_review - else -> drawableResId = R.drawable.ic_peer_review + StreamItem.Type.COLLECTION_ITEM -> drawableResId = R.drawable.vd_peer_review + else -> drawableResId = R.drawable.vd_peer_review } val courseColor: Int = if (item.canvasContext != null) { diff --git a/apps/student/src/main/java/com/instructure/student/holders/PageViewHolder.kt b/apps/student/src/main/java/com/instructure/student/holders/PageViewHolder.kt index 536654b33c..92ea9e8dd4 100644 --- a/apps/student/src/main/java/com/instructure/student/holders/PageViewHolder.kt +++ b/apps/student/src/main/java/com/instructure/student/holders/PageViewHolder.kt @@ -40,9 +40,9 @@ class PageViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { title.text = page.title if (page.frontPage) { - icon.setImageDrawable(ColorKeeper.getColoredDrawable(context, R.drawable.ic_pages, courseColor)) + icon.setImageDrawable(ColorKeeper.getColoredDrawable(context, R.drawable.vd_pages, courseColor)) } else { - icon.setImageDrawable(ColorKeeper.getColoredDrawable(context, R.drawable.ic_document, courseColor)) + icon.setImageDrawable(ColorKeeper.getColoredDrawable(context, R.drawable.vd_document, courseColor)) } modified.text = String.format( diff --git a/apps/student/src/main/java/com/instructure/student/holders/QuizViewHolder.kt b/apps/student/src/main/java/com/instructure/student/holders/QuizViewHolder.kt index defd6e1a7d..14f55c80dc 100644 --- a/apps/student/src/main/java/com/instructure/student/holders/QuizViewHolder.kt +++ b/apps/student/src/main/java/com/instructure/student/holders/QuizViewHolder.kt @@ -47,7 +47,7 @@ class QuizViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { description.setVisible(!desc.isNullOrBlank()) // Icon - val drawable = ColorKeeper.getColoredDrawable(context, R.drawable.ic_quiz, courseColor) + val drawable = ColorKeeper.getColoredDrawable(context, R.drawable.vd_quiz, courseColor) icon.setImageDrawable(drawable) // Status and Date diff --git a/apps/student/src/main/java/com/instructure/student/holders/TodoViewHolder.kt b/apps/student/src/main/java/com/instructure/student/holders/TodoViewHolder.kt index 1a68e2db98..3c0432c6a3 100644 --- a/apps/student/src/main/java/com/instructure/student/holders/TodoViewHolder.kt +++ b/apps/student/src/main/java/com/instructure/student/holders/TodoViewHolder.kt @@ -90,10 +90,10 @@ class TodoViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { description.setTextForVisibility(todoDetails) val drawableResId: Int = when { - item.type == ToDo.Type.UpcomingEvent -> R.drawable.ic_calendar - item.assignment?.quizId ?: 0 > 0 || item.quiz != null -> R.drawable.ic_quiz - item.assignment!!.discussionTopicHeader != null -> R.drawable.ic_discussion - else -> R.drawable.ic_assignment + item.type == ToDo.Type.UpcomingEvent -> R.drawable.vd_calendar + item.assignment?.quizId ?: 0 > 0 || item.quiz != null -> R.drawable.vd_quiz + item.assignment!!.discussionTopicHeader != null -> R.drawable.vd_discussion + else -> R.drawable.vd_assignment } val drawable = ColorKeeper.getColoredDrawable(context, drawableResId, courseColor) icon.setImageDrawable(drawable) diff --git a/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/AssignmentDetailsPresenter.kt b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/AssignmentDetailsPresenter.kt index b7df0c1d59..1842fce334 100644 --- a/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/AssignmentDetailsPresenter.kt +++ b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/AssignmentDetailsPresenter.kt @@ -87,7 +87,7 @@ object AssignmentDetailsPresenter : Presenter { - view.iconImageView.setImageResource(R.drawable.ic_audio) + view.iconImageView.setImageResource(R.drawable.vd_audio) view.attachmentNameTextView.text = context.getString(R.string.mediaUploadAudio) } MediaComment.MediaType.VIDEO -> { - view.iconImageView.setImageResource(R.drawable.ic_media) + view.iconImageView.setImageResource(R.drawable.vd_media) view.attachmentNameTextView.text = context.getString(R.string.mediaUploadVideo) } } diff --git a/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submissionDetails/drawer/comments/ui/views/CommentSubmissionView.kt b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submissionDetails/drawer/comments/ui/views/CommentSubmissionView.kt index 172a602198..55eed9e837 100644 --- a/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submissionDetails/drawer/comments/ui/views/CommentSubmissionView.kt +++ b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submissionDetails/drawer/comments/ui/views/CommentSubmissionView.kt @@ -66,28 +66,28 @@ class CommentSubmissionView( val (icon: Int, title: String, subtitle: String?) = when (type) { SubmissionType.ONLINE_TEXT_ENTRY -> { Triple( - R.drawable.ic_document, + R.drawable.vd_document, context.getString(R.string.commentSubmissionTypeText), quotedFromHtml(submission.body) ) } SubmissionType.EXTERNAL_TOOL -> { Triple( - R.drawable.ic_lti, + R.drawable.vd_lti, context.getString(R.string.commentSubmissionTypeExternalTool), submission.url ) } SubmissionType.DISCUSSION_TOPIC -> { Triple( - R.drawable.ic_discussion, + R.drawable.vd_discussion, context.getString(R.string.commentSubmissionTypeDiscussion), quotedFromHtml(submission.discussionEntries.firstOrNull()?.message) ) } SubmissionType.ONLINE_QUIZ -> { Triple( - R.drawable.ic_quiz, + R.drawable.vd_quiz, context.getString(R.string.commentSubmissionTypeQuiz), context.getString(R.string.commentSubmissionTypeQuizAttempt, submission.attempt) ) @@ -98,12 +98,12 @@ class CommentSubmissionView( MediaComment.MediaType.AUDIO -> context.getString(R.string.commentSubmissionTypeAudio) MediaComment.MediaType.VIDEO -> context.getString(R.string.commentSubmissionTypeVideo) } - Triple(R.drawable.ic_media, context.getString(R.string.commentSubmissionTypeMediaFile), subtitle) + Triple(R.drawable.vd_media, context.getString(R.string.commentSubmissionTypeMediaFile), subtitle) } SubmissionType.ONLINE_URL -> { - Triple(R.drawable.ic_link, context.getString(R.string.onlineURL), submission.url) + Triple(R.drawable.vd_link, context.getString(R.string.onlineURL), submission.url) } - else -> Triple(R.drawable.ic_attachment, type.prettyPrint(context), "") + else -> Triple(R.drawable.vd_utils_attachment, type.prettyPrint(context), "") } view.iconImageView.setImageResource(icon) diff --git a/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submissionDetails/drawer/files/SubmissionFilesPresenter.kt b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submissionDetails/drawer/files/SubmissionFilesPresenter.kt index 64cb161a1f..f570c29b11 100644 --- a/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submissionDetails/drawer/files/SubmissionFilesPresenter.kt +++ b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submissionDetails/drawer/files/SubmissionFilesPresenter.kt @@ -39,13 +39,13 @@ object SubmissionFilesPresenter : Presenter R.drawable.ic_pdf - contentType.contains("presentation") -> R.drawable.ic_ppt - contentType.contains("spreadsheet") -> R.drawable.ic_spreadsheet - contentType.contains("wordprocessing") -> R.drawable.ic_word_doc - contentType.contains("zip") -> R.drawable.ic_zip - contentType.contains("image") -> R.drawable.ic_image - else -> R.drawable.ic_document + contentType.contains("pdf") -> R.drawable.vd_pdf + contentType.contains("presentation") -> R.drawable.vd_ppt + contentType.contains("spreadsheet") -> R.drawable.vd_spreadsheet + contentType.contains("wordprocessing") -> R.drawable.vd_word_doc + contentType.contains("zip") -> R.drawable.vd_zip + contentType.contains("image") -> R.drawable.vd_image + else -> R.drawable.vd_document } return SubmissionFileData( id = attachment.id, diff --git a/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submissionDetails/ui/SubmissionDetailsView.kt b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submissionDetails/ui/SubmissionDetailsView.kt index 774c3157c6..57d4a91613 100644 --- a/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submissionDetails/ui/SubmissionDetailsView.kt +++ b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submissionDetails/ui/SubmissionDetailsView.kt @@ -269,7 +269,7 @@ class SubmissionDetailsView( displayName = type.attachment.displayName ?: "", contentType = type.attachment.contentType ?: "", previewUri = type.attachment.previewUrl?.let { Uri.parse(it) }, - fallbackIcon = R.drawable.ic_attachment + fallbackIcon = R.drawable.vd_attachment ) is SubmissionDetailsContentType.ImageContent -> ViewImageFragment.newInstance(type.title, Uri.parse(type.url), type.contentType, false) SubmissionDetailsContentType.NoneContent -> SubmissionMessageFragment.newInstance(title = R.string.noOnlineSubmissions, subtitle = R.string.noneContentMessage) diff --git a/apps/student/src/main/java/com/instructure/student/mobius/conferences/conference_list/ui/ConferenceListView.kt b/apps/student/src/main/java/com/instructure/student/mobius/conferences/conference_list/ui/ConferenceListView.kt index 577b32d740..f11958d8aa 100644 --- a/apps/student/src/main/java/com/instructure/student/mobius/conferences/conference_list/ui/ConferenceListView.kt +++ b/apps/student/src/main/java/com/instructure/student/mobius/conferences/conference_list/ui/ConferenceListView.kt @@ -50,7 +50,7 @@ class ConferenceListView(val canvasContext: CanvasContext, inflater: LayoutInfla // Set up menu with(toolbar.menu.add(0, R.id.openExternallyButton, 0, R.string.openInBrowser)){ - setIcon(R.drawable.ic_open_in_browser) + setIcon(R.drawable.vd_open_in_browser) setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS) setOnMenuItemClickListener { consumer?.accept(ConferenceListEvent.LaunchInBrowser) diff --git a/apps/student/src/main/java/com/instructure/student/mobius/settings/pairobserver/ui/PairObserverView.kt b/apps/student/src/main/java/com/instructure/student/mobius/settings/pairobserver/ui/PairObserverView.kt index 770d7ace9b..b6901f6d69 100644 --- a/apps/student/src/main/java/com/instructure/student/mobius/settings/pairobserver/ui/PairObserverView.kt +++ b/apps/student/src/main/java/com/instructure/student/mobius/settings/pairobserver/ui/PairObserverView.kt @@ -93,7 +93,7 @@ class PairObserverView(inflater: LayoutInflater, parent: ViewGroup) : val bitmap: Bitmap = barcodeEncoder.encodeBitmap(content, BarcodeFormat.QR_CODE, 100, 100) pairObserverQrCode.setImageBitmap(bitmap) } catch (e: Exception) { - pairObserverQrCode.setImageResource(R.drawable.ic_warning) + pairObserverQrCode.setImageResource(R.drawable.vd_error) } } } diff --git a/apps/student/src/main/java/com/instructure/student/mobius/syllabus/SyllabusPresenter.kt b/apps/student/src/main/java/com/instructure/student/mobius/syllabus/SyllabusPresenter.kt index 7f97c7209e..74cadb151d 100644 --- a/apps/student/src/main/java/com/instructure/student/mobius/syllabus/SyllabusPresenter.kt +++ b/apps/student/src/main/java/com/instructure/student/mobius/syllabus/SyllabusPresenter.kt @@ -83,17 +83,17 @@ object SyllabusPresenter : Presenter { if (event.assignment?.isLocked == true || event.assignment?.lockExplanation?.takeIf { it.isValid() && event.assignment?.lockDate?.before(Date()) == true } != null) { - return com.instructure.student.R.drawable.ic_lock_lined + return com.instructure.student.R.drawable.vd_lock_lined } return event.assignment?.let { getAssignmentIcon(it) - } ?: com.instructure.student.R.drawable.ic_calendar + } ?: com.instructure.student.R.drawable.vd_calendar } private fun getAssignmentIcon(assignment: Assignment) = when { - assignment.getSubmissionTypes().contains(Assignment.SubmissionType.ONLINE_QUIZ) -> com.instructure.student.R.drawable.ic_quiz - assignment.getSubmissionTypes().contains(Assignment.SubmissionType.DISCUSSION_TOPIC) -> com.instructure.student.R.drawable.ic_discussion - else -> com.instructure.student.R.drawable.ic_assignment + assignment.getSubmissionTypes().contains(Assignment.SubmissionType.ONLINE_QUIZ) -> com.instructure.student.R.drawable.vd_quiz + assignment.getSubmissionTypes().contains(Assignment.SubmissionType.DISCUSSION_TOPIC) -> com.instructure.student.R.drawable.vd_discussion + else -> com.instructure.student.R.drawable.vd_assignment } } diff --git a/apps/student/src/main/java/com/instructure/student/mobius/syllabus/ui/SyllabusView.kt b/apps/student/src/main/java/com/instructure/student/mobius/syllabus/ui/SyllabusView.kt index 1599d246b9..f5dd386dd3 100644 --- a/apps/student/src/main/java/com/instructure/student/mobius/syllabus/ui/SyllabusView.kt +++ b/apps/student/src/main/java/com/instructure/student/mobius/syllabus/ui/SyllabusView.kt @@ -115,7 +115,7 @@ class SyllabusView(val canvasContext: CanvasContext, inflater: LayoutInflater, p syllabusRetry?.onClick { consumer?.accept(SyllabusEvent.PullToRefresh) } } EventsViewState.Empty -> { - setEmptyView(syllabusEmptyView, R.drawable.ic_panda_space, R.string.noSyllabus, R.string.noSyllabusSubtext) + setEmptyView(syllabusEmptyView, R.drawable.vd_panda_space, R.string.noSyllabus, R.string.noSyllabusSubtext) } is EventsViewState.Loaded -> { if (syllabusEventsRecycler?.adapter == null) syllabusEventsRecycler?.adapter = SyllabusEventsAdapter(consumer) diff --git a/apps/student/src/main/java/com/instructure/student/router/RouteMatcher.kt b/apps/student/src/main/java/com/instructure/student/router/RouteMatcher.kt index ce9c1a283f..ce43d19650 100644 --- a/apps/student/src/main/java/com/instructure/student/router/RouteMatcher.kt +++ b/apps/student/src/main/java/com/instructure/student/router/RouteMatcher.kt @@ -330,7 +330,7 @@ object RouteMatcher : BaseRouteMatcher() { try { if (loadedMedia.isError) { if (loadedMedia.errorType == OpenMediaAsyncTaskLoader.ErrorType.NO_APPS) { - val args = ViewUnsupportedFileFragment.newInstance(loadedMedia.intent!!.data!!, (loader as OpenMediaAsyncTaskLoader).filename!!, loadedMedia.intent!!.type!!, null, R.drawable.ic_attachment).nonNullArgs + val args = ViewUnsupportedFileFragment.newInstance(loadedMedia.intent!!.data!!, (loader as OpenMediaAsyncTaskLoader).filename!!, loadedMedia.intent!!.type!!, null, R.drawable.vd_attachment).nonNullArgs RouteMatcher.route(activity, Route(ViewUnsupportedFileFragment::class.java, null, args)) } else { Toast.makeText(activity, activity.resources.getString(loadedMedia.errorMessage), Toast.LENGTH_LONG).show() diff --git a/apps/student/src/main/java/com/instructure/student/util/BinderUtils.kt b/apps/student/src/main/java/com/instructure/student/util/BinderUtils.kt index 228592e6fc..8322bfc80e 100644 --- a/apps/student/src/main/java/com/instructure/student/util/BinderUtils.kt +++ b/apps/student/src/main/java/com/instructure/student/util/BinderUtils.kt @@ -152,10 +152,10 @@ object BinderUtils { if (assignment == null) return 0 return when { - assignment.getSubmissionTypes().contains(Assignment.SubmissionType.ONLINE_QUIZ) -> R.drawable.ic_quiz + assignment.getSubmissionTypes().contains(Assignment.SubmissionType.ONLINE_QUIZ) -> R.drawable.vd_quiz assignment.getSubmissionTypes() - .contains(Assignment.SubmissionType.DISCUSSION_TOPIC) -> R.drawable.ic_discussion - else -> R.drawable.ic_assignment + .contains(Assignment.SubmissionType.DISCUSSION_TOPIC) -> R.drawable.vd_discussion + else -> R.drawable.vd_assignment } } diff --git a/apps/student/src/main/java/com/instructure/student/util/FileUtils.kt b/apps/student/src/main/java/com/instructure/student/util/FileUtils.kt index 4ed556d4cd..a8ed4e969d 100644 --- a/apps/student/src/main/java/com/instructure/student/util/FileUtils.kt +++ b/apps/student/src/main/java/com/instructure/student/util/FileUtils.kt @@ -109,13 +109,13 @@ object FileUtils { @IntegerRes fun getFileIcon(filename: String, contentType: String): Int { return when { - contentType.startsWith("image") -> R.drawable.ic_image - contentType.startsWith("video") -> R.drawable.ic_media - contentType.startsWith("audio") -> R.drawable.ic_audio + contentType.startsWith("image") -> R.drawable.vd_utils_image + contentType.startsWith("video") -> R.drawable.vd_utils_media + contentType.startsWith("audio") -> R.drawable.vd_utils_audio else -> when (filename.substringAfterLast(".")) { - "doc", "docx", "txt", "rtf", "pdf", "xls" -> R.drawable.ic_document - "zip", "tar", "7z", "apk", "jar", "rar" -> R.drawable.ic_attachment - else -> R.drawable.ic_attachment + "doc", "docx", "txt", "rtf", "pdf", "xls" -> R.drawable.vd_utils_document + "zip", "tar", "7z", "apk", "jar", "rar" -> R.drawable.vd_utils_attachment + else -> R.drawable.vd_utils_attachment } } } diff --git a/apps/student/src/main/java/com/instructure/student/util/ShortcutUtils.kt b/apps/student/src/main/java/com/instructure/student/util/ShortcutUtils.kt index d8d7f91c53..16a1866336 100644 --- a/apps/student/src/main/java/com/instructure/student/util/ShortcutUtils.kt +++ b/apps/student/src/main/java/com/instructure/student/util/ShortcutUtils.kt @@ -78,7 +78,7 @@ object ShortcutUtils { private fun generateLayeredBitmap(context: Context, color: Int): Bitmap? { try { val background = BitmapUtilities.getBitmapFromDrawable(context, R.mipmap.ic_shortcut_background) - val foreground = ColorUtils.colorIt(color, BitmapUtilities.getBitmapFromDrawable(context, R.drawable.ic_navigation_bookmarks)) + val foreground = ColorUtils.colorIt(color, BitmapUtilities.getBitmapFromDrawable(context, R.drawable.vd_navigation_bookmarks)) val padding = (background.height / 2.8).toInt() diff --git a/apps/student/src/main/java/com/instructure/student/view/AttachmentView.kt b/apps/student/src/main/java/com/instructure/student/view/AttachmentView.kt index c6f0cc0063..b412995824 100644 --- a/apps/student/src/main/java/com/instructure/student/view/AttachmentView.kt +++ b/apps/student/src/main/java/com/instructure/student/view/AttachmentView.kt @@ -48,7 +48,7 @@ class AttachmentView(context: Context) : FrameLayout(context) { attachmentName.text = attachment.displayName setColorAndIcon(context, attachment.contentType, attachment.fileName, previewImage, attachmentIcon) setThumbnail(attachment.thumbnailUrl) - actionButton.setImageResource(R.drawable.ic_close) + actionButton.setImageResource(R.drawable.vd_close_white) actionButton.contentDescription = context.getString(R.string.removeAttachment) actionButton.onClick { if (removeViewOnAction) (parent as? ViewGroup)?.removeView(this@AttachmentView) @@ -64,7 +64,7 @@ class AttachmentView(context: Context) : FrameLayout(context) { attachmentName.text = attachment.displayName setColorAndIcon(context, attachment.contentType, attachment.filename, previewImage, attachmentIcon) setThumbnail(attachment.thumbnailUrl) - actionButton.setImageResource(R.drawable.ic_close) + actionButton.setImageResource(R.drawable.vd_close_white) actionButton.contentDescription = context.getString(R.string.removeAttachment) actionButton.onClick { if (removeViewOnAction) (parent as? ViewGroup)?.removeView(this@AttachmentView) @@ -77,7 +77,7 @@ class AttachmentView(context: Context) : FrameLayout(context) { setColorAndIcon(context, attachment.contentType, attachment.filename, previewImage, attachmentIcon) setThumbnail(attachment.thumbnailUrl) onClick { callback(AttachmentAction.PREVIEW, attachment) } - actionButton.setImageResource(R.drawable.ic_download) + actionButton.setImageResource(R.drawable.vd_download) actionButton.setOnClickListener { callback(AttachmentAction.DOWNLOAD, attachment) } } @@ -86,7 +86,7 @@ class AttachmentView(context: Context) : FrameLayout(context) { setColorAndIcon(context, attachment.contentType, attachment.fileName, previewImage, attachmentIcon) setThumbnail(attachment.thumbnailUrl) onClick { callback(AttachmentAction.PREVIEW, attachment) } - actionButton.setImageResource(R.drawable.ic_download) + actionButton.setImageResource(R.drawable.vd_download) actionButton.setOnClickListener { callback(AttachmentAction.DOWNLOAD, attachment) } } @@ -124,16 +124,16 @@ class AttachmentView(context: Context) : FrameLayout(context) { val type = contentType.orEmpty() val name = filename.orEmpty() val (colorRes, iconRes) = when { - type.startsWith("image") -> R.color.attachmentColorImage to R.drawable.ic_image - type.startsWith("video") -> R.color.attachmentColorVideo to R.drawable.ic_media - type.startsWith("audio") -> R.color.attachmentColorAudio to R.drawable.ic_audio + type.startsWith("image") -> R.color.attachmentColorImage to R.drawable.vd_image + type.startsWith("video") -> R.color.attachmentColorVideo to R.drawable.vd_media + type.startsWith("audio") -> R.color.attachmentColorAudio to R.drawable.vd_audio else -> when (name.substringAfterLast(".")) { - "doc", "docx" -> R.color.attachmentColorDoc to R.drawable.ic_document - "txt", "rtf" -> R.color.attachmentColorTxt to R.drawable.ic_document - "pdf" -> R.color.attachmentColorPdf to R.drawable.ic_document - "xls" -> R.color.attachmentColorXls to R.drawable.ic_document - "zip", "tar", "7z", "apk", "jar", "rar" -> R.color.attachmentColorZip to R.drawable.ic_attachment - else -> R.color.attachmentColorMisc to R.drawable.ic_attachment + "doc", "docx" -> R.color.attachmentColorDoc to R.drawable.vd_document + "txt", "rtf" -> R.color.attachmentColorTxt to R.drawable.vd_document + "pdf" -> R.color.attachmentColorPdf to R.drawable.vd_document + "xls" -> R.color.attachmentColorXls to R.drawable.vd_document + "zip", "tar", "7z", "apk", "jar", "rar" -> R.color.attachmentColorZip to R.drawable.vd_attachment + else -> R.color.attachmentColorMisc to R.drawable.vd_attachment } } preview?.setBackgroundColor(ContextCompat.getColor(context, colorRes)) diff --git a/apps/student/src/main/java/com/instructure/student/widget/CanvasWidgetProvider.kt b/apps/student/src/main/java/com/instructure/student/widget/CanvasWidgetProvider.kt index c76f038d01..9a7a4775be 100644 --- a/apps/student/src/main/java/com/instructure/student/widget/CanvasWidgetProvider.kt +++ b/apps/student/src/main/java/com/instructure/student/widget/CanvasWidgetProvider.kt @@ -86,7 +86,7 @@ abstract class CanvasWidgetProvider : AppWidgetProvider() { val remoteViews = RemoteViews(context.packageName, R.layout.widget_homescreen) val textColor = BaseRemoteViewsService.getWidgetTextColor(appWidgetId, context) val logoColor = ContextCompat.getColor(context, R.color.login_studentAppTheme) - remoteViews.setImageViewResource(R.id.widget_logo, R.drawable.ic_canvas_logo_red) + remoteViews.setImageViewResource(R.id.widget_logo, R.drawable.vd_canvas_logo_red) remoteViews.setInt(R.id.widget_logo, "setColorFilter", logoColor) setWidgetDependentViews(context, remoteViews, appWidgetId, appWidgetManager, textColor) diff --git a/apps/student/src/main/java/com/instructure/student/widget/NotificationViewWidgetService.kt b/apps/student/src/main/java/com/instructure/student/widget/NotificationViewWidgetService.kt index cbed98119c..2d4cafc8a5 100644 --- a/apps/student/src/main/java/com/instructure/student/widget/NotificationViewWidgetService.kt +++ b/apps/student/src/main/java/com/instructure/student/widget/NotificationViewWidgetService.kt @@ -120,20 +120,20 @@ class NotificationViewWidgetService : BaseRemoteViewsService(), Serializable { private fun getDrawableId(streamItem: StreamItem): Int { when (streamItem.getStreamItemType()) { - StreamItem.Type.DISCUSSION_TOPIC -> return R.drawable.ic_discussion - StreamItem.Type.ANNOUNCEMENT -> return R.drawable.ic_announcement - StreamItem.Type.SUBMISSION -> return R.drawable.ic_assignment - StreamItem.Type.CONVERSATION -> return R.drawable.ic_inbox + StreamItem.Type.DISCUSSION_TOPIC -> return R.drawable.vd_discussion + StreamItem.Type.ANNOUNCEMENT -> return R.drawable.vd_announcement + StreamItem.Type.SUBMISSION -> return R.drawable.vd_assignment + StreamItem.Type.CONVERSATION -> return R.drawable.vd_inbox StreamItem.Type.MESSAGE -> //a message could be related to an assignment, check the category return when { - streamItem.contextType == CanvasContext.Type.COURSE -> R.drawable.ic_assignment - streamItem.notificationCategory.toLowerCase().contains("assignment graded") -> R.drawable.ic_grades - else -> R.drawable.ic_user_avatar + streamItem.contextType == CanvasContext.Type.COURSE -> R.drawable.vd_assignment + streamItem.notificationCategory.toLowerCase().contains("assignment graded") -> R.drawable.vd_grades + else -> R.drawable.vd_user } - StreamItem.Type.CONFERENCE -> return R.drawable.ic_conferences - StreamItem.Type.COLLABORATION -> return R.drawable.ic_collaborations - else -> return R.drawable.ic_announcement + StreamItem.Type.CONFERENCE -> return R.drawable.vd_conferences + StreamItem.Type.COLLABORATION -> return R.drawable.vd_collaborations + else -> return R.drawable.vd_announcement } } diff --git a/apps/student/src/main/java/com/instructure/student/widget/TodoViewWidgetService.kt b/apps/student/src/main/java/com/instructure/student/widget/TodoViewWidgetService.kt index e442ae0088..305b03db0f 100644 --- a/apps/student/src/main/java/com/instructure/student/widget/TodoViewWidgetService.kt +++ b/apps/student/src/main/java/com/instructure/student/widget/TodoViewWidgetService.kt @@ -63,10 +63,10 @@ class TodoViewWidgetService : BaseRemoteViewsService(), Serializable { row.setViewVisibility(R.id.icon, View.VISIBLE) when { - streamItem.type == ToDo.Type.UpcomingEvent -> row.setImageViewResource(R.id.icon, R.drawable.ic_calendar) - streamItem.assignment!!.quizId > 0 -> row.setImageViewResource(R.id.icon, R.drawable.ic_quiz) - streamItem.assignment!!.discussionTopicHeader != null -> row.setImageViewResource(R.id.icon, R.drawable.ic_discussion) - else -> row.setImageViewResource(R.id.icon, R.drawable.ic_assignment) + streamItem.type == ToDo.Type.UpcomingEvent -> row.setImageViewResource(R.id.icon, R.drawable.vd_calendar) + streamItem.assignment!!.quizId > 0 -> row.setImageViewResource(R.id.icon, R.drawable.vd_quiz) + streamItem.assignment!!.discussionTopicHeader != null -> row.setImageViewResource(R.id.icon, R.drawable.vd_discussion) + else -> row.setImageViewResource(R.id.icon, R.drawable.vd_assignment) } if (streamItem.canvasContext != null && streamItem.canvasContext!!.type != CanvasContext.Type.USER) { diff --git a/libs/pandares/src/main/res/drawable/ic_shortcut_bookmarks_foreground.xml b/apps/student/src/main/res/drawable/ic_shortcut_bookmarks_foreground.xml similarity index 74% rename from libs/pandares/src/main/res/drawable/ic_shortcut_bookmarks_foreground.xml rename to apps/student/src/main/res/drawable/ic_shortcut_bookmarks_foreground.xml index 35458e2903..9c4c8fea20 100644 --- a/libs/pandares/src/main/res/drawable/ic_shortcut_bookmarks_foreground.xml +++ b/apps/student/src/main/res/drawable/ic_shortcut_bookmarks_foreground.xml @@ -32,6 +32,16 @@ C6.59628,2.30309,6.30309,2.59628,6.30309,2.95463 L6.30309,20.6987 L12.167,17.1804 Z M19.3339,23 L12.167,18.6998 L5,23 L5,2.95463 C5,1.87698,5.87698,1,6.95463,1 L17.3793,1 + C18.457,1,19.3339,1.87698,19.3339,2.95463 L19.3339,23 Z" /> + - + \ No newline at end of file diff --git a/libs/pandares/src/main/res/drawable/ic_shortcut_calendar_foreground.xml b/apps/student/src/main/res/drawable/ic_shortcut_calendar_foreground.xml similarity index 100% rename from libs/pandares/src/main/res/drawable/ic_shortcut_calendar_foreground.xml rename to apps/student/src/main/res/drawable/ic_shortcut_calendar_foreground.xml diff --git a/libs/pandares/src/main/res/drawable/ic_shortcut_notifications_foreground.xml b/apps/student/src/main/res/drawable/ic_shortcut_notifications_foreground.xml similarity index 100% rename from libs/pandares/src/main/res/drawable/ic_shortcut_notifications_foreground.xml rename to apps/student/src/main/res/drawable/ic_shortcut_notifications_foreground.xml diff --git a/libs/pandares/src/main/res/drawable/ic_shortcut_todo_foreground.xml b/apps/student/src/main/res/drawable/ic_shortcut_todo_foreground.xml similarity index 100% rename from libs/pandares/src/main/res/drawable/ic_shortcut_todo_foreground.xml rename to apps/student/src/main/res/drawable/ic_shortcut_todo_foreground.xml diff --git a/apps/student/src/main/res/drawable/vd_add.xml b/apps/student/src/main/res/drawable/vd_add.xml new file mode 100644 index 0000000000..2bced8261b --- /dev/null +++ b/apps/student/src/main/res/drawable/vd_add.xml @@ -0,0 +1,28 @@ + + + + + + + \ No newline at end of file diff --git a/libs/pandares/src/main/res/drawable/ic_announcement.xml b/apps/student/src/main/res/drawable/vd_announcement.xml similarity index 100% rename from libs/pandares/src/main/res/drawable/ic_announcement.xml rename to apps/student/src/main/res/drawable/vd_announcement.xml diff --git a/libs/pandares/src/main/res/drawable/ic_assignment.xml b/apps/student/src/main/res/drawable/vd_assignment.xml similarity index 100% rename from libs/pandares/src/main/res/drawable/ic_assignment.xml rename to apps/student/src/main/res/drawable/vd_assignment.xml diff --git a/libs/pandares/src/main/res/drawable/ic_attachment.xml b/apps/student/src/main/res/drawable/vd_attachment.xml similarity index 60% rename from libs/pandares/src/main/res/drawable/ic_attachment.xml rename to apps/student/src/main/res/drawable/vd_attachment.xml index 9a7061a85e..d003bfb647 100644 --- a/libs/pandares/src/main/res/drawable/ic_attachment.xml +++ b/apps/student/src/main/res/drawable/vd_attachment.xml @@ -21,6 +21,33 @@ android:viewportWidth="24" android:viewportHeight="24"> + + + + diff --git a/libs/pandares/src/main/res/drawable/ic_camera.xml b/apps/student/src/main/res/drawable/vd_camera.xml old mode 100644 new mode 100755 similarity index 92% rename from libs/pandares/src/main/res/drawable/ic_camera.xml rename to apps/student/src/main/res/drawable/vd_camera.xml index a784336cd3..e39d997544 --- a/libs/pandares/src/main/res/drawable/ic_camera.xml +++ b/apps/student/src/main/res/drawable/vd_camera.xml @@ -19,6 +19,15 @@ android:height="24dp" android:viewportWidth="24" android:viewportHeight="24"> + + + diff --git a/apps/student/src/main/res/drawable/vd_checkmark_large.xml b/apps/student/src/main/res/drawable/vd_checkmark_large.xml new file mode 100644 index 0000000000..029a7751b7 --- /dev/null +++ b/apps/student/src/main/res/drawable/vd_checkmark_large.xml @@ -0,0 +1,28 @@ + + + + diff --git a/libs/pandares/src/main/res/drawable/ic_clock.xml b/apps/student/src/main/res/drawable/vd_clock.xml similarity index 66% rename from libs/pandares/src/main/res/drawable/ic_clock.xml rename to apps/student/src/main/res/drawable/vd_clock.xml index ed639fd57f..df01e039b0 100644 --- a/libs/pandares/src/main/res/drawable/ic_clock.xml +++ b/apps/student/src/main/res/drawable/vd_clock.xml @@ -21,6 +21,23 @@ android:viewportWidth="24" android:viewportHeight="24"> + + - + \ No newline at end of file diff --git a/libs/pandares/src/main/res/drawable/ic_collaborations.xml b/apps/student/src/main/res/drawable/vd_collaborations.xml similarity index 96% rename from libs/pandares/src/main/res/drawable/ic_collaborations.xml rename to apps/student/src/main/res/drawable/vd_collaborations.xml index 9e69b57392..7af728f948 100644 --- a/libs/pandares/src/main/res/drawable/ic_collaborations.xml +++ b/apps/student/src/main/res/drawable/vd_collaborations.xml @@ -21,6 +21,10 @@ android:viewportWidth="24" android:viewportHeight="24"> + - + \ No newline at end of file diff --git a/libs/pandares/src/main/res/drawable/ic_conferences.xml b/apps/student/src/main/res/drawable/vd_conferences.xml similarity index 94% rename from libs/pandares/src/main/res/drawable/ic_conferences.xml rename to apps/student/src/main/res/drawable/vd_conferences.xml index b425e538dd..0c28d522c2 100644 --- a/libs/pandares/src/main/res/drawable/ic_conferences.xml +++ b/apps/student/src/main/res/drawable/vd_conferences.xml @@ -21,6 +21,10 @@ android:viewportWidth="24" android:viewportHeight="24"> + - + \ No newline at end of file diff --git a/libs/pandares/src/main/res/drawable/ic_copy.xml b/apps/student/src/main/res/drawable/vd_copy.xml similarity index 100% rename from libs/pandares/src/main/res/drawable/ic_copy.xml rename to apps/student/src/main/res/drawable/vd_copy.xml diff --git a/libs/pandares/src/main/res/drawable/ic_courses.xml b/apps/student/src/main/res/drawable/vd_courses.xml similarity index 100% rename from libs/pandares/src/main/res/drawable/ic_courses.xml rename to apps/student/src/main/res/drawable/vd_courses.xml diff --git a/libs/pandares/src/main/res/drawable/ic_discussion.xml b/apps/student/src/main/res/drawable/vd_discussion.xml similarity index 92% rename from libs/pandares/src/main/res/drawable/ic_discussion.xml rename to apps/student/src/main/res/drawable/vd_discussion.xml index 4f6dde0451..ca597a937a 100644 --- a/libs/pandares/src/main/res/drawable/ic_discussion.xml +++ b/apps/student/src/main/res/drawable/vd_discussion.xml @@ -19,6 +19,11 @@ android:height="12dp" android:viewportWidth="12" android:viewportHeight="12"> + + - + \ No newline at end of file diff --git a/libs/pandares/src/main/res/drawable/ic_document.xml b/apps/student/src/main/res/drawable/vd_document.xml similarity index 93% rename from libs/pandares/src/main/res/drawable/ic_document.xml rename to apps/student/src/main/res/drawable/vd_document.xml index 102c632fc4..e386a0f6f1 100644 --- a/libs/pandares/src/main/res/drawable/ic_document.xml +++ b/apps/student/src/main/res/drawable/vd_document.xml @@ -23,6 +23,10 @@ + - + \ No newline at end of file diff --git a/libs/pandares/src/main/res/drawable/ic_download.xml b/apps/student/src/main/res/drawable/vd_download.xml similarity index 59% rename from libs/pandares/src/main/res/drawable/ic_download.xml rename to apps/student/src/main/res/drawable/vd_download.xml index 2fdd05018a..e94caa3f4a 100644 --- a/libs/pandares/src/main/res/drawable/ic_download.xml +++ b/apps/student/src/main/res/drawable/vd_download.xml @@ -21,6 +21,35 @@ android:viewportWidth="24" android:viewportHeight="24"> + + - + \ No newline at end of file diff --git a/libs/pandares/src/main/res/drawable/ic_edit.xml b/apps/student/src/main/res/drawable/vd_edit.xml similarity index 98% rename from libs/pandares/src/main/res/drawable/ic_edit.xml rename to apps/student/src/main/res/drawable/vd_edit.xml index 311822e242..fefd9b5724 100755 --- a/libs/pandares/src/main/res/drawable/ic_edit.xml +++ b/apps/student/src/main/res/drawable/vd_edit.xml @@ -20,7 +20,7 @@ android:viewportWidth="24" android:viewportHeight="24"> + + - + \ No newline at end of file diff --git a/libs/pandares/src/main/res/drawable/ic_filter.xml b/apps/student/src/main/res/drawable/vd_filter.xml similarity index 100% rename from libs/pandares/src/main/res/drawable/ic_filter.xml rename to apps/student/src/main/res/drawable/vd_filter.xml diff --git a/libs/pandares/src/main/res/drawable/ic_folder_solid.xml b/apps/student/src/main/res/drawable/vd_folder_solid.xml similarity index 100% rename from libs/pandares/src/main/res/drawable/ic_folder_solid.xml rename to apps/student/src/main/res/drawable/vd_folder_solid.xml diff --git a/libs/pandares/src/main/res/drawable/ic_forward_arrow.xml b/apps/student/src/main/res/drawable/vd_forward_arrow.xml similarity index 93% rename from libs/pandares/src/main/res/drawable/ic_forward_arrow.xml rename to apps/student/src/main/res/drawable/vd_forward_arrow.xml index 6bf287afbc..5c66fd38e6 100644 --- a/libs/pandares/src/main/res/drawable/ic_forward_arrow.xml +++ b/apps/student/src/main/res/drawable/vd_forward_arrow.xml @@ -23,7 +23,9 @@ android:viewportHeight="24" android:autoMirrored="true"> + - + \ No newline at end of file diff --git a/libs/pandares/src/main/res/drawable/ic_grades.xml b/apps/student/src/main/res/drawable/vd_grades.xml similarity index 100% rename from libs/pandares/src/main/res/drawable/ic_grades.xml rename to apps/student/src/main/res/drawable/vd_grades.xml diff --git a/libs/pandares/src/main/res/drawable/ic_hamburger.xml b/apps/student/src/main/res/drawable/vd_hamburger.xml similarity index 100% rename from libs/pandares/src/main/res/drawable/ic_hamburger.xml rename to apps/student/src/main/res/drawable/vd_hamburger.xml diff --git a/apps/student/src/main/res/drawable/vd_home.xml b/apps/student/src/main/res/drawable/vd_home.xml new file mode 100755 index 0000000000..55628c9c56 --- /dev/null +++ b/apps/student/src/main/res/drawable/vd_home.xml @@ -0,0 +1,41 @@ + + + + + + \ No newline at end of file diff --git a/libs/pandares/src/main/res/drawable/ic_image.xml b/apps/student/src/main/res/drawable/vd_image.xml similarity index 58% rename from libs/pandares/src/main/res/drawable/ic_image.xml rename to apps/student/src/main/res/drawable/vd_image.xml index a4d4ab0dcc..c2c96061bc 100755 --- a/libs/pandares/src/main/res/drawable/ic_image.xml +++ b/apps/student/src/main/res/drawable/vd_image.xml @@ -20,6 +20,39 @@ android:viewportWidth="24" android:viewportHeight="24"> + + + - + \ No newline at end of file diff --git a/libs/pandares/src/main/res/drawable/ic_lock.xml b/apps/student/src/main/res/drawable/vd_lock.xml similarity index 100% rename from libs/pandares/src/main/res/drawable/ic_lock.xml rename to apps/student/src/main/res/drawable/vd_lock.xml diff --git a/libs/pandares/src/main/res/drawable/ic_lock_lined.xml b/apps/student/src/main/res/drawable/vd_lock_lined.xml similarity index 100% rename from libs/pandares/src/main/res/drawable/ic_lock_lined.xml rename to apps/student/src/main/res/drawable/vd_lock_lined.xml diff --git a/libs/pandares/src/main/res/drawable/ic_lti.xml b/apps/student/src/main/res/drawable/vd_lti.xml similarity index 100% rename from libs/pandares/src/main/res/drawable/ic_lti.xml rename to apps/student/src/main/res/drawable/vd_lti.xml diff --git a/libs/pandares/src/main/res/drawable/ic_marker.xml b/apps/student/src/main/res/drawable/vd_marker.xml similarity index 100% rename from libs/pandares/src/main/res/drawable/ic_marker.xml rename to apps/student/src/main/res/drawable/vd_marker.xml diff --git a/libs/pandares/src/main/res/drawable/ic_media.xml b/apps/student/src/main/res/drawable/vd_media.xml similarity index 92% rename from libs/pandares/src/main/res/drawable/ic_media.xml rename to apps/student/src/main/res/drawable/vd_media.xml index 083fa6dc09..94e28835d6 100644 --- a/libs/pandares/src/main/res/drawable/ic_media.xml +++ b/apps/student/src/main/res/drawable/vd_media.xml @@ -23,6 +23,10 @@ + - + \ No newline at end of file diff --git a/libs/pandares/src/main/res/drawable/ic_media_recordings.xml b/apps/student/src/main/res/drawable/vd_media_recordings.xml similarity index 100% rename from libs/pandares/src/main/res/drawable/ic_media_recordings.xml rename to apps/student/src/main/res/drawable/vd_media_recordings.xml diff --git a/libs/pandares/src/main/res/drawable/ic_module_circle.xml b/apps/student/src/main/res/drawable/vd_module_circle.xml similarity index 100% rename from libs/pandares/src/main/res/drawable/ic_module_circle.xml rename to apps/student/src/main/res/drawable/vd_module_circle.xml diff --git a/libs/pandares/src/main/res/drawable/ic_modules.xml b/apps/student/src/main/res/drawable/vd_modules.xml similarity index 100% rename from libs/pandares/src/main/res/drawable/ic_modules.xml rename to apps/student/src/main/res/drawable/vd_modules.xml diff --git a/libs/pandares/src/main/res/drawable/ic_navigation_bookmarks.xml b/apps/student/src/main/res/drawable/vd_navigation_bookmarks.xml similarity index 74% rename from libs/pandares/src/main/res/drawable/ic_navigation_bookmarks.xml rename to apps/student/src/main/res/drawable/vd_navigation_bookmarks.xml index af896838e6..f34f70509c 100644 --- a/libs/pandares/src/main/res/drawable/ic_navigation_bookmarks.xml +++ b/apps/student/src/main/res/drawable/vd_navigation_bookmarks.xml @@ -31,4 +31,14 @@ C6.59628,2.30309,6.30309,2.59628,6.30309,2.95463 L6.30309,20.6987 L12.167,17.1804 Z M19.3339,23 L12.167,18.6998 L5,23 L5,2.95463 C5,1.87698,5.87698,1,6.95463,1 L17.3793,1 C18.457,1,19.3339,1.87698,19.3339,2.95463 L19.3339,23 Z" /> - + + \ No newline at end of file diff --git a/apps/student/src/main/res/drawable/vd_navigation_change_user.xml b/apps/student/src/main/res/drawable/vd_navigation_change_user.xml new file mode 100644 index 0000000000..551ebab3a3 --- /dev/null +++ b/apps/student/src/main/res/drawable/vd_navigation_change_user.xml @@ -0,0 +1,168 @@ + + + + + + + + \ No newline at end of file diff --git a/apps/student/src/main/res/drawable/vd_navigation_files.xml b/apps/student/src/main/res/drawable/vd_navigation_files.xml new file mode 100644 index 0000000000..803512bede --- /dev/null +++ b/apps/student/src/main/res/drawable/vd_navigation_files.xml @@ -0,0 +1,50 @@ + + + + + + + + \ No newline at end of file diff --git a/libs/pandares/src/main/res/drawable/ic_navigation_gauge.xml b/apps/student/src/main/res/drawable/vd_navigation_gauge.xml similarity index 100% rename from libs/pandares/src/main/res/drawable/ic_navigation_gauge.xml rename to apps/student/src/main/res/drawable/vd_navigation_gauge.xml diff --git a/libs/pandares/src/main/res/drawable/ic_navigation_logout.xml b/apps/student/src/main/res/drawable/vd_navigation_logout.xml similarity index 100% rename from libs/pandares/src/main/res/drawable/ic_navigation_logout.xml rename to apps/student/src/main/res/drawable/vd_navigation_logout.xml diff --git a/apps/student/src/main/res/drawable/vd_navigation_settings.xml b/apps/student/src/main/res/drawable/vd_navigation_settings.xml new file mode 100644 index 0000000000..a96af7d6d7 --- /dev/null +++ b/apps/student/src/main/res/drawable/vd_navigation_settings.xml @@ -0,0 +1,98 @@ + + + + + + + + \ No newline at end of file diff --git a/apps/student/src/main/res/drawable/vd_navigation_show_grades.xml b/apps/student/src/main/res/drawable/vd_navigation_show_grades.xml new file mode 100644 index 0000000000..52ad8465a2 --- /dev/null +++ b/apps/student/src/main/res/drawable/vd_navigation_show_grades.xml @@ -0,0 +1,88 @@ + + + + + + + + \ No newline at end of file diff --git a/libs/pandares/src/main/res/drawable/ic_panda_no_pairing_code.xml b/apps/student/src/main/res/drawable/vd_no_pairing_code.xml similarity index 100% rename from libs/pandares/src/main/res/drawable/ic_panda_no_pairing_code.xml rename to apps/student/src/main/res/drawable/vd_no_pairing_code.xml diff --git a/libs/pandares/src/main/res/drawable/ic_open_in_browser.xml b/apps/student/src/main/res/drawable/vd_open_in_browser.xml similarity index 94% rename from libs/pandares/src/main/res/drawable/ic_open_in_browser.xml rename to apps/student/src/main/res/drawable/vd_open_in_browser.xml index f7c86aa303..057ade02a4 100644 --- a/libs/pandares/src/main/res/drawable/ic_open_in_browser.xml +++ b/apps/student/src/main/res/drawable/vd_open_in_browser.xml @@ -21,8 +21,10 @@ android:viewportWidth="24" android:viewportHeight="24"> + - + \ No newline at end of file diff --git a/libs/pandares/src/main/res/drawable/ic_outcomes.xml b/apps/student/src/main/res/drawable/vd_outcomes.xml similarity index 100% rename from libs/pandares/src/main/res/drawable/ic_outcomes.xml rename to apps/student/src/main/res/drawable/vd_outcomes.xml diff --git a/libs/pandares/src/main/res/drawable/ic_overflow_white_18dp.xml b/apps/student/src/main/res/drawable/vd_overflow_white_18dp.xml similarity index 100% rename from libs/pandares/src/main/res/drawable/ic_overflow_white_18dp.xml rename to apps/student/src/main/res/drawable/vd_overflow_white_18dp.xml diff --git a/libs/pandares/src/main/res/drawable/ic_pages.xml b/apps/student/src/main/res/drawable/vd_pages.xml similarity index 100% rename from libs/pandares/src/main/res/drawable/ic_pages.xml rename to apps/student/src/main/res/drawable/vd_pages.xml diff --git a/libs/pandares/src/main/res/drawable/ic_pdf.xml b/apps/student/src/main/res/drawable/vd_pdf.xml similarity index 94% rename from libs/pandares/src/main/res/drawable/ic_pdf.xml rename to apps/student/src/main/res/drawable/vd_pdf.xml index ae2a8513b2..d9e015d734 100755 --- a/libs/pandares/src/main/res/drawable/ic_pdf.xml +++ b/apps/student/src/main/res/drawable/vd_pdf.xml @@ -23,6 +23,10 @@ + - + \ No newline at end of file diff --git a/libs/pandares/src/main/res/drawable/ic_peer_review.xml b/apps/student/src/main/res/drawable/vd_peer_review.xml similarity index 100% rename from libs/pandares/src/main/res/drawable/ic_peer_review.xml rename to apps/student/src/main/res/drawable/vd_peer_review.xml diff --git a/libs/pandares/src/main/res/drawable/ic_people.xml b/apps/student/src/main/res/drawable/vd_people.xml similarity index 55% rename from libs/pandares/src/main/res/drawable/ic_people.xml rename to apps/student/src/main/res/drawable/vd_people.xml index ae39992d8c..50efc6834f 100644 --- a/libs/pandares/src/main/res/drawable/ic_people.xml +++ b/apps/student/src/main/res/drawable/vd_people.xml @@ -20,6 +20,55 @@ android:viewportWidth="24" android:viewportHeight="24"> + + - + \ No newline at end of file diff --git a/libs/pandares/src/main/res/drawable/ic_pin.xml b/apps/student/src/main/res/drawable/vd_pin.xml similarity index 100% rename from libs/pandares/src/main/res/drawable/ic_pin.xml rename to apps/student/src/main/res/drawable/vd_pin.xml diff --git a/libs/pandares/src/main/res/drawable/ic_ppt.xml b/apps/student/src/main/res/drawable/vd_ppt.xml similarity index 100% rename from libs/pandares/src/main/res/drawable/ic_ppt.xml rename to apps/student/src/main/res/drawable/vd_ppt.xml diff --git a/libs/pandares/src/main/res/drawable/ic_complete_solid.xml b/apps/student/src/main/res/drawable/vd_published.xml similarity index 70% rename from libs/pandares/src/main/res/drawable/ic_complete_solid.xml rename to apps/student/src/main/res/drawable/vd_published.xml index eae67f5968..353f3e1ff8 100644 --- a/libs/pandares/src/main/res/drawable/ic_complete_solid.xml +++ b/apps/student/src/main/res/drawable/vd_published.xml @@ -21,6 +21,19 @@ android:viewportWidth="24" android:viewportHeight="24"> + + - + \ No newline at end of file diff --git a/libs/pandares/src/main/res/drawable/ic_question_mark.xml b/apps/student/src/main/res/drawable/vd_question_mark.xml similarity index 100% rename from libs/pandares/src/main/res/drawable/ic_question_mark.xml rename to apps/student/src/main/res/drawable/vd_question_mark.xml diff --git a/libs/pandares/src/main/res/drawable/ic_quiz.xml b/apps/student/src/main/res/drawable/vd_quiz.xml similarity index 94% rename from libs/pandares/src/main/res/drawable/ic_quiz.xml rename to apps/student/src/main/res/drawable/vd_quiz.xml index 3f8ea5c1f2..16652a5278 100755 --- a/libs/pandares/src/main/res/drawable/ic_quiz.xml +++ b/apps/student/src/main/res/drawable/vd_quiz.xml @@ -20,6 +20,10 @@ android:viewportWidth="12" android:viewportHeight="11"> + - + \ No newline at end of file diff --git a/libs/pandares/src/main/res/drawable/ic_refresh_material.xml b/apps/student/src/main/res/drawable/vd_refresh_material.xml similarity index 100% rename from libs/pandares/src/main/res/drawable/ic_refresh_material.xml rename to apps/student/src/main/res/drawable/vd_refresh_material.xml diff --git a/apps/student/src/main/res/drawable/vd_settings.xml b/apps/student/src/main/res/drawable/vd_settings.xml new file mode 100644 index 0000000000..90ef43d5db --- /dev/null +++ b/apps/student/src/main/res/drawable/vd_settings.xml @@ -0,0 +1,60 @@ + + + + + + \ No newline at end of file diff --git a/libs/pandares/src/main/res/drawable/ic_share.xml b/apps/student/src/main/res/drawable/vd_share.xml similarity index 92% rename from libs/pandares/src/main/res/drawable/ic_share.xml rename to apps/student/src/main/res/drawable/vd_share.xml index 3be1704fb1..5c99501802 100644 --- a/libs/pandares/src/main/res/drawable/ic_share.xml +++ b/apps/student/src/main/res/drawable/vd_share.xml @@ -27,6 +27,10 @@ + - + \ No newline at end of file diff --git a/libs/pandares/src/main/res/drawable/ic_spreadsheet.xml b/apps/student/src/main/res/drawable/vd_spreadsheet.xml similarity index 100% rename from libs/pandares/src/main/res/drawable/ic_spreadsheet.xml rename to apps/student/src/main/res/drawable/vd_spreadsheet.xml diff --git a/libs/pandares/src/main/res/drawable/ic_star.xml b/apps/student/src/main/res/drawable/vd_star.xml similarity index 59% rename from libs/pandares/src/main/res/drawable/ic_star.xml rename to apps/student/src/main/res/drawable/vd_star.xml index 4d5015f585..e7442d32d3 100755 --- a/libs/pandares/src/main/res/drawable/ic_star.xml +++ b/apps/student/src/main/res/drawable/vd_star.xml @@ -20,6 +20,37 @@ android:viewportWidth="24" android:viewportHeight="24"> + + + + + + + + + + \ No newline at end of file diff --git a/libs/pandares/src/main/res/drawable/ic_syllabus.xml b/apps/student/src/main/res/drawable/vd_syllabus.xml similarity index 100% rename from libs/pandares/src/main/res/drawable/ic_syllabus.xml rename to apps/student/src/main/res/drawable/vd_syllabus.xml diff --git a/libs/pandares/src/main/res/drawable/ic_text_submission.xml b/apps/student/src/main/res/drawable/vd_text_submission.xml similarity index 100% rename from libs/pandares/src/main/res/drawable/ic_text_submission.xml rename to apps/student/src/main/res/drawable/vd_text_submission.xml diff --git a/libs/pandares/src/main/res/drawable/ic_trash.xml b/apps/student/src/main/res/drawable/vd_trash.xml similarity index 62% rename from libs/pandares/src/main/res/drawable/ic_trash.xml rename to apps/student/src/main/res/drawable/vd_trash.xml index a73686632c..e7de49b6e2 100644 --- a/libs/pandares/src/main/res/drawable/ic_trash.xml +++ b/apps/student/src/main/res/drawable/vd_trash.xml @@ -21,6 +21,28 @@ android:viewportWidth="24" android:viewportHeight="24"> + + - + \ No newline at end of file diff --git a/apps/student/src/main/res/drawable/vd_unsubmitted.xml b/apps/student/src/main/res/drawable/vd_unsubmitted.xml new file mode 100755 index 0000000000..b3468a6701 --- /dev/null +++ b/apps/student/src/main/res/drawable/vd_unsubmitted.xml @@ -0,0 +1,21 @@ + + + + + + + diff --git a/libs/pandares/src/main/res/drawable/ic_user_avatar.xml b/apps/student/src/main/res/drawable/vd_user.xml similarity index 61% rename from libs/pandares/src/main/res/drawable/ic_user_avatar.xml rename to apps/student/src/main/res/drawable/vd_user.xml index 88ac512f7d..d4b3562dc2 100644 --- a/libs/pandares/src/main/res/drawable/ic_user_avatar.xml +++ b/apps/student/src/main/res/drawable/vd_user.xml @@ -42,7 +42,51 @@ - + + - + \ No newline at end of file diff --git a/apps/student/src/main/res/drawable/vd_warning.xml b/apps/student/src/main/res/drawable/vd_warning.xml new file mode 100755 index 0000000000..8d23e2f415 --- /dev/null +++ b/apps/student/src/main/res/drawable/vd_warning.xml @@ -0,0 +1,40 @@ + + + + + diff --git a/libs/pandares/src/main/res/drawable/ic_warning.xml b/apps/student/src/main/res/drawable/vd_warning_filled.xml similarity index 100% rename from libs/pandares/src/main/res/drawable/ic_warning.xml rename to apps/student/src/main/res/drawable/vd_warning_filled.xml diff --git a/libs/pandares/src/main/res/drawable/ic_website_address.xml b/apps/student/src/main/res/drawable/vd_website_address.xml similarity index 100% rename from libs/pandares/src/main/res/drawable/ic_website_address.xml rename to apps/student/src/main/res/drawable/vd_website_address.xml diff --git a/libs/pandares/src/main/res/drawable/ic_word_doc.xml b/apps/student/src/main/res/drawable/vd_word_doc.xml similarity index 100% rename from libs/pandares/src/main/res/drawable/ic_word_doc.xml rename to apps/student/src/main/res/drawable/vd_word_doc.xml diff --git a/apps/student/src/main/res/drawable/vd_x_large.xml b/apps/student/src/main/res/drawable/vd_x_large.xml new file mode 100644 index 0000000000..cec78e21bf --- /dev/null +++ b/apps/student/src/main/res/drawable/vd_x_large.xml @@ -0,0 +1,28 @@ + + + + diff --git a/libs/pandares/src/main/res/drawable/ic_zip.xml b/apps/student/src/main/res/drawable/vd_zip.xml similarity index 100% rename from libs/pandares/src/main/res/drawable/ic_zip.xml rename to apps/student/src/main/res/drawable/vd_zip.xml diff --git a/apps/student/src/main/res/layout/adapter_conference_item.xml b/apps/student/src/main/res/layout/adapter_conference_item.xml index efe5d03b74..4218e1ac36 100644 --- a/apps/student/src/main/res/layout/adapter_conference_item.xml +++ b/apps/student/src/main/res/layout/adapter_conference_item.xml @@ -27,7 +27,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:importantForAccessibility="no" - android:src="@drawable/ic_conferences" /> + android:src="@drawable/vd_conferences" /> + android:src="@drawable/vd_panda_online_submissions"/> + tools:srcCompat="@drawable/vd_canvas_logo_red"/> diff --git a/apps/student/src/main/res/layout/adapter_course_browser_web_view.xml b/apps/student/src/main/res/layout/adapter_course_browser_web_view.xml index f0dfcdcb52..d9f028fd05 100644 --- a/apps/student/src/main/res/layout/adapter_course_browser_web_view.xml +++ b/apps/student/src/main/res/layout/adapter_course_browser_web_view.xml @@ -31,7 +31,7 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" - tools:srcCompat="@drawable/ic_canvas_logo_red" /> + tools:srcCompat="@drawable/vd_canvas_logo_red" /> + android:src="@drawable/vd_panda_nosyllabus" /> + android:src="@drawable/vd_panda_inboxsent"/> diff --git a/apps/student/src/main/res/layout/calendar_event_layout.xml b/apps/student/src/main/res/layout/calendar_event_layout.xml index b4d641001f..b60ba3ba06 100644 --- a/apps/student/src/main/res/layout/calendar_event_layout.xml +++ b/apps/student/src/main/res/layout/calendar_event_layout.xml @@ -43,7 +43,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:contentDescription="@string/timeIconDescription" - android:src="@drawable/ic_clock" /> + android:src="@drawable/vd_clock" /> + app:srcCompat="@drawable/vd_marker" /> - + \ No newline at end of file diff --git a/apps/student/src/main/res/layout/course_discussion_topic.xml b/apps/student/src/main/res/layout/course_discussion_topic.xml index 51094c1405..9c4555635f 100644 --- a/apps/student/src/main/res/layout/course_discussion_topic.xml +++ b/apps/student/src/main/res/layout/course_discussion_topic.xml @@ -66,7 +66,7 @@ android:tint="@color/white" app:fabSize="normal" app:elevation="4dp" - app:srcCompat="@drawable/ic_add" + app:srcCompat="@drawable/vd_add" android:contentDescription="@string/utils_addNew"/> diff --git a/apps/student/src/main/res/layout/course_module_progression.xml b/apps/student/src/main/res/layout/course_module_progression.xml index a52c78cfe9..e3ffa43180 100644 --- a/apps/student/src/main/res/layout/course_module_progression.xml +++ b/apps/student/src/main/res/layout/course_module_progression.xml @@ -116,7 +116,7 @@ android:layout_gravity="center_vertical" android:layout_marginEnd="8dp" android:visibility="gone" - app:srcCompat="@drawable/ic_lock" + app:srcCompat="@drawable/vd_lock" tools:visibility="visible" />