From 77b48cbfe6b8a5e9b6ba19d717b4efb91f7137fd Mon Sep 17 00:00:00 2001 From: Ben Henning Date: Fri, 25 Sep 2020 00:39:08 -0700 Subject: [PATCH] Manual cherry-pick of #1876 (#1906) * Manual cherry-pick of 74db288b9ac25fb942a8feb35e918bcd7e94e55c (https://github.com/oppia/oppia-android/pull/1876). * Fix branch-specific issues. * Update references to app module tests in old main.yml file on release branch. --- .github/workflows/main.yml | 2 +- BUILD.bazel | 6 +- WORKSPACE | 49 +- app/BUILD.bazel | 1005 +++++++++-------- app/app_test.bzl | 40 +- app/build.gradle | 4 +- app/google-services.json | 4 +- app/src/main/AndroidManifest.xml | 109 +- app/src/main/AppAndroidManifest.xml | 2 +- app/src/main/DatabindingAdaptersManifest.xml | 2 +- app/src/main/DatabindingResourcesManifest.xml | 2 +- app/src/main/RecyclerviewAdaptersManifest.xml | 2 +- app/src/main/ViewModelManifest.xml | 2 +- app/src/main/ViewModelsManifest.xml | 2 +- app/src/main/ViewsManifest.xml | 2 +- .../android/app/activity/ActivityComponent.kt | 106 +- .../android/app/activity/ActivityModule.kt | 4 +- .../android/app/activity/ActivityScope.kt | 2 +- .../activity/InjectableAppCompatActivity.kt | 8 +- .../AdministratorControlsActivity.kt | 12 +- .../AdministratorControlsActivityPresenter.kt | 14 +- .../AdministratorControlsFragment.kt | 4 +- .../AdministratorControlsFragmentPresenter.kt | 34 +- .../AdministratorControlsViewModel.kt | 28 +- .../LoadAppVersionListener.kt | 2 +- .../LoadProfileListListener.kt | 2 +- .../RouteToAppVersionListener.kt | 2 +- .../RouteToProfileListListener.kt | 2 +- ...istratorControlsAccountActionsViewModel.kt | 6 +- ...istratorControlsAppInformationViewModel.kt | 6 +- ...torControlsDownloadPermissionsViewModel.kt | 11 +- .../AdministratorControlsGeneralViewModel.kt | 2 +- .../AdministratorControlsItemViewModel.kt | 4 +- .../AdministratorControlsProfileViewModel.kt | 6 +- .../appversion/AppVersionActivity.kt | 4 +- .../appversion/AppVersionActivityPresenter.kt | 6 +- .../appversion/AppVersionFragment.kt | 4 +- .../appversion/AppVersionFragmentPresenter.kt | 8 +- .../appversion/AppVersionViewModel.kt | 12 +- .../application/ActivityComponentFactory.kt | 6 +- .../app/application/ApplicationComponent.kt | 62 +- .../app/application/ApplicationContext.kt | 2 +- .../app/application/ApplicationInjector.kt | 4 +- .../ApplicationInjectorProvider.kt | 2 +- .../app/application/ApplicationModule.kt | 4 +- .../ApplicationStartupListenerModule.kt | 4 +- .../app/application/OppiaApplication.kt | 6 +- .../CompletedStoryItemViewModel.kt | 10 +- .../CompletedStoryListActivity.kt | 4 +- .../CompletedStoryListActivityPresenter.kt | 6 +- .../CompletedStoryListFragment.kt | 4 +- .../CompletedStoryListFragmentPresenter.kt | 12 +- .../CompletedStoryListViewModel.kt | 20 +- .../customview/LessonThumbnailImageView.kt | 20 +- .../SegmentedCircularProgressView.kt | 4 +- .../FractionInputInteractionView.kt | 8 +- .../NumericInputInteractionView.kt | 8 +- .../interaction/RatioInputInteractionView.kt | 6 +- .../interaction/TextInputInteractionView.kt | 8 +- .../databinding/DrawableBindingAdapters.java | 4 +- .../databinding/EditTextBindingAdapters.java | 2 +- .../databinding/GuidelineBindingAdapters.java | 2 +- .../databinding/ImageViewBindingAdapters.java | 8 +- .../databinding/MarginBindingAdapters.java | 2 +- .../StateAssemblerMarginBindingAdapters.java | 2 +- .../StateAssemblerPaddingBindingAdapters.java | 2 +- .../databinding/TextViewBindingAdapters.java | 6 +- .../app/databinding/ViewBindingAdapters.java | 2 +- ...maticAppDeprecationNoticeDialogFragment.kt | 4 +- ...eprecationNoticeDialogFragmentPresenter.kt | 4 +- .../DeprecationNoticeExitAppListener.kt | 2 +- .../drawer/NavigationDrawerFooterViewModel.kt | 4 +- .../app/drawer/NavigationDrawerFragment.kt | 4 +- .../NavigationDrawerFragmentPresenter.kt | 46 +- .../drawer/NavigationDrawerHeaderViewModel.kt | 6 +- .../app/drawer/NavigationDrawerItem.kt | 4 +- .../drawer/RouteToProfileProgressListener.kt | 2 +- .../android/app/fragment/FragmentComponent.kt | 98 +- .../android/app/fragment/FragmentModule.kt | 4 +- .../android/app/fragment/FragmentScope.kt | 2 +- .../app/fragment/InjectableDialogFragment.kt | 4 +- .../app/fragment/InjectableFragment.kt | 8 +- .../oppia/android/app/help/HelpActivity.kt | 10 +- .../android/app/help/HelpActivityPresenter.kt | 8 +- .../oppia/android/app/help/HelpFragment.kt | 4 +- .../android/app/help/HelpFragmentPresenter.kt | 12 +- .../android/app/help/HelpItemViewModel.kt | 6 +- .../org/oppia/android/app/help/HelpItems.kt | 2 +- .../android/app/help/HelpListViewModel.kt | 6 +- .../app/help/RouteToFAQListListener.kt | 2 +- .../android/app/help/faq/FAQListActivity.kt | 8 +- .../app/help/faq/FAQListActivityPresenter.kt | 8 +- .../android/app/help/faq/FAQListFragment.kt | 4 +- .../app/help/faq/FAQListFragmentPresenter.kt | 20 +- .../android/app/help/faq/FAQListViewModel.kt | 12 +- .../app/help/faq/RouteToFAQSingleListener.kt | 2 +- .../faqItemViewModel/FAQContentViewModel.kt | 4 +- .../faqItemViewModel/FAQHeaderViewModel.kt | 2 +- .../faq/faqItemViewModel/FAQItemViewModel.kt | 4 +- .../help/faq/faqsingle/FAQSingleActivity.kt | 4 +- .../faqsingle/FAQSingleActivityPresenter.kt | 8 +- .../ExpandedHintListIndexListener.kt | 2 +- .../HintsAndSolutionAdapter.kt | 10 +- .../HintsAndSolutionDialogFragment.kt | 8 +- ...HintsAndSolutionDialogFragmentPresenter.kt | 18 +- .../HintsAndSolutionItemViewModel.kt | 4 +- .../HintsAndSolutionListener.kt | 2 +- .../hintsandsolution/HintsDividerViewModel.kt | 2 +- .../app/hintsandsolution/HintsViewModel.kt | 8 +- .../hintsandsolution/RevealHintListener.kt | 2 +- .../RevealSolutionDialogFragment.kt | 4 +- .../RevealSolutionInterface.kt | 2 +- .../app/hintsandsolution/SolutionViewModel.kt | 2 +- .../oppia/android/app/home/HomeActivity.kt | 12 +- .../android/app/home/HomeActivityPresenter.kt | 8 +- .../oppia/android/app/home/HomeFragment.kt | 8 +- .../android/app/home/HomeFragmentPresenter.kt | 54 +- .../android/app/home/HomeItemViewModel.kt | 4 +- .../app/home/RouteToExplorationListener.kt | 2 +- .../app/home/RouteToRecentlyPlayedListener.kt | 2 +- .../android/app/home/RouteToTopicListener.kt | 2 +- .../app/home/RouteToTopicPlayStoryListener.kt | 2 +- .../android/app/home/WelcomeViewModel.kt | 2 +- .../home/recentlyplayed/OngoingListAdapter.kt | 8 +- .../OngoingStoryClickListener.kt | 4 +- .../recentlyplayed/OngoingStoryViewModel.kt | 4 +- .../recentlyplayed/RecentlyPlayedActivity.kt | 8 +- .../RecentlyPlayedActivityPresenter.kt | 6 +- .../recentlyplayed/RecentlyPlayedFragment.kt | 6 +- .../RecentlyPlayedFragmentPresenter.kt | 26 +- .../RecentlyPlayedItemViewModel.kt | 4 +- .../recentlyplayed/SectionTitleViewModel.kt | 2 +- .../app/home/topiclist/AllTopicsViewModel.kt | 4 +- .../topiclist/PromotedStoryListAdapter.kt | 6 +- .../topiclist/PromotedStoryListViewModel.kt | 8 +- .../home/topiclist/PromotedStoryViewModel.kt | 10 +- .../app/home/topiclist/TopicListAdapter.kt | 18 +- .../topiclist/TopicSummaryClickListener.kt | 4 +- .../home/topiclist/TopicSummaryViewModel.kt | 6 +- .../app/mydownloads/DownloadsTabFragment.kt | 4 +- .../DownloadsTabFragmentPresenter.kt | 6 +- .../app/mydownloads/MyDownloadsActivity.kt | 8 +- .../MyDownloadsActivityPresenter.kt | 6 +- .../app/mydownloads/MyDownloadsFragment.kt | 4 +- .../MyDownloadsFragmentPresenter.kt | 8 +- .../android/app/mydownloads/MyDownloadsTab.kt | 2 +- .../MyDownloadsViewPagerAdapter.kt | 2 +- .../app/mydownloads/UpdatesTabFragment.kt | 4 +- .../UpdatesTabFragmentPresenter.kt | 6 +- .../app/onboarding/OnboadingSlideViewModel.kt | 6 +- .../app/onboarding/OnboardingActivity.kt | 6 +- .../onboarding/OnboardingActivityPresenter.kt | 6 +- .../app/onboarding/OnboardingFragment.kt | 4 +- .../onboarding/OnboardingFragmentPresenter.kt | 12 +- .../OnboardingNavigationListener.kt | 2 +- .../app/onboarding/OnboardingPagerAdapter.kt | 6 +- .../OnboardingSlideFinalViewModel.kt | 6 +- .../app/onboarding/OnboardingViewModel.kt | 4 +- .../onboarding/RouteToProfileListListener.kt | 2 +- .../android/app/onboarding/ViewPagerSlide.kt | 2 +- .../OngoingTopicItemViewModel.kt | 10 +- .../OngoingTopicListActivity.kt | 4 +- .../OngoingTopicListActivityPresenter.kt | 6 +- .../OngoingTopicListFragment.kt | 4 +- .../OngoingTopicListFragmentPresenter.kt | 12 +- .../OngoingTopicListViewModel.kt | 20 +- .../app/options/AppLanguageActivity.kt | 4 +- .../options/AppLanguageActivityPresenter.kt | 6 +- .../app/options/AppLanguageFragment.kt | 4 +- .../options/AppLanguageFragmentPresenter.kt | 4 +- .../app/options/DefaultAudioActivity.kt | 4 +- .../options/DefaultAudioActivityPresenter.kt | 6 +- .../app/options/DefaultAudioFragment.kt | 4 +- .../options/DefaultAudioFragmentPresenter.kt | 4 +- .../app/options/LanguageSelectionAdapter.kt | 6 +- .../options/LoadAppLanguageListListener.kt | 2 +- .../options/LoadAudioLanguageListListener.kt | 2 +- .../options/LoadReadingTextSizeListener.kt | 2 +- .../app/options/OptionControlsViewModel.kt | 22 +- .../android/app/options/OptionsActivity.kt | 8 +- .../app/options/OptionsActivityPresenter.kt | 8 +- .../options/OptionsAppLanguageViewModel.kt | 2 +- .../options/OptionsAudioLanguageViewModel.kt | 2 +- .../android/app/options/OptionsFragment.kt | 4 +- .../app/options/OptionsFragmentPresenter.kt | 30 +- .../app/options/OptionsItemViewModel.kt | 4 +- .../OptionsReadingTextSizeViewModel.kt | 2 +- .../app/options/ReadingTextSizeActivity.kt | 4 +- .../ReadingTextSizeActivityPresenter.kt | 6 +- .../app/options/ReadingTextSizeFragment.kt | 4 +- .../ReadingTextSizeFragmentPresenter.kt | 8 +- .../options/RouteToAppLanguageListListener.kt | 2 +- .../RouteToAudioLanguageListListener.kt | 2 +- .../options/RouteToReadingTextSizeListener.kt | 2 +- .../app/parser/StringToFractionParser.kt | 8 +- .../app/parser/StringToNumberParser.kt | 6 +- .../android/app/parser/StringToRatioParser.kt | 10 +- .../app/player/audio/AudioButtonListener.kt | 2 +- .../android/app/player/audio/AudioFragment.kt | 6 +- .../player/audio/AudioFragmentPresenter.kt | 32 +- .../app/player/audio/AudioUiManager.kt | 4 +- .../app/player/audio/AudioViewModel.kt | 22 +- .../audio/CellularAudioDialogFragment.kt | 4 +- .../app/player/audio/CellularDataInterface.kt | 2 +- .../player/audio/LanguageDialogFragment.kt | 4 +- .../app/player/audio/LanguageInterface.kt | 2 +- .../DefaultFontSizeStateListener.kt | 4 +- .../player/exploration/ExplorationActivity.kt | 30 +- .../ExplorationActivityPresenter.kt | 28 +- .../player/exploration/ExplorationFragment.kt | 6 +- .../ExplorationFragmentPresenter.kt | 16 +- .../exploration/ExplorationManagerFragment.kt | 4 +- .../ExplorationManagerFragmentPresenter.kt | 16 +- .../exploration/ExplorationViewModel.kt | 6 +- ...tsAndSolutionExplorationManagerFragment.kt | 4 +- ...tionExplorationManagerFragmentPresenter.kt | 12 +- ...tsAndSolutionExplorationManagerListener.kt | 4 +- .../state/DragDropSortInteractionView.kt | 24 +- .../ImageRegionSelectionInteractionView.kt | 26 +- .../player/state/SelectionInteractionView.kt | 18 +- .../android/app/player/state/StateFragment.kt | 28 +- .../player/state/StateFragmentPresenter.kt | 50 +- .../state/StatePlayerRecyclerViewAssembler.kt | 144 +-- .../app/player/state/StateViewModel.kt | 16 +- ...nAnswerErrorOrAvailabilityCheckReceiver.kt | 2 +- .../InteractionAnswerHandler.kt | 4 +- ...howAdditionalHintsFromWrongAnswerMillis.kt | 2 +- .../DelayShowAdditionalHintsMillis.kt | 2 +- .../DelayShowInitialHintMillis.kt | 2 +- ...intsAndSolutionConfigFastShowTestModule.kt | 2 +- .../HintsAndSolutionConfigModule.kt | 2 +- .../state/itemviewmodel/ContentViewModel.kt | 2 +- .../ContinueInteractionViewModel.kt | 12 +- .../ContinueNavigationButtonViewModel.kt | 6 +- .../DragAndDropSortInteractionViewModel.kt | 22 +- .../DragDropInteractionContentViewModel.kt | 6 +- .../state/itemviewmodel/FeedbackViewModel.kt | 2 +- .../FractionInteractionViewModel.kt | 18 +- ...mageRegionSelectionInteractionViewModel.kt | 26 +- .../InteractionViewModelFactory.kt | 8 +- .../InteractionViewModelModule.kt | 4 +- .../itemviewmodel/NextButtonViewModel.kt | 6 +- .../itemviewmodel/NumericInputViewModel.kt | 14 +- .../itemviewmodel/PreviousButtonViewModel.kt | 4 +- .../PreviousResponsesHeaderViewModel.kt | 4 +- ...atioExpressionInputInteractionViewModel.kt | 22 +- .../itemviewmodel/ReplayButtonViewModel.kt | 4 +- .../ReturnToTopicButtonViewModel.kt | 6 +- .../SelectionInteractionContentViewModel.kt | 4 +- .../SelectionInteractionViewModel.kt | 18 +- .../state/itemviewmodel/StateItemViewModel.kt | 4 +- .../itemviewmodel/SubmitButtonViewModel.kt | 6 +- .../itemviewmodel/SubmittedAnswerViewModel.kt | 4 +- .../state/itemviewmodel/TextInputViewModel.kt | 12 +- .../ContinueNavigationButtonListener.kt | 2 +- .../listener/NextNavigationButtonListener.kt | 2 +- .../PreviousNavigationButtonListener.kt | 2 +- .../PreviousResponsesHeaderClickListener.kt | 2 +- .../state/listener/ReplayButtonListener.kt | 2 +- .../ReturnToTopicNavigationButtonListener.kt | 2 +- .../RouteToHintsAndSolutionListener.kt | 2 +- .../listener/ShowHintAvailabilityListener.kt | 4 +- .../listener/StateKeyboardButtonListener.kt | 2 +- .../SubmitNavigationButtonListener.kt | 2 +- .../testing/StateFragmentTestActivity.kt | 26 +- .../StateFragmentTestActivityPresenter.kt | 28 +- .../testing/StateFragmentTestViewModel.kt | 6 +- .../RestartPlayingSessionListener.kt | 2 +- .../StopExplorationDialogFragment.kt | 4 +- .../StopStatePlayingSessionListener.kt | 2 +- .../android/app/profile/AddProfileActivity.kt | 4 +- .../profile/AddProfileActivityPresenter.kt | 14 +- .../app/profile/AddProfileViewModel.kt | 6 +- .../android/app/profile/AdminAuthActivity.kt | 4 +- .../app/profile/AdminAuthActivityPresenter.kt | 12 +- .../android/app/profile/AdminAuthEnum.kt | 2 +- .../android/app/profile/AdminAuthViewModel.kt | 6 +- .../android/app/profile/AdminPinActivity.kt | 4 +- .../app/profile/AdminPinActivityPresenter.kt | 16 +- .../android/app/profile/AdminPinViewModel.kt | 6 +- .../profile/AdminSettingsDialogFragment.kt | 4 +- .../AdminSettingsDialogFragmentPresenter.kt | 10 +- .../app/profile/AdminSettingsViewModel.kt | 6 +- .../app/profile/PinPasswordActivity.kt | 4 +- .../profile/PinPasswordActivityPresenter.kt | 18 +- .../app/profile/PinPasswordViewModel.kt | 16 +- .../app/profile/ProfileChooserActivity.kt | 4 +- .../ProfileChooserActivityPresenter.kt | 10 +- .../app/profile/ProfileChooserFragment.kt | 4 +- .../ProfileChooserFragmentPresenter.kt | 34 +- .../app/profile/ProfileChooserViewModel.kt | 20 +- .../android/app/profile/ProfileInputView.kt | 8 +- .../profile/ProfileRouteDialogInterface.kt | 2 +- .../app/profile/ResetPinDialogFragment.kt | 4 +- .../ResetPinDialogFragmentPresenter.kt | 14 +- .../android/app/profile/ResetPinViewModel.kt | 6 +- .../app/profile/RouteToAdminPinListener.kt | 2 +- .../profileprogress/ProfilePictureActivity.kt | 4 +- .../ProfilePictureActivityPresenter.kt | 22 +- .../ProfilePictureActivityViewModel.kt | 6 +- .../ProfilePictureClickListener.kt | 2 +- .../ProfilePictureDialogInterface.kt | 2 +- .../ProfilePictureEditDialogFragment.kt | 4 +- .../ProfileProgressActivity.kt | 12 +- .../ProfileProgressActivityPresenter.kt | 12 +- .../ProfileProgressFragment.kt | 4 +- .../ProfileProgressFragmentPresenter.kt | 14 +- .../ProfileProgressHeaderViewModel.kt | 6 +- .../ProfileProgressItemViewModel.kt | 4 +- .../ProfileProgressViewModel.kt | 32 +- .../RecentlyPlayedStorySummaryViewModel.kt | 8 +- .../RouteToCompletedStoryListListener.kt | 2 +- .../RouteToOngoingTopicListListener.kt | 2 +- .../app/recyclerview/BindableAdapter.kt | 6 +- .../app/recyclerview/DividerItemDecorator.kt | 2 +- .../DragAndDropItemFacilitator.kt | 2 +- .../app/recyclerview/OnDragEndedListener.kt | 2 +- .../app/recyclerview/OnItemDragListener.kt | 2 +- .../RecyclerViewBindingAdapter.java | 2 +- .../app/recyclerview/StartSnapHelper.kt | 2 +- .../settings/profile/ProfileEditActivity.kt | 4 +- .../profile/ProfileEditActivityPresenter.kt | 16 +- .../settings/profile/ProfileEditViewModel.kt | 16 +- .../settings/profile/ProfileListActivity.kt | 4 +- .../profile/ProfileListActivityPresenter.kt | 6 +- .../settings/profile/ProfileListFragment.kt | 4 +- .../profile/ProfileListFragmentPresenter.kt | 14 +- .../settings/profile/ProfileListViewModel.kt | 14 +- .../settings/profile/ProfileRenameActivity.kt | 4 +- .../profile/ProfileRenameActivityPresenter.kt | 18 +- .../profile/ProfileRenameViewModel.kt | 6 +- .../profile/ProfileResetPinActivity.kt | 4 +- .../ProfileResetPinActivityPresenter.kt | 16 +- .../profile/ProfileResetPinViewModel.kt | 6 +- .../android/app/shim/IntentFactoryShim.kt | 2 +- .../android/app/shim/IntentFactoryShimImpl.kt | 10 +- .../app/shim/IntentFactoryShimModule.kt | 2 +- .../oppia/android/app/shim/ViewBindingShim.kt | 8 +- .../android/app/shim/ViewBindingShimImpl.kt | 20 +- .../android/app/shim/ViewBindingShimModule.kt | 2 +- .../android/app/shim/ViewComponentFactory.kt | 4 +- .../android/app/splash/SplashActivity.kt | 6 +- .../app/splash/SplashActivityPresenter.kt | 24 +- .../app/story/ExplorationSelectionListener.kt | 2 +- .../oppia/android/app/story/StoryActivity.kt | 8 +- .../app/story/StoryActivityPresenter.kt | 6 +- .../oppia/android/app/story/StoryFragment.kt | 4 +- .../app/story/StoryFragmentPresenter.kt | 30 +- .../app/story/StoryFragmentScroller.kt | 2 +- .../oppia/android/app/story/StoryViewModel.kt | 28 +- .../StoryChapterSummaryViewModel.kt | 14 +- .../StoryHeaderViewModel.kt | 2 +- .../storyitemviewmodel/StoryItemViewModel.kt | 4 +- .../app/testing/AudioFragmentTestActivity.kt | 4 +- .../AudioFragmentTestActivityPresenter.kt | 16 +- .../testing/BindableAdapterTestActivity.kt | 6 +- .../testing/BindableAdapterTestFragment.kt | 4 +- .../BindableAdapterTestFragmentPresenter.kt | 10 +- .../testing/BindableAdapterTestViewModel.kt | 8 +- .../ConceptCardFragmentTestActivity.kt | 8 +- ...onceptCardFragmentTestActivityPresenter.kt | 12 +- .../app/testing/DragDropTestActivity.kt | 8 +- .../testing/DragDropTestActivityPresenter.kt | 6 +- .../testing/ExplorationInjectionActivity.kt | 8 +- .../app/testing/ExplorationTestActivity.kt | 10 +- .../ExplorationTestActivityPresenter.kt | 20 +- .../app/testing/HomeInjectionActivity.kt | 8 +- .../android/app/testing/HomeTestActivity.kt | 4 +- .../app/testing/HomeTestActivityPresenter.kt | 6 +- .../app/testing/HtmlParserTestActivity.kt | 10 +- .../ImageRegionSelectionTestActivity.kt | 8 +- .../ImageRegionSelectionTestFragment.kt | 6 +- ...ageRegionSelectionTestFragmentPresenter.kt | 10 +- .../InputInteractionViewTestActivity.kt | 30 +- .../testing/NavigationDrawerTestActivity.kt | 14 +- .../ProfileChooserFragmentTestActivity.kt | 4 +- ...ileChooserFragmentTestActivityPresenter.kt | 10 +- .../app/testing/StoryFragmentTestActivity.kt | 6 +- .../StoryFragmentTestActivityPresenter.kt | 8 +- .../TestFontScaleConfigurationUtilActivity.kt | 4 +- ...ScaleConfigurationUtilActivityPresenter.kt | 8 +- .../app/testing/TopicRevisionTestActivity.kt | 10 +- .../TopicRevisionTestActivityPresenter.kt | 8 +- .../android/app/testing/TopicTestActivity.kt | 26 +- .../app/testing/TopicTestActivityForStory.kt | 28 +- .../app/topic/RouteToConceptCardListener.kt | 2 +- .../topic/RouteToQuestionPlayerListener.kt | 2 +- .../app/topic/RouteToRevisionCardListener.kt | 2 +- .../android/app/topic/RouteToStoryListener.kt | 2 +- .../oppia/android/app/topic/TopicActivity.kt | 16 +- .../app/topic/TopicActivityPresenter.kt | 8 +- .../oppia/android/app/topic/TopicFragment.kt | 6 +- .../app/topic/TopicFragmentPresenter.kt | 16 +- .../org/oppia/android/app/topic/TopicTab.kt | 2 +- .../oppia/android/app/topic/TopicViewModel.kt | 16 +- .../android/app/topic/ViewPagerAdapter.kt | 10 +- .../topic/conceptcard/ConceptCardFragment.kt | 6 +- .../ConceptCardFragmentPresenter.kt | 16 +- .../topic/conceptcard/ConceptCardListener.kt | 2 +- .../topic/conceptcard/ConceptCardViewModel.kt | 20 +- .../app/topic/info/TopicInfoFragment.kt | 8 +- .../topic/info/TopicInfoFragmentPresenter.kt | 24 +- .../app/topic/info/TopicInfoViewModel.kt | 12 +- .../topic/lessons/ChapterSummaryAdapter.kt | 8 +- .../topic/lessons/ChapterSummarySelector.kt | 4 +- .../ExpandedChapterListIndexListener.kt | 2 +- .../app/topic/lessons/StorySummaryAdapter.kt | 10 +- .../app/topic/lessons/StorySummarySelector.kt | 4 +- .../topic/lessons/StorySummaryViewModel.kt | 4 +- .../app/topic/lessons/TopicLessonsFragment.kt | 12 +- .../lessons/TopicLessonsFragmentPresenter.kt | 26 +- .../lessons/TopicLessonsItemViewModel.kt | 4 +- .../lessons/TopicLessonsTitleViewModel.kt | 2 +- .../app/topic/practice/SubtopicSelector.kt | 2 +- .../topic/practice/TopicPracticeFragment.kt | 8 +- .../TopicPracticeFragmentPresenter.kt | 28 +- .../topic/practice/TopicPracticeViewModel.kt | 24 +- .../TopicPracticeFooterViewModel.kt | 2 +- .../TopicPracticeHeaderViewModel.kt | 2 +- .../TopicPracticeItemViewModel.kt | 4 +- .../TopicPracticeSubtopicViewModel.kt | 4 +- ...HintsAndSolutionQuestionManagerFragment.kt | 4 +- ...olutionQuestionManagerFragmentPresenter.kt | 12 +- ...HintsAndSolutionQuestionManagerListener.kt | 4 +- .../questionplayer/QuestionPlayerActivity.kt | 28 +- .../QuestionPlayerActivityPresenter.kt | 14 +- .../questionplayer/QuestionPlayerFragment.kt | 26 +- .../QuestionPlayerFragmentPresenter.kt | 50 +- .../questionplayer/QuestionPlayerViewModel.kt | 14 +- .../revision/RevisionSubtopicSelector.kt | 4 +- .../topic/revision/TopicRevisionFragment.kt | 10 +- .../TopicRevisionFragmentPresenter.kt | 20 +- .../topic/revision/TopicRevisionViewModel.kt | 20 +- .../TopicRevisionItemViewModel.kt | 8 +- .../ReturnToTopicClickListener.kt | 2 +- .../revisioncard/RevisionCardActivity.kt | 6 +- .../RevisionCardActivityPresenter.kt | 20 +- .../revisioncard/RevisionCardFragment.kt | 4 +- .../RevisionCardFragmentPresenter.kt | 14 +- .../revisioncard/RevisionCardViewModel.kt | 20 +- .../app/utility/ClickableAreasImage.kt | 10 +- .../android/app/utility/ContextExtensions.kt | 2 +- .../app/utility/FontScaleConfigurationUtil.kt | 4 +- .../android/app/utility/KeyboardHelper.kt | 2 +- .../app/utility/LifecycleSafeTimerFactory.kt | 4 +- .../utility/OnClickableAreaClickedListener.kt | 2 +- .../android/app/utility/RatioExtensions.kt | 6 +- .../android/app/utility/RegionClickEvent.kt | 2 +- .../android/app/utility/SplitScreenManager.kt | 14 +- .../oppia/android/app/view/ViewComponent.kt | 10 +- .../org/oppia/android/app/view/ViewScope.kt | 2 +- .../app/viewmodel/ObservableArrayList.kt | 2 +- .../app/viewmodel/ObservableViewModel.kt | 2 +- .../app/viewmodel/ViewModelBridgeFactory.kt | 2 +- .../app/viewmodel/ViewModelProvider.kt | 2 +- .../app/walkthrough/WalkthroughActivity.kt | 4 +- .../WalkthroughActivityListener.kt | 2 +- .../WalkthroughActivityPresenter.kt | 18 +- .../WalkthroughFragmentChangeListener.kt | 2 +- .../app/walkthrough/WalkthroughPageChanger.kt | 2 +- .../app/walkthrough/WalkthroughPages.kt | 2 +- .../app/walkthrough/WalkthroughViewModel.kt | 4 +- .../end/WalkthroughEndPageChanger.kt | 2 +- .../end/WalkthroughFinalFragment.kt | 4 +- .../end/WalkthroughFinalFragmentPresenter.kt | 20 +- .../end/WalkthroughFinalListener.kt | 2 +- .../end/WalkthroughFinalViewModel.kt | 4 +- .../WalkthroughTopicItemViewModel.kt | 4 +- .../topiclist/WalkthroughTopicListFragment.kt | 8 +- .../WalkthroughTopicListFragmentPresenter.kt | 24 +- .../topiclist/WalkthroughTopicViewModel.kt | 18 +- .../WalkthroughTopicHeaderViewModel.kt | 4 +- .../WalkthroughTopicSummaryViewModel.kt | 8 +- .../welcome/WalkthroughWelcomeFragment.kt | 4 +- .../WalkthroughWelcomeFragmentPresenter.kt | 26 +- .../welcome/WalkthroughWelcomeViewModel.kt | 4 +- .../res/layout-land/add_profile_activity.xml | 8 +- .../res/layout-land/admin_auth_activity.xml | 4 +- .../res/layout-land/admin_pin_activity.xml | 6 +- .../res/layout-land/admin_settings_dialog.xml | 4 +- ...istrator_controls_account_actions_view.xml | 2 +- .../administrator_controls_activity.xml | 2 +- ...istrator_controls_app_information_view.xml | 2 +- ...tor_controls_download_permissions_view.xml | 2 +- .../administrator_controls_fragment.xml | 2 +- .../administrator_controls_general_view.xml | 2 +- .../administrator_controls_profile_view.xml | 2 +- .../res/layout-land/app_version_fragment.xml | 2 +- .../res/layout-land/completed_story_item.xml | 4 +- .../completed_story_list_fragment.xml | 2 +- .../res/layout-land/concept_card_fragment.xml | 2 +- app/src/main/res/layout-land/content_item.xml | 2 +- .../layout-land/continue_interaction_item.xml | 2 +- .../continue_navigation_button_item.xml | 2 +- .../drag_drop_interaction_item.xml | 4 +- app/src/main/res/layout-land/faq_content.xml | 2 +- .../main/res/layout-land/faq_item_header.xml | 2 +- .../res/layout-land/faq_list_fragment.xml | 2 +- .../main/res/layout-land/feedback_item.xml | 2 +- .../layout-land/fraction_interaction_item.xml | 4 +- .../main/res/layout-land/help_activity.xml | 2 +- app/src/main/res/layout-land/help_item.xml | 2 +- .../hints_and_solution_fragment.xml | 2 +- .../main/res/layout-land/hints_summary.xml | 2 +- .../main/res/layout-land/home_activity.xml | 2 +- .../main/res/layout-land/home_fragment.xml | 2 +- .../res/layout-land/lessons_chapter_view.xml | 4 +- .../main/res/layout-land/next_button_item.xml | 2 +- .../numeric_input_interaction_item.xml | 4 +- .../res/layout-land/onboarding_fragment.xml | 4 +- .../main/res/layout-land/onboarding_slide.xml | 2 +- .../layout-land/onboarding_slide_final.xml | 2 +- .../res/layout-land/ongoing_story_card.xml | 4 +- .../res/layout-land/ongoing_topic_item.xml | 6 +- .../ongoing_topic_list_fragment.xml | 2 +- .../main/res/layout-land/option_activity.xml | 2 +- .../res/layout-land/option_app_language.xml | 2 +- .../res/layout-land/option_audio_language.xml | 2 +- .../layout-land/option_story_text_size.xml | 2 +- .../main/res/layout-land/options_fragment.xml | 2 +- .../res/layout-land/pin_password_activity.xml | 2 +- .../res/layout-land/previous_button_item.xml | 2 +- .../previous_responses_header_item.xml | 2 +- .../layout-land/profile_chooser_fragment.xml | 2 +- .../profile_chooser_profile_view.xml | 2 +- .../res/layout-land/profile_edit_activity.xml | 2 +- .../res/layout-land/profile_list_fragment.xml | 2 +- .../layout-land/profile_list_profile_view.xml | 2 +- .../layout-land/profile_picture_activity.xml | 2 +- .../layout-land/profile_progress_fragment.xml | 2 +- .../layout-land/profile_progress_header.xml | 2 +- ...le_progress_recently_played_story_card.xml | 4 +- .../layout-land/profile_rename_activity.xml | 4 +- .../profile_reset_pin_activity.xml | 6 +- .../res/layout-land/promoted_story_card.xml | 4 +- .../res/layout-land/promoted_story_list.xml | 2 +- .../layout-land/question_player_fragment.xml | 2 +- .../res/layout-land/replay_button_item.xml | 2 +- .../main/res/layout-land/reset_pin_dialog.xml | 4 +- .../return_to_topic_button_item.xml | 2 +- .../layout-land/revision_card_fragment.xml | 2 +- .../main/res/layout-land/section_title.xml | 2 +- .../selection_interaction_item.xml | 6 +- .../main/res/layout-land/solution_summary.xml | 2 +- .../main/res/layout-land/state_fragment.xml | 2 +- .../res/layout-land/story_chapter_view.xml | 4 +- .../main/res/layout-land/story_fragment.xml | 2 +- .../res/layout-land/story_header_view.xml | 2 +- .../res/layout-land/submit_button_item.xml | 2 +- .../res/layout-land/submitted_answer_item.xml | 4 +- .../text_input_interaction_item.xml | 4 +- .../res/layout-land/topic_info_fragment.xml | 2 +- .../topic_lessons_story_summary.xml | 4 +- .../res/layout-land/topic_lessons_title.xml | 2 +- .../topic_practice_footer_view.xml | 2 +- .../layout-land/topic_practice_fragment.xml | 2 +- .../topic_practice_header_view.xml | 2 +- .../layout-land/topic_practice_subtopic.xml | 2 +- .../layout-land/topic_revision_fragment.xml | 2 +- .../topic_revision_summary_view.xml | 6 +- .../res/layout-land/topic_summary_view.xml | 4 +- .../walkthrough_final_fragment.xml | 4 +- .../walkthrough_welcome_fragment.xml | 4 +- app/src/main/res/layout-land/welcome.xml | 2 +- .../completed_story_item.xml | 4 +- .../completed_story_list_fragment.xml | 2 +- .../concept_card_fragment.xml | 2 +- .../res/layout-sw600dp-land/content_item.xml | 2 +- .../continue_interaction_item.xml | 2 +- .../continue_navigation_button_item.xml | 2 +- .../drag_drop_interaction_item.xml | 4 +- .../res/layout-sw600dp-land/feedback_item.xml | 2 +- .../fraction_interaction_item.xml | 4 +- .../hints_and_solution_fragment.xml | 2 +- .../res/layout-sw600dp-land/hints_summary.xml | 2 +- .../res/layout-sw600dp-land/home_fragment.xml | 2 +- .../layout-sw600dp-land/next_button_item.xml | 2 +- .../numeric_input_interaction_item.xml | 4 +- .../onboarding_fragment.xml | 4 +- .../layout-sw600dp-land/onboarding_slide.xml | 2 +- .../onboarding_slide_final.xml | 2 +- .../ongoing_story_card.xml | 4 +- .../ongoing_topic_item.xml | 6 +- .../ongoing_topic_list_fragment.xml | 2 +- .../previous_button_item.xml | 2 +- .../previous_responses_header_item.xml | 2 +- .../profile_chooser_fragment.xml | 2 +- .../profile_chooser_profile_view.xml | 2 +- .../profile_progress_fragment.xml | 2 +- .../profile_progress_header.xml | 2 +- ...le_progress_recently_played_story_card.xml | 4 +- .../promoted_story_card.xml | 4 +- .../promoted_story_list.xml | 2 +- .../question_player_fragment.xml | 2 +- .../replay_button_item.xml | 2 +- .../return_to_topic_button_item.xml | 2 +- .../res/layout-sw600dp-land/section_title.xml | 2 +- .../selection_interaction_item.xml | 6 +- .../layout-sw600dp-land/solution_summary.xml | 2 +- .../layout-sw600dp-land/state_fragment.xml | 2 +- .../submit_button_item.xml | 2 +- .../submitted_answer_item.xml | 4 +- .../text_input_interaction_item.xml | 4 +- .../layout-sw600dp-land/topic_fragment.xml | 2 +- .../topic_info_fragment.xml | 4 +- .../topic_lessons_story_summary.xml | 4 +- .../topic_lessons_title.xml | 2 +- .../topic_practice_footer_view.xml | 2 +- .../topic_practice_fragment.xml | 2 +- .../topic_practice_header_view.xml | 2 +- .../topic_practice_subtopic.xml | 2 +- .../topic_revision_fragment.xml | 2 +- .../topic_revision_summary_view.xml | 6 +- .../topic_summary_view.xml | 4 +- .../main/res/layout-sw600dp-land/welcome.xml | 2 +- .../completed_story_item.xml | 4 +- .../completed_story_list_fragment.xml | 2 +- .../concept_card_fragment.xml | 2 +- .../res/layout-sw600dp-port/content_item.xml | 2 +- .../continue_interaction_item.xml | 2 +- .../continue_navigation_button_item.xml | 2 +- .../drag_drop_interaction_item.xml | 4 +- .../res/layout-sw600dp-port/feedback_item.xml | 2 +- .../fraction_interaction_item.xml | 4 +- .../hints_and_solution_fragment.xml | 2 +- .../res/layout-sw600dp-port/hints_summary.xml | 2 +- .../res/layout-sw600dp-port/home_activity.xml | 2 +- .../res/layout-sw600dp-port/home_fragment.xml | 2 +- .../layout-sw600dp-port/next_button_item.xml | 2 +- .../numeric_input_interaction_item.xml | 4 +- .../onboarding_fragment.xml | 4 +- .../layout-sw600dp-port/onboarding_slide.xml | 2 +- .../onboarding_slide_final.xml | 2 +- .../ongoing_story_card.xml | 4 +- .../ongoing_topic_item.xml | 6 +- .../ongoing_topic_list_fragment.xml | 2 +- .../previous_button_item.xml | 2 +- .../previous_responses_header_item.xml | 2 +- .../profile_chooser_fragment.xml | 2 +- .../profile_chooser_profile_view.xml | 2 +- .../profile_progress_fragment.xml | 2 +- .../profile_progress_header.xml | 2 +- ...le_progress_recently_played_story_card.xml | 4 +- .../promoted_story_card.xml | 4 +- .../promoted_story_list.xml | 2 +- .../question_player_fragment.xml | 2 +- .../replay_button_item.xml | 2 +- .../return_to_topic_button_item.xml | 2 +- .../res/layout-sw600dp-port/section_title.xml | 2 +- .../selection_interaction_item.xml | 6 +- .../layout-sw600dp-port/solution_summary.xml | 2 +- .../layout-sw600dp-port/state_fragment.xml | 2 +- .../submit_button_item.xml | 2 +- .../submitted_answer_item.xml | 4 +- .../text_input_interaction_item.xml | 4 +- .../layout-sw600dp-port/topic_fragment.xml | 2 +- .../topic_info_fragment.xml | 4 +- .../topic_lessons_story_summary.xml | 4 +- .../topic_lessons_title.xml | 2 +- .../topic_practice_footer_view.xml | 2 +- .../topic_practice_fragment.xml | 2 +- .../topic_practice_header_view.xml | 2 +- .../topic_practice_subtopic.xml | 2 +- .../topic_revision_fragment.xml | 2 +- .../topic_revision_summary_view.xml | 6 +- .../main/res/layout-sw600dp-port/welcome.xml | 2 +- ...istrator_controls_account_actions_view.xml | 2 +- .../administrator_controls_activity.xml | 2 +- ...istrator_controls_app_information_view.xml | 4 +- ...tor_controls_download_permissions_view.xml | 2 +- .../administrator_controls_fragment.xml | 2 +- .../administrator_controls_general_view.xml | 2 +- .../administrator_controls_profile_view.xml | 4 +- .../layout-sw600dp/app_version_fragment.xml | 2 +- .../res/layout-sw600dp/option_activity.xml | 2 +- .../layout-sw600dp/option_app_language.xml | 4 +- .../layout-sw600dp/option_audio_language.xml | 4 +- .../layout-sw600dp/option_story_text_size.xml | 4 +- .../layout-sw600dp/profile_list_fragment.xml | 2 +- .../activity_input_interaction_view_test.xml | 16 +- .../main/res/layout/add_profile_activity.xml | 8 +- .../main/res/layout/admin_auth_activity.xml | 4 +- .../main/res/layout/admin_pin_activity.xml | 6 +- .../main/res/layout/admin_settings_dialog.xml | 4 +- ...istrator_controls_account_actions_view.xml | 2 +- .../administrator_controls_activity.xml | 2 +- ...istrator_controls_app_information_view.xml | 2 +- ...tor_controls_download_permissions_view.xml | 2 +- .../administrator_controls_fragment.xml | 2 +- .../administrator_controls_general_view.xml | 2 +- .../administrator_controls_profile_view.xml | 2 +- .../main/res/layout/app_version_fragment.xml | 2 +- app/src/main/res/layout/audio_fragment.xml | 6 +- .../main/res/layout/completed_story_item.xml | 4 +- .../layout/completed_story_list_fragment.xml | 2 +- .../main/res/layout/concept_card_fragment.xml | 2 +- app/src/main/res/layout/content_item.xml | 2 +- .../res/layout/continue_interaction_item.xml | 2 +- .../continue_navigation_button_item.xml | 2 +- .../res/layout/downloads_tab_fragment.xml | 2 +- .../res/layout/drag_drop_interaction_item.xml | 4 +- .../layout/drag_drop_interaction_items.xml | 2 +- app/src/main/res/layout/drawer_fragment.xml | 2 +- .../main/res/layout/exploration_activity.xml | 2 +- app/src/main/res/layout/faq_content.xml | 2 +- app/src/main/res/layout/faq_item_header.xml | 2 +- app/src/main/res/layout/faq_list_fragment.xml | 2 +- app/src/main/res/layout/feedback_item.xml | 2 +- .../res/layout/fraction_interaction_item.xml | 4 +- app/src/main/res/layout/help_activity.xml | 2 +- app/src/main/res/layout/help_fragment.xml | 2 +- app/src/main/res/layout/help_item.xml | 2 +- .../layout/hints_and_solution_fragment.xml | 2 +- app/src/main/res/layout/hints_summary.xml | 2 +- app/src/main/res/layout/home_activity.xml | 2 +- app/src/main/res/layout/home_fragment.xml | 2 +- ...mage_region_selection_interaction_item.xml | 4 +- .../image_region_selection_test_fragment.xml | 2 +- .../item_selection_interaction_items.xml | 2 +- .../main/res/layout/lessons_chapter_view.xml | 4 +- .../multiple_choice_interaction_items.xml | 2 +- .../layout/nav_header_navigation_drawer.xml | 2 +- app/src/main/res/layout/next_button_item.xml | 2 +- .../layout/numeric_input_interaction_item.xml | 4 +- .../main/res/layout/onboarding_fragment.xml | 4 +- app/src/main/res/layout/onboarding_slide.xml | 2 +- .../res/layout/onboarding_slide_final.xml | 2 +- .../main/res/layout/ongoing_story_card.xml | 4 +- .../main/res/layout/ongoing_topic_item.xml | 6 +- .../layout/ongoing_topic_list_fragment.xml | 2 +- app/src/main/res/layout/option_activity.xml | 2 +- .../main/res/layout/option_app_language.xml | 2 +- .../main/res/layout/option_audio_language.xml | 2 +- .../res/layout/option_story_text_size.xml | 2 +- app/src/main/res/layout/options_fragment.xml | 2 +- .../main/res/layout/pin_password_activity.xml | 2 +- .../main/res/layout/previous_button_item.xml | 2 +- .../layout/previous_responses_header_item.xml | 2 +- .../res/layout/profile_chooser_fragment.xml | 2 +- .../layout/profile_chooser_profile_view.xml | 2 +- .../main/res/layout/profile_edit_activity.xml | 2 +- .../main/res/layout/profile_list_fragment.xml | 2 +- .../res/layout/profile_list_profile_view.xml | 2 +- .../res/layout/profile_picture_activity.xml | 2 +- .../res/layout/profile_progress_fragment.xml | 2 +- .../res/layout/profile_progress_header.xml | 2 +- ...le_progress_recently_played_story_card.xml | 4 +- .../res/layout/profile_rename_activity.xml | 4 +- .../res/layout/profile_reset_pin_activity.xml | 6 +- .../main/res/layout/promoted_story_card.xml | 4 +- .../main/res/layout/promoted_story_list.xml | 2 +- .../res/layout/question_player_fragment.xml | 2 +- .../layout/ratio_input_interaction_item.xml | 4 +- .../main/res/layout/replay_button_item.xml | 2 +- app/src/main/res/layout/reset_pin_dialog.xml | 4 +- .../layout/return_to_topic_button_item.xml | 2 +- .../res/layout/revision_card_fragment.xml | 2 +- app/src/main/res/layout/section_title.xml | 2 +- .../res/layout/selection_interaction_item.xml | 6 +- app/src/main/res/layout/solution_summary.xml | 2 +- app/src/main/res/layout/state_fragment.xml | 2 +- .../layout/state_fragment_test_activity.xml | 2 +- .../main/res/layout/story_chapter_view.xml | 6 +- app/src/main/res/layout/story_fragment.xml | 2 +- app/src/main/res/layout/story_header_view.xml | 2 +- .../main/res/layout/submit_button_item.xml | 2 +- .../main/res/layout/submitted_answer_item.xml | 4 +- .../res/layout/submitted_answer_list_item.xml | 2 +- app/src/main/res/layout/test_fragment.xml | 2 +- ...st_text_view_for_int_with_data_binding.xml | 2 +- ...text_view_for_string_with_data_binding.xml | 2 +- .../layout/text_input_interaction_item.xml | 4 +- app/src/main/res/layout/topic_fragment.xml | 2 +- .../main/res/layout/topic_info_fragment.xml | 4 +- .../layout/topic_lessons_story_summary.xml | 4 +- .../main/res/layout/topic_lessons_title.xml | 2 +- .../res/layout/topic_practice_footer_view.xml | 2 +- .../res/layout/topic_practice_fragment.xml | 2 +- .../res/layout/topic_practice_header_view.xml | 2 +- .../res/layout/topic_practice_subtopic.xml | 2 +- .../res/layout/topic_revision_fragment.xml | 2 +- .../layout/topic_revision_summary_view.xml | 6 +- .../main/res/layout/topic_summary_view.xml | 4 +- .../main/res/layout/updates_tab_fragment.xml | 2 +- .../main/res/layout/walkthrough_activity.xml | 4 +- .../res/layout/walkthrough_final_fragment.xml | 4 +- .../layout/walkthrough_topic_header_view.xml | 2 +- .../walkthrough_topic_list_fragment.xml | 2 +- .../layout/walkthrough_topic_summary_view.xml | 2 +- .../layout/walkthrough_welcome_fragment.xml | 4 +- app/src/main/res/layout/welcome.xml | 2 +- .../AdministratorControlsActivityTest.kt | 34 +- .../AppVersionActivityTest.kt | 18 +- .../CompletedStoryListActivityTest.kt | 30 +- .../android/app/faq/FAQListFragmentTest.kt | 14 +- .../android/app/faq/FAQSingleActivityTest.kt | 6 +- .../android/app/help/HelpFragmentTest.kt | 12 +- .../android/app/home/HomeActivityTest.kt | 44 +- .../app/home/RecentlyPlayedFragmentTest.kt | 42 +- .../mydownloads/MyDownloadsFragmentTest.kt | 10 +- .../app/onboarding/OnboardingFragmentTest.kt | 8 +- .../OngoingTopicListActivityTest.kt | 28 +- .../app/options/OptionsFragmentTest.kt | 22 +- .../android/app/parser/HtmlParserTest.kt | 32 +- .../android/app/parser/RichTextViewMatcher.kt | 2 +- .../app/player/audio/AudioFragmentTest.kt | 28 +- .../exploration/ExplorationActivityTest.kt | 40 +- .../app/player/state/StateFragmentTest.kt | 147 +-- .../app/profile/AddProfileActivityTest.kt | 22 +- .../app/profile/AdminAuthActivityTest.kt | 18 +- .../app/profile/AdminPinActivityTest.kt | 24 +- .../app/profile/PinPasswordActivityTest.kt | 26 +- .../app/profile/ProfileChooserFragmentTest.kt | 30 +- .../ProfilePictureActivityTest.kt | 20 +- .../ProfileProgressFragmentTest.kt | 42 +- .../app/recyclerview/BindableAdapterTest.kt | 28 +- .../app/recyclerview/RecyclerViewMatcher.kt | 2 +- .../profile/ProfileEditActivityTest.kt | 24 +- .../profile/ProfileListFragmentTest.kt | 26 +- .../profile/ProfileRenameActivityTest.kt | 22 +- .../profile/ProfileResetPinActivityTest.kt | 22 +- .../android/app/splash/SplashActivityTest.kt | 80 +- .../android/app/story/StoryActivityTest.kt | 12 +- .../android/app/story/StoryFragmentTest.kt | 40 +- .../app/testing/DragDropTestActivityTest.kt | 20 +- ...ImageRegionSelectionInteractionViewTest.kt | 38 +- .../InputInteractionViewTestActivityTest.kt | 6 +- .../NavigationDrawerTestActivityTest.kt | 36 +- ...tFontScaleConfigurationUtilActivityTest.kt | 8 +- .../testing/TopicTestActivityForStoryTest.kt | 12 +- .../android/app/topic/TopicFragmentTest.kt | 18 +- .../conceptcard/ConceptCardFragmentTest.kt | 14 +- .../app/topic/info/TopicInfoFragmentTest.kt | 12 +- .../topic/lessons/TopicLessonsFragmentTest.kt | 46 +- .../practice/TopicPracticeFragmentTest.kt | 20 +- .../QuestionPlayerActivityTest.kt | 92 +- .../revision/TopicRevisionFragmentTest.kt | 20 +- .../revisioncard/RevisionCardFragmentTest.kt | 22 +- .../oppia/android/app/utility/ClickActions.kt | 2 +- .../android/app/utility/DragViewAction.kt | 2 +- .../android/app/utility/DrawableMatcher.kt | 2 +- .../app/utility/EspressoTestsMatchers.kt | 4 +- .../android/app/utility/FontSizeMatcher.kt | 2 +- .../app/utility/MockitoKotlinHelper.kt | 2 +- .../app/utility/OrientationChangeAction.kt | 2 +- .../android/app/utility/ProgressMatcher.kt | 2 +- .../app/utility/RatioExtensionsTest.kt | 4 +- .../oppia/android/app/utility/TabMatcher.kt | 2 +- .../walkthrough/WalkthroughActivityTest.kt | 8 +- .../WalkthroughFinalFragmentTest.kt | 10 +- .../WalkthroughTopicListFragmentTest.kt | 8 +- .../WalkthroughWelcomeFragmentTest.kt | 26 +- app/src/test/AndroidManifest.xml | 2 +- app/src/test/java/DataBinderMapperImpl.java | 2 +- .../android/app/home/HomeActivityLocalTest.kt | 72 +- .../app/parser/StringToRatioParserTest.kt | 4 +- .../ExplorationActivityLocalTest.kt | 84 +- .../player/state/StateFragmentLocalTest.kt | 108 +- .../ProfileChooserFragmentLocalTest.kt | 76 +- .../app/story/StoryActivityLocalTest.kt | 74 +- .../app/testing/CompletedStoryListSpanTest.kt | 8 +- .../app/testing/OngoingTopicListSpanTest.kt | 8 +- .../app/testing/ProfileChooserSpanTest.kt | 4 +- .../app/testing/ProfileProgressSpanCount.kt | 8 +- .../app/testing/TopicRevisionSpanTest.kt | 6 +- .../AdministratorControlsFragmentTest.kt | 14 +- .../options/AppLanguageFragmentTest.kt | 82 +- .../options/DefaultAudioFragmentTest.kt | 82 +- .../testing/options/OptionsFragmentTest.kt | 26 +- .../options/ReadingTextSizeFragmentTest.kt | 82 +- .../player/split/PlayerSplitScreenTesting.kt | 6 +- .../state/StateFragmentAccessibilityTest.kt | 88 +- .../topic/info/TopicInfoFragmentLocalTest.kt | 76 +- .../lessons/TopicLessonsFragmentLocalTest.kt | 74 +- .../QuestionPlayerActivityLocalTest.kt | 80 +- .../RevisionCardActivityLocalTest.kt | 78 +- app/test_with_resources.bzl | 32 +- data/BUILD.bazel | 10 +- data/src/main/AndroidManifest.xml | 2 +- .../java/org/oppia/android/data/Constants.kt | 2 +- .../data/backends/gae/NetworkInterceptor.kt | 4 +- .../data/backends/gae/NetworkModule.kt | 6 +- .../data/backends/gae/NetworkSettings.kt | 2 +- .../data/backends/gae/api/ClassroomService.kt | 4 +- .../backends/gae/api/ConceptCardService.kt | 4 +- .../backends/gae/api/ExplorationService.kt | 4 +- .../backends/gae/api/QuestionPlayerService.kt | 4 +- .../data/backends/gae/api/StoryService.kt | 4 +- .../data/backends/gae/api/SubtopicService.kt | 4 +- .../data/backends/gae/api/TopicService.kt | 4 +- .../data/backends/gae/model/GaeAnswerGroup.kt | 2 +- .../data/backends/gae/model/GaeClassroom.kt | 2 +- .../data/backends/gae/model/GaeConceptCard.kt | 2 +- .../gae/model/GaeCustomizationArgs.kt | 2 +- .../data/backends/gae/model/GaeExpSummary.kt | 2 +- .../data/backends/gae/model/GaeExploration.kt | 2 +- .../gae/model/GaeExplorationContainer.kt | 2 +- .../data/backends/gae/model/GaeHint.kt | 2 +- .../gae/model/GaeInteractionInstance.kt | 2 +- .../data/backends/gae/model/GaeOutcome.kt | 2 +- .../data/backends/gae/model/GaeParamChange.kt | 2 +- .../data/backends/gae/model/GaeParamSpec.kt | 2 +- .../data/backends/gae/model/GaeQuestion.kt | 2 +- .../backends/gae/model/GaeQuestionPlayer.kt | 2 +- .../gae/model/GaeRecordedVoiceovers.kt | 2 +- .../data/backends/gae/model/GaeRuleSpec.kt | 2 +- .../backends/gae/model/GaeSkillContents.kt | 2 +- .../data/backends/gae/model/GaeSolution.kt | 2 +- .../data/backends/gae/model/GaeState.kt | 2 +- .../backends/gae/model/GaeStateClassifier.kt | 2 +- .../data/backends/gae/model/GaeStory.kt | 2 +- .../data/backends/gae/model/GaeStoryNode.kt | 2 +- .../backends/gae/model/GaeStorySummary.kt | 2 +- .../backends/gae/model/GaeSubtitledHtml.kt | 2 +- .../data/backends/gae/model/GaeSubtopic.kt | 2 +- .../gae/model/GaeSubtopicPageContents.kt | 2 +- .../backends/gae/model/GaeSubtopicSummary.kt | 2 +- .../data/backends/gae/model/GaeTopic.kt | 2 +- .../backends/gae/model/GaeTopicSummary.kt | 2 +- .../data/backends/gae/model/GaeVoiceover.kt | 2 +- .../gae/model/GaeWrittenTranslation.kt | 2 +- .../gae/model/GaeWrittenTranslations.kt | 2 +- .../data/persistence/PersistentCacheStore.kt | 14 +- .../oppia/android/data/backends/ApiUtils.kt | 2 +- .../data/backends/api/MockClassroomService.kt | 12 +- .../backends/api/MockConceptCardService.kt | 12 +- .../backends/api/MockExplorationService.kt | 12 +- .../backends/api/MockQuestionPlayerService.kt | 12 +- .../data/backends/api/MockStoryService.kt | 12 +- .../data/backends/api/MockSubtopicService.kt | 12 +- .../data/backends/api/MockTopicService.kt | 12 +- .../data/backends/test/MockClassroomTest.kt | 10 +- .../data/backends/test/MockConceptCardTest.kt | 10 +- .../data/backends/test/MockExplorationTest.kt | 10 +- .../backends/test/MockQuestionPlayerTest.kt | 10 +- .../data/backends/test/MockStoryTest.kt | 10 +- .../data/backends/test/MockSubtopicTest.kt | 10 +- .../data/backends/test/MockTopicTest.kt | 10 +- .../backends/test/NetworkInterceptorTest.kt | 10 +- .../persistence/PersistentCacheStoreTest.kt | 16 +- domain/BUILD.bazel | 132 +-- domain/domain_test.bzl | 39 +- domain/src/main/AndroidManifest.xml | 2 +- .../domain/audio/AudioPlayerController.kt | 16 +- .../audio/CellularAudioDialogController.kt | 12 +- .../AnswerClassificationController.kt | 12 +- .../classify/GenericInteractionClassifier.kt | 2 +- .../domain/classify/InteractionClassifier.kt | 2 +- .../domain/classify/InteractionsModule.kt | 22 +- .../android/domain/classify/RuleClassifier.kt | 4 +- .../classify/rules/GenericRuleClassifier.kt | 6 +- ...nteractionObjectTypeExtractorRepository.kt | 6 +- .../classify/rules/RuleClassifierProvider.kt | 4 +- .../domain/classify/rules/RuleQualifiers.kt | 2 +- .../continueinteraction/ContinueModule.kt | 6 +- ...asElementXAtPositionYClassifierProvider.kt | 12 +- ...lementXBeforeElementYClassifierProvider.kt | 12 +- ...nputIsEqualToOrderingClassifierProvider.kt | 14 +- ...emAtIncorrectPositionClassifierProvider.kt | 14 +- .../DragDropSortInputModule.kt | 6 +- ...enominatorEqualToRuleClassifierProvider.kt | 12 +- ...artExactlyEqualToRuleClassifierProvider.kt | 12 +- ...ntegerPartEqualToRuleClassifierProvider.kt | 12 +- ...sNoFractionalPartRuleClassifierProvider.kt | 12 +- ...sNumeratorEqualToRuleClassifierProvider.kt | 12 +- ...AndInSimplestFormRuleClassifierProvider.kt | 18 +- ...putIsEquivalentToRuleClassifierProvider.kt | 16 +- ...tIsExactlyEqualToRuleClassifierProvider.kt | 12 +- ...nputIsGreaterThanRuleClassifierProvider.kt | 14 +- ...onInputIsLessThanRuleClassifierProvider.kt | 14 +- .../fractioninput/FractionInputModule.kt | 6 +- ...ckInputIsInRegionRuleClassifierProvider.kt | 12 +- .../imageClickInput/ImageClickInputModule.kt | 6 +- ...tainsAtLeastOneOfRuleClassifierProvider.kt | 12 +- ...ntainAtLeastOneOfRuleClassifierProvider.kt | 12 +- ...ectionInputEqualsRuleClassifierProvider.kt | 12 +- ...tIsProperSubsetOfRuleClassifierProvider.kt | 12 +- .../ItemSelectionInputModule.kt | 6 +- ...ChoiceInputEqualsRuleClassifierProvider.kt | 10 +- .../MultipleChoiceInputModule.kt | 6 +- ...ithUnitsIsEqualToRuleClassifierProvider.kt | 16 +- ...itsIsEquivalentToRuleClassifierProvider.kt | 16 +- .../NumberWithUnitsRuleModule.kt | 6 +- ...umericInputEqualsRuleClassifierProvider.kt | 12 +- ...aterThanOrEqualToRuleClassifierProvider.kt | 10 +- ...nputIsGreaterThanRuleClassifierProvider.kt | 10 +- ...nclusivelyBetweenRuleClassifierProvider.kt | 10 +- ...LessThanOrEqualToRuleClassifierProvider.kt | 10 +- ...icInputIsLessThanRuleClassifierProvider.kt | 10 +- ...IsWithinToleranceRuleClassifierProvider.kt | 10 +- .../numericinput/NumericInputRuleModule.kt | 6 +- .../RatioInputEqualsRuleClassifierProvider.kt | 12 +- ...sNumberOfTermsEqualToClassifierProvider.kt | 12 +- ...InputIsEquivalentRuleClassifierProvider.kt | 14 +- .../rules/ratioinput/RatioInputModule.kt | 6 +- ...seSensitiveEqualsRuleClassifierProvider.kt | 12 +- ...TextInputContainsRuleClassifierProvider.kt | 12 +- .../TextInputEqualsRuleClassifierProvider.kt | 12 +- ...tInputFuzzyEqualsRuleClassifierProvider.kt | 12 +- .../rules/textinput/TextInputRuleModule.kt | 6 +- ...xtInputStartsWithRuleClassifierProvider.kt | 12 +- .../exploration/ExplorationDataController.kt | 12 +- .../domain/exploration/ExplorationProgress.kt | 10 +- .../ExplorationProgressController.kt | 28 +- .../exploration/ExplorationRetriever.kt | 10 +- .../onboarding/AppStartupStateController.kt | 16 +- .../onboarding/ExpirationMetaDataRetriever.kt | 2 +- .../ExpirationMetaDataRetrieverImpl.kt | 2 +- .../ExpirationMetaDataRetrieverModule.kt | 2 +- .../ExpirationMetaDataRetrieverTestModule.kt | 4 +- .../FakeExpirationMetaDataRetriever.kt | 4 +- .../oppialogger/ApplicationStartupListener.kt | 2 +- .../domain/oppialogger/LogStorageModule.kt | 2 +- .../android/domain/oppialogger/OppiaLogger.kt | 8 +- .../analytics/AnalyticsController.kt | 28 +- .../exceptions/ExceptionsController.kt | 22 +- .../UncaughtExceptionLoggerModule.kt | 4 +- .../UncaughtExceptionLoggerStartupListener.kt | 8 +- .../profile/ProfileManagementController.kt | 34 +- .../question/QuestionAssessmentProgress.kt | 10 +- .../QuestionAssessmentProgressController.kt | 34 +- .../question/QuestionConstantsProvider.kt | 2 +- .../domain/question/QuestionRetriever.kt | 8 +- .../QuestionTrainingConstantsProvider.kt | 2 +- .../question/QuestionTrainingController.kt | 16 +- .../oppia/android/domain/state/StateDeck.kt | 22 +- .../oppia/android/domain/state/StateGraph.kt | 12 +- .../oppia/android/domain/state/StateList.kt | 14 +- .../domain/topic/ConceptCardRetriever.kt | 16 +- .../topic/PrimeTopicAssetsController.kt | 4 +- .../topic/PrimeTopicAssetsControllerImpl.kt | 68 +- .../topic/PrimeTopicAssetsControllerModule.kt | 4 +- .../domain/topic/RevisionCardRetriever.kt | 8 +- .../domain/topic/StoryProgressController.kt | 24 +- .../domain/topic/StoryProgressTestHelper.kt | 4 +- .../android/domain/topic/TopicController.kt | 50 +- .../domain/topic/TopicListController.kt | 32 +- .../android/domain/util/FloatExtensions.kt | 2 +- .../android/domain/util/FractionExtensions.kt | 4 +- .../util/InteractionObjectExtensions.kt | 44 +- .../android/domain/util/JsonAssetRetriever.kt | 4 +- .../android/domain/util/RatioExtensions.kt | 4 +- .../android/domain/util/StateRetriever.kt | 56 +- .../android/domain/util/StringExtensions.kt | 2 +- domain/src/test/AndroidManifest.xml | 2 +- .../domain/audio/AudioPlayerControllerTest.kt | 28 +- .../CellularAudioDialogControllerTest.kt | 20 +- .../AnswerClassificationControllerTest.kt | 42 +- ...icInputEqualsRuleClassifierProviderTest.kt | 8 +- ...ThanOrEqualToRuleClassifierProviderTest.kt | 6 +- ...IsGreaterThanRuleClassifierProviderTest.kt | 6 +- ...ThanOrEqualToRuleClassifierProviderTest.kt | 6 +- ...putIsLessThanRuleClassifierProviderTest.kt | 6 +- ...tXAtPositionYRuleClassifierProviderTest.kt | 10 +- ...eforeElementYRuleClassifierProviderTest.kt | 10 +- ...IsEqualToOrderingClassifierProviderTest.kt | 10 +- ...IncorrectPositionClassifierProviderTest.kt | 10 +- ...putIsInRegionRuleClassifierProviderTest.kt | 10 +- ...ceInputEqualsRuleClassifierProviderTest.kt | 4 +- ...ioInputEqualsRuleClassifierProviderTest.kt | 8 +- ...berOfTermsEqualToClassifierProviderTest.kt | 8 +- ...tIsEquivalentRuleClassifierProviderTest.kt | 8 +- ...InputContainsRuleClassifierProviderTest.kt | 4 +- ...xtInputEqualsRuleClassifierProviderTest.kt | 4 +- .../ExplorationDataControllerTest.kt | 66 +- .../ExplorationProgressControllerTest.kt | 70 +- .../AppStartupStateControllerTest.kt | 32 +- .../domain/oppialogger/OppiaLoggerTest.kt | 30 +- .../analytics/AnalyticsControllerTest.kt | 48 +- .../exceptions/ExceptionsControllerTest.kt | 30 +- ...aughtExceptionLoggerStartupListenerTest.kt | 28 +- .../ProfileManagementControllerTest.kt | 40 +- ...uestionAssessmentProgressControllerTest.kt | 68 +- .../QuestionTrainingControllerTest.kt | 58 +- .../topic/StoryProgressControllerTest.kt | 26 +- .../topic/StoryProgressTestHelperTest.kt | 42 +- .../domain/topic/TopicControllerTest.kt | 44 +- .../domain/topic/TopicListControllerTest.kt | 36 +- .../util/InteractionObjectExtensionsTest.kt | 24 +- .../domain/util/RatioExtensionsTest.kt | 4 +- .../android/domain/util/StateRetrieverTest.kt | 28 +- .../domain/util/StringExtensionsTest.kt | 2 +- model/src/main/proto/example.proto | 2 +- model/src/main/proto/exploration.proto | 22 +- model/src/main/proto/interaction_object.proto | 2 +- model/src/main/proto/onboarding.proto | 2 +- model/src/main/proto/oppia_logger.proto | 2 +- model/src/main/proto/profile.proto | 2 +- model/src/main/proto/question.proto | 2 +- model/src/main/proto/subtitled_html.proto | 2 +- model/src/main/proto/subtitled_unicode.proto | 2 +- model/src/main/proto/thumbnail.proto | 2 +- model/src/main/proto/topic.proto | 2 +- model/src/main/proto/translation.proto | 4 +- model/src/main/proto/voiceover.proto | 4 +- oppia_android_test.bzl | 81 +- testing/BUILD.bazel | 64 +- testing/src/main/AndroidManifest.xml | 2 +- .../testing/CoroutineExecutorService.kt | 2 +- .../oppia/android/testing/FakeEventLogger.kt | 6 +- .../android/testing/FakeExceptionLogger.kt | 4 +- .../oppia/android/testing/FakeSystemClock.kt | 2 +- .../oppia/android/testing/IsOnRobolectric.kt | 2 +- .../android/testing/OppiaTestAnnotations.kt | 6 +- .../oppia/android/testing/OppiaTestRule.kt | 2 +- .../oppia/android/testing/OppiaTestRunner.kt | 2 +- .../testing/TestAccessibilityModule.kt | 6 +- .../testing/TestCoroutineDispatcher.kt | 2 +- .../TestCoroutineDispatcherEspressoImpl.kt | 2 +- .../TestCoroutineDispatcherRobolectricImpl.kt | 2 +- .../testing/TestCoroutineDispatchers.kt | 2 +- .../TestCoroutineDispatchersEspressoImpl.kt | 4 +- ...TestCoroutineDispatchersRobolectricImpl.kt | 2 +- .../android/testing/TestDispatcherModule.kt | 6 +- .../oppia/android/testing/TestDispatchers.kt | 2 +- .../android/testing/TestLogReportingModule.kt | 6 +- .../testing/profile/ProfileTestHelper.kt | 10 +- testing/src/test/AndroidManifest.xml | 2 +- .../testing/CoroutineExecutorServiceTest.kt | 6 +- .../android/testing/FakeEventLoggerTest.kt | 8 +- .../testing/FakeExceptionLoggerTest.kt | 4 +- .../testing/profile/ProfileTestHelperTest.kt | 24 +- testing/testing_test.bzl | 35 +- utility/BUILD.bazel | 47 +- utility/src/main/AndroidManifest.xml | 2 +- .../util/accessibility/AccessibilityModule.kt | 2 +- .../AndroidAccessibilityManager.kt | 2 +- .../CustomAccessibilityManager.kt | 2 +- .../accessibility/FakeAccessibilityManager.kt | 2 +- .../android/util/caching/AssetRepository.kt | 4 +- .../util/caching/CacheAssetsLocally.kt | 2 +- .../android/util/caching/CachingModule.kt | 2 +- .../android/util/caching/TopicListToCache.kt | 2 +- .../util/caching/testing/CachingTestModule.kt | 6 +- .../util/data/AsyncDataSubscriptionManager.kt | 12 +- .../oppia/android/util/data/AsyncResult.kt | 2 +- .../oppia/android/util/data/DataProvider.kt | 2 +- .../oppia/android/util/data/DataProviders.kt | 6 +- .../util/data/InMemoryBlockingCache.kt | 4 +- .../android/util/datetime/DateTimeUtil.kt | 6 +- .../android/util/extensions/LiveDataExt.kt | 2 +- .../util/gcsresource/GcsResouceAnnotations.kt | 2 +- .../util/gcsresource/GcsResourceModule.kt | 2 +- .../android/util/logging/ConsoleLogger.kt | 4 +- .../util/logging/EventBundleCreator.kt | 18 +- .../oppia/android/util/logging/EventLogger.kt | 4 +- .../android/util/logging/ExceptionLogger.kt | 2 +- .../oppia/android/util/logging/LogLevel.kt | 2 +- .../android/util/logging/LoggerModule.kt | 2 +- .../util/logging/LoggingAnnotations.kt | 2 +- .../logging/firebase/FirebaseEventLogger.kt | 8 +- .../firebase/FirebaseExceptionLogger.kt | 4 +- .../logging/firebase/LogReportingModule.kt | 8 +- .../util/networking/NetworkConnectionUtil.kt | 2 +- .../android/util/parser/BulletTagHandler.kt | 2 +- .../android/util/parser/CustomBulletSpan.kt | 4 +- .../util/parser/CustomHtmlContentHandler.kt | 2 +- .../parser/ExplorationHtmlParserEntityType.kt | 2 +- .../android/util/parser/GlideImageLoader.kt | 6 +- .../util/parser/GlideImageLoaderModule.kt | 2 +- .../oppia/android/util/parser/HtmlParser.kt | 2 +- .../util/parser/HtmlParserEntityTypeModule.kt | 2 +- .../android/util/parser/ImageAssetFetcher.kt | 2 +- .../oppia/android/util/parser/ImageLoader.kt | 2 +- .../util/parser/ImageParsingAnnotations.kt | 2 +- .../android/util/parser/ImageParsingModule.kt | 2 +- .../oppia/android/util/parser/ImageTargets.kt | 2 +- .../util/parser/RepositoryGlideModule.kt | 4 +- .../util/parser/RepositoryModelLoader.kt | 2 +- .../oppia/android/util/parser/SvgDecoder.kt | 2 +- .../util/parser/SvgDrawableTranscoder.kt | 2 +- .../android/util/parser/UrlImageParser.kt | 4 +- .../util/profile/DirectoryManagementUtil.kt | 2 +- .../android/util/statusbar/StatusBarColor.kt | 2 +- .../oppia/android/util/system/OppiaClock.kt | 2 +- .../util/system/OppiaDateTimeFormatter.kt | 2 +- .../util/threading/BackgroundDispatcher.kt | 2 +- .../util/threading/BlockingDispatcher.kt | 2 +- .../util/threading/ConcurrentCollections.kt | 2 +- .../util/threading/DispatcherModule.kt | 2 +- utility/src/test/AndroidManifest.xml | 2 +- .../android/util/data/AsyncResultTest.kt | 12 +- .../android/util/data/DataProvidersTest.kt | 12 +- .../util/data/InMemoryBlockingCacheTest.kt | 8 +- .../android/util/datetime/DateTimeUtilTest.kt | 14 +- .../util/logging/EventBundleCreatorTest.kt | 4 +- .../networking/NetworkConnectionUtilTest.kt | 12 +- .../parser/CustomHtmlContentHandlerTest.kt | 2 +- .../profile/DirectoryManagementUtilTest.kt | 14 +- .../util/system/OppiaDateTimeFormatterTest.kt | 2 +- utility/utility_test.bzl | 35 +- 1191 files changed, 6118 insertions(+), 6038 deletions(-) rename app/src/main/java/org/oppia/{ => android}/app/testing/StoryFragmentTestActivity.kt (90%) rename app/src/main/java/org/oppia/{ => android}/app/testing/StoryFragmentTestActivityPresenter.kt (88%) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 389b5ba7931..31b7f2d41e1 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -124,7 +124,7 @@ jobs: - name: Robolectric tests - FAQ, Help, Mydownloads, Parser, ProfileProgress, RecyclerView, State, Story, Utility tests # We require 'sudo' to avoid an error of the existing android sdk. See https://github.com/actions/starter-workflows/issues/58 run: | - sudo ./gradlew :app:testDebugUnitTest --tests org.oppia.app.faq* --tests org.oppia.app.help* --tests org.oppia.app.mydownloads* --tests org.oppia.app.parser* --tests org.oppia.app.player.state* --tests org.oppia.app.profileprogress* --tests org.oppia.app.recyclerview* --tests org.oppia.app.splash* --tests org.oppia.app.story* --tests org.oppia.app.utility* --tests org.oppia.app.topic.questionplayer* + sudo ./gradlew :app:testDebugUnitTest --tests org.oppia.android.app.faq* --tests org.oppia.android.app.help* --tests org.oppia.android.app.mydownloads* --tests org.oppia.android.app.parser* --tests org.oppia.android.app.player.state* --tests org.oppia.android.app.profileprogress* --tests org.oppia.android.app.recyclerview* --tests org.oppia.android.app.splash* --tests org.oppia.android.app.story* --tests org.oppia.android.app.utility* --tests org.oppia.android.app.topic.questionplayer* - name: Upload App Test Reports uses: actions/upload-artifact@v2 if: ${{ always() }} # IMPORTANT: Upload reports regardless of status diff --git a/BUILD.bazel b/BUILD.bazel index 4081b442bfc..101cabbd052 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -2,17 +2,17 @@ # TODO(#1640): Move binary manifest to top-level package post-Gradle. android_binary( name = "oppia", - custom_package = "org.oppia.app", + custom_package = "org.oppia.android", enable_data_binding = True, manifest = "//app:src/main/AndroidManifest.xml", manifest_values = { - "applicationId": "org.oppia.app", + "applicationId": "org.oppia.android", "versionCode": "4", "versionName": "0.4-alpha-94fc517da5", "minSdkVersion": "19", "targetSdkVersion": "29", }, - multidex = "legacy", + multidex = "native", # TODO(#1875): Re-enable legacy for optimized release builds. deps = [ "//app", ], diff --git a/WORKSPACE b/WORKSPACE index 06037a9572a..f678ef38afd 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -1,6 +1,6 @@ -''' +""" This file lists and imports all external dependencies needed to build Oppia Android. -''' +""" load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") load("@bazel_tools//tools/build_defs/repo:jvm.bzl", "jvm_maven_import_external") @@ -16,60 +16,72 @@ android_sdk_repository( # Add support for JVM rules: https://github.com/bazelbuild/rules_jvm_external RULES_JVM_EXTERNAL_TAG = "2.9" + RULES_JVM_EXTERNAL_SHA = "e5b97a31a3e8feed91636f42e19b11c49487b85e5de2f387c999ea14d77c7f45" + http_archive( name = "rules_jvm_external", - strip_prefix = "rules_jvm_external-%s" % RULES_JVM_EXTERNAL_TAG, sha256 = RULES_JVM_EXTERNAL_SHA, + strip_prefix = "rules_jvm_external-%s" % RULES_JVM_EXTERNAL_TAG, url = "https://github.com/bazelbuild/rules_jvm_external/archive/%s.zip" % RULES_JVM_EXTERNAL_TAG, ) # Add support for Kotlin: https://github.com/bazelbuild/rules_kotlin. RULES_KOTLIN_VERSION = "legacy-1.4.0-rcx-oppia-exclusive-rc01" + RULES_KOTLIN_SHA = "600f3d916eda5531dd70614ec96dc92b4ac24da0e1d815eb94559976e9bea8aa" + http_archive( - name = "io_bazel_rules_kotlin", - urls = ["https://github.com/oppia/rules_kotlin/archive/%s.zip" % RULES_KOTLIN_VERSION], - type = "zip", - strip_prefix = "rules_kotlin-%s" % RULES_KOTLIN_VERSION, - sha256 = RULES_KOTLIN_SHA, + name = "io_bazel_rules_kotlin", + sha256 = RULES_KOTLIN_SHA, + strip_prefix = "rules_kotlin-%s" % RULES_KOTLIN_VERSION, + type = "zip", + urls = ["https://github.com/oppia/rules_kotlin/archive/%s.zip" % RULES_KOTLIN_VERSION], ) # TODO(#1535): Remove once rules_kotlin is released because these lines become unnecessary load("@io_bazel_rules_kotlin//kotlin:dependencies.bzl", "kt_download_local_dev_dependencies") + kt_download_local_dev_dependencies() load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kotlin_repositories", "kt_register_toolchains") + kotlin_repositories() + kt_register_toolchains() -''' +""" The proto_compiler and proto_java_toolchain bindings load the protos rules needed for the model module while helping us avoid the unnecessary compilation of protoc. Referecences: - https://github.com/google/startup-os/blob/5f30a62/WORKSPACE#L179-L187 - https://github.com/bazelbuild/bazel/issues/7095 -''' +""" + bind( name = "proto_compiler", - actual = "//tools:protoc" + actual = "//tools:protoc", ) bind( name = "proto_java_toolchain", - actual = "//tools:java_toolchain" + actual = "//tools:java_toolchain", ) load("@rules_java//java:repositories.bzl", "rules_java_dependencies", "rules_java_toolchains") + rules_java_dependencies() + rules_java_toolchains() # Add support for Dagger DAGGER_TAG = "2.28.1" + DAGGER_SHA = "9e69ab2f9a47e0f74e71fe49098bea908c528aa02fa0c5995334447b310d0cdd" + http_archive( name = "dagger", - strip_prefix = "dagger-dagger-%s" % DAGGER_TAG, sha256 = DAGGER_SHA, + strip_prefix = "dagger-dagger-%s" % DAGGER_TAG, urls = ["https://github.com/google/dagger/archive/dagger-%s.zip" % DAGGER_TAG], ) @@ -78,10 +90,12 @@ load("@dagger//:workspace_defs.bzl", "DAGGER_ARTIFACTS", "DAGGER_REPOSITORIES") # Add support for Robolectric: https://github.com/robolectric/robolectric-bazel http_archive( name = "robolectric", - urls = ["https://github.com/oppia/robolectric-bazel/archive/4.x-oppia-exclusive-rc02.tar.gz"], strip_prefix = "robolectric-bazel-4.x-oppia-exclusive-rc02", + urls = ["https://github.com/oppia/robolectric-bazel/archive/4.x-oppia-exclusive-rc02.tar.gz"], ) + load("@robolectric//bazel:robolectric.bzl", "robolectric_repositories") + robolectric_repositories() # Add support for Firebase Crashlytics @@ -92,6 +106,7 @@ git_repository( ) load("@tools_android//tools/googleservices:defs.bzl", "google_services_workspace_dependencies") + google_services_workspace_dependencies() git_repository( @@ -101,8 +116,8 @@ git_repository( ) bind( - name = "databinding_annotation_processor", - actual = "//tools/android:compiler_annotation_processor", + name = "databinding_annotation_processor", + actual = "//tools/android:compiler_annotation_processor", ) load("@rules_jvm_external//:defs.bzl", "maven_install") @@ -131,6 +146,7 @@ maven_install( "androidx.navigation:navigation-ui:2.0.0", "androidx.navigation:navigation-ui-ktx:2.0.0", "androidx.recyclerview:recyclerview:1.0.0", + "androidx.room:room-runtime:2.2.5", "androidx.test.espresso:espresso-contrib:3.1.0", "androidx.test.espresso:espresso-core:3.2.0", "androidx.test.espresso:espresso-intents:3.1.0", @@ -147,6 +163,7 @@ maven_install( "com.google.firebase:firebase-analytics:17.5.0", "com.google.firebase:firebase-crashlytics:17.1.1", "com.google.gms:google-services:4.3.3", + "com.google.guava:guava:28.1-android", "com.google.truth:truth:0.43", "com.squareup.retrofit2:converter-gson:2.5.0", "com.squareup.retrofit2:retrofit:2.9.0", diff --git a/app/BUILD.bazel b/app/BUILD.bazel index 567bdf9f3ab..b6435f7abe8 100644 --- a/app/BUILD.bazel +++ b/app/BUILD.bazel @@ -1,5 +1,5 @@ # TODO(#1532): Rename file to 'BUILD' post-Gradle. -''' +""" This library contains the app's core source files and functionality. Note that: - Most files should be built inside of app library. However, listener files, annotation @@ -8,7 +8,8 @@ documentation below specifies where these files should be added. - If your file uses Data-binding views or Kotlin synthetic imports these must be removed in order to build with Bazel. - All binding adapters must be written in Java. -''' +""" + load("@rules_jvm_external//:defs.bzl", "artifact") load("@dagger//:workspace_defs.bzl", "dagger_rules") load("@tools_android//tools/crashlytics:defs.bzl", "crashlytics_android_library") @@ -17,7 +18,7 @@ load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") load("//app:app_test.bzl", "app_test") load("//app:test_with_resources.bzl", "test_with_resources") -''' +""" Source files for the annotations library. The files inside the annotations library are dependencies for all other libraries in app module, except the listeners library. Place your file here if: @@ -25,358 +26,382 @@ Place your file here if: - It is an annotation or helper file of some kind - It is not considered a listener - It does not depend on any other file not included in this list -''' +""" + +# keep sorted ANNOTATIONS = [ - "src/main/java/org/oppia/app/activity/ActivityScope.kt", - "src/main/java/org/oppia/app/fragment/FragmentScope.kt", - "src/main/java/org/oppia/app/utility/ContextExtensions.kt", - "src/main/java/org/oppia/app/utility/KeyboardHelper.kt", + "src/main/java/org/oppia/android/app/activity/ActivityScope.kt", + "src/main/java/org/oppia/android/app/fragment/FragmentScope.kt", + "src/main/java/org/oppia/android/app/utility/ContextExtensions.kt", + "src/main/java/org/oppia/android/app/utility/KeyboardHelper.kt", ] -''' +""" Source files for the listeners library. The files inside the listeners library are dependencies for all other libraries in app module, except the annotations library. Place your file here if: - A view, view model, or layout file depends on it - It is either a listener, an interface, or a direct dependency of one in this list -''' +""" + +# keep sorted LISTENERS = [ - "src/main/java/org/oppia/app/administratorcontrols/LoadAppVersionListener.kt", - "src/main/java/org/oppia/app/administratorcontrols/LoadProfileListListener.kt", - "src/main/java/org/oppia/app/administratorcontrols/RouteToAppVersionListener.kt", - "src/main/java/org/oppia/app/administratorcontrols/RouteToProfileListListener.kt", - "src/main/java/org/oppia/app/drawer/RouteToProfileProgressListener.kt", - "src/main/java/org/oppia/app/help/faq/RouteToFAQSingleListener.kt", - "src/main/java/org/oppia/app/help/RouteToFAQListListener.kt", - "src/main/java/org/oppia/app/home/recentlyplayed/OngoingStoryClickListener.kt", - "src/main/java/org/oppia/app/home/RouteToRecentlyPlayedListener.kt", - "src/main/java/org/oppia/app/home/RouteToTopicListener.kt", - "src/main/java/org/oppia/app/home/RouteToTopicPlayStoryListener.kt", - "src/main/java/org/oppia/app/home/topiclist/TopicSummaryClickListener.kt", - "src/main/java/org/oppia/app/onboarding/OnboardingNavigationListener.kt", - "src/main/java/org/oppia/app/onboarding/RouteToProfileListListener.kt", - "src/main/java/org/oppia/app/options/LoadAppLanguageListListener.kt", - "src/main/java/org/oppia/app/options/LoadAudioLanguageListListener.kt", - "src/main/java/org/oppia/app/options/LoadReadingTextSizeListener.kt", - "src/main/java/org/oppia/app/options/RouteToAppLanguageListListener.kt", - "src/main/java/org/oppia/app/options/RouteToAudioLanguageListListener.kt", - "src/main/java/org/oppia/app/options/RouteToReadingTextSizeListener.kt", - "src/main/java/org/oppia/app/player/audio/LanguageInterface.kt", - "src/main/java/org/oppia/app/player/state/answerhandling/InteractionAnswerErrorOrAvailabilityCheckReceiver.kt", - "src/main/java/org/oppia/app/player/state/answerhandling/InteractionAnswerHandler.kt", - "src/main/java/org/oppia/app/player/state/listener/ContinueNavigationButtonListener.kt", - "src/main/java/org/oppia/app/player/state/listener/NextNavigationButtonListener.kt", - "src/main/java/org/oppia/app/player/state/listener/PreviousNavigationButtonListener.kt", - "src/main/java/org/oppia/app/player/state/listener/PreviousResponsesHeaderClickListener.kt", - "src/main/java/org/oppia/app/player/state/listener/ReplayButtonListener.kt", - "src/main/java/org/oppia/app/player/state/listener/ReturnToTopicNavigationButtonListener.kt", - "src/main/java/org/oppia/app/player/state/listener/RouteToHintsAndSolutionListener.kt", - "src/main/java/org/oppia/app/player/state/listener/StateKeyboardButtonListener.kt", - "src/main/java/org/oppia/app/player/state/listener/SubmitNavigationButtonListener.kt", - "src/main/java/org/oppia/app/profile/RouteToAdminPinListener.kt", - "src/main/java/org/oppia/app/profileprogress/ProfilePictureClickListener.kt", - "src/main/java/org/oppia/app/profileprogress/RouteToCompletedStoryListListener.kt", - "src/main/java/org/oppia/app/profileprogress/RouteToOngoingTopicListListener.kt", - "src/main/java/org/oppia/app/recyclerview/OnDragEndedListener.kt", - "src/main/java/org/oppia/app/recyclerview/OnItemDragListener.kt", - "src/main/java/org/oppia/app/story/ExplorationSelectionListener.kt", - "src/main/java/org/oppia/app/topic/lessons/StorySummarySelector.kt", - "src/main/java/org/oppia/app/topic/revision/RevisionSubtopicSelector.kt", - "src/main/java/org/oppia/app/topic/revisioncard/ReturnToTopicClickListener.kt", - "src/main/java/org/oppia/app/topic/RouteToRevisionCardListener.kt", - "src/main/java/org/oppia/app/utility/OnClickableAreaClickedListener.kt", - "src/main/java/org/oppia/app/utility/RegionClickEvent.kt", - "src/main/java/org/oppia/app/walkthrough/end/WalkthroughEndPageChanger.kt", - "src/main/java/org/oppia/app/walkthrough/WalkthroughActivityListener.kt", - "src/main/java/org/oppia/app/walkthrough/WalkthroughFragmentChangeListener.kt", - "src/main/java/org/oppia/app/walkthrough/WalkthroughPageChanger.kt", + "src/main/java/org/oppia/android/app/administratorcontrols/LoadAppVersionListener.kt", + "src/main/java/org/oppia/android/app/administratorcontrols/LoadProfileListListener.kt", + "src/main/java/org/oppia/android/app/administratorcontrols/RouteToAppVersionListener.kt", + "src/main/java/org/oppia/android/app/administratorcontrols/RouteToProfileListListener.kt", + "src/main/java/org/oppia/android/app/drawer/RouteToProfileProgressListener.kt", + "src/main/java/org/oppia/android/app/help/RouteToFAQListListener.kt", + "src/main/java/org/oppia/android/app/help/faq/RouteToFAQSingleListener.kt", + "src/main/java/org/oppia/android/app/home/RouteToRecentlyPlayedListener.kt", + "src/main/java/org/oppia/android/app/home/RouteToTopicListener.kt", + "src/main/java/org/oppia/android/app/home/RouteToTopicPlayStoryListener.kt", + "src/main/java/org/oppia/android/app/home/recentlyplayed/OngoingStoryClickListener.kt", + "src/main/java/org/oppia/android/app/home/topiclist/TopicSummaryClickListener.kt", + "src/main/java/org/oppia/android/app/onboarding/OnboardingNavigationListener.kt", + "src/main/java/org/oppia/android/app/onboarding/RouteToProfileListListener.kt", + "src/main/java/org/oppia/android/app/options/LoadAppLanguageListListener.kt", + "src/main/java/org/oppia/android/app/options/LoadAudioLanguageListListener.kt", + "src/main/java/org/oppia/android/app/options/LoadReadingTextSizeListener.kt", + "src/main/java/org/oppia/android/app/options/RouteToAppLanguageListListener.kt", + "src/main/java/org/oppia/android/app/options/RouteToAudioLanguageListListener.kt", + "src/main/java/org/oppia/android/app/options/RouteToReadingTextSizeListener.kt", + "src/main/java/org/oppia/android/app/player/audio/LanguageInterface.kt", + "src/main/java/org/oppia/android/app/player/state/answerhandling/InteractionAnswerErrorOrAvailabilityCheckReceiver.kt", + "src/main/java/org/oppia/android/app/player/state/answerhandling/InteractionAnswerHandler.kt", + "src/main/java/org/oppia/android/app/player/state/listener/ContinueNavigationButtonListener.kt", + "src/main/java/org/oppia/android/app/player/state/listener/NextNavigationButtonListener.kt", + "src/main/java/org/oppia/android/app/player/state/listener/PreviousNavigationButtonListener.kt", + "src/main/java/org/oppia/android/app/player/state/listener/PreviousResponsesHeaderClickListener.kt", + "src/main/java/org/oppia/android/app/player/state/listener/ReplayButtonListener.kt", + "src/main/java/org/oppia/android/app/player/state/listener/ReturnToTopicNavigationButtonListener.kt", + "src/main/java/org/oppia/android/app/player/state/listener/RouteToHintsAndSolutionListener.kt", + "src/main/java/org/oppia/android/app/player/state/listener/StateKeyboardButtonListener.kt", + "src/main/java/org/oppia/android/app/player/state/listener/SubmitNavigationButtonListener.kt", + "src/main/java/org/oppia/android/app/profile/RouteToAdminPinListener.kt", + "src/main/java/org/oppia/android/app/profileprogress/ProfilePictureClickListener.kt", + "src/main/java/org/oppia/android/app/profileprogress/RouteToCompletedStoryListListener.kt", + "src/main/java/org/oppia/android/app/profileprogress/RouteToOngoingTopicListListener.kt", + "src/main/java/org/oppia/android/app/recyclerview/OnDragEndedListener.kt", + "src/main/java/org/oppia/android/app/recyclerview/OnItemDragListener.kt", + "src/main/java/org/oppia/android/app/story/ExplorationSelectionListener.kt", + "src/main/java/org/oppia/android/app/topic/RouteToRevisionCardListener.kt", + "src/main/java/org/oppia/android/app/topic/lessons/StorySummarySelector.kt", + "src/main/java/org/oppia/android/app/topic/revision/RevisionSubtopicSelector.kt", + "src/main/java/org/oppia/android/app/topic/revisioncard/ReturnToTopicClickListener.kt", + "src/main/java/org/oppia/android/app/utility/OnClickableAreaClickedListener.kt", + "src/main/java/org/oppia/android/app/utility/RegionClickEvent.kt", + "src/main/java/org/oppia/android/app/walkthrough/WalkthroughActivityListener.kt", + "src/main/java/org/oppia/android/app/walkthrough/WalkthroughFragmentChangeListener.kt", + "src/main/java/org/oppia/android/app/walkthrough/WalkthroughPageChanger.kt", + "src/main/java/org/oppia/android/app/walkthrough/end/WalkthroughEndPageChanger.kt", ] -''' +""" Source files for the databinding_resources library. The files inside this list include all layout files. Please note that layouts MUST NOT depend on presenters or fragments. Instead, they should depend on a listener or interface as an abstraction. -''' +""" + DATABINDING_LAYOUTS = ["src/main/res/layout*/**"] # View Models # TODO(#1617): Remove genrules post-gradle -''' +""" Source files for the view_models library that import resources. Place your file here if: - It is a view model - - It imports resources (ex: `import org.oppia.app.R`) -''' + - It imports resources (ex: `import org.oppia.android.R`) +""" + +# keep sorted VIEW_MODELS_WITH_RESOURCE_IMPORTS = [ - "src/main/java/org/oppia/app/administratorcontrols/administratorcontrolsitemviewmodel/AdministratorControlsAccountActionsViewModel.kt", - "src/main/java/org/oppia/app/help/faq/FAQListViewModel.kt", - "src/main/java/org/oppia/app/help/HelpItemViewModel.kt", - "src/main/java/org/oppia/app/help/HelpListViewModel.kt", - "src/main/java/org/oppia/app/onboarding/OnboadingSlideViewModel.kt", - "src/main/java/org/oppia/app/onboarding/OnboardingViewModel.kt", - "src/main/java/org/oppia/app/parser/StringToFractionParser.kt", - "src/main/java/org/oppia/app/parser/StringToNumberParser.kt", - "src/main/java/org/oppia/app/parser/StringToRatioParser.kt", - "src/main/java/org/oppia/app/utility/RatioExtensions.kt", - "src/main/java/org/oppia/app/player/state/itemviewmodel/FractionInteractionViewModel.kt", - "src/main/java/org/oppia/app/player/state/itemviewmodel/ImageRegionSelectionInteractionViewModel.kt", - "src/main/java/org/oppia/app/topic/info/TopicInfoViewModel.kt", + "src/main/java/org/oppia/android/app/administratorcontrols/administratorcontrolsitemviewmodel/AdministratorControlsAccountActionsViewModel.kt", + "src/main/java/org/oppia/android/app/help/HelpItemViewModel.kt", + "src/main/java/org/oppia/android/app/help/HelpListViewModel.kt", + "src/main/java/org/oppia/android/app/help/faq/FAQListViewModel.kt", + "src/main/java/org/oppia/android/app/onboarding/OnboadingSlideViewModel.kt", + "src/main/java/org/oppia/android/app/onboarding/OnboardingViewModel.kt", + "src/main/java/org/oppia/android/app/parser/StringToFractionParser.kt", + "src/main/java/org/oppia/android/app/parser/StringToNumberParser.kt", + "src/main/java/org/oppia/android/app/parser/StringToRatioParser.kt", + "src/main/java/org/oppia/android/app/player/state/itemviewmodel/FractionInteractionViewModel.kt", + "src/main/java/org/oppia/android/app/player/state/itemviewmodel/ImageRegionSelectionInteractionViewModel.kt", + "src/main/java/org/oppia/android/app/player/state/itemviewmodel/RatioExpressionInputInteractionViewModel.kt", + "src/main/java/org/oppia/android/app/profileprogress/ProfileProgressViewModel.kt", + "src/main/java/org/oppia/android/app/topic/info/TopicInfoViewModel.kt", + "src/main/java/org/oppia/android/app/utility/RatioExtensions.kt", ] -''' +""" Source files for the view_models library that DO NOT import resources. Place your file here if: - It is a view model - It does not import resources -''' +""" + +# keep sorted VIEW_MODELS = [ - "src/main/java/org/oppia/app/administratorcontrols/administratorcontrolsitemviewmodel/AdministratorControlsAppInformationViewModel.kt", - "src/main/java/org/oppia/app/administratorcontrols/administratorcontrolsitemviewmodel/AdministratorControlsDownloadPermissionsViewModel.kt", - "src/main/java/org/oppia/app/administratorcontrols/administratorcontrolsitemviewmodel/AdministratorControlsGeneralViewModel.kt", - "src/main/java/org/oppia/app/administratorcontrols/administratorcontrolsitemviewmodel/AdministratorControlsItemViewModel.kt", - "src/main/java/org/oppia/app/administratorcontrols/administratorcontrolsitemviewmodel/AdministratorControlsProfileViewModel.kt", - "src/main/java/org/oppia/app/administratorcontrols/AdministratorControlsViewModel.kt", - "src/main/java/org/oppia/app/administratorcontrols/appversion/AppVersionViewModel.kt", - "src/main/java/org/oppia/app/completedstorylist/CompletedStoryItemViewModel.kt", - "src/main/java/org/oppia/app/completedstorylist/CompletedStoryListViewModel.kt", - "src/main/java/org/oppia/app/drawer/NavigationDrawerFooterViewModel.kt", - "src/main/java/org/oppia/app/drawer/NavigationDrawerHeaderViewModel.kt", - "src/main/java/org/oppia/app/help/faq/faqItemViewModel/FAQContentViewModel.kt", - "src/main/java/org/oppia/app/help/faq/faqItemViewModel/FAQHeaderViewModel.kt", - "src/main/java/org/oppia/app/help/faq/faqItemViewModel/FAQItemViewModel.kt", - "src/main/java/org/oppia/app/help/HelpItems.kt", - "src/main/java/org/oppia/app/hintsandsolution/HintsAndSolutionItemViewModel.kt", - "src/main/java/org/oppia/app/hintsandsolution/HintsDividerViewModel.kt", - "src/main/java/org/oppia/app/hintsandsolution/HintsViewModel.kt", - "src/main/java/org/oppia/app/hintsandsolution/SolutionViewModel.kt", - "src/main/java/org/oppia/app/home/HomeItemViewModel.kt", - "src/main/java/org/oppia/app/home/recentlyplayed/OngoingStoryViewModel.kt", - "src/main/java/org/oppia/app/home/recentlyplayed/RecentlyPlayedItemViewModel.kt", - "src/main/java/org/oppia/app/home/recentlyplayed/SectionTitleViewModel.kt", - "src/main/java/org/oppia/app/home/topiclist/AllTopicsViewModel.kt", - "src/main/java/org/oppia/app/home/topiclist/PromotedStoryListViewModel.kt", - "src/main/java/org/oppia/app/home/topiclist/PromotedStoryViewModel.kt", - "src/main/java/org/oppia/app/home/topiclist/TopicSummaryViewModel.kt", - "src/main/java/org/oppia/app/home/UserAppHistoryViewModel.kt", - "src/main/java/org/oppia/app/home/WelcomeViewModel.kt", - "src/main/java/org/oppia/app/onboarding/OnboardingSlideFinalViewModel.kt", - "src/main/java/org/oppia/app/onboarding/ViewPagerSlide.kt", - "src/main/java/org/oppia/app/ongoingtopiclist/OngoingTopicItemViewModel.kt", - "src/main/java/org/oppia/app/ongoingtopiclist/OngoingTopicListViewModel.kt", - "src/main/java/org/oppia/app/options/OptionControlsViewModel.kt", - "src/main/java/org/oppia/app/options/OptionsAppLanguageViewModel.kt", - "src/main/java/org/oppia/app/options/OptionsAudioLanguageViewModel.kt", - "src/main/java/org/oppia/app/options/OptionsItemViewModel.kt", - "src/main/java/org/oppia/app/options/OptionsReadingTextSizeViewModel.kt", - "src/main/java/org/oppia/app/player/audio/AudioViewModel.kt", - "src/main/java/org/oppia/app/player/exploration/ExplorationViewModel.kt", - "src/main/java/org/oppia/app/player/state/itemviewmodel/ContentViewModel.kt", - "src/main/java/org/oppia/app/player/state/itemviewmodel/ContinueInteractionViewModel.kt", - "src/main/java/org/oppia/app/player/state/itemviewmodel/ContinueNavigationButtonViewModel.kt", - "src/main/java/org/oppia/app/player/state/itemviewmodel/DragAndDropSortInteractionViewModel.kt", - "src/main/java/org/oppia/app/player/state/itemviewmodel/DragDropInteractionContentViewModel.kt", - "src/main/java/org/oppia/app/player/state/itemviewmodel/FeedbackViewModel.kt", - "src/main/java/org/oppia/app/player/state/itemviewmodel/NextButtonViewModel.kt", - "src/main/java/org/oppia/app/player/state/itemviewmodel/NumericInputViewModel.kt", - "src/main/java/org/oppia/app/player/state/itemviewmodel/PreviousButtonViewModel.kt", - "src/main/java/org/oppia/app/player/state/itemviewmodel/PreviousResponsesHeaderViewModel.kt", - "src/main/java/org/oppia/app/player/state/itemviewmodel/ReplayButtonViewModel.kt", - "src/main/java/org/oppia/app/player/state/itemviewmodel/ReturnToTopicButtonViewModel.kt", - "src/main/java/org/oppia/app/player/state/itemviewmodel/RatioExpressionInputInteractionViewModel.kt", - "src/main/java/org/oppia/app/player/state/itemviewmodel/SelectionInteractionContentViewModel.kt", - "src/main/java/org/oppia/app/player/state/itemviewmodel/SelectionInteractionViewModel.kt", - "src/main/java/org/oppia/app/player/state/itemviewmodel/StateItemViewModel.kt", - "src/main/java/org/oppia/app/player/state/itemviewmodel/SubmitButtonViewModel.kt", - "src/main/java/org/oppia/app/player/state/itemviewmodel/SubmittedAnswerViewModel.kt", - "src/main/java/org/oppia/app/player/state/itemviewmodel/TextInputViewModel.kt", - "src/main/java/org/oppia/app/player/state/StateViewModel.kt", - "src/main/java/org/oppia/app/player/state/testing/StateFragmentTestViewModel.kt", - "src/main/java/org/oppia/app/profile/AddProfileViewModel.kt", - "src/main/java/org/oppia/app/profile/AdminAuthViewModel.kt", - "src/main/java/org/oppia/app/profile/AdminPinViewModel.kt", - "src/main/java/org/oppia/app/profile/AdminSettingsViewModel.kt", - "src/main/java/org/oppia/app/profile/PinPasswordViewModel.kt", - "src/main/java/org/oppia/app/profile/ProfileChooserViewModel.kt", - "src/main/java/org/oppia/app/profile/ResetPinViewModel.kt", - "src/main/java/org/oppia/app/profileprogress/ProfilePictureActivityViewModel.kt", - "src/main/java/org/oppia/app/profileprogress/ProfileProgressHeaderViewModel.kt", - "src/main/java/org/oppia/app/profileprogress/ProfileProgressItemViewModel.kt", - "src/main/java/org/oppia/app/profileprogress/ProfileProgressViewModel.kt", - "src/main/java/org/oppia/app/profileprogress/RecentlyPlayedStorySummaryViewModel.kt", - "src/main/java/org/oppia/app/recyclerview/BindableAdapter.kt", - "src/main/java/org/oppia/app/recyclerview/DividerItemDecorator.kt", - "src/main/java/org/oppia/app/recyclerview/DragAndDropItemFacilitator.kt", - "src/main/java/org/oppia/app/settings/profile/ProfileEditViewModel.kt", - "src/main/java/org/oppia/app/settings/profile/ProfileListViewModel.kt", - "src/main/java/org/oppia/app/settings/profile/ProfileRenameViewModel.kt", - "src/main/java/org/oppia/app/settings/profile/ProfileResetPinViewModel.kt", - "src/main/java/org/oppia/app/shim/IntentFactoryShim.kt", - "src/main/java/org/oppia/app/story/StoryFragmentScroller.kt", - "src/main/java/org/oppia/app/story/storyitemviewmodel/StoryChapterSummaryViewModel.kt", - "src/main/java/org/oppia/app/story/storyitemviewmodel/StoryHeaderViewModel.kt", - "src/main/java/org/oppia/app/story/storyitemviewmodel/StoryItemViewModel.kt", - "src/main/java/org/oppia/app/story/StoryViewModel.kt", - "src/main/java/org/oppia/app/testing/BindableAdapterTestViewModel.kt", - "src/main/java/org/oppia/app/topic/conceptcard/ConceptCardViewModel.kt", - "src/main/java/org/oppia/app/topic/lessons/StorySummaryViewModel.kt", - "src/main/java/org/oppia/app/topic/lessons/TopicLessonsItemViewModel.kt", - "src/main/java/org/oppia/app/topic/lessons/TopicLessonsTitleViewModel.kt", - "src/main/java/org/oppia/app/topic/practice/practiceitemviewmodel/TopicPracticeFooterViewModel.kt", - "src/main/java/org/oppia/app/topic/practice/practiceitemviewmodel/TopicPracticeHeaderViewModel.kt", - "src/main/java/org/oppia/app/topic/practice/practiceitemviewmodel/TopicPracticeItemViewModel.kt", - "src/main/java/org/oppia/app/topic/practice/practiceitemviewmodel/TopicPracticeSubtopicViewModel.kt", - "src/main/java/org/oppia/app/topic/practice/TopicPracticeViewModel.kt", - "src/main/java/org/oppia/app/topic/questionplayer/QuestionPlayerViewModel.kt", - "src/main/java/org/oppia/app/topic/revision/revisionitemviewmodel/TopicRevisionItemViewModel.kt", - "src/main/java/org/oppia/app/topic/revision/TopicRevisionViewModel.kt", - "src/main/java/org/oppia/app/topic/revisioncard/RevisionCardViewModel.kt", - "src/main/java/org/oppia/app/topic/TopicViewModel.kt", - "src/main/java/org/oppia/app/viewmodel/ObservableArrayList.kt", - "src/main/java/org/oppia/app/viewmodel/ObservableViewModel.kt", - "src/main/java/org/oppia/app/walkthrough/end/WalkthroughFinalViewModel.kt", - "src/main/java/org/oppia/app/walkthrough/topiclist/topiclistviewmodel/WalkthroughTopicHeaderViewModel.kt", - "src/main/java/org/oppia/app/walkthrough/topiclist/topiclistviewmodel/WalkthroughTopicSummaryViewModel.kt", - "src/main/java/org/oppia/app/walkthrough/topiclist/WalkthroughTopicItemViewModel.kt", - "src/main/java/org/oppia/app/walkthrough/topiclist/WalkthroughTopicViewModel.kt", - "src/main/java/org/oppia/app/walkthrough/WalkthroughViewModel.kt", - "src/main/java/org/oppia/app/walkthrough/welcome/WalkthroughWelcomeViewModel.kt", + "src/main/java/org/oppia/android/app/administratorcontrols/administratorcontrolsitemviewmodel/AdministratorControlsAppInformationViewModel.kt", + "src/main/java/org/oppia/android/app/administratorcontrols/administratorcontrolsitemviewmodel/AdministratorControlsDownloadPermissionsViewModel.kt", + "src/main/java/org/oppia/android/app/administratorcontrols/administratorcontrolsitemviewmodel/AdministratorControlsGeneralViewModel.kt", + "src/main/java/org/oppia/android/app/administratorcontrols/administratorcontrolsitemviewmodel/AdministratorControlsItemViewModel.kt", + "src/main/java/org/oppia/android/app/administratorcontrols/administratorcontrolsitemviewmodel/AdministratorControlsProfileViewModel.kt", + "src/main/java/org/oppia/android/app/administratorcontrols/AdministratorControlsViewModel.kt", + "src/main/java/org/oppia/android/app/administratorcontrols/appversion/AppVersionViewModel.kt", + "src/main/java/org/oppia/android/app/completedstorylist/CompletedStoryItemViewModel.kt", + "src/main/java/org/oppia/android/app/completedstorylist/CompletedStoryListViewModel.kt", + "src/main/java/org/oppia/android/app/drawer/NavigationDrawerFooterViewModel.kt", + "src/main/java/org/oppia/android/app/drawer/NavigationDrawerHeaderViewModel.kt", + "src/main/java/org/oppia/android/app/help/faq/faqItemViewModel/FAQContentViewModel.kt", + "src/main/java/org/oppia/android/app/help/faq/faqItemViewModel/FAQHeaderViewModel.kt", + "src/main/java/org/oppia/android/app/help/faq/faqItemViewModel/FAQItemViewModel.kt", + "src/main/java/org/oppia/android/app/help/HelpItems.kt", + "src/main/java/org/oppia/android/app/hintsandsolution/HintsAndSolutionItemViewModel.kt", + "src/main/java/org/oppia/android/app/hintsandsolution/HintsDividerViewModel.kt", + "src/main/java/org/oppia/android/app/hintsandsolution/HintsViewModel.kt", + "src/main/java/org/oppia/android/app/hintsandsolution/SolutionViewModel.kt", + "src/main/java/org/oppia/android/app/home/HomeItemViewModel.kt", + "src/main/java/org/oppia/android/app/home/recentlyplayed/OngoingStoryViewModel.kt", + "src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedItemViewModel.kt", + "src/main/java/org/oppia/android/app/home/recentlyplayed/SectionTitleViewModel.kt", + "src/main/java/org/oppia/android/app/home/topiclist/AllTopicsViewModel.kt", + "src/main/java/org/oppia/android/app/home/topiclist/PromotedStoryListViewModel.kt", + "src/main/java/org/oppia/android/app/home/topiclist/PromotedStoryViewModel.kt", + "src/main/java/org/oppia/android/app/home/topiclist/TopicSummaryViewModel.kt", + "src/main/java/org/oppia/android/app/home/UserAppHistoryViewModel.kt", + "src/main/java/org/oppia/android/app/home/WelcomeViewModel.kt", + "src/main/java/org/oppia/android/app/onboarding/OnboardingSlideFinalViewModel.kt", + "src/main/java/org/oppia/android/app/onboarding/ViewPagerSlide.kt", + "src/main/java/org/oppia/android/app/ongoingtopiclist/OngoingTopicItemViewModel.kt", + "src/main/java/org/oppia/android/app/ongoingtopiclist/OngoingTopicListViewModel.kt", + "src/main/java/org/oppia/android/app/options/OptionControlsViewModel.kt", + "src/main/java/org/oppia/android/app/options/OptionsAppLanguageViewModel.kt", + "src/main/java/org/oppia/android/app/options/OptionsAudioLanguageViewModel.kt", + "src/main/java/org/oppia/android/app/options/OptionsItemViewModel.kt", + "src/main/java/org/oppia/android/app/options/OptionsReadingTextSizeViewModel.kt", + "src/main/java/org/oppia/android/app/player/audio/AudioViewModel.kt", + "src/main/java/org/oppia/android/app/player/exploration/ExplorationViewModel.kt", + "src/main/java/org/oppia/android/app/player/state/itemviewmodel/ContentViewModel.kt", + "src/main/java/org/oppia/android/app/player/state/itemviewmodel/ContinueInteractionViewModel.kt", + "src/main/java/org/oppia/android/app/player/state/itemviewmodel/ContinueNavigationButtonViewModel.kt", + "src/main/java/org/oppia/android/app/player/state/itemviewmodel/DragAndDropSortInteractionViewModel.kt", + "src/main/java/org/oppia/android/app/player/state/itemviewmodel/DragDropInteractionContentViewModel.kt", + "src/main/java/org/oppia/android/app/player/state/itemviewmodel/FeedbackViewModel.kt", + "src/main/java/org/oppia/android/app/player/state/itemviewmodel/NextButtonViewModel.kt", + "src/main/java/org/oppia/android/app/player/state/itemviewmodel/NumericInputViewModel.kt", + "src/main/java/org/oppia/android/app/player/state/itemviewmodel/PreviousButtonViewModel.kt", + "src/main/java/org/oppia/android/app/player/state/itemviewmodel/PreviousResponsesHeaderViewModel.kt", + "src/main/java/org/oppia/android/app/player/state/itemviewmodel/ReplayButtonViewModel.kt", + "src/main/java/org/oppia/android/app/player/state/itemviewmodel/ReturnToTopicButtonViewModel.kt", + "src/main/java/org/oppia/android/app/player/state/itemviewmodel/SelectionInteractionContentViewModel.kt", + "src/main/java/org/oppia/android/app/player/state/itemviewmodel/SelectionInteractionViewModel.kt", + "src/main/java/org/oppia/android/app/player/state/itemviewmodel/StateItemViewModel.kt", + "src/main/java/org/oppia/android/app/player/state/itemviewmodel/SubmitButtonViewModel.kt", + "src/main/java/org/oppia/android/app/player/state/itemviewmodel/SubmittedAnswerViewModel.kt", + "src/main/java/org/oppia/android/app/player/state/itemviewmodel/TextInputViewModel.kt", + "src/main/java/org/oppia/android/app/player/state/StateViewModel.kt", + "src/main/java/org/oppia/android/app/player/state/testing/StateFragmentTestViewModel.kt", + "src/main/java/org/oppia/android/app/profile/AddProfileViewModel.kt", + "src/main/java/org/oppia/android/app/profile/AdminAuthViewModel.kt", + "src/main/java/org/oppia/android/app/profile/AdminPinViewModel.kt", + "src/main/java/org/oppia/android/app/profile/AdminSettingsViewModel.kt", + "src/main/java/org/oppia/android/app/profile/PinPasswordViewModel.kt", + "src/main/java/org/oppia/android/app/profile/ProfileChooserViewModel.kt", + "src/main/java/org/oppia/android/app/profile/ResetPinViewModel.kt", + "src/main/java/org/oppia/android/app/profileprogress/ProfilePictureActivityViewModel.kt", + "src/main/java/org/oppia/android/app/profileprogress/ProfileProgressHeaderViewModel.kt", + "src/main/java/org/oppia/android/app/profileprogress/ProfileProgressItemViewModel.kt", + "src/main/java/org/oppia/android/app/profileprogress/RecentlyPlayedStorySummaryViewModel.kt", + "src/main/java/org/oppia/android/app/recyclerview/BindableAdapter.kt", + "src/main/java/org/oppia/android/app/recyclerview/DividerItemDecorator.kt", + "src/main/java/org/oppia/android/app/recyclerview/DragAndDropItemFacilitator.kt", + "src/main/java/org/oppia/android/app/settings/profile/ProfileEditViewModel.kt", + "src/main/java/org/oppia/android/app/settings/profile/ProfileListViewModel.kt", + "src/main/java/org/oppia/android/app/settings/profile/ProfileRenameViewModel.kt", + "src/main/java/org/oppia/android/app/settings/profile/ProfileResetPinViewModel.kt", + "src/main/java/org/oppia/android/app/shim/IntentFactoryShim.kt", + "src/main/java/org/oppia/android/app/story/StoryFragmentScroller.kt", + "src/main/java/org/oppia/android/app/story/storyitemviewmodel/StoryChapterSummaryViewModel.kt", + "src/main/java/org/oppia/android/app/story/storyitemviewmodel/StoryHeaderViewModel.kt", + "src/main/java/org/oppia/android/app/story/storyitemviewmodel/StoryItemViewModel.kt", + "src/main/java/org/oppia/android/app/story/StoryViewModel.kt", + "src/main/java/org/oppia/android/app/testing/BindableAdapterTestViewModel.kt", + "src/main/java/org/oppia/android/app/topic/conceptcard/ConceptCardViewModel.kt", + "src/main/java/org/oppia/android/app/topic/lessons/StorySummaryViewModel.kt", + "src/main/java/org/oppia/android/app/topic/lessons/TopicLessonsItemViewModel.kt", + "src/main/java/org/oppia/android/app/topic/lessons/TopicLessonsTitleViewModel.kt", + "src/main/java/org/oppia/android/app/topic/practice/practiceitemviewmodel/TopicPracticeFooterViewModel.kt", + "src/main/java/org/oppia/android/app/topic/practice/practiceitemviewmodel/TopicPracticeHeaderViewModel.kt", + "src/main/java/org/oppia/android/app/topic/practice/practiceitemviewmodel/TopicPracticeItemViewModel.kt", + "src/main/java/org/oppia/android/app/topic/practice/practiceitemviewmodel/TopicPracticeSubtopicViewModel.kt", + "src/main/java/org/oppia/android/app/topic/practice/TopicPracticeViewModel.kt", + "src/main/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerViewModel.kt", + "src/main/java/org/oppia/android/app/topic/revision/revisionitemviewmodel/TopicRevisionItemViewModel.kt", + "src/main/java/org/oppia/android/app/topic/revision/TopicRevisionViewModel.kt", + "src/main/java/org/oppia/android/app/topic/revisioncard/RevisionCardViewModel.kt", + "src/main/java/org/oppia/android/app/topic/TopicViewModel.kt", + "src/main/java/org/oppia/android/app/viewmodel/ObservableArrayList.kt", + "src/main/java/org/oppia/android/app/viewmodel/ObservableViewModel.kt", + "src/main/java/org/oppia/android/app/walkthrough/end/WalkthroughFinalViewModel.kt", + "src/main/java/org/oppia/android/app/walkthrough/topiclist/topiclistviewmodel/WalkthroughTopicHeaderViewModel.kt", + "src/main/java/org/oppia/android/app/walkthrough/topiclist/topiclistviewmodel/WalkthroughTopicSummaryViewModel.kt", + "src/main/java/org/oppia/android/app/walkthrough/topiclist/WalkthroughTopicItemViewModel.kt", + "src/main/java/org/oppia/android/app/walkthrough/topiclist/WalkthroughTopicViewModel.kt", + "src/main/java/org/oppia/android/app/walkthrough/WalkthroughViewModel.kt", + "src/main/java/org/oppia/android/app/walkthrough/welcome/WalkthroughWelcomeViewModel.kt", ] + [ "update_" + view_models_with_resource_imports[0:-3] for view_models_with_resource_imports in VIEW_MODELS_WITH_RESOURCE_IMPORTS ] # TODO(#1617): Remove genrules post-gradle -''' +""" Genrule for source files in the view_models library. Because each databinding library must have a unique package name and manifest, resources must be imported using the proper package name when building with Bazel. This genrule alters those imports in order to keep Gradle building. -''' -[genrule( - name = "update_" + file[0:-3], - srcs = [file], - outs = [file[0:-3] + "_updated.kt"], - cmd = ''' +""" + +[ + genrule( + name = "update_" + file[0:-3], + srcs = [file], + outs = [file[0:-3] + "_updated.kt"], + cmd = """ cat $(SRCS) | - sed 's/import org.oppia.app.R/import org.oppia.app.view.models.R/g' > $(OUTS) - ''', -) -for file in VIEW_MODELS_WITH_RESOURCE_IMPORTS] + sed 's/import org.oppia.android.R/import org.oppia.android.app.view.models.R/g' > $(OUTS) + """, + ) + for file in VIEW_MODELS_WITH_RESOURCE_IMPORTS +] # Views # TODO(#1617): Remove genrules post-gradle -''' +""" Source files for the views library that import resources. Place your file here if: - It is a view file - - It imports resources (ex: `import org.oppia.app.R`) -''' + - It imports resources (ex: `import org.oppia.android.R`) +""" + +# keep sorted VIEWS_WITH_RESOURCE_IMPORTS = [ - "src/main/java/org/oppia/app/customview/LessonThumbnailImageView.kt", - "src/main/java/org/oppia/app/customview/SegmentedCircularProgressView.kt", - "src/main/java/org/oppia/app/profile/ProfileInputView.kt", - "src/main/java/org/oppia/app/utility/ClickableAreasImage.kt", + "src/main/java/org/oppia/android/app/customview/LessonThumbnailImageView.kt", + "src/main/java/org/oppia/android/app/customview/SegmentedCircularProgressView.kt", + "src/main/java/org/oppia/android/app/profile/ProfileInputView.kt", + "src/main/java/org/oppia/android/app/utility/ClickableAreasImage.kt", ] -''' +""" Source files for the views library that DO NOT import resources. Place your file here if: - It is a view file - It does not import resources - It holds a circular dependency with a view (including views in VIEWS_WITH_RESOURCE_IMPORTS) -''' +""" + +# keep sorted VIEWS = [ - "src/main/java/org/oppia/app/application/ApplicationInjector.kt", - "src/main/java/org/oppia/app/application/ApplicationInjectorProvider.kt", - "src/main/java/org/oppia/app/customview/interaction/FractionInputInteractionView.kt", - "src/main/java/org/oppia/app/customview/interaction/NumericInputInteractionView.kt", - "src/main/java/org/oppia/app/customview/interaction/TextInputInteractionView.kt", - "src/main/java/org/oppia/app/customview/interaction/RatioInputInteractionView.kt", - "src/main/java/org/oppia/app/player/state/DragDropSortInteractionView.kt", - "src/main/java/org/oppia/app/player/state/ImageRegionSelectionInteractionView.kt", - "src/main/java/org/oppia/app/player/state/SelectionInteractionView.kt", - "src/main/java/org/oppia/app/shim/ViewBindingShim.kt", - "src/main/java/org/oppia/app/shim/ViewComponentFactory.kt", - "src/main/java/org/oppia/app/view/ViewComponent.kt", - "src/main/java/org/oppia/app/view/ViewScope.kt", + "src/main/java/org/oppia/android/app/application/ApplicationInjector.kt", + "src/main/java/org/oppia/android/app/application/ApplicationInjectorProvider.kt", + "src/main/java/org/oppia/android/app/customview/interaction/FractionInputInteractionView.kt", + "src/main/java/org/oppia/android/app/customview/interaction/NumericInputInteractionView.kt", + "src/main/java/org/oppia/android/app/customview/interaction/TextInputInteractionView.kt", + "src/main/java/org/oppia/android/app/customview/interaction/RatioInputInteractionView.kt", + "src/main/java/org/oppia/android/app/player/state/DragDropSortInteractionView.kt", + "src/main/java/org/oppia/android/app/player/state/ImageRegionSelectionInteractionView.kt", + "src/main/java/org/oppia/android/app/player/state/SelectionInteractionView.kt", + "src/main/java/org/oppia/android/app/shim/ViewBindingShim.kt", + "src/main/java/org/oppia/android/app/shim/ViewComponentFactory.kt", + "src/main/java/org/oppia/android/app/view/ViewComponent.kt", + "src/main/java/org/oppia/android/app/view/ViewScope.kt", ] + [ "update_" + views_with_resource_imports[0:-3] for views_with_resource_imports in VIEWS_WITH_RESOURCE_IMPORTS ] # TODO(#1617): Remove genrules post-gradle -''' +""" Genrule for source files in the views library. Because each databinding library must have a unique package name and manifest, resources must be imported using the proper package name when building with Bazel. This genrule alters those imports in order to keep Gradle building. -''' -[genrule( - name = "update_" + file[0:-3], - srcs = [file], - outs = [file[0:-3] + "_updated.kt"], - cmd = ''' +""" + +[ + genrule( + name = "update_" + file[0:-3], + srcs = [file], + outs = [file[0:-3] + "_updated.kt"], + cmd = """ cat $(SRCS) | - sed 's/import org.oppia.app.R/import org.oppia.app.views.R/g' > $(OUTS) - ''', - ) -for file in VIEWS_WITH_RESOURCE_IMPORTS] + sed 's/import org.oppia.android.R/import org.oppia.android.app.views.R/g' > $(OUTS) + """, + ) + for file in VIEWS_WITH_RESOURCE_IMPORTS +] # Binding Adapters # TODO(#1617): Remove genrules post-gradle -''' +""" Binding adapter files that import resources. Place your file here if: - It is a binding adapter - - It imports resources (ex: `import org.oppia.app.R`) -''' + - It imports resources (ex: `import org.oppia.android.R`) +""" + +# keep sorted BINDING_ADAPTERS_WITH_RESOURCE_IMPORTS = [ - "src/main/java/org/oppia/app/databinding/DrawableBindingAdapters.java", - "src/main/java/org/oppia/app/databinding/ImageViewBindingAdapters.java", - "src/main/java/org/oppia/app/databinding/TextViewBindingAdapters.java", + "src/main/java/org/oppia/android/app/databinding/DrawableBindingAdapters.java", + "src/main/java/org/oppia/android/app/databinding/ImageViewBindingAdapters.java", + "src/main/java/org/oppia/android/app/databinding/TextViewBindingAdapters.java", ] -''' +""" Binding adapter files that DO NOT import resources. Place your file here if: - It is a binding adapter - It does not import resources -''' +""" + +# keep sorted BINDING_ADAPTERS = [ - "src/main/java/org/oppia/app/databinding/EditTextBindingAdapters.java", - "src/main/java/org/oppia/app/databinding/GuidelineBindingAdapters.java", - "src/main/java/org/oppia/app/databinding/MarginBindingAdapters.java", - "src/main/java/org/oppia/app/databinding/StateAssemblerMarginBindingAdapters.java", - "src/main/java/org/oppia/app/databinding/StateAssemblerPaddingBindingAdapters.java", - "src/main/java/org/oppia/app/databinding/ViewBindingAdapters.java", - "src/main/java/org/oppia/app/recyclerview/RecyclerViewBindingAdapter.java" + "src/main/java/org/oppia/android/app/databinding/EditTextBindingAdapters.java", + "src/main/java/org/oppia/android/app/databinding/GuidelineBindingAdapters.java", + "src/main/java/org/oppia/android/app/databinding/MarginBindingAdapters.java", + "src/main/java/org/oppia/android/app/databinding/StateAssemblerMarginBindingAdapters.java", + "src/main/java/org/oppia/android/app/databinding/StateAssemblerPaddingBindingAdapters.java", + "src/main/java/org/oppia/android/app/databinding/ViewBindingAdapters.java", + "src/main/java/org/oppia/android/app/recyclerview/RecyclerViewBindingAdapter.java", ] + [ "update_" + binding_adapters_with_resource_imports[0:-5] for binding_adapters_with_resource_imports in BINDING_ADAPTERS_WITH_RESOURCE_IMPORTS ] # TODO(#1617): Remove genrules post-gradle -''' +""" Genrule for source files in the binding_adapters library. Because each databinding library must have a unique package name and manifest, resources must be imported using the proper package name when building with Bazel. This genrule alters those imports in order to keep Gradle building. -''' +""" + [genrule( - name = "update_" + file[0:-5], - srcs = [file], - outs = [file[0:-5] + "_updated.java"], - cmd = ''' + name = "update_" + file[0:-5], + srcs = [file], + outs = [file[0:-5] + "_updated.java"], + cmd = """ cat $(SRCS) | - sed 's/import org.oppia.app.R/import org.oppia.app.databinding.adapters.R/g' | + sed 's/import org.oppia.android.R/import org.oppia.android.app.databinding.adapters.R/g' | sed 's/BindingAdapters {/BindingAdapters_updated {/g' > $(OUTS) - ''', - ) for file in BINDING_ADAPTERS_WITH_RESOURCE_IMPORTS] + """, +) for file in BINDING_ADAPTERS_WITH_RESOURCE_IMPORTS] -''' +""" Files to be excluded from the source list for the app library. This list includes all the files built by the following libraries: - view_models @@ -384,32 +409,40 @@ built by the following libraries: - listeners - annotations - binding_adapters -''' +""" + EXCLUDED_APP_LIB_FILES = VIEW_MODELS + VIEW_MODELS_WITH_RESOURCE_IMPORTS + VIEWS + VIEWS_WITH_RESOURCE_IMPORTS + BINDING_ADAPTERS + BINDING_ADAPTERS_WITH_RESOURCE_IMPORTS + LISTENERS + ANNOTATIONS -''' +""" Files to be built by the app library. All of these files are assumed to have resource imports and will be processed by the app library genrule regardless in order to avoid any import issues. -''' -APP_FILES_WITH_RESOURCE_IMPORTS = glob(["src/main/java/org/oppia/app/**/*.kt"], exclude = EXCLUDED_APP_LIB_FILES) +""" -''' +APP_FILES_WITH_RESOURCE_IMPORTS = glob( + ["src/main/java/org/oppia/android/app/**/*.kt"], + exclude = EXCLUDED_APP_LIB_FILES, +) + +""" Genrule for source files in the app library. Because each databinding library must have a unique package name and manifest, resources must be imported using the proper package name when building with Bazel. This genrule alters those imports in order to keep Gradle building. -''' -[genrule( - name = "update_" + file[0:-3], - srcs = [file], - outs = [file[0:-3] + "_updated.kt"], - cmd = ''' +""" + +[ + genrule( + name = "update_" + file[0:-3], + srcs = [file], + outs = [file[0:-3] + "_updated.kt"], + cmd = """ cat $(SRCS) | - sed 's/import org.oppia.app.R/import org.oppia.app.ui.R/g' | - sed 's/import org.oppia.app.databinding./import org.oppia.app.databinding.databinding./g' > $(OUTS) - ''', - ) -for file in APP_FILES_WITH_RESOURCE_IMPORTS] + sed 's/import org.oppia.android.R/import org.oppia.android.app.ui.R/g' | + sed 's/import org.oppia.android.databinding./import org.oppia.android.app.databinding.databinding./g' > $(OUTS) + """, + ) + for file in APP_FILES_WITH_RESOURCE_IMPORTS +] # Files to be built by the app library. APP_FILES = [] + [ @@ -420,25 +453,28 @@ APP_FILES = [] + [ # Library for non-layout resource files. android_library( name = "resources", - custom_package = "org.oppia.app", - manifest = "src/main/AndroidManifest.xml", - resource_files = glob(["src/main/res/**",], exclude = DATABINDING_LAYOUTS), + custom_package = "org.oppia.android.app", exports_manifest = True, + manifest = "src/main/AndroidManifest.xml", + resource_files = glob( + ["src/main/res/**"], + exclude = DATABINDING_LAYOUTS, + ), + visibility = ["//visibility:private"], deps = [ artifact("com.google.android.material:material"), ], - visibility = ["//visibility:private"], ) # Library for layout resource files. android_library( name = "databinding_resources", - custom_package = "org.oppia.app.databinding", - manifest = "src/main/DatabindingResourcesManifest.xml", srcs = BINDING_ADAPTERS, - resource_files = glob(DATABINDING_LAYOUTS), + custom_package = "org.oppia.android.app.databinding", enable_data_binding = True, exports_manifest = True, + manifest = "src/main/DatabindingResourcesManifest.xml", + resource_files = glob(DATABINDING_LAYOUTS), deps = [ ":annotations", ":binding_adapters", @@ -467,22 +503,23 @@ android_library( # Library for listener files required to build views and view_model libraries. kt_android_library( name = "listeners", - custom_package = "org.oppia.app", srcs = LISTENERS, + custom_package = "org.oppia.android.app", + visibility = ["//visibility:private"], deps = [ ":dagger", "//model", artifact("androidx.recyclerview:recyclerview:1.0.0"), ], - visibility = ["//visibility:private"], ) # Library for all view files required to build layout files. kt_android_library( name = "views", - custom_package = "org.oppia.app.views", - manifest = "src/main/ViewsManifest.xml", srcs = VIEWS, + custom_package = "org.oppia.android.app.views", + manifest = "src/main/ViewsManifest.xml", + visibility = ["//visibility:private"], deps = [ ":annotations", ":listeners", @@ -495,28 +532,28 @@ kt_android_library( artifact("androidx.databinding:databinding-common"), artifact("androidx.databinding:databinding-runtime"), ], - visibility = ["//visibility:private"], ) # Library for scope annotations required to build views and view_model libraries. kt_android_library( name = "annotations", - custom_package = "org.oppia.app", srcs = ANNOTATIONS, + custom_package = "org.oppia.android.app", + visibility = ["//visibility:private"], deps = [ ":dagger", "//model", ], - visibility = ["//visibility:private"], ) # Library for all view model files. kt_android_library( name = "view_models", - custom_package = "org.oppia.app.view.models", srcs = VIEW_MODELS, + custom_package = "org.oppia.android.app.view.models", enable_data_binding = True, manifest = "src/main/ViewModelsManifest.xml", + visibility = ["//visibility:private"], deps = [ ":annotations", ":dagger", @@ -528,17 +565,17 @@ kt_android_library( artifact("androidx.databinding:databinding-common"), artifact("androidx.databinding:databinding-runtime"), ], - visibility = ["//visibility:private"], ) # TODO(#1639): Translate binding adapters back to Kotlin post-Bazel modularization. -# Library for all custom data-binding adapters under org/oppia/app/databinding. +# Library for all custom data-binding adapters under org/oppia/android/app/databinding. android_library( name = "binding_adapters", - custom_package = "org.oppia.app.databinding.adapters", srcs = BINDING_ADAPTERS, + custom_package = "org.oppia.android.app.databinding.adapters", enable_data_binding = True, manifest = "src/main/DatabindingAdaptersManifest.xml", + visibility = ["//visibility:private"], deps = [ ":dagger", ":resources", @@ -551,16 +588,16 @@ android_library( artifact("androidx.lifecycle:lifecycle-livedata-core:jar:2.0.0-alpha1"), artifact("androidx.lifecycle:lifecycle-livedata-ktx"), ], - visibility = ["//visibility:private"], ) # Library containing all activity, fragment, and view-based UI flows in the app. kt_android_library( name = "app", - custom_package = "org.oppia.app.ui", srcs = APP_FILES, + custom_package = "org.oppia.android.app.ui", enable_data_binding = 1, manifest = "src/main/AppAndroidManifest.xml", + visibility = ["//visibility:public"], deps = [ ":binding_adapters", ":dagger", @@ -581,10 +618,9 @@ kt_android_library( artifact("com.caverock:androidsvg-aar"), artifact("javax.annotation:javax.annotation-api:jar"), ], - visibility = ["//visibility:public"], ) -''' +""" Library that builds test-only source files. All app-specific files that are only used for testing @@ -594,28 +630,29 @@ the app library or the final binary but should be dependencies for tests. Place your file here if: - It is not a test file - Only test files depend on it -''' +""" + kt_android_library( name = "test_deps", + testonly = True, srcs = [ - "src/sharedTest/java/org/oppia/app/parser/RichTextViewMatcher.kt", - "src/sharedTest/java/org/oppia/app/recyclerview/RecyclerViewMatcher.kt", - "src/sharedTest/java/org/oppia/app/utility/ClickActions.kt", - "src/sharedTest/java/org/oppia/app/utility/DragViewAction.kt", - "src/sharedTest/java/org/oppia/app/utility/DrawableMatcher.kt", - "src/sharedTest/java/org/oppia/app/utility/EspressoTestsMatchers.kt", - "src/sharedTest/java/org/oppia/app/utility/FontSizeMatcher.kt", - "src/sharedTest/java/org/oppia/app/utility/MockitoKotlinHelper.kt", - "src/sharedTest/java/org/oppia/app/utility/OrientationChangeAction.kt", - "src/sharedTest/java/org/oppia/app/utility/ProgressMatcher.kt", - "src/sharedTest/java/org/oppia/app/utility/TabMatcher.kt", + "src/sharedTest/java/org/oppia/android/app/parser/RichTextViewMatcher.kt", + "src/sharedTest/java/org/oppia/android/app/recyclerview/RecyclerViewMatcher.kt", + "src/sharedTest/java/org/oppia/android/app/utility/ClickActions.kt", + "src/sharedTest/java/org/oppia/android/app/utility/DragViewAction.kt", + "src/sharedTest/java/org/oppia/android/app/utility/DrawableMatcher.kt", + "src/sharedTest/java/org/oppia/android/app/utility/EspressoTestsMatchers.kt", + "src/sharedTest/java/org/oppia/android/app/utility/FontSizeMatcher.kt", + "src/sharedTest/java/org/oppia/android/app/utility/MockitoKotlinHelper.kt", + "src/sharedTest/java/org/oppia/android/app/utility/OrientationChangeAction.kt", + "src/sharedTest/java/org/oppia/android/app/utility/ProgressMatcher.kt", + "src/sharedTest/java/org/oppia/android/app/utility/TabMatcher.kt", ], deps = [ ":app", "//testing", artifact("org.mockito:mockito-core"), ], - testonly = True, ) TEST_DEPS = [ @@ -632,6 +669,8 @@ TEST_DEPS = [ artifact("androidx.databinding:databinding-common"), artifact("androidx.databinding:databinding-compiler"), artifact("androidx.databinding:databinding-runtime"), + artifact("androidx.navigation:navigation-fragment"), + artifact("androidx.navigation:navigation-ui"), artifact("androidx.test.espresso:espresso-contrib:3.1.0"), artifact("androidx.test.espresso:espresso-core:3.2.0"), artifact("androidx.test.espresso:espresso-intents:3.1.0"), @@ -646,508 +685,516 @@ TEST_DEPS = [ artifact("org.robolectric:annotations:4.3"), ] -# TODO(#973): Fix app module tests for Roboelectric. -''' +# TODO(#973): Fix app module tests for Robolectric. +""" App module tests. Note that if a test file imports resources or binding files, it must be wrapped by test_with_resources(). -''' +""" app_test( name = "HomeActivityLocalTest", - srcs = ["src/test/java/org/oppia/app/home/HomeActivityLocalTest.kt"], - test_class = "org.oppia.app.home.HomeActivityLocalTest", + srcs = ["src/test/java/org/oppia/android/app/home/HomeActivityLocalTest.kt"], + test_class = "org.oppia.android.app.home.HomeActivityLocalTest", deps = TEST_DEPS, ) -# TODO(#973): Fix app module tests for Roboelectric. +# TODO(#973): Fix app module tests for Robolectric. app_test( name = "ExplorationActivityLocalTest", - srcs = ["src/test/java/org/oppia/app/player/exploration/ExplorationActivityLocalTest.kt"], - test_class = "org.oppia.app.player.exploration.ExplorationActivityLocalTest", + srcs = ["src/test/java/org/oppia/android/app/player/exploration/ExplorationActivityLocalTest.kt"], + test_class = "org.oppia.android.app.player.exploration.ExplorationActivityLocalTest", deps = TEST_DEPS, ) app_test( name = "StateFragmentLocalTest", - srcs = [test_with_resources("src/test/java/org/oppia/app/player/state/StateFragmentLocalTest.kt")], - test_class = "org.oppia.app.player.state.StateFragmentLocalTest", + srcs = [test_with_resources("src/test/java/org/oppia/android/app/player/state/StateFragmentLocalTest.kt")], + test_class = "org.oppia.android.app.player.state.StateFragmentLocalTest", deps = TEST_DEPS, ) app_test( name = "ProfileChooserFragmentLocalTest", - srcs = ["src/test/java/org/oppia/app/profile/ProfileChooserFragmentLocalTest.kt"], - test_class = "org.oppia.app.profile.ProfileChooserFragmentLocalTest", + srcs = ["src/test/java/org/oppia/android/app/profile/ProfileChooserFragmentLocalTest.kt"], + test_class = "org.oppia.android.app.profile.ProfileChooserFragmentLocalTest", deps = TEST_DEPS, ) app_test( name = "StoryActivityLocalTest", - srcs = ["src/test/java/org/oppia/app/story/StoryActivityLocalTest.kt"], - test_class = "org.oppia.app.story.StoryActivityLocalTest", + srcs = ["src/test/java/org/oppia/android/app/story/StoryActivityLocalTest.kt"], + test_class = "org.oppia.android.app.story.StoryActivityLocalTest", deps = TEST_DEPS, ) app_test( name = "CompletedStoryListSpanTest", - srcs = [test_with_resources("src/test/java/org/oppia/app/testing/CompletedStoryListSpanTest.kt")], - test_class = "org.oppia.app.testing.CompletedStoryListSpanTest", + srcs = [test_with_resources("src/test/java/org/oppia/android/app/testing/CompletedStoryListSpanTest.kt")], + test_class = "org.oppia.android.app.testing.CompletedStoryListSpanTest", deps = TEST_DEPS, ) app_test( name = "OngoingTopicListSpanTest", - srcs = [test_with_resources("src/test/java/org/oppia/app/testing/OngoingTopicListSpanTest.kt")], - test_class = "org.oppia.app.testing.OngoingTopicListSpanTest", + srcs = [test_with_resources("src/test/java/org/oppia/android/app/testing/OngoingTopicListSpanTest.kt")], + test_class = "org.oppia.android.app.testing.OngoingTopicListSpanTest", deps = TEST_DEPS, ) app_test( name = "ProfileChooserSpanTest", - srcs = ["src/test/java/org/oppia/app/testing/ProfileChooserSpanTest.kt"], - test_class = "org.oppia.app.testing.ProfileChooserSpanTest", + srcs = ["src/test/java/org/oppia/android/app/testing/ProfileChooserSpanTest.kt"], + test_class = "org.oppia.android.app.testing.ProfileChooserSpanTest", deps = TEST_DEPS, ) app_test( name = "TopicRevisionSpanTest", - srcs = [test_with_resources("src/test/java/org/oppia/app/testing/TopicRevisionSpanTest.kt")], - test_class = "org.oppia.app.testing.TopicRevisionSpanTest", + srcs = [test_with_resources("src/test/java/org/oppia/android/app/testing/TopicRevisionSpanTest.kt")], + test_class = "org.oppia.android.app.testing.TopicRevisionSpanTest", deps = TEST_DEPS, ) app_test( name = "PlayerSplitScreenTesting", - srcs = ["src/test/java/org/oppia/app/testing/player/split/PlayerSplitScreenTesting.kt"], - test_class = "org.oppia.app.testing.player.split.PlayerSplitScreenTesting", + srcs = ["src/test/java/org/oppia/android/app/testing/player/split/PlayerSplitScreenTesting.kt"], + test_class = "org.oppia.android.app.testing.player.split.PlayerSplitScreenTesting", deps = TEST_DEPS, ) app_test( name = "StateFragmentAccessibilityTest", - srcs = [test_with_resources("src/test/java/org/oppia/app/testing/player/state/StateFragmentAccessibilityTest.kt")], - test_class = "org.oppia.app.testing.player.state.StateFragmentAccessibilityTest", + srcs = [test_with_resources("src/test/java/org/oppia/android/app/testing/player/state/StateFragmentAccessibilityTest.kt")], + test_class = "org.oppia.android.app.testing.player.state.StateFragmentAccessibilityTest", deps = TEST_DEPS, ) app_test( name = "TopicInfoFragmentLocalTest", - srcs = ["src/test/java/org/oppia/app/topic/info/TopicInfoFragmentLocalTest.kt"], - test_class = "org.oppia.app.topic.info.TopicInfoFragmentLocalTest", + srcs = ["src/test/java/org/oppia/android/app/topic/info/TopicInfoFragmentLocalTest.kt"], + test_class = "org.oppia.android.app.topic.info.TopicInfoFragmentLocalTest", deps = TEST_DEPS, ) app_test( name = "TopicLessonsFragmentLocalTest", - srcs = ["src/test/java/org/oppia/app/topic/lessons/TopicLessonsFragmentLocalTest.kt"], - test_class = "org.oppia.app.topic.lessons.TopicLessonsFragmentLocalTest", + srcs = ["src/test/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentLocalTest.kt"], + test_class = "org.oppia.android.app.topic.lessons.TopicLessonsFragmentLocalTest", deps = TEST_DEPS, ) app_test( name = "RevisionCardActivityLocalTest", - srcs = ["src/test/java/org/oppia/app/topic/revisioncard/RevisionCardActivityLocalTest.kt"], - test_class = "org.oppia.app.topic.revisioncard.RevisionCardActivityLocalTest", + srcs = ["src/test/java/org/oppia/android/app/topic/revisioncard/RevisionCardActivityLocalTest.kt"], + test_class = "org.oppia.android.app.topic.revisioncard.RevisionCardActivityLocalTest", deps = TEST_DEPS, ) -''' App Module Shared Tests ''' +""" App Module Shared Tests """ -# TODO(#973): Fix app module tests for Roboelectric. +# TODO(#973): Fix app module tests for Robolectric. app_test( name = "AdministratorControlsActivityTest", - srcs = [test_with_resources("src/sharedTest/java/org/oppia/app/administratorcontrols/AdministratorControlsActivityTest.kt")], - test_class = "org.oppia.app.administratorcontrols.AdministratorControlsActivityTest", + srcs = [test_with_resources("src/sharedTest/java/org/oppia/android/app/administratorcontrols/AdministratorControlsActivityTest.kt")], + test_class = "org.oppia.android.app.administratorcontrols.AdministratorControlsActivityTest", deps = TEST_DEPS, ) -# TODO(#973): Fix app module tests for Roboelectric. +# TODO(#973): Fix app module tests for Robolectric. app_test( name = "AppVersionActivityTest", - srcs = [test_with_resources("src/sharedTest/java/org/oppia/app/administratorcontrols/AppVersionActivityTest.kt")], - test_class = "org.oppia.app.administratorcontrols.AppVersionActivityTest", + srcs = [test_with_resources("src/sharedTest/java/org/oppia/android/app/administratorcontrols/AppVersionActivityTest.kt")], + manifest_values = { + "applicationId": "org.oppia.android", + "versionCode": "0", + "versionName": "0.1-alpha", + "minSdkVersion": "19", + "targetSdkVersion": "28", + }, + test_class = "org.oppia.android.app.administratorcontrols.AppVersionActivityTest", deps = TEST_DEPS, ) -# TODO(#973): Fix app module tests for Roboelectric. +# TODO(#973): Fix app module tests for Robolectric. app_test( name = "CompletedStoryListActivityTest", - srcs = [test_with_resources("src/sharedTest/java/org/oppia/app/completedstorylist/CompletedStoryListActivityTest.kt")], - test_class = "org.oppia.app.completedstorylist.CompletedStoryListActivityTest", + srcs = [test_with_resources("src/sharedTest/java/org/oppia/android/app/completedstorylist/CompletedStoryListActivityTest.kt")], + test_class = "org.oppia.android.app.completedstorylist.CompletedStoryListActivityTest", deps = TEST_DEPS, ) app_test( name = "FAQListFragmentTest", - srcs = [test_with_resources("src/sharedTest/java/org/oppia/app/faq/FAQListFragmentTest.kt")], - test_class = "org.oppia.app.faq.FAQListFragmentTest", + srcs = [test_with_resources("src/sharedTest/java/org/oppia/android/app/faq/FAQListFragmentTest.kt")], + test_class = "org.oppia.android.app.faq.FAQListFragmentTest", deps = TEST_DEPS, ) app_test( name = "FAQSingleActivityTest", - srcs = [test_with_resources("src/sharedTest/java/org/oppia/app/faq/FAQSingleActivityTest.kt")], - test_class = "org.oppia.app.faq.FAQSingleActivityTest", + srcs = [test_with_resources("src/sharedTest/java/org/oppia/android/app/faq/FAQSingleActivityTest.kt")], + test_class = "org.oppia.android.app.faq.FAQSingleActivityTest", deps = TEST_DEPS, ) app_test( name = "HelpFragmentTest", - srcs = [test_with_resources("src/sharedTest/java/org/oppia/app/help/HelpFragmentTest.kt")], - test_class = "org.oppia.app.help.HelpFragmentTest", + srcs = [test_with_resources("src/sharedTest/java/org/oppia/android/app/help/HelpFragmentTest.kt")], + test_class = "org.oppia.android.app.help.HelpFragmentTest", deps = TEST_DEPS, ) -# TODO(#973): Fix app module tests for Roboelectric. +# TODO(#973): Fix app module tests for Robolectric. app_test( name = "HomeActivityTest", - srcs = [test_with_resources("src/sharedTest/java/org/oppia/app/home/HomeActivityTest.kt")], - test_class = "org.oppia.app.home.HomeActivityTest", + srcs = [test_with_resources("src/sharedTest/java/org/oppia/android/app/home/HomeActivityTest.kt")], + test_class = "org.oppia.android.app.home.HomeActivityTest", deps = TEST_DEPS, ) -# TODO(#973): Fix app module tests for Roboelectric. +# TODO(#973): Fix app module tests for Robolectric. app_test( name = "RecentlyPlayedFragmentTest", - srcs = [test_with_resources("src/sharedTest/java/org/oppia/app/home/RecentlyPlayedFragmentTest.kt")], - test_class = "org.oppia.app.home.RecentlyPlayedFragmentTest", + srcs = [test_with_resources("src/sharedTest/java/org/oppia/android/app/home/RecentlyPlayedFragmentTest.kt")], + test_class = "org.oppia.android.app.home.RecentlyPlayedFragmentTest", deps = TEST_DEPS, ) app_test( name = "MyDownloadsFragmentTest", - srcs = [test_with_resources("src/sharedTest/java/org/oppia/app/mydownloads/MyDownloadsFragmentTest.kt")], - test_class = "org.oppia.app.mydownloads.MyDownloadsFragmentTest", + srcs = [test_with_resources("src/sharedTest/java/org/oppia/android/app/mydownloads/MyDownloadsFragmentTest.kt")], + test_class = "org.oppia.android.app.mydownloads.MyDownloadsFragmentTest", deps = TEST_DEPS, ) -# TODO(#973): Fix app module tests for Roboelectric. +# TODO(#973): Fix app module tests for Robolectric. app_test( name = "OnboardingFragmentTest", - srcs = [test_with_resources("src/sharedTest/java/org/oppia/app/onboarding/OnboardingFragmentTest.kt")], - test_class = "org.oppia.app.onboarding.OnboardingFragmentTest", + srcs = [test_with_resources("src/sharedTest/java/org/oppia/android/app/onboarding/OnboardingFragmentTest.kt")], + test_class = "org.oppia.android.app.onboarding.OnboardingFragmentTest", deps = TEST_DEPS, ) -# TODO(#973): Fix app module tests for Roboelectric. +# TODO(#973): Fix app module tests for Robolectric. app_test( name = "OngoingTopicListActivityTest", - srcs = [test_with_resources("src/sharedTest/java/org/oppia/app/ongoingtopiclist/OngoingTopicListActivityTest.kt")], - test_class = "org.oppia.app.ongoingtopiclist.OngoingTopicListActivityTest", + srcs = [test_with_resources("src/sharedTest/java/org/oppia/android/app/ongoingtopiclist/OngoingTopicListActivityTest.kt")], + test_class = "org.oppia.android.app.ongoingtopiclist.OngoingTopicListActivityTest", deps = TEST_DEPS, ) -# TODO(#973): Fix app module tests for Roboelectric. +# TODO(#973): Fix app module tests for Robolectric. app_test( name = "OptionsFragmentTest", - srcs = [test_with_resources("src/sharedTest/java/org/oppia/app/options/OptionsFragmentTest.kt")], - test_class = "org.oppia.app.options.OptionsFragmentTest", + srcs = [test_with_resources("src/sharedTest/java/org/oppia/android/app/options/OptionsFragmentTest.kt")], + test_class = "org.oppia.android.app.options.OptionsFragmentTest", deps = TEST_DEPS, ) -# TODO(#973): Fix app module tests for Roboelectric. +# TODO(#973): Fix app module tests for Robolectric. app_test( name = "HtmlParserTest", - srcs = [test_with_resources("src/sharedTest/java/org/oppia/app/parser/HtmlParserTest.kt")], - test_class = "org.oppia.app.parser.HtmlParserTest", + srcs = [test_with_resources("src/sharedTest/java/org/oppia/android/app/parser/HtmlParserTest.kt")], + test_class = "org.oppia.android.app.parser.HtmlParserTest", deps = TEST_DEPS, ) -# TODO(#973): Fix app module tests for Roboelectric. +# TODO(#973): Fix app module tests for Robolectric. app_test( name = "AudioFragmentTest", - srcs = [test_with_resources("src/sharedTest/java/org/oppia/app/player/audio/AudioFragmentTest.kt")], - test_class = "org.oppia.app.player.audio.AudioFragmentTest", + srcs = [test_with_resources("src/sharedTest/java/org/oppia/android/app/player/audio/AudioFragmentTest.kt")], + test_class = "org.oppia.android.app.player.audio.AudioFragmentTest", deps = TEST_DEPS, ) -# TODO(#973): Fix app module tests for Roboelectric. +# TODO(#973): Fix app module tests for Robolectric. app_test( name = "ExplorationActivityTest", - srcs = [test_with_resources("src/sharedTest/java/org/oppia/app/player/exploration/ExplorationActivityTest.kt")], - test_class = "org.oppia.app.player.exploration.ExplorationActivityTest", + srcs = [test_with_resources("src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt")], + test_class = "org.oppia.android.app.player.exploration.ExplorationActivityTest", deps = TEST_DEPS, ) -# TODO(#973): Fix app module tests for Roboelectric. +# TODO(#973): Fix app module tests for Robolectric. app_test( name = "StateFragmentTest", - srcs = [test_with_resources("src/sharedTest/java/org/oppia/app/player/state/StateFragmentTest.kt")], - test_class = "org.oppia.app.player.state.StateFragmentTest", + srcs = [test_with_resources("src/sharedTest/java/org/oppia/android/app/player/state/StateFragmentTest.kt")], + test_class = "org.oppia.android.app.player.state.StateFragmentTest", deps = TEST_DEPS, ) -# TODO(#973): Fix app module tests for Roboelectric. +# TODO(#973): Fix app module tests for Robolectric. app_test( name = "AddProfileActivityTest", - srcs = [test_with_resources("src/sharedTest/java/org/oppia/app/profile/AddProfileActivityTest.kt")], - test_class = "org.oppia.app.profile.AddProfileActivityTest", + srcs = [test_with_resources("src/sharedTest/java/org/oppia/android/app/profile/AddProfileActivityTest.kt")], + test_class = "org.oppia.android.app.profile.AddProfileActivityTest", deps = TEST_DEPS, ) -# TODO(#973): Fix app module tests for Roboelectric. +# TODO(#973): Fix app module tests for Robolectric. app_test( name = "AdminAuthActivityTest", - srcs = [test_with_resources("src/sharedTest/java/org/oppia/app/profile/AdminAuthActivityTest.kt")], - test_class = "org.oppia.app.profile.AdminAuthActivityTest", + srcs = [test_with_resources("src/sharedTest/java/org/oppia/android/app/profile/AdminAuthActivityTest.kt")], + test_class = "org.oppia.android.app.profile.AdminAuthActivityTest", deps = TEST_DEPS, ) -# TODO(#973): Fix app module tests for Roboelectric. +# TODO(#973): Fix app module tests for Robolectric. app_test( name = "AdminPinActivityTest", - srcs = [test_with_resources("src/sharedTest/java/org/oppia/app/profile/AdminPinActivityTest.kt")], - test_class = "org.oppia.app.profile.AdminPinActivityTest", + srcs = [test_with_resources("src/sharedTest/java/org/oppia/android/app/profile/AdminPinActivityTest.kt")], + test_class = "org.oppia.android.app.profile.AdminPinActivityTest", deps = TEST_DEPS, ) -# TODO(#973): Fix app module tests for Roboelectric. +# TODO(#973): Fix app module tests for Robolectric. app_test( name = "PinPasswordActivityTest", - srcs = [test_with_resources("src/sharedTest/java/org/oppia/app/profile/PinPasswordActivityTest.kt")], - test_class = "org.oppia.app.profile.PinPasswordActivityTest", + srcs = [test_with_resources("src/sharedTest/java/org/oppia/android/app/profile/PinPasswordActivityTest.kt")], + test_class = "org.oppia.android.app.profile.PinPasswordActivityTest", deps = TEST_DEPS, ) -# TODO(#973): Fix app module tests for Roboelectric. +# TODO(#973): Fix app module tests for Robolectric. app_test( name = "ProfileChooserFragmentTest", - srcs = [test_with_resources("src/sharedTest/java/org/oppia/app/profile/ProfileChooserFragmentTest.kt")], - test_class = "org.oppia.app.profile.ProfileChooserFragmentTest", + srcs = [test_with_resources("src/sharedTest/java/org/oppia/android/app/profile/ProfileChooserFragmentTest.kt")], + test_class = "org.oppia.android.app.profile.ProfileChooserFragmentTest", deps = TEST_DEPS, ) app_test( name = "ProfilePictureActivityTest", - srcs = [test_with_resources("src/sharedTest/java/org/oppia/app/profileprogress/ProfilePictureActivityTest.kt")], - test_class = "org.oppia.app.profileprogress.ProfilePictureActivityTest", + srcs = [test_with_resources("src/sharedTest/java/org/oppia/android/app/profileprogress/ProfilePictureActivityTest.kt")], + test_class = "org.oppia.android.app.profileprogress.ProfilePictureActivityTest", deps = TEST_DEPS, ) app_test( name = "ProfileProgressFragmentTest", - srcs = [test_with_resources("src/sharedTest/java/org/oppia/app/profileprogress/ProfileProgressFragmentTest.kt")], - test_class = "org.oppia.app.profileprogress.ProfileProgressFragmentTest", + srcs = [test_with_resources("src/sharedTest/java/org/oppia/android/app/profileprogress/ProfileProgressFragmentTest.kt")], + test_class = "org.oppia.android.app.profileprogress.ProfileProgressFragmentTest", deps = TEST_DEPS, ) app_test( name = "BindableAdapterTest", - srcs = [test_with_resources("src/sharedTest/java/org/oppia/app/recyclerview/BindableAdapterTest.kt")], - test_class = "org.oppia.app.recyclerview.BindableAdapterTest", + srcs = [test_with_resources("src/sharedTest/java/org/oppia/android/app/recyclerview/BindableAdapterTest.kt")], + test_class = "org.oppia.android.app.recyclerview.BindableAdapterTest", deps = TEST_DEPS, ) -# TODO(#973): Fix app module tests for Roboelectric. +# TODO(#973): Fix app module tests for Robolectric. app_test( name = "ProfileEditActivityTest", - srcs = [test_with_resources("src/sharedTest/java/org/oppia/app/settings/profile/ProfileEditActivityTest.kt")], - test_class = "org.oppia.app.settings.profile.ProfileEditActivityTest", + srcs = [test_with_resources("src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileEditActivityTest.kt")], + test_class = "org.oppia.android.app.settings.profile.ProfileEditActivityTest", deps = TEST_DEPS, ) app_test( - name = "ProfileListActivityTest", - srcs = [test_with_resources("src/sharedTest/java/org/oppia/app/settings/profile/ProfileListActivityTest.kt")], - test_class = "org.oppia.app.settings.profile.ProfileListActivityTest", + name = "ProfileListFragmentTest", + srcs = [test_with_resources("src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileListFragmentTest.kt")], + test_class = "org.oppia.android.app.settings.profile.ProfileListFragmentTest", deps = TEST_DEPS, ) -# TODO(#973): Fix app module tests for Roboelectric. +# TODO(#973): Fix app module tests for Robolectric. app_test( name = "ProfileRenameActivityTest", - srcs = [test_with_resources("src/sharedTest/java/org/oppia/app/settings/profile/ProfileRenameActivityTest.kt")], - test_class = "org.oppia.app.settings.profile.ProfileRenameActivityTest", + srcs = [test_with_resources("src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileRenameActivityTest.kt")], + test_class = "org.oppia.android.app.settings.profile.ProfileRenameActivityTest", deps = TEST_DEPS, ) -# TODO(#973): Fix app module tests for Roboelectric. +# TODO(#973): Fix app module tests for Robolectric. app_test( name = "ProfileResetPinActivityTest", - srcs = [test_with_resources("src/sharedTest/java/org/oppia/app/settings/profile/ProfileResetPinActivityTest.kt")], - test_class = "org.oppia.app.settings.profile.ProfileResetPinActivityTest", + srcs = [test_with_resources("src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileResetPinActivityTest.kt")], + test_class = "org.oppia.android.app.settings.profile.ProfileResetPinActivityTest", deps = TEST_DEPS, ) app_test( name = "SplashActivityTest", - srcs = [test_with_resources("src/sharedTest/java/org/oppia/app/splash/SplashActivityTest.kt")], - test_class = "org.oppia.app.splash.SplashActivityTest", + srcs = [test_with_resources("src/sharedTest/java/org/oppia/android/app/splash/SplashActivityTest.kt")], + test_class = "org.oppia.android.app.splash.SplashActivityTest", deps = TEST_DEPS, ) app_test( name = "StoryActivityTest", - srcs = [test_with_resources("src/sharedTest/java/org/oppia/app/story/StoryActivityTest.kt")], - test_class = "org.oppia.app.story.StoryActivityTest", + srcs = [test_with_resources("src/sharedTest/java/org/oppia/android/app/story/StoryActivityTest.kt")], + test_class = "org.oppia.android.app.story.StoryActivityTest", deps = TEST_DEPS, ) app_test( name = "StoryFragmentTest", - srcs = [test_with_resources("src/sharedTest/java/org/oppia/app/story/StoryFragmentTest.kt")], - test_class = "org.oppia.app.story.StoryFragmentTest", + srcs = [test_with_resources("src/sharedTest/java/org/oppia/android/app/story/StoryFragmentTest.kt")], + test_class = "org.oppia.android.app.story.StoryFragmentTest", deps = TEST_DEPS, ) app_test( name = "DragDropTestActivityTest", - srcs = [test_with_resources("src/sharedTest/java/org/oppia/app/testing/DragDropTestActivityTest.kt")], - test_class = "org.oppia.app.testing.DragDropTestActivityTest", + srcs = [test_with_resources("src/sharedTest/java/org/oppia/android/app/testing/DragDropTestActivityTest.kt")], + test_class = "org.oppia.android.app.testing.DragDropTestActivityTest", deps = TEST_DEPS, ) -# TODO(#973): Fix app module tests for Roboelectric. +# TODO(#973): Fix app module tests for Robolectric. app_test( name = "ImageRegionSelectionInteractionViewTest", - srcs = [test_with_resources("src/sharedTest/java/org/oppia/app/testing/ImageRegionSelectionInteractionViewTest.kt")], - test_class = "org.oppia.app.testing.ImageRegionSelectionInteractionViewTest", + srcs = [test_with_resources("src/sharedTest/java/org/oppia/android/app/testing/ImageRegionSelectionInteractionViewTest.kt")], + test_class = "org.oppia.android.app.testing.ImageRegionSelectionInteractionViewTest", deps = TEST_DEPS, ) -# TODO(#973): Fix app module tests for Roboelectric. +# TODO(#973): Fix app module tests for Robolectric. app_test( name = "InputInteractionViewTestActivityTest", - srcs = [test_with_resources("src/sharedTest/java/org/oppia/app/testing/InputInteractionViewTestActivityTest.kt")], - test_class = "org.oppia.app.testing.InputInteractionViewTestActivityTest", + srcs = [test_with_resources("src/sharedTest/java/org/oppia/android/app/testing/InputInteractionViewTestActivityTest.kt")], + test_class = "org.oppia.android.app.testing.InputInteractionViewTestActivityTest", deps = TEST_DEPS, ) -# TODO(#973): Fix app module tests for Roboelectric. +# TODO(#973): Fix app module tests for Robolectric. app_test( name = "NavigationDrawerTestActivityTest", - srcs = [test_with_resources("src/sharedTest/java/org/oppia/app/testing/NavigationDrawerTestActivityTest.kt")], - test_class = "org.oppia.app.testing.NavigationDrawerTestActivityTest", + srcs = [test_with_resources("src/sharedTest/java/org/oppia/android/app/testing/NavigationDrawerTestActivityTest.kt")], + test_class = "org.oppia.android.app.testing.NavigationDrawerTestActivityTest", deps = TEST_DEPS, ) -# TODO(#973): Fix app module tests for Roboelectric. +# TODO(#973): Fix app module tests for Robolectric. app_test( name = "TestFontScaleConfigurationUtilActivityTest", - srcs = [test_with_resources("src/sharedTest/java/org/oppia/app/testing/TestFontScaleConfigurationUtilActivityTest.kt")], - test_class = "org.oppia.app.testing.TestFontScaleConfigurationUtilActivityTest", + srcs = [test_with_resources("src/sharedTest/java/org/oppia/android/app/testing/TestFontScaleConfigurationUtilActivityTest.kt")], + test_class = "org.oppia.android.app.testing.TestFontScaleConfigurationUtilActivityTest", deps = TEST_DEPS, ) -# TODO(#973): Fix app module tests for Roboelectric. +# TODO(#973): Fix app module tests for Robolectric. app_test( name = "TopicTestActivityForStoryTest", - srcs = [test_with_resources("src/sharedTest/java/org/oppia/app/testing/TopicTestActivityForStoryTest.kt")], - test_class = "org.oppia.app.testing.TopicTestActivityForStoryTest", + srcs = [test_with_resources("src/sharedTest/java/org/oppia/android/app/testing/TopicTestActivityForStoryTest.kt")], + test_class = "org.oppia.android.app.testing.TopicTestActivityForStoryTest", deps = TEST_DEPS, ) -# TODO(#973): Fix app module tests for Roboelectric. +# TODO(#973): Fix app module tests for Robolectric. app_test( name = "TopicFragmentTest", - srcs = [test_with_resources("src/sharedTest/java/org/oppia/app/topic/TopicFragmentTest.kt")], - test_class = "org.oppia.app.topic.TopicFragmentTest", + srcs = [test_with_resources("src/sharedTest/java/org/oppia/android/app/topic/TopicFragmentTest.kt")], + test_class = "org.oppia.android.app.topic.TopicFragmentTest", deps = TEST_DEPS, ) -# TODO(#973): Fix app module tests for Roboelectric. +# TODO(#973): Fix app module tests for Robolectric. app_test( name = "ConceptCardFragmentTest", - srcs = [test_with_resources("src/sharedTest/java/org/oppia/app/topic/conceptcard/ConceptCardFragmentTest.kt")], - test_class = "org.oppia.app.topic.conceptcard.ConceptCardFragmentTest", + srcs = [test_with_resources("src/sharedTest/java/org/oppia/android/app/topic/conceptcard/ConceptCardFragmentTest.kt")], + test_class = "org.oppia.android.app.topic.conceptcard.ConceptCardFragmentTest", deps = TEST_DEPS, ) -# TODO(#973): Fix app module tests for Roboelectric. +# TODO(#973): Fix app module tests for Robolectric. app_test( name = "TopicInfoFragmentTest", - srcs = [test_with_resources("src/sharedTest/java/org/oppia/app/topic/info/TopicInfoFragmentTest.kt")], - test_class = "org.oppia.app.topic.info.TopicInfoFragmentTest", + srcs = [test_with_resources("src/sharedTest/java/org/oppia/android/app/topic/info/TopicInfoFragmentTest.kt")], + test_class = "org.oppia.android.app.topic.info.TopicInfoFragmentTest", deps = TEST_DEPS, ) -# TODO(#973): Fix app module tests for Roboelectric. +# TODO(#973): Fix app module tests for Robolectric. app_test( name = "TopicLessonsFragmentTest", - srcs = [test_with_resources("src/sharedTest/java/org/oppia/app/topic/lessons/TopicLessonsFragmentTest.kt")], - test_class = "org.oppia.app.topic.lessons.TopicLessonsFragmentTest", + srcs = [test_with_resources("src/sharedTest/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentTest.kt")], + test_class = "org.oppia.android.app.topic.lessons.TopicLessonsFragmentTest", deps = TEST_DEPS, ) -# TODO(#973): Fix app module tests for Roboelectric. +# TODO(#973): Fix app module tests for Robolectric. app_test( name = "TopicPracticeFragmentTest", - srcs = [test_with_resources("src/sharedTest/java/org/oppia/app/topic/practice/TopicPracticeFragmentTest.kt")], - test_class = "org.oppia.app.topic.practice.TopicPracticeFragmentTest", + srcs = [test_with_resources("src/sharedTest/java/org/oppia/android/app/topic/practice/TopicPracticeFragmentTest.kt")], + test_class = "org.oppia.android.app.topic.practice.TopicPracticeFragmentTest", deps = TEST_DEPS, ) app_test( name = "QuestionPlayerActivityTest", - srcs = [test_with_resources("src/sharedTest/java/org/oppia/app/topic/questionplayer/QuestionPlayerActivityTest.kt")], - test_class = "org.oppia.app.topic.questionplayer.QuestionPlayerActivityTest", + srcs = [test_with_resources("src/sharedTest/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivityTest.kt")], + test_class = "org.oppia.android.app.topic.questionplayer.QuestionPlayerActivityTest", deps = TEST_DEPS, ) -# TODO(#973): Fix app module tests for Roboelectric. +# TODO(#973): Fix app module tests for Robolectric. app_test( name = "TopicRevisionFragmentTest", - srcs = [test_with_resources("src/sharedTest/java/org/oppia/app/topic/revision/TopicRevisionFragmentTest.kt")], - test_class = "org.oppia.app.topic.revision.TopicRevisionFragmentTest", + srcs = [test_with_resources("src/sharedTest/java/org/oppia/android/app/topic/revision/TopicRevisionFragmentTest.kt")], + test_class = "org.oppia.android.app.topic.revision.TopicRevisionFragmentTest", deps = TEST_DEPS, ) app_test( name = "RevisionCardFragmentTest", - srcs = [test_with_resources("src/sharedTest/java/org/oppia/app/topic/revisioncard/RevisionCardFragmentTest.kt")], - test_class = "org.oppia.app.topic.revisioncard.RevisionCardFragmentTest", + srcs = [test_with_resources("src/sharedTest/java/org/oppia/android/app/topic/revisioncard/RevisionCardFragmentTest.kt")], + test_class = "org.oppia.android.app.topic.revisioncard.RevisionCardFragmentTest", deps = TEST_DEPS, ) -# TODO(#973): Fix app module tests for Roboelectric. +# TODO(#973): Fix app module tests for Robolectric. app_test( name = "WalkthroughActivityTest", - srcs = [test_with_resources("src/sharedTest/java/org/oppia/app/walkthrough/WalkthroughActivityTest.kt")], - test_class = "org.oppia.app.walkthrough.WalkthroughActivityTest", + srcs = [test_with_resources("src/sharedTest/java/org/oppia/android/app/walkthrough/WalkthroughActivityTest.kt")], + test_class = "org.oppia.android.app.walkthrough.WalkthroughActivityTest", deps = TEST_DEPS, ) -# TODO(#973): Fix app module tests for Roboelectric. +# TODO(#973): Fix app module tests for Robolectric. app_test( name = "WalkthroughFinalFragmentTest", - srcs = [test_with_resources("src/sharedTest/java/org/oppia/app/walkthrough/WalkthroughFinalFragmentTest.kt")], - test_class = "org.oppia.app.walkthrough.WalkthroughFinalFragmentTest", + srcs = [test_with_resources("src/sharedTest/java/org/oppia/android/app/walkthrough/WalkthroughFinalFragmentTest.kt")], + test_class = "org.oppia.android.app.walkthrough.WalkthroughFinalFragmentTest", deps = TEST_DEPS, ) -# TODO(#973): Fix app module tests for Roboelectric. +# TODO(#973): Fix app module tests for Robolectric. app_test( name = "WalkthroughTopicListFragmentTest", - srcs = [test_with_resources("src/sharedTest/java/org/oppia/app/walkthrough/WalkthroughTopicListFragmentTest.kt")], - test_class = "org.oppia.app.walkthrough.WalkthroughTopicListFragmentTest", + srcs = [test_with_resources("src/sharedTest/java/org/oppia/android/app/walkthrough/WalkthroughTopicListFragmentTest.kt")], + test_class = "org.oppia.android.app.walkthrough.WalkthroughTopicListFragmentTest", deps = TEST_DEPS, ) app_test( name = "WalkthroughWelcomeFragmentTest", - srcs = [test_with_resources("src/sharedTest/java/org/oppia/app/walkthrough/WalkthroughWelcomeFragmentTest.kt")], - test_class = "org.oppia.app.walkthrough.WalkthroughWelcomeFragmentTest", + srcs = [test_with_resources("src/sharedTest/java/org/oppia/android/app/walkthrough/WalkthroughWelcomeFragmentTest.kt")], + test_class = "org.oppia.android.app.walkthrough.WalkthroughWelcomeFragmentTest", deps = TEST_DEPS, ) # TODO(#1566): Move Firebase rules to their own package & remove default visibility -''' +""" Package for all Firebase dependencies. To reference these dependencies, add '//app:crashlytics' and '//app:crashlytics_deps' to your build rule's dependency list. -''' +""" + package(default_visibility = ["//visibility:public"]) GOOGLE_SERVICES_RESOURCES = google_services_xml( - package_name = "org.oppia.app", + package_name = "org.oppia.android", google_services_json = "google-services.json", ) crashlytics_android_library( name = "crashlytics", - package_name = "org.oppia.app", + package_name = "org.oppia.android", build_id = "48fc9d17-e102-444c-8e0d-638d75ec0942", resource_files = GOOGLE_SERVICES_RESOURCES, ) diff --git a/app/app_test.bzl b/app/app_test.bzl index 6180e96c037..1409042ac8b 100644 --- a/app/app_test.bzl +++ b/app/app_test.bzl @@ -1,23 +1,25 @@ load("//:oppia_android_test.bzl", "oppia_android_test") + # TODO(#1620): Remove module-specific test macros once Gradle is removed -def app_test(name, srcs, test_class, deps): - ''' - Creates individual tests for test files in the app module. +def app_test(name, srcs, test_class, deps, **kwargs): + ''' + Creates individual tests for test files in the app module. - Args: - name: str. The name of the Kotlin test file without the '.kt' suffix. - src: list of str. The list of test files to be run. - test_class: str. The package of the src file. Example: If the src is 'FakeEventLoggerTest.kt', - then the test_class would be "org.oppia.testing.FakeEventLoggerTest". - deps: list of str. The list of dependencies needed to build and run this test. - ''' + Args: + name: str. The name of the Kotlin test file without the '.kt' suffix. + src: list of str. The list of test files to be run. + test_class: str. The package of the src file. Example: If the src is 'FakeEventLoggerTest.kt', + then the test_class would be "org.oppia.testing.FakeEventLoggerTest". + deps: list of str. The list of dependencies needed to build and run this test. + ''' - oppia_android_test( - name = name, - srcs = srcs + ["src/test/java/DataBinderMapperImpl.java"], - custom_package = "org.oppia.app.test", - test_class = test_class, - test_manifest = "src/test/AndroidManifest.xml", - deps = deps, - enable_data_binding = True, - ) + oppia_android_test( + name = name, + srcs = srcs + ["src/test/java/DataBinderMapperImpl.java"], + custom_package = "org.oppia.android.app.test", + test_class = test_class, + test_manifest = "src/test/AndroidManifest.xml", + deps = deps, + enable_data_binding = True, + **kwargs + ) diff --git a/app/build.gradle b/app/build.gradle index 84291d6ba5f..1c033484f0b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,13 +9,13 @@ android { compileSdkVersion 29 buildToolsVersion "29.0.2" defaultConfig { - applicationId "org.oppia.app" + applicationId "org.oppia.android" minSdkVersion 19 targetSdkVersion 29 versionCode 4 versionName "0.4-alpha-94fc517da5" multiDexEnabled true - testInstrumentationRunner "org.oppia.testing.OppiaTestRunner" + testInstrumentationRunner "org.oppia.android.testing.OppiaTestRunner" // https://developer.android.com/training/testing/junit-runner#ato-gradle testInstrumentationRunnerArguments clearPackageData: 'true' javaCompileOptions { diff --git a/app/google-services.json b/app/google-services.json index 5b1dc0f6672..2a75406af37 100644 --- a/app/google-services.json +++ b/app/google-services.json @@ -8,9 +8,9 @@ "client": [ { "client_info": { - "mobilesdk_app_id": "1:215533462679:android:a25a70347460cd014035d2", + "mobilesdk_app_id": "1:215533462679:android:41398480f14f22c24035d2", "android_client_info": { - "package_name": "org.oppia.app" + "package_name": "org.oppia.android" } }, "oauth_client": [ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 3701dcf2062..374f0a8c75d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,12 +1,11 @@ + package="org.oppia.android"> - - + - + @@ -115,49 +114,49 @@ - - - - - - + + + + + + - - - - - + + + + + - + diff --git a/app/src/main/AppAndroidManifest.xml b/app/src/main/AppAndroidManifest.xml index ea8ad561f07..51b7ff8b641 100644 --- a/app/src/main/AppAndroidManifest.xml +++ b/app/src/main/AppAndroidManifest.xml @@ -1,5 +1,5 @@ + package="org.oppia.android.app.ui"> diff --git a/app/src/main/DatabindingAdaptersManifest.xml b/app/src/main/DatabindingAdaptersManifest.xml index 8af9451619e..8c155399f43 100644 --- a/app/src/main/DatabindingAdaptersManifest.xml +++ b/app/src/main/DatabindingAdaptersManifest.xml @@ -1,5 +1,5 @@ + package="org.oppia.android.databinding.adapters"> diff --git a/app/src/main/DatabindingResourcesManifest.xml b/app/src/main/DatabindingResourcesManifest.xml index 26a8d90e4f0..8cc32b74508 100644 --- a/app/src/main/DatabindingResourcesManifest.xml +++ b/app/src/main/DatabindingResourcesManifest.xml @@ -1,5 +1,5 @@ + package="org.oppia.android.app.databinding"> diff --git a/app/src/main/RecyclerviewAdaptersManifest.xml b/app/src/main/RecyclerviewAdaptersManifest.xml index 3b755820d93..361df363835 100644 --- a/app/src/main/RecyclerviewAdaptersManifest.xml +++ b/app/src/main/RecyclerviewAdaptersManifest.xml @@ -1,5 +1,5 @@ + package="org.oppia.android.app.recyclerview.adapters"> diff --git a/app/src/main/ViewModelManifest.xml b/app/src/main/ViewModelManifest.xml index 10dc9585622..edfb0810736 100644 --- a/app/src/main/ViewModelManifest.xml +++ b/app/src/main/ViewModelManifest.xml @@ -1,7 +1,7 @@ + package="org.oppia.android.app.vm"> diff --git a/app/src/main/ViewModelsManifest.xml b/app/src/main/ViewModelsManifest.xml index 167bc3587ac..791f75c827e 100644 --- a/app/src/main/ViewModelsManifest.xml +++ b/app/src/main/ViewModelsManifest.xml @@ -1,7 +1,7 @@ + package="org.oppia.android.app.view.models"> diff --git a/app/src/main/ViewsManifest.xml b/app/src/main/ViewsManifest.xml index 0b89c5bf0fd..91e1bfa94f0 100644 --- a/app/src/main/ViewsManifest.xml +++ b/app/src/main/ViewsManifest.xml @@ -1,7 +1,7 @@ + package="org.oppia.android.app.views"> diff --git a/app/src/main/java/org/oppia/android/app/activity/ActivityComponent.kt b/app/src/main/java/org/oppia/android/app/activity/ActivityComponent.kt index 3f619cd1496..f902371a260 100644 --- a/app/src/main/java/org/oppia/android/app/activity/ActivityComponent.kt +++ b/app/src/main/java/org/oppia/android/app/activity/ActivityComponent.kt @@ -1,60 +1,60 @@ -package org.oppia.app.activity +package org.oppia.android.app.activity import androidx.appcompat.app.AppCompatActivity import dagger.BindsInstance import dagger.Subcomponent -import org.oppia.app.administratorcontrols.AdministratorControlsActivity -import org.oppia.app.administratorcontrols.appversion.AppVersionActivity -import org.oppia.app.completedstorylist.CompletedStoryListActivity -import org.oppia.app.fragment.FragmentComponent -import org.oppia.app.help.HelpActivity -import org.oppia.app.help.faq.FAQListActivity -import org.oppia.app.help.faq.faqsingle.FAQSingleActivity -import org.oppia.app.home.HomeActivity -import org.oppia.app.home.recentlyplayed.RecentlyPlayedActivity -import org.oppia.app.mydownloads.MyDownloadsActivity -import org.oppia.app.onboarding.OnboardingActivity -import org.oppia.app.ongoingtopiclist.OngoingTopicListActivity -import org.oppia.app.options.AppLanguageActivity -import org.oppia.app.options.DefaultAudioActivity -import org.oppia.app.options.OptionsActivity -import org.oppia.app.options.ReadingTextSizeActivity -import org.oppia.app.player.exploration.ExplorationActivity -import org.oppia.app.player.state.testing.StateFragmentTestActivity -import org.oppia.app.profile.AddProfileActivity -import org.oppia.app.profile.AdminAuthActivity -import org.oppia.app.profile.AdminPinActivity -import org.oppia.app.profile.PinPasswordActivity -import org.oppia.app.profile.ProfileChooserActivity -import org.oppia.app.profileprogress.ProfilePictureActivity -import org.oppia.app.profileprogress.ProfileProgressActivity -import org.oppia.app.settings.profile.ProfileEditActivity -import org.oppia.app.settings.profile.ProfileListActivity -import org.oppia.app.settings.profile.ProfileRenameActivity -import org.oppia.app.settings.profile.ProfileResetPinActivity -import org.oppia.app.splash.SplashActivity -import org.oppia.app.story.StoryActivity -import org.oppia.app.testing.AudioFragmentTestActivity -import org.oppia.app.testing.BindableAdapterTestActivity -import org.oppia.app.testing.ConceptCardFragmentTestActivity -import org.oppia.app.testing.DragDropTestActivity -import org.oppia.app.testing.ExplorationInjectionActivity -import org.oppia.app.testing.ExplorationTestActivity -import org.oppia.app.testing.HomeInjectionActivity -import org.oppia.app.testing.HomeTestActivity -import org.oppia.app.testing.HtmlParserTestActivity -import org.oppia.app.testing.ImageRegionSelectionTestActivity -import org.oppia.app.testing.NavigationDrawerTestActivity -import org.oppia.app.testing.ProfileChooserFragmentTestActivity -import org.oppia.app.testing.StoryFragmentTestActivity -import org.oppia.app.testing.TestFontScaleConfigurationUtilActivity -import org.oppia.app.testing.TopicRevisionTestActivity -import org.oppia.app.testing.TopicTestActivity -import org.oppia.app.testing.TopicTestActivityForStory -import org.oppia.app.topic.TopicActivity -import org.oppia.app.topic.questionplayer.QuestionPlayerActivity -import org.oppia.app.topic.revisioncard.RevisionCardActivity -import org.oppia.app.walkthrough.WalkthroughActivity +import org.oppia.android.app.administratorcontrols.AdministratorControlsActivity +import org.oppia.android.app.administratorcontrols.appversion.AppVersionActivity +import org.oppia.android.app.completedstorylist.CompletedStoryListActivity +import org.oppia.android.app.fragment.FragmentComponent +import org.oppia.android.app.help.HelpActivity +import org.oppia.android.app.help.faq.FAQListActivity +import org.oppia.android.app.help.faq.faqsingle.FAQSingleActivity +import org.oppia.android.app.home.HomeActivity +import org.oppia.android.app.home.recentlyplayed.RecentlyPlayedActivity +import org.oppia.android.app.mydownloads.MyDownloadsActivity +import org.oppia.android.app.onboarding.OnboardingActivity +import org.oppia.android.app.ongoingtopiclist.OngoingTopicListActivity +import org.oppia.android.app.options.AppLanguageActivity +import org.oppia.android.app.options.DefaultAudioActivity +import org.oppia.android.app.options.OptionsActivity +import org.oppia.android.app.options.ReadingTextSizeActivity +import org.oppia.android.app.player.exploration.ExplorationActivity +import org.oppia.android.app.player.state.testing.StateFragmentTestActivity +import org.oppia.android.app.profile.AddProfileActivity +import org.oppia.android.app.profile.AdminAuthActivity +import org.oppia.android.app.profile.AdminPinActivity +import org.oppia.android.app.profile.PinPasswordActivity +import org.oppia.android.app.profile.ProfileChooserActivity +import org.oppia.android.app.profileprogress.ProfilePictureActivity +import org.oppia.android.app.profileprogress.ProfileProgressActivity +import org.oppia.android.app.settings.profile.ProfileEditActivity +import org.oppia.android.app.settings.profile.ProfileListActivity +import org.oppia.android.app.settings.profile.ProfileRenameActivity +import org.oppia.android.app.settings.profile.ProfileResetPinActivity +import org.oppia.android.app.splash.SplashActivity +import org.oppia.android.app.story.StoryActivity +import org.oppia.android.app.testing.AudioFragmentTestActivity +import org.oppia.android.app.testing.BindableAdapterTestActivity +import org.oppia.android.app.testing.ConceptCardFragmentTestActivity +import org.oppia.android.app.testing.DragDropTestActivity +import org.oppia.android.app.testing.ExplorationInjectionActivity +import org.oppia.android.app.testing.ExplorationTestActivity +import org.oppia.android.app.testing.HomeInjectionActivity +import org.oppia.android.app.testing.HomeTestActivity +import org.oppia.android.app.testing.HtmlParserTestActivity +import org.oppia.android.app.testing.ImageRegionSelectionTestActivity +import org.oppia.android.app.testing.NavigationDrawerTestActivity +import org.oppia.android.app.testing.ProfileChooserFragmentTestActivity +import org.oppia.android.app.testing.StoryFragmentTestActivity +import org.oppia.android.app.testing.TestFontScaleConfigurationUtilActivity +import org.oppia.android.app.testing.TopicRevisionTestActivity +import org.oppia.android.app.testing.TopicTestActivity +import org.oppia.android.app.testing.TopicTestActivityForStory +import org.oppia.android.app.topic.TopicActivity +import org.oppia.android.app.topic.questionplayer.QuestionPlayerActivity +import org.oppia.android.app.topic.revisioncard.RevisionCardActivity +import org.oppia.android.app.walkthrough.WalkthroughActivity import javax.inject.Provider /** Root subcomponent for all activities. */ diff --git a/app/src/main/java/org/oppia/android/app/activity/ActivityModule.kt b/app/src/main/java/org/oppia/android/app/activity/ActivityModule.kt index e459bc8a012..b5121ad7415 100644 --- a/app/src/main/java/org/oppia/android/app/activity/ActivityModule.kt +++ b/app/src/main/java/org/oppia/android/app/activity/ActivityModule.kt @@ -1,7 +1,7 @@ -package org.oppia.app.activity +package org.oppia.android.app.activity import dagger.Module -import org.oppia.app.fragment.FragmentComponent +import org.oppia.android.app.fragment.FragmentComponent /** Root activity module. */ @Module(subcomponents = [FragmentComponent::class]) diff --git a/app/src/main/java/org/oppia/android/app/activity/ActivityScope.kt b/app/src/main/java/org/oppia/android/app/activity/ActivityScope.kt index 4d8283fa75d..71eb245220d 100644 --- a/app/src/main/java/org/oppia/android/app/activity/ActivityScope.kt +++ b/app/src/main/java/org/oppia/android/app/activity/ActivityScope.kt @@ -1,4 +1,4 @@ -package org.oppia.app.activity +package org.oppia.android.app.activity import javax.inject.Scope diff --git a/app/src/main/java/org/oppia/android/app/activity/InjectableAppCompatActivity.kt b/app/src/main/java/org/oppia/android/app/activity/InjectableAppCompatActivity.kt index cf7f241a43e..c4214c8c187 100644 --- a/app/src/main/java/org/oppia/android/app/activity/InjectableAppCompatActivity.kt +++ b/app/src/main/java/org/oppia/android/app/activity/InjectableAppCompatActivity.kt @@ -1,15 +1,15 @@ -package org.oppia.app.activity +package org.oppia.android.app.activity import android.os.Bundle import android.os.PersistableBundle import androidx.appcompat.app.AppCompatActivity import androidx.fragment.app.Fragment -import org.oppia.app.application.ActivityComponentFactory -import org.oppia.app.fragment.FragmentComponent +import org.oppia.android.app.application.ActivityComponentFactory +import org.oppia.android.app.fragment.FragmentComponent /** * An [AppCompatActivity] that facilitates field injection to child activities and constituent fragments that extend - * [org.oppia.app.fragment.InjectableFragment]. + * [org.oppia.android.app.fragment.InjectableFragment]. */ abstract class InjectableAppCompatActivity : AppCompatActivity() { /** diff --git a/app/src/main/java/org/oppia/android/app/administratorcontrols/AdministratorControlsActivity.kt b/app/src/main/java/org/oppia/android/app/administratorcontrols/AdministratorControlsActivity.kt index 742fef79b31..892593408e3 100644 --- a/app/src/main/java/org/oppia/android/app/administratorcontrols/AdministratorControlsActivity.kt +++ b/app/src/main/java/org/oppia/android/app/administratorcontrols/AdministratorControlsActivity.kt @@ -1,14 +1,14 @@ -package org.oppia.app.administratorcontrols +package org.oppia.android.app.administratorcontrols import android.content.Context import android.content.Intent import android.os.Bundle import android.view.Menu -import org.oppia.app.R -import org.oppia.app.activity.InjectableAppCompatActivity -import org.oppia.app.administratorcontrols.appversion.AppVersionActivity -import org.oppia.app.drawer.KEY_NAVIGATION_PROFILE_ID -import org.oppia.app.settings.profile.ProfileListActivity +import org.oppia.android.R +import org.oppia.android.app.activity.InjectableAppCompatActivity +import org.oppia.android.app.administratorcontrols.appversion.AppVersionActivity +import org.oppia.android.app.drawer.KEY_NAVIGATION_PROFILE_ID +import org.oppia.android.app.settings.profile.ProfileListActivity import javax.inject.Inject const val SELECTED_CONTROLS_TITLE_KEY = "SELECTED_CONTROLS_TITLE_KEY" diff --git a/app/src/main/java/org/oppia/android/app/administratorcontrols/AdministratorControlsActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/administratorcontrols/AdministratorControlsActivityPresenter.kt index 90574a60b5e..2c92efbe5dd 100644 --- a/app/src/main/java/org/oppia/android/app/administratorcontrols/AdministratorControlsActivityPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/administratorcontrols/AdministratorControlsActivityPresenter.kt @@ -1,15 +1,15 @@ -package org.oppia.app.administratorcontrols +package org.oppia.android.app.administratorcontrols import android.os.Bundle import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.widget.Toolbar import androidx.databinding.DataBindingUtil -import org.oppia.app.R -import org.oppia.app.activity.ActivityScope -import org.oppia.app.administratorcontrols.appversion.AppVersionFragment -import org.oppia.app.databinding.AdministratorControlsActivityBinding -import org.oppia.app.drawer.NavigationDrawerFragment -import org.oppia.app.settings.profile.ProfileListFragment +import org.oppia.android.R +import org.oppia.android.app.activity.ActivityScope +import org.oppia.android.app.administratorcontrols.appversion.AppVersionFragment +import org.oppia.android.app.drawer.NavigationDrawerFragment +import org.oppia.android.app.settings.profile.ProfileListFragment +import org.oppia.android.databinding.AdministratorControlsActivityBinding import javax.inject.Inject /** The presenter for [AdministratorControlsActivity]. */ diff --git a/app/src/main/java/org/oppia/android/app/administratorcontrols/AdministratorControlsFragment.kt b/app/src/main/java/org/oppia/android/app/administratorcontrols/AdministratorControlsFragment.kt index 5991a2f6e7a..e0052cc872b 100644 --- a/app/src/main/java/org/oppia/android/app/administratorcontrols/AdministratorControlsFragment.kt +++ b/app/src/main/java/org/oppia/android/app/administratorcontrols/AdministratorControlsFragment.kt @@ -1,11 +1,11 @@ -package org.oppia.app.administratorcontrols +package org.oppia.android.app.administratorcontrols import android.content.Context import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import org.oppia.app.fragment.InjectableFragment +import org.oppia.android.app.fragment.InjectableFragment import javax.inject.Inject /** Fragment that contains Administrator Controls of the application. */ diff --git a/app/src/main/java/org/oppia/android/app/administratorcontrols/AdministratorControlsFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/administratorcontrols/AdministratorControlsFragmentPresenter.kt index 3b29a1fbc4a..9de4a6fa2fc 100644 --- a/app/src/main/java/org/oppia/android/app/administratorcontrols/AdministratorControlsFragmentPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/administratorcontrols/AdministratorControlsFragmentPresenter.kt @@ -1,4 +1,4 @@ -package org.oppia.app.administratorcontrols +package org.oppia.android.app.administratorcontrols import android.view.LayoutInflater import android.view.View @@ -6,22 +6,22 @@ import android.view.ViewGroup import androidx.appcompat.app.AppCompatActivity import androidx.fragment.app.Fragment import androidx.recyclerview.widget.LinearLayoutManager -import org.oppia.app.administratorcontrols.administratorcontrolsitemviewmodel.AdministratorControlsAccountActionsViewModel -import org.oppia.app.administratorcontrols.administratorcontrolsitemviewmodel.AdministratorControlsAppInformationViewModel -import org.oppia.app.administratorcontrols.administratorcontrolsitemviewmodel.AdministratorControlsDownloadPermissionsViewModel -import org.oppia.app.administratorcontrols.administratorcontrolsitemviewmodel.AdministratorControlsGeneralViewModel -import org.oppia.app.administratorcontrols.administratorcontrolsitemviewmodel.AdministratorControlsItemViewModel -import org.oppia.app.administratorcontrols.administratorcontrolsitemviewmodel.AdministratorControlsProfileViewModel -import org.oppia.app.databinding.AdministratorControlsAccountActionsViewBinding -import org.oppia.app.databinding.AdministratorControlsAppInformationViewBinding -import org.oppia.app.databinding.AdministratorControlsDownloadPermissionsViewBinding -import org.oppia.app.databinding.AdministratorControlsFragmentBinding -import org.oppia.app.databinding.AdministratorControlsGeneralViewBinding -import org.oppia.app.databinding.AdministratorControlsProfileViewBinding -import org.oppia.app.drawer.KEY_NAVIGATION_PROFILE_ID -import org.oppia.app.fragment.FragmentScope -import org.oppia.app.model.ProfileId -import org.oppia.app.recyclerview.BindableAdapter +import org.oppia.android.app.administratorcontrols.administratorcontrolsitemviewmodel.AdministratorControlsAccountActionsViewModel +import org.oppia.android.app.administratorcontrols.administratorcontrolsitemviewmodel.AdministratorControlsAppInformationViewModel +import org.oppia.android.app.administratorcontrols.administratorcontrolsitemviewmodel.AdministratorControlsDownloadPermissionsViewModel +import org.oppia.android.app.administratorcontrols.administratorcontrolsitemviewmodel.AdministratorControlsGeneralViewModel +import org.oppia.android.app.administratorcontrols.administratorcontrolsitemviewmodel.AdministratorControlsItemViewModel +import org.oppia.android.app.administratorcontrols.administratorcontrolsitemviewmodel.AdministratorControlsProfileViewModel +import org.oppia.android.app.drawer.KEY_NAVIGATION_PROFILE_ID +import org.oppia.android.app.fragment.FragmentScope +import org.oppia.android.app.model.ProfileId +import org.oppia.android.app.recyclerview.BindableAdapter +import org.oppia.android.databinding.AdministratorControlsAccountActionsViewBinding +import org.oppia.android.databinding.AdministratorControlsAppInformationViewBinding +import org.oppia.android.databinding.AdministratorControlsDownloadPermissionsViewBinding +import org.oppia.android.databinding.AdministratorControlsFragmentBinding +import org.oppia.android.databinding.AdministratorControlsGeneralViewBinding +import org.oppia.android.databinding.AdministratorControlsProfileViewBinding import java.security.InvalidParameterException import javax.inject.Inject diff --git a/app/src/main/java/org/oppia/android/app/administratorcontrols/AdministratorControlsViewModel.kt b/app/src/main/java/org/oppia/android/app/administratorcontrols/AdministratorControlsViewModel.kt index 6fbbdef9262..e497e6805a5 100644 --- a/app/src/main/java/org/oppia/android/app/administratorcontrols/AdministratorControlsViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/administratorcontrols/AdministratorControlsViewModel.kt @@ -1,4 +1,4 @@ -package org.oppia.app.administratorcontrols +package org.oppia.android.app.administratorcontrols import androidx.appcompat.app.AppCompatActivity import androidx.databinding.ObservableField @@ -6,19 +6,19 @@ import androidx.fragment.app.Fragment import androidx.lifecycle.LiveData import androidx.lifecycle.Transformations import androidx.lifecycle.ViewModel -import org.oppia.app.administratorcontrols.administratorcontrolsitemviewmodel.AdministratorControlsAccountActionsViewModel -import org.oppia.app.administratorcontrols.administratorcontrolsitemviewmodel.AdministratorControlsAppInformationViewModel -import org.oppia.app.administratorcontrols.administratorcontrolsitemviewmodel.AdministratorControlsDownloadPermissionsViewModel -import org.oppia.app.administratorcontrols.administratorcontrolsitemviewmodel.AdministratorControlsGeneralViewModel -import org.oppia.app.administratorcontrols.administratorcontrolsitemviewmodel.AdministratorControlsItemViewModel -import org.oppia.app.administratorcontrols.administratorcontrolsitemviewmodel.AdministratorControlsProfileViewModel -import org.oppia.app.fragment.FragmentScope -import org.oppia.app.model.DeviceSettings -import org.oppia.app.model.ProfileId -import org.oppia.app.shim.IntentFactoryShim -import org.oppia.domain.profile.ProfileManagementController -import org.oppia.util.data.AsyncResult -import org.oppia.util.logging.ConsoleLogger +import org.oppia.android.app.administratorcontrols.administratorcontrolsitemviewmodel.AdministratorControlsAccountActionsViewModel +import org.oppia.android.app.administratorcontrols.administratorcontrolsitemviewmodel.AdministratorControlsAppInformationViewModel +import org.oppia.android.app.administratorcontrols.administratorcontrolsitemviewmodel.AdministratorControlsDownloadPermissionsViewModel +import org.oppia.android.app.administratorcontrols.administratorcontrolsitemviewmodel.AdministratorControlsGeneralViewModel +import org.oppia.android.app.administratorcontrols.administratorcontrolsitemviewmodel.AdministratorControlsItemViewModel +import org.oppia.android.app.administratorcontrols.administratorcontrolsitemviewmodel.AdministratorControlsProfileViewModel +import org.oppia.android.app.fragment.FragmentScope +import org.oppia.android.app.model.DeviceSettings +import org.oppia.android.app.model.ProfileId +import org.oppia.android.app.shim.IntentFactoryShim +import org.oppia.android.domain.profile.ProfileManagementController +import org.oppia.android.util.data.AsyncResult +import org.oppia.android.util.logging.ConsoleLogger import javax.inject.Inject /** [ViewModel] for [AdministratorControlsFragment]. */ diff --git a/app/src/main/java/org/oppia/android/app/administratorcontrols/LoadAppVersionListener.kt b/app/src/main/java/org/oppia/android/app/administratorcontrols/LoadAppVersionListener.kt index 96e1c77e9a6..e16a44a31c6 100644 --- a/app/src/main/java/org/oppia/android/app/administratorcontrols/LoadAppVersionListener.kt +++ b/app/src/main/java/org/oppia/android/app/administratorcontrols/LoadAppVersionListener.kt @@ -1,4 +1,4 @@ -package org.oppia.app.administratorcontrols +package org.oppia.android.app.administratorcontrols /** Listener for when an activity should load [AppVersionFragment]. */ interface LoadAppVersionListener { diff --git a/app/src/main/java/org/oppia/android/app/administratorcontrols/LoadProfileListListener.kt b/app/src/main/java/org/oppia/android/app/administratorcontrols/LoadProfileListListener.kt index e5dcfae56c7..64cba0aa4eb 100644 --- a/app/src/main/java/org/oppia/android/app/administratorcontrols/LoadProfileListListener.kt +++ b/app/src/main/java/org/oppia/android/app/administratorcontrols/LoadProfileListListener.kt @@ -1,4 +1,4 @@ -package org.oppia.app.administratorcontrols +package org.oppia.android.app.administratorcontrols /** Listener for when an activity should load [ProfileListFragment]. */ interface LoadProfileListListener { diff --git a/app/src/main/java/org/oppia/android/app/administratorcontrols/RouteToAppVersionListener.kt b/app/src/main/java/org/oppia/android/app/administratorcontrols/RouteToAppVersionListener.kt index e970d62609f..4b42abed38a 100644 --- a/app/src/main/java/org/oppia/android/app/administratorcontrols/RouteToAppVersionListener.kt +++ b/app/src/main/java/org/oppia/android/app/administratorcontrols/RouteToAppVersionListener.kt @@ -1,4 +1,4 @@ -package org.oppia.app.administratorcontrols +package org.oppia.android.app.administratorcontrols /** Listener for when an activity should route to App Version. */ interface RouteToAppVersionListener { diff --git a/app/src/main/java/org/oppia/android/app/administratorcontrols/RouteToProfileListListener.kt b/app/src/main/java/org/oppia/android/app/administratorcontrols/RouteToProfileListListener.kt index bde0b6f6add..c63372027e8 100644 --- a/app/src/main/java/org/oppia/android/app/administratorcontrols/RouteToProfileListListener.kt +++ b/app/src/main/java/org/oppia/android/app/administratorcontrols/RouteToProfileListListener.kt @@ -1,4 +1,4 @@ -package org.oppia.app.administratorcontrols +package org.oppia.android.app.administratorcontrols /** Listener for when an activity should route to a exploration. */ interface RouteToProfileListListener { diff --git a/app/src/main/java/org/oppia/android/app/administratorcontrols/administratorcontrolsitemviewmodel/AdministratorControlsAccountActionsViewModel.kt b/app/src/main/java/org/oppia/android/app/administratorcontrols/administratorcontrolsitemviewmodel/AdministratorControlsAccountActionsViewModel.kt index 99930f35c6f..4deacd49620 100644 --- a/app/src/main/java/org/oppia/android/app/administratorcontrols/administratorcontrolsitemviewmodel/AdministratorControlsAccountActionsViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/administratorcontrols/administratorcontrolsitemviewmodel/AdministratorControlsAccountActionsViewModel.kt @@ -1,10 +1,10 @@ -package org.oppia.app.administratorcontrols.administratorcontrolsitemviewmodel +package org.oppia.android.app.administratorcontrols.administratorcontrolsitemviewmodel import android.content.Intent import androidx.appcompat.app.AlertDialog import androidx.fragment.app.Fragment -import org.oppia.app.R -import org.oppia.app.shim.IntentFactoryShim +import org.oppia.android.R +import org.oppia.android.app.shim.IntentFactoryShim /** [ViewModel] for the recycler view in [AdministratorControlsFragment]. */ class AdministratorControlsAccountActionsViewModel( diff --git a/app/src/main/java/org/oppia/android/app/administratorcontrols/administratorcontrolsitemviewmodel/AdministratorControlsAppInformationViewModel.kt b/app/src/main/java/org/oppia/android/app/administratorcontrols/administratorcontrolsitemviewmodel/AdministratorControlsAppInformationViewModel.kt index 100165822d8..9dc2454c3b2 100644 --- a/app/src/main/java/org/oppia/android/app/administratorcontrols/administratorcontrolsitemviewmodel/AdministratorControlsAppInformationViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/administratorcontrols/administratorcontrolsitemviewmodel/AdministratorControlsAppInformationViewModel.kt @@ -1,8 +1,8 @@ -package org.oppia.app.administratorcontrols.administratorcontrolsitemviewmodel +package org.oppia.android.app.administratorcontrols.administratorcontrolsitemviewmodel import androidx.appcompat.app.AppCompatActivity -import org.oppia.app.administratorcontrols.LoadAppVersionListener -import org.oppia.app.administratorcontrols.RouteToAppVersionListener +import org.oppia.android.app.administratorcontrols.LoadAppVersionListener +import org.oppia.android.app.administratorcontrols.RouteToAppVersionListener /** [ViewModel] for the recycler view in [AdministratorControlsFragment]. */ class AdministratorControlsAppInformationViewModel( diff --git a/app/src/main/java/org/oppia/android/app/administratorcontrols/administratorcontrolsitemviewmodel/AdministratorControlsDownloadPermissionsViewModel.kt b/app/src/main/java/org/oppia/android/app/administratorcontrols/administratorcontrolsitemviewmodel/AdministratorControlsDownloadPermissionsViewModel.kt index 264eb78d7bb..88ca5539c78 100644 --- a/app/src/main/java/org/oppia/android/app/administratorcontrols/administratorcontrolsitemviewmodel/AdministratorControlsDownloadPermissionsViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/administratorcontrols/administratorcontrolsitemviewmodel/AdministratorControlsDownloadPermissionsViewModel.kt @@ -1,13 +1,12 @@ -package org.oppia.app.administratorcontrols.administratorcontrolsitemviewmodel +package org.oppia.android.app.administratorcontrols.administratorcontrolsitemviewmodel import androidx.databinding.ObservableField import androidx.fragment.app.Fragment import androidx.lifecycle.Observer -import org.oppia.app.model.DeviceSettings -import org.oppia.app.model.ProfileId -import org.oppia.domain.profile.ProfileManagementController -import org.oppia.util.logging.ConsoleLogger - +import org.oppia.android.app.model.DeviceSettings +import org.oppia.android.app.model.ProfileId +import org.oppia.android.domain.profile.ProfileManagementController +import org.oppia.android.util.logging.ConsoleLogger /** [ViewModel] for the recycler view in [AdministratorControlsFragment]. */ class AdministratorControlsDownloadPermissionsViewModel( private val fragment: Fragment, diff --git a/app/src/main/java/org/oppia/android/app/administratorcontrols/administratorcontrolsitemviewmodel/AdministratorControlsGeneralViewModel.kt b/app/src/main/java/org/oppia/android/app/administratorcontrols/administratorcontrolsitemviewmodel/AdministratorControlsGeneralViewModel.kt index 7b9635e34de..d98b52afb32 100644 --- a/app/src/main/java/org/oppia/android/app/administratorcontrols/administratorcontrolsitemviewmodel/AdministratorControlsGeneralViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/administratorcontrols/administratorcontrolsitemviewmodel/AdministratorControlsGeneralViewModel.kt @@ -1,4 +1,4 @@ -package org.oppia.app.administratorcontrols.administratorcontrolsitemviewmodel +package org.oppia.android.app.administratorcontrols.administratorcontrolsitemviewmodel /** [ViewModel] for the recycler view in [AdministratorControlsFragment]. */ class AdministratorControlsGeneralViewModel : AdministratorControlsItemViewModel() diff --git a/app/src/main/java/org/oppia/android/app/administratorcontrols/administratorcontrolsitemviewmodel/AdministratorControlsItemViewModel.kt b/app/src/main/java/org/oppia/android/app/administratorcontrols/administratorcontrolsitemviewmodel/AdministratorControlsItemViewModel.kt index 9c4c53e220c..3119fa85c2b 100644 --- a/app/src/main/java/org/oppia/android/app/administratorcontrols/administratorcontrolsitemviewmodel/AdministratorControlsItemViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/administratorcontrols/administratorcontrolsitemviewmodel/AdministratorControlsItemViewModel.kt @@ -1,7 +1,7 @@ -package org.oppia.app.administratorcontrols.administratorcontrolsitemviewmodel +package org.oppia.android.app.administratorcontrols.administratorcontrolsitemviewmodel import androidx.databinding.ObservableField -import org.oppia.app.viewmodel.ObservableViewModel +import org.oppia.android.app.viewmodel.ObservableViewModel /** Super-class for generalising different views for the recyclerView in [AdministratorControlsFragment] */ abstract class AdministratorControlsItemViewModel : ObservableViewModel() { diff --git a/app/src/main/java/org/oppia/android/app/administratorcontrols/administratorcontrolsitemviewmodel/AdministratorControlsProfileViewModel.kt b/app/src/main/java/org/oppia/android/app/administratorcontrols/administratorcontrolsitemviewmodel/AdministratorControlsProfileViewModel.kt index f53e9398a57..c193763c0d9 100644 --- a/app/src/main/java/org/oppia/android/app/administratorcontrols/administratorcontrolsitemviewmodel/AdministratorControlsProfileViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/administratorcontrols/administratorcontrolsitemviewmodel/AdministratorControlsProfileViewModel.kt @@ -1,7 +1,7 @@ -package org.oppia.app.administratorcontrols.administratorcontrolsitemviewmodel +package org.oppia.android.app.administratorcontrols.administratorcontrolsitemviewmodel -import org.oppia.app.administratorcontrols.LoadProfileListListener -import org.oppia.app.administratorcontrols.RouteToProfileListListener +import org.oppia.android.app.administratorcontrols.LoadProfileListListener +import org.oppia.android.app.administratorcontrols.RouteToProfileListListener /** [ViewModel] for the recycler view in [AdministratorControlsFragment]. */ class AdministratorControlsProfileViewModel( diff --git a/app/src/main/java/org/oppia/android/app/administratorcontrols/appversion/AppVersionActivity.kt b/app/src/main/java/org/oppia/android/app/administratorcontrols/appversion/AppVersionActivity.kt index ee05477f695..a1956c909a8 100644 --- a/app/src/main/java/org/oppia/android/app/administratorcontrols/appversion/AppVersionActivity.kt +++ b/app/src/main/java/org/oppia/android/app/administratorcontrols/appversion/AppVersionActivity.kt @@ -1,10 +1,10 @@ -package org.oppia.app.administratorcontrols.appversion +package org.oppia.android.app.administratorcontrols.appversion import android.content.Context import android.content.Intent import android.os.Bundle import android.view.MenuItem -import org.oppia.app.activity.InjectableAppCompatActivity +import org.oppia.android.app.activity.InjectableAppCompatActivity import javax.inject.Inject /** Activity for App Version. */ diff --git a/app/src/main/java/org/oppia/android/app/administratorcontrols/appversion/AppVersionActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/administratorcontrols/appversion/AppVersionActivityPresenter.kt index 951f66707f7..8dea913ea00 100644 --- a/app/src/main/java/org/oppia/android/app/administratorcontrols/appversion/AppVersionActivityPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/administratorcontrols/appversion/AppVersionActivityPresenter.kt @@ -1,9 +1,9 @@ -package org.oppia.app.administratorcontrols.appversion +package org.oppia.android.app.administratorcontrols.appversion import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.widget.Toolbar -import org.oppia.app.R -import org.oppia.app.activity.ActivityScope +import org.oppia.android.R +import org.oppia.android.app.activity.ActivityScope import javax.inject.Inject /** The presenter for [AppVersionActivity]. */ diff --git a/app/src/main/java/org/oppia/android/app/administratorcontrols/appversion/AppVersionFragment.kt b/app/src/main/java/org/oppia/android/app/administratorcontrols/appversion/AppVersionFragment.kt index f000bf4458f..242776ce166 100644 --- a/app/src/main/java/org/oppia/android/app/administratorcontrols/appversion/AppVersionFragment.kt +++ b/app/src/main/java/org/oppia/android/app/administratorcontrols/appversion/AppVersionFragment.kt @@ -1,11 +1,11 @@ -package org.oppia.app.administratorcontrols.appversion +package org.oppia.android.app.administratorcontrols.appversion import android.content.Context import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import org.oppia.app.fragment.InjectableFragment +import org.oppia.android.app.fragment.InjectableFragment import javax.inject.Inject /** Fragment that contains app version and last update time of the Oppia application. */ diff --git a/app/src/main/java/org/oppia/android/app/administratorcontrols/appversion/AppVersionFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/administratorcontrols/appversion/AppVersionFragmentPresenter.kt index cc4c4e8b496..2df0651b183 100644 --- a/app/src/main/java/org/oppia/android/app/administratorcontrols/appversion/AppVersionFragmentPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/administratorcontrols/appversion/AppVersionFragmentPresenter.kt @@ -1,12 +1,12 @@ -package org.oppia.app.administratorcontrols.appversion +package org.oppia.android.app.administratorcontrols.appversion import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.fragment.app.Fragment -import org.oppia.app.databinding.AppVersionFragmentBinding -import org.oppia.app.fragment.FragmentScope -import org.oppia.app.viewmodel.ViewModelProvider +import org.oppia.android.app.fragment.FragmentScope +import org.oppia.android.app.viewmodel.ViewModelProvider +import org.oppia.android.databinding.AppVersionFragmentBinding import javax.inject.Inject /** The presenter for [AppVersionFragment]. */ diff --git a/app/src/main/java/org/oppia/android/app/administratorcontrols/appversion/AppVersionViewModel.kt b/app/src/main/java/org/oppia/android/app/administratorcontrols/appversion/AppVersionViewModel.kt index bc70375ee6c..b05924a70ec 100644 --- a/app/src/main/java/org/oppia/android/app/administratorcontrols/appversion/AppVersionViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/administratorcontrols/appversion/AppVersionViewModel.kt @@ -1,14 +1,14 @@ -package org.oppia.app.administratorcontrols.appversion +package org.oppia.android.app.administratorcontrols.appversion import android.content.Context import androidx.databinding.ObservableField import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModel -import org.oppia.app.fragment.FragmentScope -import org.oppia.app.utility.getLastUpdateTime -import org.oppia.app.utility.getVersionName -import org.oppia.app.viewmodel.ObservableViewModel -import org.oppia.util.system.OppiaDateTimeFormatter +import org.oppia.android.app.fragment.FragmentScope +import org.oppia.android.app.utility.getLastUpdateTime +import org.oppia.android.app.utility.getVersionName +import org.oppia.android.app.viewmodel.ObservableViewModel +import org.oppia.android.util.system.OppiaDateTimeFormatter import java.util.Locale import javax.inject.Inject diff --git a/app/src/main/java/org/oppia/android/app/application/ActivityComponentFactory.kt b/app/src/main/java/org/oppia/android/app/application/ActivityComponentFactory.kt index 4ebd50b2476..5a903499cf4 100644 --- a/app/src/main/java/org/oppia/android/app/application/ActivityComponentFactory.kt +++ b/app/src/main/java/org/oppia/android/app/application/ActivityComponentFactory.kt @@ -1,12 +1,12 @@ -package org.oppia.app.application +package org.oppia.android.app.application import androidx.appcompat.app.AppCompatActivity -import org.oppia.app.activity.ActivityComponent +import org.oppia.android.app.activity.ActivityComponent interface ActivityComponentFactory { /** * Returns a new [ActivityComponent] for the specified activity. This should only be used by - * [org.oppia.app.activity.InjectableAppCompatActivity]. + * [org.oppia.android.app.activity.InjectableAppCompatActivity]. */ fun createActivityComponent(activity: AppCompatActivity): ActivityComponent } diff --git a/app/src/main/java/org/oppia/android/app/application/ApplicationComponent.kt b/app/src/main/java/org/oppia/android/app/application/ApplicationComponent.kt index 6173c2863bf..e3a9c523767 100644 --- a/app/src/main/java/org/oppia/android/app/application/ApplicationComponent.kt +++ b/app/src/main/java/org/oppia/android/app/application/ApplicationComponent.kt @@ -1,39 +1,39 @@ -package org.oppia.app.application +package org.oppia.android.app.application // TODO(#1675): Add NetworkModule once data module is migrated off of Moshi. import android.app.Application import dagger.BindsInstance import dagger.Component -import org.oppia.app.activity.ActivityComponent -import org.oppia.app.player.state.hintsandsolution.HintsAndSolutionConfigModule -import org.oppia.app.shim.IntentFactoryShimModule -import org.oppia.app.shim.ViewBindingShimModule -import org.oppia.domain.classify.InteractionsModule -import org.oppia.domain.classify.rules.continueinteraction.ContinueModule -import org.oppia.domain.classify.rules.dragAndDropSortInput.DragDropSortInputModule -import org.oppia.domain.classify.rules.fractioninput.FractionInputModule -import org.oppia.domain.classify.rules.imageClickInput.ImageClickInputModule -import org.oppia.domain.classify.rules.itemselectioninput.ItemSelectionInputModule -import org.oppia.domain.classify.rules.multiplechoiceinput.MultipleChoiceInputModule -import org.oppia.domain.classify.rules.numberwithunits.NumberWithUnitsRuleModule -import org.oppia.domain.classify.rules.numericinput.NumericInputRuleModule -import org.oppia.domain.classify.rules.ratioinput.RatioInputModule -import org.oppia.domain.classify.rules.textinput.TextInputRuleModule -import org.oppia.domain.onboarding.ExpirationMetaDataRetrieverModule -import org.oppia.domain.oppialogger.ApplicationStartupListener -import org.oppia.domain.oppialogger.LogStorageModule -import org.oppia.domain.oppialogger.exceptions.UncaughtExceptionLoggerModule -import org.oppia.domain.question.QuestionModule -import org.oppia.domain.topic.PrimeTopicAssetsControllerModule -import org.oppia.util.accessibility.AccessibilityModule -import org.oppia.util.caching.CachingModule -import org.oppia.util.gcsresource.GcsResourceModule -import org.oppia.util.logging.LoggerModule -import org.oppia.util.logging.firebase.LogReportingModule -import org.oppia.util.parser.GlideImageLoaderModule -import org.oppia.util.parser.HtmlParserEntityTypeModule -import org.oppia.util.parser.ImageParsingModule -import org.oppia.util.threading.DispatcherModule +import org.oppia.android.app.activity.ActivityComponent +import org.oppia.android.app.player.state.hintsandsolution.HintsAndSolutionConfigModule +import org.oppia.android.app.shim.IntentFactoryShimModule +import org.oppia.android.app.shim.ViewBindingShimModule +import org.oppia.android.domain.classify.InteractionsModule +import org.oppia.android.domain.classify.rules.continueinteraction.ContinueModule +import org.oppia.android.domain.classify.rules.dragAndDropSortInput.DragDropSortInputModule +import org.oppia.android.domain.classify.rules.fractioninput.FractionInputModule +import org.oppia.android.domain.classify.rules.imageClickInput.ImageClickInputModule +import org.oppia.android.domain.classify.rules.itemselectioninput.ItemSelectionInputModule +import org.oppia.android.domain.classify.rules.multiplechoiceinput.MultipleChoiceInputModule +import org.oppia.android.domain.classify.rules.numberwithunits.NumberWithUnitsRuleModule +import org.oppia.android.domain.classify.rules.numericinput.NumericInputRuleModule +import org.oppia.android.domain.classify.rules.ratioinput.RatioInputModule +import org.oppia.android.domain.classify.rules.textinput.TextInputRuleModule +import org.oppia.android.domain.onboarding.ExpirationMetaDataRetrieverModule +import org.oppia.android.domain.oppialogger.ApplicationStartupListener +import org.oppia.android.domain.oppialogger.LogStorageModule +import org.oppia.android.domain.oppialogger.exceptions.UncaughtExceptionLoggerModule +import org.oppia.android.domain.question.QuestionModule +import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule +import org.oppia.android.util.accessibility.AccessibilityModule +import org.oppia.android.util.caching.CachingModule +import org.oppia.android.util.gcsresource.GcsResourceModule +import org.oppia.android.util.logging.LoggerModule +import org.oppia.android.util.logging.firebase.LogReportingModule +import org.oppia.android.util.parser.GlideImageLoaderModule +import org.oppia.android.util.parser.HtmlParserEntityTypeModule +import org.oppia.android.util.parser.ImageParsingModule +import org.oppia.android.util.threading.DispatcherModule import javax.inject.Provider import javax.inject.Singleton diff --git a/app/src/main/java/org/oppia/android/app/application/ApplicationContext.kt b/app/src/main/java/org/oppia/android/app/application/ApplicationContext.kt index 28c6000df60..d4aa0324272 100644 --- a/app/src/main/java/org/oppia/android/app/application/ApplicationContext.kt +++ b/app/src/main/java/org/oppia/android/app/application/ApplicationContext.kt @@ -1,4 +1,4 @@ -package org.oppia.app.application +package org.oppia.android.app.application import javax.inject.Qualifier diff --git a/app/src/main/java/org/oppia/android/app/application/ApplicationInjector.kt b/app/src/main/java/org/oppia/android/app/application/ApplicationInjector.kt index 24aa635497a..e83f5ed90c5 100644 --- a/app/src/main/java/org/oppia/android/app/application/ApplicationInjector.kt +++ b/app/src/main/java/org/oppia/android/app/application/ApplicationInjector.kt @@ -1,6 +1,6 @@ -package org.oppia.app.application +package org.oppia.android.app.application -import org.oppia.app.profile.ProfileInputView +import org.oppia.android.app.profile.ProfileInputView /** Injector for application-level dependencies that can't be directly injected where needed. */ interface ApplicationInjector { diff --git a/app/src/main/java/org/oppia/android/app/application/ApplicationInjectorProvider.kt b/app/src/main/java/org/oppia/android/app/application/ApplicationInjectorProvider.kt index 12498147b67..7dc57a86317 100644 --- a/app/src/main/java/org/oppia/android/app/application/ApplicationInjectorProvider.kt +++ b/app/src/main/java/org/oppia/android/app/application/ApplicationInjectorProvider.kt @@ -1,4 +1,4 @@ -package org.oppia.app.application +package org.oppia.android.app.application /** Provider for [ApplicationInjector]. The application context will implement this interface. */ interface ApplicationInjectorProvider { diff --git a/app/src/main/java/org/oppia/android/app/application/ApplicationModule.kt b/app/src/main/java/org/oppia/android/app/application/ApplicationModule.kt index c2ae637e845..afa2ec1478e 100644 --- a/app/src/main/java/org/oppia/android/app/application/ApplicationModule.kt +++ b/app/src/main/java/org/oppia/android/app/application/ApplicationModule.kt @@ -1,10 +1,10 @@ -package org.oppia.app.application +package org.oppia.android.app.application import android.app.Application import android.content.Context import dagger.Module import dagger.Provides -import org.oppia.app.activity.ActivityComponent +import org.oppia.android.app.activity.ActivityComponent import javax.inject.Singleton /** Provides core infrastructure needed to support all other dependencies in the app. */ diff --git a/app/src/main/java/org/oppia/android/app/application/ApplicationStartupListenerModule.kt b/app/src/main/java/org/oppia/android/app/application/ApplicationStartupListenerModule.kt index 6a39d583a9c..239e3b0e9f8 100644 --- a/app/src/main/java/org/oppia/android/app/application/ApplicationStartupListenerModule.kt +++ b/app/src/main/java/org/oppia/android/app/application/ApplicationStartupListenerModule.kt @@ -1,8 +1,8 @@ -package org.oppia.app.application +package org.oppia.android.app.application import dagger.Module import dagger.multibindings.Multibinds -import org.oppia.domain.oppialogger.ApplicationStartupListener +import org.oppia.android.domain.oppialogger.ApplicationStartupListener /** Binds multiple dependencies that implement [ApplicationStartupListener] into a set. */ @Module diff --git a/app/src/main/java/org/oppia/android/app/application/OppiaApplication.kt b/app/src/main/java/org/oppia/android/app/application/OppiaApplication.kt index 76859166e76..2b1642ce62e 100644 --- a/app/src/main/java/org/oppia/android/app/application/OppiaApplication.kt +++ b/app/src/main/java/org/oppia/android/app/application/OppiaApplication.kt @@ -1,11 +1,11 @@ -package org.oppia.app.application +package org.oppia.android.app.application import android.app.Application import androidx.appcompat.app.AppCompatActivity import androidx.multidex.MultiDexApplication import com.google.firebase.FirebaseApp -import org.oppia.app.activity.ActivityComponent -import org.oppia.domain.oppialogger.ApplicationStartupListener +import org.oppia.android.app.activity.ActivityComponent +import org.oppia.android.domain.oppialogger.ApplicationStartupListener /** The root [Application] of the Oppia app. */ class OppiaApplication : diff --git a/app/src/main/java/org/oppia/android/app/completedstorylist/CompletedStoryItemViewModel.kt b/app/src/main/java/org/oppia/android/app/completedstorylist/CompletedStoryItemViewModel.kt index acbf11ece7f..ce634b15ccc 100644 --- a/app/src/main/java/org/oppia/android/app/completedstorylist/CompletedStoryItemViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/completedstorylist/CompletedStoryItemViewModel.kt @@ -1,10 +1,10 @@ -package org.oppia.app.completedstorylist +package org.oppia.android.app.completedstorylist import androidx.appcompat.app.AppCompatActivity -import org.oppia.app.home.RouteToTopicPlayStoryListener -import org.oppia.app.model.CompletedStory -import org.oppia.app.shim.IntentFactoryShim -import org.oppia.app.viewmodel.ObservableViewModel +import org.oppia.android.app.home.RouteToTopicPlayStoryListener +import org.oppia.android.app.model.CompletedStory +import org.oppia.android.app.shim.IntentFactoryShim +import org.oppia.android.app.viewmodel.ObservableViewModel /** Completed story view model for the recycler view in [CompletedStoryListFragment]. */ class CompletedStoryItemViewModel( diff --git a/app/src/main/java/org/oppia/android/app/completedstorylist/CompletedStoryListActivity.kt b/app/src/main/java/org/oppia/android/app/completedstorylist/CompletedStoryListActivity.kt index e23de492536..5d2cf986741 100644 --- a/app/src/main/java/org/oppia/android/app/completedstorylist/CompletedStoryListActivity.kt +++ b/app/src/main/java/org/oppia/android/app/completedstorylist/CompletedStoryListActivity.kt @@ -1,9 +1,9 @@ -package org.oppia.app.completedstorylist +package org.oppia.android.app.completedstorylist import android.content.Context import android.content.Intent import android.os.Bundle -import org.oppia.app.activity.InjectableAppCompatActivity +import org.oppia.android.app.activity.InjectableAppCompatActivity import javax.inject.Inject /** Activity for completed stories. */ diff --git a/app/src/main/java/org/oppia/android/app/completedstorylist/CompletedStoryListActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/completedstorylist/CompletedStoryListActivityPresenter.kt index ea8886caab6..b92b1424aa4 100644 --- a/app/src/main/java/org/oppia/android/app/completedstorylist/CompletedStoryListActivityPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/completedstorylist/CompletedStoryListActivityPresenter.kt @@ -1,8 +1,8 @@ -package org.oppia.app.completedstorylist +package org.oppia.android.app.completedstorylist import androidx.appcompat.app.AppCompatActivity -import org.oppia.app.R -import org.oppia.app.activity.ActivityScope +import org.oppia.android.R +import org.oppia.android.app.activity.ActivityScope import javax.inject.Inject /** The presenter for [CompletedStoryListActivity]. */ diff --git a/app/src/main/java/org/oppia/android/app/completedstorylist/CompletedStoryListFragment.kt b/app/src/main/java/org/oppia/android/app/completedstorylist/CompletedStoryListFragment.kt index ce5b144e7b7..d12bda93ad1 100644 --- a/app/src/main/java/org/oppia/android/app/completedstorylist/CompletedStoryListFragment.kt +++ b/app/src/main/java/org/oppia/android/app/completedstorylist/CompletedStoryListFragment.kt @@ -1,11 +1,11 @@ -package org.oppia.app.completedstorylist +package org.oppia.android.app.completedstorylist import android.content.Context import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import org.oppia.app.fragment.InjectableFragment +import org.oppia.android.app.fragment.InjectableFragment import javax.inject.Inject /** Fragment for displaying completed stories. */ diff --git a/app/src/main/java/org/oppia/android/app/completedstorylist/CompletedStoryListFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/completedstorylist/CompletedStoryListFragmentPresenter.kt index e1f54da4ead..660113abfff 100644 --- a/app/src/main/java/org/oppia/android/app/completedstorylist/CompletedStoryListFragmentPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/completedstorylist/CompletedStoryListFragmentPresenter.kt @@ -1,4 +1,4 @@ -package org.oppia.app.completedstorylist +package org.oppia.android.app.completedstorylist import android.view.LayoutInflater import android.view.View @@ -6,11 +6,11 @@ import android.view.ViewGroup import androidx.appcompat.app.AppCompatActivity import androidx.fragment.app.Fragment import androidx.recyclerview.widget.GridLayoutManager -import org.oppia.app.R -import org.oppia.app.databinding.CompletedStoryItemBinding -import org.oppia.app.databinding.CompletedStoryListFragmentBinding -import org.oppia.app.recyclerview.BindableAdapter -import org.oppia.app.viewmodel.ViewModelProvider +import org.oppia.android.R +import org.oppia.android.app.recyclerview.BindableAdapter +import org.oppia.android.app.viewmodel.ViewModelProvider +import org.oppia.android.databinding.CompletedStoryItemBinding +import org.oppia.android.databinding.CompletedStoryListFragmentBinding import javax.inject.Inject /** The presenter for [CompletedStoryListFragment]. */ diff --git a/app/src/main/java/org/oppia/android/app/completedstorylist/CompletedStoryListViewModel.kt b/app/src/main/java/org/oppia/android/app/completedstorylist/CompletedStoryListViewModel.kt index 83eebcd4622..fddb9bb11f0 100644 --- a/app/src/main/java/org/oppia/android/app/completedstorylist/CompletedStoryListViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/completedstorylist/CompletedStoryListViewModel.kt @@ -1,17 +1,17 @@ -package org.oppia.app.completedstorylist +package org.oppia.android.app.completedstorylist import androidx.appcompat.app.AppCompatActivity import androidx.lifecycle.LiveData import androidx.lifecycle.Transformations -import org.oppia.app.fragment.FragmentScope -import org.oppia.app.model.CompletedStoryList -import org.oppia.app.model.ProfileId -import org.oppia.app.shim.IntentFactoryShim -import org.oppia.app.viewmodel.ObservableViewModel -import org.oppia.domain.topic.TopicController -import org.oppia.util.data.AsyncResult -import org.oppia.util.logging.ConsoleLogger -import org.oppia.util.parser.StoryHtmlParserEntityType +import org.oppia.android.app.fragment.FragmentScope +import org.oppia.android.app.model.CompletedStoryList +import org.oppia.android.app.model.ProfileId +import org.oppia.android.app.shim.IntentFactoryShim +import org.oppia.android.app.viewmodel.ObservableViewModel +import org.oppia.android.domain.topic.TopicController +import org.oppia.android.util.data.AsyncResult +import org.oppia.android.util.logging.ConsoleLogger +import org.oppia.android.util.parser.StoryHtmlParserEntityType import javax.inject.Inject /** The ObservableViewModel for [CompletedStoryListFragment]. */ diff --git a/app/src/main/java/org/oppia/android/app/customview/LessonThumbnailImageView.kt b/app/src/main/java/org/oppia/android/app/customview/LessonThumbnailImageView.kt index a1bc7fc5f5d..932a611186a 100644 --- a/app/src/main/java/org/oppia/android/app/customview/LessonThumbnailImageView.kt +++ b/app/src/main/java/org/oppia/android/app/customview/LessonThumbnailImageView.kt @@ -1,19 +1,19 @@ -package org.oppia.app.customview +package org.oppia.android.app.customview import android.content.Context import android.util.AttributeSet import androidx.appcompat.widget.AppCompatImageView import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager -import org.oppia.app.R -import org.oppia.app.model.LessonThumbnail -import org.oppia.app.model.LessonThumbnailGraphic -import org.oppia.app.shim.ViewComponentFactory -import org.oppia.util.gcsresource.DefaultResourceBucketName -import org.oppia.util.parser.DefaultGcsPrefix -import org.oppia.util.parser.ImageLoader -import org.oppia.util.parser.ImageViewTarget -import org.oppia.util.parser.ThumbnailDownloadUrlTemplate +import org.oppia.android.R +import org.oppia.android.app.model.LessonThumbnail +import org.oppia.android.app.model.LessonThumbnailGraphic +import org.oppia.android.app.shim.ViewComponentFactory +import org.oppia.android.util.gcsresource.DefaultResourceBucketName +import org.oppia.android.util.parser.DefaultGcsPrefix +import org.oppia.android.util.parser.ImageLoader +import org.oppia.android.util.parser.ImageViewTarget +import org.oppia.android.util.parser.ThumbnailDownloadUrlTemplate import javax.inject.Inject /** A custom [AppCompatImageView] used to show lesson thumbnails. */ diff --git a/app/src/main/java/org/oppia/android/app/customview/SegmentedCircularProgressView.kt b/app/src/main/java/org/oppia/android/app/customview/SegmentedCircularProgressView.kt index 26d05640ef5..67f5a0f7daa 100644 --- a/app/src/main/java/org/oppia/android/app/customview/SegmentedCircularProgressView.kt +++ b/app/src/main/java/org/oppia/android/app/customview/SegmentedCircularProgressView.kt @@ -1,4 +1,4 @@ -package org.oppia.app.customview +package org.oppia.android.app.customview import android.content.Context import android.graphics.Canvas @@ -8,7 +8,7 @@ import android.util.AttributeSet import android.util.TypedValue import android.view.View import androidx.core.content.ContextCompat -import org.oppia.app.R +import org.oppia.android.R private const val STROKE_DASH_GAP_IN_DEGREE = 12 diff --git a/app/src/main/java/org/oppia/android/app/customview/interaction/FractionInputInteractionView.kt b/app/src/main/java/org/oppia/android/app/customview/interaction/FractionInputInteractionView.kt index 45368654b00..d8ea04584ed 100644 --- a/app/src/main/java/org/oppia/android/app/customview/interaction/FractionInputInteractionView.kt +++ b/app/src/main/java/org/oppia/android/app/customview/interaction/FractionInputInteractionView.kt @@ -1,4 +1,4 @@ -package org.oppia.app.customview.interaction +package org.oppia.android.app.customview.interaction import android.content.Context import android.graphics.Typeface @@ -9,9 +9,9 @@ import android.view.KeyEvent.KEYCODE_BACK import android.view.View import android.view.inputmethod.EditorInfo import android.widget.EditText -import org.oppia.app.player.state.listener.StateKeyboardButtonListener -import org.oppia.app.utility.KeyboardHelper.Companion.hideSoftKeyboard -import org.oppia.app.utility.KeyboardHelper.Companion.showSoftKeyboard +import org.oppia.android.app.player.state.listener.StateKeyboardButtonListener +import org.oppia.android.app.utility.KeyboardHelper.Companion.hideSoftKeyboard +import org.oppia.android.app.utility.KeyboardHelper.Companion.showSoftKeyboard // TODO(#249): These are the attributes which should be defined in XML, that are required for this interaction view to work correctly // digits="0123456789/-" diff --git a/app/src/main/java/org/oppia/android/app/customview/interaction/NumericInputInteractionView.kt b/app/src/main/java/org/oppia/android/app/customview/interaction/NumericInputInteractionView.kt index b04c4f7b4be..093795a1cb2 100644 --- a/app/src/main/java/org/oppia/android/app/customview/interaction/NumericInputInteractionView.kt +++ b/app/src/main/java/org/oppia/android/app/customview/interaction/NumericInputInteractionView.kt @@ -1,4 +1,4 @@ -package org.oppia.app.customview.interaction +package org.oppia.android.app.customview.interaction import android.content.Context import android.graphics.Typeface @@ -9,9 +9,9 @@ import android.view.KeyEvent.KEYCODE_BACK import android.view.View import android.view.inputmethod.EditorInfo import android.widget.EditText -import org.oppia.app.player.state.listener.StateKeyboardButtonListener -import org.oppia.app.utility.KeyboardHelper.Companion.hideSoftKeyboard -import org.oppia.app.utility.KeyboardHelper.Companion.showSoftKeyboard +import org.oppia.android.app.player.state.listener.StateKeyboardButtonListener +import org.oppia.android.app.utility.KeyboardHelper.Companion.hideSoftKeyboard +import org.oppia.android.app.utility.KeyboardHelper.Companion.showSoftKeyboard // TODO(#249): These are the attributes which should be defined in XML, that are required for this interaction view to work correctly // digits="0123456789." diff --git a/app/src/main/java/org/oppia/android/app/customview/interaction/RatioInputInteractionView.kt b/app/src/main/java/org/oppia/android/app/customview/interaction/RatioInputInteractionView.kt index 1bfb31dd55c..c3eb784514d 100644 --- a/app/src/main/java/org/oppia/android/app/customview/interaction/RatioInputInteractionView.kt +++ b/app/src/main/java/org/oppia/android/app/customview/interaction/RatioInputInteractionView.kt @@ -1,4 +1,4 @@ -package org.oppia.app.customview.interaction +package org.oppia.android.app.customview.interaction import android.content.Context import android.graphics.Typeface @@ -7,8 +7,8 @@ import android.view.KeyEvent import android.view.View import android.view.inputmethod.EditorInfo import android.widget.EditText -import org.oppia.app.player.state.listener.StateKeyboardButtonListener -import org.oppia.app.utility.KeyboardHelper +import org.oppia.android.app.player.state.listener.StateKeyboardButtonListener +import org.oppia.android.app.utility.KeyboardHelper /** The custom EditText class for ratio input interaction view. */ class RatioInputInteractionView @JvmOverloads constructor( diff --git a/app/src/main/java/org/oppia/android/app/customview/interaction/TextInputInteractionView.kt b/app/src/main/java/org/oppia/android/app/customview/interaction/TextInputInteractionView.kt index 092529b3a7e..d3400a10e51 100644 --- a/app/src/main/java/org/oppia/android/app/customview/interaction/TextInputInteractionView.kt +++ b/app/src/main/java/org/oppia/android/app/customview/interaction/TextInputInteractionView.kt @@ -1,4 +1,4 @@ -package org.oppia.app.customview.interaction +package org.oppia.android.app.customview.interaction import android.content.Context import android.graphics.Typeface @@ -7,9 +7,9 @@ import android.view.KeyEvent import android.view.View import android.view.inputmethod.EditorInfo import android.widget.EditText -import org.oppia.app.player.state.listener.StateKeyboardButtonListener -import org.oppia.app.utility.KeyboardHelper.Companion.hideSoftKeyboard -import org.oppia.app.utility.KeyboardHelper.Companion.showSoftKeyboard +import org.oppia.android.app.player.state.listener.StateKeyboardButtonListener +import org.oppia.android.app.utility.KeyboardHelper.Companion.hideSoftKeyboard +import org.oppia.android.app.utility.KeyboardHelper.Companion.showSoftKeyboard // TODO(#249): These are the attributes which should be defined in XML, that are required for this interaction view to work correctly // hint="Write here." diff --git a/app/src/main/java/org/oppia/android/app/databinding/DrawableBindingAdapters.java b/app/src/main/java/org/oppia/android/app/databinding/DrawableBindingAdapters.java index d7a53577b7b..13ca2c811bf 100644 --- a/app/src/main/java/org/oppia/android/app/databinding/DrawableBindingAdapters.java +++ b/app/src/main/java/org/oppia/android/app/databinding/DrawableBindingAdapters.java @@ -1,4 +1,4 @@ -package org.oppia.app.databinding; +package org.oppia.android.app.databinding; import android.graphics.drawable.GradientDrawable; import android.view.View; @@ -7,7 +7,7 @@ import androidx.annotation.DrawableRes; import androidx.annotation.NonNull; import androidx.databinding.BindingAdapter; -import org.oppia.app.R; +import org.oppia.android.R; /** Holds all custom binding adapters that set background drawables. */ public final class DrawableBindingAdapters { diff --git a/app/src/main/java/org/oppia/android/app/databinding/EditTextBindingAdapters.java b/app/src/main/java/org/oppia/android/app/databinding/EditTextBindingAdapters.java index ad6a8a0e599..2b9518436a2 100644 --- a/app/src/main/java/org/oppia/android/app/databinding/EditTextBindingAdapters.java +++ b/app/src/main/java/org/oppia/android/app/databinding/EditTextBindingAdapters.java @@ -1,4 +1,4 @@ -package org.oppia.app.databinding; +package org.oppia.android.app.databinding; import android.text.TextWatcher; import android.widget.EditText; diff --git a/app/src/main/java/org/oppia/android/app/databinding/GuidelineBindingAdapters.java b/app/src/main/java/org/oppia/android/app/databinding/GuidelineBindingAdapters.java index 30f3ba2e8c7..c6cc74d3cb5 100644 --- a/app/src/main/java/org/oppia/android/app/databinding/GuidelineBindingAdapters.java +++ b/app/src/main/java/org/oppia/android/app/databinding/GuidelineBindingAdapters.java @@ -1,4 +1,4 @@ -package org.oppia.app.databinding; +package org.oppia.android.app.databinding; import androidx.annotation.NonNull; import androidx.constraintlayout.widget.ConstraintLayout; diff --git a/app/src/main/java/org/oppia/android/app/databinding/ImageViewBindingAdapters.java b/app/src/main/java/org/oppia/android/app/databinding/ImageViewBindingAdapters.java index c074362d424..cece88b616d 100644 --- a/app/src/main/java/org/oppia/android/app/databinding/ImageViewBindingAdapters.java +++ b/app/src/main/java/org/oppia/android/app/databinding/ImageViewBindingAdapters.java @@ -1,4 +1,4 @@ -package org.oppia.app.databinding; +package org.oppia.android.app.databinding; import android.graphics.PorterDuff; import android.graphics.drawable.Drawable; @@ -12,9 +12,9 @@ import com.bumptech.glide.request.RequestListener; import com.bumptech.glide.request.RequestOptions; import com.bumptech.glide.request.target.Target; -import org.oppia.app.R; -import org.oppia.app.model.LessonThumbnailGraphic; -import org.oppia.app.model.ProfileAvatar; +import org.oppia.android.R; +import org.oppia.android.app.model.LessonThumbnailGraphic; +import org.oppia.android.app.model.ProfileAvatar; /** Holds all custom binding adapters that bind to [ImageView]. */ public final class ImageViewBindingAdapters { diff --git a/app/src/main/java/org/oppia/android/app/databinding/MarginBindingAdapters.java b/app/src/main/java/org/oppia/android/app/databinding/MarginBindingAdapters.java index 91ddcd6d5b1..68bac5aadd3 100644 --- a/app/src/main/java/org/oppia/android/app/databinding/MarginBindingAdapters.java +++ b/app/src/main/java/org/oppia/android/app/databinding/MarginBindingAdapters.java @@ -1,4 +1,4 @@ -package org.oppia.app.databinding; +package org.oppia.android.app.databinding; import android.view.View; import android.view.ViewGroup.MarginLayoutParams; diff --git a/app/src/main/java/org/oppia/android/app/databinding/StateAssemblerMarginBindingAdapters.java b/app/src/main/java/org/oppia/android/app/databinding/StateAssemblerMarginBindingAdapters.java index e19b95429ea..31ed417ad1f 100644 --- a/app/src/main/java/org/oppia/android/app/databinding/StateAssemblerMarginBindingAdapters.java +++ b/app/src/main/java/org/oppia/android/app/databinding/StateAssemblerMarginBindingAdapters.java @@ -1,4 +1,4 @@ -package org.oppia.app.databinding; +package org.oppia.android.app.databinding; import android.view.View; import android.view.ViewGroup.MarginLayoutParams; diff --git a/app/src/main/java/org/oppia/android/app/databinding/StateAssemblerPaddingBindingAdapters.java b/app/src/main/java/org/oppia/android/app/databinding/StateAssemblerPaddingBindingAdapters.java index 8e92c81e5e4..25f032be666 100644 --- a/app/src/main/java/org/oppia/android/app/databinding/StateAssemblerPaddingBindingAdapters.java +++ b/app/src/main/java/org/oppia/android/app/databinding/StateAssemblerPaddingBindingAdapters.java @@ -1,4 +1,4 @@ -package org.oppia.app.databinding; +package org.oppia.android.app.databinding; import android.view.View; import androidx.databinding.BindingAdapter; diff --git a/app/src/main/java/org/oppia/android/app/databinding/TextViewBindingAdapters.java b/app/src/main/java/org/oppia/android/app/databinding/TextViewBindingAdapters.java index c735951cfc0..3376d30755f 100644 --- a/app/src/main/java/org/oppia/android/app/databinding/TextViewBindingAdapters.java +++ b/app/src/main/java/org/oppia/android/app/databinding/TextViewBindingAdapters.java @@ -1,4 +1,4 @@ -package org.oppia.app.databinding; +package org.oppia.android.app.databinding; import android.content.Context; import android.content.res.Resources; @@ -6,8 +6,8 @@ import androidx.annotation.NonNull; import androidx.annotation.PluralsRes; import androidx.databinding.BindingAdapter; -import org.oppia.app.R; -import org.oppia.util.system.OppiaDateTimeFormatter; +import org.oppia.android.R; +import org.oppia.android.util.system.OppiaDateTimeFormatter; import java.util.Locale; import java.util.concurrent.TimeUnit; diff --git a/app/src/main/java/org/oppia/android/app/databinding/ViewBindingAdapters.java b/app/src/main/java/org/oppia/android/app/databinding/ViewBindingAdapters.java index ed09bcc25c3..6c3d99d4d07 100644 --- a/app/src/main/java/org/oppia/android/app/databinding/ViewBindingAdapters.java +++ b/app/src/main/java/org/oppia/android/app/databinding/ViewBindingAdapters.java @@ -1,4 +1,4 @@ -package org.oppia.app.databinding; +package org.oppia.android.app.databinding; import android.animation.ValueAnimator; import android.view.View; diff --git a/app/src/main/java/org/oppia/android/app/deprecation/AutomaticAppDeprecationNoticeDialogFragment.kt b/app/src/main/java/org/oppia/android/app/deprecation/AutomaticAppDeprecationNoticeDialogFragment.kt index d45a837c0d8..a322bfe84ad 100644 --- a/app/src/main/java/org/oppia/android/app/deprecation/AutomaticAppDeprecationNoticeDialogFragment.kt +++ b/app/src/main/java/org/oppia/android/app/deprecation/AutomaticAppDeprecationNoticeDialogFragment.kt @@ -1,9 +1,9 @@ -package org.oppia.app.deprecation +package org.oppia.android.app.deprecation import android.app.Dialog import android.content.Context import android.os.Bundle -import org.oppia.app.fragment.InjectableDialogFragment +import org.oppia.android.app.fragment.InjectableDialogFragment import javax.inject.Inject /** diff --git a/app/src/main/java/org/oppia/android/app/deprecation/AutomaticAppDeprecationNoticeDialogFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/deprecation/AutomaticAppDeprecationNoticeDialogFragmentPresenter.kt index 68303e31389..58a40354dd6 100644 --- a/app/src/main/java/org/oppia/android/app/deprecation/AutomaticAppDeprecationNoticeDialogFragmentPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/deprecation/AutomaticAppDeprecationNoticeDialogFragmentPresenter.kt @@ -1,9 +1,9 @@ -package org.oppia.app.deprecation +package org.oppia.android.app.deprecation import android.app.Dialog import androidx.appcompat.app.AlertDialog import androidx.appcompat.app.AppCompatActivity -import org.oppia.app.R +import org.oppia.android.R import javax.inject.Inject /** diff --git a/app/src/main/java/org/oppia/android/app/deprecation/DeprecationNoticeExitAppListener.kt b/app/src/main/java/org/oppia/android/app/deprecation/DeprecationNoticeExitAppListener.kt index a8184e0e952..020ac27ef8e 100644 --- a/app/src/main/java/org/oppia/android/app/deprecation/DeprecationNoticeExitAppListener.kt +++ b/app/src/main/java/org/oppia/android/app/deprecation/DeprecationNoticeExitAppListener.kt @@ -1,4 +1,4 @@ -package org.oppia.app.deprecation +package org.oppia.android.app.deprecation /** Listener for when the app deprecation dialog is closed. */ interface DeprecationNoticeExitAppListener { diff --git a/app/src/main/java/org/oppia/android/app/drawer/NavigationDrawerFooterViewModel.kt b/app/src/main/java/org/oppia/android/app/drawer/NavigationDrawerFooterViewModel.kt index f8937690a04..9bdd14eedad 100644 --- a/app/src/main/java/org/oppia/android/app/drawer/NavigationDrawerFooterViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/drawer/NavigationDrawerFooterViewModel.kt @@ -1,7 +1,7 @@ -package org.oppia.app.drawer +package org.oppia.android.app.drawer import androidx.databinding.ObservableField -import org.oppia.app.viewmodel.ObservableViewModel +import org.oppia.android.app.viewmodel.ObservableViewModel import javax.inject.Inject /** [ViewModel] for displaying Administrator Controls option. */ diff --git a/app/src/main/java/org/oppia/android/app/drawer/NavigationDrawerFragment.kt b/app/src/main/java/org/oppia/android/app/drawer/NavigationDrawerFragment.kt index d9131358f3a..20ed1daf94d 100644 --- a/app/src/main/java/org/oppia/android/app/drawer/NavigationDrawerFragment.kt +++ b/app/src/main/java/org/oppia/android/app/drawer/NavigationDrawerFragment.kt @@ -1,4 +1,4 @@ -package org.oppia.app.drawer +package org.oppia.android.app.drawer import android.content.Context import android.os.Bundle @@ -7,7 +7,7 @@ import android.view.View import android.view.ViewGroup import androidx.appcompat.widget.Toolbar import androidx.drawerlayout.widget.DrawerLayout -import org.oppia.app.fragment.InjectableFragment +import org.oppia.android.app.fragment.InjectableFragment import javax.inject.Inject /** [NavigationDrawerFragment] to show navigation drawer. */ diff --git a/app/src/main/java/org/oppia/android/app/drawer/NavigationDrawerFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/drawer/NavigationDrawerFragmentPresenter.kt index 9a3c342d01e..00ee9e73ac1 100644 --- a/app/src/main/java/org/oppia/android/app/drawer/NavigationDrawerFragmentPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/drawer/NavigationDrawerFragmentPresenter.kt @@ -1,4 +1,4 @@ -package org.oppia.app.drawer +package org.oppia.android.app.drawer import android.view.LayoutInflater import android.view.MenuItem @@ -15,28 +15,28 @@ import androidx.lifecycle.LiveData import androidx.lifecycle.Observer import androidx.lifecycle.Transformations import com.google.android.material.navigation.NavigationView -import org.oppia.app.R -import org.oppia.app.administratorcontrols.AdministratorControlsActivity -import org.oppia.app.databinding.DrawerFragmentBinding -import org.oppia.app.databinding.NavHeaderNavigationDrawerBinding -import org.oppia.app.fragment.FragmentScope -import org.oppia.app.help.HelpActivity -import org.oppia.app.home.HomeActivity -import org.oppia.app.model.CompletedStoryList -import org.oppia.app.model.OngoingTopicList -import org.oppia.app.model.Profile -import org.oppia.app.model.ProfileId -import org.oppia.app.mydownloads.MyDownloadsActivity -import org.oppia.app.options.OptionsActivity -import org.oppia.app.profile.ProfileChooserActivity -import org.oppia.app.profileprogress.ProfileProgressActivity -import org.oppia.app.topic.TopicActivity -import org.oppia.app.viewmodel.ViewModelProvider -import org.oppia.domain.profile.ProfileManagementController -import org.oppia.domain.topic.TopicController -import org.oppia.util.data.AsyncResult -import org.oppia.util.logging.ConsoleLogger -import org.oppia.util.statusbar.StatusBarColor +import org.oppia.android.R +import org.oppia.android.app.administratorcontrols.AdministratorControlsActivity +import org.oppia.android.app.fragment.FragmentScope +import org.oppia.android.app.help.HelpActivity +import org.oppia.android.app.home.HomeActivity +import org.oppia.android.app.model.CompletedStoryList +import org.oppia.android.app.model.OngoingTopicList +import org.oppia.android.app.model.Profile +import org.oppia.android.app.model.ProfileId +import org.oppia.android.app.mydownloads.MyDownloadsActivity +import org.oppia.android.app.options.OptionsActivity +import org.oppia.android.app.profile.ProfileChooserActivity +import org.oppia.android.app.profileprogress.ProfileProgressActivity +import org.oppia.android.app.topic.TopicActivity +import org.oppia.android.app.viewmodel.ViewModelProvider +import org.oppia.android.databinding.DrawerFragmentBinding +import org.oppia.android.databinding.NavHeaderNavigationDrawerBinding +import org.oppia.android.domain.profile.ProfileManagementController +import org.oppia.android.domain.topic.TopicController +import org.oppia.android.util.data.AsyncResult +import org.oppia.android.util.logging.ConsoleLogger +import org.oppia.android.util.statusbar.StatusBarColor import javax.inject.Inject const val KEY_NAVIGATION_PROFILE_ID = "KEY_NAVIGATION_PROFILE_ID" diff --git a/app/src/main/java/org/oppia/android/app/drawer/NavigationDrawerHeaderViewModel.kt b/app/src/main/java/org/oppia/android/app/drawer/NavigationDrawerHeaderViewModel.kt index a0beaa4b367..071af222366 100644 --- a/app/src/main/java/org/oppia/android/app/drawer/NavigationDrawerHeaderViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/drawer/NavigationDrawerHeaderViewModel.kt @@ -1,10 +1,10 @@ -package org.oppia.app.drawer +package org.oppia.android.app.drawer import androidx.databinding.ObservableField import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModel -import org.oppia.app.model.Profile -import org.oppia.app.viewmodel.ObservableViewModel +import org.oppia.android.app.model.Profile +import org.oppia.android.app.viewmodel.ObservableViewModel import javax.inject.Inject /** [ViewModel] for displaying User profile details in navigation header. */ diff --git a/app/src/main/java/org/oppia/android/app/drawer/NavigationDrawerItem.kt b/app/src/main/java/org/oppia/android/app/drawer/NavigationDrawerItem.kt index c015376f483..b8ee7cf62e4 100644 --- a/app/src/main/java/org/oppia/android/app/drawer/NavigationDrawerItem.kt +++ b/app/src/main/java/org/oppia/android/app/drawer/NavigationDrawerItem.kt @@ -1,6 +1,6 @@ -package org.oppia.app.drawer +package org.oppia.android.app.drawer -import org.oppia.app.R +import org.oppia.android.R /** Represents different destinations that can be selected by the user from the navigation drawer. */ enum class NavigationDrawerItem(val value: Int) { diff --git a/app/src/main/java/org/oppia/android/app/drawer/RouteToProfileProgressListener.kt b/app/src/main/java/org/oppia/android/app/drawer/RouteToProfileProgressListener.kt index 31afe0b0cf2..c1b5e12a654 100644 --- a/app/src/main/java/org/oppia/android/app/drawer/RouteToProfileProgressListener.kt +++ b/app/src/main/java/org/oppia/android/app/drawer/RouteToProfileProgressListener.kt @@ -1,4 +1,4 @@ -package org.oppia.app.drawer +package org.oppia.android.app.drawer /** Listener for when an activity should route to [ProfileProgressActivity]. */ interface RouteToProfileProgressListener { diff --git a/app/src/main/java/org/oppia/android/app/fragment/FragmentComponent.kt b/app/src/main/java/org/oppia/android/app/fragment/FragmentComponent.kt index bf1f8b64620..2304645603f 100644 --- a/app/src/main/java/org/oppia/android/app/fragment/FragmentComponent.kt +++ b/app/src/main/java/org/oppia/android/app/fragment/FragmentComponent.kt @@ -1,56 +1,56 @@ -package org.oppia.app.fragment +package org.oppia.android.app.fragment import androidx.fragment.app.Fragment import dagger.BindsInstance import dagger.Subcomponent -import org.oppia.app.administratorcontrols.AdministratorControlsFragment -import org.oppia.app.administratorcontrols.appversion.AppVersionFragment -import org.oppia.app.completedstorylist.CompletedStoryListFragment -import org.oppia.app.deprecation.AutomaticAppDeprecationNoticeDialogFragment -import org.oppia.app.drawer.NavigationDrawerFragment -import org.oppia.app.help.HelpFragment -import org.oppia.app.help.faq.FAQListFragment -import org.oppia.app.hintsandsolution.HintsAndSolutionDialogFragment -import org.oppia.app.home.HomeFragment -import org.oppia.app.home.recentlyplayed.RecentlyPlayedFragment -import org.oppia.app.mydownloads.DownloadsTabFragment -import org.oppia.app.mydownloads.MyDownloadsFragment -import org.oppia.app.mydownloads.UpdatesTabFragment -import org.oppia.app.onboarding.OnboardingFragment -import org.oppia.app.ongoingtopiclist.OngoingTopicListFragment -import org.oppia.app.options.AppLanguageFragment -import org.oppia.app.options.DefaultAudioFragment -import org.oppia.app.options.OptionsFragment -import org.oppia.app.options.ReadingTextSizeFragment -import org.oppia.app.player.audio.AudioFragment -import org.oppia.app.player.exploration.ExplorationFragment -import org.oppia.app.player.exploration.ExplorationManagerFragment -import org.oppia.app.player.exploration.HintsAndSolutionExplorationManagerFragment -import org.oppia.app.player.state.StateFragment -import org.oppia.app.player.state.itemviewmodel.InteractionViewModelModule -import org.oppia.app.profile.AdminSettingsDialogFragment -import org.oppia.app.profile.ProfileChooserFragment -import org.oppia.app.profile.ResetPinDialogFragment -import org.oppia.app.profileprogress.ProfileProgressFragment -import org.oppia.app.settings.profile.ProfileListFragment -import org.oppia.app.shim.IntentFactoryShimModule -import org.oppia.app.shim.ViewBindingShimModule -import org.oppia.app.story.StoryFragment -import org.oppia.app.testing.BindableAdapterTestFragment -import org.oppia.app.testing.ImageRegionSelectionTestFragment -import org.oppia.app.topic.TopicFragment -import org.oppia.app.topic.conceptcard.ConceptCardFragment -import org.oppia.app.topic.info.TopicInfoFragment -import org.oppia.app.topic.lessons.TopicLessonsFragment -import org.oppia.app.topic.practice.TopicPracticeFragment -import org.oppia.app.topic.questionplayer.HintsAndSolutionQuestionManagerFragment -import org.oppia.app.topic.questionplayer.QuestionPlayerFragment -import org.oppia.app.topic.revision.TopicRevisionFragment -import org.oppia.app.topic.revisioncard.RevisionCardFragment -import org.oppia.app.view.ViewComponent -import org.oppia.app.walkthrough.end.WalkthroughFinalFragment -import org.oppia.app.walkthrough.topiclist.WalkthroughTopicListFragment -import org.oppia.app.walkthrough.welcome.WalkthroughWelcomeFragment +import org.oppia.android.app.administratorcontrols.AdministratorControlsFragment +import org.oppia.android.app.administratorcontrols.appversion.AppVersionFragment +import org.oppia.android.app.completedstorylist.CompletedStoryListFragment +import org.oppia.android.app.deprecation.AutomaticAppDeprecationNoticeDialogFragment +import org.oppia.android.app.drawer.NavigationDrawerFragment +import org.oppia.android.app.help.HelpFragment +import org.oppia.android.app.help.faq.FAQListFragment +import org.oppia.android.app.hintsandsolution.HintsAndSolutionDialogFragment +import org.oppia.android.app.home.HomeFragment +import org.oppia.android.app.home.recentlyplayed.RecentlyPlayedFragment +import org.oppia.android.app.mydownloads.DownloadsTabFragment +import org.oppia.android.app.mydownloads.MyDownloadsFragment +import org.oppia.android.app.mydownloads.UpdatesTabFragment +import org.oppia.android.app.onboarding.OnboardingFragment +import org.oppia.android.app.ongoingtopiclist.OngoingTopicListFragment +import org.oppia.android.app.options.AppLanguageFragment +import org.oppia.android.app.options.DefaultAudioFragment +import org.oppia.android.app.options.OptionsFragment +import org.oppia.android.app.options.ReadingTextSizeFragment +import org.oppia.android.app.player.audio.AudioFragment +import org.oppia.android.app.player.exploration.ExplorationFragment +import org.oppia.android.app.player.exploration.ExplorationManagerFragment +import org.oppia.android.app.player.exploration.HintsAndSolutionExplorationManagerFragment +import org.oppia.android.app.player.state.StateFragment +import org.oppia.android.app.player.state.itemviewmodel.InteractionViewModelModule +import org.oppia.android.app.profile.AdminSettingsDialogFragment +import org.oppia.android.app.profile.ProfileChooserFragment +import org.oppia.android.app.profile.ResetPinDialogFragment +import org.oppia.android.app.profileprogress.ProfileProgressFragment +import org.oppia.android.app.settings.profile.ProfileListFragment +import org.oppia.android.app.shim.IntentFactoryShimModule +import org.oppia.android.app.shim.ViewBindingShimModule +import org.oppia.android.app.story.StoryFragment +import org.oppia.android.app.testing.BindableAdapterTestFragment +import org.oppia.android.app.testing.ImageRegionSelectionTestFragment +import org.oppia.android.app.topic.TopicFragment +import org.oppia.android.app.topic.conceptcard.ConceptCardFragment +import org.oppia.android.app.topic.info.TopicInfoFragment +import org.oppia.android.app.topic.lessons.TopicLessonsFragment +import org.oppia.android.app.topic.practice.TopicPracticeFragment +import org.oppia.android.app.topic.questionplayer.HintsAndSolutionQuestionManagerFragment +import org.oppia.android.app.topic.questionplayer.QuestionPlayerFragment +import org.oppia.android.app.topic.revision.TopicRevisionFragment +import org.oppia.android.app.topic.revisioncard.RevisionCardFragment +import org.oppia.android.app.view.ViewComponent +import org.oppia.android.app.walkthrough.end.WalkthroughFinalFragment +import org.oppia.android.app.walkthrough.topiclist.WalkthroughTopicListFragment +import org.oppia.android.app.walkthrough.welcome.WalkthroughWelcomeFragment import javax.inject.Provider /** Root subcomponent for all fragments. */ diff --git a/app/src/main/java/org/oppia/android/app/fragment/FragmentModule.kt b/app/src/main/java/org/oppia/android/app/fragment/FragmentModule.kt index 369774d558c..5d4e455b847 100644 --- a/app/src/main/java/org/oppia/android/app/fragment/FragmentModule.kt +++ b/app/src/main/java/org/oppia/android/app/fragment/FragmentModule.kt @@ -1,7 +1,7 @@ -package org.oppia.app.fragment +package org.oppia.android.app.fragment import dagger.Module -import org.oppia.app.view.ViewComponent +import org.oppia.android.app.view.ViewComponent /** Root fragment module. */ @Module(subcomponents = [ViewComponent::class]) diff --git a/app/src/main/java/org/oppia/android/app/fragment/FragmentScope.kt b/app/src/main/java/org/oppia/android/app/fragment/FragmentScope.kt index 2c7a0073fdb..7dfd6c66073 100644 --- a/app/src/main/java/org/oppia/android/app/fragment/FragmentScope.kt +++ b/app/src/main/java/org/oppia/android/app/fragment/FragmentScope.kt @@ -1,4 +1,4 @@ -package org.oppia.app.fragment +package org.oppia.android.app.fragment import javax.inject.Scope diff --git a/app/src/main/java/org/oppia/android/app/fragment/InjectableDialogFragment.kt b/app/src/main/java/org/oppia/android/app/fragment/InjectableDialogFragment.kt index 5a9fb1ed5ea..bd822635685 100644 --- a/app/src/main/java/org/oppia/android/app/fragment/InjectableDialogFragment.kt +++ b/app/src/main/java/org/oppia/android/app/fragment/InjectableDialogFragment.kt @@ -1,8 +1,8 @@ -package org.oppia.app.fragment +package org.oppia.android.app.fragment import android.content.Context import androidx.fragment.app.DialogFragment -import org.oppia.app.activity.InjectableAppCompatActivity +import org.oppia.android.app.activity.InjectableAppCompatActivity /** * A fragment that facilitates field injection to children. This fragment can only be used with diff --git a/app/src/main/java/org/oppia/android/app/fragment/InjectableFragment.kt b/app/src/main/java/org/oppia/android/app/fragment/InjectableFragment.kt index f18a4541cdb..465f3be1ec4 100644 --- a/app/src/main/java/org/oppia/android/app/fragment/InjectableFragment.kt +++ b/app/src/main/java/org/oppia/android/app/fragment/InjectableFragment.kt @@ -1,11 +1,11 @@ -package org.oppia.app.fragment +package org.oppia.android.app.fragment import android.content.Context import android.view.View import androidx.fragment.app.Fragment -import org.oppia.app.activity.InjectableAppCompatActivity -import org.oppia.app.shim.ViewComponentFactory -import org.oppia.app.view.ViewComponent +import org.oppia.android.app.activity.InjectableAppCompatActivity +import org.oppia.android.app.shim.ViewComponentFactory +import org.oppia.android.app.view.ViewComponent /** * A fragment that facilitates field injection to children. This fragment can only be used with diff --git a/app/src/main/java/org/oppia/android/app/help/HelpActivity.kt b/app/src/main/java/org/oppia/android/app/help/HelpActivity.kt index c13bc5b368f..c2b27dd47ae 100644 --- a/app/src/main/java/org/oppia/android/app/help/HelpActivity.kt +++ b/app/src/main/java/org/oppia/android/app/help/HelpActivity.kt @@ -1,12 +1,12 @@ -package org.oppia.app.help +package org.oppia.android.app.help import android.content.Context import android.content.Intent import android.os.Bundle -import org.oppia.app.R -import org.oppia.app.activity.InjectableAppCompatActivity -import org.oppia.app.drawer.KEY_NAVIGATION_PROFILE_ID -import org.oppia.app.help.faq.FAQListActivity +import org.oppia.android.R +import org.oppia.android.app.activity.InjectableAppCompatActivity +import org.oppia.android.app.drawer.KEY_NAVIGATION_PROFILE_ID +import org.oppia.android.app.help.faq.FAQListActivity import javax.inject.Inject /** The help page activity for FAQs and feedback. */ diff --git a/app/src/main/java/org/oppia/android/app/help/HelpActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/help/HelpActivityPresenter.kt index 109e4985419..a92de534199 100644 --- a/app/src/main/java/org/oppia/android/app/help/HelpActivityPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/help/HelpActivityPresenter.kt @@ -1,12 +1,12 @@ -package org.oppia.app.help +package org.oppia.android.app.help import android.view.View import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.widget.Toolbar import androidx.drawerlayout.widget.DrawerLayout -import org.oppia.app.R -import org.oppia.app.activity.ActivityScope -import org.oppia.app.drawer.NavigationDrawerFragment +import org.oppia.android.R +import org.oppia.android.app.activity.ActivityScope +import org.oppia.android.app.drawer.NavigationDrawerFragment import javax.inject.Inject /** The presenter for [HelpActivity]. */ diff --git a/app/src/main/java/org/oppia/android/app/help/HelpFragment.kt b/app/src/main/java/org/oppia/android/app/help/HelpFragment.kt index f76fcf99c22..9a8c7c52673 100644 --- a/app/src/main/java/org/oppia/android/app/help/HelpFragment.kt +++ b/app/src/main/java/org/oppia/android/app/help/HelpFragment.kt @@ -1,11 +1,11 @@ -package org.oppia.app.help +package org.oppia.android.app.help import android.content.Context import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import org.oppia.app.fragment.InjectableFragment +import org.oppia.android.app.fragment.InjectableFragment import javax.inject.Inject /** Fragment that contains help in the app. */ diff --git a/app/src/main/java/org/oppia/android/app/help/HelpFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/help/HelpFragmentPresenter.kt index f3a58d7671e..a8fc0b2852e 100644 --- a/app/src/main/java/org/oppia/android/app/help/HelpFragmentPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/help/HelpFragmentPresenter.kt @@ -1,4 +1,4 @@ -package org.oppia.app.help +package org.oppia.android.app.help import android.view.LayoutInflater import android.view.View @@ -6,11 +6,11 @@ import android.view.ViewGroup import androidx.appcompat.app.AppCompatActivity import androidx.fragment.app.Fragment import androidx.recyclerview.widget.LinearLayoutManager -import org.oppia.app.databinding.HelpFragmentBinding -import org.oppia.app.databinding.HelpItemBinding -import org.oppia.app.fragment.FragmentScope -import org.oppia.app.recyclerview.BindableAdapter -import org.oppia.app.viewmodel.ViewModelProvider +import org.oppia.android.app.fragment.FragmentScope +import org.oppia.android.app.recyclerview.BindableAdapter +import org.oppia.android.app.viewmodel.ViewModelProvider +import org.oppia.android.databinding.HelpFragmentBinding +import org.oppia.android.databinding.HelpItemBinding import javax.inject.Inject /** The presenter for [HelpFragment]. */ diff --git a/app/src/main/java/org/oppia/android/app/help/HelpItemViewModel.kt b/app/src/main/java/org/oppia/android/app/help/HelpItemViewModel.kt index e00ab933481..107cbe59fda 100644 --- a/app/src/main/java/org/oppia/android/app/help/HelpItemViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/help/HelpItemViewModel.kt @@ -1,8 +1,8 @@ -package org.oppia.app.help +package org.oppia.android.app.help import androidx.appcompat.app.AppCompatActivity -import org.oppia.app.R -import org.oppia.app.viewmodel.ObservableViewModel +import org.oppia.android.R +import org.oppia.android.app.viewmodel.ObservableViewModel /** [ObservableViewModel] for the recycler view of HelpActivity. */ class HelpItemViewModel( diff --git a/app/src/main/java/org/oppia/android/app/help/HelpItems.kt b/app/src/main/java/org/oppia/android/app/help/HelpItems.kt index 15a9c38f255..fdce0ded14f 100644 --- a/app/src/main/java/org/oppia/android/app/help/HelpItems.kt +++ b/app/src/main/java/org/oppia/android/app/help/HelpItems.kt @@ -1,4 +1,4 @@ -package org.oppia.app.help +package org.oppia.android.app.help /** Enum class containing the items for the Recycler view of [HelpActivity]. */ enum class HelpItems { diff --git a/app/src/main/java/org/oppia/android/app/help/HelpListViewModel.kt b/app/src/main/java/org/oppia/android/app/help/HelpListViewModel.kt index f69ead99fa0..758e25e8396 100644 --- a/app/src/main/java/org/oppia/android/app/help/HelpListViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/help/HelpListViewModel.kt @@ -1,8 +1,8 @@ -package org.oppia.app.help +package org.oppia.android.app.help import androidx.appcompat.app.AppCompatActivity -import org.oppia.app.R -import org.oppia.app.viewmodel.ObservableViewModel +import org.oppia.android.R +import org.oppia.android.app.viewmodel.ObservableViewModel import javax.inject.Inject /** View model in [HelpFragment]. */ diff --git a/app/src/main/java/org/oppia/android/app/help/RouteToFAQListListener.kt b/app/src/main/java/org/oppia/android/app/help/RouteToFAQListListener.kt index 0b37bc0e283..65673a046e1 100644 --- a/app/src/main/java/org/oppia/android/app/help/RouteToFAQListListener.kt +++ b/app/src/main/java/org/oppia/android/app/help/RouteToFAQListListener.kt @@ -1,4 +1,4 @@ -package org.oppia.app.help +package org.oppia.android.app.help /** Listener for when a selection should result to [FAQListActivity]. */ interface RouteToFAQListListener { diff --git a/app/src/main/java/org/oppia/android/app/help/faq/FAQListActivity.kt b/app/src/main/java/org/oppia/android/app/help/faq/FAQListActivity.kt index 976adb99bc7..aa902526424 100644 --- a/app/src/main/java/org/oppia/android/app/help/faq/FAQListActivity.kt +++ b/app/src/main/java/org/oppia/android/app/help/faq/FAQListActivity.kt @@ -1,12 +1,12 @@ -package org.oppia.app.help.faq +package org.oppia.android.app.help.faq import android.content.Context import android.content.Intent import android.os.Bundle import android.view.Menu -import org.oppia.app.R -import org.oppia.app.activity.InjectableAppCompatActivity -import org.oppia.app.help.faq.faqsingle.FAQSingleActivity +import org.oppia.android.R +import org.oppia.android.app.activity.InjectableAppCompatActivity +import org.oppia.android.app.help.faq.faqsingle.FAQSingleActivity import javax.inject.Inject /** The FAQ page activity for placement of different FAQs. */ diff --git a/app/src/main/java/org/oppia/android/app/help/faq/FAQListActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/help/faq/FAQListActivityPresenter.kt index 760cbbfbc3c..98e850e4f5e 100644 --- a/app/src/main/java/org/oppia/android/app/help/faq/FAQListActivityPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/help/faq/FAQListActivityPresenter.kt @@ -1,11 +1,11 @@ -package org.oppia.app.help.faq +package org.oppia.android.app.help.faq import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.widget.Toolbar import androidx.databinding.DataBindingUtil -import org.oppia.app.R -import org.oppia.app.activity.ActivityScope -import org.oppia.app.databinding.FaqListActivityBinding +import org.oppia.android.R +import org.oppia.android.app.activity.ActivityScope +import org.oppia.android.databinding.FaqListActivityBinding import javax.inject.Inject /** The presenter for [FAQListActivity]. */ diff --git a/app/src/main/java/org/oppia/android/app/help/faq/FAQListFragment.kt b/app/src/main/java/org/oppia/android/app/help/faq/FAQListFragment.kt index 907378459e8..d138b3a5666 100644 --- a/app/src/main/java/org/oppia/android/app/help/faq/FAQListFragment.kt +++ b/app/src/main/java/org/oppia/android/app/help/faq/FAQListFragment.kt @@ -1,11 +1,11 @@ -package org.oppia.app.help.faq +package org.oppia.android.app.help.faq import android.content.Context import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import org.oppia.app.fragment.InjectableFragment +import org.oppia.android.app.fragment.InjectableFragment import javax.inject.Inject /** Fragment that contains FAQ list in the app. */ diff --git a/app/src/main/java/org/oppia/android/app/help/faq/FAQListFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/help/faq/FAQListFragmentPresenter.kt index dcaf54571da..13a4f16c30f 100644 --- a/app/src/main/java/org/oppia/android/app/help/faq/FAQListFragmentPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/help/faq/FAQListFragmentPresenter.kt @@ -1,4 +1,4 @@ -package org.oppia.app.help.faq +package org.oppia.android.app.help.faq import android.view.LayoutInflater import android.view.View @@ -6,15 +6,15 @@ import android.view.ViewGroup import androidx.appcompat.app.AppCompatActivity import androidx.fragment.app.Fragment import androidx.recyclerview.widget.LinearLayoutManager -import org.oppia.app.databinding.FaqContentBinding -import org.oppia.app.databinding.FaqItemHeaderBinding -import org.oppia.app.databinding.FaqListFragmentBinding -import org.oppia.app.fragment.FragmentScope -import org.oppia.app.help.faq.faqItemViewModel.FAQContentViewModel -import org.oppia.app.help.faq.faqItemViewModel.FAQHeaderViewModel -import org.oppia.app.help.faq.faqItemViewModel.FAQItemViewModel -import org.oppia.app.recyclerview.BindableAdapter -import org.oppia.app.viewmodel.ViewModelProvider +import org.oppia.android.app.fragment.FragmentScope +import org.oppia.android.app.help.faq.faqItemViewModel.FAQContentViewModel +import org.oppia.android.app.help.faq.faqItemViewModel.FAQHeaderViewModel +import org.oppia.android.app.help.faq.faqItemViewModel.FAQItemViewModel +import org.oppia.android.app.recyclerview.BindableAdapter +import org.oppia.android.app.viewmodel.ViewModelProvider +import org.oppia.android.databinding.FaqContentBinding +import org.oppia.android.databinding.FaqItemHeaderBinding +import org.oppia.android.databinding.FaqListFragmentBinding import javax.inject.Inject /** The presenter for [FAQListFragment]. */ diff --git a/app/src/main/java/org/oppia/android/app/help/faq/FAQListViewModel.kt b/app/src/main/java/org/oppia/android/app/help/faq/FAQListViewModel.kt index ec73bec8d5f..0b74868eb41 100644 --- a/app/src/main/java/org/oppia/android/app/help/faq/FAQListViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/help/faq/FAQListViewModel.kt @@ -1,11 +1,11 @@ -package org.oppia.app.help.faq +package org.oppia.android.app.help.faq import androidx.appcompat.app.AppCompatActivity -import org.oppia.app.R -import org.oppia.app.help.faq.faqItemViewModel.FAQContentViewModel -import org.oppia.app.help.faq.faqItemViewModel.FAQHeaderViewModel -import org.oppia.app.help.faq.faqItemViewModel.FAQItemViewModel -import org.oppia.app.viewmodel.ObservableViewModel +import org.oppia.android.R +import org.oppia.android.app.help.faq.faqItemViewModel.FAQContentViewModel +import org.oppia.android.app.help.faq.faqItemViewModel.FAQHeaderViewModel +import org.oppia.android.app.help.faq.faqItemViewModel.FAQItemViewModel +import org.oppia.android.app.viewmodel.ObservableViewModel import javax.inject.Inject /** View model in [FAQListFragment]. */ diff --git a/app/src/main/java/org/oppia/android/app/help/faq/RouteToFAQSingleListener.kt b/app/src/main/java/org/oppia/android/app/help/faq/RouteToFAQSingleListener.kt index 1ef2e6418b9..9afbda56dd6 100644 --- a/app/src/main/java/org/oppia/android/app/help/faq/RouteToFAQSingleListener.kt +++ b/app/src/main/java/org/oppia/android/app/help/faq/RouteToFAQSingleListener.kt @@ -1,4 +1,4 @@ -package org.oppia.app.help.faq +package org.oppia.android.app.help.faq /** Listener for when a selection should result to [FAQSingleActivity]. */ interface RouteToFAQSingleListener { diff --git a/app/src/main/java/org/oppia/android/app/help/faq/faqItemViewModel/FAQContentViewModel.kt b/app/src/main/java/org/oppia/android/app/help/faq/faqItemViewModel/FAQContentViewModel.kt index a992de87b82..9dbf5fc7790 100644 --- a/app/src/main/java/org/oppia/android/app/help/faq/faqItemViewModel/FAQContentViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/help/faq/faqItemViewModel/FAQContentViewModel.kt @@ -1,8 +1,8 @@ -package org.oppia.app.help.faq.faqItemViewModel +package org.oppia.android.app.help.faq.faqItemViewModel import androidx.appcompat.app.AppCompatActivity import androidx.databinding.ObservableField -import org.oppia.app.help.faq.RouteToFAQSingleListener +import org.oppia.android.app.help.faq.RouteToFAQSingleListener /** Content view model for the recycler view in [FAQFragment]. */ class FAQContentViewModel( diff --git a/app/src/main/java/org/oppia/android/app/help/faq/faqItemViewModel/FAQHeaderViewModel.kt b/app/src/main/java/org/oppia/android/app/help/faq/faqItemViewModel/FAQHeaderViewModel.kt index eca53189a98..39307640712 100644 --- a/app/src/main/java/org/oppia/android/app/help/faq/faqItemViewModel/FAQHeaderViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/help/faq/faqItemViewModel/FAQHeaderViewModel.kt @@ -1,4 +1,4 @@ -package org.oppia.app.help.faq.faqItemViewModel +package org.oppia.android.app.help.faq.faqItemViewModel /** Header view model for the recycler view in [FAQFragment]. */ class FAQHeaderViewModel : FAQItemViewModel() diff --git a/app/src/main/java/org/oppia/android/app/help/faq/faqItemViewModel/FAQItemViewModel.kt b/app/src/main/java/org/oppia/android/app/help/faq/faqItemViewModel/FAQItemViewModel.kt index b5d4cd12230..29e623e5e13 100644 --- a/app/src/main/java/org/oppia/android/app/help/faq/faqItemViewModel/FAQItemViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/help/faq/faqItemViewModel/FAQItemViewModel.kt @@ -1,6 +1,6 @@ -package org.oppia.app.help.faq.faqItemViewModel +package org.oppia.android.app.help.faq.faqItemViewModel -import org.oppia.app.viewmodel.ObservableViewModel +import org.oppia.android.app.viewmodel.ObservableViewModel /** Super-class for generalising different views for the recyclerView in [FAQFragment]. */ abstract class FAQItemViewModel : ObservableViewModel() diff --git a/app/src/main/java/org/oppia/android/app/help/faq/faqsingle/FAQSingleActivity.kt b/app/src/main/java/org/oppia/android/app/help/faq/faqsingle/FAQSingleActivity.kt index 9900dc434d4..1a92313fbef 100644 --- a/app/src/main/java/org/oppia/android/app/help/faq/faqsingle/FAQSingleActivity.kt +++ b/app/src/main/java/org/oppia/android/app/help/faq/faqsingle/FAQSingleActivity.kt @@ -1,9 +1,9 @@ -package org.oppia.app.help.faq.faqsingle +package org.oppia.android.app.help.faq.faqsingle import android.content.Context import android.content.Intent import android.os.Bundle -import org.oppia.app.activity.InjectableAppCompatActivity +import org.oppia.android.app.activity.InjectableAppCompatActivity import javax.inject.Inject /** The FAQ page activity for placement of single FAQ. */ diff --git a/app/src/main/java/org/oppia/android/app/help/faq/faqsingle/FAQSingleActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/help/faq/faqsingle/FAQSingleActivityPresenter.kt index d968a58deb5..4e28fcbb345 100644 --- a/app/src/main/java/org/oppia/android/app/help/faq/faqsingle/FAQSingleActivityPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/help/faq/faqsingle/FAQSingleActivityPresenter.kt @@ -1,4 +1,4 @@ -package org.oppia.app.help.faq.faqsingle +package org.oppia.android.app.help.faq.faqsingle import android.os.Build import android.text.Html @@ -6,9 +6,9 @@ import android.widget.TextView import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.widget.Toolbar import androidx.databinding.DataBindingUtil -import org.oppia.app.R -import org.oppia.app.activity.ActivityScope -import org.oppia.app.databinding.FaqSingleActivityBinding +import org.oppia.android.R +import org.oppia.android.app.activity.ActivityScope +import org.oppia.android.databinding.FaqSingleActivityBinding import javax.inject.Inject /** The presenter for [FAQSingleActivity]. */ diff --git a/app/src/main/java/org/oppia/android/app/hintsandsolution/ExpandedHintListIndexListener.kt b/app/src/main/java/org/oppia/android/app/hintsandsolution/ExpandedHintListIndexListener.kt index 23d0962eb77..bdac01524d3 100644 --- a/app/src/main/java/org/oppia/android/app/hintsandsolution/ExpandedHintListIndexListener.kt +++ b/app/src/main/java/org/oppia/android/app/hintsandsolution/ExpandedHintListIndexListener.kt @@ -1,4 +1,4 @@ -package org.oppia.app.hintsandsolution +package org.oppia.android.app.hintsandsolution /** * Interface to keep track of hint-index for which HintList is visible/expanded. diff --git a/app/src/main/java/org/oppia/android/app/hintsandsolution/HintsAndSolutionAdapter.kt b/app/src/main/java/org/oppia/android/app/hintsandsolution/HintsAndSolutionAdapter.kt index cdf8254f33f..e54880d4acc 100644 --- a/app/src/main/java/org/oppia/android/app/hintsandsolution/HintsAndSolutionAdapter.kt +++ b/app/src/main/java/org/oppia/android/app/hintsandsolution/HintsAndSolutionAdapter.kt @@ -1,14 +1,14 @@ -package org.oppia.app.hintsandsolution +package org.oppia.android.app.hintsandsolution import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.recyclerview.widget.RecyclerView -import org.oppia.app.databinding.HintsDividerBinding -import org.oppia.app.databinding.HintsSummaryBinding -import org.oppia.app.databinding.SolutionSummaryBinding -import org.oppia.util.parser.HtmlParser +import org.oppia.android.databinding.HintsDividerBinding +import org.oppia.android.databinding.HintsSummaryBinding +import org.oppia.android.databinding.SolutionSummaryBinding +import org.oppia.android.util.parser.HtmlParser // TODO(#216): Make use of generic data-binding-enabled RecyclerView adapter. diff --git a/app/src/main/java/org/oppia/android/app/hintsandsolution/HintsAndSolutionDialogFragment.kt b/app/src/main/java/org/oppia/android/app/hintsandsolution/HintsAndSolutionDialogFragment.kt index 5f617342c0e..27b0e5b670b 100644 --- a/app/src/main/java/org/oppia/android/app/hintsandsolution/HintsAndSolutionDialogFragment.kt +++ b/app/src/main/java/org/oppia/android/app/hintsandsolution/HintsAndSolutionDialogFragment.kt @@ -1,13 +1,13 @@ -package org.oppia.app.hintsandsolution +package org.oppia.android.app.hintsandsolution import android.content.Context import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import org.oppia.app.R -import org.oppia.app.fragment.InjectableDialogFragment -import org.oppia.app.model.State +import org.oppia.android.R +import org.oppia.android.app.fragment.InjectableDialogFragment +import org.oppia.android.app.model.State import javax.inject.Inject private const val CURRENT_EXPANDED_LIST_INDEX_SAVED_KEY = "CURRENT_EXPANDED_LIST_INDEX" diff --git a/app/src/main/java/org/oppia/android/app/hintsandsolution/HintsAndSolutionDialogFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/hintsandsolution/HintsAndSolutionDialogFragmentPresenter.kt index 2d3c3d77532..4fcfefcab61 100644 --- a/app/src/main/java/org/oppia/android/app/hintsandsolution/HintsAndSolutionDialogFragmentPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/hintsandsolution/HintsAndSolutionDialogFragmentPresenter.kt @@ -1,17 +1,17 @@ -package org.oppia.app.hintsandsolution +package org.oppia.android.app.hintsandsolution import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.fragment.app.Fragment -import org.oppia.app.R -import org.oppia.app.databinding.HintsAndSolutionFragmentBinding -import org.oppia.app.fragment.FragmentScope -import org.oppia.app.model.State -import org.oppia.app.viewmodel.ViewModelProvider -import org.oppia.util.gcsresource.DefaultResourceBucketName -import org.oppia.util.parser.ExplorationHtmlParserEntityType -import org.oppia.util.parser.HtmlParser +import org.oppia.android.R +import org.oppia.android.app.fragment.FragmentScope +import org.oppia.android.app.model.State +import org.oppia.android.app.viewmodel.ViewModelProvider +import org.oppia.android.databinding.HintsAndSolutionFragmentBinding +import org.oppia.android.util.gcsresource.DefaultResourceBucketName +import org.oppia.android.util.parser.ExplorationHtmlParserEntityType +import org.oppia.android.util.parser.HtmlParser import javax.inject.Inject /** Presenter for [HintsAndSolutionDialogFragment], sets up bindings from ViewModel. */ diff --git a/app/src/main/java/org/oppia/android/app/hintsandsolution/HintsAndSolutionItemViewModel.kt b/app/src/main/java/org/oppia/android/app/hintsandsolution/HintsAndSolutionItemViewModel.kt index b333e1d8cea..ff23090b6a2 100644 --- a/app/src/main/java/org/oppia/android/app/hintsandsolution/HintsAndSolutionItemViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/hintsandsolution/HintsAndSolutionItemViewModel.kt @@ -1,6 +1,6 @@ -package org.oppia.app.hintsandsolution +package org.oppia.android.app.hintsandsolution -import org.oppia.app.viewmodel.ObservableViewModel +import org.oppia.android.app.viewmodel.ObservableViewModel /** The root [ViewModel] for all individual items that may be displayed in [HintsAndSolutionDialogFragment] recycler view. */ abstract class HintsAndSolutionItemViewModel : ObservableViewModel() diff --git a/app/src/main/java/org/oppia/android/app/hintsandsolution/HintsAndSolutionListener.kt b/app/src/main/java/org/oppia/android/app/hintsandsolution/HintsAndSolutionListener.kt index 0d39602e054..08b3eef2783 100644 --- a/app/src/main/java/org/oppia/android/app/hintsandsolution/HintsAndSolutionListener.kt +++ b/app/src/main/java/org/oppia/android/app/hintsandsolution/HintsAndSolutionListener.kt @@ -1,4 +1,4 @@ -package org.oppia.app.hintsandsolution +package org.oppia.android.app.hintsandsolution /** Allows parent activity to dismiss the [HintsAndSolutionFragmentt] */ interface HintsAndSolutionListener { diff --git a/app/src/main/java/org/oppia/android/app/hintsandsolution/HintsDividerViewModel.kt b/app/src/main/java/org/oppia/android/app/hintsandsolution/HintsDividerViewModel.kt index 9e756b5f14f..595b1c04add 100644 --- a/app/src/main/java/org/oppia/android/app/hintsandsolution/HintsDividerViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/hintsandsolution/HintsDividerViewModel.kt @@ -1,3 +1,3 @@ -package org.oppia.app.hintsandsolution +package org.oppia.android.app.hintsandsolution class HintsDividerViewModel : HintsAndSolutionItemViewModel() diff --git a/app/src/main/java/org/oppia/android/app/hintsandsolution/HintsViewModel.kt b/app/src/main/java/org/oppia/android/app/hintsandsolution/HintsViewModel.kt index d0aea0f6f03..6906afb3e11 100644 --- a/app/src/main/java/org/oppia/android/app/hintsandsolution/HintsViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/hintsandsolution/HintsViewModel.kt @@ -1,10 +1,10 @@ -package org.oppia.app.hintsandsolution +package org.oppia.android.app.hintsandsolution import androidx.databinding.ObservableField import androidx.lifecycle.ViewModel -import org.oppia.app.fragment.FragmentScope -import org.oppia.app.model.Hint -import org.oppia.app.model.Solution +import org.oppia.android.app.fragment.FragmentScope +import org.oppia.android.app.model.Hint +import org.oppia.android.app.model.Solution import javax.inject.Inject /** [ViewModel] for Hints in [HintsAndSolutionDialogFragment]. */ diff --git a/app/src/main/java/org/oppia/android/app/hintsandsolution/RevealHintListener.kt b/app/src/main/java/org/oppia/android/app/hintsandsolution/RevealHintListener.kt index f21e167fbfa..72b263c6842 100755 --- a/app/src/main/java/org/oppia/android/app/hintsandsolution/RevealHintListener.kt +++ b/app/src/main/java/org/oppia/android/app/hintsandsolution/RevealHintListener.kt @@ -1,4 +1,4 @@ -package org.oppia.app.hintsandsolution +package org.oppia.android.app.hintsandsolution /** Interface to check the preference regarding alert for [HintsAndSolutionDialogFragment]. */ interface RevealHintListener { diff --git a/app/src/main/java/org/oppia/android/app/hintsandsolution/RevealSolutionDialogFragment.kt b/app/src/main/java/org/oppia/android/app/hintsandsolution/RevealSolutionDialogFragment.kt index a4e8af91bc0..9fab17d85b8 100755 --- a/app/src/main/java/org/oppia/android/app/hintsandsolution/RevealSolutionDialogFragment.kt +++ b/app/src/main/java/org/oppia/android/app/hintsandsolution/RevealSolutionDialogFragment.kt @@ -1,4 +1,4 @@ -package org.oppia.app.hintsandsolution +package org.oppia.android.app.hintsandsolution import android.app.Dialog import android.content.Context @@ -7,7 +7,7 @@ import android.view.View import androidx.appcompat.app.AlertDialog import androidx.appcompat.view.ContextThemeWrapper import androidx.fragment.app.DialogFragment -import org.oppia.app.R +import org.oppia.android.R /** * DialogFragment that asks to the user if they want to reveal solution. diff --git a/app/src/main/java/org/oppia/android/app/hintsandsolution/RevealSolutionInterface.kt b/app/src/main/java/org/oppia/android/app/hintsandsolution/RevealSolutionInterface.kt index 4835ffe9047..726ac51d479 100755 --- a/app/src/main/java/org/oppia/android/app/hintsandsolution/RevealSolutionInterface.kt +++ b/app/src/main/java/org/oppia/android/app/hintsandsolution/RevealSolutionInterface.kt @@ -1,4 +1,4 @@ -package org.oppia.app.hintsandsolution +package org.oppia.android.app.hintsandsolution /** Interface to check the preference regarding alert for [HintsAndSolutionDialogFragment]. */ interface RevealSolutionInterface { diff --git a/app/src/main/java/org/oppia/android/app/hintsandsolution/SolutionViewModel.kt b/app/src/main/java/org/oppia/android/app/hintsandsolution/SolutionViewModel.kt index f507d65f07d..84a9befdff5 100644 --- a/app/src/main/java/org/oppia/android/app/hintsandsolution/SolutionViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/hintsandsolution/SolutionViewModel.kt @@ -1,4 +1,4 @@ -package org.oppia.app.hintsandsolution +package org.oppia.android.app.hintsandsolution import androidx.databinding.ObservableField import androidx.lifecycle.ViewModel diff --git a/app/src/main/java/org/oppia/android/app/home/HomeActivity.kt b/app/src/main/java/org/oppia/android/app/home/HomeActivity.kt index c5d4fec2765..120ef58852b 100644 --- a/app/src/main/java/org/oppia/android/app/home/HomeActivity.kt +++ b/app/src/main/java/org/oppia/android/app/home/HomeActivity.kt @@ -1,14 +1,14 @@ -package org.oppia.app.home +package org.oppia.android.app.home import android.content.Context import android.content.Intent import android.os.Bundle import androidx.appcompat.app.AlertDialog -import org.oppia.app.R -import org.oppia.app.activity.InjectableAppCompatActivity -import org.oppia.app.drawer.KEY_NAVIGATION_PROFILE_ID -import org.oppia.app.profile.ProfileChooserActivity -import org.oppia.app.topic.TopicActivity +import org.oppia.android.R +import org.oppia.android.app.activity.InjectableAppCompatActivity +import org.oppia.android.app.drawer.KEY_NAVIGATION_PROFILE_ID +import org.oppia.android.app.profile.ProfileChooserActivity +import org.oppia.android.app.topic.TopicActivity import javax.inject.Inject /** The central activity for all users entering the app. */ diff --git a/app/src/main/java/org/oppia/android/app/home/HomeActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/home/HomeActivityPresenter.kt index daee7ead099..91614a2cd81 100644 --- a/app/src/main/java/org/oppia/android/app/home/HomeActivityPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/home/HomeActivityPresenter.kt @@ -1,12 +1,12 @@ -package org.oppia.app.home +package org.oppia.android.app.home import android.view.View import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.widget.Toolbar import androidx.drawerlayout.widget.DrawerLayout -import org.oppia.app.R -import org.oppia.app.activity.ActivityScope -import org.oppia.app.drawer.NavigationDrawerFragment +import org.oppia.android.R +import org.oppia.android.app.activity.ActivityScope +import org.oppia.android.app.drawer.NavigationDrawerFragment import javax.inject.Inject const val TAG_HOME_FRAGMENT = "HOME_FRAGMENT" diff --git a/app/src/main/java/org/oppia/android/app/home/HomeFragment.kt b/app/src/main/java/org/oppia/android/app/home/HomeFragment.kt index e03e79e9ca0..1dd8bd40439 100644 --- a/app/src/main/java/org/oppia/android/app/home/HomeFragment.kt +++ b/app/src/main/java/org/oppia/android/app/home/HomeFragment.kt @@ -1,13 +1,13 @@ -package org.oppia.app.home +package org.oppia.android.app.home import android.content.Context import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import org.oppia.app.fragment.InjectableFragment -import org.oppia.app.home.topiclist.TopicSummaryClickListener -import org.oppia.app.model.TopicSummary +import org.oppia.android.app.fragment.InjectableFragment +import org.oppia.android.app.home.topiclist.TopicSummaryClickListener +import org.oppia.android.app.model.TopicSummary import javax.inject.Inject /** Fragment that contains an introduction to the app. */ diff --git a/app/src/main/java/org/oppia/android/app/home/HomeFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/home/HomeFragmentPresenter.kt index 245071e79ad..c09cdcc2a55 100644 --- a/app/src/main/java/org/oppia/android/app/home/HomeFragmentPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/home/HomeFragmentPresenter.kt @@ -1,4 +1,4 @@ -package org.oppia.app.home +package org.oppia.android.app.home import android.view.LayoutInflater import android.view.View @@ -9,32 +9,32 @@ import androidx.lifecycle.LiveData import androidx.lifecycle.Observer import androidx.lifecycle.Transformations import androidx.recyclerview.widget.GridLayoutManager -import org.oppia.app.R -import org.oppia.app.databinding.HomeFragmentBinding -import org.oppia.app.drawer.KEY_NAVIGATION_PROFILE_ID -import org.oppia.app.fragment.FragmentScope -import org.oppia.app.home.topiclist.AllTopicsViewModel -import org.oppia.app.home.topiclist.PromotedStoryListViewModel -import org.oppia.app.home.topiclist.PromotedStoryViewModel -import org.oppia.app.home.topiclist.TopicListAdapter -import org.oppia.app.home.topiclist.TopicSummaryClickListener -import org.oppia.app.home.topiclist.TopicSummaryViewModel -import org.oppia.app.model.EventLog -import org.oppia.app.model.OngoingStoryList -import org.oppia.app.model.Profile -import org.oppia.app.model.ProfileId -import org.oppia.app.model.TopicList -import org.oppia.app.model.TopicSummary -import org.oppia.app.shim.IntentFactoryShim -import org.oppia.domain.oppialogger.OppiaLogger -import org.oppia.domain.profile.ProfileManagementController -import org.oppia.domain.topic.TopicListController -import org.oppia.util.data.AsyncResult -import org.oppia.util.datetime.DateTimeUtil -import org.oppia.util.logging.ConsoleLogger -import org.oppia.util.parser.StoryHtmlParserEntityType -import org.oppia.util.parser.TopicHtmlParserEntityType -import org.oppia.util.system.OppiaClock +import org.oppia.android.R +import org.oppia.android.app.drawer.KEY_NAVIGATION_PROFILE_ID +import org.oppia.android.app.fragment.FragmentScope +import org.oppia.android.app.home.topiclist.AllTopicsViewModel +import org.oppia.android.app.home.topiclist.PromotedStoryListViewModel +import org.oppia.android.app.home.topiclist.PromotedStoryViewModel +import org.oppia.android.app.home.topiclist.TopicListAdapter +import org.oppia.android.app.home.topiclist.TopicSummaryClickListener +import org.oppia.android.app.home.topiclist.TopicSummaryViewModel +import org.oppia.android.app.model.EventLog +import org.oppia.android.app.model.OngoingStoryList +import org.oppia.android.app.model.Profile +import org.oppia.android.app.model.ProfileId +import org.oppia.android.app.model.TopicList +import org.oppia.android.app.model.TopicSummary +import org.oppia.android.app.shim.IntentFactoryShim +import org.oppia.android.databinding.HomeFragmentBinding +import org.oppia.android.domain.oppialogger.OppiaLogger +import org.oppia.android.domain.profile.ProfileManagementController +import org.oppia.android.domain.topic.TopicListController +import org.oppia.android.util.data.AsyncResult +import org.oppia.android.util.datetime.DateTimeUtil +import org.oppia.android.util.logging.ConsoleLogger +import org.oppia.android.util.parser.StoryHtmlParserEntityType +import org.oppia.android.util.parser.TopicHtmlParserEntityType +import org.oppia.android.util.system.OppiaClock import javax.inject.Inject /** The presenter for [HomeFragment]. */ diff --git a/app/src/main/java/org/oppia/android/app/home/HomeItemViewModel.kt b/app/src/main/java/org/oppia/android/app/home/HomeItemViewModel.kt index 00c81e5b772..4cd6675658d 100644 --- a/app/src/main/java/org/oppia/android/app/home/HomeItemViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/home/HomeItemViewModel.kt @@ -1,6 +1,6 @@ -package org.oppia.app.home +package org.oppia.android.app.home -import org.oppia.app.viewmodel.ObservableViewModel +import org.oppia.android.app.viewmodel.ObservableViewModel /** The root [ViewModel] for all individual items that may be displayed in home fragment recycler view. */ abstract class HomeItemViewModel : ObservableViewModel() diff --git a/app/src/main/java/org/oppia/android/app/home/RouteToExplorationListener.kt b/app/src/main/java/org/oppia/android/app/home/RouteToExplorationListener.kt index 1409107eb3d..86cff149c07 100755 --- a/app/src/main/java/org/oppia/android/app/home/RouteToExplorationListener.kt +++ b/app/src/main/java/org/oppia/android/app/home/RouteToExplorationListener.kt @@ -1,4 +1,4 @@ -package org.oppia.app.home +package org.oppia.android.app.home /** Listener for when an activity should route to a exploration. */ interface RouteToExplorationListener { diff --git a/app/src/main/java/org/oppia/android/app/home/RouteToRecentlyPlayedListener.kt b/app/src/main/java/org/oppia/android/app/home/RouteToRecentlyPlayedListener.kt index c87a8cb828a..127ecdb5198 100755 --- a/app/src/main/java/org/oppia/android/app/home/RouteToRecentlyPlayedListener.kt +++ b/app/src/main/java/org/oppia/android/app/home/RouteToRecentlyPlayedListener.kt @@ -1,4 +1,4 @@ -package org.oppia.app.home +package org.oppia.android.app.home /** Listener for when an activity should route to [RecentlyPlayedActivity]. */ interface RouteToRecentlyPlayedListener { diff --git a/app/src/main/java/org/oppia/android/app/home/RouteToTopicListener.kt b/app/src/main/java/org/oppia/android/app/home/RouteToTopicListener.kt index 7723d88ebb6..36c7a1a1d94 100755 --- a/app/src/main/java/org/oppia/android/app/home/RouteToTopicListener.kt +++ b/app/src/main/java/org/oppia/android/app/home/RouteToTopicListener.kt @@ -1,4 +1,4 @@ -package org.oppia.app.home +package org.oppia.android.app.home /** Listener for when an activity should route to a topic. */ interface RouteToTopicListener { diff --git a/app/src/main/java/org/oppia/android/app/home/RouteToTopicPlayStoryListener.kt b/app/src/main/java/org/oppia/android/app/home/RouteToTopicPlayStoryListener.kt index b2468004f8c..aa7121f1c07 100755 --- a/app/src/main/java/org/oppia/android/app/home/RouteToTopicPlayStoryListener.kt +++ b/app/src/main/java/org/oppia/android/app/home/RouteToTopicPlayStoryListener.kt @@ -1,4 +1,4 @@ -package org.oppia.app.home +package org.oppia.android.app.home /** Listener for when an activity should route to a story-item in TopicPlay tab. */ interface RouteToTopicPlayStoryListener { diff --git a/app/src/main/java/org/oppia/android/app/home/WelcomeViewModel.kt b/app/src/main/java/org/oppia/android/app/home/WelcomeViewModel.kt index 919278a9dcf..bf207c1931f 100644 --- a/app/src/main/java/org/oppia/android/app/home/WelcomeViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/home/WelcomeViewModel.kt @@ -1,4 +1,4 @@ -package org.oppia.app.home +package org.oppia.android.app.home import androidx.databinding.ObservableField import androidx.lifecycle.ViewModel diff --git a/app/src/main/java/org/oppia/android/app/home/recentlyplayed/OngoingListAdapter.kt b/app/src/main/java/org/oppia/android/app/home/recentlyplayed/OngoingListAdapter.kt index 2ce019c7314..7d52cb3e03b 100644 --- a/app/src/main/java/org/oppia/android/app/home/recentlyplayed/OngoingListAdapter.kt +++ b/app/src/main/java/org/oppia/android/app/home/recentlyplayed/OngoingListAdapter.kt @@ -1,4 +1,4 @@ -package org.oppia.app.home.recentlyplayed +package org.oppia.android.app.home.recentlyplayed import android.content.Context import android.content.res.Configuration @@ -7,9 +7,9 @@ import android.view.LayoutInflater import android.view.ViewGroup import androidx.appcompat.app.AppCompatActivity import androidx.recyclerview.widget.RecyclerView -import org.oppia.app.R -import org.oppia.app.databinding.OngoingStoryCardBinding -import org.oppia.app.databinding.SectionTitleBinding +import org.oppia.android.R +import org.oppia.android.databinding.OngoingStoryCardBinding +import org.oppia.android.databinding.SectionTitleBinding private const val VIEW_TYPE_SECTION_TITLE_TEXT = 1 private const val VIEW_TYPE_SECTION_STORY_ITEM = 2 diff --git a/app/src/main/java/org/oppia/android/app/home/recentlyplayed/OngoingStoryClickListener.kt b/app/src/main/java/org/oppia/android/app/home/recentlyplayed/OngoingStoryClickListener.kt index e2a1d9f0c30..007f6dfd2f4 100755 --- a/app/src/main/java/org/oppia/android/app/home/recentlyplayed/OngoingStoryClickListener.kt +++ b/app/src/main/java/org/oppia/android/app/home/recentlyplayed/OngoingStoryClickListener.kt @@ -1,6 +1,6 @@ -package org.oppia.app.home.recentlyplayed +package org.oppia.android.app.home.recentlyplayed -import org.oppia.app.model.PromotedStory +import org.oppia.android.app.model.PromotedStory /** Listener interface for when ongoing story is clicked in the UI. */ interface OngoingStoryClickListener { diff --git a/app/src/main/java/org/oppia/android/app/home/recentlyplayed/OngoingStoryViewModel.kt b/app/src/main/java/org/oppia/android/app/home/recentlyplayed/OngoingStoryViewModel.kt index 680bc16ce63..ca4754524e0 100755 --- a/app/src/main/java/org/oppia/android/app/home/recentlyplayed/OngoingStoryViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/home/recentlyplayed/OngoingStoryViewModel.kt @@ -1,8 +1,8 @@ -package org.oppia.app.home.recentlyplayed +package org.oppia.android.app.home.recentlyplayed import android.view.View import androidx.lifecycle.ViewModel -import org.oppia.app.model.PromotedStory +import org.oppia.android.app.model.PromotedStory // TODO(#297): Add download status information to promoted-story-card. diff --git a/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedActivity.kt b/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedActivity.kt index 0d1fa154f18..fcb09bc3876 100644 --- a/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedActivity.kt +++ b/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedActivity.kt @@ -1,11 +1,11 @@ -package org.oppia.app.home.recentlyplayed +package org.oppia.android.app.home.recentlyplayed import android.content.Context import android.content.Intent import android.os.Bundle -import org.oppia.app.activity.InjectableAppCompatActivity -import org.oppia.app.home.RouteToExplorationListener -import org.oppia.app.player.exploration.ExplorationActivity +import org.oppia.android.app.activity.InjectableAppCompatActivity +import org.oppia.android.app.home.RouteToExplorationListener +import org.oppia.android.app.player.exploration.ExplorationActivity import javax.inject.Inject /** Activity for recent stories. */ diff --git a/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedActivityPresenter.kt index 2141e869a73..1826587f235 100644 --- a/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedActivityPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedActivityPresenter.kt @@ -1,8 +1,8 @@ -package org.oppia.app.home.recentlyplayed +package org.oppia.android.app.home.recentlyplayed import androidx.appcompat.app.AppCompatActivity -import org.oppia.app.R -import org.oppia.app.activity.ActivityScope +import org.oppia.android.R +import org.oppia.android.app.activity.ActivityScope import javax.inject.Inject /** The presenter for [RecentlyPlayedActivity]. */ diff --git a/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedFragment.kt b/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedFragment.kt index 33056c1999e..c11740ba0b0 100644 --- a/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedFragment.kt +++ b/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedFragment.kt @@ -1,12 +1,12 @@ -package org.oppia.app.home.recentlyplayed +package org.oppia.android.app.home.recentlyplayed import android.content.Context import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import org.oppia.app.fragment.InjectableFragment -import org.oppia.app.model.PromotedStory +import org.oppia.android.app.fragment.InjectableFragment +import org.oppia.android.app.model.PromotedStory import javax.inject.Inject private const val RECENTLY_PLAYED_FRAGMENT_INTERNAL_PROFILE_ID_KEY = diff --git a/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedFragmentPresenter.kt index 2160b91e4fe..0a2cb59c686 100755 --- a/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedFragmentPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedFragmentPresenter.kt @@ -1,4 +1,4 @@ -package org.oppia.app.home.recentlyplayed +package org.oppia.android.app.home.recentlyplayed import android.content.res.Resources import android.view.LayoutInflater @@ -11,18 +11,18 @@ import androidx.lifecycle.Observer import androidx.lifecycle.Transformations import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.RecyclerView -import org.oppia.app.R -import org.oppia.app.databinding.RecentlyPlayedFragmentBinding -import org.oppia.app.fragment.FragmentScope -import org.oppia.app.home.RouteToExplorationListener -import org.oppia.app.model.OngoingStoryList -import org.oppia.app.model.ProfileId -import org.oppia.app.model.PromotedStory -import org.oppia.domain.exploration.ExplorationDataController -import org.oppia.domain.topic.TopicListController -import org.oppia.util.data.AsyncResult -import org.oppia.util.logging.ConsoleLogger -import org.oppia.util.parser.StoryHtmlParserEntityType +import org.oppia.android.R +import org.oppia.android.app.fragment.FragmentScope +import org.oppia.android.app.home.RouteToExplorationListener +import org.oppia.android.app.model.OngoingStoryList +import org.oppia.android.app.model.ProfileId +import org.oppia.android.app.model.PromotedStory +import org.oppia.android.databinding.RecentlyPlayedFragmentBinding +import org.oppia.android.domain.exploration.ExplorationDataController +import org.oppia.android.domain.topic.TopicListController +import org.oppia.android.util.data.AsyncResult +import org.oppia.android.util.logging.ConsoleLogger +import org.oppia.android.util.parser.StoryHtmlParserEntityType import javax.inject.Inject /** The presenter for [RecentlyPlayedFragment]. */ diff --git a/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedItemViewModel.kt b/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedItemViewModel.kt index 9f5ac5c04fb..6413c55f4a8 100644 --- a/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedItemViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedItemViewModel.kt @@ -1,6 +1,6 @@ -package org.oppia.app.home.recentlyplayed +package org.oppia.android.app.home.recentlyplayed -import org.oppia.app.viewmodel.ObservableViewModel +import org.oppia.android.app.viewmodel.ObservableViewModel /** * The root [ObservableViewModel] for all individual items that may be displayed in recently-played diff --git a/app/src/main/java/org/oppia/android/app/home/recentlyplayed/SectionTitleViewModel.kt b/app/src/main/java/org/oppia/android/app/home/recentlyplayed/SectionTitleViewModel.kt index 5196ac40bcf..0ae35924240 100644 --- a/app/src/main/java/org/oppia/android/app/home/recentlyplayed/SectionTitleViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/home/recentlyplayed/SectionTitleViewModel.kt @@ -1,4 +1,4 @@ -package org.oppia.app.home.recentlyplayed +package org.oppia.android.app.home.recentlyplayed import androidx.lifecycle.ViewModel diff --git a/app/src/main/java/org/oppia/android/app/home/topiclist/AllTopicsViewModel.kt b/app/src/main/java/org/oppia/android/app/home/topiclist/AllTopicsViewModel.kt index ba019b4793f..7e8e9a3777e 100644 --- a/app/src/main/java/org/oppia/android/app/home/topiclist/AllTopicsViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/home/topiclist/AllTopicsViewModel.kt @@ -1,7 +1,7 @@ -package org.oppia.app.home.topiclist +package org.oppia.android.app.home.topiclist import androidx.lifecycle.ViewModel -import org.oppia.app.home.HomeItemViewModel +import org.oppia.android.app.home.HomeItemViewModel /** [ViewModel] all topics text in [HomeFragment]. */ class AllTopicsViewModel : HomeItemViewModel() diff --git a/app/src/main/java/org/oppia/android/app/home/topiclist/PromotedStoryListAdapter.kt b/app/src/main/java/org/oppia/android/app/home/topiclist/PromotedStoryListAdapter.kt index 041f4e605e9..aaf28ca84a2 100644 --- a/app/src/main/java/org/oppia/android/app/home/topiclist/PromotedStoryListAdapter.kt +++ b/app/src/main/java/org/oppia/android/app/home/topiclist/PromotedStoryListAdapter.kt @@ -1,4 +1,4 @@ -package org.oppia.app.home.topiclist +package org.oppia.android.app.home.topiclist import android.content.Context import android.content.res.Configuration @@ -7,8 +7,8 @@ import android.view.LayoutInflater import android.view.ViewGroup import androidx.appcompat.app.AppCompatActivity import androidx.recyclerview.widget.RecyclerView -import org.oppia.app.R -import org.oppia.app.databinding.PromotedStoryCardBinding +import org.oppia.android.R +import org.oppia.android.databinding.PromotedStoryCardBinding /** Adapter to bind promoted stories to [RecyclerView] inside [HomeFragment] to create carousel. */ class PromotedStoryListAdapter( diff --git a/app/src/main/java/org/oppia/android/app/home/topiclist/PromotedStoryListViewModel.kt b/app/src/main/java/org/oppia/android/app/home/topiclist/PromotedStoryListViewModel.kt index 135e69c2386..7ec5abd4850 100644 --- a/app/src/main/java/org/oppia/android/app/home/topiclist/PromotedStoryListViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/home/topiclist/PromotedStoryListViewModel.kt @@ -1,10 +1,10 @@ -package org.oppia.app.home.topiclist +package org.oppia.android.app.home.topiclist import androidx.appcompat.app.AppCompatActivity import androidx.lifecycle.ViewModel -import org.oppia.app.home.HomeItemViewModel -import org.oppia.app.home.RouteToRecentlyPlayedListener -import org.oppia.app.shim.IntentFactoryShim +import org.oppia.android.app.home.HomeItemViewModel +import org.oppia.android.app.home.RouteToRecentlyPlayedListener +import org.oppia.android.app.shim.IntentFactoryShim /** [ViewModel] promoted story list in [HomeFragment]. */ class PromotedStoryListViewModel( diff --git a/app/src/main/java/org/oppia/android/app/home/topiclist/PromotedStoryViewModel.kt b/app/src/main/java/org/oppia/android/app/home/topiclist/PromotedStoryViewModel.kt index 7978fec262c..749f0f8e513 100755 --- a/app/src/main/java/org/oppia/android/app/home/topiclist/PromotedStoryViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/home/topiclist/PromotedStoryViewModel.kt @@ -1,13 +1,13 @@ -package org.oppia.app.home.topiclist +package org.oppia.android.app.home.topiclist import androidx.appcompat.app.AppCompatActivity import androidx.databinding.ObservableField import androidx.lifecycle.LiveData import androidx.lifecycle.ViewModel -import org.oppia.app.home.RouteToTopicPlayStoryListener -import org.oppia.app.model.PromotedStory -import org.oppia.app.shim.IntentFactoryShim -import org.oppia.app.viewmodel.ObservableViewModel +import org.oppia.android.app.home.RouteToTopicPlayStoryListener +import org.oppia.android.app.model.PromotedStory +import org.oppia.android.app.shim.IntentFactoryShim +import org.oppia.android.app.viewmodel.ObservableViewModel // TODO(#283): Add download status information to promoted-story-card. diff --git a/app/src/main/java/org/oppia/android/app/home/topiclist/TopicListAdapter.kt b/app/src/main/java/org/oppia/android/app/home/topiclist/TopicListAdapter.kt index 29e3a5f082a..f7d42273260 100644 --- a/app/src/main/java/org/oppia/android/app/home/topiclist/TopicListAdapter.kt +++ b/app/src/main/java/org/oppia/android/app/home/topiclist/TopicListAdapter.kt @@ -1,4 +1,4 @@ -package org.oppia.app.home.topiclist +package org.oppia.android.app.home.topiclist import android.content.Context import android.view.LayoutInflater @@ -6,14 +6,14 @@ import android.view.ViewGroup import androidx.appcompat.app.AppCompatActivity import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import org.oppia.app.R -import org.oppia.app.databinding.AllTopicsBinding -import org.oppia.app.databinding.PromotedStoryListBinding -import org.oppia.app.databinding.TopicSummaryViewBinding -import org.oppia.app.databinding.WelcomeBinding -import org.oppia.app.home.HomeItemViewModel -import org.oppia.app.home.WelcomeViewModel -import org.oppia.app.recyclerview.StartSnapHelper +import org.oppia.android.R +import org.oppia.android.app.home.HomeItemViewModel +import org.oppia.android.app.home.WelcomeViewModel +import org.oppia.android.app.recyclerview.StartSnapHelper +import org.oppia.android.databinding.AllTopicsBinding +import org.oppia.android.databinding.PromotedStoryListBinding +import org.oppia.android.databinding.TopicSummaryViewBinding +import org.oppia.android.databinding.WelcomeBinding private const val VIEW_TYPE_WELCOME_MESSAGE = 1 private const val VIEW_TYPE_PROMOTED_STORY_LIST = 2 diff --git a/app/src/main/java/org/oppia/android/app/home/topiclist/TopicSummaryClickListener.kt b/app/src/main/java/org/oppia/android/app/home/topiclist/TopicSummaryClickListener.kt index eacd39bb236..0ecfc749f14 100755 --- a/app/src/main/java/org/oppia/android/app/home/topiclist/TopicSummaryClickListener.kt +++ b/app/src/main/java/org/oppia/android/app/home/topiclist/TopicSummaryClickListener.kt @@ -1,6 +1,6 @@ -package org.oppia.app.home.topiclist +package org.oppia.android.app.home.topiclist -import org.oppia.app.model.TopicSummary +import org.oppia.android.app.model.TopicSummary /** Listener interface for when topic summaries are clicked in the UI. */ interface TopicSummaryClickListener { diff --git a/app/src/main/java/org/oppia/android/app/home/topiclist/TopicSummaryViewModel.kt b/app/src/main/java/org/oppia/android/app/home/topiclist/TopicSummaryViewModel.kt index 50cf202fd08..d9c98ad9b42 100755 --- a/app/src/main/java/org/oppia/android/app/home/topiclist/TopicSummaryViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/home/topiclist/TopicSummaryViewModel.kt @@ -1,9 +1,9 @@ -package org.oppia.app.home.topiclist +package org.oppia.android.app.home.topiclist import android.graphics.Color import androidx.annotation.ColorInt -import org.oppia.app.home.HomeItemViewModel -import org.oppia.app.model.TopicSummary +import org.oppia.android.app.home.HomeItemViewModel +import org.oppia.android.app.model.TopicSummary // TODO(#206): Remove the color darkening computation and properly set up the topic thumbnails. // These values were roughly computed based on the mocks. They won't produce the same colors since darker colors in the diff --git a/app/src/main/java/org/oppia/android/app/mydownloads/DownloadsTabFragment.kt b/app/src/main/java/org/oppia/android/app/mydownloads/DownloadsTabFragment.kt index 609e13f79bd..3a40400215e 100644 --- a/app/src/main/java/org/oppia/android/app/mydownloads/DownloadsTabFragment.kt +++ b/app/src/main/java/org/oppia/android/app/mydownloads/DownloadsTabFragment.kt @@ -1,11 +1,11 @@ -package org.oppia.app.mydownloads +package org.oppia.android.app.mydownloads import android.content.Context import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import org.oppia.app.fragment.InjectableFragment +import org.oppia.android.app.fragment.InjectableFragment import javax.inject.Inject /** Fragment that contains downloaded topic list. */ diff --git a/app/src/main/java/org/oppia/android/app/mydownloads/DownloadsTabFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/mydownloads/DownloadsTabFragmentPresenter.kt index 6012ea01ca4..3978d6b0975 100644 --- a/app/src/main/java/org/oppia/android/app/mydownloads/DownloadsTabFragmentPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/mydownloads/DownloadsTabFragmentPresenter.kt @@ -1,10 +1,10 @@ -package org.oppia.app.mydownloads +package org.oppia.android.app.mydownloads import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import org.oppia.app.databinding.DownloadsTabFragmentBinding -import org.oppia.app.fragment.FragmentScope +import org.oppia.android.app.fragment.FragmentScope +import org.oppia.android.databinding.DownloadsTabFragmentBinding import javax.inject.Inject /** The presenter for [DownloadsTabFragment]. */ diff --git a/app/src/main/java/org/oppia/android/app/mydownloads/MyDownloadsActivity.kt b/app/src/main/java/org/oppia/android/app/mydownloads/MyDownloadsActivity.kt index 4bc8c99361b..4e3c8e7f812 100644 --- a/app/src/main/java/org/oppia/android/app/mydownloads/MyDownloadsActivity.kt +++ b/app/src/main/java/org/oppia/android/app/mydownloads/MyDownloadsActivity.kt @@ -1,11 +1,11 @@ -package org.oppia.app.mydownloads +package org.oppia.android.app.mydownloads import android.content.Context import android.content.Intent import android.os.Bundle -import org.oppia.app.activity.InjectableAppCompatActivity -import org.oppia.app.drawer.KEY_NAVIGATION_PROFILE_ID -import org.oppia.app.home.HomeActivity +import org.oppia.android.app.activity.InjectableAppCompatActivity +import org.oppia.android.app.drawer.KEY_NAVIGATION_PROFILE_ID +import org.oppia.android.app.home.HomeActivity import javax.inject.Inject /** The activity for displaying [MyDownloadsFragment]. */ diff --git a/app/src/main/java/org/oppia/android/app/mydownloads/MyDownloadsActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/mydownloads/MyDownloadsActivityPresenter.kt index ba755c3f943..aed31403f41 100644 --- a/app/src/main/java/org/oppia/android/app/mydownloads/MyDownloadsActivityPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/mydownloads/MyDownloadsActivityPresenter.kt @@ -1,8 +1,8 @@ -package org.oppia.app.mydownloads +package org.oppia.android.app.mydownloads import androidx.appcompat.app.AppCompatActivity -import org.oppia.app.R -import org.oppia.app.activity.ActivityScope +import org.oppia.android.R +import org.oppia.android.app.activity.ActivityScope import javax.inject.Inject /** The presenter for [MyDownloadsActivity]. */ diff --git a/app/src/main/java/org/oppia/android/app/mydownloads/MyDownloadsFragment.kt b/app/src/main/java/org/oppia/android/app/mydownloads/MyDownloadsFragment.kt index a8c13055310..4d687e35a27 100644 --- a/app/src/main/java/org/oppia/android/app/mydownloads/MyDownloadsFragment.kt +++ b/app/src/main/java/org/oppia/android/app/mydownloads/MyDownloadsFragment.kt @@ -1,11 +1,11 @@ -package org.oppia.app.mydownloads +package org.oppia.android.app.mydownloads import android.content.Context import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import org.oppia.app.fragment.InjectableFragment +import org.oppia.android.app.fragment.InjectableFragment import javax.inject.Inject /** Fragment that contains tabs for MyDownloads. */ diff --git a/app/src/main/java/org/oppia/android/app/mydownloads/MyDownloadsFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/mydownloads/MyDownloadsFragmentPresenter.kt index b9dfb4ef42a..de09a000ec2 100644 --- a/app/src/main/java/org/oppia/android/app/mydownloads/MyDownloadsFragmentPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/mydownloads/MyDownloadsFragmentPresenter.kt @@ -1,4 +1,4 @@ -package org.oppia.app.mydownloads +package org.oppia.android.app.mydownloads import android.view.LayoutInflater import android.view.View @@ -6,9 +6,9 @@ import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.viewpager.widget.ViewPager import com.google.android.material.tabs.TabLayout -import org.oppia.app.R -import org.oppia.app.databinding.MyDownloadsFragmentBinding -import org.oppia.app.fragment.FragmentScope +import org.oppia.android.R +import org.oppia.android.app.fragment.FragmentScope +import org.oppia.android.databinding.MyDownloadsFragmentBinding import javax.inject.Inject /** The presenter for [MyDownloadsFragment]. */ diff --git a/app/src/main/java/org/oppia/android/app/mydownloads/MyDownloadsTab.kt b/app/src/main/java/org/oppia/android/app/mydownloads/MyDownloadsTab.kt index 588d84db945..58077817958 100644 --- a/app/src/main/java/org/oppia/android/app/mydownloads/MyDownloadsTab.kt +++ b/app/src/main/java/org/oppia/android/app/mydownloads/MyDownloadsTab.kt @@ -1,4 +1,4 @@ -package org.oppia.app.mydownloads +package org.oppia.android.app.mydownloads /** Enum to store the tabs of [MyDownloadsFragment] and get tab by position. */ enum class MyDownloadsTab(private var position: Int) { diff --git a/app/src/main/java/org/oppia/android/app/mydownloads/MyDownloadsViewPagerAdapter.kt b/app/src/main/java/org/oppia/android/app/mydownloads/MyDownloadsViewPagerAdapter.kt index 176b0c267ce..1de9082a11e 100644 --- a/app/src/main/java/org/oppia/android/app/mydownloads/MyDownloadsViewPagerAdapter.kt +++ b/app/src/main/java/org/oppia/android/app/mydownloads/MyDownloadsViewPagerAdapter.kt @@ -1,4 +1,4 @@ -package org.oppia.app.mydownloads +package org.oppia.android.app.mydownloads import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager diff --git a/app/src/main/java/org/oppia/android/app/mydownloads/UpdatesTabFragment.kt b/app/src/main/java/org/oppia/android/app/mydownloads/UpdatesTabFragment.kt index 56d567a7558..ad7030bc806 100644 --- a/app/src/main/java/org/oppia/android/app/mydownloads/UpdatesTabFragment.kt +++ b/app/src/main/java/org/oppia/android/app/mydownloads/UpdatesTabFragment.kt @@ -1,11 +1,11 @@ -package org.oppia.app.mydownloads +package org.oppia.android.app.mydownloads import android.content.Context import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import org.oppia.app.fragment.InjectableFragment +import org.oppia.android.app.fragment.InjectableFragment import javax.inject.Inject /** Fragment that contains downloaded topic list that needs update. */ diff --git a/app/src/main/java/org/oppia/android/app/mydownloads/UpdatesTabFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/mydownloads/UpdatesTabFragmentPresenter.kt index 97b1efe7d71..30cf3361f72 100644 --- a/app/src/main/java/org/oppia/android/app/mydownloads/UpdatesTabFragmentPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/mydownloads/UpdatesTabFragmentPresenter.kt @@ -1,10 +1,10 @@ -package org.oppia.app.mydownloads +package org.oppia.android.app.mydownloads import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import org.oppia.app.databinding.UpdatesTabFragmentBinding -import org.oppia.app.fragment.FragmentScope +import org.oppia.android.app.fragment.FragmentScope +import org.oppia.android.databinding.UpdatesTabFragmentBinding import javax.inject.Inject /** The presenter for [UpdatesTabFragment]. */ diff --git a/app/src/main/java/org/oppia/android/app/onboarding/OnboadingSlideViewModel.kt b/app/src/main/java/org/oppia/android/app/onboarding/OnboadingSlideViewModel.kt index 98eee7ac4ca..6049c796a68 100644 --- a/app/src/main/java/org/oppia/android/app/onboarding/OnboadingSlideViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/onboarding/OnboadingSlideViewModel.kt @@ -1,12 +1,12 @@ -package org.oppia.app.onboarding +package org.oppia.android.app.onboarding import android.content.Context import android.content.res.Configuration import android.content.res.Resources import androidx.databinding.ObservableField import androidx.lifecycle.ViewModel -import org.oppia.app.R -import org.oppia.app.viewmodel.ObservableViewModel +import org.oppia.android.R +import org.oppia.android.app.viewmodel.ObservableViewModel const val TOTAL_NUMBER_OF_SLIDES = 4 diff --git a/app/src/main/java/org/oppia/android/app/onboarding/OnboardingActivity.kt b/app/src/main/java/org/oppia/android/app/onboarding/OnboardingActivity.kt index eeb72986d8a..4f225f85411 100644 --- a/app/src/main/java/org/oppia/android/app/onboarding/OnboardingActivity.kt +++ b/app/src/main/java/org/oppia/android/app/onboarding/OnboardingActivity.kt @@ -1,10 +1,10 @@ -package org.oppia.app.onboarding +package org.oppia.android.app.onboarding import android.content.Context import android.content.Intent import android.os.Bundle -import org.oppia.app.activity.InjectableAppCompatActivity -import org.oppia.app.profile.ProfileChooserActivity +import org.oppia.android.app.activity.InjectableAppCompatActivity +import org.oppia.android.app.profile.ProfileChooserActivity import javax.inject.Inject /** Activity that contains the onboarding flow for learners. */ diff --git a/app/src/main/java/org/oppia/android/app/onboarding/OnboardingActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/onboarding/OnboardingActivityPresenter.kt index e5b1f9dc3ad..abbe74efc5b 100644 --- a/app/src/main/java/org/oppia/android/app/onboarding/OnboardingActivityPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/onboarding/OnboardingActivityPresenter.kt @@ -1,8 +1,8 @@ -package org.oppia.app.onboarding +package org.oppia.android.app.onboarding import androidx.appcompat.app.AppCompatActivity -import org.oppia.app.R -import org.oppia.app.activity.ActivityScope +import org.oppia.android.R +import org.oppia.android.app.activity.ActivityScope import javax.inject.Inject /** The presenter for [OnboardingActivity]. */ diff --git a/app/src/main/java/org/oppia/android/app/onboarding/OnboardingFragment.kt b/app/src/main/java/org/oppia/android/app/onboarding/OnboardingFragment.kt index 42875498186..caf502c8953 100644 --- a/app/src/main/java/org/oppia/android/app/onboarding/OnboardingFragment.kt +++ b/app/src/main/java/org/oppia/android/app/onboarding/OnboardingFragment.kt @@ -1,11 +1,11 @@ -package org.oppia.app.onboarding +package org.oppia.android.app.onboarding import android.content.Context import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import org.oppia.app.fragment.InjectableFragment +import org.oppia.android.app.fragment.InjectableFragment import javax.inject.Inject /** Fragment that contains an onboarding flow of the app. */ diff --git a/app/src/main/java/org/oppia/android/app/onboarding/OnboardingFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/onboarding/OnboardingFragmentPresenter.kt index ef8bf9ee278..ae347f23cda 100644 --- a/app/src/main/java/org/oppia/android/app/onboarding/OnboardingFragmentPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/onboarding/OnboardingFragmentPresenter.kt @@ -1,4 +1,4 @@ -package org.oppia.app.onboarding +package org.oppia.android.app.onboarding import android.view.LayoutInflater import android.view.View @@ -8,11 +8,11 @@ import android.widget.LinearLayout import androidx.appcompat.app.AppCompatActivity import androidx.fragment.app.Fragment import androidx.viewpager.widget.ViewPager -import org.oppia.app.R -import org.oppia.app.databinding.OnboardingFragmentBinding -import org.oppia.app.fragment.FragmentScope -import org.oppia.app.viewmodel.ViewModelProvider -import org.oppia.util.statusbar.StatusBarColor +import org.oppia.android.R +import org.oppia.android.app.fragment.FragmentScope +import org.oppia.android.app.viewmodel.ViewModelProvider +import org.oppia.android.databinding.OnboardingFragmentBinding +import org.oppia.android.util.statusbar.StatusBarColor import javax.inject.Inject /** The presenter for [OnboardingFragment]. */ diff --git a/app/src/main/java/org/oppia/android/app/onboarding/OnboardingNavigationListener.kt b/app/src/main/java/org/oppia/android/app/onboarding/OnboardingNavigationListener.kt index 602320f3abf..cd6adef8cb0 100644 --- a/app/src/main/java/org/oppia/android/app/onboarding/OnboardingNavigationListener.kt +++ b/app/src/main/java/org/oppia/android/app/onboarding/OnboardingNavigationListener.kt @@ -1,4 +1,4 @@ -package org.oppia.app.onboarding +package org.oppia.android.app.onboarding /** Listener for buttons in OnboardingFragment */ interface OnboardingNavigationListener { diff --git a/app/src/main/java/org/oppia/android/app/onboarding/OnboardingPagerAdapter.kt b/app/src/main/java/org/oppia/android/app/onboarding/OnboardingPagerAdapter.kt index 378568eaa66..3d139a45b4e 100644 --- a/app/src/main/java/org/oppia/android/app/onboarding/OnboardingPagerAdapter.kt +++ b/app/src/main/java/org/oppia/android/app/onboarding/OnboardingPagerAdapter.kt @@ -1,4 +1,4 @@ -package org.oppia.app.onboarding +package org.oppia.android.app.onboarding import android.content.Context import android.view.LayoutInflater @@ -6,8 +6,8 @@ import android.view.View import android.view.ViewGroup import android.widget.ScrollView import androidx.viewpager.widget.PagerAdapter -import org.oppia.app.databinding.OnboardingSlideBinding -import org.oppia.app.databinding.OnboardingSlideFinalBinding +import org.oppia.android.databinding.OnboardingSlideBinding +import org.oppia.android.databinding.OnboardingSlideFinalBinding /** Adapter to control the slide details in onboarding flow. */ class OnboardingPagerAdapter( diff --git a/app/src/main/java/org/oppia/android/app/onboarding/OnboardingSlideFinalViewModel.kt b/app/src/main/java/org/oppia/android/app/onboarding/OnboardingSlideFinalViewModel.kt index 9831ee18195..bb1de6a1f99 100644 --- a/app/src/main/java/org/oppia/android/app/onboarding/OnboardingSlideFinalViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/onboarding/OnboardingSlideFinalViewModel.kt @@ -1,9 +1,9 @@ -package org.oppia.app.onboarding +package org.oppia.android.app.onboarding import androidx.appcompat.app.AppCompatActivity import androidx.lifecycle.ViewModel -import org.oppia.app.viewmodel.ObservableViewModel -import org.oppia.domain.onboarding.AppStartupStateController +import org.oppia.android.app.viewmodel.ObservableViewModel +import org.oppia.android.domain.onboarding.AppStartupStateController import javax.inject.Inject /** [ViewModel] for final slide in onboarding flow. */ diff --git a/app/src/main/java/org/oppia/android/app/onboarding/OnboardingViewModel.kt b/app/src/main/java/org/oppia/android/app/onboarding/OnboardingViewModel.kt index df3d0e28711..3c899d86026 100644 --- a/app/src/main/java/org/oppia/android/app/onboarding/OnboardingViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/onboarding/OnboardingViewModel.kt @@ -1,8 +1,8 @@ -package org.oppia.app.onboarding +package org.oppia.android.app.onboarding import androidx.databinding.ObservableField import androidx.lifecycle.ViewModel -import org.oppia.app.viewmodel.ObservableViewModel +import org.oppia.android.app.viewmodel.ObservableViewModel import javax.inject.Inject /** [ViewModel] for [OnboardingFragment]. */ diff --git a/app/src/main/java/org/oppia/android/app/onboarding/RouteToProfileListListener.kt b/app/src/main/java/org/oppia/android/app/onboarding/RouteToProfileListListener.kt index 54c7631ebbc..b0980bd9a8b 100755 --- a/app/src/main/java/org/oppia/android/app/onboarding/RouteToProfileListListener.kt +++ b/app/src/main/java/org/oppia/android/app/onboarding/RouteToProfileListListener.kt @@ -1,4 +1,4 @@ -package org.oppia.app.onboarding +package org.oppia.android.app.onboarding /** Listener for when an activity should route to [ProfileActivity]. */ interface RouteToProfileListListener { diff --git a/app/src/main/java/org/oppia/android/app/onboarding/ViewPagerSlide.kt b/app/src/main/java/org/oppia/android/app/onboarding/ViewPagerSlide.kt index 4940dfbd508..50222a507ce 100644 --- a/app/src/main/java/org/oppia/android/app/onboarding/ViewPagerSlide.kt +++ b/app/src/main/java/org/oppia/android/app/onboarding/ViewPagerSlide.kt @@ -1,4 +1,4 @@ -package org.oppia.app.onboarding +package org.oppia.android.app.onboarding /** Enum to store the slides of [OnboardingFragment] and get slide by position. */ enum class ViewPagerSlide(private var position: Int) { diff --git a/app/src/main/java/org/oppia/android/app/ongoingtopiclist/OngoingTopicItemViewModel.kt b/app/src/main/java/org/oppia/android/app/ongoingtopiclist/OngoingTopicItemViewModel.kt index 25f89f5198b..1b6b97f1722 100644 --- a/app/src/main/java/org/oppia/android/app/ongoingtopiclist/OngoingTopicItemViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/ongoingtopiclist/OngoingTopicItemViewModel.kt @@ -1,11 +1,11 @@ -package org.oppia.app.ongoingtopiclist +package org.oppia.android.app.ongoingtopiclist import androidx.appcompat.app.AppCompatActivity import androidx.lifecycle.ViewModel -import org.oppia.app.home.RouteToTopicListener -import org.oppia.app.model.Topic -import org.oppia.app.shim.IntentFactoryShim -import org.oppia.app.viewmodel.ObservableViewModel +import org.oppia.android.app.home.RouteToTopicListener +import org.oppia.android.app.model.Topic +import org.oppia.android.app.shim.IntentFactoryShim +import org.oppia.android.app.viewmodel.ObservableViewModel /** [ViewModel] for displaying topic item in [OngoingTopicListActivity]. */ class OngoingTopicItemViewModel( diff --git a/app/src/main/java/org/oppia/android/app/ongoingtopiclist/OngoingTopicListActivity.kt b/app/src/main/java/org/oppia/android/app/ongoingtopiclist/OngoingTopicListActivity.kt index 5966ef03ef8..c5ebe547f33 100644 --- a/app/src/main/java/org/oppia/android/app/ongoingtopiclist/OngoingTopicListActivity.kt +++ b/app/src/main/java/org/oppia/android/app/ongoingtopiclist/OngoingTopicListActivity.kt @@ -1,9 +1,9 @@ -package org.oppia.app.ongoingtopiclist +package org.oppia.android.app.ongoingtopiclist import android.content.Context import android.content.Intent import android.os.Bundle -import org.oppia.app.activity.InjectableAppCompatActivity +import org.oppia.android.app.activity.InjectableAppCompatActivity import javax.inject.Inject /** Activity for ongoing topics. */ diff --git a/app/src/main/java/org/oppia/android/app/ongoingtopiclist/OngoingTopicListActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/ongoingtopiclist/OngoingTopicListActivityPresenter.kt index 85e7982ad48..54df078f088 100644 --- a/app/src/main/java/org/oppia/android/app/ongoingtopiclist/OngoingTopicListActivityPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/ongoingtopiclist/OngoingTopicListActivityPresenter.kt @@ -1,8 +1,8 @@ -package org.oppia.app.ongoingtopiclist +package org.oppia.android.app.ongoingtopiclist import androidx.appcompat.app.AppCompatActivity -import org.oppia.app.R -import org.oppia.app.activity.ActivityScope +import org.oppia.android.R +import org.oppia.android.app.activity.ActivityScope import javax.inject.Inject /** The presenter for [OngoingTopicListActivity]. */ diff --git a/app/src/main/java/org/oppia/android/app/ongoingtopiclist/OngoingTopicListFragment.kt b/app/src/main/java/org/oppia/android/app/ongoingtopiclist/OngoingTopicListFragment.kt index a22401997ab..0368de982af 100644 --- a/app/src/main/java/org/oppia/android/app/ongoingtopiclist/OngoingTopicListFragment.kt +++ b/app/src/main/java/org/oppia/android/app/ongoingtopiclist/OngoingTopicListFragment.kt @@ -1,11 +1,11 @@ -package org.oppia.app.ongoingtopiclist +package org.oppia.android.app.ongoingtopiclist import android.content.Context import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import org.oppia.app.fragment.InjectableFragment +import org.oppia.android.app.fragment.InjectableFragment import javax.inject.Inject /** Fragment for displaying [OngoingTopicListActivity]. */ diff --git a/app/src/main/java/org/oppia/android/app/ongoingtopiclist/OngoingTopicListFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/ongoingtopiclist/OngoingTopicListFragmentPresenter.kt index 69395a4bc4f..dafe1d384f3 100644 --- a/app/src/main/java/org/oppia/android/app/ongoingtopiclist/OngoingTopicListFragmentPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/ongoingtopiclist/OngoingTopicListFragmentPresenter.kt @@ -1,4 +1,4 @@ -package org.oppia.app.ongoingtopiclist +package org.oppia.android.app.ongoingtopiclist import android.view.LayoutInflater import android.view.View @@ -6,11 +6,11 @@ import android.view.ViewGroup import androidx.appcompat.app.AppCompatActivity import androidx.fragment.app.Fragment import androidx.recyclerview.widget.GridLayoutManager -import org.oppia.app.R -import org.oppia.app.databinding.OngoingTopicItemBinding -import org.oppia.app.databinding.OngoingTopicListFragmentBinding -import org.oppia.app.recyclerview.BindableAdapter -import org.oppia.app.viewmodel.ViewModelProvider +import org.oppia.android.R +import org.oppia.android.app.recyclerview.BindableAdapter +import org.oppia.android.app.viewmodel.ViewModelProvider +import org.oppia.android.databinding.OngoingTopicItemBinding +import org.oppia.android.databinding.OngoingTopicListFragmentBinding import javax.inject.Inject /** The presenter for [OngoingTopicListFragment]. */ diff --git a/app/src/main/java/org/oppia/android/app/ongoingtopiclist/OngoingTopicListViewModel.kt b/app/src/main/java/org/oppia/android/app/ongoingtopiclist/OngoingTopicListViewModel.kt index 14cef4018b9..a637ce0257e 100644 --- a/app/src/main/java/org/oppia/android/app/ongoingtopiclist/OngoingTopicListViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/ongoingtopiclist/OngoingTopicListViewModel.kt @@ -1,17 +1,17 @@ -package org.oppia.app.ongoingtopiclist +package org.oppia.android.app.ongoingtopiclist import androidx.appcompat.app.AppCompatActivity import androidx.lifecycle.LiveData import androidx.lifecycle.Transformations -import org.oppia.app.fragment.FragmentScope -import org.oppia.app.model.OngoingTopicList -import org.oppia.app.model.ProfileId -import org.oppia.app.shim.IntentFactoryShim -import org.oppia.app.viewmodel.ObservableViewModel -import org.oppia.domain.topic.TopicController -import org.oppia.util.data.AsyncResult -import org.oppia.util.logging.ConsoleLogger -import org.oppia.util.parser.TopicHtmlParserEntityType +import org.oppia.android.app.fragment.FragmentScope +import org.oppia.android.app.model.OngoingTopicList +import org.oppia.android.app.model.ProfileId +import org.oppia.android.app.shim.IntentFactoryShim +import org.oppia.android.app.viewmodel.ObservableViewModel +import org.oppia.android.domain.topic.TopicController +import org.oppia.android.util.data.AsyncResult +import org.oppia.android.util.logging.ConsoleLogger +import org.oppia.android.util.parser.TopicHtmlParserEntityType import javax.inject.Inject /** The ObservableViewModel for [OngoingTopicListFragment]. */ diff --git a/app/src/main/java/org/oppia/android/app/options/AppLanguageActivity.kt b/app/src/main/java/org/oppia/android/app/options/AppLanguageActivity.kt index 66bd43608eb..f0e04951f5c 100644 --- a/app/src/main/java/org/oppia/android/app/options/AppLanguageActivity.kt +++ b/app/src/main/java/org/oppia/android/app/options/AppLanguageActivity.kt @@ -1,9 +1,9 @@ -package org.oppia.app.options +package org.oppia.android.app.options import android.content.Context import android.content.Intent import android.os.Bundle -import org.oppia.app.activity.InjectableAppCompatActivity +import org.oppia.android.app.activity.InjectableAppCompatActivity import javax.inject.Inject /** The activity to change the language of the app. */ diff --git a/app/src/main/java/org/oppia/android/app/options/AppLanguageActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/options/AppLanguageActivityPresenter.kt index eb50dcdb884..3369f4f6887 100644 --- a/app/src/main/java/org/oppia/android/app/options/AppLanguageActivityPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/options/AppLanguageActivityPresenter.kt @@ -1,8 +1,8 @@ -package org.oppia.app.options +package org.oppia.android.app.options import androidx.appcompat.app.AppCompatActivity -import org.oppia.app.R -import org.oppia.app.activity.ActivityScope +import org.oppia.android.R +import org.oppia.android.app.activity.ActivityScope import javax.inject.Inject /** The presenter for [AppLanguageActivity]. */ diff --git a/app/src/main/java/org/oppia/android/app/options/AppLanguageFragment.kt b/app/src/main/java/org/oppia/android/app/options/AppLanguageFragment.kt index 42bfb2b8685..1566f8e69b3 100644 --- a/app/src/main/java/org/oppia/android/app/options/AppLanguageFragment.kt +++ b/app/src/main/java/org/oppia/android/app/options/AppLanguageFragment.kt @@ -1,11 +1,11 @@ -package org.oppia.app.options +package org.oppia.android.app.options import android.content.Context import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import org.oppia.app.fragment.InjectableFragment +import org.oppia.android.app.fragment.InjectableFragment import javax.inject.Inject private const val KEY_APP_LANGUAGE_PREFERENCE_TITLE = "APP_LANGUAGE_PREFERENCE" diff --git a/app/src/main/java/org/oppia/android/app/options/AppLanguageFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/options/AppLanguageFragmentPresenter.kt index 87de2657f16..900357b5cfb 100644 --- a/app/src/main/java/org/oppia/android/app/options/AppLanguageFragmentPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/options/AppLanguageFragmentPresenter.kt @@ -1,11 +1,11 @@ -package org.oppia.app.options +package org.oppia.android.app.options import android.content.Intent import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.fragment.app.Fragment -import org.oppia.app.databinding.AppLanguageFragmentBinding +import org.oppia.android.databinding.AppLanguageFragmentBinding import javax.inject.Inject /** The presenter for [AppLanguageFragment]. */ diff --git a/app/src/main/java/org/oppia/android/app/options/DefaultAudioActivity.kt b/app/src/main/java/org/oppia/android/app/options/DefaultAudioActivity.kt index 760b5df4e1e..e5f47457343 100644 --- a/app/src/main/java/org/oppia/android/app/options/DefaultAudioActivity.kt +++ b/app/src/main/java/org/oppia/android/app/options/DefaultAudioActivity.kt @@ -1,9 +1,9 @@ -package org.oppia.app.options +package org.oppia.android.app.options import android.content.Context import android.content.Intent import android.os.Bundle -import org.oppia.app.activity.InjectableAppCompatActivity +import org.oppia.android.app.activity.InjectableAppCompatActivity import javax.inject.Inject /** The activity to change the Default Audio language of the app. */ diff --git a/app/src/main/java/org/oppia/android/app/options/DefaultAudioActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/options/DefaultAudioActivityPresenter.kt index 7d06245874d..c399c4332e2 100644 --- a/app/src/main/java/org/oppia/android/app/options/DefaultAudioActivityPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/options/DefaultAudioActivityPresenter.kt @@ -1,8 +1,8 @@ -package org.oppia.app.options +package org.oppia.android.app.options import androidx.appcompat.app.AppCompatActivity -import org.oppia.app.R -import org.oppia.app.activity.ActivityScope +import org.oppia.android.R +import org.oppia.android.app.activity.ActivityScope import javax.inject.Inject /** The presenter for [DefaultAudioActivity]. */ diff --git a/app/src/main/java/org/oppia/android/app/options/DefaultAudioFragment.kt b/app/src/main/java/org/oppia/android/app/options/DefaultAudioFragment.kt index b607c15ed9d..44c5a40d1aa 100644 --- a/app/src/main/java/org/oppia/android/app/options/DefaultAudioFragment.kt +++ b/app/src/main/java/org/oppia/android/app/options/DefaultAudioFragment.kt @@ -1,11 +1,11 @@ -package org.oppia.app.options +package org.oppia.android.app.options import android.content.Context import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import org.oppia.app.fragment.InjectableFragment +import org.oppia.android.app.fragment.InjectableFragment import javax.inject.Inject private const val KEY_AUDIO_LANGUAGE_PREFERENCE_TITLE = "AUDIO_LANGUAGE_PREFERENCE" diff --git a/app/src/main/java/org/oppia/android/app/options/DefaultAudioFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/options/DefaultAudioFragmentPresenter.kt index 317992c7537..dc665633d16 100644 --- a/app/src/main/java/org/oppia/android/app/options/DefaultAudioFragmentPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/options/DefaultAudioFragmentPresenter.kt @@ -1,11 +1,11 @@ -package org.oppia.app.options +package org.oppia.android.app.options import android.content.Intent import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.fragment.app.Fragment -import org.oppia.app.databinding.DefaultAudioFragmentBinding +import org.oppia.android.databinding.DefaultAudioFragmentBinding import javax.inject.Inject /** The presenter for [DefaultAudioFragment]. */ diff --git a/app/src/main/java/org/oppia/android/app/options/LanguageSelectionAdapter.kt b/app/src/main/java/org/oppia/android/app/options/LanguageSelectionAdapter.kt index 951a86134b3..423c7c7549c 100644 --- a/app/src/main/java/org/oppia/android/app/options/LanguageSelectionAdapter.kt +++ b/app/src/main/java/org/oppia/android/app/options/LanguageSelectionAdapter.kt @@ -1,11 +1,11 @@ -package org.oppia.app.options +package org.oppia.android.app.options import android.view.LayoutInflater import android.view.ViewGroup import androidx.databinding.DataBindingUtil import androidx.recyclerview.widget.RecyclerView -import org.oppia.app.R -import org.oppia.app.databinding.LanguageItemsBinding +import org.oppia.android.R +import org.oppia.android.databinding.LanguageItemsBinding // TODO(#216): Make use of generic data-binding-enabled RecyclerView adapter. diff --git a/app/src/main/java/org/oppia/android/app/options/LoadAppLanguageListListener.kt b/app/src/main/java/org/oppia/android/app/options/LoadAppLanguageListListener.kt index c48659d696c..f78569e5753 100644 --- a/app/src/main/java/org/oppia/android/app/options/LoadAppLanguageListListener.kt +++ b/app/src/main/java/org/oppia/android/app/options/LoadAppLanguageListListener.kt @@ -1,4 +1,4 @@ -package org.oppia.app.options +package org.oppia.android.app.options /** Listener for when an activity should load a [AppLanguageFragment]. */ interface LoadAppLanguageListListener { diff --git a/app/src/main/java/org/oppia/android/app/options/LoadAudioLanguageListListener.kt b/app/src/main/java/org/oppia/android/app/options/LoadAudioLanguageListListener.kt index 61501290019..18ebf9657e1 100644 --- a/app/src/main/java/org/oppia/android/app/options/LoadAudioLanguageListListener.kt +++ b/app/src/main/java/org/oppia/android/app/options/LoadAudioLanguageListListener.kt @@ -1,4 +1,4 @@ -package org.oppia.app.options +package org.oppia.android.app.options /** Listener for when an activity should load a [DefaultAudioFragment]. */ interface LoadAudioLanguageListListener { diff --git a/app/src/main/java/org/oppia/android/app/options/LoadReadingTextSizeListener.kt b/app/src/main/java/org/oppia/android/app/options/LoadReadingTextSizeListener.kt index 2d2f6c51ad1..66a233a97ac 100644 --- a/app/src/main/java/org/oppia/android/app/options/LoadReadingTextSizeListener.kt +++ b/app/src/main/java/org/oppia/android/app/options/LoadReadingTextSizeListener.kt @@ -1,4 +1,4 @@ -package org.oppia.app.options +package org.oppia.android.app.options /** Listener for when an activity should load a [ReadingTextSizeFragment]. */ interface LoadReadingTextSizeListener { diff --git a/app/src/main/java/org/oppia/android/app/options/OptionControlsViewModel.kt b/app/src/main/java/org/oppia/android/app/options/OptionControlsViewModel.kt index 37dea2da6ee..d1f0ddb72ae 100644 --- a/app/src/main/java/org/oppia/android/app/options/OptionControlsViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/options/OptionControlsViewModel.kt @@ -1,4 +1,4 @@ -package org.oppia.app.options +package org.oppia.android.app.options import androidx.appcompat.app.AppCompatActivity import androidx.databinding.ObservableField @@ -7,16 +7,16 @@ import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.Transformations import androidx.lifecycle.ViewModel -import org.oppia.app.fragment.FragmentScope -import org.oppia.app.model.AppLanguage -import org.oppia.app.model.AudioLanguage -import org.oppia.app.model.Profile -import org.oppia.app.model.ProfileId -import org.oppia.app.model.ReadingTextSize -import org.oppia.app.viewmodel.ObservableArrayList -import org.oppia.domain.profile.ProfileManagementController -import org.oppia.util.data.AsyncResult -import org.oppia.util.logging.ConsoleLogger +import org.oppia.android.app.fragment.FragmentScope +import org.oppia.android.app.model.AppLanguage +import org.oppia.android.app.model.AudioLanguage +import org.oppia.android.app.model.Profile +import org.oppia.android.app.model.ProfileId +import org.oppia.android.app.model.ReadingTextSize +import org.oppia.android.app.viewmodel.ObservableArrayList +import org.oppia.android.domain.profile.ProfileManagementController +import org.oppia.android.util.data.AsyncResult +import org.oppia.android.util.logging.ConsoleLogger import javax.inject.Inject /** [ViewModel] for [OptionsFragment]. */ diff --git a/app/src/main/java/org/oppia/android/app/options/OptionsActivity.kt b/app/src/main/java/org/oppia/android/app/options/OptionsActivity.kt index 10b689d4da4..f2ed2088e9b 100644 --- a/app/src/main/java/org/oppia/android/app/options/OptionsActivity.kt +++ b/app/src/main/java/org/oppia/android/app/options/OptionsActivity.kt @@ -1,12 +1,12 @@ -package org.oppia.app.options +package org.oppia.android.app.options import android.content.Context import android.content.Intent import android.os.Bundle import android.widget.TextView -import org.oppia.app.R -import org.oppia.app.activity.InjectableAppCompatActivity -import org.oppia.app.drawer.KEY_NAVIGATION_PROFILE_ID +import org.oppia.android.R +import org.oppia.android.app.activity.InjectableAppCompatActivity +import org.oppia.android.app.drawer.KEY_NAVIGATION_PROFILE_ID import javax.inject.Inject private const val SELECTED_OPTIONS_TITLE_KEY = "SELECTED_OPTIONS_TITLE_KEY" diff --git a/app/src/main/java/org/oppia/android/app/options/OptionsActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/options/OptionsActivityPresenter.kt index b34c974c606..697351b150a 100644 --- a/app/src/main/java/org/oppia/android/app/options/OptionsActivityPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/options/OptionsActivityPresenter.kt @@ -1,4 +1,4 @@ -package org.oppia.app.options +package org.oppia.android.app.options import android.view.View import android.widget.FrameLayout @@ -6,9 +6,9 @@ import android.widget.TextView import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.widget.Toolbar import androidx.drawerlayout.widget.DrawerLayout -import org.oppia.app.R -import org.oppia.app.activity.ActivityScope -import org.oppia.app.drawer.NavigationDrawerFragment +import org.oppia.android.R +import org.oppia.android.app.activity.ActivityScope +import org.oppia.android.app.drawer.NavigationDrawerFragment import javax.inject.Inject /** The presenter for [OptionsActivity]. */ diff --git a/app/src/main/java/org/oppia/android/app/options/OptionsAppLanguageViewModel.kt b/app/src/main/java/org/oppia/android/app/options/OptionsAppLanguageViewModel.kt index b95421fb63f..4f52bf9e90e 100644 --- a/app/src/main/java/org/oppia/android/app/options/OptionsAppLanguageViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/options/OptionsAppLanguageViewModel.kt @@ -1,4 +1,4 @@ -package org.oppia.app.options +package org.oppia.android.app.options import androidx.databinding.ObservableField diff --git a/app/src/main/java/org/oppia/android/app/options/OptionsAudioLanguageViewModel.kt b/app/src/main/java/org/oppia/android/app/options/OptionsAudioLanguageViewModel.kt index 36bdca02450..95ccd0e773d 100644 --- a/app/src/main/java/org/oppia/android/app/options/OptionsAudioLanguageViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/options/OptionsAudioLanguageViewModel.kt @@ -1,4 +1,4 @@ -package org.oppia.app.options +package org.oppia.android.app.options import androidx.databinding.ObservableField diff --git a/app/src/main/java/org/oppia/android/app/options/OptionsFragment.kt b/app/src/main/java/org/oppia/android/app/options/OptionsFragment.kt index 7bfeb1ab0c7..b84726c4507 100644 --- a/app/src/main/java/org/oppia/android/app/options/OptionsFragment.kt +++ b/app/src/main/java/org/oppia/android/app/options/OptionsFragment.kt @@ -1,11 +1,11 @@ -package org.oppia.app.options +package org.oppia.android.app.options import android.content.Context import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import org.oppia.app.fragment.InjectableFragment +import org.oppia.android.app.fragment.InjectableFragment import javax.inject.Inject const val KEY_MESSAGE_READING_TEXT_SIZE = "TEXT_SIZE" diff --git a/app/src/main/java/org/oppia/android/app/options/OptionsFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/options/OptionsFragmentPresenter.kt index d735f6bd367..d6d406b1bbd 100644 --- a/app/src/main/java/org/oppia/android/app/options/OptionsFragmentPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/options/OptionsFragmentPresenter.kt @@ -1,4 +1,4 @@ -package org.oppia.app.options +package org.oppia.android.app.options import android.view.LayoutInflater import android.view.View @@ -7,20 +7,20 @@ import androidx.appcompat.app.AppCompatActivity import androidx.fragment.app.Fragment import androidx.lifecycle.Observer import androidx.recyclerview.widget.RecyclerView -import org.oppia.app.databinding.OptionAppLanguageBinding -import org.oppia.app.databinding.OptionAudioLanguageBinding -import org.oppia.app.databinding.OptionStoryTextSizeBinding -import org.oppia.app.databinding.OptionsFragmentBinding -import org.oppia.app.drawer.KEY_NAVIGATION_PROFILE_ID -import org.oppia.app.fragment.FragmentScope -import org.oppia.app.model.AppLanguage -import org.oppia.app.model.AudioLanguage -import org.oppia.app.model.ProfileId -import org.oppia.app.model.ReadingTextSize -import org.oppia.app.recyclerview.BindableAdapter -import org.oppia.app.viewmodel.ViewModelProvider -import org.oppia.domain.profile.ProfileManagementController -import org.oppia.util.logging.ConsoleLogger +import org.oppia.android.app.drawer.KEY_NAVIGATION_PROFILE_ID +import org.oppia.android.app.fragment.FragmentScope +import org.oppia.android.app.model.AppLanguage +import org.oppia.android.app.model.AudioLanguage +import org.oppia.android.app.model.ProfileId +import org.oppia.android.app.model.ReadingTextSize +import org.oppia.android.app.recyclerview.BindableAdapter +import org.oppia.android.app.viewmodel.ViewModelProvider +import org.oppia.android.databinding.OptionAppLanguageBinding +import org.oppia.android.databinding.OptionAudioLanguageBinding +import org.oppia.android.databinding.OptionStoryTextSizeBinding +import org.oppia.android.databinding.OptionsFragmentBinding +import org.oppia.android.domain.profile.ProfileManagementController +import org.oppia.android.util.logging.ConsoleLogger import java.security.InvalidParameterException import javax.inject.Inject diff --git a/app/src/main/java/org/oppia/android/app/options/OptionsItemViewModel.kt b/app/src/main/java/org/oppia/android/app/options/OptionsItemViewModel.kt index ff155aeb9d1..18cb231dd74 100644 --- a/app/src/main/java/org/oppia/android/app/options/OptionsItemViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/options/OptionsItemViewModel.kt @@ -1,7 +1,7 @@ -package org.oppia.app.options +package org.oppia.android.app.options import androidx.databinding.ObservableField -import org.oppia.app.viewmodel.ObservableViewModel +import org.oppia.android.app.viewmodel.ObservableViewModel /** Option items view model for the recyclerView in [OptionsFragment] */ abstract class OptionsItemViewModel : ObservableViewModel() { diff --git a/app/src/main/java/org/oppia/android/app/options/OptionsReadingTextSizeViewModel.kt b/app/src/main/java/org/oppia/android/app/options/OptionsReadingTextSizeViewModel.kt index daa906ae435..39014f849de 100644 --- a/app/src/main/java/org/oppia/android/app/options/OptionsReadingTextSizeViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/options/OptionsReadingTextSizeViewModel.kt @@ -1,4 +1,4 @@ -package org.oppia.app.options +package org.oppia.android.app.options import androidx.databinding.ObservableField diff --git a/app/src/main/java/org/oppia/android/app/options/ReadingTextSizeActivity.kt b/app/src/main/java/org/oppia/android/app/options/ReadingTextSizeActivity.kt index 7bdcf3e01ca..06971c85e2e 100644 --- a/app/src/main/java/org/oppia/android/app/options/ReadingTextSizeActivity.kt +++ b/app/src/main/java/org/oppia/android/app/options/ReadingTextSizeActivity.kt @@ -1,9 +1,9 @@ -package org.oppia.app.options +package org.oppia.android.app.options import android.content.Context import android.content.Intent import android.os.Bundle -import org.oppia.app.activity.InjectableAppCompatActivity +import org.oppia.android.app.activity.InjectableAppCompatActivity import javax.inject.Inject /** The activity to change the text size of the reading content in the app. */ diff --git a/app/src/main/java/org/oppia/android/app/options/ReadingTextSizeActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/options/ReadingTextSizeActivityPresenter.kt index 95eb77d5576..d3e24fdaea7 100644 --- a/app/src/main/java/org/oppia/android/app/options/ReadingTextSizeActivityPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/options/ReadingTextSizeActivityPresenter.kt @@ -1,8 +1,8 @@ -package org.oppia.app.options +package org.oppia.android.app.options import androidx.appcompat.app.AppCompatActivity -import org.oppia.app.R -import org.oppia.app.activity.ActivityScope +import org.oppia.android.R +import org.oppia.android.app.activity.ActivityScope import javax.inject.Inject /** The presenter for [ReadingTextSizeActivity]. */ diff --git a/app/src/main/java/org/oppia/android/app/options/ReadingTextSizeFragment.kt b/app/src/main/java/org/oppia/android/app/options/ReadingTextSizeFragment.kt index f3f4efe809c..0b1a5410787 100644 --- a/app/src/main/java/org/oppia/android/app/options/ReadingTextSizeFragment.kt +++ b/app/src/main/java/org/oppia/android/app/options/ReadingTextSizeFragment.kt @@ -1,11 +1,11 @@ -package org.oppia.app.options +package org.oppia.android.app.options import android.content.Context import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import org.oppia.app.fragment.InjectableFragment +import org.oppia.android.app.fragment.InjectableFragment import javax.inject.Inject private const val KEY_READING_TEXT_SIZE_PREFERENCE_SUMMARY_VALUE = diff --git a/app/src/main/java/org/oppia/android/app/options/ReadingTextSizeFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/options/ReadingTextSizeFragmentPresenter.kt index 2911fd7dd95..b9a5b705f4c 100644 --- a/app/src/main/java/org/oppia/android/app/options/ReadingTextSizeFragmentPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/options/ReadingTextSizeFragmentPresenter.kt @@ -1,4 +1,4 @@ -package org.oppia.app.options +package org.oppia.android.app.options import android.content.Intent import android.view.LayoutInflater @@ -6,9 +6,9 @@ import android.view.View import android.view.ViewGroup import android.widget.SeekBar import androidx.fragment.app.Fragment -import org.oppia.app.R -import org.oppia.app.databinding.ReadingTextSizeFragmentBinding -import org.oppia.app.model.ReadingTextSize +import org.oppia.android.R +import org.oppia.android.app.model.ReadingTextSize +import org.oppia.android.databinding.ReadingTextSizeFragmentBinding import javax.inject.Inject private const val SMALL_TEXT_SIZE_SCALE = 0.8f diff --git a/app/src/main/java/org/oppia/android/app/options/RouteToAppLanguageListListener.kt b/app/src/main/java/org/oppia/android/app/options/RouteToAppLanguageListListener.kt index d3522637d15..86c8dbab432 100644 --- a/app/src/main/java/org/oppia/android/app/options/RouteToAppLanguageListListener.kt +++ b/app/src/main/java/org/oppia/android/app/options/RouteToAppLanguageListListener.kt @@ -1,4 +1,4 @@ -package org.oppia.app.options +package org.oppia.android.app.options /** Listener for when an activity should route to a [AppLanguageActivity]. */ interface RouteToAppLanguageListListener { diff --git a/app/src/main/java/org/oppia/android/app/options/RouteToAudioLanguageListListener.kt b/app/src/main/java/org/oppia/android/app/options/RouteToAudioLanguageListListener.kt index 3d07d2b5c1b..61a8253eac0 100644 --- a/app/src/main/java/org/oppia/android/app/options/RouteToAudioLanguageListListener.kt +++ b/app/src/main/java/org/oppia/android/app/options/RouteToAudioLanguageListListener.kt @@ -1,4 +1,4 @@ -package org.oppia.app.options +package org.oppia.android.app.options /** Listener for when an activity should route to a [DefaultAudioActivity]. */ interface RouteToAudioLanguageListListener { diff --git a/app/src/main/java/org/oppia/android/app/options/RouteToReadingTextSizeListener.kt b/app/src/main/java/org/oppia/android/app/options/RouteToReadingTextSizeListener.kt index f79dc1ac453..c1ad1c9db86 100644 --- a/app/src/main/java/org/oppia/android/app/options/RouteToReadingTextSizeListener.kt +++ b/app/src/main/java/org/oppia/android/app/options/RouteToReadingTextSizeListener.kt @@ -1,4 +1,4 @@ -package org.oppia.app.options +package org.oppia.android.app.options /** Listener for when an activity should route to a [ReadingTextSizeActivity]. */ interface RouteToReadingTextSizeListener { diff --git a/app/src/main/java/org/oppia/android/app/parser/StringToFractionParser.kt b/app/src/main/java/org/oppia/android/app/parser/StringToFractionParser.kt index 10a6fbf8c07..d6d2bab22a5 100644 --- a/app/src/main/java/org/oppia/android/app/parser/StringToFractionParser.kt +++ b/app/src/main/java/org/oppia/android/app/parser/StringToFractionParser.kt @@ -1,10 +1,10 @@ -package org.oppia.app.parser +package org.oppia.android.app.parser import android.content.Context import androidx.annotation.StringRes -import org.oppia.app.R -import org.oppia.app.model.Fraction -import org.oppia.domain.util.normalizeWhitespace +import org.oppia.android.R +import org.oppia.android.app.model.Fraction +import org.oppia.android.domain.util.normalizeWhitespace /** This class contains method that helps to parse string to fraction. */ class StringToFractionParser { diff --git a/app/src/main/java/org/oppia/android/app/parser/StringToNumberParser.kt b/app/src/main/java/org/oppia/android/app/parser/StringToNumberParser.kt index ae51f4d21be..6215dec4861 100644 --- a/app/src/main/java/org/oppia/android/app/parser/StringToNumberParser.kt +++ b/app/src/main/java/org/oppia/android/app/parser/StringToNumberParser.kt @@ -1,9 +1,9 @@ -package org.oppia.app.parser +package org.oppia.android.app.parser import android.content.Context import androidx.annotation.StringRes -import org.oppia.app.R -import org.oppia.domain.util.normalizeWhitespace +import org.oppia.android.R +import org.oppia.android.domain.util.normalizeWhitespace /** This class contains methods that help to parse string to number, check realtime and submit time errors. */ class StringToNumberParser { diff --git a/app/src/main/java/org/oppia/android/app/parser/StringToRatioParser.kt b/app/src/main/java/org/oppia/android/app/parser/StringToRatioParser.kt index a313c4bd113..8da5cba2442 100644 --- a/app/src/main/java/org/oppia/android/app/parser/StringToRatioParser.kt +++ b/app/src/main/java/org/oppia/android/app/parser/StringToRatioParser.kt @@ -1,11 +1,11 @@ -package org.oppia.app.parser +package org.oppia.android.app.parser import android.content.Context import androidx.annotation.StringRes -import org.oppia.app.R -import org.oppia.app.model.RatioExpression -import org.oppia.domain.util.normalizeWhitespace -import org.oppia.domain.util.removeWhitespace +import org.oppia.android.R +import org.oppia.android.app.model.RatioExpression +import org.oppia.android.domain.util.normalizeWhitespace +import org.oppia.android.domain.util.removeWhitespace /** * Utility for parsing [RatioExpression]s from strings and validating strings can be parsed diff --git a/app/src/main/java/org/oppia/android/app/player/audio/AudioButtonListener.kt b/app/src/main/java/org/oppia/android/app/player/audio/AudioButtonListener.kt index 7cfd017db15..0eb3534e9db 100644 --- a/app/src/main/java/org/oppia/android/app/player/audio/AudioButtonListener.kt +++ b/app/src/main/java/org/oppia/android/app/player/audio/AudioButtonListener.kt @@ -1,4 +1,4 @@ -package org.oppia.app.player.audio +package org.oppia.android.app.player.audio /** Interface to show or hide the audio button and change its icon. */ interface AudioButtonListener { diff --git a/app/src/main/java/org/oppia/android/app/player/audio/AudioFragment.kt b/app/src/main/java/org/oppia/android/app/player/audio/AudioFragment.kt index 000ef5154ea..66c687c0180 100755 --- a/app/src/main/java/org/oppia/android/app/player/audio/AudioFragment.kt +++ b/app/src/main/java/org/oppia/android/app/player/audio/AudioFragment.kt @@ -1,12 +1,12 @@ -package org.oppia.app.player.audio +package org.oppia.android.app.player.audio import android.content.Context import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import org.oppia.app.fragment.InjectableFragment -import org.oppia.app.model.State +import org.oppia.android.app.fragment.InjectableFragment +import org.oppia.android.app.model.State import javax.inject.Inject /** Fragment that controls audio for a content-card. */ diff --git a/app/src/main/java/org/oppia/android/app/player/audio/AudioFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/player/audio/AudioFragmentPresenter.kt index 400aab06e77..5e57857992b 100755 --- a/app/src/main/java/org/oppia/android/app/player/audio/AudioFragmentPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/player/audio/AudioFragmentPresenter.kt @@ -1,4 +1,4 @@ -package org.oppia.app.player.audio +package org.oppia.android.app.player.audio import android.app.AlertDialog import android.content.Context @@ -13,21 +13,21 @@ import androidx.fragment.app.Fragment import androidx.lifecycle.LiveData import androidx.lifecycle.Observer import androidx.lifecycle.Transformations -import org.oppia.app.R -import org.oppia.app.databinding.AudioFragmentBinding -import org.oppia.app.fragment.FragmentScope -import org.oppia.app.model.AudioLanguage -import org.oppia.app.model.CellularDataPreference -import org.oppia.app.model.Profile -import org.oppia.app.model.ProfileId -import org.oppia.app.model.State -import org.oppia.app.player.audio.AudioViewModel.UiAudioPlayStatus -import org.oppia.app.viewmodel.ViewModelProvider -import org.oppia.domain.audio.CellularAudioDialogController -import org.oppia.domain.profile.ProfileManagementController -import org.oppia.util.data.AsyncResult -import org.oppia.util.logging.ConsoleLogger -import org.oppia.util.networking.NetworkConnectionUtil +import org.oppia.android.R +import org.oppia.android.app.fragment.FragmentScope +import org.oppia.android.app.model.AudioLanguage +import org.oppia.android.app.model.CellularDataPreference +import org.oppia.android.app.model.Profile +import org.oppia.android.app.model.ProfileId +import org.oppia.android.app.model.State +import org.oppia.android.app.player.audio.AudioViewModel.UiAudioPlayStatus +import org.oppia.android.app.viewmodel.ViewModelProvider +import org.oppia.android.databinding.AudioFragmentBinding +import org.oppia.android.domain.audio.CellularAudioDialogController +import org.oppia.android.domain.profile.ProfileManagementController +import org.oppia.android.util.data.AsyncResult +import org.oppia.android.util.logging.ConsoleLogger +import org.oppia.android.util.networking.NetworkConnectionUtil import javax.inject.Inject const val TAG_LANGUAGE_DIALOG = "LANGUAGE_DIALOG" diff --git a/app/src/main/java/org/oppia/android/app/player/audio/AudioUiManager.kt b/app/src/main/java/org/oppia/android/app/player/audio/AudioUiManager.kt index a03588df886..5d154611f43 100644 --- a/app/src/main/java/org/oppia/android/app/player/audio/AudioUiManager.kt +++ b/app/src/main/java/org/oppia/android/app/player/audio/AudioUiManager.kt @@ -1,6 +1,6 @@ -package org.oppia.app.player.audio +package org.oppia.android.app.player.audio -import org.oppia.app.model.State +import org.oppia.android.app.model.State /** Manager for updating audio state within the state player. */ interface AudioUiManager { diff --git a/app/src/main/java/org/oppia/android/app/player/audio/AudioViewModel.kt b/app/src/main/java/org/oppia/android/app/player/audio/AudioViewModel.kt index 4b34d1d9221..0eeaf2ee24f 100644 --- a/app/src/main/java/org/oppia/android/app/player/audio/AudioViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/player/audio/AudioViewModel.kt @@ -1,19 +1,19 @@ -package org.oppia.app.player.audio +package org.oppia.android.app.player.audio import androidx.databinding.ObservableField import androidx.fragment.app.Fragment import androidx.lifecycle.LiveData import androidx.lifecycle.Transformations -import org.oppia.app.fragment.FragmentScope -import org.oppia.app.model.State -import org.oppia.app.model.Voiceover -import org.oppia.app.model.VoiceoverMapping -import org.oppia.app.viewmodel.ObservableViewModel -import org.oppia.domain.audio.AudioPlayerController -import org.oppia.domain.audio.AudioPlayerController.PlayProgress -import org.oppia.domain.audio.AudioPlayerController.PlayStatus -import org.oppia.util.data.AsyncResult -import org.oppia.util.gcsresource.DefaultResourceBucketName +import org.oppia.android.app.fragment.FragmentScope +import org.oppia.android.app.model.State +import org.oppia.android.app.model.Voiceover +import org.oppia.android.app.model.VoiceoverMapping +import org.oppia.android.app.viewmodel.ObservableViewModel +import org.oppia.android.domain.audio.AudioPlayerController +import org.oppia.android.domain.audio.AudioPlayerController.PlayProgress +import org.oppia.android.domain.audio.AudioPlayerController.PlayStatus +import org.oppia.android.util.data.AsyncResult +import org.oppia.android.util.gcsresource.DefaultResourceBucketName import java.util.Locale import javax.inject.Inject diff --git a/app/src/main/java/org/oppia/android/app/player/audio/CellularAudioDialogFragment.kt b/app/src/main/java/org/oppia/android/app/player/audio/CellularAudioDialogFragment.kt index 9025408c0ae..44b3f54d133 100755 --- a/app/src/main/java/org/oppia/android/app/player/audio/CellularAudioDialogFragment.kt +++ b/app/src/main/java/org/oppia/android/app/player/audio/CellularAudioDialogFragment.kt @@ -1,4 +1,4 @@ -package org.oppia.app.player.audio +package org.oppia.android.app.player.audio import android.app.Dialog import android.content.Context @@ -8,7 +8,7 @@ import android.widget.CheckBox import androidx.appcompat.app.AlertDialog import androidx.appcompat.view.ContextThemeWrapper import androidx.fragment.app.DialogFragment -import org.oppia.app.R +import org.oppia.android.R /** * DialogFragment that indicates to the user they are on cellular when trying to play an audio voiceover. diff --git a/app/src/main/java/org/oppia/android/app/player/audio/CellularDataInterface.kt b/app/src/main/java/org/oppia/android/app/player/audio/CellularDataInterface.kt index 629a795d0a8..d430917dd17 100755 --- a/app/src/main/java/org/oppia/android/app/player/audio/CellularDataInterface.kt +++ b/app/src/main/java/org/oppia/android/app/player/audio/CellularDataInterface.kt @@ -1,4 +1,4 @@ -package org.oppia.app.player.audio +package org.oppia.android.app.player.audio /** Interface to check the preference regarding alert for [CellularAudioDialogFragment]. */ interface CellularDataInterface { diff --git a/app/src/main/java/org/oppia/android/app/player/audio/LanguageDialogFragment.kt b/app/src/main/java/org/oppia/android/app/player/audio/LanguageDialogFragment.kt index 676a4d7c8da..534c5e43c06 100644 --- a/app/src/main/java/org/oppia/android/app/player/audio/LanguageDialogFragment.kt +++ b/app/src/main/java/org/oppia/android/app/player/audio/LanguageDialogFragment.kt @@ -1,4 +1,4 @@ -package org.oppia.app.player.audio +package org.oppia.android.app.player.audio import android.app.Dialog import android.content.Context @@ -6,7 +6,7 @@ import android.os.Bundle import androidx.appcompat.app.AlertDialog import androidx.appcompat.view.ContextThemeWrapper import androidx.fragment.app.DialogFragment -import org.oppia.app.R +import org.oppia.android.R import java.util.Locale import kotlin.collections.ArrayList diff --git a/app/src/main/java/org/oppia/android/app/player/audio/LanguageInterface.kt b/app/src/main/java/org/oppia/android/app/player/audio/LanguageInterface.kt index 0aeec94adab..ad3265ebdca 100644 --- a/app/src/main/java/org/oppia/android/app/player/audio/LanguageInterface.kt +++ b/app/src/main/java/org/oppia/android/app/player/audio/LanguageInterface.kt @@ -1,4 +1,4 @@ -package org.oppia.app.player.audio +package org.oppia.android.app.player.audio /** Interface to receive selected language from [LanguageDialogFragment]. */ interface LanguageInterface { diff --git a/app/src/main/java/org/oppia/android/app/player/exploration/DefaultFontSizeStateListener.kt b/app/src/main/java/org/oppia/android/app/player/exploration/DefaultFontSizeStateListener.kt index ef610be7ffe..d3a888c792d 100644 --- a/app/src/main/java/org/oppia/android/app/player/exploration/DefaultFontSizeStateListener.kt +++ b/app/src/main/java/org/oppia/android/app/player/exploration/DefaultFontSizeStateListener.kt @@ -1,6 +1,6 @@ -package org.oppia.app.player.exploration +package org.oppia.android.app.player.exploration -import org.oppia.app.model.ReadingTextSize +import org.oppia.android.app.model.ReadingTextSize /** * To set the font-size correctly we need to fetch it before loading the `ExplorationFragment` and diff --git a/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationActivity.kt b/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationActivity.kt index 3722a413325..ddffab5bfa2 100755 --- a/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationActivity.kt +++ b/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationActivity.kt @@ -1,24 +1,24 @@ -package org.oppia.app.player.exploration +package org.oppia.android.app.player.exploration import android.content.Context import android.content.Intent import android.os.Bundle import android.view.Menu import android.view.MenuItem -import org.oppia.app.R -import org.oppia.app.activity.InjectableAppCompatActivity -import org.oppia.app.hintsandsolution.HintsAndSolutionDialogFragment -import org.oppia.app.hintsandsolution.HintsAndSolutionListener -import org.oppia.app.hintsandsolution.RevealHintListener -import org.oppia.app.hintsandsolution.RevealSolutionInterface -import org.oppia.app.model.ReadingTextSize -import org.oppia.app.model.State -import org.oppia.app.player.audio.AudioButtonListener -import org.oppia.app.player.state.listener.RouteToHintsAndSolutionListener -import org.oppia.app.player.state.listener.StateKeyboardButtonListener -import org.oppia.app.player.stopplaying.StopExplorationDialogFragment -import org.oppia.app.player.stopplaying.StopStatePlayingSessionListener -import org.oppia.app.topic.conceptcard.ConceptCardListener +import org.oppia.android.R +import org.oppia.android.app.activity.InjectableAppCompatActivity +import org.oppia.android.app.hintsandsolution.HintsAndSolutionDialogFragment +import org.oppia.android.app.hintsandsolution.HintsAndSolutionListener +import org.oppia.android.app.hintsandsolution.RevealHintListener +import org.oppia.android.app.hintsandsolution.RevealSolutionInterface +import org.oppia.android.app.model.ReadingTextSize +import org.oppia.android.app.model.State +import org.oppia.android.app.player.audio.AudioButtonListener +import org.oppia.android.app.player.state.listener.RouteToHintsAndSolutionListener +import org.oppia.android.app.player.state.listener.StateKeyboardButtonListener +import org.oppia.android.app.player.stopplaying.StopExplorationDialogFragment +import org.oppia.android.app.player.stopplaying.StopStatePlayingSessionListener +import org.oppia.android.app.topic.conceptcard.ConceptCardListener import javax.inject.Inject private const val TAG_STOP_EXPLORATION_DIALOG = "STOP_EXPLORATION_DIALOG" diff --git a/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationActivityPresenter.kt index 04e86cf55ca..2b338bf21d9 100755 --- a/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationActivityPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationActivityPresenter.kt @@ -1,4 +1,4 @@ -package org.oppia.app.player.exploration +package org.oppia.android.app.player.exploration import android.content.Context import android.os.Bundle @@ -11,19 +11,19 @@ import androidx.databinding.DataBindingUtil import androidx.lifecycle.LiveData import androidx.lifecycle.Observer import androidx.lifecycle.Transformations -import org.oppia.app.R -import org.oppia.app.activity.ActivityScope -import org.oppia.app.databinding.ExplorationActivityBinding -import org.oppia.app.help.HelpActivity -import org.oppia.app.model.Exploration -import org.oppia.app.model.ReadingTextSize -import org.oppia.app.options.OptionsActivity -import org.oppia.app.topic.TopicActivity -import org.oppia.app.utility.FontScaleConfigurationUtil -import org.oppia.app.viewmodel.ViewModelProvider -import org.oppia.domain.exploration.ExplorationDataController -import org.oppia.util.data.AsyncResult -import org.oppia.util.logging.ConsoleLogger +import org.oppia.android.R +import org.oppia.android.app.activity.ActivityScope +import org.oppia.android.app.help.HelpActivity +import org.oppia.android.app.model.Exploration +import org.oppia.android.app.model.ReadingTextSize +import org.oppia.android.app.options.OptionsActivity +import org.oppia.android.app.topic.TopicActivity +import org.oppia.android.app.utility.FontScaleConfigurationUtil +import org.oppia.android.app.viewmodel.ViewModelProvider +import org.oppia.android.databinding.ExplorationActivityBinding +import org.oppia.android.domain.exploration.ExplorationDataController +import org.oppia.android.util.data.AsyncResult +import org.oppia.android.util.logging.ConsoleLogger import javax.inject.Inject const val TAG_EXPLORATION_FRAGMENT = "TAG_EXPLORATION_FRAGMENT" diff --git a/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationFragment.kt b/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationFragment.kt index 592bb449105..b231766a740 100755 --- a/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationFragment.kt +++ b/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationFragment.kt @@ -1,12 +1,12 @@ -package org.oppia.app.player.exploration +package org.oppia.android.app.player.exploration import android.content.Context import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import org.oppia.app.fragment.InjectableFragment -import org.oppia.app.utility.FontScaleConfigurationUtil +import org.oppia.android.app.fragment.InjectableFragment +import org.oppia.android.app.utility.FontScaleConfigurationUtil import javax.inject.Inject /** Fragment that contains displays single exploration. */ diff --git a/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationFragmentPresenter.kt index 371dd206bae..6c0fc19015c 100755 --- a/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationFragmentPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationFragmentPresenter.kt @@ -1,16 +1,16 @@ -package org.oppia.app.player.exploration +package org.oppia.android.app.player.exploration import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.fragment.app.Fragment -import org.oppia.app.R -import org.oppia.app.databinding.ExplorationFragmentBinding -import org.oppia.app.fragment.FragmentScope -import org.oppia.app.model.EventLog -import org.oppia.app.player.state.StateFragment -import org.oppia.domain.oppialogger.OppiaLogger -import org.oppia.util.system.OppiaClock +import org.oppia.android.R +import org.oppia.android.app.fragment.FragmentScope +import org.oppia.android.app.model.EventLog +import org.oppia.android.app.player.state.StateFragment +import org.oppia.android.databinding.ExplorationFragmentBinding +import org.oppia.android.domain.oppialogger.OppiaLogger +import org.oppia.android.util.system.OppiaClock import javax.inject.Inject /** The presenter for [ExplorationFragment]. */ diff --git a/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationManagerFragment.kt b/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationManagerFragment.kt index 8a4b27e6d91..0cc7d2b2b83 100644 --- a/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationManagerFragment.kt +++ b/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationManagerFragment.kt @@ -1,8 +1,8 @@ -package org.oppia.app.player.exploration +package org.oppia.android.app.player.exploration import android.content.Context import android.os.Bundle -import org.oppia.app.fragment.InjectableFragment +import org.oppia.android.app.fragment.InjectableFragment import javax.inject.Inject /** diff --git a/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationManagerFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationManagerFragmentPresenter.kt index e0afcab2811..55c8e6d388e 100644 --- a/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationManagerFragmentPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationManagerFragmentPresenter.kt @@ -1,17 +1,17 @@ -package org.oppia.app.player.exploration +package org.oppia.android.app.player.exploration import androidx.appcompat.app.AppCompatActivity import androidx.fragment.app.Fragment import androidx.lifecycle.LiveData import androidx.lifecycle.Observer import androidx.lifecycle.Transformations -import org.oppia.app.fragment.FragmentScope -import org.oppia.app.model.Profile -import org.oppia.app.model.ProfileId -import org.oppia.app.model.ReadingTextSize -import org.oppia.domain.profile.ProfileManagementController -import org.oppia.util.data.AsyncResult -import org.oppia.util.logging.ConsoleLogger +import org.oppia.android.app.fragment.FragmentScope +import org.oppia.android.app.model.Profile +import org.oppia.android.app.model.ProfileId +import org.oppia.android.app.model.ReadingTextSize +import org.oppia.android.domain.profile.ProfileManagementController +import org.oppia.android.util.data.AsyncResult +import org.oppia.android.util.logging.ConsoleLogger import javax.inject.Inject /** The presenter for [ExplorationManagerFragment]. */ diff --git a/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationViewModel.kt b/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationViewModel.kt index 37258fa2199..64935ac4969 100644 --- a/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationViewModel.kt @@ -1,8 +1,8 @@ -package org.oppia.app.player.exploration +package org.oppia.android.app.player.exploration import androidx.databinding.ObservableField -import org.oppia.app.activity.ActivityScope -import org.oppia.app.viewmodel.ObservableViewModel +import org.oppia.android.app.activity.ActivityScope +import org.oppia.android.app.viewmodel.ObservableViewModel import javax.inject.Inject /** The ViewModel for [ExplorationActivity] */ diff --git a/app/src/main/java/org/oppia/android/app/player/exploration/HintsAndSolutionExplorationManagerFragment.kt b/app/src/main/java/org/oppia/android/app/player/exploration/HintsAndSolutionExplorationManagerFragment.kt index afd212812f7..2840d2d4f55 100644 --- a/app/src/main/java/org/oppia/android/app/player/exploration/HintsAndSolutionExplorationManagerFragment.kt +++ b/app/src/main/java/org/oppia/android/app/player/exploration/HintsAndSolutionExplorationManagerFragment.kt @@ -1,11 +1,11 @@ -package org.oppia.app.player.exploration +package org.oppia.android.app.player.exploration import android.content.Context import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import org.oppia.app.fragment.InjectableFragment +import org.oppia.android.app.fragment.InjectableFragment import javax.inject.Inject /** diff --git a/app/src/main/java/org/oppia/android/app/player/exploration/HintsAndSolutionExplorationManagerFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/player/exploration/HintsAndSolutionExplorationManagerFragmentPresenter.kt index 7eb03b9383c..fa6637d8341 100644 --- a/app/src/main/java/org/oppia/android/app/player/exploration/HintsAndSolutionExplorationManagerFragmentPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/player/exploration/HintsAndSolutionExplorationManagerFragmentPresenter.kt @@ -1,14 +1,14 @@ -package org.oppia.app.player.exploration +package org.oppia.android.app.player.exploration import android.view.View import androidx.appcompat.app.AppCompatActivity import androidx.lifecycle.LiveData import androidx.lifecycle.Observer -import org.oppia.app.fragment.FragmentScope -import org.oppia.app.model.EphemeralState -import org.oppia.domain.exploration.ExplorationProgressController -import org.oppia.util.data.AsyncResult -import org.oppia.util.logging.ConsoleLogger +import org.oppia.android.app.fragment.FragmentScope +import org.oppia.android.app.model.EphemeralState +import org.oppia.android.domain.exploration.ExplorationProgressController +import org.oppia.android.util.data.AsyncResult +import org.oppia.android.util.logging.ConsoleLogger import javax.inject.Inject /** The presenter for [HintsAndSolutionExplorationManagerFragment]. */ diff --git a/app/src/main/java/org/oppia/android/app/player/exploration/HintsAndSolutionExplorationManagerListener.kt b/app/src/main/java/org/oppia/android/app/player/exploration/HintsAndSolutionExplorationManagerListener.kt index 49d5c5c27f7..9b671eb020e 100644 --- a/app/src/main/java/org/oppia/android/app/player/exploration/HintsAndSolutionExplorationManagerListener.kt +++ b/app/src/main/java/org/oppia/android/app/player/exploration/HintsAndSolutionExplorationManagerListener.kt @@ -1,6 +1,6 @@ -package org.oppia.app.player.exploration +package org.oppia.android.app.player.exploration -import org.oppia.app.model.State +import org.oppia.android.app.model.State /** Listener for fetching current exploration state data. */ interface HintsAndSolutionExplorationManagerListener { diff --git a/app/src/main/java/org/oppia/android/app/player/state/DragDropSortInteractionView.kt b/app/src/main/java/org/oppia/android/app/player/state/DragDropSortInteractionView.kt index 8a0e726b4c3..6c79ff16013 100644 --- a/app/src/main/java/org/oppia/android/app/player/state/DragDropSortInteractionView.kt +++ b/app/src/main/java/org/oppia/android/app/player/state/DragDropSortInteractionView.kt @@ -1,4 +1,4 @@ -package org.oppia.app.player.state +package org.oppia.android.app.player.state import android.content.Context import android.util.AttributeSet @@ -9,17 +9,17 @@ import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager import androidx.recyclerview.widget.ItemTouchHelper import androidx.recyclerview.widget.RecyclerView -import org.oppia.app.player.state.itemviewmodel.DragDropInteractionContentViewModel -import org.oppia.app.recyclerview.BindableAdapter -import org.oppia.app.recyclerview.DragAndDropItemFacilitator -import org.oppia.app.recyclerview.OnDragEndedListener -import org.oppia.app.recyclerview.OnItemDragListener -import org.oppia.app.shim.ViewBindingShim -import org.oppia.app.shim.ViewComponentFactory -import org.oppia.util.accessibility.CustomAccessibilityManager -import org.oppia.util.gcsresource.DefaultResourceBucketName -import org.oppia.util.parser.ExplorationHtmlParserEntityType -import org.oppia.util.parser.HtmlParser +import org.oppia.android.app.player.state.itemviewmodel.DragDropInteractionContentViewModel +import org.oppia.android.app.recyclerview.BindableAdapter +import org.oppia.android.app.recyclerview.DragAndDropItemFacilitator +import org.oppia.android.app.recyclerview.OnDragEndedListener +import org.oppia.android.app.recyclerview.OnItemDragListener +import org.oppia.android.app.shim.ViewBindingShim +import org.oppia.android.app.shim.ViewComponentFactory +import org.oppia.android.util.accessibility.CustomAccessibilityManager +import org.oppia.android.util.gcsresource.DefaultResourceBucketName +import org.oppia.android.util.parser.ExplorationHtmlParserEntityType +import org.oppia.android.util.parser.HtmlParser import javax.inject.Inject /** diff --git a/app/src/main/java/org/oppia/android/app/player/state/ImageRegionSelectionInteractionView.kt b/app/src/main/java/org/oppia/android/app/player/state/ImageRegionSelectionInteractionView.kt index 426b1cc1bb2..cf2ba5ffd54 100644 --- a/app/src/main/java/org/oppia/android/app/player/state/ImageRegionSelectionInteractionView.kt +++ b/app/src/main/java/org/oppia/android/app/player/state/ImageRegionSelectionInteractionView.kt @@ -1,4 +1,4 @@ -package org.oppia.app.player.state +package org.oppia.android.app.player.state import android.content.Context import android.util.AttributeSet @@ -8,18 +8,18 @@ import androidx.appcompat.widget.AppCompatImageView import androidx.core.view.forEachIndexed import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager -import org.oppia.app.model.ImageWithRegions -import org.oppia.app.shim.ViewBindingShim -import org.oppia.app.shim.ViewComponentFactory -import org.oppia.app.utility.ClickableAreasImage -import org.oppia.app.utility.OnClickableAreaClickedListener -import org.oppia.util.accessibility.CustomAccessibilityManager -import org.oppia.util.gcsresource.DefaultResourceBucketName -import org.oppia.util.parser.DefaultGcsPrefix -import org.oppia.util.parser.ExplorationHtmlParserEntityType -import org.oppia.util.parser.ImageDownloadUrlTemplate -import org.oppia.util.parser.ImageLoader -import org.oppia.util.parser.ImageViewTarget +import org.oppia.android.app.model.ImageWithRegions +import org.oppia.android.app.shim.ViewBindingShim +import org.oppia.android.app.shim.ViewComponentFactory +import org.oppia.android.app.utility.ClickableAreasImage +import org.oppia.android.app.utility.OnClickableAreaClickedListener +import org.oppia.android.util.accessibility.CustomAccessibilityManager +import org.oppia.android.util.gcsresource.DefaultResourceBucketName +import org.oppia.android.util.parser.DefaultGcsPrefix +import org.oppia.android.util.parser.ExplorationHtmlParserEntityType +import org.oppia.android.util.parser.ImageDownloadUrlTemplate +import org.oppia.android.util.parser.ImageLoader +import org.oppia.android.util.parser.ImageViewTarget import javax.inject.Inject /** diff --git a/app/src/main/java/org/oppia/android/app/player/state/SelectionInteractionView.kt b/app/src/main/java/org/oppia/android/app/player/state/SelectionInteractionView.kt index 42df791b83a..cdf0c87673b 100644 --- a/app/src/main/java/org/oppia/android/app/player/state/SelectionInteractionView.kt +++ b/app/src/main/java/org/oppia/android/app/player/state/SelectionInteractionView.kt @@ -1,4 +1,4 @@ -package org.oppia.app.player.state +package org.oppia.android.app.player.state import android.content.Context import android.util.AttributeSet @@ -7,14 +7,14 @@ import androidx.databinding.BindingAdapter import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager import androidx.recyclerview.widget.RecyclerView -import org.oppia.app.player.state.itemviewmodel.SelectionInteractionContentViewModel -import org.oppia.app.player.state.itemviewmodel.SelectionItemInputType -import org.oppia.app.recyclerview.BindableAdapter -import org.oppia.app.shim.ViewBindingShim -import org.oppia.app.shim.ViewComponentFactory -import org.oppia.util.gcsresource.DefaultResourceBucketName -import org.oppia.util.parser.ExplorationHtmlParserEntityType -import org.oppia.util.parser.HtmlParser +import org.oppia.android.app.player.state.itemviewmodel.SelectionInteractionContentViewModel +import org.oppia.android.app.player.state.itemviewmodel.SelectionItemInputType +import org.oppia.android.app.recyclerview.BindableAdapter +import org.oppia.android.app.shim.ViewBindingShim +import org.oppia.android.app.shim.ViewComponentFactory +import org.oppia.android.util.gcsresource.DefaultResourceBucketName +import org.oppia.android.util.parser.ExplorationHtmlParserEntityType +import org.oppia.android.util.parser.HtmlParser import javax.inject.Inject /** diff --git a/app/src/main/java/org/oppia/android/app/player/state/StateFragment.kt b/app/src/main/java/org/oppia/android/app/player/state/StateFragment.kt index 78d096f70d1..4fef663e37e 100755 --- a/app/src/main/java/org/oppia/android/app/player/state/StateFragment.kt +++ b/app/src/main/java/org/oppia/android/app/player/state/StateFragment.kt @@ -1,23 +1,23 @@ -package org.oppia.app.player.state +package org.oppia.android.app.player.state import android.content.Context import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import org.oppia.app.fragment.InjectableFragment -import org.oppia.app.model.HelpIndex -import org.oppia.app.model.UserAnswer -import org.oppia.app.player.state.answerhandling.InteractionAnswerErrorOrAvailabilityCheckReceiver -import org.oppia.app.player.state.answerhandling.InteractionAnswerHandler -import org.oppia.app.player.state.answerhandling.InteractionAnswerReceiver -import org.oppia.app.player.state.listener.ContinueNavigationButtonListener -import org.oppia.app.player.state.listener.NextNavigationButtonListener -import org.oppia.app.player.state.listener.PreviousNavigationButtonListener -import org.oppia.app.player.state.listener.PreviousResponsesHeaderClickListener -import org.oppia.app.player.state.listener.ReturnToTopicNavigationButtonListener -import org.oppia.app.player.state.listener.ShowHintAvailabilityListener -import org.oppia.app.player.state.listener.SubmitNavigationButtonListener +import org.oppia.android.app.fragment.InjectableFragment +import org.oppia.android.app.model.HelpIndex +import org.oppia.android.app.model.UserAnswer +import org.oppia.android.app.player.state.answerhandling.InteractionAnswerErrorOrAvailabilityCheckReceiver +import org.oppia.android.app.player.state.answerhandling.InteractionAnswerHandler +import org.oppia.android.app.player.state.answerhandling.InteractionAnswerReceiver +import org.oppia.android.app.player.state.listener.ContinueNavigationButtonListener +import org.oppia.android.app.player.state.listener.NextNavigationButtonListener +import org.oppia.android.app.player.state.listener.PreviousNavigationButtonListener +import org.oppia.android.app.player.state.listener.PreviousResponsesHeaderClickListener +import org.oppia.android.app.player.state.listener.ReturnToTopicNavigationButtonListener +import org.oppia.android.app.player.state.listener.ShowHintAvailabilityListener +import org.oppia.android.app.player.state.listener.SubmitNavigationButtonListener import javax.inject.Inject /** Fragment that represents the current state of an exploration. */ diff --git a/app/src/main/java/org/oppia/android/app/player/state/StateFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/player/state/StateFragmentPresenter.kt index 28e5f119432..84fe53ae1db 100755 --- a/app/src/main/java/org/oppia/android/app/player/state/StateFragmentPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/player/state/StateFragmentPresenter.kt @@ -1,4 +1,4 @@ -package org.oppia.app.player.state +package org.oppia.android.app.player.state import android.content.Context import android.view.LayoutInflater @@ -13,30 +13,30 @@ import androidx.lifecycle.Observer import androidx.lifecycle.Transformations import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import org.oppia.app.R -import org.oppia.app.databinding.StateFragmentBinding -import org.oppia.app.fragment.FragmentScope -import org.oppia.app.model.AnswerOutcome -import org.oppia.app.model.EphemeralState -import org.oppia.app.model.HelpIndex -import org.oppia.app.model.Hint -import org.oppia.app.model.ProfileId -import org.oppia.app.model.Solution -import org.oppia.app.model.State -import org.oppia.app.model.UserAnswer -import org.oppia.app.player.audio.AudioButtonListener -import org.oppia.app.player.audio.AudioFragment -import org.oppia.app.player.audio.AudioUiManager -import org.oppia.app.player.state.listener.RouteToHintsAndSolutionListener -import org.oppia.app.player.stopplaying.StopStatePlayingSessionListener -import org.oppia.app.utility.SplitScreenManager -import org.oppia.app.viewmodel.ViewModelProvider -import org.oppia.domain.exploration.ExplorationProgressController -import org.oppia.domain.topic.StoryProgressController -import org.oppia.util.data.AsyncResult -import org.oppia.util.gcsresource.DefaultResourceBucketName -import org.oppia.util.logging.ConsoleLogger -import org.oppia.util.parser.ExplorationHtmlParserEntityType +import org.oppia.android.R +import org.oppia.android.app.fragment.FragmentScope +import org.oppia.android.app.model.AnswerOutcome +import org.oppia.android.app.model.EphemeralState +import org.oppia.android.app.model.HelpIndex +import org.oppia.android.app.model.Hint +import org.oppia.android.app.model.ProfileId +import org.oppia.android.app.model.Solution +import org.oppia.android.app.model.State +import org.oppia.android.app.model.UserAnswer +import org.oppia.android.app.player.audio.AudioButtonListener +import org.oppia.android.app.player.audio.AudioFragment +import org.oppia.android.app.player.audio.AudioUiManager +import org.oppia.android.app.player.state.listener.RouteToHintsAndSolutionListener +import org.oppia.android.app.player.stopplaying.StopStatePlayingSessionListener +import org.oppia.android.app.utility.SplitScreenManager +import org.oppia.android.app.viewmodel.ViewModelProvider +import org.oppia.android.databinding.StateFragmentBinding +import org.oppia.android.domain.exploration.ExplorationProgressController +import org.oppia.android.domain.topic.StoryProgressController +import org.oppia.android.util.data.AsyncResult +import org.oppia.android.util.gcsresource.DefaultResourceBucketName +import org.oppia.android.util.logging.ConsoleLogger +import org.oppia.android.util.parser.ExplorationHtmlParserEntityType import java.util.Date import javax.inject.Inject diff --git a/app/src/main/java/org/oppia/android/app/player/state/StatePlayerRecyclerViewAssembler.kt b/app/src/main/java/org/oppia/android/app/player/state/StatePlayerRecyclerViewAssembler.kt index 83b42313348..6204e1ed35d 100644 --- a/app/src/main/java/org/oppia/android/app/player/state/StatePlayerRecyclerViewAssembler.kt +++ b/app/src/main/java/org/oppia/android/app/player/state/StatePlayerRecyclerViewAssembler.kt @@ -1,4 +1,4 @@ -package org.oppia.app.player.state +package org.oppia.android.app.player.state import android.view.LayoutInflater import android.view.View @@ -15,77 +15,77 @@ import androidx.databinding.ViewDataBinding import androidx.fragment.app.Fragment import androidx.lifecycle.Observer import kotlinx.coroutines.CoroutineDispatcher -import org.oppia.app.databinding.ContentItemBinding -import org.oppia.app.databinding.ContinueInteractionItemBinding -import org.oppia.app.databinding.ContinueNavigationButtonItemBinding -import org.oppia.app.databinding.DragDropInteractionItemBinding -import org.oppia.app.databinding.FeedbackItemBinding -import org.oppia.app.databinding.FractionInteractionItemBinding -import org.oppia.app.databinding.ImageRegionSelectionInteractionItemBinding -import org.oppia.app.databinding.NextButtonItemBinding -import org.oppia.app.databinding.NumericInputInteractionItemBinding -import org.oppia.app.databinding.PreviousButtonItemBinding -import org.oppia.app.databinding.PreviousResponsesHeaderItemBinding -import org.oppia.app.databinding.RatioInputInteractionItemBinding -import org.oppia.app.databinding.ReplayButtonItemBinding -import org.oppia.app.databinding.ReturnToTopicButtonItemBinding -import org.oppia.app.databinding.SelectionInteractionItemBinding -import org.oppia.app.databinding.SubmitButtonItemBinding -import org.oppia.app.databinding.SubmittedAnswerItemBinding -import org.oppia.app.databinding.SubmittedAnswerListItemBinding -import org.oppia.app.databinding.SubmittedHtmlAnswerItemBinding -import org.oppia.app.databinding.TextInputInteractionItemBinding -import org.oppia.app.model.AnswerAndResponse -import org.oppia.app.model.EphemeralState -import org.oppia.app.model.HelpIndex -import org.oppia.app.model.HelpIndex.IndexTypeCase.INDEXTYPE_NOT_SET -import org.oppia.app.model.Interaction -import org.oppia.app.model.PendingState -import org.oppia.app.model.State -import org.oppia.app.model.StringList -import org.oppia.app.model.SubtitledHtml -import org.oppia.app.model.UserAnswer -import org.oppia.app.player.audio.AudioUiManager -import org.oppia.app.player.state.StatePlayerRecyclerViewAssembler.Builder.Factory -import org.oppia.app.player.state.answerhandling.InteractionAnswerErrorOrAvailabilityCheckReceiver -import org.oppia.app.player.state.answerhandling.InteractionAnswerHandler -import org.oppia.app.player.state.answerhandling.InteractionAnswerReceiver -import org.oppia.app.player.state.hintsandsolution.DelayShowAdditionalHintsFromWrongAnswerMillis -import org.oppia.app.player.state.hintsandsolution.DelayShowAdditionalHintsMillis -import org.oppia.app.player.state.hintsandsolution.DelayShowInitialHintMillis -import org.oppia.app.player.state.itemviewmodel.ContentViewModel -import org.oppia.app.player.state.itemviewmodel.ContinueInteractionViewModel -import org.oppia.app.player.state.itemviewmodel.ContinueNavigationButtonViewModel -import org.oppia.app.player.state.itemviewmodel.DragAndDropSortInteractionViewModel -import org.oppia.app.player.state.itemviewmodel.FeedbackViewModel -import org.oppia.app.player.state.itemviewmodel.FractionInteractionViewModel -import org.oppia.app.player.state.itemviewmodel.ImageRegionSelectionInteractionViewModel -import org.oppia.app.player.state.itemviewmodel.InteractionViewModelFactory -import org.oppia.app.player.state.itemviewmodel.NextButtonViewModel -import org.oppia.app.player.state.itemviewmodel.NumericInputViewModel -import org.oppia.app.player.state.itemviewmodel.PreviousButtonViewModel -import org.oppia.app.player.state.itemviewmodel.PreviousResponsesHeaderViewModel -import org.oppia.app.player.state.itemviewmodel.RatioExpressionInputInteractionViewModel -import org.oppia.app.player.state.itemviewmodel.ReplayButtonViewModel -import org.oppia.app.player.state.itemviewmodel.ReturnToTopicButtonViewModel -import org.oppia.app.player.state.itemviewmodel.SelectionInteractionViewModel -import org.oppia.app.player.state.itemviewmodel.StateItemViewModel -import org.oppia.app.player.state.itemviewmodel.SubmitButtonViewModel -import org.oppia.app.player.state.itemviewmodel.SubmittedAnswerViewModel -import org.oppia.app.player.state.itemviewmodel.TextInputViewModel -import org.oppia.app.player.state.listener.ContinueNavigationButtonListener -import org.oppia.app.player.state.listener.NextNavigationButtonListener -import org.oppia.app.player.state.listener.PreviousNavigationButtonListener -import org.oppia.app.player.state.listener.PreviousResponsesHeaderClickListener -import org.oppia.app.player.state.listener.ReplayButtonListener -import org.oppia.app.player.state.listener.ReturnToTopicNavigationButtonListener -import org.oppia.app.player.state.listener.ShowHintAvailabilityListener -import org.oppia.app.player.state.listener.SubmitNavigationButtonListener -import org.oppia.app.recyclerview.BindableAdapter -import org.oppia.app.topic.conceptcard.ConceptCardFragment -import org.oppia.app.utility.LifecycleSafeTimerFactory -import org.oppia.util.parser.HtmlParser -import org.oppia.util.threading.BackgroundDispatcher +import org.oppia.android.app.model.AnswerAndResponse +import org.oppia.android.app.model.EphemeralState +import org.oppia.android.app.model.HelpIndex +import org.oppia.android.app.model.HelpIndex.IndexTypeCase.INDEXTYPE_NOT_SET +import org.oppia.android.app.model.Interaction +import org.oppia.android.app.model.PendingState +import org.oppia.android.app.model.State +import org.oppia.android.app.model.StringList +import org.oppia.android.app.model.SubtitledHtml +import org.oppia.android.app.model.UserAnswer +import org.oppia.android.app.player.audio.AudioUiManager +import org.oppia.android.app.player.state.StatePlayerRecyclerViewAssembler.Builder.Factory +import org.oppia.android.app.player.state.answerhandling.InteractionAnswerErrorOrAvailabilityCheckReceiver +import org.oppia.android.app.player.state.answerhandling.InteractionAnswerHandler +import org.oppia.android.app.player.state.answerhandling.InteractionAnswerReceiver +import org.oppia.android.app.player.state.hintsandsolution.DelayShowAdditionalHintsFromWrongAnswerMillis +import org.oppia.android.app.player.state.hintsandsolution.DelayShowAdditionalHintsMillis +import org.oppia.android.app.player.state.hintsandsolution.DelayShowInitialHintMillis +import org.oppia.android.app.player.state.itemviewmodel.ContentViewModel +import org.oppia.android.app.player.state.itemviewmodel.ContinueInteractionViewModel +import org.oppia.android.app.player.state.itemviewmodel.ContinueNavigationButtonViewModel +import org.oppia.android.app.player.state.itemviewmodel.DragAndDropSortInteractionViewModel +import org.oppia.android.app.player.state.itemviewmodel.FeedbackViewModel +import org.oppia.android.app.player.state.itemviewmodel.FractionInteractionViewModel +import org.oppia.android.app.player.state.itemviewmodel.ImageRegionSelectionInteractionViewModel +import org.oppia.android.app.player.state.itemviewmodel.InteractionViewModelFactory +import org.oppia.android.app.player.state.itemviewmodel.NextButtonViewModel +import org.oppia.android.app.player.state.itemviewmodel.NumericInputViewModel +import org.oppia.android.app.player.state.itemviewmodel.PreviousButtonViewModel +import org.oppia.android.app.player.state.itemviewmodel.PreviousResponsesHeaderViewModel +import org.oppia.android.app.player.state.itemviewmodel.RatioExpressionInputInteractionViewModel +import org.oppia.android.app.player.state.itemviewmodel.ReplayButtonViewModel +import org.oppia.android.app.player.state.itemviewmodel.ReturnToTopicButtonViewModel +import org.oppia.android.app.player.state.itemviewmodel.SelectionInteractionViewModel +import org.oppia.android.app.player.state.itemviewmodel.StateItemViewModel +import org.oppia.android.app.player.state.itemviewmodel.SubmitButtonViewModel +import org.oppia.android.app.player.state.itemviewmodel.SubmittedAnswerViewModel +import org.oppia.android.app.player.state.itemviewmodel.TextInputViewModel +import org.oppia.android.app.player.state.listener.ContinueNavigationButtonListener +import org.oppia.android.app.player.state.listener.NextNavigationButtonListener +import org.oppia.android.app.player.state.listener.PreviousNavigationButtonListener +import org.oppia.android.app.player.state.listener.PreviousResponsesHeaderClickListener +import org.oppia.android.app.player.state.listener.ReplayButtonListener +import org.oppia.android.app.player.state.listener.ReturnToTopicNavigationButtonListener +import org.oppia.android.app.player.state.listener.ShowHintAvailabilityListener +import org.oppia.android.app.player.state.listener.SubmitNavigationButtonListener +import org.oppia.android.app.recyclerview.BindableAdapter +import org.oppia.android.app.topic.conceptcard.ConceptCardFragment +import org.oppia.android.app.utility.LifecycleSafeTimerFactory +import org.oppia.android.databinding.ContentItemBinding +import org.oppia.android.databinding.ContinueInteractionItemBinding +import org.oppia.android.databinding.ContinueNavigationButtonItemBinding +import org.oppia.android.databinding.DragDropInteractionItemBinding +import org.oppia.android.databinding.FeedbackItemBinding +import org.oppia.android.databinding.FractionInteractionItemBinding +import org.oppia.android.databinding.ImageRegionSelectionInteractionItemBinding +import org.oppia.android.databinding.NextButtonItemBinding +import org.oppia.android.databinding.NumericInputInteractionItemBinding +import org.oppia.android.databinding.PreviousButtonItemBinding +import org.oppia.android.databinding.PreviousResponsesHeaderItemBinding +import org.oppia.android.databinding.RatioInputInteractionItemBinding +import org.oppia.android.databinding.ReplayButtonItemBinding +import org.oppia.android.databinding.ReturnToTopicButtonItemBinding +import org.oppia.android.databinding.SelectionInteractionItemBinding +import org.oppia.android.databinding.SubmitButtonItemBinding +import org.oppia.android.databinding.SubmittedAnswerItemBinding +import org.oppia.android.databinding.SubmittedAnswerListItemBinding +import org.oppia.android.databinding.SubmittedHtmlAnswerItemBinding +import org.oppia.android.databinding.TextInputInteractionItemBinding +import org.oppia.android.util.parser.HtmlParser +import org.oppia.android.util.threading.BackgroundDispatcher import javax.inject.Inject private typealias AudioUiManagerRetriever = () -> AudioUiManager? diff --git a/app/src/main/java/org/oppia/android/app/player/state/StateViewModel.kt b/app/src/main/java/org/oppia/android/app/player/state/StateViewModel.kt index c7bacbf461a..a2e284ae53c 100644 --- a/app/src/main/java/org/oppia/android/app/player/state/StateViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/player/state/StateViewModel.kt @@ -1,15 +1,15 @@ -package org.oppia.app.player.state +package org.oppia.android.app.player.state import androidx.databinding.ObservableField import androidx.databinding.ObservableList import androidx.lifecycle.ViewModel -import org.oppia.app.fragment.FragmentScope -import org.oppia.app.model.UserAnswer -import org.oppia.app.player.state.answerhandling.AnswerErrorCategory -import org.oppia.app.player.state.answerhandling.InteractionAnswerHandler -import org.oppia.app.player.state.itemviewmodel.StateItemViewModel -import org.oppia.app.viewmodel.ObservableArrayList -import org.oppia.app.viewmodel.ObservableViewModel +import org.oppia.android.app.fragment.FragmentScope +import org.oppia.android.app.model.UserAnswer +import org.oppia.android.app.player.state.answerhandling.AnswerErrorCategory +import org.oppia.android.app.player.state.answerhandling.InteractionAnswerHandler +import org.oppia.android.app.player.state.itemviewmodel.StateItemViewModel +import org.oppia.android.app.viewmodel.ObservableArrayList +import org.oppia.android.app.viewmodel.ObservableViewModel import javax.inject.Inject /** [ViewModel] for state-fragment. */ diff --git a/app/src/main/java/org/oppia/android/app/player/state/answerhandling/InteractionAnswerErrorOrAvailabilityCheckReceiver.kt b/app/src/main/java/org/oppia/android/app/player/state/answerhandling/InteractionAnswerErrorOrAvailabilityCheckReceiver.kt index 6e221d6bd3a..fe68da3473e 100644 --- a/app/src/main/java/org/oppia/android/app/player/state/answerhandling/InteractionAnswerErrorOrAvailabilityCheckReceiver.kt +++ b/app/src/main/java/org/oppia/android/app/player/state/answerhandling/InteractionAnswerErrorOrAvailabilityCheckReceiver.kt @@ -1,4 +1,4 @@ -package org.oppia.app.player.state.answerhandling +package org.oppia.android.app.player.state.answerhandling /** * A handler for interaction answer's error receiving and change in answer availability status to update submit button. diff --git a/app/src/main/java/org/oppia/android/app/player/state/answerhandling/InteractionAnswerHandler.kt b/app/src/main/java/org/oppia/android/app/player/state/answerhandling/InteractionAnswerHandler.kt index 2894263a182..cb8251b3295 100644 --- a/app/src/main/java/org/oppia/android/app/player/state/answerhandling/InteractionAnswerHandler.kt +++ b/app/src/main/java/org/oppia/android/app/player/state/answerhandling/InteractionAnswerHandler.kt @@ -1,6 +1,6 @@ -package org.oppia.app.player.state.answerhandling +package org.oppia.android.app.player.state.answerhandling -import org.oppia.app.model.UserAnswer +import org.oppia.android.app.model.UserAnswer /** * A handler for interaction answers. Handlers can either require an additional user action before the answer can be diff --git a/app/src/main/java/org/oppia/android/app/player/state/hintsandsolution/DelayShowAdditionalHintsFromWrongAnswerMillis.kt b/app/src/main/java/org/oppia/android/app/player/state/hintsandsolution/DelayShowAdditionalHintsFromWrongAnswerMillis.kt index b2a13d421ce..223996ceb99 100644 --- a/app/src/main/java/org/oppia/android/app/player/state/hintsandsolution/DelayShowAdditionalHintsFromWrongAnswerMillis.kt +++ b/app/src/main/java/org/oppia/android/app/player/state/hintsandsolution/DelayShowAdditionalHintsFromWrongAnswerMillis.kt @@ -1,4 +1,4 @@ -package org.oppia.app.player.state.hintsandsolution +package org.oppia.android.app.player.state.hintsandsolution import javax.inject.Qualifier diff --git a/app/src/main/java/org/oppia/android/app/player/state/hintsandsolution/DelayShowAdditionalHintsMillis.kt b/app/src/main/java/org/oppia/android/app/player/state/hintsandsolution/DelayShowAdditionalHintsMillis.kt index fe90b11af3c..600c354db98 100644 --- a/app/src/main/java/org/oppia/android/app/player/state/hintsandsolution/DelayShowAdditionalHintsMillis.kt +++ b/app/src/main/java/org/oppia/android/app/player/state/hintsandsolution/DelayShowAdditionalHintsMillis.kt @@ -1,4 +1,4 @@ -package org.oppia.app.player.state.hintsandsolution +package org.oppia.android.app.player.state.hintsandsolution import javax.inject.Qualifier diff --git a/app/src/main/java/org/oppia/android/app/player/state/hintsandsolution/DelayShowInitialHintMillis.kt b/app/src/main/java/org/oppia/android/app/player/state/hintsandsolution/DelayShowInitialHintMillis.kt index 6ed6293aaaf..f02d8c74d9b 100644 --- a/app/src/main/java/org/oppia/android/app/player/state/hintsandsolution/DelayShowInitialHintMillis.kt +++ b/app/src/main/java/org/oppia/android/app/player/state/hintsandsolution/DelayShowInitialHintMillis.kt @@ -1,4 +1,4 @@ -package org.oppia.app.player.state.hintsandsolution +package org.oppia.android.app.player.state.hintsandsolution import javax.inject.Qualifier diff --git a/app/src/main/java/org/oppia/android/app/player/state/hintsandsolution/HintsAndSolutionConfigFastShowTestModule.kt b/app/src/main/java/org/oppia/android/app/player/state/hintsandsolution/HintsAndSolutionConfigFastShowTestModule.kt index ec36968018d..b0c431c64f4 100644 --- a/app/src/main/java/org/oppia/android/app/player/state/hintsandsolution/HintsAndSolutionConfigFastShowTestModule.kt +++ b/app/src/main/java/org/oppia/android/app/player/state/hintsandsolution/HintsAndSolutionConfigFastShowTestModule.kt @@ -1,4 +1,4 @@ -package org.oppia.app.player.state.hintsandsolution +package org.oppia.android.app.player.state.hintsandsolution import dagger.Module import dagger.Provides diff --git a/app/src/main/java/org/oppia/android/app/player/state/hintsandsolution/HintsAndSolutionConfigModule.kt b/app/src/main/java/org/oppia/android/app/player/state/hintsandsolution/HintsAndSolutionConfigModule.kt index bd6499f24b0..24cde21f077 100644 --- a/app/src/main/java/org/oppia/android/app/player/state/hintsandsolution/HintsAndSolutionConfigModule.kt +++ b/app/src/main/java/org/oppia/android/app/player/state/hintsandsolution/HintsAndSolutionConfigModule.kt @@ -1,4 +1,4 @@ -package org.oppia.app.player.state.hintsandsolution +package org.oppia.android.app.player.state.hintsandsolution import dagger.Module import dagger.Provides diff --git a/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/ContentViewModel.kt b/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/ContentViewModel.kt index 3d2c53cd2d7..5a581ea586b 100644 --- a/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/ContentViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/ContentViewModel.kt @@ -1,4 +1,4 @@ -package org.oppia.app.player.state.itemviewmodel +package org.oppia.android.app.player.state.itemviewmodel /** [StateItemViewModel] for content-card state. */ class ContentViewModel( diff --git a/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/ContinueInteractionViewModel.kt b/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/ContinueInteractionViewModel.kt index 5769ed50f4e..a59acca203a 100644 --- a/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/ContinueInteractionViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/ContinueInteractionViewModel.kt @@ -1,10 +1,10 @@ -package org.oppia.app.player.state.itemviewmodel +package org.oppia.android.app.player.state.itemviewmodel -import org.oppia.app.model.InteractionObject -import org.oppia.app.model.UserAnswer -import org.oppia.app.player.state.answerhandling.InteractionAnswerHandler -import org.oppia.app.player.state.answerhandling.InteractionAnswerReceiver -import org.oppia.app.player.state.listener.PreviousNavigationButtonListener +import org.oppia.android.app.model.InteractionObject +import org.oppia.android.app.model.UserAnswer +import org.oppia.android.app.player.state.answerhandling.InteractionAnswerHandler +import org.oppia.android.app.player.state.answerhandling.InteractionAnswerReceiver +import org.oppia.android.app.player.state.listener.PreviousNavigationButtonListener // For context: // https://github.com/oppia/oppia/blob/37285a/extensions/interactions/Continue/directives/oppia-interactive-continue.directive.ts diff --git a/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/ContinueNavigationButtonViewModel.kt b/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/ContinueNavigationButtonViewModel.kt index a7ba4443d8c..2f668b3848a 100644 --- a/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/ContinueNavigationButtonViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/ContinueNavigationButtonViewModel.kt @@ -1,7 +1,7 @@ -package org.oppia.app.player.state.itemviewmodel +package org.oppia.android.app.player.state.itemviewmodel -import org.oppia.app.player.state.listener.ContinueNavigationButtonListener -import org.oppia.app.player.state.listener.PreviousNavigationButtonListener +import org.oppia.android.app.player.state.listener.ContinueNavigationButtonListener +import org.oppia.android.app.player.state.listener.PreviousNavigationButtonListener /** * [StateItemViewModel] for navigating to previous states and continuing to a new state. This differs from diff --git a/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/DragAndDropSortInteractionViewModel.kt b/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/DragAndDropSortInteractionViewModel.kt index 192ffc58448..978c6c45e95 100644 --- a/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/DragAndDropSortInteractionViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/DragAndDropSortInteractionViewModel.kt @@ -1,18 +1,18 @@ -package org.oppia.app.player.state.itemviewmodel +package org.oppia.android.app.player.state.itemviewmodel import androidx.databinding.Observable import androidx.databinding.ObservableField import androidx.recyclerview.widget.RecyclerView -import org.oppia.app.model.Interaction -import org.oppia.app.model.InteractionObject -import org.oppia.app.model.ListOfSetsOfHtmlStrings -import org.oppia.app.model.StringList -import org.oppia.app.model.UserAnswer -import org.oppia.app.player.state.answerhandling.InteractionAnswerErrorOrAvailabilityCheckReceiver -import org.oppia.app.player.state.answerhandling.InteractionAnswerHandler -import org.oppia.app.recyclerview.BindableAdapter -import org.oppia.app.recyclerview.OnDragEndedListener -import org.oppia.app.recyclerview.OnItemDragListener +import org.oppia.android.app.model.Interaction +import org.oppia.android.app.model.InteractionObject +import org.oppia.android.app.model.ListOfSetsOfHtmlStrings +import org.oppia.android.app.model.StringList +import org.oppia.android.app.model.UserAnswer +import org.oppia.android.app.player.state.answerhandling.InteractionAnswerErrorOrAvailabilityCheckReceiver +import org.oppia.android.app.player.state.answerhandling.InteractionAnswerHandler +import org.oppia.android.app.recyclerview.BindableAdapter +import org.oppia.android.app.recyclerview.OnDragEndedListener +import org.oppia.android.app.recyclerview.OnItemDragListener /** [StateItemViewModel] for drag drop & sort choice list. */ class DragAndDropSortInteractionViewModel( diff --git a/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/DragDropInteractionContentViewModel.kt b/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/DragDropInteractionContentViewModel.kt index 7851aebf79b..836da71841b 100644 --- a/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/DragDropInteractionContentViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/DragDropInteractionContentViewModel.kt @@ -1,8 +1,8 @@ -package org.oppia.app.player.state.itemviewmodel +package org.oppia.android.app.player.state.itemviewmodel import androidx.recyclerview.widget.RecyclerView -import org.oppia.app.model.StringList -import org.oppia.app.viewmodel.ObservableViewModel +import org.oppia.android.app.model.StringList +import org.oppia.android.app.viewmodel.ObservableViewModel /** [ObservableViewModel] for DragDropSortInput values. */ class DragDropInteractionContentViewModel( diff --git a/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/FeedbackViewModel.kt b/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/FeedbackViewModel.kt index 105c0114b54..ef484383f5c 100644 --- a/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/FeedbackViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/FeedbackViewModel.kt @@ -1,4 +1,4 @@ -package org.oppia.app.player.state.itemviewmodel +package org.oppia.android.app.player.state.itemviewmodel /** [StateItemViewModel] for feedback blurbs. */ class FeedbackViewModel( diff --git a/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/FractionInteractionViewModel.kt b/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/FractionInteractionViewModel.kt index fd7059b25e8..c142dc3cb3e 100644 --- a/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/FractionInteractionViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/FractionInteractionViewModel.kt @@ -1,18 +1,18 @@ -package org.oppia.app.player.state.itemviewmodel +package org.oppia.android.app.player.state.itemviewmodel import android.content.Context import android.text.Editable import android.text.TextWatcher import androidx.databinding.Observable import androidx.databinding.ObservableField -import org.oppia.app.R -import org.oppia.app.model.Interaction -import org.oppia.app.model.InteractionObject -import org.oppia.app.model.UserAnswer -import org.oppia.app.parser.StringToFractionParser -import org.oppia.app.player.state.answerhandling.AnswerErrorCategory -import org.oppia.app.player.state.answerhandling.InteractionAnswerErrorOrAvailabilityCheckReceiver -import org.oppia.app.player.state.answerhandling.InteractionAnswerHandler +import org.oppia.android.R +import org.oppia.android.app.model.Interaction +import org.oppia.android.app.model.InteractionObject +import org.oppia.android.app.model.UserAnswer +import org.oppia.android.app.parser.StringToFractionParser +import org.oppia.android.app.player.state.answerhandling.AnswerErrorCategory +import org.oppia.android.app.player.state.answerhandling.InteractionAnswerErrorOrAvailabilityCheckReceiver +import org.oppia.android.app.player.state.answerhandling.InteractionAnswerHandler /** [StateItemViewModel] for the fraction input interaction. */ class FractionInteractionViewModel( diff --git a/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/ImageRegionSelectionInteractionViewModel.kt b/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/ImageRegionSelectionInteractionViewModel.kt index 10032ef5533..8b4dc01544a 100644 --- a/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/ImageRegionSelectionInteractionViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/ImageRegionSelectionInteractionViewModel.kt @@ -1,20 +1,20 @@ -package org.oppia.app.player.state.itemviewmodel +package org.oppia.android.app.player.state.itemviewmodel import android.content.Context import androidx.databinding.Observable import androidx.databinding.ObservableField -import org.oppia.app.R -import org.oppia.app.model.ClickOnImage -import org.oppia.app.model.ImageWithRegions -import org.oppia.app.model.Interaction -import org.oppia.app.model.InteractionObject -import org.oppia.app.model.UserAnswer -import org.oppia.app.player.state.answerhandling.InteractionAnswerErrorOrAvailabilityCheckReceiver -import org.oppia.app.player.state.answerhandling.InteractionAnswerHandler -import org.oppia.app.utility.DefaultRegionClickedEvent -import org.oppia.app.utility.NamedRegionClickedEvent -import org.oppia.app.utility.OnClickableAreaClickedListener -import org.oppia.app.utility.RegionClickedEvent +import org.oppia.android.R +import org.oppia.android.app.model.ClickOnImage +import org.oppia.android.app.model.ImageWithRegions +import org.oppia.android.app.model.Interaction +import org.oppia.android.app.model.InteractionObject +import org.oppia.android.app.model.UserAnswer +import org.oppia.android.app.player.state.answerhandling.InteractionAnswerErrorOrAvailabilityCheckReceiver +import org.oppia.android.app.player.state.answerhandling.InteractionAnswerHandler +import org.oppia.android.app.utility.DefaultRegionClickedEvent +import org.oppia.android.app.utility.NamedRegionClickedEvent +import org.oppia.android.app.utility.OnClickableAreaClickedListener +import org.oppia.android.app.utility.RegionClickedEvent /** [StateItemViewModel] for image region selection. */ class ImageRegionSelectionInteractionViewModel( diff --git a/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/InteractionViewModelFactory.kt b/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/InteractionViewModelFactory.kt index df4dfd366ea..58196c76705 100644 --- a/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/InteractionViewModelFactory.kt +++ b/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/InteractionViewModelFactory.kt @@ -1,8 +1,8 @@ -package org.oppia.app.player.state.itemviewmodel +package org.oppia.android.app.player.state.itemviewmodel -import org.oppia.app.model.Interaction -import org.oppia.app.player.state.answerhandling.InteractionAnswerErrorOrAvailabilityCheckReceiver -import org.oppia.app.player.state.answerhandling.InteractionAnswerReceiver +import org.oppia.android.app.model.Interaction +import org.oppia.android.app.player.state.answerhandling.InteractionAnswerErrorOrAvailabilityCheckReceiver +import org.oppia.android.app.player.state.answerhandling.InteractionAnswerReceiver /** * Returns a new [StateItemViewModel] corresponding to this interaction with the GCS entity ID, the [Interaction] diff --git a/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/InteractionViewModelModule.kt b/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/InteractionViewModelModule.kt index bf74604f47d..af5c84918e1 100644 --- a/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/InteractionViewModelModule.kt +++ b/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/InteractionViewModelModule.kt @@ -1,4 +1,4 @@ -package org.oppia.app.player.state.itemviewmodel +package org.oppia.android.app.player.state.itemviewmodel import android.content.Context import androidx.fragment.app.Fragment @@ -6,7 +6,7 @@ import dagger.Module import dagger.Provides import dagger.multibindings.IntoMap import dagger.multibindings.StringKey -import org.oppia.app.player.state.listener.PreviousNavigationButtonListener +import org.oppia.android.app.player.state.listener.PreviousNavigationButtonListener /** * Module to provide interaction view model-specific dependencies for interactions that should be diff --git a/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/NextButtonViewModel.kt b/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/NextButtonViewModel.kt index ca4fef9bc2a..3783cc44981 100644 --- a/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/NextButtonViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/NextButtonViewModel.kt @@ -1,7 +1,7 @@ -package org.oppia.app.player.state.itemviewmodel +package org.oppia.android.app.player.state.itemviewmodel -import org.oppia.app.player.state.listener.NextNavigationButtonListener -import org.oppia.app.player.state.listener.PreviousNavigationButtonListener +import org.oppia.android.app.player.state.listener.NextNavigationButtonListener +import org.oppia.android.app.player.state.listener.PreviousNavigationButtonListener /** [StateItemViewModel] for navigation buttons to traverse previous and upcoming states. */ class NextButtonViewModel( diff --git a/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/NumericInputViewModel.kt b/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/NumericInputViewModel.kt index fd041ee4d2c..0825021f7e9 100644 --- a/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/NumericInputViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/NumericInputViewModel.kt @@ -1,16 +1,16 @@ -package org.oppia.app.player.state.itemviewmodel +package org.oppia.android.app.player.state.itemviewmodel import android.content.Context import android.text.Editable import android.text.TextWatcher import androidx.databinding.Observable import androidx.databinding.ObservableField -import org.oppia.app.model.InteractionObject -import org.oppia.app.model.UserAnswer -import org.oppia.app.parser.StringToNumberParser -import org.oppia.app.player.state.answerhandling.AnswerErrorCategory -import org.oppia.app.player.state.answerhandling.InteractionAnswerErrorOrAvailabilityCheckReceiver -import org.oppia.app.player.state.answerhandling.InteractionAnswerHandler +import org.oppia.android.app.model.InteractionObject +import org.oppia.android.app.model.UserAnswer +import org.oppia.android.app.parser.StringToNumberParser +import org.oppia.android.app.player.state.answerhandling.AnswerErrorCategory +import org.oppia.android.app.player.state.answerhandling.InteractionAnswerErrorOrAvailabilityCheckReceiver +import org.oppia.android.app.player.state.answerhandling.InteractionAnswerHandler /** [StateItemViewModel] for the numeric input interaction. */ class NumericInputViewModel( diff --git a/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/PreviousButtonViewModel.kt b/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/PreviousButtonViewModel.kt index 47da4a013e6..66daf4d78e4 100644 --- a/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/PreviousButtonViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/PreviousButtonViewModel.kt @@ -1,6 +1,6 @@ -package org.oppia.app.player.state.itemviewmodel +package org.oppia.android.app.player.state.itemviewmodel -import org.oppia.app.player.state.listener.PreviousNavigationButtonListener +import org.oppia.android.app.player.state.listener.PreviousNavigationButtonListener /** * [StateItemViewModel] for navigating to a previous state. Unlike other navigation buttons, this model only represents diff --git a/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/PreviousResponsesHeaderViewModel.kt b/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/PreviousResponsesHeaderViewModel.kt index f6ab99ccfc4..0492b5c8215 100644 --- a/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/PreviousResponsesHeaderViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/PreviousResponsesHeaderViewModel.kt @@ -1,7 +1,7 @@ -package org.oppia.app.player.state.itemviewmodel +package org.oppia.android.app.player.state.itemviewmodel import androidx.databinding.ObservableBoolean -import org.oppia.app.player.state.listener.PreviousResponsesHeaderClickListener +import org.oppia.android.app.player.state.listener.PreviousResponsesHeaderClickListener /** [StateItemViewModel] for the header of the section of previously submitted answers. */ class PreviousResponsesHeaderViewModel( diff --git a/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/RatioExpressionInputInteractionViewModel.kt b/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/RatioExpressionInputInteractionViewModel.kt index 330a9c2aa75..0979bd4e785 100644 --- a/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/RatioExpressionInputInteractionViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/RatioExpressionInputInteractionViewModel.kt @@ -1,20 +1,20 @@ -package org.oppia.app.player.state.itemviewmodel +package org.oppia.android.app.player.state.itemviewmodel import android.content.Context import android.text.Editable import android.text.TextWatcher import androidx.databinding.Observable import androidx.databinding.ObservableField -import org.oppia.app.R -import org.oppia.app.model.Interaction -import org.oppia.app.model.InteractionObject -import org.oppia.app.model.UserAnswer -import org.oppia.app.parser.StringToRatioParser -import org.oppia.app.player.state.answerhandling.AnswerErrorCategory -import org.oppia.app.player.state.answerhandling.InteractionAnswerErrorOrAvailabilityCheckReceiver -import org.oppia.app.player.state.answerhandling.InteractionAnswerHandler -import org.oppia.app.utility.toAccessibleAnswerString -import org.oppia.domain.util.toAnswerString +import org.oppia.android.R +import org.oppia.android.app.model.Interaction +import org.oppia.android.app.model.InteractionObject +import org.oppia.android.app.model.UserAnswer +import org.oppia.android.app.parser.StringToRatioParser +import org.oppia.android.app.player.state.answerhandling.AnswerErrorCategory +import org.oppia.android.app.player.state.answerhandling.InteractionAnswerErrorOrAvailabilityCheckReceiver +import org.oppia.android.app.player.state.answerhandling.InteractionAnswerHandler +import org.oppia.android.app.utility.toAccessibleAnswerString +import org.oppia.android.domain.util.toAnswerString /** [StateItemViewModel] for the ratio expression input interaction. */ class RatioExpressionInputInteractionViewModel( diff --git a/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/ReplayButtonViewModel.kt b/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/ReplayButtonViewModel.kt index 7592d150c6d..05306127ada 100644 --- a/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/ReplayButtonViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/ReplayButtonViewModel.kt @@ -1,6 +1,6 @@ -package org.oppia.app.player.state.itemviewmodel +package org.oppia.android.app.player.state.itemviewmodel -import org.oppia.app.player.state.listener.ReplayButtonListener +import org.oppia.android.app.player.state.listener.ReplayButtonListener /** [StateItemViewModel] for replaying the current lesson experience. */ class ReplayButtonViewModel( diff --git a/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/ReturnToTopicButtonViewModel.kt b/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/ReturnToTopicButtonViewModel.kt index a8edc4927b0..49b275234e2 100644 --- a/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/ReturnToTopicButtonViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/ReturnToTopicButtonViewModel.kt @@ -1,7 +1,7 @@ -package org.oppia.app.player.state.itemviewmodel +package org.oppia.android.app.player.state.itemviewmodel -import org.oppia.app.player.state.listener.PreviousNavigationButtonListener -import org.oppia.app.player.state.listener.ReturnToTopicNavigationButtonListener +import org.oppia.android.app.player.state.listener.PreviousNavigationButtonListener +import org.oppia.android.app.player.state.listener.ReturnToTopicNavigationButtonListener /** [StateItemViewModel] for both previous state navigation and navigating back to the topic containing this lesson. */ class ReturnToTopicButtonViewModel( diff --git a/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/SelectionInteractionContentViewModel.kt b/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/SelectionInteractionContentViewModel.kt index 4cdf2078235..cda68fb8d87 100644 --- a/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/SelectionInteractionContentViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/SelectionInteractionContentViewModel.kt @@ -1,7 +1,7 @@ -package org.oppia.app.player.state.itemviewmodel +package org.oppia.android.app.player.state.itemviewmodel import androidx.databinding.ObservableBoolean -import org.oppia.app.viewmodel.ObservableViewModel +import org.oppia.android.app.viewmodel.ObservableViewModel /** [ObservableViewModel] for MultipleChoiceInput values or ItemSelectionInput values. */ class SelectionInteractionContentViewModel( diff --git a/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/SelectionInteractionViewModel.kt b/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/SelectionInteractionViewModel.kt index d5ec8c67620..d2b17cb5fb4 100644 --- a/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/SelectionInteractionViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/SelectionInteractionViewModel.kt @@ -1,16 +1,16 @@ -package org.oppia.app.player.state.itemviewmodel +package org.oppia.android.app.player.state.itemviewmodel import androidx.databinding.Observable import androidx.databinding.ObservableField import androidx.databinding.ObservableList -import org.oppia.app.model.Interaction -import org.oppia.app.model.InteractionObject -import org.oppia.app.model.StringList -import org.oppia.app.model.UserAnswer -import org.oppia.app.player.state.answerhandling.InteractionAnswerErrorOrAvailabilityCheckReceiver -import org.oppia.app.player.state.answerhandling.InteractionAnswerHandler -import org.oppia.app.player.state.answerhandling.InteractionAnswerReceiver -import org.oppia.app.viewmodel.ObservableArrayList +import org.oppia.android.app.model.Interaction +import org.oppia.android.app.model.InteractionObject +import org.oppia.android.app.model.StringList +import org.oppia.android.app.model.UserAnswer +import org.oppia.android.app.player.state.answerhandling.InteractionAnswerErrorOrAvailabilityCheckReceiver +import org.oppia.android.app.player.state.answerhandling.InteractionAnswerHandler +import org.oppia.android.app.player.state.answerhandling.InteractionAnswerReceiver +import org.oppia.android.app.viewmodel.ObservableArrayList /** Corresponds to the type of input that should be used for an item selection interaction view. */ enum class SelectionItemInputType { diff --git a/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/StateItemViewModel.kt b/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/StateItemViewModel.kt index 0672c8bed89..cce34492ed6 100644 --- a/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/StateItemViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/StateItemViewModel.kt @@ -1,6 +1,6 @@ -package org.oppia.app.player.state.itemviewmodel +package org.oppia.android.app.player.state.itemviewmodel -import org.oppia.app.viewmodel.ObservableViewModel +import org.oppia.android.app.viewmodel.ObservableViewModel /** * The root [ObservableViewModel] for all individual items that may be displayed in the state fragment recycler view. diff --git a/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/SubmitButtonViewModel.kt b/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/SubmitButtonViewModel.kt index c10015d710a..073adea0828 100644 --- a/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/SubmitButtonViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/SubmitButtonViewModel.kt @@ -1,8 +1,8 @@ -package org.oppia.app.player.state.itemviewmodel +package org.oppia.android.app.player.state.itemviewmodel import androidx.databinding.ObservableField -import org.oppia.app.player.state.listener.PreviousNavigationButtonListener -import org.oppia.app.player.state.listener.SubmitNavigationButtonListener +import org.oppia.android.app.player.state.listener.PreviousNavigationButtonListener +import org.oppia.android.app.player.state.listener.SubmitNavigationButtonListener /** [StateItemViewModel] for navigation to previous states and submitting new answers. */ class SubmitButtonViewModel( diff --git a/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/SubmittedAnswerViewModel.kt b/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/SubmittedAnswerViewModel.kt index 8ed55fb0da4..c971e6aad5e 100644 --- a/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/SubmittedAnswerViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/SubmittedAnswerViewModel.kt @@ -1,7 +1,7 @@ -package org.oppia.app.player.state.itemviewmodel +package org.oppia.android.app.player.state.itemviewmodel import androidx.databinding.ObservableField -import org.oppia.app.model.UserAnswer +import org.oppia.android.app.model.UserAnswer /** [StateItemViewModel] for previously submitted answers. */ class SubmittedAnswerViewModel( diff --git a/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/TextInputViewModel.kt b/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/TextInputViewModel.kt index ecdfa5ffb4f..db5e2711d60 100644 --- a/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/TextInputViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/TextInputViewModel.kt @@ -1,14 +1,14 @@ -package org.oppia.app.player.state.itemviewmodel +package org.oppia.android.app.player.state.itemviewmodel import android.text.Editable import android.text.TextWatcher import androidx.databinding.Observable import androidx.databinding.ObservableField -import org.oppia.app.model.Interaction -import org.oppia.app.model.InteractionObject -import org.oppia.app.model.UserAnswer -import org.oppia.app.player.state.answerhandling.InteractionAnswerErrorOrAvailabilityCheckReceiver -import org.oppia.app.player.state.answerhandling.InteractionAnswerHandler +import org.oppia.android.app.model.Interaction +import org.oppia.android.app.model.InteractionObject +import org.oppia.android.app.model.UserAnswer +import org.oppia.android.app.player.state.answerhandling.InteractionAnswerErrorOrAvailabilityCheckReceiver +import org.oppia.android.app.player.state.answerhandling.InteractionAnswerHandler /** [StateItemViewModel] for the text input interaction. */ class TextInputViewModel( diff --git a/app/src/main/java/org/oppia/android/app/player/state/listener/ContinueNavigationButtonListener.kt b/app/src/main/java/org/oppia/android/app/player/state/listener/ContinueNavigationButtonListener.kt index a942090933b..b7d77d0c36e 100644 --- a/app/src/main/java/org/oppia/android/app/player/state/listener/ContinueNavigationButtonListener.kt +++ b/app/src/main/java/org/oppia/android/app/player/state/listener/ContinueNavigationButtonListener.kt @@ -1,4 +1,4 @@ -package org.oppia.app.player.state.listener +package org.oppia.android.app.player.state.listener /** Listener for when the non-interaction 'Continue' button is clicked. */ interface ContinueNavigationButtonListener { diff --git a/app/src/main/java/org/oppia/android/app/player/state/listener/NextNavigationButtonListener.kt b/app/src/main/java/org/oppia/android/app/player/state/listener/NextNavigationButtonListener.kt index d6773f26787..b1f1c531568 100644 --- a/app/src/main/java/org/oppia/android/app/player/state/listener/NextNavigationButtonListener.kt +++ b/app/src/main/java/org/oppia/android/app/player/state/listener/NextNavigationButtonListener.kt @@ -1,4 +1,4 @@ -package org.oppia.app.player.state.listener +package org.oppia.android.app.player.state.listener /** Listener for when the 'next' navigation button is clicked. */ interface NextNavigationButtonListener { diff --git a/app/src/main/java/org/oppia/android/app/player/state/listener/PreviousNavigationButtonListener.kt b/app/src/main/java/org/oppia/android/app/player/state/listener/PreviousNavigationButtonListener.kt index 3db53811be2..8422a02f344 100644 --- a/app/src/main/java/org/oppia/android/app/player/state/listener/PreviousNavigationButtonListener.kt +++ b/app/src/main/java/org/oppia/android/app/player/state/listener/PreviousNavigationButtonListener.kt @@ -1,4 +1,4 @@ -package org.oppia.app.player.state.listener +package org.oppia.android.app.player.state.listener /** Listener for when the 'previous' navigation button is clicked. */ interface PreviousNavigationButtonListener { diff --git a/app/src/main/java/org/oppia/android/app/player/state/listener/PreviousResponsesHeaderClickListener.kt b/app/src/main/java/org/oppia/android/app/player/state/listener/PreviousResponsesHeaderClickListener.kt index 6e6a0e9e457..191f0a2bb8a 100644 --- a/app/src/main/java/org/oppia/android/app/player/state/listener/PreviousResponsesHeaderClickListener.kt +++ b/app/src/main/java/org/oppia/android/app/player/state/listener/PreviousResponsesHeaderClickListener.kt @@ -1,4 +1,4 @@ -package org.oppia.app.player.state.listener +package org.oppia.android.app.player.state.listener /** Listener for when the previous response header is clicked. */ interface PreviousResponsesHeaderClickListener { diff --git a/app/src/main/java/org/oppia/android/app/player/state/listener/ReplayButtonListener.kt b/app/src/main/java/org/oppia/android/app/player/state/listener/ReplayButtonListener.kt index 65115471d0c..9c99e19c200 100644 --- a/app/src/main/java/org/oppia/android/app/player/state/listener/ReplayButtonListener.kt +++ b/app/src/main/java/org/oppia/android/app/player/state/listener/ReplayButtonListener.kt @@ -1,4 +1,4 @@ -package org.oppia.app.player.state.listener +package org.oppia.android.app.player.state.listener /** Listener for when the replay button is clicked. */ interface ReplayButtonListener { diff --git a/app/src/main/java/org/oppia/android/app/player/state/listener/ReturnToTopicNavigationButtonListener.kt b/app/src/main/java/org/oppia/android/app/player/state/listener/ReturnToTopicNavigationButtonListener.kt index c00c207e8b4..17bbca6e5a8 100644 --- a/app/src/main/java/org/oppia/android/app/player/state/listener/ReturnToTopicNavigationButtonListener.kt +++ b/app/src/main/java/org/oppia/android/app/player/state/listener/ReturnToTopicNavigationButtonListener.kt @@ -1,4 +1,4 @@ -package org.oppia.app.player.state.listener +package org.oppia.android.app.player.state.listener /** Listener for when the 'return to topic' navigation button is clicked. */ interface ReturnToTopicNavigationButtonListener { diff --git a/app/src/main/java/org/oppia/android/app/player/state/listener/RouteToHintsAndSolutionListener.kt b/app/src/main/java/org/oppia/android/app/player/state/listener/RouteToHintsAndSolutionListener.kt index 214c4b4544e..9412a17e999 100755 --- a/app/src/main/java/org/oppia/android/app/player/state/listener/RouteToHintsAndSolutionListener.kt +++ b/app/src/main/java/org/oppia/android/app/player/state/listener/RouteToHintsAndSolutionListener.kt @@ -1,4 +1,4 @@ -package org.oppia.app.player.state.listener +package org.oppia.android.app.player.state.listener /** Listener for when an [ExplorationActivity] should route to a [HintsAndSolution]. */ interface RouteToHintsAndSolutionListener { diff --git a/app/src/main/java/org/oppia/android/app/player/state/listener/ShowHintAvailabilityListener.kt b/app/src/main/java/org/oppia/android/app/player/state/listener/ShowHintAvailabilityListener.kt index 1b8adbccdb2..d8012967f89 100644 --- a/app/src/main/java/org/oppia/android/app/player/state/listener/ShowHintAvailabilityListener.kt +++ b/app/src/main/java/org/oppia/android/app/player/state/listener/ShowHintAvailabilityListener.kt @@ -1,6 +1,6 @@ -package org.oppia.app.player.state.listener +package org.oppia.android.app.player.state.listener -import org.oppia.app.model.HelpIndex +import org.oppia.android.app.model.HelpIndex /** Callback interface for when hints can be made available to the learner. */ interface ShowHintAvailabilityListener { diff --git a/app/src/main/java/org/oppia/android/app/player/state/listener/StateKeyboardButtonListener.kt b/app/src/main/java/org/oppia/android/app/player/state/listener/StateKeyboardButtonListener.kt index d91309e572e..1e452e886f4 100644 --- a/app/src/main/java/org/oppia/android/app/player/state/listener/StateKeyboardButtonListener.kt +++ b/app/src/main/java/org/oppia/android/app/player/state/listener/StateKeyboardButtonListener.kt @@ -1,4 +1,4 @@ -package org.oppia.app.player.state.listener +package org.oppia.android.app.player.state.listener /** This interface helps to know when a keyboard action done button has been clicked. */ interface StateKeyboardButtonListener { diff --git a/app/src/main/java/org/oppia/android/app/player/state/listener/SubmitNavigationButtonListener.kt b/app/src/main/java/org/oppia/android/app/player/state/listener/SubmitNavigationButtonListener.kt index cd1f2f2b4dd..234b8313ad8 100644 --- a/app/src/main/java/org/oppia/android/app/player/state/listener/SubmitNavigationButtonListener.kt +++ b/app/src/main/java/org/oppia/android/app/player/state/listener/SubmitNavigationButtonListener.kt @@ -1,4 +1,4 @@ -package org.oppia.app.player.state.listener +package org.oppia.android.app.player.state.listener /** Listener for when the answer submit button is clicked. */ interface SubmitNavigationButtonListener { diff --git a/app/src/main/java/org/oppia/android/app/player/state/testing/StateFragmentTestActivity.kt b/app/src/main/java/org/oppia/android/app/player/state/testing/StateFragmentTestActivity.kt index 7fe989032c8..1c8432037bb 100644 --- a/app/src/main/java/org/oppia/android/app/player/state/testing/StateFragmentTestActivity.kt +++ b/app/src/main/java/org/oppia/android/app/player/state/testing/StateFragmentTestActivity.kt @@ -1,20 +1,20 @@ -package org.oppia.app.player.state.testing +package org.oppia.android.app.player.state.testing import android.content.Context import android.content.Intent import android.os.Bundle -import org.oppia.app.activity.InjectableAppCompatActivity -import org.oppia.app.hintsandsolution.HintsAndSolutionDialogFragment -import org.oppia.app.hintsandsolution.HintsAndSolutionListener -import org.oppia.app.hintsandsolution.RevealHintListener -import org.oppia.app.hintsandsolution.RevealSolutionInterface -import org.oppia.app.model.State -import org.oppia.app.player.audio.AudioButtonListener -import org.oppia.app.player.exploration.HintsAndSolutionExplorationManagerListener -import org.oppia.app.player.exploration.TAG_HINTS_AND_SOLUTION_DIALOG -import org.oppia.app.player.state.listener.RouteToHintsAndSolutionListener -import org.oppia.app.player.state.listener.StateKeyboardButtonListener -import org.oppia.app.player.stopplaying.StopStatePlayingSessionListener +import org.oppia.android.app.activity.InjectableAppCompatActivity +import org.oppia.android.app.hintsandsolution.HintsAndSolutionDialogFragment +import org.oppia.android.app.hintsandsolution.HintsAndSolutionListener +import org.oppia.android.app.hintsandsolution.RevealHintListener +import org.oppia.android.app.hintsandsolution.RevealSolutionInterface +import org.oppia.android.app.model.State +import org.oppia.android.app.player.audio.AudioButtonListener +import org.oppia.android.app.player.exploration.HintsAndSolutionExplorationManagerListener +import org.oppia.android.app.player.exploration.TAG_HINTS_AND_SOLUTION_DIALOG +import org.oppia.android.app.player.state.listener.RouteToHintsAndSolutionListener +import org.oppia.android.app.player.state.listener.StateKeyboardButtonListener +import org.oppia.android.app.player.stopplaying.StopStatePlayingSessionListener import javax.inject.Inject internal const val TEST_ACTIVITY_PROFILE_ID_EXTRA = "StateFragmentTestActivity.profile_id" diff --git a/app/src/main/java/org/oppia/android/app/player/state/testing/StateFragmentTestActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/player/state/testing/StateFragmentTestActivityPresenter.kt index 8961e682296..3b6d5304bab 100644 --- a/app/src/main/java/org/oppia/android/app/player/state/testing/StateFragmentTestActivityPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/player/state/testing/StateFragmentTestActivityPresenter.kt @@ -1,22 +1,22 @@ -package org.oppia.app.player.state.testing +package org.oppia.android.app.player.state.testing import android.widget.Button import androidx.appcompat.app.AppCompatActivity import androidx.databinding.DataBindingUtil import androidx.lifecycle.Observer -import org.oppia.app.R -import org.oppia.app.activity.ActivityScope -import org.oppia.app.databinding.StateFragmentTestActivityBinding -import org.oppia.app.player.exploration.HintsAndSolutionExplorationManagerFragment -import org.oppia.app.player.exploration.TAG_HINTS_AND_SOLUTION_EXPLORATION_MANAGER -import org.oppia.app.player.state.StateFragment -import org.oppia.app.viewmodel.ViewModelProvider -import org.oppia.domain.exploration.ExplorationDataController -import org.oppia.domain.topic.TEST_EXPLORATION_ID_2 -import org.oppia.domain.topic.TEST_STORY_ID_0 -import org.oppia.domain.topic.TEST_TOPIC_ID_0 -import org.oppia.util.data.AsyncResult -import org.oppia.util.logging.ConsoleLogger +import org.oppia.android.R +import org.oppia.android.app.activity.ActivityScope +import org.oppia.android.app.player.exploration.HintsAndSolutionExplorationManagerFragment +import org.oppia.android.app.player.exploration.TAG_HINTS_AND_SOLUTION_EXPLORATION_MANAGER +import org.oppia.android.app.player.state.StateFragment +import org.oppia.android.app.viewmodel.ViewModelProvider +import org.oppia.android.databinding.StateFragmentTestActivityBinding +import org.oppia.android.domain.exploration.ExplorationDataController +import org.oppia.android.domain.topic.TEST_EXPLORATION_ID_2 +import org.oppia.android.domain.topic.TEST_STORY_ID_0 +import org.oppia.android.domain.topic.TEST_TOPIC_ID_0 +import org.oppia.android.util.data.AsyncResult +import org.oppia.android.util.logging.ConsoleLogger import javax.inject.Inject private const val TEST_ACTIVITY_TAG = "TestActivity" diff --git a/app/src/main/java/org/oppia/android/app/player/state/testing/StateFragmentTestViewModel.kt b/app/src/main/java/org/oppia/android/app/player/state/testing/StateFragmentTestViewModel.kt index f5cdaa0f5c0..97f0c327248 100644 --- a/app/src/main/java/org/oppia/android/app/player/state/testing/StateFragmentTestViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/player/state/testing/StateFragmentTestViewModel.kt @@ -1,9 +1,9 @@ -package org.oppia.app.player.state.testing +package org.oppia.android.app.player.state.testing import androidx.databinding.ObservableField import androidx.lifecycle.ViewModel -import org.oppia.app.activity.ActivityScope -import org.oppia.app.viewmodel.ObservableViewModel +import org.oppia.android.app.activity.ActivityScope +import org.oppia.android.app.viewmodel.ObservableViewModel import javax.inject.Inject /** [ViewModel] for [StateFragmentTestActivity]. */ diff --git a/app/src/main/java/org/oppia/android/app/player/stopplaying/RestartPlayingSessionListener.kt b/app/src/main/java/org/oppia/android/app/player/stopplaying/RestartPlayingSessionListener.kt index 03d2eae3bef..4e93946f2db 100644 --- a/app/src/main/java/org/oppia/android/app/player/stopplaying/RestartPlayingSessionListener.kt +++ b/app/src/main/java/org/oppia/android/app/player/stopplaying/RestartPlayingSessionListener.kt @@ -1,4 +1,4 @@ -package org.oppia.app.player.stopplaying +package org.oppia.android.app.player.stopplaying /** Listener for when the current state playing session should be restarted. */ interface RestartPlayingSessionListener { diff --git a/app/src/main/java/org/oppia/android/app/player/stopplaying/StopExplorationDialogFragment.kt b/app/src/main/java/org/oppia/android/app/player/stopplaying/StopExplorationDialogFragment.kt index 716531f53c0..fa37b32c7cf 100644 --- a/app/src/main/java/org/oppia/android/app/player/stopplaying/StopExplorationDialogFragment.kt +++ b/app/src/main/java/org/oppia/android/app/player/stopplaying/StopExplorationDialogFragment.kt @@ -1,4 +1,4 @@ -package org.oppia.app.player.stopplaying +package org.oppia.android.app.player.stopplaying import android.app.Dialog import android.content.Context @@ -6,7 +6,7 @@ import android.os.Bundle import androidx.appcompat.app.AlertDialog import androidx.appcompat.view.ContextThemeWrapper import androidx.fragment.app.DialogFragment -import org.oppia.app.R +import org.oppia.android.R /** * DialogFragment that gives option to learner to stop exploration in between. diff --git a/app/src/main/java/org/oppia/android/app/player/stopplaying/StopStatePlayingSessionListener.kt b/app/src/main/java/org/oppia/android/app/player/stopplaying/StopStatePlayingSessionListener.kt index 2980987cda0..17bce23e885 100644 --- a/app/src/main/java/org/oppia/android/app/player/stopplaying/StopStatePlayingSessionListener.kt +++ b/app/src/main/java/org/oppia/android/app/player/stopplaying/StopStatePlayingSessionListener.kt @@ -1,4 +1,4 @@ -package org.oppia.app.player.stopplaying +package org.oppia.android.app.player.stopplaying /** Listener for when the current state playing session should be stop and the user navigated back to the topic. */ interface StopStatePlayingSessionListener { diff --git a/app/src/main/java/org/oppia/android/app/profile/AddProfileActivity.kt b/app/src/main/java/org/oppia/android/app/profile/AddProfileActivity.kt index 36f92987b75..abfc8b0ca86 100644 --- a/app/src/main/java/org/oppia/android/app/profile/AddProfileActivity.kt +++ b/app/src/main/java/org/oppia/android/app/profile/AddProfileActivity.kt @@ -1,9 +1,9 @@ -package org.oppia.app.profile +package org.oppia.android.app.profile import android.content.Context import android.content.Intent import android.os.Bundle -import org.oppia.app.activity.InjectableAppCompatActivity +import org.oppia.android.app.activity.InjectableAppCompatActivity import javax.inject.Inject const val KEY_ADD_PROFILE_COLOR_RGB = "KEY_ADD_PROFILE_COLOR_RGB" diff --git a/app/src/main/java/org/oppia/android/app/profile/AddProfileActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/profile/AddProfileActivityPresenter.kt index 73626f73909..bc7ce594839 100644 --- a/app/src/main/java/org/oppia/android/app/profile/AddProfileActivityPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/profile/AddProfileActivityPresenter.kt @@ -1,4 +1,4 @@ -package org.oppia.app.profile +package org.oppia.android.app.profile import android.app.Activity import android.content.Context @@ -24,12 +24,12 @@ import com.bumptech.glide.load.engine.GlideException import com.bumptech.glide.request.RequestListener import com.bumptech.glide.request.RequestOptions import com.bumptech.glide.request.target.Target -import org.oppia.app.R -import org.oppia.app.activity.ActivityScope -import org.oppia.app.databinding.AddProfileActivityBinding -import org.oppia.app.viewmodel.ViewModelProvider -import org.oppia.domain.profile.ProfileManagementController -import org.oppia.util.data.AsyncResult +import org.oppia.android.R +import org.oppia.android.app.activity.ActivityScope +import org.oppia.android.app.viewmodel.ViewModelProvider +import org.oppia.android.databinding.AddProfileActivityBinding +import org.oppia.android.domain.profile.ProfileManagementController +import org.oppia.android.util.data.AsyncResult import javax.inject.Inject const val GALLERY_INTENT_RESULT_CODE = 1 diff --git a/app/src/main/java/org/oppia/android/app/profile/AddProfileViewModel.kt b/app/src/main/java/org/oppia/android/app/profile/AddProfileViewModel.kt index 01f8db5ff0f..5508ce4a50f 100644 --- a/app/src/main/java/org/oppia/android/app/profile/AddProfileViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/profile/AddProfileViewModel.kt @@ -1,8 +1,8 @@ -package org.oppia.app.profile +package org.oppia.android.app.profile import androidx.databinding.ObservableField -import org.oppia.app.activity.ActivityScope -import org.oppia.app.viewmodel.ObservableViewModel +import org.oppia.android.app.activity.ActivityScope +import org.oppia.android.app.viewmodel.ObservableViewModel import javax.inject.Inject /** The ViewModel for [AddProfileActivity]. */ diff --git a/app/src/main/java/org/oppia/android/app/profile/AdminAuthActivity.kt b/app/src/main/java/org/oppia/android/app/profile/AdminAuthActivity.kt index c5700a931cf..75f07d49ec8 100644 --- a/app/src/main/java/org/oppia/android/app/profile/AdminAuthActivity.kt +++ b/app/src/main/java/org/oppia/android/app/profile/AdminAuthActivity.kt @@ -1,9 +1,9 @@ -package org.oppia.app.profile +package org.oppia.android.app.profile import android.content.Context import android.content.Intent import android.os.Bundle -import org.oppia.app.activity.InjectableAppCompatActivity +import org.oppia.android.app.activity.InjectableAppCompatActivity import javax.inject.Inject const val KEY_ADMIN_AUTH_ADMIN_PIN = "ADMIN_AUTH_ADMIN_PIN" diff --git a/app/src/main/java/org/oppia/android/app/profile/AdminAuthActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/profile/AdminAuthActivityPresenter.kt index c9c24cc3e58..3ba4fd1d7ac 100644 --- a/app/src/main/java/org/oppia/android/app/profile/AdminAuthActivityPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/profile/AdminAuthActivityPresenter.kt @@ -1,4 +1,4 @@ -package org.oppia.app.profile +package org.oppia.android.app.profile import android.content.Context import android.os.Bundle @@ -8,11 +8,11 @@ import android.view.inputmethod.EditorInfo import android.widget.TextView import androidx.appcompat.app.AppCompatActivity import androidx.databinding.DataBindingUtil -import org.oppia.app.R -import org.oppia.app.activity.ActivityScope -import org.oppia.app.administratorcontrols.AdministratorControlsActivity -import org.oppia.app.databinding.AdminAuthActivityBinding -import org.oppia.app.viewmodel.ViewModelProvider +import org.oppia.android.R +import org.oppia.android.app.activity.ActivityScope +import org.oppia.android.app.administratorcontrols.AdministratorControlsActivity +import org.oppia.android.app.viewmodel.ViewModelProvider +import org.oppia.android.databinding.AdminAuthActivityBinding import javax.inject.Inject const val KEY_ADMIN_AUTH_INPUT_ERROR_MESSAGE = "ADMIN_AUTH_INPUT_ERROR_MESSAGE" diff --git a/app/src/main/java/org/oppia/android/app/profile/AdminAuthEnum.kt b/app/src/main/java/org/oppia/android/app/profile/AdminAuthEnum.kt index 5f90390e5c7..b377fa9ee85 100644 --- a/app/src/main/java/org/oppia/android/app/profile/AdminAuthEnum.kt +++ b/app/src/main/java/org/oppia/android/app/profile/AdminAuthEnum.kt @@ -1,4 +1,4 @@ -package org.oppia.app.profile +package org.oppia.android.app.profile /** Represents different activities from which AdminPinActivity can be opened. */ enum class AdminAuthEnum(val value: Int) { diff --git a/app/src/main/java/org/oppia/android/app/profile/AdminAuthViewModel.kt b/app/src/main/java/org/oppia/android/app/profile/AdminAuthViewModel.kt index 21552aefa18..666cf6da729 100644 --- a/app/src/main/java/org/oppia/android/app/profile/AdminAuthViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/profile/AdminAuthViewModel.kt @@ -1,10 +1,10 @@ -package org.oppia.app.profile +package org.oppia.android.app.profile import android.text.Editable import android.text.TextWatcher import androidx.databinding.ObservableField -import org.oppia.app.activity.ActivityScope -import org.oppia.app.viewmodel.ObservableViewModel +import org.oppia.android.app.activity.ActivityScope +import org.oppia.android.app.viewmodel.ObservableViewModel import javax.inject.Inject /** The ViewModel for [AdminAuthActivity]. */ diff --git a/app/src/main/java/org/oppia/android/app/profile/AdminPinActivity.kt b/app/src/main/java/org/oppia/android/app/profile/AdminPinActivity.kt index 23a7ad9f2aa..7af543999c5 100644 --- a/app/src/main/java/org/oppia/android/app/profile/AdminPinActivity.kt +++ b/app/src/main/java/org/oppia/android/app/profile/AdminPinActivity.kt @@ -1,9 +1,9 @@ -package org.oppia.app.profile +package org.oppia.android.app.profile import android.content.Context import android.content.Intent import android.os.Bundle -import org.oppia.app.activity.InjectableAppCompatActivity +import org.oppia.android.app.activity.InjectableAppCompatActivity import javax.inject.Inject const val KEY_ADMIN_PIN_PROFILE_ID = "ADMIN_PIN_PROFILE_ID" diff --git a/app/src/main/java/org/oppia/android/app/profile/AdminPinActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/profile/AdminPinActivityPresenter.kt index 022c4b4d3a4..0a5b8ecba12 100644 --- a/app/src/main/java/org/oppia/android/app/profile/AdminPinActivityPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/profile/AdminPinActivityPresenter.kt @@ -1,4 +1,4 @@ -package org.oppia.app.profile +package org.oppia.android.app.profile import android.content.Context import android.text.Editable @@ -8,13 +8,13 @@ import android.widget.TextView import androidx.appcompat.app.AppCompatActivity import androidx.databinding.DataBindingUtil import androidx.lifecycle.Observer -import org.oppia.app.R -import org.oppia.app.activity.ActivityScope -import org.oppia.app.administratorcontrols.AdministratorControlsActivity -import org.oppia.app.databinding.AdminPinActivityBinding -import org.oppia.app.model.ProfileId -import org.oppia.app.viewmodel.ViewModelProvider -import org.oppia.domain.profile.ProfileManagementController +import org.oppia.android.R +import org.oppia.android.app.activity.ActivityScope +import org.oppia.android.app.administratorcontrols.AdministratorControlsActivity +import org.oppia.android.app.model.ProfileId +import org.oppia.android.app.viewmodel.ViewModelProvider +import org.oppia.android.databinding.AdminPinActivityBinding +import org.oppia.android.domain.profile.ProfileManagementController import javax.inject.Inject /** The presenter for [AdminPinActivity]. */ diff --git a/app/src/main/java/org/oppia/android/app/profile/AdminPinViewModel.kt b/app/src/main/java/org/oppia/android/app/profile/AdminPinViewModel.kt index 814cbe5d9ec..974cbc98826 100644 --- a/app/src/main/java/org/oppia/android/app/profile/AdminPinViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/profile/AdminPinViewModel.kt @@ -1,8 +1,8 @@ -package org.oppia.app.profile +package org.oppia.android.app.profile import androidx.databinding.ObservableField -import org.oppia.app.activity.ActivityScope -import org.oppia.app.viewmodel.ObservableViewModel +import org.oppia.android.app.activity.ActivityScope +import org.oppia.android.app.viewmodel.ObservableViewModel import javax.inject.Inject /** The ViewModel for [AdminPinActivity]. */ diff --git a/app/src/main/java/org/oppia/android/app/profile/AdminSettingsDialogFragment.kt b/app/src/main/java/org/oppia/android/app/profile/AdminSettingsDialogFragment.kt index 6e5fdbac048..0ab464b4ed3 100644 --- a/app/src/main/java/org/oppia/android/app/profile/AdminSettingsDialogFragment.kt +++ b/app/src/main/java/org/oppia/android/app/profile/AdminSettingsDialogFragment.kt @@ -1,9 +1,9 @@ -package org.oppia.app.profile +package org.oppia.android.app.profile import android.app.Dialog import android.content.Context import android.os.Bundle -import org.oppia.app.fragment.InjectableDialogFragment +import org.oppia.android.app.fragment.InjectableDialogFragment import javax.inject.Inject const val KEY_ADMIN_SETTINGS_PIN = "ADMIN_SETTINGS_PIN" diff --git a/app/src/main/java/org/oppia/android/app/profile/AdminSettingsDialogFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/profile/AdminSettingsDialogFragmentPresenter.kt index 992f16e3067..5e05151d1a6 100644 --- a/app/src/main/java/org/oppia/android/app/profile/AdminSettingsDialogFragmentPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/profile/AdminSettingsDialogFragmentPresenter.kt @@ -1,4 +1,4 @@ -package org.oppia.app.profile +package org.oppia.android.app.profile import android.app.Dialog import android.text.Editable @@ -7,10 +7,10 @@ import androidx.appcompat.app.AlertDialog import androidx.appcompat.app.AppCompatActivity import androidx.databinding.DataBindingUtil import androidx.fragment.app.Fragment -import org.oppia.app.R -import org.oppia.app.databinding.AdminSettingsDialogBinding -import org.oppia.app.fragment.FragmentScope -import org.oppia.app.viewmodel.ViewModelProvider +import org.oppia.android.R +import org.oppia.android.app.fragment.FragmentScope +import org.oppia.android.app.viewmodel.ViewModelProvider +import org.oppia.android.databinding.AdminSettingsDialogBinding import javax.inject.Inject /** The presenter for [AdminSettingsDialogFragment]. */ diff --git a/app/src/main/java/org/oppia/android/app/profile/AdminSettingsViewModel.kt b/app/src/main/java/org/oppia/android/app/profile/AdminSettingsViewModel.kt index 8d147db0c33..e910489c046 100644 --- a/app/src/main/java/org/oppia/android/app/profile/AdminSettingsViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/profile/AdminSettingsViewModel.kt @@ -1,8 +1,8 @@ -package org.oppia.app.profile +package org.oppia.android.app.profile import androidx.databinding.ObservableField -import org.oppia.app.fragment.FragmentScope -import org.oppia.app.viewmodel.ObservableViewModel +import org.oppia.android.app.fragment.FragmentScope +import org.oppia.android.app.viewmodel.ObservableViewModel import javax.inject.Inject /** The ViewModel for [AdminSettingsDialogFragment]. */ diff --git a/app/src/main/java/org/oppia/android/app/profile/PinPasswordActivity.kt b/app/src/main/java/org/oppia/android/app/profile/PinPasswordActivity.kt index 493e013a93c..181d02f9a1b 100644 --- a/app/src/main/java/org/oppia/android/app/profile/PinPasswordActivity.kt +++ b/app/src/main/java/org/oppia/android/app/profile/PinPasswordActivity.kt @@ -1,9 +1,9 @@ -package org.oppia.app.profile +package org.oppia.android.app.profile import android.content.Context import android.content.Intent import android.os.Bundle -import org.oppia.app.activity.InjectableAppCompatActivity +import org.oppia.android.app.activity.InjectableAppCompatActivity import javax.inject.Inject const val KEY_PIN_PASSWORD_PROFILE_ID = "PIN_PASSWORD_PROFILE_ID" diff --git a/app/src/main/java/org/oppia/android/app/profile/PinPasswordActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/profile/PinPasswordActivityPresenter.kt index a661d9254b4..490a3dea4d2 100644 --- a/app/src/main/java/org/oppia/android/app/profile/PinPasswordActivityPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/profile/PinPasswordActivityPresenter.kt @@ -1,4 +1,4 @@ -package org.oppia.app.profile +package org.oppia.android.app.profile import android.content.ActivityNotFoundException import android.content.Intent @@ -11,14 +11,14 @@ import androidx.appcompat.app.AppCompatActivity import androidx.databinding.DataBindingUtil import androidx.fragment.app.DialogFragment import androidx.lifecycle.Observer -import org.oppia.app.R -import org.oppia.app.databinding.PinPasswordActivityBinding -import org.oppia.app.home.HomeActivity -import org.oppia.app.model.ProfileId -import org.oppia.app.utility.LifecycleSafeTimerFactory -import org.oppia.app.viewmodel.ViewModelProvider -import org.oppia.domain.profile.ProfileManagementController -import org.oppia.util.statusbar.StatusBarColor +import org.oppia.android.R +import org.oppia.android.app.home.HomeActivity +import org.oppia.android.app.model.ProfileId +import org.oppia.android.app.utility.LifecycleSafeTimerFactory +import org.oppia.android.app.viewmodel.ViewModelProvider +import org.oppia.android.databinding.PinPasswordActivityBinding +import org.oppia.android.domain.profile.ProfileManagementController +import org.oppia.android.util.statusbar.StatusBarColor import javax.inject.Inject private const val TAG_ADMIN_SETTINGS_DIALOG = "ADMIN_SETTINGS_DIALOG" diff --git a/app/src/main/java/org/oppia/android/app/profile/PinPasswordViewModel.kt b/app/src/main/java/org/oppia/android/app/profile/PinPasswordViewModel.kt index 7b668682bc6..a6ef878ec61 100644 --- a/app/src/main/java/org/oppia/android/app/profile/PinPasswordViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/profile/PinPasswordViewModel.kt @@ -1,15 +1,15 @@ -package org.oppia.app.profile +package org.oppia.android.app.profile import androidx.databinding.ObservableField import androidx.lifecycle.LiveData import androidx.lifecycle.Transformations -import org.oppia.app.activity.ActivityScope -import org.oppia.app.model.Profile -import org.oppia.app.model.ProfileId -import org.oppia.app.viewmodel.ObservableViewModel -import org.oppia.domain.profile.ProfileManagementController -import org.oppia.util.data.AsyncResult -import org.oppia.util.logging.ConsoleLogger +import org.oppia.android.app.activity.ActivityScope +import org.oppia.android.app.model.Profile +import org.oppia.android.app.model.ProfileId +import org.oppia.android.app.viewmodel.ObservableViewModel +import org.oppia.android.domain.profile.ProfileManagementController +import org.oppia.android.util.data.AsyncResult +import org.oppia.android.util.logging.ConsoleLogger import javax.inject.Inject /** The ViewModel for [PinPasswordActivity]. */ diff --git a/app/src/main/java/org/oppia/android/app/profile/ProfileChooserActivity.kt b/app/src/main/java/org/oppia/android/app/profile/ProfileChooserActivity.kt index 7379cd6f858..540bb15f839 100644 --- a/app/src/main/java/org/oppia/android/app/profile/ProfileChooserActivity.kt +++ b/app/src/main/java/org/oppia/android/app/profile/ProfileChooserActivity.kt @@ -1,9 +1,9 @@ -package org.oppia.app.profile +package org.oppia.android.app.profile import android.content.Context import android.content.Intent import android.os.Bundle -import org.oppia.app.activity.InjectableAppCompatActivity +import org.oppia.android.app.activity.InjectableAppCompatActivity import javax.inject.Inject /** Activity that controls profile creation and selection. */ diff --git a/app/src/main/java/org/oppia/android/app/profile/ProfileChooserActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/profile/ProfileChooserActivityPresenter.kt index b95e9763476..a61009bb979 100644 --- a/app/src/main/java/org/oppia/android/app/profile/ProfileChooserActivityPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/profile/ProfileChooserActivityPresenter.kt @@ -1,10 +1,10 @@ -package org.oppia.app.profile +package org.oppia.android.app.profile import androidx.appcompat.app.AppCompatActivity -import org.oppia.app.R -import org.oppia.app.activity.ActivityScope -import org.oppia.app.testing.ProfileChooserFragmentTestActivity -import org.oppia.domain.profile.ProfileManagementController +import org.oppia.android.R +import org.oppia.android.app.activity.ActivityScope +import org.oppia.android.app.testing.ProfileChooserFragmentTestActivity +import org.oppia.android.domain.profile.ProfileManagementController import javax.inject.Inject /** The presenter for [ProfileChooserActivity]. */ diff --git a/app/src/main/java/org/oppia/android/app/profile/ProfileChooserFragment.kt b/app/src/main/java/org/oppia/android/app/profile/ProfileChooserFragment.kt index 3860bf8f1a9..681d88c3c43 100644 --- a/app/src/main/java/org/oppia/android/app/profile/ProfileChooserFragment.kt +++ b/app/src/main/java/org/oppia/android/app/profile/ProfileChooserFragment.kt @@ -1,11 +1,11 @@ -package org.oppia.app.profile +package org.oppia.android.app.profile import android.content.Context import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import org.oppia.app.fragment.InjectableFragment +import org.oppia.android.app.fragment.InjectableFragment import javax.inject.Inject /** Fragment that allows user to select a profile or create new ones. */ diff --git a/app/src/main/java/org/oppia/android/app/profile/ProfileChooserFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/profile/ProfileChooserFragmentPresenter.kt index 0fba8f30754..575021c26c7 100644 --- a/app/src/main/java/org/oppia/android/app/profile/ProfileChooserFragmentPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/profile/ProfileChooserFragmentPresenter.kt @@ -1,4 +1,4 @@ -package org.oppia.app.profile +package org.oppia.android.app.profile import android.content.Context import android.content.res.Resources @@ -13,22 +13,22 @@ import androidx.lifecycle.LiveData import androidx.lifecycle.Observer import androidx.lifecycle.Transformations import androidx.recyclerview.widget.GridLayoutManager -import org.oppia.app.R -import org.oppia.app.databinding.ProfileChooserAddViewBinding -import org.oppia.app.databinding.ProfileChooserFragmentBinding -import org.oppia.app.databinding.ProfileChooserProfileViewBinding -import org.oppia.app.fragment.FragmentScope -import org.oppia.app.home.HomeActivity -import org.oppia.app.model.EventLog -import org.oppia.app.model.ProfileChooserUiModel -import org.oppia.app.recyclerview.BindableAdapter -import org.oppia.app.viewmodel.ViewModelProvider -import org.oppia.domain.oppialogger.OppiaLogger -import org.oppia.domain.profile.ProfileManagementController -import org.oppia.util.data.AsyncResult -import org.oppia.util.logging.ConsoleLogger -import org.oppia.util.statusbar.StatusBarColor -import org.oppia.util.system.OppiaClock +import org.oppia.android.R +import org.oppia.android.app.fragment.FragmentScope +import org.oppia.android.app.home.HomeActivity +import org.oppia.android.app.model.EventLog +import org.oppia.android.app.model.ProfileChooserUiModel +import org.oppia.android.app.recyclerview.BindableAdapter +import org.oppia.android.app.viewmodel.ViewModelProvider +import org.oppia.android.databinding.ProfileChooserAddViewBinding +import org.oppia.android.databinding.ProfileChooserFragmentBinding +import org.oppia.android.databinding.ProfileChooserProfileViewBinding +import org.oppia.android.domain.oppialogger.OppiaLogger +import org.oppia.android.domain.profile.ProfileManagementController +import org.oppia.android.util.data.AsyncResult +import org.oppia.android.util.logging.ConsoleLogger +import org.oppia.android.util.statusbar.StatusBarColor +import org.oppia.android.util.system.OppiaClock import javax.inject.Inject private val COLORS_LIST = listOf( diff --git a/app/src/main/java/org/oppia/android/app/profile/ProfileChooserViewModel.kt b/app/src/main/java/org/oppia/android/app/profile/ProfileChooserViewModel.kt index 122810b6a28..86f22ede032 100644 --- a/app/src/main/java/org/oppia/android/app/profile/ProfileChooserViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/profile/ProfileChooserViewModel.kt @@ -1,17 +1,17 @@ -package org.oppia.app.profile +package org.oppia.android.app.profile import androidx.fragment.app.Fragment import androidx.lifecycle.LiveData import androidx.lifecycle.Transformations -import org.oppia.app.fragment.FragmentScope -import org.oppia.app.model.Profile -import org.oppia.app.model.ProfileAvatar -import org.oppia.app.model.ProfileChooserUiModel -import org.oppia.app.model.ProfileId -import org.oppia.app.viewmodel.ObservableViewModel -import org.oppia.domain.profile.ProfileManagementController -import org.oppia.util.data.AsyncResult -import org.oppia.util.logging.ConsoleLogger +import org.oppia.android.app.fragment.FragmentScope +import org.oppia.android.app.model.Profile +import org.oppia.android.app.model.ProfileAvatar +import org.oppia.android.app.model.ProfileChooserUiModel +import org.oppia.android.app.model.ProfileId +import org.oppia.android.app.viewmodel.ObservableViewModel +import org.oppia.android.domain.profile.ProfileManagementController +import org.oppia.android.util.data.AsyncResult +import org.oppia.android.util.logging.ConsoleLogger import java.util.Locale import javax.inject.Inject diff --git a/app/src/main/java/org/oppia/android/app/profile/ProfileInputView.kt b/app/src/main/java/org/oppia/android/app/profile/ProfileInputView.kt index 67435018a30..cff0a9a7c06 100644 --- a/app/src/main/java/org/oppia/android/app/profile/ProfileInputView.kt +++ b/app/src/main/java/org/oppia/android/app/profile/ProfileInputView.kt @@ -1,4 +1,4 @@ -package org.oppia.app.profile +package org.oppia.android.app.profile import android.content.Context import android.text.InputFilter @@ -10,9 +10,9 @@ import android.widget.EditText import android.widget.LinearLayout import android.widget.TextView import androidx.databinding.BindingAdapter -import org.oppia.app.R -import org.oppia.app.application.ApplicationInjectorProvider -import org.oppia.app.shim.ViewBindingShim +import org.oppia.android.R +import org.oppia.android.app.application.ApplicationInjectorProvider +import org.oppia.android.app.shim.ViewBindingShim import javax.inject.Inject /** Custom view that is used for name or pin input with error messages. */ diff --git a/app/src/main/java/org/oppia/android/app/profile/ProfileRouteDialogInterface.kt b/app/src/main/java/org/oppia/android/app/profile/ProfileRouteDialogInterface.kt index a04efcdc213..7b28359665e 100644 --- a/app/src/main/java/org/oppia/android/app/profile/ProfileRouteDialogInterface.kt +++ b/app/src/main/java/org/oppia/android/app/profile/ProfileRouteDialogInterface.kt @@ -1,4 +1,4 @@ -package org.oppia.app.profile +package org.oppia.android.app.profile /** Interface to route dialogs in user Forgot Password flow. */ interface ProfileRouteDialogInterface { diff --git a/app/src/main/java/org/oppia/android/app/profile/ResetPinDialogFragment.kt b/app/src/main/java/org/oppia/android/app/profile/ResetPinDialogFragment.kt index 411e48b4d75..3d56b5f0be7 100644 --- a/app/src/main/java/org/oppia/android/app/profile/ResetPinDialogFragment.kt +++ b/app/src/main/java/org/oppia/android/app/profile/ResetPinDialogFragment.kt @@ -1,9 +1,9 @@ -package org.oppia.app.profile +package org.oppia.android.app.profile import android.app.Dialog import android.content.Context import android.os.Bundle -import org.oppia.app.fragment.InjectableDialogFragment +import org.oppia.android.app.fragment.InjectableDialogFragment import javax.inject.Inject const val KEY_RESET_PIN_PROFILE_ID = "RESET_PIN_PROFILE_ID" diff --git a/app/src/main/java/org/oppia/android/app/profile/ResetPinDialogFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/profile/ResetPinDialogFragmentPresenter.kt index e06faaef7ab..afa196c92fa 100644 --- a/app/src/main/java/org/oppia/android/app/profile/ResetPinDialogFragmentPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/profile/ResetPinDialogFragmentPresenter.kt @@ -1,4 +1,4 @@ -package org.oppia.app.profile +package org.oppia.android.app.profile import android.app.Dialog import android.text.Editable @@ -8,12 +8,12 @@ import androidx.appcompat.app.AppCompatActivity import androidx.databinding.DataBindingUtil import androidx.fragment.app.Fragment import androidx.lifecycle.Observer -import org.oppia.app.R -import org.oppia.app.databinding.ResetPinDialogBinding -import org.oppia.app.fragment.FragmentScope -import org.oppia.app.model.ProfileId -import org.oppia.app.viewmodel.ViewModelProvider -import org.oppia.domain.profile.ProfileManagementController +import org.oppia.android.R +import org.oppia.android.app.fragment.FragmentScope +import org.oppia.android.app.model.ProfileId +import org.oppia.android.app.viewmodel.ViewModelProvider +import org.oppia.android.databinding.ResetPinDialogBinding +import org.oppia.android.domain.profile.ProfileManagementController import javax.inject.Inject /** The presenter for [ResetPinDialogFragment]. */ diff --git a/app/src/main/java/org/oppia/android/app/profile/ResetPinViewModel.kt b/app/src/main/java/org/oppia/android/app/profile/ResetPinViewModel.kt index 0ec55b27837..99e44f64956 100644 --- a/app/src/main/java/org/oppia/android/app/profile/ResetPinViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/profile/ResetPinViewModel.kt @@ -1,8 +1,8 @@ -package org.oppia.app.profile +package org.oppia.android.app.profile import androidx.databinding.ObservableField -import org.oppia.app.fragment.FragmentScope -import org.oppia.app.viewmodel.ObservableViewModel +import org.oppia.android.app.fragment.FragmentScope +import org.oppia.android.app.viewmodel.ObservableViewModel import javax.inject.Inject /** The ViewModel for [ResetPinDialogFragment]. */ diff --git a/app/src/main/java/org/oppia/android/app/profile/RouteToAdminPinListener.kt b/app/src/main/java/org/oppia/android/app/profile/RouteToAdminPinListener.kt index 8b7c46b1b0f..3134e19f96c 100644 --- a/app/src/main/java/org/oppia/android/app/profile/RouteToAdminPinListener.kt +++ b/app/src/main/java/org/oppia/android/app/profile/RouteToAdminPinListener.kt @@ -1,4 +1,4 @@ -package org.oppia.app.profile +package org.oppia.android.app.profile /** Listener for when an activity should route to Administrator Controls. */ interface RouteToAdminPinListener { diff --git a/app/src/main/java/org/oppia/android/app/profileprogress/ProfilePictureActivity.kt b/app/src/main/java/org/oppia/android/app/profileprogress/ProfilePictureActivity.kt index da054d62030..fd1a660e70a 100644 --- a/app/src/main/java/org/oppia/android/app/profileprogress/ProfilePictureActivity.kt +++ b/app/src/main/java/org/oppia/android/app/profileprogress/ProfilePictureActivity.kt @@ -1,9 +1,9 @@ -package org.oppia.app.profileprogress +package org.oppia.android.app.profileprogress import android.content.Context import android.content.Intent import android.os.Bundle -import org.oppia.app.activity.InjectableAppCompatActivity +import org.oppia.android.app.activity.InjectableAppCompatActivity import javax.inject.Inject /** Activity to display profile picture. */ diff --git a/app/src/main/java/org/oppia/android/app/profileprogress/ProfilePictureActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/profileprogress/ProfilePictureActivityPresenter.kt index c3e63fe6b56..6f5a5a87495 100644 --- a/app/src/main/java/org/oppia/android/app/profileprogress/ProfilePictureActivityPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/profileprogress/ProfilePictureActivityPresenter.kt @@ -1,20 +1,20 @@ -package org.oppia.app.profileprogress +package org.oppia.android.app.profileprogress import androidx.appcompat.app.AppCompatActivity import androidx.databinding.DataBindingUtil import androidx.lifecycle.LiveData import androidx.lifecycle.Observer import androidx.lifecycle.Transformations -import org.oppia.app.R -import org.oppia.app.activity.ActivityScope -import org.oppia.app.databinding.ProfilePictureActivityBinding -import org.oppia.app.model.Profile -import org.oppia.app.model.ProfileAvatar -import org.oppia.app.model.ProfileId -import org.oppia.domain.profile.ProfileManagementController -import org.oppia.util.data.AsyncResult -import org.oppia.util.logging.ConsoleLogger -import org.oppia.util.statusbar.StatusBarColor +import org.oppia.android.R +import org.oppia.android.app.activity.ActivityScope +import org.oppia.android.app.model.Profile +import org.oppia.android.app.model.ProfileAvatar +import org.oppia.android.app.model.ProfileId +import org.oppia.android.databinding.ProfilePictureActivityBinding +import org.oppia.android.domain.profile.ProfileManagementController +import org.oppia.android.util.data.AsyncResult +import org.oppia.android.util.logging.ConsoleLogger +import org.oppia.android.util.statusbar.StatusBarColor import javax.inject.Inject /** The presenter for [ProfilePictureActivity]. */ diff --git a/app/src/main/java/org/oppia/android/app/profileprogress/ProfilePictureActivityViewModel.kt b/app/src/main/java/org/oppia/android/app/profileprogress/ProfilePictureActivityViewModel.kt index 1d22733de10..2fe73600699 100644 --- a/app/src/main/java/org/oppia/android/app/profileprogress/ProfilePictureActivityViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/profileprogress/ProfilePictureActivityViewModel.kt @@ -1,8 +1,8 @@ -package org.oppia.app.profileprogress +package org.oppia.android.app.profileprogress import androidx.databinding.ObservableField -import org.oppia.app.model.ProfileAvatar -import org.oppia.app.viewmodel.ObservableViewModel +import org.oppia.android.app.model.ProfileAvatar +import org.oppia.android.app.viewmodel.ObservableViewModel /** [ViewModel] for displaying user image in Activity. */ class ProfilePictureActivityViewModel : ObservableViewModel() { diff --git a/app/src/main/java/org/oppia/android/app/profileprogress/ProfilePictureClickListener.kt b/app/src/main/java/org/oppia/android/app/profileprogress/ProfilePictureClickListener.kt index c9c1542b9d0..6c316e5290e 100644 --- a/app/src/main/java/org/oppia/android/app/profileprogress/ProfilePictureClickListener.kt +++ b/app/src/main/java/org/oppia/android/app/profileprogress/ProfilePictureClickListener.kt @@ -1,4 +1,4 @@ -package org.oppia.app.profileprogress +package org.oppia.android.app.profileprogress /** Listener interface for when profile picture is clicked in the UI. */ interface ProfilePictureClickListener { diff --git a/app/src/main/java/org/oppia/android/app/profileprogress/ProfilePictureDialogInterface.kt b/app/src/main/java/org/oppia/android/app/profileprogress/ProfilePictureDialogInterface.kt index dde69ec1dba..06d24e5c825 100644 --- a/app/src/main/java/org/oppia/android/app/profileprogress/ProfilePictureDialogInterface.kt +++ b/app/src/main/java/org/oppia/android/app/profileprogress/ProfilePictureDialogInterface.kt @@ -1,4 +1,4 @@ -package org.oppia.app.profileprogress +package org.oppia.android.app.profileprogress /** Interface to handle option selection in [ProfilePictureEditDialogFragment]. */ interface ProfilePictureDialogInterface { diff --git a/app/src/main/java/org/oppia/android/app/profileprogress/ProfilePictureEditDialogFragment.kt b/app/src/main/java/org/oppia/android/app/profileprogress/ProfilePictureEditDialogFragment.kt index 0fd2052714f..ccd94db5d1c 100644 --- a/app/src/main/java/org/oppia/android/app/profileprogress/ProfilePictureEditDialogFragment.kt +++ b/app/src/main/java/org/oppia/android/app/profileprogress/ProfilePictureEditDialogFragment.kt @@ -1,4 +1,4 @@ -package org.oppia.app.profileprogress +package org.oppia.android.app.profileprogress import android.app.Dialog import android.content.Context @@ -8,7 +8,7 @@ import android.widget.TextView import androidx.appcompat.app.AlertDialog import androidx.appcompat.view.ContextThemeWrapper import androidx.fragment.app.DialogFragment -import org.oppia.app.R +import org.oppia.android.R /** [DialogFragment] that gives option to either view the profile picture or change the current profile picture. */ class ProfilePictureEditDialogFragment : DialogFragment() { diff --git a/app/src/main/java/org/oppia/android/app/profileprogress/ProfileProgressActivity.kt b/app/src/main/java/org/oppia/android/app/profileprogress/ProfileProgressActivity.kt index 58989d1c5f2..b1c248cbd8a 100644 --- a/app/src/main/java/org/oppia/android/app/profileprogress/ProfileProgressActivity.kt +++ b/app/src/main/java/org/oppia/android/app/profileprogress/ProfileProgressActivity.kt @@ -1,13 +1,13 @@ -package org.oppia.app.profileprogress +package org.oppia.android.app.profileprogress import android.content.Context import android.content.Intent import android.os.Bundle -import org.oppia.app.activity.InjectableAppCompatActivity -import org.oppia.app.completedstorylist.CompletedStoryListActivity -import org.oppia.app.home.RouteToRecentlyPlayedListener -import org.oppia.app.home.recentlyplayed.RecentlyPlayedActivity -import org.oppia.app.ongoingtopiclist.OngoingTopicListActivity +import org.oppia.android.app.activity.InjectableAppCompatActivity +import org.oppia.android.app.completedstorylist.CompletedStoryListActivity +import org.oppia.android.app.home.RouteToRecentlyPlayedListener +import org.oppia.android.app.home.recentlyplayed.RecentlyPlayedActivity +import org.oppia.android.app.ongoingtopiclist.OngoingTopicListActivity import javax.inject.Inject /** Activity to display profile progress. */ diff --git a/app/src/main/java/org/oppia/android/app/profileprogress/ProfileProgressActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/profileprogress/ProfileProgressActivityPresenter.kt index beafe95e72c..fb77053a250 100644 --- a/app/src/main/java/org/oppia/android/app/profileprogress/ProfileProgressActivityPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/profileprogress/ProfileProgressActivityPresenter.kt @@ -1,15 +1,15 @@ -package org.oppia.app.profileprogress +package org.oppia.android.app.profileprogress import android.content.Intent import android.provider.MediaStore import android.view.View import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.widget.Toolbar -import org.oppia.app.R -import org.oppia.app.activity.ActivityScope -import org.oppia.app.model.ProfileId -import org.oppia.app.profile.GALLERY_INTENT_RESULT_CODE -import org.oppia.domain.profile.ProfileManagementController +import org.oppia.android.R +import org.oppia.android.app.activity.ActivityScope +import org.oppia.android.app.model.ProfileId +import org.oppia.android.app.profile.GALLERY_INTENT_RESULT_CODE +import org.oppia.android.domain.profile.ProfileManagementController import javax.inject.Inject /** The presenter for [ProfileProgressActivity]. */ diff --git a/app/src/main/java/org/oppia/android/app/profileprogress/ProfileProgressFragment.kt b/app/src/main/java/org/oppia/android/app/profileprogress/ProfileProgressFragment.kt index b2fa2fdfcf6..545833decce 100644 --- a/app/src/main/java/org/oppia/android/app/profileprogress/ProfileProgressFragment.kt +++ b/app/src/main/java/org/oppia/android/app/profileprogress/ProfileProgressFragment.kt @@ -1,11 +1,11 @@ -package org.oppia.app.profileprogress +package org.oppia.android.app.profileprogress import android.content.Context import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import org.oppia.app.fragment.InjectableFragment +import org.oppia.android.app.fragment.InjectableFragment import javax.inject.Inject /** Fragment that displays profile progress in the app. */ diff --git a/app/src/main/java/org/oppia/android/app/profileprogress/ProfileProgressFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/profileprogress/ProfileProgressFragmentPresenter.kt index 6efb31671cf..71f4b0451b5 100644 --- a/app/src/main/java/org/oppia/android/app/profileprogress/ProfileProgressFragmentPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/profileprogress/ProfileProgressFragmentPresenter.kt @@ -1,4 +1,4 @@ -package org.oppia.app.profileprogress +package org.oppia.android.app.profileprogress import android.view.LayoutInflater import android.view.View @@ -6,12 +6,12 @@ import android.view.ViewGroup import androidx.appcompat.app.AppCompatActivity import androidx.fragment.app.Fragment import androidx.recyclerview.widget.GridLayoutManager -import org.oppia.app.R -import org.oppia.app.databinding.ProfileProgressFragmentBinding -import org.oppia.app.databinding.ProfileProgressHeaderBinding -import org.oppia.app.databinding.ProfileProgressRecentlyPlayedStoryCardBinding -import org.oppia.app.fragment.FragmentScope -import org.oppia.app.recyclerview.BindableAdapter +import org.oppia.android.R +import org.oppia.android.app.fragment.FragmentScope +import org.oppia.android.app.recyclerview.BindableAdapter +import org.oppia.android.databinding.ProfileProgressFragmentBinding +import org.oppia.android.databinding.ProfileProgressHeaderBinding +import org.oppia.android.databinding.ProfileProgressRecentlyPlayedStoryCardBinding import javax.inject.Inject private const val TAG_PROFILE_PICTURE_EDIT_DIALOG = "PROFILE_PICTURE_EDIT_DIALOG" diff --git a/app/src/main/java/org/oppia/android/app/profileprogress/ProfileProgressHeaderViewModel.kt b/app/src/main/java/org/oppia/android/app/profileprogress/ProfileProgressHeaderViewModel.kt index 3da5f4daad4..bda15271294 100644 --- a/app/src/main/java/org/oppia/android/app/profileprogress/ProfileProgressHeaderViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/profileprogress/ProfileProgressHeaderViewModel.kt @@ -1,10 +1,10 @@ -package org.oppia.app.profileprogress +package org.oppia.android.app.profileprogress import androidx.appcompat.app.AppCompatActivity import androidx.databinding.ObservableField import androidx.fragment.app.Fragment -import org.oppia.app.home.RouteToRecentlyPlayedListener -import org.oppia.app.model.Profile +import org.oppia.android.app.home.RouteToRecentlyPlayedListener +import org.oppia.android.app.model.Profile /** Header [ViewModel] for the recycler view in [ProfileProgressFragment]. */ class ProfileProgressHeaderViewModel(activity: AppCompatActivity, fragment: Fragment) : diff --git a/app/src/main/java/org/oppia/android/app/profileprogress/ProfileProgressItemViewModel.kt b/app/src/main/java/org/oppia/android/app/profileprogress/ProfileProgressItemViewModel.kt index b3c2056a497..1776dac14c5 100644 --- a/app/src/main/java/org/oppia/android/app/profileprogress/ProfileProgressItemViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/profileprogress/ProfileProgressItemViewModel.kt @@ -1,6 +1,6 @@ -package org.oppia.app.profileprogress +package org.oppia.android.app.profileprogress -import org.oppia.app.viewmodel.ObservableViewModel +import org.oppia.android.app.viewmodel.ObservableViewModel /** Super-class for generalising different views for the recyclerView in [ProfileProgressFragment] */ abstract class ProfileProgressItemViewModel : ObservableViewModel() diff --git a/app/src/main/java/org/oppia/android/app/profileprogress/ProfileProgressViewModel.kt b/app/src/main/java/org/oppia/android/app/profileprogress/ProfileProgressViewModel.kt index b18148bbcf2..169943650ca 100644 --- a/app/src/main/java/org/oppia/android/app/profileprogress/ProfileProgressViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/profileprogress/ProfileProgressViewModel.kt @@ -1,4 +1,4 @@ -package org.oppia.app.profileprogress +package org.oppia.android.app.profileprogress import androidx.appcompat.app.AppCompatActivity import androidx.fragment.app.Fragment @@ -6,21 +6,21 @@ import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.Observer import androidx.lifecycle.Transformations -import org.oppia.app.R -import org.oppia.app.fragment.FragmentScope -import org.oppia.app.model.CompletedStoryList -import org.oppia.app.model.OngoingStoryList -import org.oppia.app.model.OngoingTopicList -import org.oppia.app.model.Profile -import org.oppia.app.model.ProfileId -import org.oppia.app.shim.IntentFactoryShim -import org.oppia.app.viewmodel.ObservableViewModel -import org.oppia.domain.profile.ProfileManagementController -import org.oppia.domain.topic.TopicController -import org.oppia.domain.topic.TopicListController -import org.oppia.util.data.AsyncResult -import org.oppia.util.logging.ConsoleLogger -import org.oppia.util.parser.StoryHtmlParserEntityType +import org.oppia.android.R +import org.oppia.android.app.fragment.FragmentScope +import org.oppia.android.app.model.CompletedStoryList +import org.oppia.android.app.model.OngoingStoryList +import org.oppia.android.app.model.OngoingTopicList +import org.oppia.android.app.model.Profile +import org.oppia.android.app.model.ProfileId +import org.oppia.android.app.shim.IntentFactoryShim +import org.oppia.android.app.viewmodel.ObservableViewModel +import org.oppia.android.domain.profile.ProfileManagementController +import org.oppia.android.domain.topic.TopicController +import org.oppia.android.domain.topic.TopicListController +import org.oppia.android.util.data.AsyncResult +import org.oppia.android.util.logging.ConsoleLogger +import org.oppia.android.util.parser.StoryHtmlParserEntityType import javax.inject.Inject /** The [ObservableViewModel] for [ProfileProgressFragment]. */ diff --git a/app/src/main/java/org/oppia/android/app/profileprogress/RecentlyPlayedStorySummaryViewModel.kt b/app/src/main/java/org/oppia/android/app/profileprogress/RecentlyPlayedStorySummaryViewModel.kt index 8ff1052d150..24c51105cce 100644 --- a/app/src/main/java/org/oppia/android/app/profileprogress/RecentlyPlayedStorySummaryViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/profileprogress/RecentlyPlayedStorySummaryViewModel.kt @@ -1,9 +1,9 @@ -package org.oppia.app.profileprogress +package org.oppia.android.app.profileprogress import androidx.appcompat.app.AppCompatActivity -import org.oppia.app.home.RouteToTopicPlayStoryListener -import org.oppia.app.model.PromotedStory -import org.oppia.app.shim.IntentFactoryShim +import org.oppia.android.app.home.RouteToTopicPlayStoryListener +import org.oppia.android.app.model.PromotedStory +import org.oppia.android.app.shim.IntentFactoryShim /** Recently played item [ViewModel] for the recycler view in [ProfileProgressFragment]. */ class RecentlyPlayedStorySummaryViewModel( diff --git a/app/src/main/java/org/oppia/android/app/profileprogress/RouteToCompletedStoryListListener.kt b/app/src/main/java/org/oppia/android/app/profileprogress/RouteToCompletedStoryListListener.kt index e1734701cdc..c7cd85d70f5 100755 --- a/app/src/main/java/org/oppia/android/app/profileprogress/RouteToCompletedStoryListListener.kt +++ b/app/src/main/java/org/oppia/android/app/profileprogress/RouteToCompletedStoryListListener.kt @@ -1,4 +1,4 @@ -package org.oppia.app.profileprogress +package org.oppia.android.app.profileprogress /** Listener for when an activity should route to [CompletedStoryListActivity]. */ interface RouteToCompletedStoryListListener { diff --git a/app/src/main/java/org/oppia/android/app/profileprogress/RouteToOngoingTopicListListener.kt b/app/src/main/java/org/oppia/android/app/profileprogress/RouteToOngoingTopicListListener.kt index 00ffd9e1c50..abc597d2869 100755 --- a/app/src/main/java/org/oppia/android/app/profileprogress/RouteToOngoingTopicListListener.kt +++ b/app/src/main/java/org/oppia/android/app/profileprogress/RouteToOngoingTopicListListener.kt @@ -1,4 +1,4 @@ -package org.oppia.app.profileprogress +package org.oppia.android.app.profileprogress /** Listener for when an activity should route to [OngoingTopicListActivity]. */ interface RouteToOngoingTopicListListener { diff --git a/app/src/main/java/org/oppia/android/app/recyclerview/BindableAdapter.kt b/app/src/main/java/org/oppia/android/app/recyclerview/BindableAdapter.kt index 2b12bd9e554..754ed807824 100644 --- a/app/src/main/java/org/oppia/android/app/recyclerview/BindableAdapter.kt +++ b/app/src/main/java/org/oppia/android/app/recyclerview/BindableAdapter.kt @@ -1,12 +1,12 @@ -package org.oppia.app.recyclerview +package org.oppia.android.app.recyclerview import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.databinding.ViewDataBinding import androidx.recyclerview.widget.RecyclerView -import org.oppia.app.recyclerview.BindableAdapter.MultiTypeBuilder.Companion.newBuilder -import org.oppia.app.recyclerview.BindableAdapter.SingleTypeBuilder.Companion.newBuilder +import org.oppia.android.app.recyclerview.BindableAdapter.MultiTypeBuilder.Companion.newBuilder +import org.oppia.android.app.recyclerview.BindableAdapter.SingleTypeBuilder.Companion.newBuilder import kotlin.reflect.KClass /** A function that returns the integer-based type of view that can bind the specified data object. */ diff --git a/app/src/main/java/org/oppia/android/app/recyclerview/DividerItemDecorator.kt b/app/src/main/java/org/oppia/android/app/recyclerview/DividerItemDecorator.kt index b98db8c0997..ec3067ee210 100644 --- a/app/src/main/java/org/oppia/android/app/recyclerview/DividerItemDecorator.kt +++ b/app/src/main/java/org/oppia/android/app/recyclerview/DividerItemDecorator.kt @@ -1,4 +1,4 @@ -package org.oppia.app.recyclerview +package org.oppia.android.app.recyclerview import android.graphics.Canvas import android.graphics.drawable.Drawable diff --git a/app/src/main/java/org/oppia/android/app/recyclerview/DragAndDropItemFacilitator.kt b/app/src/main/java/org/oppia/android/app/recyclerview/DragAndDropItemFacilitator.kt index adc2d8d5805..77e1ab70157 100644 --- a/app/src/main/java/org/oppia/android/app/recyclerview/DragAndDropItemFacilitator.kt +++ b/app/src/main/java/org/oppia/android/app/recyclerview/DragAndDropItemFacilitator.kt @@ -1,4 +1,4 @@ -package org.oppia.app.recyclerview +package org.oppia.android.app.recyclerview import androidx.recyclerview.widget.ItemTouchHelper import androidx.recyclerview.widget.RecyclerView diff --git a/app/src/main/java/org/oppia/android/app/recyclerview/OnDragEndedListener.kt b/app/src/main/java/org/oppia/android/app/recyclerview/OnDragEndedListener.kt index da165ca726f..ffd68d60f4e 100644 --- a/app/src/main/java/org/oppia/android/app/recyclerview/OnDragEndedListener.kt +++ b/app/src/main/java/org/oppia/android/app/recyclerview/OnDragEndedListener.kt @@ -1,4 +1,4 @@ -package org.oppia.app.recyclerview +package org.oppia.android.app.recyclerview import androidx.recyclerview.widget.RecyclerView diff --git a/app/src/main/java/org/oppia/android/app/recyclerview/OnItemDragListener.kt b/app/src/main/java/org/oppia/android/app/recyclerview/OnItemDragListener.kt index c515a0c77a3..ff767fefcb9 100644 --- a/app/src/main/java/org/oppia/android/app/recyclerview/OnItemDragListener.kt +++ b/app/src/main/java/org/oppia/android/app/recyclerview/OnItemDragListener.kt @@ -1,4 +1,4 @@ -package org.oppia.app.recyclerview +package org.oppia.android.app.recyclerview import androidx.recyclerview.widget.RecyclerView diff --git a/app/src/main/java/org/oppia/android/app/recyclerview/RecyclerViewBindingAdapter.java b/app/src/main/java/org/oppia/android/app/recyclerview/RecyclerViewBindingAdapter.java index cf90991cf1a..b3173bbc45f 100644 --- a/app/src/main/java/org/oppia/android/app/recyclerview/RecyclerViewBindingAdapter.java +++ b/app/src/main/java/org/oppia/android/app/recyclerview/RecyclerViewBindingAdapter.java @@ -1,4 +1,4 @@ -package org.oppia.app.recyclerview; +package org.oppia.android.app.recyclerview; import android.graphics.drawable.Drawable; import androidx.annotation.NonNull; diff --git a/app/src/main/java/org/oppia/android/app/recyclerview/StartSnapHelper.kt b/app/src/main/java/org/oppia/android/app/recyclerview/StartSnapHelper.kt index 588a724c579..1b11dcc2023 100644 --- a/app/src/main/java/org/oppia/android/app/recyclerview/StartSnapHelper.kt +++ b/app/src/main/java/org/oppia/android/app/recyclerview/StartSnapHelper.kt @@ -1,4 +1,4 @@ -package org.oppia.app.recyclerview +package org.oppia.android.app.recyclerview import android.view.View import androidx.recyclerview.widget.LinearLayoutManager diff --git a/app/src/main/java/org/oppia/android/app/settings/profile/ProfileEditActivity.kt b/app/src/main/java/org/oppia/android/app/settings/profile/ProfileEditActivity.kt index fc7f8e50c1a..2a1efcc2f49 100644 --- a/app/src/main/java/org/oppia/android/app/settings/profile/ProfileEditActivity.kt +++ b/app/src/main/java/org/oppia/android/app/settings/profile/ProfileEditActivity.kt @@ -1,9 +1,9 @@ -package org.oppia.app.settings.profile +package org.oppia.android.app.settings.profile import android.content.Context import android.content.Intent import android.os.Bundle -import org.oppia.app.activity.InjectableAppCompatActivity +import org.oppia.android.app.activity.InjectableAppCompatActivity import javax.inject.Inject const val KEY_PROFILE_EDIT_PROFILE_ID = "KEY_PROFILE_EDIT_PROFILE_ID" diff --git a/app/src/main/java/org/oppia/android/app/settings/profile/ProfileEditActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/settings/profile/ProfileEditActivityPresenter.kt index 9cd0b1dd857..be6786250cd 100644 --- a/app/src/main/java/org/oppia/android/app/settings/profile/ProfileEditActivityPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/settings/profile/ProfileEditActivityPresenter.kt @@ -1,4 +1,4 @@ -package org.oppia.app.settings.profile +package org.oppia.android.app.settings.profile import android.content.Intent import android.widget.Switch @@ -6,13 +6,13 @@ import androidx.appcompat.app.AlertDialog import androidx.appcompat.app.AppCompatActivity import androidx.databinding.DataBindingUtil import androidx.lifecycle.Observer -import org.oppia.app.R -import org.oppia.app.activity.ActivityScope -import org.oppia.app.databinding.ProfileEditActivityBinding -import org.oppia.app.model.ProfileId -import org.oppia.app.viewmodel.ViewModelProvider -import org.oppia.domain.profile.ProfileManagementController -import org.oppia.util.logging.ConsoleLogger +import org.oppia.android.R +import org.oppia.android.app.activity.ActivityScope +import org.oppia.android.app.model.ProfileId +import org.oppia.android.app.viewmodel.ViewModelProvider +import org.oppia.android.databinding.ProfileEditActivityBinding +import org.oppia.android.domain.profile.ProfileManagementController +import org.oppia.android.util.logging.ConsoleLogger import javax.inject.Inject /** The presenter for [ProfileEditActivity]. */ diff --git a/app/src/main/java/org/oppia/android/app/settings/profile/ProfileEditViewModel.kt b/app/src/main/java/org/oppia/android/app/settings/profile/ProfileEditViewModel.kt index 1a59305c91c..07e86b28f79 100644 --- a/app/src/main/java/org/oppia/android/app/settings/profile/ProfileEditViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/settings/profile/ProfileEditViewModel.kt @@ -1,16 +1,16 @@ -package org.oppia.app.settings.profile +package org.oppia.android.app.settings.profile import android.widget.Switch import androidx.appcompat.app.AppCompatActivity import androidx.lifecycle.LiveData import androidx.lifecycle.Transformations -import org.oppia.app.activity.ActivityScope -import org.oppia.app.model.Profile -import org.oppia.app.model.ProfileId -import org.oppia.app.viewmodel.ObservableViewModel -import org.oppia.domain.profile.ProfileManagementController -import org.oppia.util.data.AsyncResult -import org.oppia.util.logging.ConsoleLogger +import org.oppia.android.app.activity.ActivityScope +import org.oppia.android.app.model.Profile +import org.oppia.android.app.model.ProfileId +import org.oppia.android.app.viewmodel.ObservableViewModel +import org.oppia.android.domain.profile.ProfileManagementController +import org.oppia.android.util.data.AsyncResult +import org.oppia.android.util.logging.ConsoleLogger import javax.inject.Inject // TODO(#1633): Fix ViewModel to not depend on View diff --git a/app/src/main/java/org/oppia/android/app/settings/profile/ProfileListActivity.kt b/app/src/main/java/org/oppia/android/app/settings/profile/ProfileListActivity.kt index 9c381f2394b..defa87b9193 100644 --- a/app/src/main/java/org/oppia/android/app/settings/profile/ProfileListActivity.kt +++ b/app/src/main/java/org/oppia/android/app/settings/profile/ProfileListActivity.kt @@ -1,9 +1,9 @@ -package org.oppia.app.settings.profile +package org.oppia.android.app.settings.profile import android.content.Context import android.content.Intent import android.os.Bundle -import org.oppia.app.activity.InjectableAppCompatActivity +import org.oppia.android.app.activity.InjectableAppCompatActivity import javax.inject.Inject /** Activity to display all profiles to admin. */ diff --git a/app/src/main/java/org/oppia/android/app/settings/profile/ProfileListActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/settings/profile/ProfileListActivityPresenter.kt index 2abb43d71b5..5338813cb5d 100644 --- a/app/src/main/java/org/oppia/android/app/settings/profile/ProfileListActivityPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/settings/profile/ProfileListActivityPresenter.kt @@ -1,8 +1,8 @@ -package org.oppia.app.settings.profile +package org.oppia.android.app.settings.profile import androidx.appcompat.app.AppCompatActivity -import org.oppia.app.R -import org.oppia.app.activity.ActivityScope +import org.oppia.android.R +import org.oppia.android.app.activity.ActivityScope import javax.inject.Inject /** The presenter for [ProfileListActivity]. */ diff --git a/app/src/main/java/org/oppia/android/app/settings/profile/ProfileListFragment.kt b/app/src/main/java/org/oppia/android/app/settings/profile/ProfileListFragment.kt index b53bf0de92c..70070a46fc5 100644 --- a/app/src/main/java/org/oppia/android/app/settings/profile/ProfileListFragment.kt +++ b/app/src/main/java/org/oppia/android/app/settings/profile/ProfileListFragment.kt @@ -1,11 +1,11 @@ -package org.oppia.app.settings.profile +package org.oppia.android.app.settings.profile import android.content.Context import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import org.oppia.app.fragment.InjectableFragment +import org.oppia.android.app.fragment.InjectableFragment import javax.inject.Inject private const val IS_MULTIPANE_KEY = "IS_MULTIPANE_KEY" diff --git a/app/src/main/java/org/oppia/android/app/settings/profile/ProfileListFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/settings/profile/ProfileListFragmentPresenter.kt index 95f263dcc5d..e664a818bef 100644 --- a/app/src/main/java/org/oppia/android/app/settings/profile/ProfileListFragmentPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/settings/profile/ProfileListFragmentPresenter.kt @@ -1,16 +1,16 @@ -package org.oppia.app.settings.profile +package org.oppia.android.app.settings.profile import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.appcompat.app.AppCompatActivity import androidx.fragment.app.Fragment -import org.oppia.app.databinding.ProfileListFragmentBinding -import org.oppia.app.databinding.ProfileListProfileViewBinding -import org.oppia.app.fragment.FragmentScope -import org.oppia.app.model.Profile -import org.oppia.app.recyclerview.BindableAdapter -import org.oppia.app.viewmodel.ViewModelProvider +import org.oppia.android.app.fragment.FragmentScope +import org.oppia.android.app.model.Profile +import org.oppia.android.app.recyclerview.BindableAdapter +import org.oppia.android.app.viewmodel.ViewModelProvider +import org.oppia.android.databinding.ProfileListFragmentBinding +import org.oppia.android.databinding.ProfileListProfileViewBinding import javax.inject.Inject /** The presenter for [ProfileListFragment]. */ diff --git a/app/src/main/java/org/oppia/android/app/settings/profile/ProfileListViewModel.kt b/app/src/main/java/org/oppia/android/app/settings/profile/ProfileListViewModel.kt index 3d1e17e79f7..7eae6c6fda4 100644 --- a/app/src/main/java/org/oppia/android/app/settings/profile/ProfileListViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/settings/profile/ProfileListViewModel.kt @@ -1,13 +1,13 @@ -package org.oppia.app.settings.profile +package org.oppia.android.app.settings.profile import androidx.lifecycle.LiveData import androidx.lifecycle.Transformations -import org.oppia.app.activity.ActivityScope -import org.oppia.app.model.Profile -import org.oppia.app.viewmodel.ObservableViewModel -import org.oppia.domain.profile.ProfileManagementController -import org.oppia.util.data.AsyncResult -import org.oppia.util.logging.ConsoleLogger +import org.oppia.android.app.activity.ActivityScope +import org.oppia.android.app.model.Profile +import org.oppia.android.app.viewmodel.ObservableViewModel +import org.oppia.android.domain.profile.ProfileManagementController +import org.oppia.android.util.data.AsyncResult +import org.oppia.android.util.logging.ConsoleLogger import java.util.Locale import javax.inject.Inject diff --git a/app/src/main/java/org/oppia/android/app/settings/profile/ProfileRenameActivity.kt b/app/src/main/java/org/oppia/android/app/settings/profile/ProfileRenameActivity.kt index 9dd7dc12391..ddf77b6a001 100644 --- a/app/src/main/java/org/oppia/android/app/settings/profile/ProfileRenameActivity.kt +++ b/app/src/main/java/org/oppia/android/app/settings/profile/ProfileRenameActivity.kt @@ -1,9 +1,9 @@ -package org.oppia.app.settings.profile +package org.oppia.android.app.settings.profile import android.content.Context import android.content.Intent import android.os.Bundle -import org.oppia.app.activity.InjectableAppCompatActivity +import org.oppia.android.app.activity.InjectableAppCompatActivity import javax.inject.Inject const val KEY_PROFILE_RENAME_PROFILE_ID = "KEY_PROFILE_RENAME_PROFILE_ID" diff --git a/app/src/main/java/org/oppia/android/app/settings/profile/ProfileRenameActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/settings/profile/ProfileRenameActivityPresenter.kt index d87219db7e3..470fcfa948a 100644 --- a/app/src/main/java/org/oppia/android/app/settings/profile/ProfileRenameActivityPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/settings/profile/ProfileRenameActivityPresenter.kt @@ -1,4 +1,4 @@ -package org.oppia.app.settings.profile +package org.oppia.android.app.settings.profile import android.content.Context import android.content.Intent @@ -8,14 +8,14 @@ import android.view.inputmethod.InputMethodManager import androidx.appcompat.app.AppCompatActivity import androidx.databinding.DataBindingUtil import androidx.lifecycle.Observer -import org.oppia.app.R -import org.oppia.app.activity.ActivityScope -import org.oppia.app.databinding.ProfileRenameActivityBinding -import org.oppia.app.model.ProfileId -import org.oppia.app.profile.ProfileInputView -import org.oppia.app.viewmodel.ViewModelProvider -import org.oppia.domain.profile.ProfileManagementController -import org.oppia.util.data.AsyncResult +import org.oppia.android.R +import org.oppia.android.app.activity.ActivityScope +import org.oppia.android.app.model.ProfileId +import org.oppia.android.app.profile.ProfileInputView +import org.oppia.android.app.viewmodel.ViewModelProvider +import org.oppia.android.databinding.ProfileRenameActivityBinding +import org.oppia.android.domain.profile.ProfileManagementController +import org.oppia.android.util.data.AsyncResult import javax.inject.Inject /** The presenter for [ProfileRenameActivity]. */ diff --git a/app/src/main/java/org/oppia/android/app/settings/profile/ProfileRenameViewModel.kt b/app/src/main/java/org/oppia/android/app/settings/profile/ProfileRenameViewModel.kt index ba0683459e4..0db6f6a6a9b 100644 --- a/app/src/main/java/org/oppia/android/app/settings/profile/ProfileRenameViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/settings/profile/ProfileRenameViewModel.kt @@ -1,8 +1,8 @@ -package org.oppia.app.settings.profile +package org.oppia.android.app.settings.profile import androidx.databinding.ObservableField -import org.oppia.app.activity.ActivityScope -import org.oppia.app.viewmodel.ObservableViewModel +import org.oppia.android.app.activity.ActivityScope +import org.oppia.android.app.viewmodel.ObservableViewModel import javax.inject.Inject /** The ViewModel for [ProfileRenameActivity]. */ diff --git a/app/src/main/java/org/oppia/android/app/settings/profile/ProfileResetPinActivity.kt b/app/src/main/java/org/oppia/android/app/settings/profile/ProfileResetPinActivity.kt index 9ede94aee1f..c6550d97dbc 100644 --- a/app/src/main/java/org/oppia/android/app/settings/profile/ProfileResetPinActivity.kt +++ b/app/src/main/java/org/oppia/android/app/settings/profile/ProfileResetPinActivity.kt @@ -1,9 +1,9 @@ -package org.oppia.app.settings.profile +package org.oppia.android.app.settings.profile import android.content.Context import android.content.Intent import android.os.Bundle -import org.oppia.app.activity.InjectableAppCompatActivity +import org.oppia.android.app.activity.InjectableAppCompatActivity import javax.inject.Inject const val KEY_PROFILE_RESET_PIN_PROFILE_ID = "KEY_PROFILE_RESET_PIN_PROFILE_ID" diff --git a/app/src/main/java/org/oppia/android/app/settings/profile/ProfileResetPinActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/settings/profile/ProfileResetPinActivityPresenter.kt index 4638a0454ab..0d85f236b78 100644 --- a/app/src/main/java/org/oppia/android/app/settings/profile/ProfileResetPinActivityPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/settings/profile/ProfileResetPinActivityPresenter.kt @@ -1,4 +1,4 @@ -package org.oppia.app.settings.profile +package org.oppia.android.app.settings.profile import android.content.Intent import android.text.Editable @@ -6,13 +6,13 @@ import android.text.TextWatcher import androidx.appcompat.app.AppCompatActivity import androidx.databinding.DataBindingUtil import androidx.lifecycle.Observer -import org.oppia.app.R -import org.oppia.app.activity.ActivityScope -import org.oppia.app.databinding.ProfileResetPinActivityBinding -import org.oppia.app.model.ProfileId -import org.oppia.app.profile.ProfileInputView -import org.oppia.app.viewmodel.ViewModelProvider -import org.oppia.domain.profile.ProfileManagementController +import org.oppia.android.R +import org.oppia.android.app.activity.ActivityScope +import org.oppia.android.app.model.ProfileId +import org.oppia.android.app.profile.ProfileInputView +import org.oppia.android.app.viewmodel.ViewModelProvider +import org.oppia.android.databinding.ProfileResetPinActivityBinding +import org.oppia.android.domain.profile.ProfileManagementController import javax.inject.Inject /** The presenter for [ProfileResetPinActivity]. */ diff --git a/app/src/main/java/org/oppia/android/app/settings/profile/ProfileResetPinViewModel.kt b/app/src/main/java/org/oppia/android/app/settings/profile/ProfileResetPinViewModel.kt index 36d1c121d4f..dd0d2ddfec5 100644 --- a/app/src/main/java/org/oppia/android/app/settings/profile/ProfileResetPinViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/settings/profile/ProfileResetPinViewModel.kt @@ -1,8 +1,8 @@ -package org.oppia.app.settings.profile +package org.oppia.android.app.settings.profile import androidx.databinding.ObservableField -import org.oppia.app.activity.ActivityScope -import org.oppia.app.viewmodel.ObservableViewModel +import org.oppia.android.app.activity.ActivityScope +import org.oppia.android.app.viewmodel.ObservableViewModel import javax.inject.Inject /** The ViewModel for [ProfileResetPinActivity]. */ diff --git a/app/src/main/java/org/oppia/android/app/shim/IntentFactoryShim.kt b/app/src/main/java/org/oppia/android/app/shim/IntentFactoryShim.kt index 430d9ddd5eb..ff7a38f9e01 100644 --- a/app/src/main/java/org/oppia/android/app/shim/IntentFactoryShim.kt +++ b/app/src/main/java/org/oppia/android/app/shim/IntentFactoryShim.kt @@ -1,4 +1,4 @@ -package org.oppia.app.shim +package org.oppia.android.app.shim import android.content.Context import android.content.Intent diff --git a/app/src/main/java/org/oppia/android/app/shim/IntentFactoryShimImpl.kt b/app/src/main/java/org/oppia/android/app/shim/IntentFactoryShimImpl.kt index 85640ebfcdb..2f9d758efdb 100644 --- a/app/src/main/java/org/oppia/android/app/shim/IntentFactoryShimImpl.kt +++ b/app/src/main/java/org/oppia/android/app/shim/IntentFactoryShimImpl.kt @@ -1,12 +1,12 @@ -package org.oppia.app.shim +package org.oppia.android.app.shim import android.content.Context import android.content.Intent import androidx.fragment.app.FragmentActivity -import org.oppia.app.drawer.KEY_NAVIGATION_PROFILE_ID -import org.oppia.app.home.recentlyplayed.RecentlyPlayedActivity -import org.oppia.app.profile.ProfileChooserActivity -import org.oppia.app.topic.TopicActivity +import org.oppia.android.app.drawer.KEY_NAVIGATION_PROFILE_ID +import org.oppia.android.app.home.recentlyplayed.RecentlyPlayedActivity +import org.oppia.android.app.profile.ProfileChooserActivity +import org.oppia.android.app.topic.TopicActivity import javax.inject.Inject /** diff --git a/app/src/main/java/org/oppia/android/app/shim/IntentFactoryShimModule.kt b/app/src/main/java/org/oppia/android/app/shim/IntentFactoryShimModule.kt index 3021aa97811..45e2f38a662 100644 --- a/app/src/main/java/org/oppia/android/app/shim/IntentFactoryShimModule.kt +++ b/app/src/main/java/org/oppia/android/app/shim/IntentFactoryShimModule.kt @@ -1,4 +1,4 @@ -package org.oppia.app.shim +package org.oppia.android.app.shim import dagger.Binds import dagger.Module diff --git a/app/src/main/java/org/oppia/android/app/shim/ViewBindingShim.kt b/app/src/main/java/org/oppia/android/app/shim/ViewBindingShim.kt index f60eed36e23..846dc200fed 100644 --- a/app/src/main/java/org/oppia/android/app/shim/ViewBindingShim.kt +++ b/app/src/main/java/org/oppia/android/app/shim/ViewBindingShim.kt @@ -1,4 +1,4 @@ -package org.oppia.app.shim +package org.oppia.android.app.shim import android.view.LayoutInflater import android.view.View @@ -9,9 +9,9 @@ import android.widget.ImageButton import android.widget.LinearLayout import android.widget.TextView import androidx.recyclerview.widget.RecyclerView -import org.oppia.app.player.state.itemviewmodel.DragDropInteractionContentViewModel -import org.oppia.app.player.state.itemviewmodel.SelectionInteractionContentViewModel -import org.oppia.util.parser.HtmlParser +import org.oppia.android.app.player.state.itemviewmodel.DragDropInteractionContentViewModel +import org.oppia.android.app.player.state.itemviewmodel.SelectionInteractionContentViewModel +import org.oppia.android.util.parser.HtmlParser /** * Creates bindings for Views in order to avoid View files directly depending on Binding files. diff --git a/app/src/main/java/org/oppia/android/app/shim/ViewBindingShimImpl.kt b/app/src/main/java/org/oppia/android/app/shim/ViewBindingShimImpl.kt index fb46b5c2694..3b0bbeb6825 100644 --- a/app/src/main/java/org/oppia/android/app/shim/ViewBindingShimImpl.kt +++ b/app/src/main/java/org/oppia/android/app/shim/ViewBindingShimImpl.kt @@ -1,4 +1,4 @@ -package org.oppia.app.shim +package org.oppia.android.app.shim import android.view.LayoutInflater import android.view.View @@ -10,15 +10,15 @@ import android.widget.LinearLayout import android.widget.TextView import androidx.databinding.DataBindingUtil import androidx.recyclerview.widget.RecyclerView -import org.oppia.app.R -import org.oppia.app.databinding.DragDropInteractionItemsBinding -import org.oppia.app.databinding.DragDropSingleItemBinding -import org.oppia.app.databinding.ItemSelectionInteractionItemsBinding -import org.oppia.app.databinding.MultipleChoiceInteractionItemsBinding -import org.oppia.app.databinding.ProfileInputViewBinding -import org.oppia.app.player.state.itemviewmodel.DragDropInteractionContentViewModel -import org.oppia.app.player.state.itemviewmodel.SelectionInteractionContentViewModel -import org.oppia.util.parser.HtmlParser +import org.oppia.android.R +import org.oppia.android.app.player.state.itemviewmodel.DragDropInteractionContentViewModel +import org.oppia.android.app.player.state.itemviewmodel.SelectionInteractionContentViewModel +import org.oppia.android.databinding.DragDropInteractionItemsBinding +import org.oppia.android.databinding.DragDropSingleItemBinding +import org.oppia.android.databinding.ItemSelectionInteractionItemsBinding +import org.oppia.android.databinding.MultipleChoiceInteractionItemsBinding +import org.oppia.android.databinding.ProfileInputViewBinding +import org.oppia.android.util.parser.HtmlParser import javax.inject.Inject /** diff --git a/app/src/main/java/org/oppia/android/app/shim/ViewBindingShimModule.kt b/app/src/main/java/org/oppia/android/app/shim/ViewBindingShimModule.kt index 870b9789614..dab26dc3e87 100644 --- a/app/src/main/java/org/oppia/android/app/shim/ViewBindingShimModule.kt +++ b/app/src/main/java/org/oppia/android/app/shim/ViewBindingShimModule.kt @@ -1,4 +1,4 @@ -package org.oppia.app.shim +package org.oppia.android.app.shim import dagger.Binds import dagger.Module diff --git a/app/src/main/java/org/oppia/android/app/shim/ViewComponentFactory.kt b/app/src/main/java/org/oppia/android/app/shim/ViewComponentFactory.kt index e8690bcd687..bf1eb2adcc1 100644 --- a/app/src/main/java/org/oppia/android/app/shim/ViewComponentFactory.kt +++ b/app/src/main/java/org/oppia/android/app/shim/ViewComponentFactory.kt @@ -1,7 +1,7 @@ -package org.oppia.app.shim +package org.oppia.android.app.shim import android.view.View -import org.oppia.app.view.ViewComponent +import org.oppia.android.app.view.ViewComponent interface ViewComponentFactory { /** diff --git a/app/src/main/java/org/oppia/android/app/splash/SplashActivity.kt b/app/src/main/java/org/oppia/android/app/splash/SplashActivity.kt index bf42687a201..ebd8b0531e8 100644 --- a/app/src/main/java/org/oppia/android/app/splash/SplashActivity.kt +++ b/app/src/main/java/org/oppia/android/app/splash/SplashActivity.kt @@ -1,8 +1,8 @@ -package org.oppia.app.splash +package org.oppia.android.app.splash import android.os.Bundle -import org.oppia.app.activity.InjectableAppCompatActivity -import org.oppia.app.deprecation.DeprecationNoticeExitAppListener +import org.oppia.android.app.activity.InjectableAppCompatActivity +import org.oppia.android.app.deprecation.DeprecationNoticeExitAppListener import javax.inject.Inject /** An activity that shows a temporary loading page until the app is fully loaded then navigates to [ProfileActivity]. */ diff --git a/app/src/main/java/org/oppia/android/app/splash/SplashActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/splash/SplashActivityPresenter.kt index c7a5a2e2134..bd5ae83cae0 100644 --- a/app/src/main/java/org/oppia/android/app/splash/SplashActivityPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/splash/SplashActivityPresenter.kt @@ -1,21 +1,21 @@ -package org.oppia.app.splash +package org.oppia.android.app.splash import android.view.WindowManager import androidx.appcompat.app.AppCompatActivity import androidx.lifecycle.LiveData import androidx.lifecycle.Observer import androidx.lifecycle.Transformations -import org.oppia.app.R -import org.oppia.app.activity.ActivityScope -import org.oppia.app.deprecation.AutomaticAppDeprecationNoticeDialogFragment -import org.oppia.app.model.AppStartupState -import org.oppia.app.model.AppStartupState.StartupMode -import org.oppia.app.onboarding.OnboardingActivity -import org.oppia.app.profile.ProfileChooserActivity -import org.oppia.domain.onboarding.AppStartupStateController -import org.oppia.domain.topic.PrimeTopicAssetsController -import org.oppia.util.data.AsyncResult -import org.oppia.util.logging.ConsoleLogger +import org.oppia.android.R +import org.oppia.android.app.activity.ActivityScope +import org.oppia.android.app.deprecation.AutomaticAppDeprecationNoticeDialogFragment +import org.oppia.android.app.model.AppStartupState +import org.oppia.android.app.model.AppStartupState.StartupMode +import org.oppia.android.app.onboarding.OnboardingActivity +import org.oppia.android.app.profile.ProfileChooserActivity +import org.oppia.android.domain.onboarding.AppStartupStateController +import org.oppia.android.domain.topic.PrimeTopicAssetsController +import org.oppia.android.util.data.AsyncResult +import org.oppia.android.util.logging.ConsoleLogger import javax.inject.Inject private const val AUTO_DEPRECATION_NOTICE_DIALOG_FRAGMENT_TAG = "auto_deprecation_notice_dialog" diff --git a/app/src/main/java/org/oppia/android/app/story/ExplorationSelectionListener.kt b/app/src/main/java/org/oppia/android/app/story/ExplorationSelectionListener.kt index 042afabfea3..ed761b4c355 100644 --- a/app/src/main/java/org/oppia/android/app/story/ExplorationSelectionListener.kt +++ b/app/src/main/java/org/oppia/android/app/story/ExplorationSelectionListener.kt @@ -1,4 +1,4 @@ -package org.oppia.app.story +package org.oppia.android.app.story /** Listener for cases when the user taps on a specific chapter/exploration to play. */ interface ExplorationSelectionListener { diff --git a/app/src/main/java/org/oppia/android/app/story/StoryActivity.kt b/app/src/main/java/org/oppia/android/app/story/StoryActivity.kt index 7fc9a1e3862..a3e57491dc7 100644 --- a/app/src/main/java/org/oppia/android/app/story/StoryActivity.kt +++ b/app/src/main/java/org/oppia/android/app/story/StoryActivity.kt @@ -1,11 +1,11 @@ -package org.oppia.app.story +package org.oppia.android.app.story import android.content.Context import android.content.Intent import android.os.Bundle -import org.oppia.app.activity.InjectableAppCompatActivity -import org.oppia.app.home.RouteToExplorationListener -import org.oppia.app.player.exploration.ExplorationActivity +import org.oppia.android.app.activity.InjectableAppCompatActivity +import org.oppia.android.app.home.RouteToExplorationListener +import org.oppia.android.app.player.exploration.ExplorationActivity import javax.inject.Inject /** Activity for stories. */ diff --git a/app/src/main/java/org/oppia/android/app/story/StoryActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/story/StoryActivityPresenter.kt index 4ed56c5e485..dd840745ca9 100644 --- a/app/src/main/java/org/oppia/android/app/story/StoryActivityPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/story/StoryActivityPresenter.kt @@ -1,8 +1,8 @@ -package org.oppia.app.story +package org.oppia.android.app.story import androidx.appcompat.app.AppCompatActivity -import org.oppia.app.R -import org.oppia.app.activity.ActivityScope +import org.oppia.android.R +import org.oppia.android.app.activity.ActivityScope import javax.inject.Inject /** The presenter for [StoryActivity]. */ diff --git a/app/src/main/java/org/oppia/android/app/story/StoryFragment.kt b/app/src/main/java/org/oppia/android/app/story/StoryFragment.kt index f49ab4dd98e..60686c7f312 100644 --- a/app/src/main/java/org/oppia/android/app/story/StoryFragment.kt +++ b/app/src/main/java/org/oppia/android/app/story/StoryFragment.kt @@ -1,11 +1,11 @@ -package org.oppia.app.story +package org.oppia.android.app.story import android.content.Context import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import org.oppia.app.fragment.InjectableFragment +import org.oppia.android.app.fragment.InjectableFragment import javax.inject.Inject private const val KEY_INTERNAL_PROFILE_ID_ARGUMENT = "INTERNAL_PROFILE_ID" diff --git a/app/src/main/java/org/oppia/android/app/story/StoryFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/story/StoryFragmentPresenter.kt index 3b0fe4c368f..34cbc068b84 100644 --- a/app/src/main/java/org/oppia/android/app/story/StoryFragmentPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/story/StoryFragmentPresenter.kt @@ -1,4 +1,4 @@ -package org.oppia.app.story +package org.oppia.android.app.story import android.content.res.Resources import android.util.DisplayMetrics @@ -12,20 +12,20 @@ import androidx.fragment.app.Fragment import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.LinearSmoothScroller import androidx.recyclerview.widget.RecyclerView -import org.oppia.app.databinding.StoryChapterViewBinding -import org.oppia.app.databinding.StoryFragmentBinding -import org.oppia.app.databinding.StoryHeaderViewBinding -import org.oppia.app.home.RouteToExplorationListener -import org.oppia.app.model.EventLog -import org.oppia.app.recyclerview.BindableAdapter -import org.oppia.app.story.storyitemviewmodel.StoryChapterSummaryViewModel -import org.oppia.app.story.storyitemviewmodel.StoryHeaderViewModel -import org.oppia.app.story.storyitemviewmodel.StoryItemViewModel -import org.oppia.domain.oppialogger.OppiaLogger -import org.oppia.util.gcsresource.DefaultResourceBucketName -import org.oppia.util.parser.HtmlParser -import org.oppia.util.parser.TopicHtmlParserEntityType -import org.oppia.util.system.OppiaClock +import org.oppia.android.app.home.RouteToExplorationListener +import org.oppia.android.app.model.EventLog +import org.oppia.android.app.recyclerview.BindableAdapter +import org.oppia.android.app.story.storyitemviewmodel.StoryChapterSummaryViewModel +import org.oppia.android.app.story.storyitemviewmodel.StoryHeaderViewModel +import org.oppia.android.app.story.storyitemviewmodel.StoryItemViewModel +import org.oppia.android.databinding.StoryChapterViewBinding +import org.oppia.android.databinding.StoryFragmentBinding +import org.oppia.android.databinding.StoryHeaderViewBinding +import org.oppia.android.domain.oppialogger.OppiaLogger +import org.oppia.android.util.gcsresource.DefaultResourceBucketName +import org.oppia.android.util.parser.HtmlParser +import org.oppia.android.util.parser.TopicHtmlParserEntityType +import org.oppia.android.util.system.OppiaClock import javax.inject.Inject /** The presenter for [StoryFragment]. */ diff --git a/app/src/main/java/org/oppia/android/app/story/StoryFragmentScroller.kt b/app/src/main/java/org/oppia/android/app/story/StoryFragmentScroller.kt index 84f438dc3cb..cb3ee1cf989 100644 --- a/app/src/main/java/org/oppia/android/app/story/StoryFragmentScroller.kt +++ b/app/src/main/java/org/oppia/android/app/story/StoryFragmentScroller.kt @@ -1,4 +1,4 @@ -package org.oppia.app.story +package org.oppia.android.app.story interface StoryFragmentScroller { /** diff --git a/app/src/main/java/org/oppia/android/app/story/StoryViewModel.kt b/app/src/main/java/org/oppia/android/app/story/StoryViewModel.kt index 59b11ba8cce..87a2b633e51 100644 --- a/app/src/main/java/org/oppia/android/app/story/StoryViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/story/StoryViewModel.kt @@ -1,21 +1,21 @@ -package org.oppia.app.story +package org.oppia.android.app.story import androidx.fragment.app.Fragment import androidx.lifecycle.LiveData import androidx.lifecycle.Transformations -import org.oppia.app.fragment.FragmentScope -import org.oppia.app.model.ChapterPlayState -import org.oppia.app.model.ChapterSummary -import org.oppia.app.model.ProfileId -import org.oppia.app.model.StorySummary -import org.oppia.app.story.storyitemviewmodel.StoryChapterSummaryViewModel -import org.oppia.app.story.storyitemviewmodel.StoryHeaderViewModel -import org.oppia.app.story.storyitemviewmodel.StoryItemViewModel -import org.oppia.domain.exploration.ExplorationDataController -import org.oppia.domain.topic.TopicController -import org.oppia.util.data.AsyncResult -import org.oppia.util.logging.ConsoleLogger -import org.oppia.util.parser.StoryHtmlParserEntityType +import org.oppia.android.app.fragment.FragmentScope +import org.oppia.android.app.model.ChapterPlayState +import org.oppia.android.app.model.ChapterSummary +import org.oppia.android.app.model.ProfileId +import org.oppia.android.app.model.StorySummary +import org.oppia.android.app.story.storyitemviewmodel.StoryChapterSummaryViewModel +import org.oppia.android.app.story.storyitemviewmodel.StoryHeaderViewModel +import org.oppia.android.app.story.storyitemviewmodel.StoryItemViewModel +import org.oppia.android.domain.exploration.ExplorationDataController +import org.oppia.android.domain.topic.TopicController +import org.oppia.android.util.data.AsyncResult +import org.oppia.android.util.logging.ConsoleLogger +import org.oppia.android.util.parser.StoryHtmlParserEntityType import javax.inject.Inject /** The ViewModel for StoryFragment. */ diff --git a/app/src/main/java/org/oppia/android/app/story/storyitemviewmodel/StoryChapterSummaryViewModel.kt b/app/src/main/java/org/oppia/android/app/story/storyitemviewmodel/StoryChapterSummaryViewModel.kt index 46427df2a66..02b97e4e71b 100644 --- a/app/src/main/java/org/oppia/android/app/story/storyitemviewmodel/StoryChapterSummaryViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/story/storyitemviewmodel/StoryChapterSummaryViewModel.kt @@ -1,13 +1,13 @@ -package org.oppia.app.story.storyitemviewmodel +package org.oppia.android.app.story.storyitemviewmodel import androidx.fragment.app.Fragment import androidx.lifecycle.Observer -import org.oppia.app.model.ChapterSummary -import org.oppia.app.model.LessonThumbnail -import org.oppia.app.story.ExplorationSelectionListener -import org.oppia.domain.exploration.ExplorationDataController -import org.oppia.util.data.AsyncResult -import org.oppia.util.logging.ConsoleLogger +import org.oppia.android.app.model.ChapterSummary +import org.oppia.android.app.model.LessonThumbnail +import org.oppia.android.app.story.ExplorationSelectionListener +import org.oppia.android.domain.exploration.ExplorationDataController +import org.oppia.android.util.data.AsyncResult +import org.oppia.android.util.logging.ConsoleLogger private const val STORY_VIEWER_TAG = "StoryViewer" diff --git a/app/src/main/java/org/oppia/android/app/story/storyitemviewmodel/StoryHeaderViewModel.kt b/app/src/main/java/org/oppia/android/app/story/storyitemviewmodel/StoryHeaderViewModel.kt index a0430576b2f..68dd69bf29b 100644 --- a/app/src/main/java/org/oppia/android/app/story/storyitemviewmodel/StoryHeaderViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/story/storyitemviewmodel/StoryHeaderViewModel.kt @@ -1,4 +1,4 @@ -package org.oppia.app.story.storyitemviewmodel +package org.oppia.android.app.story.storyitemviewmodel /** Header view model for the recycler view in [StoryFragment]. */ class StoryHeaderViewModel( diff --git a/app/src/main/java/org/oppia/android/app/story/storyitemviewmodel/StoryItemViewModel.kt b/app/src/main/java/org/oppia/android/app/story/storyitemviewmodel/StoryItemViewModel.kt index f4d4a51ee54..58edcb67ebc 100644 --- a/app/src/main/java/org/oppia/android/app/story/storyitemviewmodel/StoryItemViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/story/storyitemviewmodel/StoryItemViewModel.kt @@ -1,6 +1,6 @@ -package org.oppia.app.story.storyitemviewmodel +package org.oppia.android.app.story.storyitemviewmodel -import org.oppia.app.viewmodel.ObservableViewModel +import org.oppia.android.app.viewmodel.ObservableViewModel /** Super-class for generalising different views for the recyclerView in [StoryFragment] */ abstract class StoryItemViewModel : ObservableViewModel() diff --git a/app/src/main/java/org/oppia/android/app/testing/AudioFragmentTestActivity.kt b/app/src/main/java/org/oppia/android/app/testing/AudioFragmentTestActivity.kt index 951ae59c035..b0ea2fc8d53 100644 --- a/app/src/main/java/org/oppia/android/app/testing/AudioFragmentTestActivity.kt +++ b/app/src/main/java/org/oppia/android/app/testing/AudioFragmentTestActivity.kt @@ -1,9 +1,9 @@ -package org.oppia.app.testing +package org.oppia.android.app.testing import android.content.Context import android.content.Intent import android.os.Bundle -import org.oppia.app.activity.InjectableAppCompatActivity +import org.oppia.android.app.activity.InjectableAppCompatActivity import javax.inject.Inject const val KEY_AUDIO_FRAGMENT_TEST_PROFILE_ID = "KEY_AUDIO_FRAGMENT_TEST_PROFILE_ID" diff --git a/app/src/main/java/org/oppia/android/app/testing/AudioFragmentTestActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/testing/AudioFragmentTestActivityPresenter.kt index 5c3984cabab..5ef44304cac 100644 --- a/app/src/main/java/org/oppia/android/app/testing/AudioFragmentTestActivityPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/testing/AudioFragmentTestActivityPresenter.kt @@ -1,13 +1,13 @@ -package org.oppia.app.testing +package org.oppia.android.app.testing import androidx.appcompat.app.AppCompatActivity -import org.oppia.app.R -import org.oppia.app.activity.ActivityScope -import org.oppia.app.model.State -import org.oppia.app.model.SubtitledHtml -import org.oppia.app.model.Voiceover -import org.oppia.app.model.VoiceoverMapping -import org.oppia.app.player.audio.AudioFragment +import org.oppia.android.R +import org.oppia.android.app.activity.ActivityScope +import org.oppia.android.app.model.State +import org.oppia.android.app.model.SubtitledHtml +import org.oppia.android.app.model.Voiceover +import org.oppia.android.app.model.VoiceoverMapping +import org.oppia.android.app.player.audio.AudioFragment import javax.inject.Inject /** The presenter for [AudioFragmentTestActivity] */ diff --git a/app/src/main/java/org/oppia/android/app/testing/BindableAdapterTestActivity.kt b/app/src/main/java/org/oppia/android/app/testing/BindableAdapterTestActivity.kt index 990e20f6461..6457f0773f2 100644 --- a/app/src/main/java/org/oppia/android/app/testing/BindableAdapterTestActivity.kt +++ b/app/src/main/java/org/oppia/android/app/testing/BindableAdapterTestActivity.kt @@ -1,8 +1,8 @@ -package org.oppia.app.testing +package org.oppia.android.app.testing import android.os.Bundle -import org.oppia.app.R -import org.oppia.app.activity.InjectableAppCompatActivity +import org.oppia.android.R +import org.oppia.android.app.activity.InjectableAppCompatActivity // TODO(#59): Make this activity only included in relevant tests instead of all prod builds. /** A test activity for the bindable RecyclerView adapter. */ diff --git a/app/src/main/java/org/oppia/android/app/testing/BindableAdapterTestFragment.kt b/app/src/main/java/org/oppia/android/app/testing/BindableAdapterTestFragment.kt index 7f7a7efd041..c7c55d430ea 100644 --- a/app/src/main/java/org/oppia/android/app/testing/BindableAdapterTestFragment.kt +++ b/app/src/main/java/org/oppia/android/app/testing/BindableAdapterTestFragment.kt @@ -1,11 +1,11 @@ -package org.oppia.app.testing +package org.oppia.android.app.testing import android.content.Context import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import org.oppia.app.fragment.InjectableFragment +import org.oppia.android.app.fragment.InjectableFragment import javax.inject.Inject const val BINDABLE_TEST_FRAGMENT_TAG = "bindable_adapter_test_fragment" diff --git a/app/src/main/java/org/oppia/android/app/testing/BindableAdapterTestFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/testing/BindableAdapterTestFragmentPresenter.kt index f6eb0796d25..973867f3f1c 100644 --- a/app/src/main/java/org/oppia/android/app/testing/BindableAdapterTestFragmentPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/testing/BindableAdapterTestFragmentPresenter.kt @@ -1,14 +1,14 @@ -package org.oppia.app.testing +package org.oppia.android.app.testing import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.annotation.VisibleForTesting import androidx.fragment.app.Fragment -import org.oppia.app.databinding.TestFragmentBinding -import org.oppia.app.model.TestModel -import org.oppia.app.recyclerview.BindableAdapter -import org.oppia.app.viewmodel.ViewModelProvider +import org.oppia.android.app.model.TestModel +import org.oppia.android.app.recyclerview.BindableAdapter +import org.oppia.android.app.viewmodel.ViewModelProvider +import org.oppia.android.databinding.TestFragmentBinding import javax.inject.Inject /** The test-only fragment presenter corresponding to [BindableAdapterTestFragment]. */ diff --git a/app/src/main/java/org/oppia/android/app/testing/BindableAdapterTestViewModel.kt b/app/src/main/java/org/oppia/android/app/testing/BindableAdapterTestViewModel.kt index 0d899c2c3ff..3a7627a7d38 100644 --- a/app/src/main/java/org/oppia/android/app/testing/BindableAdapterTestViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/testing/BindableAdapterTestViewModel.kt @@ -1,9 +1,9 @@ -package org.oppia.app.testing +package org.oppia.android.app.testing import androidx.lifecycle.MutableLiveData -import org.oppia.app.fragment.FragmentScope -import org.oppia.app.model.TestModel -import org.oppia.app.viewmodel.ObservableViewModel +import org.oppia.android.app.fragment.FragmentScope +import org.oppia.android.app.model.TestModel +import org.oppia.android.app.viewmodel.ObservableViewModel import javax.inject.Inject // TODO(#59): Make this view model only included in relevant tests instead of all prod builds. diff --git a/app/src/main/java/org/oppia/android/app/testing/ConceptCardFragmentTestActivity.kt b/app/src/main/java/org/oppia/android/app/testing/ConceptCardFragmentTestActivity.kt index 1022569783a..7c9d5318bb9 100644 --- a/app/src/main/java/org/oppia/android/app/testing/ConceptCardFragmentTestActivity.kt +++ b/app/src/main/java/org/oppia/android/app/testing/ConceptCardFragmentTestActivity.kt @@ -1,9 +1,9 @@ -package org.oppia.app.testing +package org.oppia.android.app.testing import android.os.Bundle -import org.oppia.app.activity.InjectableAppCompatActivity -import org.oppia.app.topic.conceptcard.ConceptCardFragment -import org.oppia.app.topic.conceptcard.ConceptCardListener +import org.oppia.android.app.activity.InjectableAppCompatActivity +import org.oppia.android.app.topic.conceptcard.ConceptCardFragment +import org.oppia.android.app.topic.conceptcard.ConceptCardListener import javax.inject.Inject /** Test Activity used for testing ConceptCardFragment */ diff --git a/app/src/main/java/org/oppia/android/app/testing/ConceptCardFragmentTestActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/testing/ConceptCardFragmentTestActivityPresenter.kt index 6c21837a303..f64cfbd2a69 100644 --- a/app/src/main/java/org/oppia/android/app/testing/ConceptCardFragmentTestActivityPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/testing/ConceptCardFragmentTestActivityPresenter.kt @@ -1,12 +1,12 @@ -package org.oppia.app.testing +package org.oppia.android.app.testing import android.widget.Button import androidx.appcompat.app.AppCompatActivity -import org.oppia.app.R -import org.oppia.app.testing.ConceptCardFragmentTestActivity.Companion.TAG_CONCEPT_CARD_DIALOG -import org.oppia.app.topic.conceptcard.ConceptCardFragment -import org.oppia.domain.topic.TEST_SKILL_ID_0 -import org.oppia.domain.topic.TEST_SKILL_ID_1 +import org.oppia.android.R +import org.oppia.android.app.testing.ConceptCardFragmentTestActivity.Companion.TAG_CONCEPT_CARD_DIALOG +import org.oppia.android.app.topic.conceptcard.ConceptCardFragment +import org.oppia.android.domain.topic.TEST_SKILL_ID_0 +import org.oppia.android.domain.topic.TEST_SKILL_ID_1 import javax.inject.Inject /** The presenter for [ConceptCardFragmentTestActivity] */ diff --git a/app/src/main/java/org/oppia/android/app/testing/DragDropTestActivity.kt b/app/src/main/java/org/oppia/android/app/testing/DragDropTestActivity.kt index 2fcd9f622fb..de864c9fd11 100644 --- a/app/src/main/java/org/oppia/android/app/testing/DragDropTestActivity.kt +++ b/app/src/main/java/org/oppia/android/app/testing/DragDropTestActivity.kt @@ -1,10 +1,10 @@ -package org.oppia.app.testing +package org.oppia.android.app.testing import android.os.Bundle import androidx.recyclerview.widget.RecyclerView -import org.oppia.app.activity.InjectableAppCompatActivity -import org.oppia.app.recyclerview.OnDragEndedListener -import org.oppia.app.recyclerview.OnItemDragListener +import org.oppia.android.app.activity.InjectableAppCompatActivity +import org.oppia.android.app.recyclerview.OnDragEndedListener +import org.oppia.android.app.recyclerview.OnItemDragListener import javax.inject.Inject /** Test Activity used for testing [DragAndDropItemFacilitator] functionality */ diff --git a/app/src/main/java/org/oppia/android/app/testing/DragDropTestActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/testing/DragDropTestActivityPresenter.kt index 6778769245f..592e74f62bd 100644 --- a/app/src/main/java/org/oppia/android/app/testing/DragDropTestActivityPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/testing/DragDropTestActivityPresenter.kt @@ -1,12 +1,12 @@ -package org.oppia.app.testing +package org.oppia.android.app.testing import android.view.LayoutInflater import android.view.ViewGroup import android.widget.TextView import androidx.appcompat.app.AppCompatActivity import androidx.recyclerview.widget.RecyclerView -import org.oppia.app.R -import org.oppia.app.recyclerview.BindableAdapter +import org.oppia.android.R +import org.oppia.android.app.recyclerview.BindableAdapter import javax.inject.Inject /** The presenter for [DragDropTestActivity] */ diff --git a/app/src/main/java/org/oppia/android/app/testing/ExplorationInjectionActivity.kt b/app/src/main/java/org/oppia/android/app/testing/ExplorationInjectionActivity.kt index cf8ee6fe0ed..62e3e3fe575 100644 --- a/app/src/main/java/org/oppia/android/app/testing/ExplorationInjectionActivity.kt +++ b/app/src/main/java/org/oppia/android/app/testing/ExplorationInjectionActivity.kt @@ -1,9 +1,9 @@ -package org.oppia.app.testing +package org.oppia.android.app.testing import android.os.Bundle -import org.oppia.app.activity.InjectableAppCompatActivity -import org.oppia.domain.exploration.ExplorationDataController -import org.oppia.util.networking.NetworkConnectionUtil +import org.oppia.android.app.activity.InjectableAppCompatActivity +import org.oppia.android.domain.exploration.ExplorationDataController +import org.oppia.android.util.networking.NetworkConnectionUtil import javax.inject.Inject /** Activity used in [ExplorationActivityTest] to get certain dependencies. */ diff --git a/app/src/main/java/org/oppia/android/app/testing/ExplorationTestActivity.kt b/app/src/main/java/org/oppia/android/app/testing/ExplorationTestActivity.kt index b7a5280bb2a..5281e777a50 100644 --- a/app/src/main/java/org/oppia/android/app/testing/ExplorationTestActivity.kt +++ b/app/src/main/java/org/oppia/android/app/testing/ExplorationTestActivity.kt @@ -1,10 +1,10 @@ -package org.oppia.app.testing +package org.oppia.android.app.testing import android.os.Bundle -import org.oppia.app.activity.InjectableAppCompatActivity -import org.oppia.app.home.RouteToExplorationListener -import org.oppia.app.player.exploration.ExplorationActivity -import org.oppia.app.topic.TopicFragment +import org.oppia.android.app.activity.InjectableAppCompatActivity +import org.oppia.android.app.home.RouteToExplorationListener +import org.oppia.android.app.player.exploration.ExplorationActivity +import org.oppia.android.app.topic.TopicFragment import javax.inject.Inject /** The activity for testing [TopicFragment]. */ diff --git a/app/src/main/java/org/oppia/android/app/testing/ExplorationTestActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/testing/ExplorationTestActivityPresenter.kt index 6f54fcfe908..d321d00f008 100644 --- a/app/src/main/java/org/oppia/android/app/testing/ExplorationTestActivityPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/testing/ExplorationTestActivityPresenter.kt @@ -1,17 +1,17 @@ -package org.oppia.app.testing +package org.oppia.android.app.testing import android.widget.Button import androidx.appcompat.app.AppCompatActivity import androidx.lifecycle.Observer -import org.oppia.app.R -import org.oppia.app.activity.ActivityScope -import org.oppia.app.home.RouteToExplorationListener -import org.oppia.domain.exploration.ExplorationDataController -import org.oppia.domain.topic.TEST_EXPLORATION_ID_2 -import org.oppia.domain.topic.TEST_STORY_ID_0 -import org.oppia.domain.topic.TEST_TOPIC_ID_0 -import org.oppia.util.data.AsyncResult -import org.oppia.util.logging.ConsoleLogger +import org.oppia.android.R +import org.oppia.android.app.activity.ActivityScope +import org.oppia.android.app.home.RouteToExplorationListener +import org.oppia.android.domain.exploration.ExplorationDataController +import org.oppia.android.domain.topic.TEST_EXPLORATION_ID_2 +import org.oppia.android.domain.topic.TEST_STORY_ID_0 +import org.oppia.android.domain.topic.TEST_TOPIC_ID_0 +import org.oppia.android.util.data.AsyncResult +import org.oppia.android.util.logging.ConsoleLogger import javax.inject.Inject private const val INTERNAL_PROFILE_ID = 0 diff --git a/app/src/main/java/org/oppia/android/app/testing/HomeInjectionActivity.kt b/app/src/main/java/org/oppia/android/app/testing/HomeInjectionActivity.kt index c1eb20be8d5..c8351a5e9ad 100644 --- a/app/src/main/java/org/oppia/android/app/testing/HomeInjectionActivity.kt +++ b/app/src/main/java/org/oppia/android/app/testing/HomeInjectionActivity.kt @@ -1,9 +1,9 @@ -package org.oppia.app.testing +package org.oppia.android.app.testing import android.os.Bundle -import org.oppia.app.activity.InjectableAppCompatActivity -import org.oppia.domain.profile.ProfileManagementController -import org.oppia.util.system.OppiaClock +import org.oppia.android.app.activity.InjectableAppCompatActivity +import org.oppia.android.domain.profile.ProfileManagementController +import org.oppia.android.util.system.OppiaClock import javax.inject.Inject /** Activity used in [HomeActivityTest] to get certain dependencies. */ diff --git a/app/src/main/java/org/oppia/android/app/testing/HomeTestActivity.kt b/app/src/main/java/org/oppia/android/app/testing/HomeTestActivity.kt index 4d6cc4ae323..8a3b4f0ef91 100644 --- a/app/src/main/java/org/oppia/android/app/testing/HomeTestActivity.kt +++ b/app/src/main/java/org/oppia/android/app/testing/HomeTestActivity.kt @@ -1,7 +1,7 @@ -package org.oppia.app.testing +package org.oppia.android.app.testing import android.os.Bundle -import org.oppia.app.activity.InjectableAppCompatActivity +import org.oppia.android.app.activity.InjectableAppCompatActivity import javax.inject.Inject /** The activity for testing [HomeFragment]. */ diff --git a/app/src/main/java/org/oppia/android/app/testing/HomeTestActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/testing/HomeTestActivityPresenter.kt index 9d4e2c1d954..85785322364 100644 --- a/app/src/main/java/org/oppia/android/app/testing/HomeTestActivityPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/testing/HomeTestActivityPresenter.kt @@ -1,8 +1,8 @@ -package org.oppia.app.testing +package org.oppia.android.app.testing import androidx.appcompat.app.AppCompatActivity -import org.oppia.app.R -import org.oppia.app.activity.ActivityScope +import org.oppia.android.R +import org.oppia.android.app.activity.ActivityScope import javax.inject.Inject /** The presenter for [HomeTestActivity]. */ diff --git a/app/src/main/java/org/oppia/android/app/testing/HtmlParserTestActivity.kt b/app/src/main/java/org/oppia/android/app/testing/HtmlParserTestActivity.kt index 6967e2ad708..d279de1a028 100644 --- a/app/src/main/java/org/oppia/android/app/testing/HtmlParserTestActivity.kt +++ b/app/src/main/java/org/oppia/android/app/testing/HtmlParserTestActivity.kt @@ -1,12 +1,12 @@ -package org.oppia.app.testing +package org.oppia.android.app.testing import android.os.Bundle import android.text.Spannable import android.widget.TextView -import org.oppia.app.R -import org.oppia.app.activity.InjectableAppCompatActivity -import org.oppia.util.gcsresource.DefaultResourceBucketName -import org.oppia.util.parser.HtmlParser +import org.oppia.android.R +import org.oppia.android.app.activity.InjectableAppCompatActivity +import org.oppia.android.util.gcsresource.DefaultResourceBucketName +import org.oppia.android.util.parser.HtmlParser import javax.inject.Inject /** This is a dummy activity to test Html parsing. */ diff --git a/app/src/main/java/org/oppia/android/app/testing/ImageRegionSelectionTestActivity.kt b/app/src/main/java/org/oppia/android/app/testing/ImageRegionSelectionTestActivity.kt index 8650f6c0426..dc5187eaf5e 100644 --- a/app/src/main/java/org/oppia/android/app/testing/ImageRegionSelectionTestActivity.kt +++ b/app/src/main/java/org/oppia/android/app/testing/ImageRegionSelectionTestActivity.kt @@ -1,9 +1,9 @@ -package org.oppia.app.testing +package org.oppia.android.app.testing import android.os.Bundle -import org.oppia.app.R -import org.oppia.app.activity.InjectableAppCompatActivity -import org.oppia.app.utility.ClickableAreasImage +import org.oppia.android.R +import org.oppia.android.app.activity.InjectableAppCompatActivity +import org.oppia.android.app.utility.ClickableAreasImage /** Test Activity used for testing [ClickableAreasImage] functionality */ class ImageRegionSelectionTestActivity : InjectableAppCompatActivity() { diff --git a/app/src/main/java/org/oppia/android/app/testing/ImageRegionSelectionTestFragment.kt b/app/src/main/java/org/oppia/android/app/testing/ImageRegionSelectionTestFragment.kt index fa35d0cc200..6238ea4c04d 100644 --- a/app/src/main/java/org/oppia/android/app/testing/ImageRegionSelectionTestFragment.kt +++ b/app/src/main/java/org/oppia/android/app/testing/ImageRegionSelectionTestFragment.kt @@ -1,12 +1,12 @@ -package org.oppia.app.testing +package org.oppia.android.app.testing import android.content.Context import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import org.oppia.app.fragment.InjectableFragment -import org.oppia.app.utility.ClickableAreasImage +import org.oppia.android.app.fragment.InjectableFragment +import org.oppia.android.app.utility.ClickableAreasImage import javax.inject.Inject const val IMAGE_REGION_SELECTION_TEST_FRAGMENT_TAG = "image_region_selection_test_fragment" diff --git a/app/src/main/java/org/oppia/android/app/testing/ImageRegionSelectionTestFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/testing/ImageRegionSelectionTestFragmentPresenter.kt index 73539d48701..abdcba85aef 100644 --- a/app/src/main/java/org/oppia/android/app/testing/ImageRegionSelectionTestFragmentPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/testing/ImageRegionSelectionTestFragmentPresenter.kt @@ -1,13 +1,13 @@ -package org.oppia.app.testing +package org.oppia.android.app.testing import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.appcompat.app.AppCompatActivity -import org.oppia.app.R -import org.oppia.app.model.ImageWithRegions.LabeledRegion -import org.oppia.app.model.Point2d -import org.oppia.app.player.state.ImageRegionSelectionInteractionView +import org.oppia.android.R +import org.oppia.android.app.model.ImageWithRegions.LabeledRegion +import org.oppia.android.app.model.Point2d +import org.oppia.android.app.player.state.ImageRegionSelectionInteractionView import javax.inject.Inject /** The presenter for [ImageRegionSelectionTestActivity] */ diff --git a/app/src/main/java/org/oppia/android/app/testing/InputInteractionViewTestActivity.kt b/app/src/main/java/org/oppia/android/app/testing/InputInteractionViewTestActivity.kt index 0492e65fcdb..4808730782a 100644 --- a/app/src/main/java/org/oppia/android/app/testing/InputInteractionViewTestActivity.kt +++ b/app/src/main/java/org/oppia/android/app/testing/InputInteractionViewTestActivity.kt @@ -1,23 +1,23 @@ -package org.oppia.app.testing +package org.oppia.android.app.testing import android.os.Bundle import android.view.View import androidx.appcompat.app.AppCompatActivity import androidx.databinding.DataBindingUtil -import org.oppia.app.R -import org.oppia.app.customview.interaction.FractionInputInteractionView -import org.oppia.app.customview.interaction.NumericInputInteractionView -import org.oppia.app.customview.interaction.TextInputInteractionView -import org.oppia.app.databinding.ActivityInputInteractionViewTestBinding -import org.oppia.app.model.Interaction -import org.oppia.app.model.SchemaObject -import org.oppia.app.player.state.answerhandling.AnswerErrorCategory -import org.oppia.app.player.state.answerhandling.InteractionAnswerErrorOrAvailabilityCheckReceiver -import org.oppia.app.player.state.itemviewmodel.FractionInteractionViewModel -import org.oppia.app.player.state.itemviewmodel.NumericInputViewModel -import org.oppia.app.player.state.itemviewmodel.RatioExpressionInputInteractionViewModel -import org.oppia.app.player.state.itemviewmodel.TextInputViewModel -import org.oppia.app.player.state.listener.StateKeyboardButtonListener +import org.oppia.android.R +import org.oppia.android.app.customview.interaction.FractionInputInteractionView +import org.oppia.android.app.customview.interaction.NumericInputInteractionView +import org.oppia.android.app.customview.interaction.TextInputInteractionView +import org.oppia.android.app.model.Interaction +import org.oppia.android.app.model.SchemaObject +import org.oppia.android.app.player.state.answerhandling.AnswerErrorCategory +import org.oppia.android.app.player.state.answerhandling.InteractionAnswerErrorOrAvailabilityCheckReceiver +import org.oppia.android.app.player.state.itemviewmodel.FractionInteractionViewModel +import org.oppia.android.app.player.state.itemviewmodel.NumericInputViewModel +import org.oppia.android.app.player.state.itemviewmodel.RatioExpressionInputInteractionViewModel +import org.oppia.android.app.player.state.itemviewmodel.TextInputViewModel +import org.oppia.android.app.player.state.listener.StateKeyboardButtonListener +import org.oppia.android.databinding.ActivityInputInteractionViewTestBinding /** * This is a dummy activity to test input interaction views. diff --git a/app/src/main/java/org/oppia/android/app/testing/NavigationDrawerTestActivity.kt b/app/src/main/java/org/oppia/android/app/testing/NavigationDrawerTestActivity.kt index 95b45f8e7ea..2149dba653e 100644 --- a/app/src/main/java/org/oppia/android/app/testing/NavigationDrawerTestActivity.kt +++ b/app/src/main/java/org/oppia/android/app/testing/NavigationDrawerTestActivity.kt @@ -1,14 +1,14 @@ -package org.oppia.app.testing +package org.oppia.android.app.testing import android.content.Context import android.content.Intent import android.os.Bundle -import org.oppia.app.R -import org.oppia.app.activity.InjectableAppCompatActivity -import org.oppia.app.drawer.KEY_NAVIGATION_PROFILE_ID -import org.oppia.app.home.HomeActivityPresenter -import org.oppia.app.home.RouteToTopicListener -import org.oppia.app.topic.TopicActivity +import org.oppia.android.R +import org.oppia.android.app.activity.InjectableAppCompatActivity +import org.oppia.android.app.drawer.KEY_NAVIGATION_PROFILE_ID +import org.oppia.android.app.home.HomeActivityPresenter +import org.oppia.android.app.home.RouteToTopicListener +import org.oppia.android.app.topic.TopicActivity import javax.inject.Inject class NavigationDrawerTestActivity : InjectableAppCompatActivity(), RouteToTopicListener { diff --git a/app/src/main/java/org/oppia/android/app/testing/ProfileChooserFragmentTestActivity.kt b/app/src/main/java/org/oppia/android/app/testing/ProfileChooserFragmentTestActivity.kt index 9547ec4c2b7..fe862bdd7b3 100644 --- a/app/src/main/java/org/oppia/android/app/testing/ProfileChooserFragmentTestActivity.kt +++ b/app/src/main/java/org/oppia/android/app/testing/ProfileChooserFragmentTestActivity.kt @@ -1,7 +1,7 @@ -package org.oppia.app.testing +package org.oppia.android.app.testing import android.os.Bundle -import org.oppia.app.activity.InjectableAppCompatActivity +import org.oppia.android.app.activity.InjectableAppCompatActivity import javax.inject.Inject /** Test Activity used for testing [ProfileChooserFragment] */ diff --git a/app/src/main/java/org/oppia/android/app/testing/ProfileChooserFragmentTestActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/testing/ProfileChooserFragmentTestActivityPresenter.kt index a9a8c665ed9..74166de0e1c 100644 --- a/app/src/main/java/org/oppia/android/app/testing/ProfileChooserFragmentTestActivityPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/testing/ProfileChooserFragmentTestActivityPresenter.kt @@ -1,10 +1,10 @@ -package org.oppia.app.testing +package org.oppia.android.app.testing import androidx.appcompat.app.AppCompatActivity -import org.oppia.app.R -import org.oppia.app.activity.ActivityScope -import org.oppia.app.profile.ProfileChooserFragment -import org.oppia.domain.profile.ProfileManagementController +import org.oppia.android.R +import org.oppia.android.app.activity.ActivityScope +import org.oppia.android.app.profile.ProfileChooserFragment +import org.oppia.android.domain.profile.ProfileManagementController import javax.inject.Inject /** The presenter for [ProfileChooserFragmentTestActivity]. */ diff --git a/app/src/main/java/org/oppia/app/testing/StoryFragmentTestActivity.kt b/app/src/main/java/org/oppia/android/app/testing/StoryFragmentTestActivity.kt similarity index 90% rename from app/src/main/java/org/oppia/app/testing/StoryFragmentTestActivity.kt rename to app/src/main/java/org/oppia/android/app/testing/StoryFragmentTestActivity.kt index e9af5c68e03..08ecef0db8b 100644 --- a/app/src/main/java/org/oppia/app/testing/StoryFragmentTestActivity.kt +++ b/app/src/main/java/org/oppia/android/app/testing/StoryFragmentTestActivity.kt @@ -1,10 +1,10 @@ -package org.oppia.app.testing +package org.oppia.android.app.testing import android.content.Context import android.content.Intent import android.os.Bundle -import org.oppia.app.activity.InjectableAppCompatActivity -import org.oppia.app.home.RouteToExplorationListener +import org.oppia.android.app.activity.InjectableAppCompatActivity +import org.oppia.android.app.home.RouteToExplorationListener import javax.inject.Inject const val INTERNAL_PROFILE_ID_TEST_INTENT_EXTRA = "StoryFragmentTestActivity.internalProfileId" diff --git a/app/src/main/java/org/oppia/app/testing/StoryFragmentTestActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/testing/StoryFragmentTestActivityPresenter.kt similarity index 88% rename from app/src/main/java/org/oppia/app/testing/StoryFragmentTestActivityPresenter.kt rename to app/src/main/java/org/oppia/android/app/testing/StoryFragmentTestActivityPresenter.kt index 4fd2083b0eb..3d6169c2031 100644 --- a/app/src/main/java/org/oppia/app/testing/StoryFragmentTestActivityPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/testing/StoryFragmentTestActivityPresenter.kt @@ -1,9 +1,9 @@ -package org.oppia.app.testing +package org.oppia.android.app.testing import androidx.appcompat.app.AppCompatActivity -import org.oppia.app.R -import org.oppia.app.activity.ActivityScope -import org.oppia.app.story.StoryFragment +import org.oppia.android.R +import org.oppia.android.app.activity.ActivityScope +import org.oppia.android.app.story.StoryFragment import javax.inject.Inject /** The presenter for [StoryFragmentTestActivity]. */ diff --git a/app/src/main/java/org/oppia/android/app/testing/TestFontScaleConfigurationUtilActivity.kt b/app/src/main/java/org/oppia/android/app/testing/TestFontScaleConfigurationUtilActivity.kt index 04a8c8fe35b..f2eec3c1069 100644 --- a/app/src/main/java/org/oppia/android/app/testing/TestFontScaleConfigurationUtilActivity.kt +++ b/app/src/main/java/org/oppia/android/app/testing/TestFontScaleConfigurationUtilActivity.kt @@ -1,9 +1,9 @@ -package org.oppia.app.testing +package org.oppia.android.app.testing import android.content.Context import android.content.Intent import android.os.Bundle -import org.oppia.app.activity.InjectableAppCompatActivity +import org.oppia.android.app.activity.InjectableAppCompatActivity import javax.inject.Inject /** Test activity used for testing font scale. */ diff --git a/app/src/main/java/org/oppia/android/app/testing/TestFontScaleConfigurationUtilActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/testing/TestFontScaleConfigurationUtilActivityPresenter.kt index 3ce6879aa31..c46630eb39e 100644 --- a/app/src/main/java/org/oppia/android/app/testing/TestFontScaleConfigurationUtilActivityPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/testing/TestFontScaleConfigurationUtilActivityPresenter.kt @@ -1,9 +1,9 @@ -package org.oppia.app.testing +package org.oppia.android.app.testing import androidx.appcompat.app.AppCompatActivity -import org.oppia.app.R -import org.oppia.app.activity.ActivityScope -import org.oppia.app.utility.FontScaleConfigurationUtil +import org.oppia.android.R +import org.oppia.android.app.activity.ActivityScope +import org.oppia.android.app.utility.FontScaleConfigurationUtil import javax.inject.Inject /** The presenter for [TestFontScaleConfigurationUtilActivity] */ diff --git a/app/src/main/java/org/oppia/android/app/testing/TopicRevisionTestActivity.kt b/app/src/main/java/org/oppia/android/app/testing/TopicRevisionTestActivity.kt index d21007862b1..086fd77eb29 100644 --- a/app/src/main/java/org/oppia/android/app/testing/TopicRevisionTestActivity.kt +++ b/app/src/main/java/org/oppia/android/app/testing/TopicRevisionTestActivity.kt @@ -1,10 +1,10 @@ -package org.oppia.app.testing +package org.oppia.android.app.testing import android.os.Bundle -import org.oppia.app.activity.InjectableAppCompatActivity -import org.oppia.app.topic.RouteToRevisionCardListener -import org.oppia.app.topic.revision.TopicRevisionFragment -import org.oppia.app.topic.revisioncard.RevisionCardActivity +import org.oppia.android.app.activity.InjectableAppCompatActivity +import org.oppia.android.app.topic.RouteToRevisionCardListener +import org.oppia.android.app.topic.revision.TopicRevisionFragment +import org.oppia.android.app.topic.revisioncard.RevisionCardActivity import javax.inject.Inject /** Test Activity used for testing [TopicRevisionFragment] */ diff --git a/app/src/main/java/org/oppia/android/app/testing/TopicRevisionTestActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/testing/TopicRevisionTestActivityPresenter.kt index d00901df7a2..20910ef0c83 100644 --- a/app/src/main/java/org/oppia/android/app/testing/TopicRevisionTestActivityPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/testing/TopicRevisionTestActivityPresenter.kt @@ -1,9 +1,9 @@ -package org.oppia.app.testing +package org.oppia.android.app.testing import androidx.appcompat.app.AppCompatActivity -import org.oppia.app.R -import org.oppia.app.activity.ActivityScope -import org.oppia.app.topic.revision.TopicRevisionFragment +import org.oppia.android.R +import org.oppia.android.app.activity.ActivityScope +import org.oppia.android.app.topic.revision.TopicRevisionFragment import javax.inject.Inject /** The presenter for [TopicRevisionTestActivity]. */ diff --git a/app/src/main/java/org/oppia/android/app/testing/TopicTestActivity.kt b/app/src/main/java/org/oppia/android/app/testing/TopicTestActivity.kt index c6e8ed71958..3111170ebde 100644 --- a/app/src/main/java/org/oppia/android/app/testing/TopicTestActivity.kt +++ b/app/src/main/java/org/oppia/android/app/testing/TopicTestActivity.kt @@ -1,18 +1,18 @@ -package org.oppia.app.testing +package org.oppia.android.app.testing import android.os.Bundle -import org.oppia.app.activity.InjectableAppCompatActivity -import org.oppia.app.home.RouteToExplorationListener -import org.oppia.app.player.exploration.ExplorationActivity -import org.oppia.app.story.StoryActivity -import org.oppia.app.topic.RouteToQuestionPlayerListener -import org.oppia.app.topic.RouteToRevisionCardListener -import org.oppia.app.topic.RouteToStoryListener -import org.oppia.app.topic.TopicActivityPresenter -import org.oppia.app.topic.TopicFragment -import org.oppia.app.topic.questionplayer.QuestionPlayerActivity -import org.oppia.app.topic.revisioncard.RevisionCardActivity -import org.oppia.domain.topic.TEST_TOPIC_ID_0 +import org.oppia.android.app.activity.InjectableAppCompatActivity +import org.oppia.android.app.home.RouteToExplorationListener +import org.oppia.android.app.player.exploration.ExplorationActivity +import org.oppia.android.app.story.StoryActivity +import org.oppia.android.app.topic.RouteToQuestionPlayerListener +import org.oppia.android.app.topic.RouteToRevisionCardListener +import org.oppia.android.app.topic.RouteToStoryListener +import org.oppia.android.app.topic.TopicActivityPresenter +import org.oppia.android.app.topic.TopicFragment +import org.oppia.android.app.topic.questionplayer.QuestionPlayerActivity +import org.oppia.android.app.topic.revisioncard.RevisionCardActivity +import org.oppia.android.domain.topic.TEST_TOPIC_ID_0 import javax.inject.Inject /** The activity for testing [TopicFragment]. */ diff --git a/app/src/main/java/org/oppia/android/app/testing/TopicTestActivityForStory.kt b/app/src/main/java/org/oppia/android/app/testing/TopicTestActivityForStory.kt index 5da93e32a2b..ad9879f1943 100644 --- a/app/src/main/java/org/oppia/android/app/testing/TopicTestActivityForStory.kt +++ b/app/src/main/java/org/oppia/android/app/testing/TopicTestActivityForStory.kt @@ -1,19 +1,19 @@ -package org.oppia.app.testing +package org.oppia.android.app.testing import android.os.Bundle -import org.oppia.app.activity.InjectableAppCompatActivity -import org.oppia.app.home.RouteToExplorationListener -import org.oppia.app.player.exploration.ExplorationActivity -import org.oppia.app.story.StoryActivity -import org.oppia.app.topic.RouteToQuestionPlayerListener -import org.oppia.app.topic.RouteToRevisionCardListener -import org.oppia.app.topic.RouteToStoryListener -import org.oppia.app.topic.TopicActivityPresenter -import org.oppia.app.topic.TopicFragment -import org.oppia.app.topic.questionplayer.QuestionPlayerActivity -import org.oppia.app.topic.revisioncard.RevisionCardActivity -import org.oppia.domain.topic.TEST_STORY_ID_1 -import org.oppia.domain.topic.TEST_TOPIC_ID_0 +import org.oppia.android.app.activity.InjectableAppCompatActivity +import org.oppia.android.app.home.RouteToExplorationListener +import org.oppia.android.app.player.exploration.ExplorationActivity +import org.oppia.android.app.story.StoryActivity +import org.oppia.android.app.topic.RouteToQuestionPlayerListener +import org.oppia.android.app.topic.RouteToRevisionCardListener +import org.oppia.android.app.topic.RouteToStoryListener +import org.oppia.android.app.topic.TopicActivityPresenter +import org.oppia.android.app.topic.TopicFragment +import org.oppia.android.app.topic.questionplayer.QuestionPlayerActivity +import org.oppia.android.app.topic.revisioncard.RevisionCardActivity +import org.oppia.android.domain.topic.TEST_STORY_ID_1 +import org.oppia.android.domain.topic.TEST_TOPIC_ID_0 import javax.inject.Inject /** The test activity for [TopicFragment] to test displaying story by storyId. */ diff --git a/app/src/main/java/org/oppia/android/app/topic/RouteToConceptCardListener.kt b/app/src/main/java/org/oppia/android/app/topic/RouteToConceptCardListener.kt index c29292110d7..0e80f7b58ed 100755 --- a/app/src/main/java/org/oppia/android/app/topic/RouteToConceptCardListener.kt +++ b/app/src/main/java/org/oppia/android/app/topic/RouteToConceptCardListener.kt @@ -1,4 +1,4 @@ -package org.oppia.app.topic +package org.oppia.android.app.topic /** Listener for when an [TopicActivity] should route to a [ConceptCardFragment]. */ interface RouteToConceptCardListener { diff --git a/app/src/main/java/org/oppia/android/app/topic/RouteToQuestionPlayerListener.kt b/app/src/main/java/org/oppia/android/app/topic/RouteToQuestionPlayerListener.kt index 56297cc1405..fd1b2a2e0db 100755 --- a/app/src/main/java/org/oppia/android/app/topic/RouteToQuestionPlayerListener.kt +++ b/app/src/main/java/org/oppia/android/app/topic/RouteToQuestionPlayerListener.kt @@ -1,4 +1,4 @@ -package org.oppia.app.topic +package org.oppia.android.app.topic /** Listener for when an activity should route to a Question Player. */ interface RouteToQuestionPlayerListener { diff --git a/app/src/main/java/org/oppia/android/app/topic/RouteToRevisionCardListener.kt b/app/src/main/java/org/oppia/android/app/topic/RouteToRevisionCardListener.kt index 716724dcff5..58ed7a5a47e 100755 --- a/app/src/main/java/org/oppia/android/app/topic/RouteToRevisionCardListener.kt +++ b/app/src/main/java/org/oppia/android/app/topic/RouteToRevisionCardListener.kt @@ -1,4 +1,4 @@ -package org.oppia.app.topic +package org.oppia.android.app.topic /** Listener for when an [TopicActivity] should route to a [RevisionCardFragment]. */ interface RouteToRevisionCardListener { diff --git a/app/src/main/java/org/oppia/android/app/topic/RouteToStoryListener.kt b/app/src/main/java/org/oppia/android/app/topic/RouteToStoryListener.kt index 4040acab478..5cee9714126 100755 --- a/app/src/main/java/org/oppia/android/app/topic/RouteToStoryListener.kt +++ b/app/src/main/java/org/oppia/android/app/topic/RouteToStoryListener.kt @@ -1,4 +1,4 @@ -package org.oppia.app.topic +package org.oppia.android.app.topic /** Listener for when an [TopicActivity] should route to a [StoryActivity]. */ interface RouteToStoryListener { diff --git a/app/src/main/java/org/oppia/android/app/topic/TopicActivity.kt b/app/src/main/java/org/oppia/android/app/topic/TopicActivity.kt index 11e972f4625..a158d2fa7e3 100755 --- a/app/src/main/java/org/oppia/android/app/topic/TopicActivity.kt +++ b/app/src/main/java/org/oppia/android/app/topic/TopicActivity.kt @@ -1,15 +1,15 @@ -package org.oppia.app.topic +package org.oppia.android.app.topic import android.content.Context import android.content.Intent import android.os.Bundle -import org.oppia.app.activity.InjectableAppCompatActivity -import org.oppia.app.drawer.KEY_NAVIGATION_PROFILE_ID -import org.oppia.app.home.RouteToExplorationListener -import org.oppia.app.player.exploration.ExplorationActivity -import org.oppia.app.story.StoryActivity -import org.oppia.app.topic.questionplayer.QuestionPlayerActivity -import org.oppia.app.topic.revisioncard.RevisionCardActivity +import org.oppia.android.app.activity.InjectableAppCompatActivity +import org.oppia.android.app.drawer.KEY_NAVIGATION_PROFILE_ID +import org.oppia.android.app.home.RouteToExplorationListener +import org.oppia.android.app.player.exploration.ExplorationActivity +import org.oppia.android.app.story.StoryActivity +import org.oppia.android.app.topic.questionplayer.QuestionPlayerActivity +import org.oppia.android.app.topic.revisioncard.RevisionCardActivity import javax.inject.Inject private const val TOPIC_ACTIVITY_TOPIC_ID_ARGUMENT_KEY = "TopicActivity.topic_id" diff --git a/app/src/main/java/org/oppia/android/app/topic/TopicActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/topic/TopicActivityPresenter.kt index c2dc29fdea0..ea4a760a690 100755 --- a/app/src/main/java/org/oppia/android/app/topic/TopicActivityPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/topic/TopicActivityPresenter.kt @@ -1,10 +1,10 @@ -package org.oppia.app.topic +package org.oppia.android.app.topic import android.os.Bundle import androidx.appcompat.app.AppCompatActivity -import org.oppia.app.R -import org.oppia.app.activity.ActivityScope -import org.oppia.app.model.ProfileId +import org.oppia.android.R +import org.oppia.android.app.activity.ActivityScope +import org.oppia.android.app.model.ProfileId import javax.inject.Inject const val TOPIC_FRAGMENT_TAG = "TopicFragment" diff --git a/app/src/main/java/org/oppia/android/app/topic/TopicFragment.kt b/app/src/main/java/org/oppia/android/app/topic/TopicFragment.kt index 9a0aa52c94c..12b8d895582 100644 --- a/app/src/main/java/org/oppia/android/app/topic/TopicFragment.kt +++ b/app/src/main/java/org/oppia/android/app/topic/TopicFragment.kt @@ -1,12 +1,12 @@ -package org.oppia.app.topic +package org.oppia.android.app.topic import android.content.Context import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import org.oppia.app.fragment.InjectableFragment -import org.oppia.domain.topic.TEST_TOPIC_ID_0 +import org.oppia.android.app.fragment.InjectableFragment +import org.oppia.android.domain.topic.TEST_TOPIC_ID_0 import javax.inject.Inject /** Fragment that contains tabs for Topic. */ diff --git a/app/src/main/java/org/oppia/android/app/topic/TopicFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/topic/TopicFragmentPresenter.kt index 68da38f8413..393c64e39a8 100644 --- a/app/src/main/java/org/oppia/android/app/topic/TopicFragmentPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/topic/TopicFragmentPresenter.kt @@ -1,4 +1,4 @@ -package org.oppia.app.topic +package org.oppia.android.app.topic import android.view.LayoutInflater import android.view.View @@ -7,13 +7,13 @@ import androidx.appcompat.app.AppCompatActivity import androidx.fragment.app.Fragment import androidx.viewpager.widget.ViewPager import com.google.android.material.tabs.TabLayout -import org.oppia.app.R -import org.oppia.app.databinding.TopicFragmentBinding -import org.oppia.app.fragment.FragmentScope -import org.oppia.app.model.EventLog -import org.oppia.app.viewmodel.ViewModelProvider -import org.oppia.domain.oppialogger.OppiaLogger -import org.oppia.util.system.OppiaClock +import org.oppia.android.R +import org.oppia.android.app.fragment.FragmentScope +import org.oppia.android.app.model.EventLog +import org.oppia.android.app.viewmodel.ViewModelProvider +import org.oppia.android.databinding.TopicFragmentBinding +import org.oppia.android.domain.oppialogger.OppiaLogger +import org.oppia.android.util.system.OppiaClock import javax.inject.Inject /** The presenter for [TopicFragment]. */ diff --git a/app/src/main/java/org/oppia/android/app/topic/TopicTab.kt b/app/src/main/java/org/oppia/android/app/topic/TopicTab.kt index fdba5ae7075..baaea0a2a04 100644 --- a/app/src/main/java/org/oppia/android/app/topic/TopicTab.kt +++ b/app/src/main/java/org/oppia/android/app/topic/TopicTab.kt @@ -1,4 +1,4 @@ -package org.oppia.app.topic +package org.oppia.android.app.topic /** Enum to store the tabs of [TopicFragment] and get tab by position. */ enum class TopicTab(private var position: Int) { diff --git a/app/src/main/java/org/oppia/android/app/topic/TopicViewModel.kt b/app/src/main/java/org/oppia/android/app/topic/TopicViewModel.kt index b7264cfe676..8b975d1c684 100644 --- a/app/src/main/java/org/oppia/android/app/topic/TopicViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/topic/TopicViewModel.kt @@ -1,14 +1,14 @@ -package org.oppia.app.topic +package org.oppia.android.app.topic import androidx.lifecycle.LiveData import androidx.lifecycle.Transformations -import org.oppia.app.fragment.FragmentScope -import org.oppia.app.model.ProfileId -import org.oppia.app.model.Topic -import org.oppia.app.viewmodel.ObservableViewModel -import org.oppia.domain.topic.TopicController -import org.oppia.util.data.AsyncResult -import org.oppia.util.logging.ConsoleLogger +import org.oppia.android.app.fragment.FragmentScope +import org.oppia.android.app.model.ProfileId +import org.oppia.android.app.model.Topic +import org.oppia.android.app.viewmodel.ObservableViewModel +import org.oppia.android.domain.topic.TopicController +import org.oppia.android.util.data.AsyncResult +import org.oppia.android.util.logging.ConsoleLogger import javax.inject.Inject /** The ObservableViewModel for [TopicFragment]. */ diff --git a/app/src/main/java/org/oppia/android/app/topic/ViewPagerAdapter.kt b/app/src/main/java/org/oppia/android/app/topic/ViewPagerAdapter.kt index 59ac6002128..5a781d33412 100644 --- a/app/src/main/java/org/oppia/android/app/topic/ViewPagerAdapter.kt +++ b/app/src/main/java/org/oppia/android/app/topic/ViewPagerAdapter.kt @@ -1,12 +1,12 @@ -package org.oppia.app.topic +package org.oppia.android.app.topic import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentStatePagerAdapter -import org.oppia.app.topic.info.TopicInfoFragment -import org.oppia.app.topic.lessons.TopicLessonsFragment -import org.oppia.app.topic.practice.TopicPracticeFragment -import org.oppia.app.topic.revision.TopicRevisionFragment +import org.oppia.android.app.topic.info.TopicInfoFragment +import org.oppia.android.app.topic.lessons.TopicLessonsFragment +import org.oppia.android.app.topic.practice.TopicPracticeFragment +import org.oppia.android.app.topic.revision.TopicRevisionFragment /** Adapter to bind fragments to [FragmentStatePagerAdapter] inside [TopicFragment]. */ class ViewPagerAdapter( diff --git a/app/src/main/java/org/oppia/android/app/topic/conceptcard/ConceptCardFragment.kt b/app/src/main/java/org/oppia/android/app/topic/conceptcard/ConceptCardFragment.kt index 0158bd99bb6..3c30964d09a 100644 --- a/app/src/main/java/org/oppia/android/app/topic/conceptcard/ConceptCardFragment.kt +++ b/app/src/main/java/org/oppia/android/app/topic/conceptcard/ConceptCardFragment.kt @@ -1,12 +1,12 @@ -package org.oppia.app.topic.conceptcard +package org.oppia.android.app.topic.conceptcard import android.content.Context import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import org.oppia.app.R -import org.oppia.app.fragment.InjectableDialogFragment +import org.oppia.android.R +import org.oppia.android.app.fragment.InjectableDialogFragment import javax.inject.Inject private const val KEY_SKILL_ID = "SKILL_ID" diff --git a/app/src/main/java/org/oppia/android/app/topic/conceptcard/ConceptCardFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/topic/conceptcard/ConceptCardFragmentPresenter.kt index 85fd2db10fa..55defd25a7c 100644 --- a/app/src/main/java/org/oppia/android/app/topic/conceptcard/ConceptCardFragmentPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/topic/conceptcard/ConceptCardFragmentPresenter.kt @@ -1,16 +1,16 @@ -package org.oppia.app.topic.conceptcard +package org.oppia.android.app.topic.conceptcard import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.fragment.app.Fragment -import org.oppia.app.R -import org.oppia.app.databinding.ConceptCardFragmentBinding -import org.oppia.app.fragment.FragmentScope -import org.oppia.app.model.EventLog -import org.oppia.app.viewmodel.ViewModelProvider -import org.oppia.domain.oppialogger.OppiaLogger -import org.oppia.util.system.OppiaClock +import org.oppia.android.R +import org.oppia.android.app.fragment.FragmentScope +import org.oppia.android.app.model.EventLog +import org.oppia.android.app.viewmodel.ViewModelProvider +import org.oppia.android.databinding.ConceptCardFragmentBinding +import org.oppia.android.domain.oppialogger.OppiaLogger +import org.oppia.android.util.system.OppiaClock import javax.inject.Inject /** Presenter for [ConceptCardFragment], sets up bindings from ViewModel */ diff --git a/app/src/main/java/org/oppia/android/app/topic/conceptcard/ConceptCardListener.kt b/app/src/main/java/org/oppia/android/app/topic/conceptcard/ConceptCardListener.kt index d1aa2d64f89..ca3302ee3b4 100644 --- a/app/src/main/java/org/oppia/android/app/topic/conceptcard/ConceptCardListener.kt +++ b/app/src/main/java/org/oppia/android/app/topic/conceptcard/ConceptCardListener.kt @@ -1,4 +1,4 @@ -package org.oppia.app.topic.conceptcard +package org.oppia.android.app.topic.conceptcard /** Allows parent activity to dismiss the [ConceptCardFragment] */ interface ConceptCardListener { diff --git a/app/src/main/java/org/oppia/android/app/topic/conceptcard/ConceptCardViewModel.kt b/app/src/main/java/org/oppia/android/app/topic/conceptcard/ConceptCardViewModel.kt index eca3baf7367..146a47439de 100644 --- a/app/src/main/java/org/oppia/android/app/topic/conceptcard/ConceptCardViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/topic/conceptcard/ConceptCardViewModel.kt @@ -1,17 +1,17 @@ -package org.oppia.app.topic.conceptcard +package org.oppia.android.app.topic.conceptcard import android.widget.TextView import androidx.lifecycle.LiveData import androidx.lifecycle.Transformations -import org.oppia.app.fragment.FragmentScope -import org.oppia.app.model.ConceptCard -import org.oppia.app.viewmodel.ObservableViewModel -import org.oppia.domain.topic.TopicController -import org.oppia.util.data.AsyncResult -import org.oppia.util.gcsresource.DefaultResourceBucketName -import org.oppia.util.logging.ConsoleLogger -import org.oppia.util.parser.ConceptCardHtmlParserEntityType -import org.oppia.util.parser.HtmlParser +import org.oppia.android.app.fragment.FragmentScope +import org.oppia.android.app.model.ConceptCard +import org.oppia.android.app.viewmodel.ObservableViewModel +import org.oppia.android.domain.topic.TopicController +import org.oppia.android.util.data.AsyncResult +import org.oppia.android.util.gcsresource.DefaultResourceBucketName +import org.oppia.android.util.logging.ConsoleLogger +import org.oppia.android.util.parser.ConceptCardHtmlParserEntityType +import org.oppia.android.util.parser.HtmlParser import javax.inject.Inject // TODO(#1633): Fix ViewModel to not depend on View diff --git a/app/src/main/java/org/oppia/android/app/topic/info/TopicInfoFragment.kt b/app/src/main/java/org/oppia/android/app/topic/info/TopicInfoFragment.kt index 370b9a0d2a3..4307b3aa9fb 100644 --- a/app/src/main/java/org/oppia/android/app/topic/info/TopicInfoFragment.kt +++ b/app/src/main/java/org/oppia/android/app/topic/info/TopicInfoFragment.kt @@ -1,13 +1,13 @@ -package org.oppia.app.topic.info +package org.oppia.android.app.topic.info import android.content.Context import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import org.oppia.app.fragment.InjectableFragment -import org.oppia.app.topic.PROFILE_ID_ARGUMENT_KEY -import org.oppia.app.topic.TOPIC_ID_ARGUMENT_KEY +import org.oppia.android.app.fragment.InjectableFragment +import org.oppia.android.app.topic.PROFILE_ID_ARGUMENT_KEY +import org.oppia.android.app.topic.TOPIC_ID_ARGUMENT_KEY import javax.inject.Inject /** Fragment that contains info of Topic. */ diff --git a/app/src/main/java/org/oppia/android/app/topic/info/TopicInfoFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/topic/info/TopicInfoFragmentPresenter.kt index c0df2786af4..427b67657ca 100644 --- a/app/src/main/java/org/oppia/android/app/topic/info/TopicInfoFragmentPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/topic/info/TopicInfoFragmentPresenter.kt @@ -1,4 +1,4 @@ -package org.oppia.app.topic.info +package org.oppia.android.app.topic.info import android.view.LayoutInflater import android.view.View @@ -7,17 +7,17 @@ import androidx.fragment.app.Fragment import androidx.lifecycle.LiveData import androidx.lifecycle.Observer import androidx.lifecycle.Transformations -import org.oppia.app.R -import org.oppia.app.databinding.TopicInfoFragmentBinding -import org.oppia.app.fragment.FragmentScope -import org.oppia.app.model.ProfileId -import org.oppia.app.model.Topic -import org.oppia.app.viewmodel.ViewModelProvider -import org.oppia.domain.topic.TopicController -import org.oppia.util.data.AsyncResult -import org.oppia.util.gcsresource.DefaultResourceBucketName -import org.oppia.util.logging.ConsoleLogger -import org.oppia.util.parser.HtmlParser +import org.oppia.android.R +import org.oppia.android.app.fragment.FragmentScope +import org.oppia.android.app.model.ProfileId +import org.oppia.android.app.model.Topic +import org.oppia.android.app.viewmodel.ViewModelProvider +import org.oppia.android.databinding.TopicInfoFragmentBinding +import org.oppia.android.domain.topic.TopicController +import org.oppia.android.util.data.AsyncResult +import org.oppia.android.util.gcsresource.DefaultResourceBucketName +import org.oppia.android.util.logging.ConsoleLogger +import org.oppia.android.util.parser.HtmlParser import javax.inject.Inject /** The presenter for [TopicInfoFragment]. */ diff --git a/app/src/main/java/org/oppia/android/app/topic/info/TopicInfoViewModel.kt b/app/src/main/java/org/oppia/android/app/topic/info/TopicInfoViewModel.kt index e26ffc56fd8..4d96f75967f 100644 --- a/app/src/main/java/org/oppia/android/app/topic/info/TopicInfoViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/topic/info/TopicInfoViewModel.kt @@ -1,13 +1,13 @@ -package org.oppia.app.topic.info +package org.oppia.android.app.topic.info import android.content.Context import androidx.databinding.ObservableField import androidx.lifecycle.ViewModel -import org.oppia.app.R -import org.oppia.app.fragment.FragmentScope -import org.oppia.app.model.Topic -import org.oppia.app.viewmodel.ObservableViewModel -import org.oppia.util.parser.TopicHtmlParserEntityType +import org.oppia.android.R +import org.oppia.android.app.fragment.FragmentScope +import org.oppia.android.app.model.Topic +import org.oppia.android.app.viewmodel.ObservableViewModel +import org.oppia.android.util.parser.TopicHtmlParserEntityType import javax.inject.Inject /** [ViewModel] for showing topic info details. */ diff --git a/app/src/main/java/org/oppia/android/app/topic/lessons/ChapterSummaryAdapter.kt b/app/src/main/java/org/oppia/android/app/topic/lessons/ChapterSummaryAdapter.kt index 62bade6107b..4ee0ede607d 100644 --- a/app/src/main/java/org/oppia/android/app/topic/lessons/ChapterSummaryAdapter.kt +++ b/app/src/main/java/org/oppia/android/app/topic/lessons/ChapterSummaryAdapter.kt @@ -1,12 +1,12 @@ -package org.oppia.app.topic.lessons +package org.oppia.android.app.topic.lessons import android.view.LayoutInflater import android.view.ViewGroup import androidx.databinding.DataBindingUtil import androidx.recyclerview.widget.RecyclerView -import org.oppia.app.R -import org.oppia.app.databinding.LessonsChapterViewBinding -import org.oppia.app.model.ChapterSummary +import org.oppia.android.R +import org.oppia.android.app.model.ChapterSummary +import org.oppia.android.databinding.LessonsChapterViewBinding // TODO(#216): Make use of generic data-binding-enabled RecyclerView adapter. diff --git a/app/src/main/java/org/oppia/android/app/topic/lessons/ChapterSummarySelector.kt b/app/src/main/java/org/oppia/android/app/topic/lessons/ChapterSummarySelector.kt index b99773b1df8..1e62702d949 100644 --- a/app/src/main/java/org/oppia/android/app/topic/lessons/ChapterSummarySelector.kt +++ b/app/src/main/java/org/oppia/android/app/topic/lessons/ChapterSummarySelector.kt @@ -1,6 +1,6 @@ -package org.oppia.app.topic.lessons +package org.oppia.android.app.topic.lessons -import org.oppia.app.model.ChapterSummary +import org.oppia.android.app.model.ChapterSummary /** Interface to transfer the selected chapter summary to [TopicLessonsFragmentPresenter]. */ interface ChapterSummarySelector { diff --git a/app/src/main/java/org/oppia/android/app/topic/lessons/ExpandedChapterListIndexListener.kt b/app/src/main/java/org/oppia/android/app/topic/lessons/ExpandedChapterListIndexListener.kt index 8bcaad2eceb..d41fe06a580 100644 --- a/app/src/main/java/org/oppia/android/app/topic/lessons/ExpandedChapterListIndexListener.kt +++ b/app/src/main/java/org/oppia/android/app/topic/lessons/ExpandedChapterListIndexListener.kt @@ -1,4 +1,4 @@ -package org.oppia.app.topic.lessons +package org.oppia.android.app.topic.lessons /** * Interface to keep track of story-index for which ChapterList is visible/expanded. diff --git a/app/src/main/java/org/oppia/android/app/topic/lessons/StorySummaryAdapter.kt b/app/src/main/java/org/oppia/android/app/topic/lessons/StorySummaryAdapter.kt index fb7812d1670..3f79637e5bd 100644 --- a/app/src/main/java/org/oppia/android/app/topic/lessons/StorySummaryAdapter.kt +++ b/app/src/main/java/org/oppia/android/app/topic/lessons/StorySummaryAdapter.kt @@ -1,13 +1,13 @@ -package org.oppia.app.topic.lessons +package org.oppia.android.app.topic.lessons import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView -import org.oppia.app.databinding.TopicLessonsStorySummaryBinding -import org.oppia.app.databinding.TopicLessonsTitleBinding -import org.oppia.app.model.ChapterPlayState -import org.oppia.app.model.ChapterSummary +import org.oppia.android.app.model.ChapterPlayState +import org.oppia.android.app.model.ChapterSummary +import org.oppia.android.databinding.TopicLessonsStorySummaryBinding +import org.oppia.android.databinding.TopicLessonsTitleBinding // TODO(#216): Make use of generic data-binding-enabled RecyclerView adapter. diff --git a/app/src/main/java/org/oppia/android/app/topic/lessons/StorySummarySelector.kt b/app/src/main/java/org/oppia/android/app/topic/lessons/StorySummarySelector.kt index 1bf4b01b7e7..8b62f447f4e 100644 --- a/app/src/main/java/org/oppia/android/app/topic/lessons/StorySummarySelector.kt +++ b/app/src/main/java/org/oppia/android/app/topic/lessons/StorySummarySelector.kt @@ -1,6 +1,6 @@ -package org.oppia.app.topic.lessons +package org.oppia.android.app.topic.lessons -import org.oppia.app.model.StorySummary +import org.oppia.android.app.model.StorySummary /** Interface to transfer the selected story summary to [TopicLessonsFragmentPresenter]. */ interface StorySummarySelector { diff --git a/app/src/main/java/org/oppia/android/app/topic/lessons/StorySummaryViewModel.kt b/app/src/main/java/org/oppia/android/app/topic/lessons/StorySummaryViewModel.kt index eab112dc788..beb048cb024 100644 --- a/app/src/main/java/org/oppia/android/app/topic/lessons/StorySummaryViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/topic/lessons/StorySummaryViewModel.kt @@ -1,7 +1,7 @@ -package org.oppia.app.topic.lessons +package org.oppia.android.app.topic.lessons import androidx.lifecycle.ViewModel -import org.oppia.app.model.StorySummary +import org.oppia.android.app.model.StorySummary /** [ViewModel] for displaying a story summary. */ class StorySummaryViewModel( diff --git a/app/src/main/java/org/oppia/android/app/topic/lessons/TopicLessonsFragment.kt b/app/src/main/java/org/oppia/android/app/topic/lessons/TopicLessonsFragment.kt index f0e718b9afb..7069fbd96ce 100644 --- a/app/src/main/java/org/oppia/android/app/topic/lessons/TopicLessonsFragment.kt +++ b/app/src/main/java/org/oppia/android/app/topic/lessons/TopicLessonsFragment.kt @@ -1,15 +1,15 @@ -package org.oppia.app.topic.lessons +package org.oppia.android.app.topic.lessons import android.content.Context import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import org.oppia.app.fragment.InjectableFragment -import org.oppia.app.model.StorySummary -import org.oppia.app.topic.PROFILE_ID_ARGUMENT_KEY -import org.oppia.app.topic.STORY_ID_ARGUMENT_KEY -import org.oppia.app.topic.TOPIC_ID_ARGUMENT_KEY +import org.oppia.android.app.fragment.InjectableFragment +import org.oppia.android.app.model.StorySummary +import org.oppia.android.app.topic.PROFILE_ID_ARGUMENT_KEY +import org.oppia.android.app.topic.STORY_ID_ARGUMENT_KEY +import org.oppia.android.app.topic.TOPIC_ID_ARGUMENT_KEY import javax.inject.Inject private const val KEY_CURRENT_EXPANDED_LIST_INDEX = "CURRENT_EXPANDED_LIST_INDEX" diff --git a/app/src/main/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentPresenter.kt index 963c84f0dda..16cedda4eee 100644 --- a/app/src/main/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentPresenter.kt @@ -1,4 +1,4 @@ -package org.oppia.app.topic.lessons +package org.oppia.android.app.topic.lessons import android.view.LayoutInflater import android.view.View @@ -8,18 +8,18 @@ import androidx.fragment.app.Fragment import androidx.lifecycle.LiveData import androidx.lifecycle.Observer import androidx.lifecycle.Transformations -import org.oppia.app.databinding.TopicLessonsFragmentBinding -import org.oppia.app.fragment.FragmentScope -import org.oppia.app.home.RouteToExplorationListener -import org.oppia.app.model.ChapterSummary -import org.oppia.app.model.ProfileId -import org.oppia.app.model.StorySummary -import org.oppia.app.model.Topic -import org.oppia.app.topic.RouteToStoryListener -import org.oppia.domain.exploration.ExplorationDataController -import org.oppia.domain.topic.TopicController -import org.oppia.util.data.AsyncResult -import org.oppia.util.logging.ConsoleLogger +import org.oppia.android.app.fragment.FragmentScope +import org.oppia.android.app.home.RouteToExplorationListener +import org.oppia.android.app.model.ChapterSummary +import org.oppia.android.app.model.ProfileId +import org.oppia.android.app.model.StorySummary +import org.oppia.android.app.model.Topic +import org.oppia.android.app.topic.RouteToStoryListener +import org.oppia.android.databinding.TopicLessonsFragmentBinding +import org.oppia.android.domain.exploration.ExplorationDataController +import org.oppia.android.domain.topic.TopicController +import org.oppia.android.util.data.AsyncResult +import org.oppia.android.util.logging.ConsoleLogger import javax.inject.Inject /** The presenter for [TopicLessonsFragment]. */ diff --git a/app/src/main/java/org/oppia/android/app/topic/lessons/TopicLessonsItemViewModel.kt b/app/src/main/java/org/oppia/android/app/topic/lessons/TopicLessonsItemViewModel.kt index 23aa0739d0a..78b45c36a79 100644 --- a/app/src/main/java/org/oppia/android/app/topic/lessons/TopicLessonsItemViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/topic/lessons/TopicLessonsItemViewModel.kt @@ -1,6 +1,6 @@ -package org.oppia.app.topic.lessons +package org.oppia.android.app.topic.lessons -import org.oppia.app.viewmodel.ObservableViewModel +import org.oppia.android.app.viewmodel.ObservableViewModel /** The root [ViewModel] for all individual items that may be displayed in [TopicLessonsFragment] recycler view. */ abstract class TopicLessonsItemViewModel : ObservableViewModel() diff --git a/app/src/main/java/org/oppia/android/app/topic/lessons/TopicLessonsTitleViewModel.kt b/app/src/main/java/org/oppia/android/app/topic/lessons/TopicLessonsTitleViewModel.kt index d8d9ca6963b..e5fc6e033ef 100644 --- a/app/src/main/java/org/oppia/android/app/topic/lessons/TopicLessonsTitleViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/topic/lessons/TopicLessonsTitleViewModel.kt @@ -1,4 +1,4 @@ -package org.oppia.app.topic.lessons +package org.oppia.android.app.topic.lessons import androidx.lifecycle.ViewModel diff --git a/app/src/main/java/org/oppia/android/app/topic/practice/SubtopicSelector.kt b/app/src/main/java/org/oppia/android/app/topic/practice/SubtopicSelector.kt index b88852443cc..8409ce67a3e 100644 --- a/app/src/main/java/org/oppia/android/app/topic/practice/SubtopicSelector.kt +++ b/app/src/main/java/org/oppia/android/app/topic/practice/SubtopicSelector.kt @@ -1,4 +1,4 @@ -package org.oppia.app.topic.practice +package org.oppia.android.app.topic.practice /** Interface to update the selectedSubtopicList in [TopicPracticeFragmentPresenter]. */ interface SubtopicSelector { diff --git a/app/src/main/java/org/oppia/android/app/topic/practice/TopicPracticeFragment.kt b/app/src/main/java/org/oppia/android/app/topic/practice/TopicPracticeFragment.kt index 6c31cc0450f..3fc015f757b 100644 --- a/app/src/main/java/org/oppia/android/app/topic/practice/TopicPracticeFragment.kt +++ b/app/src/main/java/org/oppia/android/app/topic/practice/TopicPracticeFragment.kt @@ -1,13 +1,13 @@ -package org.oppia.app.topic.practice +package org.oppia.android.app.topic.practice import android.content.Context import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import org.oppia.app.fragment.InjectableFragment -import org.oppia.app.topic.PROFILE_ID_ARGUMENT_KEY -import org.oppia.app.topic.TOPIC_ID_ARGUMENT_KEY +import org.oppia.android.app.fragment.InjectableFragment +import org.oppia.android.app.topic.PROFILE_ID_ARGUMENT_KEY +import org.oppia.android.app.topic.TOPIC_ID_ARGUMENT_KEY import javax.inject.Inject /** Fragment that displays skills for topic practice mode. */ diff --git a/app/src/main/java/org/oppia/android/app/topic/practice/TopicPracticeFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/topic/practice/TopicPracticeFragmentPresenter.kt index b5bcb65ba72..cb28f8b774c 100644 --- a/app/src/main/java/org/oppia/android/app/topic/practice/TopicPracticeFragmentPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/topic/practice/TopicPracticeFragmentPresenter.kt @@ -1,4 +1,4 @@ -package org.oppia.app.topic.practice +package org.oppia.android.app.topic.practice import android.view.LayoutInflater import android.view.View @@ -6,19 +6,19 @@ import android.view.ViewGroup import androidx.appcompat.app.AppCompatActivity import androidx.fragment.app.Fragment import androidx.recyclerview.widget.LinearLayoutManager -import org.oppia.app.databinding.TopicPracticeFooterViewBinding -import org.oppia.app.databinding.TopicPracticeFragmentBinding -import org.oppia.app.databinding.TopicPracticeHeaderViewBinding -import org.oppia.app.databinding.TopicPracticeSubtopicBinding -import org.oppia.app.fragment.FragmentScope -import org.oppia.app.recyclerview.BindableAdapter -import org.oppia.app.topic.RouteToQuestionPlayerListener -import org.oppia.app.topic.practice.practiceitemviewmodel.TopicPracticeFooterViewModel -import org.oppia.app.topic.practice.practiceitemviewmodel.TopicPracticeHeaderViewModel -import org.oppia.app.topic.practice.practiceitemviewmodel.TopicPracticeItemViewModel -import org.oppia.app.topic.practice.practiceitemviewmodel.TopicPracticeSubtopicViewModel -import org.oppia.app.viewmodel.ViewModelProvider -import org.oppia.util.logging.ConsoleLogger +import org.oppia.android.app.fragment.FragmentScope +import org.oppia.android.app.recyclerview.BindableAdapter +import org.oppia.android.app.topic.RouteToQuestionPlayerListener +import org.oppia.android.app.topic.practice.practiceitemviewmodel.TopicPracticeFooterViewModel +import org.oppia.android.app.topic.practice.practiceitemviewmodel.TopicPracticeHeaderViewModel +import org.oppia.android.app.topic.practice.practiceitemviewmodel.TopicPracticeItemViewModel +import org.oppia.android.app.topic.practice.practiceitemviewmodel.TopicPracticeSubtopicViewModel +import org.oppia.android.app.viewmodel.ViewModelProvider +import org.oppia.android.databinding.TopicPracticeFooterViewBinding +import org.oppia.android.databinding.TopicPracticeFragmentBinding +import org.oppia.android.databinding.TopicPracticeHeaderViewBinding +import org.oppia.android.databinding.TopicPracticeSubtopicBinding +import org.oppia.android.util.logging.ConsoleLogger import javax.inject.Inject /** The presenter for [TopicPracticeFragment]. */ diff --git a/app/src/main/java/org/oppia/android/app/topic/practice/TopicPracticeViewModel.kt b/app/src/main/java/org/oppia/android/app/topic/practice/TopicPracticeViewModel.kt index bc6a6c4d66f..a6890c3f7be 100644 --- a/app/src/main/java/org/oppia/android/app/topic/practice/TopicPracticeViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/topic/practice/TopicPracticeViewModel.kt @@ -1,18 +1,18 @@ -package org.oppia.app.topic.practice +package org.oppia.android.app.topic.practice import androidx.lifecycle.LiveData import androidx.lifecycle.Transformations -import org.oppia.app.fragment.FragmentScope -import org.oppia.app.model.ProfileId -import org.oppia.app.model.Topic -import org.oppia.app.topic.practice.practiceitemviewmodel.TopicPracticeFooterViewModel -import org.oppia.app.topic.practice.practiceitemviewmodel.TopicPracticeHeaderViewModel -import org.oppia.app.topic.practice.practiceitemviewmodel.TopicPracticeItemViewModel -import org.oppia.app.topic.practice.practiceitemviewmodel.TopicPracticeSubtopicViewModel -import org.oppia.app.viewmodel.ObservableViewModel -import org.oppia.domain.topic.TopicController -import org.oppia.util.data.AsyncResult -import org.oppia.util.logging.ConsoleLogger +import org.oppia.android.app.fragment.FragmentScope +import org.oppia.android.app.model.ProfileId +import org.oppia.android.app.model.Topic +import org.oppia.android.app.topic.practice.practiceitemviewmodel.TopicPracticeFooterViewModel +import org.oppia.android.app.topic.practice.practiceitemviewmodel.TopicPracticeHeaderViewModel +import org.oppia.android.app.topic.practice.practiceitemviewmodel.TopicPracticeItemViewModel +import org.oppia.android.app.topic.practice.practiceitemviewmodel.TopicPracticeSubtopicViewModel +import org.oppia.android.app.viewmodel.ObservableViewModel +import org.oppia.android.domain.topic.TopicController +import org.oppia.android.util.data.AsyncResult +import org.oppia.android.util.logging.ConsoleLogger import javax.inject.Inject /** [ObservableViewModel] for [TopicPracticeFragment]. */ diff --git a/app/src/main/java/org/oppia/android/app/topic/practice/practiceitemviewmodel/TopicPracticeFooterViewModel.kt b/app/src/main/java/org/oppia/android/app/topic/practice/practiceitemviewmodel/TopicPracticeFooterViewModel.kt index 9eefef94158..cd784653712 100644 --- a/app/src/main/java/org/oppia/android/app/topic/practice/practiceitemviewmodel/TopicPracticeFooterViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/topic/practice/practiceitemviewmodel/TopicPracticeFooterViewModel.kt @@ -1,4 +1,4 @@ -package org.oppia.app.topic.practice.practiceitemviewmodel +package org.oppia.android.app.topic.practice.practiceitemviewmodel /** Footer view model for the recycler view in [TopicPracticeFragment]. */ class TopicPracticeFooterViewModel : TopicPracticeItemViewModel() diff --git a/app/src/main/java/org/oppia/android/app/topic/practice/practiceitemviewmodel/TopicPracticeHeaderViewModel.kt b/app/src/main/java/org/oppia/android/app/topic/practice/practiceitemviewmodel/TopicPracticeHeaderViewModel.kt index 32b30195836..a4a039885e7 100644 --- a/app/src/main/java/org/oppia/android/app/topic/practice/practiceitemviewmodel/TopicPracticeHeaderViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/topic/practice/practiceitemviewmodel/TopicPracticeHeaderViewModel.kt @@ -1,4 +1,4 @@ -package org.oppia.app.topic.practice.practiceitemviewmodel +package org.oppia.android.app.topic.practice.practiceitemviewmodel /** Header view model for the recycler view in [TopicPracticeFragment]. */ class TopicPracticeHeaderViewModel : TopicPracticeItemViewModel() diff --git a/app/src/main/java/org/oppia/android/app/topic/practice/practiceitemviewmodel/TopicPracticeItemViewModel.kt b/app/src/main/java/org/oppia/android/app/topic/practice/practiceitemviewmodel/TopicPracticeItemViewModel.kt index 9d17c4bc894..42b6d5b8e69 100644 --- a/app/src/main/java/org/oppia/android/app/topic/practice/practiceitemviewmodel/TopicPracticeItemViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/topic/practice/practiceitemviewmodel/TopicPracticeItemViewModel.kt @@ -1,6 +1,6 @@ -package org.oppia.app.topic.practice.practiceitemviewmodel +package org.oppia.android.app.topic.practice.practiceitemviewmodel -import org.oppia.app.viewmodel.ObservableViewModel +import org.oppia.android.app.viewmodel.ObservableViewModel /** Super-class for generalising different views for the recyclerView in [TopicPracticeFragment] */ abstract class TopicPracticeItemViewModel : ObservableViewModel() diff --git a/app/src/main/java/org/oppia/android/app/topic/practice/practiceitemviewmodel/TopicPracticeSubtopicViewModel.kt b/app/src/main/java/org/oppia/android/app/topic/practice/practiceitemviewmodel/TopicPracticeSubtopicViewModel.kt index 986d36f7fb2..4774cde269a 100644 --- a/app/src/main/java/org/oppia/android/app/topic/practice/practiceitemviewmodel/TopicPracticeSubtopicViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/topic/practice/practiceitemviewmodel/TopicPracticeSubtopicViewModel.kt @@ -1,6 +1,6 @@ -package org.oppia.app.topic.practice.practiceitemviewmodel +package org.oppia.android.app.topic.practice.practiceitemviewmodel -import org.oppia.app.model.Subtopic +import org.oppia.android.app.model.Subtopic /** Subtopic view model for the recycler view in [TopicPracticeFragment]. */ class TopicPracticeSubtopicViewModel(val subtopic: Subtopic) : TopicPracticeItemViewModel() diff --git a/app/src/main/java/org/oppia/android/app/topic/questionplayer/HintsAndSolutionQuestionManagerFragment.kt b/app/src/main/java/org/oppia/android/app/topic/questionplayer/HintsAndSolutionQuestionManagerFragment.kt index 847c1fbd31d..b7c14028c8c 100644 --- a/app/src/main/java/org/oppia/android/app/topic/questionplayer/HintsAndSolutionQuestionManagerFragment.kt +++ b/app/src/main/java/org/oppia/android/app/topic/questionplayer/HintsAndSolutionQuestionManagerFragment.kt @@ -1,11 +1,11 @@ -package org.oppia.app.topic.questionplayer +package org.oppia.android.app.topic.questionplayer import android.content.Context import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import org.oppia.app.fragment.InjectableFragment +import org.oppia.android.app.fragment.InjectableFragment import javax.inject.Inject /** diff --git a/app/src/main/java/org/oppia/android/app/topic/questionplayer/HintsAndSolutionQuestionManagerFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/topic/questionplayer/HintsAndSolutionQuestionManagerFragmentPresenter.kt index d286c3388d6..ac85e514a59 100644 --- a/app/src/main/java/org/oppia/android/app/topic/questionplayer/HintsAndSolutionQuestionManagerFragmentPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/topic/questionplayer/HintsAndSolutionQuestionManagerFragmentPresenter.kt @@ -1,14 +1,14 @@ -package org.oppia.app.topic.questionplayer +package org.oppia.android.app.topic.questionplayer import android.view.View import androidx.appcompat.app.AppCompatActivity import androidx.lifecycle.LiveData import androidx.lifecycle.Observer -import org.oppia.app.fragment.FragmentScope -import org.oppia.app.model.EphemeralQuestion -import org.oppia.domain.question.QuestionAssessmentProgressController -import org.oppia.util.data.AsyncResult -import org.oppia.util.logging.ConsoleLogger +import org.oppia.android.app.fragment.FragmentScope +import org.oppia.android.app.model.EphemeralQuestion +import org.oppia.android.domain.question.QuestionAssessmentProgressController +import org.oppia.android.util.data.AsyncResult +import org.oppia.android.util.logging.ConsoleLogger import javax.inject.Inject /** The presenter for [HintsAndSolutionQuestionManagerFragment]. */ diff --git a/app/src/main/java/org/oppia/android/app/topic/questionplayer/HintsAndSolutionQuestionManagerListener.kt b/app/src/main/java/org/oppia/android/app/topic/questionplayer/HintsAndSolutionQuestionManagerListener.kt index 62a1cbc3485..fd377ba1635 100644 --- a/app/src/main/java/org/oppia/android/app/topic/questionplayer/HintsAndSolutionQuestionManagerListener.kt +++ b/app/src/main/java/org/oppia/android/app/topic/questionplayer/HintsAndSolutionQuestionManagerListener.kt @@ -1,6 +1,6 @@ -package org.oppia.app.topic.questionplayer +package org.oppia.android.app.topic.questionplayer -import org.oppia.app.model.State +import org.oppia.android.app.model.State /** Listener for fetching current Question state data. */ interface HintsAndSolutionQuestionManagerListener { diff --git a/app/src/main/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivity.kt b/app/src/main/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivity.kt index 2d5a67118f2..8d415b40e70 100644 --- a/app/src/main/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivity.kt +++ b/app/src/main/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivity.kt @@ -1,21 +1,21 @@ -package org.oppia.app.topic.questionplayer +package org.oppia.android.app.topic.questionplayer import android.content.Context import android.content.Intent import android.os.Bundle -import org.oppia.app.activity.InjectableAppCompatActivity -import org.oppia.app.hintsandsolution.HintsAndSolutionDialogFragment -import org.oppia.app.hintsandsolution.HintsAndSolutionListener -import org.oppia.app.hintsandsolution.RevealHintListener -import org.oppia.app.hintsandsolution.RevealSolutionInterface -import org.oppia.app.model.State -import org.oppia.app.player.exploration.TAG_HINTS_AND_SOLUTION_DIALOG -import org.oppia.app.player.state.listener.RouteToHintsAndSolutionListener -import org.oppia.app.player.state.listener.StateKeyboardButtonListener -import org.oppia.app.player.stopplaying.RestartPlayingSessionListener -import org.oppia.app.player.stopplaying.StopExplorationDialogFragment -import org.oppia.app.player.stopplaying.StopStatePlayingSessionListener -import org.oppia.app.topic.conceptcard.ConceptCardListener +import org.oppia.android.app.activity.InjectableAppCompatActivity +import org.oppia.android.app.hintsandsolution.HintsAndSolutionDialogFragment +import org.oppia.android.app.hintsandsolution.HintsAndSolutionListener +import org.oppia.android.app.hintsandsolution.RevealHintListener +import org.oppia.android.app.hintsandsolution.RevealSolutionInterface +import org.oppia.android.app.model.State +import org.oppia.android.app.player.exploration.TAG_HINTS_AND_SOLUTION_DIALOG +import org.oppia.android.app.player.state.listener.RouteToHintsAndSolutionListener +import org.oppia.android.app.player.state.listener.StateKeyboardButtonListener +import org.oppia.android.app.player.stopplaying.RestartPlayingSessionListener +import org.oppia.android.app.player.stopplaying.StopExplorationDialogFragment +import org.oppia.android.app.player.stopplaying.StopStatePlayingSessionListener +import org.oppia.android.app.topic.conceptcard.ConceptCardListener import javax.inject.Inject const val QUESTION_PLAYER_ACTIVITY_SKILL_ID_LIST_ARGUMENT_KEY = diff --git a/app/src/main/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivityPresenter.kt index 8e104d87bd8..abd045777fa 100644 --- a/app/src/main/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivityPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivityPresenter.kt @@ -1,15 +1,15 @@ -package org.oppia.app.topic.questionplayer +package org.oppia.android.app.topic.questionplayer import android.view.inputmethod.EditorInfo import androidx.appcompat.app.AppCompatActivity import androidx.databinding.DataBindingUtil import androidx.lifecycle.Observer -import org.oppia.app.R -import org.oppia.app.activity.ActivityScope -import org.oppia.app.databinding.QuestionPlayerActivityBinding -import org.oppia.domain.question.QuestionTrainingController -import org.oppia.util.data.AsyncResult -import org.oppia.util.logging.ConsoleLogger +import org.oppia.android.R +import org.oppia.android.app.activity.ActivityScope +import org.oppia.android.databinding.QuestionPlayerActivityBinding +import org.oppia.android.domain.question.QuestionTrainingController +import org.oppia.android.util.data.AsyncResult +import org.oppia.android.util.logging.ConsoleLogger import javax.inject.Inject const val TAG_QUESTION_PLAYER_FRAGMENT = "TAG_QUESTION_PLAYER_FRAGMENT" diff --git a/app/src/main/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerFragment.kt b/app/src/main/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerFragment.kt index 849b0ef9804..ae64667ea40 100644 --- a/app/src/main/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerFragment.kt +++ b/app/src/main/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerFragment.kt @@ -1,22 +1,22 @@ -package org.oppia.app.topic.questionplayer +package org.oppia.android.app.topic.questionplayer import android.content.Context import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import org.oppia.app.fragment.InjectableFragment -import org.oppia.app.model.HelpIndex -import org.oppia.app.model.UserAnswer -import org.oppia.app.player.state.answerhandling.InteractionAnswerErrorOrAvailabilityCheckReceiver -import org.oppia.app.player.state.answerhandling.InteractionAnswerReceiver -import org.oppia.app.player.state.listener.ContinueNavigationButtonListener -import org.oppia.app.player.state.listener.NextNavigationButtonListener -import org.oppia.app.player.state.listener.PreviousResponsesHeaderClickListener -import org.oppia.app.player.state.listener.ReplayButtonListener -import org.oppia.app.player.state.listener.ReturnToTopicNavigationButtonListener -import org.oppia.app.player.state.listener.ShowHintAvailabilityListener -import org.oppia.app.player.state.listener.SubmitNavigationButtonListener +import org.oppia.android.app.fragment.InjectableFragment +import org.oppia.android.app.model.HelpIndex +import org.oppia.android.app.model.UserAnswer +import org.oppia.android.app.player.state.answerhandling.InteractionAnswerErrorOrAvailabilityCheckReceiver +import org.oppia.android.app.player.state.answerhandling.InteractionAnswerReceiver +import org.oppia.android.app.player.state.listener.ContinueNavigationButtonListener +import org.oppia.android.app.player.state.listener.NextNavigationButtonListener +import org.oppia.android.app.player.state.listener.PreviousResponsesHeaderClickListener +import org.oppia.android.app.player.state.listener.ReplayButtonListener +import org.oppia.android.app.player.state.listener.ReturnToTopicNavigationButtonListener +import org.oppia.android.app.player.state.listener.ShowHintAvailabilityListener +import org.oppia.android.app.player.state.listener.SubmitNavigationButtonListener import javax.inject.Inject /** Fragment that contains all questions in Question Player. */ diff --git a/app/src/main/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerFragmentPresenter.kt index 958cfd5c2ff..6bc20d8822a 100644 --- a/app/src/main/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerFragmentPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerFragmentPresenter.kt @@ -1,4 +1,4 @@ -package org.oppia.app.topic.questionplayer +package org.oppia.android.app.topic.questionplayer import android.content.Context import android.view.LayoutInflater @@ -11,30 +11,30 @@ import androidx.fragment.app.Fragment import androidx.lifecycle.LiveData import androidx.lifecycle.Observer import androidx.lifecycle.Transformations -import org.oppia.app.databinding.QuestionPlayerFragmentBinding -import org.oppia.app.fragment.FragmentScope -import org.oppia.app.model.AnsweredQuestionOutcome -import org.oppia.app.model.EphemeralQuestion -import org.oppia.app.model.EphemeralState -import org.oppia.app.model.EventLog -import org.oppia.app.model.HelpIndex -import org.oppia.app.model.Hint -import org.oppia.app.model.Solution -import org.oppia.app.model.State -import org.oppia.app.model.UserAnswer -import org.oppia.app.player.state.CONCEPT_CARD_DIALOG_FRAGMENT_TAG -import org.oppia.app.player.state.StatePlayerRecyclerViewAssembler -import org.oppia.app.player.state.listener.RouteToHintsAndSolutionListener -import org.oppia.app.player.stopplaying.RestartPlayingSessionListener -import org.oppia.app.player.stopplaying.StopStatePlayingSessionListener -import org.oppia.app.utility.SplitScreenManager -import org.oppia.app.viewmodel.ViewModelProvider -import org.oppia.domain.oppialogger.OppiaLogger -import org.oppia.domain.question.QuestionAssessmentProgressController -import org.oppia.util.data.AsyncResult -import org.oppia.util.gcsresource.QuestionResourceBucketName -import org.oppia.util.logging.ConsoleLogger -import org.oppia.util.system.OppiaClock +import org.oppia.android.app.fragment.FragmentScope +import org.oppia.android.app.model.AnsweredQuestionOutcome +import org.oppia.android.app.model.EphemeralQuestion +import org.oppia.android.app.model.EphemeralState +import org.oppia.android.app.model.EventLog +import org.oppia.android.app.model.HelpIndex +import org.oppia.android.app.model.Hint +import org.oppia.android.app.model.Solution +import org.oppia.android.app.model.State +import org.oppia.android.app.model.UserAnswer +import org.oppia.android.app.player.state.CONCEPT_CARD_DIALOG_FRAGMENT_TAG +import org.oppia.android.app.player.state.StatePlayerRecyclerViewAssembler +import org.oppia.android.app.player.state.listener.RouteToHintsAndSolutionListener +import org.oppia.android.app.player.stopplaying.RestartPlayingSessionListener +import org.oppia.android.app.player.stopplaying.StopStatePlayingSessionListener +import org.oppia.android.app.utility.SplitScreenManager +import org.oppia.android.app.viewmodel.ViewModelProvider +import org.oppia.android.databinding.QuestionPlayerFragmentBinding +import org.oppia.android.domain.oppialogger.OppiaLogger +import org.oppia.android.domain.question.QuestionAssessmentProgressController +import org.oppia.android.util.data.AsyncResult +import org.oppia.android.util.gcsresource.QuestionResourceBucketName +import org.oppia.android.util.logging.ConsoleLogger +import org.oppia.android.util.system.OppiaClock import javax.inject.Inject /** The presenter for [QuestionPlayerFragment]. */ diff --git a/app/src/main/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerViewModel.kt b/app/src/main/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerViewModel.kt index 7c5bab42a54..36172c6be5d 100644 --- a/app/src/main/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerViewModel.kt @@ -1,14 +1,14 @@ -package org.oppia.app.topic.questionplayer +package org.oppia.android.app.topic.questionplayer import androidx.databinding.ObservableBoolean import androidx.databinding.ObservableField import androidx.databinding.ObservableList -import org.oppia.app.model.UserAnswer -import org.oppia.app.player.state.answerhandling.AnswerErrorCategory -import org.oppia.app.player.state.answerhandling.InteractionAnswerHandler -import org.oppia.app.player.state.itemviewmodel.StateItemViewModel -import org.oppia.app.viewmodel.ObservableArrayList -import org.oppia.app.viewmodel.ObservableViewModel +import org.oppia.android.app.model.UserAnswer +import org.oppia.android.app.player.state.answerhandling.AnswerErrorCategory +import org.oppia.android.app.player.state.answerhandling.InteractionAnswerHandler +import org.oppia.android.app.player.state.itemviewmodel.StateItemViewModel +import org.oppia.android.app.viewmodel.ObservableArrayList +import org.oppia.android.app.viewmodel.ObservableViewModel import javax.inject.Inject /** [ObservableViewModel] for the question player. */ diff --git a/app/src/main/java/org/oppia/android/app/topic/revision/RevisionSubtopicSelector.kt b/app/src/main/java/org/oppia/android/app/topic/revision/RevisionSubtopicSelector.kt index 954f603e0c4..1fa914f16a6 100755 --- a/app/src/main/java/org/oppia/android/app/topic/revision/RevisionSubtopicSelector.kt +++ b/app/src/main/java/org/oppia/android/app/topic/revision/RevisionSubtopicSelector.kt @@ -1,6 +1,6 @@ -package org.oppia.app.topic.revision +package org.oppia.android.app.topic.revision -import org.oppia.app.model.Subtopic +import org.oppia.android.app.model.Subtopic /** Listener for when a subtopic is selected for revision. */ interface RevisionSubtopicSelector { diff --git a/app/src/main/java/org/oppia/android/app/topic/revision/TopicRevisionFragment.kt b/app/src/main/java/org/oppia/android/app/topic/revision/TopicRevisionFragment.kt index e5dfe91690f..b589fead6b9 100755 --- a/app/src/main/java/org/oppia/android/app/topic/revision/TopicRevisionFragment.kt +++ b/app/src/main/java/org/oppia/android/app/topic/revision/TopicRevisionFragment.kt @@ -1,14 +1,14 @@ -package org.oppia.app.topic.revision +package org.oppia.android.app.topic.revision import android.content.Context import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import org.oppia.app.fragment.InjectableFragment -import org.oppia.app.model.Subtopic -import org.oppia.app.topic.PROFILE_ID_ARGUMENT_KEY -import org.oppia.app.topic.TOPIC_ID_ARGUMENT_KEY +import org.oppia.android.app.fragment.InjectableFragment +import org.oppia.android.app.model.Subtopic +import org.oppia.android.app.topic.PROFILE_ID_ARGUMENT_KEY +import org.oppia.android.app.topic.TOPIC_ID_ARGUMENT_KEY import javax.inject.Inject /** Fragment that card for topic revision. */ diff --git a/app/src/main/java/org/oppia/android/app/topic/revision/TopicRevisionFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/topic/revision/TopicRevisionFragmentPresenter.kt index 61a50e5dddc..91e164c271e 100755 --- a/app/src/main/java/org/oppia/android/app/topic/revision/TopicRevisionFragmentPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/topic/revision/TopicRevisionFragmentPresenter.kt @@ -1,4 +1,4 @@ -package org.oppia.app.topic.revision +package org.oppia.android.app.topic.revision import android.view.LayoutInflater import android.view.View @@ -6,15 +6,15 @@ import android.view.ViewGroup import androidx.appcompat.app.AppCompatActivity import androidx.fragment.app.Fragment import androidx.recyclerview.widget.GridLayoutManager -import org.oppia.app.R -import org.oppia.app.databinding.TopicRevisionFragmentBinding -import org.oppia.app.databinding.TopicRevisionSummaryViewBinding -import org.oppia.app.fragment.FragmentScope -import org.oppia.app.model.Subtopic -import org.oppia.app.recyclerview.BindableAdapter -import org.oppia.app.topic.RouteToRevisionCardListener -import org.oppia.app.topic.revision.revisionitemviewmodel.TopicRevisionItemViewModel -import org.oppia.app.viewmodel.ViewModelProvider +import org.oppia.android.R +import org.oppia.android.app.fragment.FragmentScope +import org.oppia.android.app.model.Subtopic +import org.oppia.android.app.recyclerview.BindableAdapter +import org.oppia.android.app.topic.RouteToRevisionCardListener +import org.oppia.android.app.topic.revision.revisionitemviewmodel.TopicRevisionItemViewModel +import org.oppia.android.app.viewmodel.ViewModelProvider +import org.oppia.android.databinding.TopicRevisionFragmentBinding +import org.oppia.android.databinding.TopicRevisionSummaryViewBinding import javax.inject.Inject /** The presenter for [TopicRevisionFragment]. */ diff --git a/app/src/main/java/org/oppia/android/app/topic/revision/TopicRevisionViewModel.kt b/app/src/main/java/org/oppia/android/app/topic/revision/TopicRevisionViewModel.kt index f79932768e3..cbe2c8b11bc 100755 --- a/app/src/main/java/org/oppia/android/app/topic/revision/TopicRevisionViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/topic/revision/TopicRevisionViewModel.kt @@ -1,17 +1,17 @@ -package org.oppia.app.topic.revision +package org.oppia.android.app.topic.revision import androidx.fragment.app.Fragment import androidx.lifecycle.LiveData import androidx.lifecycle.Transformations -import org.oppia.app.fragment.FragmentScope -import org.oppia.app.model.ProfileId -import org.oppia.app.model.Topic -import org.oppia.app.topic.revision.revisionitemviewmodel.TopicRevisionItemViewModel -import org.oppia.app.viewmodel.ObservableViewModel -import org.oppia.domain.topic.TopicController -import org.oppia.util.data.AsyncResult -import org.oppia.util.logging.ConsoleLogger -import org.oppia.util.parser.TopicHtmlParserEntityType +import org.oppia.android.app.fragment.FragmentScope +import org.oppia.android.app.model.ProfileId +import org.oppia.android.app.model.Topic +import org.oppia.android.app.topic.revision.revisionitemviewmodel.TopicRevisionItemViewModel +import org.oppia.android.app.viewmodel.ObservableViewModel +import org.oppia.android.domain.topic.TopicController +import org.oppia.android.util.data.AsyncResult +import org.oppia.android.util.logging.ConsoleLogger +import org.oppia.android.util.parser.TopicHtmlParserEntityType import javax.inject.Inject /** [ObservableViewModel] for [TopicRevisionFragment]. */ diff --git a/app/src/main/java/org/oppia/android/app/topic/revision/revisionitemviewmodel/TopicRevisionItemViewModel.kt b/app/src/main/java/org/oppia/android/app/topic/revision/revisionitemviewmodel/TopicRevisionItemViewModel.kt index d18457b6581..8b126e61937 100644 --- a/app/src/main/java/org/oppia/android/app/topic/revision/revisionitemviewmodel/TopicRevisionItemViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/topic/revision/revisionitemviewmodel/TopicRevisionItemViewModel.kt @@ -1,8 +1,8 @@ -package org.oppia.app.topic.revision.revisionitemviewmodel +package org.oppia.android.app.topic.revision.revisionitemviewmodel -import org.oppia.app.model.Subtopic -import org.oppia.app.topic.revision.RevisionSubtopicSelector -import org.oppia.app.viewmodel.ObservableViewModel +import org.oppia.android.app.model.Subtopic +import org.oppia.android.app.topic.revision.RevisionSubtopicSelector +import org.oppia.android.app.viewmodel.ObservableViewModel /** [ObservableViewModel] for child views of recycler view present in the [TopicRevisionFragment]. */ class TopicRevisionItemViewModel( diff --git a/app/src/main/java/org/oppia/android/app/topic/revisioncard/ReturnToTopicClickListener.kt b/app/src/main/java/org/oppia/android/app/topic/revisioncard/ReturnToTopicClickListener.kt index 0f3fb4b14ca..1477507296a 100644 --- a/app/src/main/java/org/oppia/android/app/topic/revisioncard/ReturnToTopicClickListener.kt +++ b/app/src/main/java/org/oppia/android/app/topic/revisioncard/ReturnToTopicClickListener.kt @@ -1,4 +1,4 @@ -package org.oppia.app.topic.revisioncard +package org.oppia.android.app.topic.revisioncard /** Listener to route to [TopicActivity] when clicked on Return to Topic button. */ interface ReturnToTopicClickListener { diff --git a/app/src/main/java/org/oppia/android/app/topic/revisioncard/RevisionCardActivity.kt b/app/src/main/java/org/oppia/android/app/topic/revisioncard/RevisionCardActivity.kt index 618cd5bae7c..f6f07fc5e2b 100644 --- a/app/src/main/java/org/oppia/android/app/topic/revisioncard/RevisionCardActivity.kt +++ b/app/src/main/java/org/oppia/android/app/topic/revisioncard/RevisionCardActivity.kt @@ -1,12 +1,12 @@ -package org.oppia.app.topic.revisioncard +package org.oppia.android.app.topic.revisioncard import android.content.Context import android.content.Intent import android.os.Bundle import android.view.Menu import android.view.MenuItem -import org.oppia.app.R -import org.oppia.app.activity.InjectableAppCompatActivity +import org.oppia.android.R +import org.oppia.android.app.activity.InjectableAppCompatActivity import javax.inject.Inject /** Activity for revision card. */ diff --git a/app/src/main/java/org/oppia/android/app/topic/revisioncard/RevisionCardActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/topic/revisioncard/RevisionCardActivityPresenter.kt index 6cf5ca2956e..5042179de0e 100644 --- a/app/src/main/java/org/oppia/android/app/topic/revisioncard/RevisionCardActivityPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/topic/revisioncard/RevisionCardActivityPresenter.kt @@ -1,4 +1,4 @@ -package org.oppia.app.topic.revisioncard +package org.oppia.android.app.topic.revisioncard import android.view.MenuItem import android.widget.TextView @@ -8,15 +8,15 @@ import androidx.databinding.DataBindingUtil import androidx.lifecycle.LiveData import androidx.lifecycle.Observer import androidx.lifecycle.Transformations -import org.oppia.app.R -import org.oppia.app.activity.ActivityScope -import org.oppia.app.databinding.RevisionCardActivityBinding -import org.oppia.app.help.HelpActivity -import org.oppia.app.model.RevisionCard -import org.oppia.app.options.OptionsActivity -import org.oppia.domain.topic.TopicController -import org.oppia.util.data.AsyncResult -import org.oppia.util.logging.ConsoleLogger +import org.oppia.android.R +import org.oppia.android.app.activity.ActivityScope +import org.oppia.android.app.help.HelpActivity +import org.oppia.android.app.model.RevisionCard +import org.oppia.android.app.options.OptionsActivity +import org.oppia.android.databinding.RevisionCardActivityBinding +import org.oppia.android.domain.topic.TopicController +import org.oppia.android.util.data.AsyncResult +import org.oppia.android.util.logging.ConsoleLogger import javax.inject.Inject /** The presenter for [RevisionCardActivity]. */ diff --git a/app/src/main/java/org/oppia/android/app/topic/revisioncard/RevisionCardFragment.kt b/app/src/main/java/org/oppia/android/app/topic/revisioncard/RevisionCardFragment.kt index 8aa42e8933f..76902f8f14d 100755 --- a/app/src/main/java/org/oppia/android/app/topic/revisioncard/RevisionCardFragment.kt +++ b/app/src/main/java/org/oppia/android/app/topic/revisioncard/RevisionCardFragment.kt @@ -1,11 +1,11 @@ -package org.oppia.app.topic.revisioncard +package org.oppia.android.app.topic.revisioncard import android.content.Context import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import org.oppia.app.fragment.InjectableDialogFragment +import org.oppia.android.app.fragment.InjectableDialogFragment import javax.inject.Inject /* Fragment that displays revision card */ diff --git a/app/src/main/java/org/oppia/android/app/topic/revisioncard/RevisionCardFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/topic/revisioncard/RevisionCardFragmentPresenter.kt index 189b3f7e186..a188693f8b8 100755 --- a/app/src/main/java/org/oppia/android/app/topic/revisioncard/RevisionCardFragmentPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/topic/revisioncard/RevisionCardFragmentPresenter.kt @@ -1,15 +1,15 @@ -package org.oppia.app.topic.revisioncard +package org.oppia.android.app.topic.revisioncard import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.fragment.app.Fragment -import org.oppia.app.databinding.RevisionCardFragmentBinding -import org.oppia.app.fragment.FragmentScope -import org.oppia.app.model.EventLog -import org.oppia.app.viewmodel.ViewModelProvider -import org.oppia.domain.oppialogger.OppiaLogger -import org.oppia.util.system.OppiaClock +import org.oppia.android.app.fragment.FragmentScope +import org.oppia.android.app.model.EventLog +import org.oppia.android.app.viewmodel.ViewModelProvider +import org.oppia.android.databinding.RevisionCardFragmentBinding +import org.oppia.android.domain.oppialogger.OppiaLogger +import org.oppia.android.util.system.OppiaClock import javax.inject.Inject /** Presenter for [RevisionCardFragment], sets up bindings from ViewModel. */ diff --git a/app/src/main/java/org/oppia/android/app/topic/revisioncard/RevisionCardViewModel.kt b/app/src/main/java/org/oppia/android/app/topic/revisioncard/RevisionCardViewModel.kt index 934b79bdf31..9a7e6703fe1 100755 --- a/app/src/main/java/org/oppia/android/app/topic/revisioncard/RevisionCardViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/topic/revisioncard/RevisionCardViewModel.kt @@ -1,19 +1,19 @@ -package org.oppia.app.topic.revisioncard +package org.oppia.android.app.topic.revisioncard import android.view.View import android.widget.TextView import androidx.appcompat.app.AppCompatActivity import androidx.lifecycle.LiveData import androidx.lifecycle.Transformations -import org.oppia.app.fragment.FragmentScope -import org.oppia.app.model.RevisionCard -import org.oppia.app.viewmodel.ObservableViewModel -import org.oppia.domain.topic.TopicController -import org.oppia.util.data.AsyncResult -import org.oppia.util.gcsresource.DefaultResourceBucketName -import org.oppia.util.logging.ConsoleLogger -import org.oppia.util.parser.HtmlParser -import org.oppia.util.parser.TopicHtmlParserEntityType +import org.oppia.android.app.fragment.FragmentScope +import org.oppia.android.app.model.RevisionCard +import org.oppia.android.app.viewmodel.ObservableViewModel +import org.oppia.android.domain.topic.TopicController +import org.oppia.android.util.data.AsyncResult +import org.oppia.android.util.gcsresource.DefaultResourceBucketName +import org.oppia.android.util.logging.ConsoleLogger +import org.oppia.android.util.parser.HtmlParser +import org.oppia.android.util.parser.TopicHtmlParserEntityType import javax.inject.Inject // TODO(#1633): Fix ViewModel to not depend on View diff --git a/app/src/main/java/org/oppia/android/app/utility/ClickableAreasImage.kt b/app/src/main/java/org/oppia/android/app/utility/ClickableAreasImage.kt index 8e47124d9de..82c44c8d9f7 100644 --- a/app/src/main/java/org/oppia/android/app/utility/ClickableAreasImage.kt +++ b/app/src/main/java/org/oppia/android/app/utility/ClickableAreasImage.kt @@ -1,4 +1,4 @@ -package org.oppia.app.utility +package org.oppia.android.app.utility import android.graphics.RectF import android.view.MotionEvent @@ -6,10 +6,10 @@ import android.view.View import android.widget.FrameLayout import androidx.core.view.forEachIndexed import androidx.core.view.isVisible -import org.oppia.app.R -import org.oppia.app.model.ImageWithRegions -import org.oppia.app.player.state.ImageRegionSelectionInteractionView -import org.oppia.app.shim.ViewBindingShim +import org.oppia.android.R +import org.oppia.android.app.model.ImageWithRegions +import org.oppia.android.app.player.state.ImageRegionSelectionInteractionView +import org.oppia.android.app.shim.ViewBindingShim import kotlin.math.roundToInt /** diff --git a/app/src/main/java/org/oppia/android/app/utility/ContextExtensions.kt b/app/src/main/java/org/oppia/android/app/utility/ContextExtensions.kt index 583585cf750..91983da0475 100644 --- a/app/src/main/java/org/oppia/android/app/utility/ContextExtensions.kt +++ b/app/src/main/java/org/oppia/android/app/utility/ContextExtensions.kt @@ -1,4 +1,4 @@ -package org.oppia.app.utility +package org.oppia.android.app.utility import android.content.Context diff --git a/app/src/main/java/org/oppia/android/app/utility/FontScaleConfigurationUtil.kt b/app/src/main/java/org/oppia/android/app/utility/FontScaleConfigurationUtil.kt index 5516cbeb263..f0bcf1bdb9a 100644 --- a/app/src/main/java/org/oppia/android/app/utility/FontScaleConfigurationUtil.kt +++ b/app/src/main/java/org/oppia/android/app/utility/FontScaleConfigurationUtil.kt @@ -1,10 +1,10 @@ -package org.oppia.app.utility +package org.oppia.android.app.utility import android.content.Context import android.content.Context.WINDOW_SERVICE import android.util.DisplayMetrics import android.view.WindowManager -import org.oppia.app.model.ReadingTextSize +import org.oppia.android.app.model.ReadingTextSize import javax.inject.Inject /** Utility to change the scale of font for the entire app. */ diff --git a/app/src/main/java/org/oppia/android/app/utility/KeyboardHelper.kt b/app/src/main/java/org/oppia/android/app/utility/KeyboardHelper.kt index 0bfba81e585..3ea535b44e6 100644 --- a/app/src/main/java/org/oppia/android/app/utility/KeyboardHelper.kt +++ b/app/src/main/java/org/oppia/android/app/utility/KeyboardHelper.kt @@ -1,4 +1,4 @@ -package org.oppia.app.utility +package org.oppia.android.app.utility import android.content.Context import android.view.View diff --git a/app/src/main/java/org/oppia/android/app/utility/LifecycleSafeTimerFactory.kt b/app/src/main/java/org/oppia/android/app/utility/LifecycleSafeTimerFactory.kt index f99d42e8a88..92ac3d421c0 100644 --- a/app/src/main/java/org/oppia/android/app/utility/LifecycleSafeTimerFactory.kt +++ b/app/src/main/java/org/oppia/android/app/utility/LifecycleSafeTimerFactory.kt @@ -1,4 +1,4 @@ -package org.oppia.app.utility +package org.oppia.android.app.utility import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData @@ -6,7 +6,7 @@ import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.delay import kotlinx.coroutines.launch -import org.oppia.util.threading.BackgroundDispatcher +import org.oppia.android.util.threading.BackgroundDispatcher import javax.inject.Inject /** diff --git a/app/src/main/java/org/oppia/android/app/utility/OnClickableAreaClickedListener.kt b/app/src/main/java/org/oppia/android/app/utility/OnClickableAreaClickedListener.kt index 8a4a1356dd8..45909da4882 100644 --- a/app/src/main/java/org/oppia/android/app/utility/OnClickableAreaClickedListener.kt +++ b/app/src/main/java/org/oppia/android/app/utility/OnClickableAreaClickedListener.kt @@ -1,4 +1,4 @@ -package org.oppia.app.utility +package org.oppia.android.app.utility /** Listener for an image when it is clicked which have a [ClickableAreasImage] attached to the view. */ interface OnClickableAreaClickedListener { diff --git a/app/src/main/java/org/oppia/android/app/utility/RatioExtensions.kt b/app/src/main/java/org/oppia/android/app/utility/RatioExtensions.kt index 4926c34959d..95c9d1fe5ac 100644 --- a/app/src/main/java/org/oppia/android/app/utility/RatioExtensions.kt +++ b/app/src/main/java/org/oppia/android/app/utility/RatioExtensions.kt @@ -1,8 +1,8 @@ -package org.oppia.app.utility +package org.oppia.android.app.utility import android.content.Context -import org.oppia.app.R -import org.oppia.app.model.RatioExpression +import org.oppia.android.R +import org.oppia.android.app.model.RatioExpression /** * Returns an accessibly readable string representation of this [RatioExpression]. diff --git a/app/src/main/java/org/oppia/android/app/utility/RegionClickEvent.kt b/app/src/main/java/org/oppia/android/app/utility/RegionClickEvent.kt index e39cd9f805f..7df8bad6fbb 100644 --- a/app/src/main/java/org/oppia/android/app/utility/RegionClickEvent.kt +++ b/app/src/main/java/org/oppia/android/app/utility/RegionClickEvent.kt @@ -1,4 +1,4 @@ -package org.oppia.app.utility +package org.oppia.android.app.utility /** Sealed class containing the items for accessibility and non-accessibility use-case to in conjunction with [ClickableAreasImage]. */ sealed class RegionClickedEvent diff --git a/app/src/main/java/org/oppia/android/app/utility/SplitScreenManager.kt b/app/src/main/java/org/oppia/android/app/utility/SplitScreenManager.kt index 4f6f57c27a9..b4e1d3b6614 100644 --- a/app/src/main/java/org/oppia/android/app/utility/SplitScreenManager.kt +++ b/app/src/main/java/org/oppia/android/app/utility/SplitScreenManager.kt @@ -1,13 +1,13 @@ -package org.oppia.app.utility +package org.oppia.android.app.utility import android.content.Context import android.content.res.Resources -import org.oppia.app.R -import org.oppia.app.model.EphemeralQuestion -import org.oppia.app.model.EphemeralState -import org.oppia.app.player.state.StateFragment -import org.oppia.app.player.state.itemviewmodel.InteractionViewModelModule.Companion.splitScreenInteractionIdsPool -import org.oppia.app.topic.questionplayer.QuestionPlayerFragment +import org.oppia.android.R +import org.oppia.android.app.model.EphemeralQuestion +import org.oppia.android.app.model.EphemeralState +import org.oppia.android.app.player.state.StateFragment +import org.oppia.android.app.player.state.itemviewmodel.InteractionViewModelModule.Companion.splitScreenInteractionIdsPool +import org.oppia.android.app.topic.questionplayer.QuestionPlayerFragment import javax.inject.Inject import javax.inject.Singleton import kotlin.math.pow diff --git a/app/src/main/java/org/oppia/android/app/view/ViewComponent.kt b/app/src/main/java/org/oppia/android/app/view/ViewComponent.kt index d31e5702813..468a8531f3f 100644 --- a/app/src/main/java/org/oppia/android/app/view/ViewComponent.kt +++ b/app/src/main/java/org/oppia/android/app/view/ViewComponent.kt @@ -1,12 +1,12 @@ -package org.oppia.app.view +package org.oppia.android.app.view import android.view.View import dagger.BindsInstance import dagger.Subcomponent -import org.oppia.app.customview.LessonThumbnailImageView -import org.oppia.app.player.state.DragDropSortInteractionView -import org.oppia.app.player.state.ImageRegionSelectionInteractionView -import org.oppia.app.player.state.SelectionInteractionView +import org.oppia.android.app.customview.LessonThumbnailImageView +import org.oppia.android.app.player.state.DragDropSortInteractionView +import org.oppia.android.app.player.state.ImageRegionSelectionInteractionView +import org.oppia.android.app.player.state.SelectionInteractionView /** Root subcomponent for custom views. */ @Subcomponent diff --git a/app/src/main/java/org/oppia/android/app/view/ViewScope.kt b/app/src/main/java/org/oppia/android/app/view/ViewScope.kt index f57a5cb4d81..1f3d783a8df 100644 --- a/app/src/main/java/org/oppia/android/app/view/ViewScope.kt +++ b/app/src/main/java/org/oppia/android/app/view/ViewScope.kt @@ -1,4 +1,4 @@ -package org.oppia.app.view +package org.oppia.android.app.view import javax.inject.Scope diff --git a/app/src/main/java/org/oppia/android/app/viewmodel/ObservableArrayList.kt b/app/src/main/java/org/oppia/android/app/viewmodel/ObservableArrayList.kt index 0cdcc4ebc82..efe78307d12 100644 --- a/app/src/main/java/org/oppia/android/app/viewmodel/ObservableArrayList.kt +++ b/app/src/main/java/org/oppia/android/app/viewmodel/ObservableArrayList.kt @@ -1,4 +1,4 @@ -package org.oppia.app.viewmodel +package org.oppia.android.app.viewmodel import androidx.databinding.ListChangeRegistry import androidx.databinding.ObservableList diff --git a/app/src/main/java/org/oppia/android/app/viewmodel/ObservableViewModel.kt b/app/src/main/java/org/oppia/android/app/viewmodel/ObservableViewModel.kt index 3eff35e00dc..558bb071d15 100644 --- a/app/src/main/java/org/oppia/android/app/viewmodel/ObservableViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/viewmodel/ObservableViewModel.kt @@ -1,4 +1,4 @@ -package org.oppia.app.viewmodel +package org.oppia.android.app.viewmodel import androidx.databinding.Observable import androidx.databinding.PropertyChangeRegistry diff --git a/app/src/main/java/org/oppia/android/app/viewmodel/ViewModelBridgeFactory.kt b/app/src/main/java/org/oppia/android/app/viewmodel/ViewModelBridgeFactory.kt index f4742376497..50838b1e02e 100644 --- a/app/src/main/java/org/oppia/android/app/viewmodel/ViewModelBridgeFactory.kt +++ b/app/src/main/java/org/oppia/android/app/viewmodel/ViewModelBridgeFactory.kt @@ -1,4 +1,4 @@ -package org.oppia.app.viewmodel +package org.oppia.android.app.viewmodel import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider diff --git a/app/src/main/java/org/oppia/android/app/viewmodel/ViewModelProvider.kt b/app/src/main/java/org/oppia/android/app/viewmodel/ViewModelProvider.kt index d3c84c3e724..76d6ec4871d 100644 --- a/app/src/main/java/org/oppia/android/app/viewmodel/ViewModelProvider.kt +++ b/app/src/main/java/org/oppia/android/app/viewmodel/ViewModelProvider.kt @@ -1,4 +1,4 @@ -package org.oppia.app.viewmodel +package org.oppia.android.app.viewmodel import androidx.appcompat.app.AppCompatActivity import androidx.fragment.app.Fragment diff --git a/app/src/main/java/org/oppia/android/app/walkthrough/WalkthroughActivity.kt b/app/src/main/java/org/oppia/android/app/walkthrough/WalkthroughActivity.kt index 4fa2fa5ee40..8e62c6f3974 100644 --- a/app/src/main/java/org/oppia/android/app/walkthrough/WalkthroughActivity.kt +++ b/app/src/main/java/org/oppia/android/app/walkthrough/WalkthroughActivity.kt @@ -1,9 +1,9 @@ -package org.oppia.app.walkthrough +package org.oppia.android.app.walkthrough import android.content.Context import android.content.Intent import android.os.Bundle -import org.oppia.app.activity.InjectableAppCompatActivity +import org.oppia.android.app.activity.InjectableAppCompatActivity import javax.inject.Inject /** Activity that contains the walkthrough flow for users. */ diff --git a/app/src/main/java/org/oppia/android/app/walkthrough/WalkthroughActivityListener.kt b/app/src/main/java/org/oppia/android/app/walkthrough/WalkthroughActivityListener.kt index ed3f92d6e53..014088235e0 100644 --- a/app/src/main/java/org/oppia/android/app/walkthrough/WalkthroughActivityListener.kt +++ b/app/src/main/java/org/oppia/android/app/walkthrough/WalkthroughActivityListener.kt @@ -1,4 +1,4 @@ -package org.oppia.app.walkthrough +package org.oppia.android.app.walkthrough /** Listener for when an activity should move to a previous page during a walkthrough flow. */ interface WalkthroughActivityListener { diff --git a/app/src/main/java/org/oppia/android/app/walkthrough/WalkthroughActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/walkthrough/WalkthroughActivityPresenter.kt index 6c629abd16a..cad40c9a76d 100644 --- a/app/src/main/java/org/oppia/android/app/walkthrough/WalkthroughActivityPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/walkthrough/WalkthroughActivityPresenter.kt @@ -1,15 +1,15 @@ -package org.oppia.app.walkthrough +package org.oppia.android.app.walkthrough import androidx.appcompat.app.AppCompatActivity import androidx.databinding.DataBindingUtil -import org.oppia.app.R -import org.oppia.app.activity.ActivityScope -import org.oppia.app.databinding.WalkthroughActivityBinding -import org.oppia.app.viewmodel.ViewModelProvider -import org.oppia.app.walkthrough.end.WalkthroughFinalFragment -import org.oppia.app.walkthrough.topiclist.WalkthroughTopicListFragment -import org.oppia.app.walkthrough.welcome.WalkthroughWelcomeFragment -import org.oppia.util.statusbar.StatusBarColor +import org.oppia.android.R +import org.oppia.android.app.activity.ActivityScope +import org.oppia.android.app.viewmodel.ViewModelProvider +import org.oppia.android.app.walkthrough.end.WalkthroughFinalFragment +import org.oppia.android.app.walkthrough.topiclist.WalkthroughTopicListFragment +import org.oppia.android.app.walkthrough.welcome.WalkthroughWelcomeFragment +import org.oppia.android.databinding.WalkthroughActivityBinding +import org.oppia.android.util.statusbar.StatusBarColor import javax.inject.Inject /** The presenter for [WalkthroughActivity]. */ diff --git a/app/src/main/java/org/oppia/android/app/walkthrough/WalkthroughFragmentChangeListener.kt b/app/src/main/java/org/oppia/android/app/walkthrough/WalkthroughFragmentChangeListener.kt index ec738ec030e..6a67f1cdeb3 100644 --- a/app/src/main/java/org/oppia/android/app/walkthrough/WalkthroughFragmentChangeListener.kt +++ b/app/src/main/java/org/oppia/android/app/walkthrough/WalkthroughFragmentChangeListener.kt @@ -1,4 +1,4 @@ -package org.oppia.app.walkthrough +package org.oppia.android.app.walkthrough /** Listener for when an activity should change a fragment position. */ interface WalkthroughFragmentChangeListener { diff --git a/app/src/main/java/org/oppia/android/app/walkthrough/WalkthroughPageChanger.kt b/app/src/main/java/org/oppia/android/app/walkthrough/WalkthroughPageChanger.kt index e4e4b3e595e..c1c4ff21be8 100644 --- a/app/src/main/java/org/oppia/android/app/walkthrough/WalkthroughPageChanger.kt +++ b/app/src/main/java/org/oppia/android/app/walkthrough/WalkthroughPageChanger.kt @@ -1,4 +1,4 @@ -package org.oppia.app.walkthrough +package org.oppia.android.app.walkthrough /** * Listener for when an activity should change pages during the app walkthrough flow's welcome diff --git a/app/src/main/java/org/oppia/android/app/walkthrough/WalkthroughPages.kt b/app/src/main/java/org/oppia/android/app/walkthrough/WalkthroughPages.kt index cd95a63ca26..d85e58fb7a8 100644 --- a/app/src/main/java/org/oppia/android/app/walkthrough/WalkthroughPages.kt +++ b/app/src/main/java/org/oppia/android/app/walkthrough/WalkthroughPages.kt @@ -1,4 +1,4 @@ -package org.oppia.app.walkthrough +package org.oppia.android.app.walkthrough /** Represents current state of [WalkthroughActivity]. */ enum class WalkthroughPages(val value: Int) { diff --git a/app/src/main/java/org/oppia/android/app/walkthrough/WalkthroughViewModel.kt b/app/src/main/java/org/oppia/android/app/walkthrough/WalkthroughViewModel.kt index 77813843980..e0c37309550 100644 --- a/app/src/main/java/org/oppia/android/app/walkthrough/WalkthroughViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/walkthrough/WalkthroughViewModel.kt @@ -1,8 +1,8 @@ -package org.oppia.app.walkthrough +package org.oppia.android.app.walkthrough import androidx.databinding.ObservableField import androidx.lifecycle.ViewModel -import org.oppia.app.viewmodel.ObservableViewModel +import org.oppia.android.app.viewmodel.ObservableViewModel import javax.inject.Inject /** [ViewModel] for [WalkthroughActivity]. */ diff --git a/app/src/main/java/org/oppia/android/app/walkthrough/end/WalkthroughEndPageChanger.kt b/app/src/main/java/org/oppia/android/app/walkthrough/end/WalkthroughEndPageChanger.kt index 14b2bc39b7d..c21ea4e030f 100644 --- a/app/src/main/java/org/oppia/android/app/walkthrough/end/WalkthroughEndPageChanger.kt +++ b/app/src/main/java/org/oppia/android/app/walkthrough/end/WalkthroughEndPageChanger.kt @@ -1,4 +1,4 @@ -package org.oppia.app.walkthrough.end +package org.oppia.android.app.walkthrough.end /** Listener for when an activity should go back a page. */ interface WalkthroughEndPageChanger { diff --git a/app/src/main/java/org/oppia/android/app/walkthrough/end/WalkthroughFinalFragment.kt b/app/src/main/java/org/oppia/android/app/walkthrough/end/WalkthroughFinalFragment.kt index 20bae4b7588..b95cd0ba9b7 100644 --- a/app/src/main/java/org/oppia/android/app/walkthrough/end/WalkthroughFinalFragment.kt +++ b/app/src/main/java/org/oppia/android/app/walkthrough/end/WalkthroughFinalFragment.kt @@ -1,11 +1,11 @@ -package org.oppia.app.walkthrough.end +package org.oppia.android.app.walkthrough.end import android.content.Context import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import org.oppia.app.fragment.InjectableFragment +import org.oppia.android.app.fragment.InjectableFragment import javax.inject.Inject private const val KEY_TOPIC_ID_ARGUMENT = "TOPIC_ID" diff --git a/app/src/main/java/org/oppia/android/app/walkthrough/end/WalkthroughFinalFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/walkthrough/end/WalkthroughFinalFragmentPresenter.kt index 84f2c7aa20e..eb581788425 100644 --- a/app/src/main/java/org/oppia/android/app/walkthrough/end/WalkthroughFinalFragmentPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/walkthrough/end/WalkthroughFinalFragmentPresenter.kt @@ -1,4 +1,4 @@ -package org.oppia.app.walkthrough.end +package org.oppia.android.app.walkthrough.end import android.view.LayoutInflater import android.view.View @@ -8,15 +8,15 @@ import androidx.fragment.app.Fragment import androidx.lifecycle.LiveData import androidx.lifecycle.Observer import androidx.lifecycle.Transformations -import org.oppia.app.R -import org.oppia.app.databinding.WalkthroughFinalFragmentBinding -import org.oppia.app.fragment.FragmentScope -import org.oppia.app.model.ProfileId -import org.oppia.app.model.Topic -import org.oppia.app.walkthrough.WalkthroughActivity -import org.oppia.domain.topic.TopicController -import org.oppia.util.data.AsyncResult -import org.oppia.util.logging.ConsoleLogger +import org.oppia.android.R +import org.oppia.android.app.fragment.FragmentScope +import org.oppia.android.app.model.ProfileId +import org.oppia.android.app.model.Topic +import org.oppia.android.app.walkthrough.WalkthroughActivity +import org.oppia.android.databinding.WalkthroughFinalFragmentBinding +import org.oppia.android.domain.topic.TopicController +import org.oppia.android.util.data.AsyncResult +import org.oppia.android.util.logging.ConsoleLogger import javax.inject.Inject /** The presenter for [WalkthroughFinalFragment]. */ diff --git a/app/src/main/java/org/oppia/android/app/walkthrough/end/WalkthroughFinalListener.kt b/app/src/main/java/org/oppia/android/app/walkthrough/end/WalkthroughFinalListener.kt index fab3aa9654e..5869ddc2f6c 100644 --- a/app/src/main/java/org/oppia/android/app/walkthrough/end/WalkthroughFinalListener.kt +++ b/app/src/main/java/org/oppia/android/app/walkthrough/end/WalkthroughFinalListener.kt @@ -1,4 +1,4 @@ -package org.oppia.app.walkthrough.end +package org.oppia.android.app.walkthrough.end /** Listener for when an activity should change a fragment position. */ interface WalkthroughFinalListener { diff --git a/app/src/main/java/org/oppia/android/app/walkthrough/end/WalkthroughFinalViewModel.kt b/app/src/main/java/org/oppia/android/app/walkthrough/end/WalkthroughFinalViewModel.kt index d16f5797f52..37e2b3fa6b3 100644 --- a/app/src/main/java/org/oppia/android/app/walkthrough/end/WalkthroughFinalViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/walkthrough/end/WalkthroughFinalViewModel.kt @@ -1,7 +1,7 @@ -package org.oppia.app.walkthrough.end +package org.oppia.android.app.walkthrough.end import androidx.databinding.ObservableField -import org.oppia.app.viewmodel.ObservableViewModel +import org.oppia.android.app.viewmodel.ObservableViewModel /** [ViewModel] for displaying topic name in walkthrough final fragment. */ class WalkthroughFinalViewModel : ObservableViewModel() { diff --git a/app/src/main/java/org/oppia/android/app/walkthrough/topiclist/WalkthroughTopicItemViewModel.kt b/app/src/main/java/org/oppia/android/app/walkthrough/topiclist/WalkthroughTopicItemViewModel.kt index af4e9e1b8ed..f8636379445 100644 --- a/app/src/main/java/org/oppia/android/app/walkthrough/topiclist/WalkthroughTopicItemViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/walkthrough/topiclist/WalkthroughTopicItemViewModel.kt @@ -1,6 +1,6 @@ -package org.oppia.app.walkthrough.topiclist +package org.oppia.android.app.walkthrough.topiclist -import org.oppia.app.viewmodel.ObservableViewModel +import org.oppia.android.app.viewmodel.ObservableViewModel /** Super-class for generalising different views for the recyclerView in [WalkthroughTopicListFragment] */ abstract class WalkthroughTopicItemViewModel : ObservableViewModel() diff --git a/app/src/main/java/org/oppia/android/app/walkthrough/topiclist/WalkthroughTopicListFragment.kt b/app/src/main/java/org/oppia/android/app/walkthrough/topiclist/WalkthroughTopicListFragment.kt index 9850f7a00d2..e85fbf16fbf 100644 --- a/app/src/main/java/org/oppia/android/app/walkthrough/topiclist/WalkthroughTopicListFragment.kt +++ b/app/src/main/java/org/oppia/android/app/walkthrough/topiclist/WalkthroughTopicListFragment.kt @@ -1,13 +1,13 @@ -package org.oppia.app.walkthrough.topiclist +package org.oppia.android.app.walkthrough.topiclist import android.content.Context import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import org.oppia.app.fragment.InjectableFragment -import org.oppia.app.home.topiclist.TopicSummaryClickListener -import org.oppia.app.model.TopicSummary +import org.oppia.android.app.fragment.InjectableFragment +import org.oppia.android.app.home.topiclist.TopicSummaryClickListener +import org.oppia.android.app.model.TopicSummary import javax.inject.Inject /** The second slide for [WalkthroughActivity]. */ diff --git a/app/src/main/java/org/oppia/android/app/walkthrough/topiclist/WalkthroughTopicListFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/walkthrough/topiclist/WalkthroughTopicListFragmentPresenter.kt index d0360e4ecb9..deef5d17312 100644 --- a/app/src/main/java/org/oppia/android/app/walkthrough/topiclist/WalkthroughTopicListFragmentPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/walkthrough/topiclist/WalkthroughTopicListFragmentPresenter.kt @@ -1,4 +1,4 @@ -package org.oppia.app.walkthrough.topiclist +package org.oppia.android.app.walkthrough.topiclist import android.content.res.Configuration import android.content.res.Resources @@ -8,17 +8,17 @@ import android.view.ViewGroup import androidx.appcompat.app.AppCompatActivity import androidx.fragment.app.Fragment import androidx.recyclerview.widget.GridLayoutManager -import org.oppia.app.databinding.WalkthroughTopicHeaderViewBinding -import org.oppia.app.databinding.WalkthroughTopicListFragmentBinding -import org.oppia.app.databinding.WalkthroughTopicSummaryViewBinding -import org.oppia.app.fragment.FragmentScope -import org.oppia.app.model.TopicSummary -import org.oppia.app.recyclerview.BindableAdapter -import org.oppia.app.viewmodel.ViewModelProvider -import org.oppia.app.walkthrough.WalkthroughFragmentChangeListener -import org.oppia.app.walkthrough.WalkthroughPages -import org.oppia.app.walkthrough.topiclist.topiclistviewmodel.WalkthroughTopicHeaderViewModel -import org.oppia.app.walkthrough.topiclist.topiclistviewmodel.WalkthroughTopicSummaryViewModel +import org.oppia.android.app.fragment.FragmentScope +import org.oppia.android.app.model.TopicSummary +import org.oppia.android.app.recyclerview.BindableAdapter +import org.oppia.android.app.viewmodel.ViewModelProvider +import org.oppia.android.app.walkthrough.WalkthroughFragmentChangeListener +import org.oppia.android.app.walkthrough.WalkthroughPages +import org.oppia.android.app.walkthrough.topiclist.topiclistviewmodel.WalkthroughTopicHeaderViewModel +import org.oppia.android.app.walkthrough.topiclist.topiclistviewmodel.WalkthroughTopicSummaryViewModel +import org.oppia.android.databinding.WalkthroughTopicHeaderViewBinding +import org.oppia.android.databinding.WalkthroughTopicListFragmentBinding +import org.oppia.android.databinding.WalkthroughTopicSummaryViewBinding import javax.inject.Inject /** The presenter for [WalkthroughTopicListFragment]. */ diff --git a/app/src/main/java/org/oppia/android/app/walkthrough/topiclist/WalkthroughTopicViewModel.kt b/app/src/main/java/org/oppia/android/app/walkthrough/topiclist/WalkthroughTopicViewModel.kt index 7486be9668b..aece4a4e451 100644 --- a/app/src/main/java/org/oppia/android/app/walkthrough/topiclist/WalkthroughTopicViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/walkthrough/topiclist/WalkthroughTopicViewModel.kt @@ -1,16 +1,16 @@ -package org.oppia.app.walkthrough.topiclist +package org.oppia.android.app.walkthrough.topiclist import androidx.fragment.app.Fragment import androidx.lifecycle.LiveData import androidx.lifecycle.Transformations -import org.oppia.app.home.topiclist.TopicSummaryClickListener -import org.oppia.app.model.TopicList -import org.oppia.app.viewmodel.ObservableViewModel -import org.oppia.app.walkthrough.topiclist.topiclistviewmodel.WalkthroughTopicHeaderViewModel -import org.oppia.app.walkthrough.topiclist.topiclistviewmodel.WalkthroughTopicSummaryViewModel -import org.oppia.domain.topic.TopicListController -import org.oppia.util.data.AsyncResult -import org.oppia.util.logging.ConsoleLogger +import org.oppia.android.app.home.topiclist.TopicSummaryClickListener +import org.oppia.android.app.model.TopicList +import org.oppia.android.app.viewmodel.ObservableViewModel +import org.oppia.android.app.walkthrough.topiclist.topiclistviewmodel.WalkthroughTopicHeaderViewModel +import org.oppia.android.app.walkthrough.topiclist.topiclistviewmodel.WalkthroughTopicSummaryViewModel +import org.oppia.android.domain.topic.TopicListController +import org.oppia.android.util.data.AsyncResult +import org.oppia.android.util.logging.ConsoleLogger import javax.inject.Inject /** The ObservableViewModel for [WalkthroughTopicListFragment]. */ diff --git a/app/src/main/java/org/oppia/android/app/walkthrough/topiclist/topiclistviewmodel/WalkthroughTopicHeaderViewModel.kt b/app/src/main/java/org/oppia/android/app/walkthrough/topiclist/topiclistviewmodel/WalkthroughTopicHeaderViewModel.kt index 486bf658840..974ae4b090a 100644 --- a/app/src/main/java/org/oppia/android/app/walkthrough/topiclist/topiclistviewmodel/WalkthroughTopicHeaderViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/walkthrough/topiclist/topiclistviewmodel/WalkthroughTopicHeaderViewModel.kt @@ -1,7 +1,7 @@ -package org.oppia.app.walkthrough.topiclist.topiclistviewmodel +package org.oppia.android.app.walkthrough.topiclist.topiclistviewmodel import androidx.lifecycle.ViewModel -import org.oppia.app.walkthrough.topiclist.WalkthroughTopicItemViewModel +import org.oppia.android.app.walkthrough.topiclist.WalkthroughTopicItemViewModel /** [ViewModel] What do want to learn text in [WalkthroughTopicListFragment]. */ class WalkthroughTopicHeaderViewModel : WalkthroughTopicItemViewModel() diff --git a/app/src/main/java/org/oppia/android/app/walkthrough/topiclist/topiclistviewmodel/WalkthroughTopicSummaryViewModel.kt b/app/src/main/java/org/oppia/android/app/walkthrough/topiclist/topiclistviewmodel/WalkthroughTopicSummaryViewModel.kt index 5257aab247a..ba35abefe5f 100644 --- a/app/src/main/java/org/oppia/android/app/walkthrough/topiclist/topiclistviewmodel/WalkthroughTopicSummaryViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/walkthrough/topiclist/topiclistviewmodel/WalkthroughTopicSummaryViewModel.kt @@ -1,11 +1,11 @@ -package org.oppia.app.walkthrough.topiclist.topiclistviewmodel +package org.oppia.android.app.walkthrough.topiclist.topiclistviewmodel import android.graphics.Color import androidx.annotation.ColorInt import androidx.lifecycle.ViewModel -import org.oppia.app.home.topiclist.TopicSummaryClickListener -import org.oppia.app.model.TopicSummary -import org.oppia.app.walkthrough.topiclist.WalkthroughTopicItemViewModel +import org.oppia.android.app.home.topiclist.TopicSummaryClickListener +import org.oppia.android.app.model.TopicSummary +import org.oppia.android.app.walkthrough.topiclist.WalkthroughTopicItemViewModel // TODO(#206): Remove the color darkening computation and properly set up the topic thumbnails. // These values were roughly computed based on the mocks. They won't produce the same colors since darker colors in the diff --git a/app/src/main/java/org/oppia/android/app/walkthrough/welcome/WalkthroughWelcomeFragment.kt b/app/src/main/java/org/oppia/android/app/walkthrough/welcome/WalkthroughWelcomeFragment.kt index b3d5be06860..d5c604c51e2 100644 --- a/app/src/main/java/org/oppia/android/app/walkthrough/welcome/WalkthroughWelcomeFragment.kt +++ b/app/src/main/java/org/oppia/android/app/walkthrough/welcome/WalkthroughWelcomeFragment.kt @@ -1,11 +1,11 @@ -package org.oppia.app.walkthrough.welcome +package org.oppia.android.app.walkthrough.welcome import android.content.Context import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import org.oppia.app.fragment.InjectableFragment +import org.oppia.android.app.fragment.InjectableFragment import javax.inject.Inject /** The first slide for [WalkthroughActivity]. */ diff --git a/app/src/main/java/org/oppia/android/app/walkthrough/welcome/WalkthroughWelcomeFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/walkthrough/welcome/WalkthroughWelcomeFragmentPresenter.kt index 223c296c4ea..1aed5dc5320 100644 --- a/app/src/main/java/org/oppia/android/app/walkthrough/welcome/WalkthroughWelcomeFragmentPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/walkthrough/welcome/WalkthroughWelcomeFragmentPresenter.kt @@ -1,4 +1,4 @@ -package org.oppia.app.walkthrough.welcome +package org.oppia.android.app.walkthrough.welcome import android.view.LayoutInflater import android.view.View @@ -8,18 +8,18 @@ import androidx.fragment.app.Fragment import androidx.lifecycle.LiveData import androidx.lifecycle.Observer import androidx.lifecycle.Transformations -import org.oppia.app.R -import org.oppia.app.databinding.WalkthroughWelcomeFragmentBinding -import org.oppia.app.fragment.FragmentScope -import org.oppia.app.model.Profile -import org.oppia.app.model.ProfileId -import org.oppia.app.walkthrough.WalkthroughActivity -import org.oppia.app.walkthrough.WalkthroughFragmentChangeListener -import org.oppia.app.walkthrough.WalkthroughPageChanger -import org.oppia.app.walkthrough.WalkthroughPages -import org.oppia.domain.profile.ProfileManagementController -import org.oppia.util.data.AsyncResult -import org.oppia.util.logging.ConsoleLogger +import org.oppia.android.R +import org.oppia.android.app.fragment.FragmentScope +import org.oppia.android.app.model.Profile +import org.oppia.android.app.model.ProfileId +import org.oppia.android.app.walkthrough.WalkthroughActivity +import org.oppia.android.app.walkthrough.WalkthroughFragmentChangeListener +import org.oppia.android.app.walkthrough.WalkthroughPageChanger +import org.oppia.android.app.walkthrough.WalkthroughPages +import org.oppia.android.databinding.WalkthroughWelcomeFragmentBinding +import org.oppia.android.domain.profile.ProfileManagementController +import org.oppia.android.util.data.AsyncResult +import org.oppia.android.util.logging.ConsoleLogger import javax.inject.Inject /** The presenter for [WalkthroughWelcomeFragment]. */ diff --git a/app/src/main/java/org/oppia/android/app/walkthrough/welcome/WalkthroughWelcomeViewModel.kt b/app/src/main/java/org/oppia/android/app/walkthrough/welcome/WalkthroughWelcomeViewModel.kt index e9a000b075a..334a1d1044c 100644 --- a/app/src/main/java/org/oppia/android/app/walkthrough/welcome/WalkthroughWelcomeViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/walkthrough/welcome/WalkthroughWelcomeViewModel.kt @@ -1,7 +1,7 @@ -package org.oppia.app.walkthrough.welcome +package org.oppia.android.app.walkthrough.welcome import androidx.databinding.ObservableField -import org.oppia.app.viewmodel.ObservableViewModel +import org.oppia.android.app.viewmodel.ObservableViewModel /** [ViewModel] for displaying user profile details in walkthrough welcome fragment. */ class WalkthroughWelcomeViewModel : ObservableViewModel() { diff --git a/app/src/main/res/layout-land/add_profile_activity.xml b/app/src/main/res/layout-land/add_profile_activity.xml index 789f5da64f6..198f92d8445 100644 --- a/app/src/main/res/layout-land/add_profile_activity.xml +++ b/app/src/main/res/layout-land/add_profile_activity.xml @@ -9,7 +9,7 @@ + type="org.oppia.android.app.profile.AddProfileViewModel" /> - - - + type="org.oppia.android.app.profile.AdminAuthViewModel" /> - + type="org.oppia.android.app.profile.AdminPinViewModel" /> - - + type="org.oppia.android.app.profile.AdminSettingsViewModel" /> - + type="org.oppia.android.app.administratorcontrols.administratorcontrolsitemviewmodel.AdministratorControlsAccountActionsViewModel" /> + type="org.oppia.android.app.administratorcontrols.administratorcontrolsitemviewmodel.AdministratorControlsAppInformationViewModel" /> + type="org.oppia.android.app.administratorcontrols.administratorcontrolsitemviewmodel.AdministratorControlsDownloadPermissionsViewModel" /> + type="org.oppia.android.app.administratorcontrols.AdministratorControlsViewModel" /> + type="org.oppia.android.app.administratorcontrols.administratorcontrolsitemviewmodel.AdministratorControlsGeneralViewModel" /> + type="org.oppia.android.app.administratorcontrols.administratorcontrolsitemviewmodel.AdministratorControlsProfileViewModel" /> + type="org.oppia.android.app.administratorcontrols.appversion.AppVersionViewModel" /> + type="org.oppia.android.app.completedstorylist.CompletedStoryItemViewModel" /> - + type="org.oppia.android.app.completedstorylist.CompletedStoryListViewModel" /> + type="org.oppia.android.app.topic.conceptcard.ConceptCardViewModel" /> + type="org.oppia.android.app.player.state.itemviewmodel.ContentViewModel" /> + type="org.oppia.android.app.player.state.itemviewmodel.ContinueInteractionViewModel" /> + type="org.oppia.android.app.player.state.itemviewmodel.ContinueNavigationButtonViewModel" /> + type="org.oppia.android.app.player.state.itemviewmodel.DragAndDropSortInteractionViewModel" /> @@ -56,7 +56,7 @@ android:textStyle="italic" android:visibility="@{viewModel.getGroupingStatus()? View.VISIBLE : View.GONE}" /> - + type="org.oppia.android.app.help.faq.faqItemViewModel.FAQContentViewModel" /> + type="org.oppia.android.app.help.faq.faqItemViewModel.FAQHeaderViewModel" /> + type="org.oppia.android.app.help.faq.FAQListViewModel" /> + type="org.oppia.android.app.player.state.itemviewmodel.FeedbackViewModel" /> + type="org.oppia.android.app.player.state.itemviewmodel.FractionInteractionViewModel" /> - + type="org.oppia.android.app.help.HelpItemViewModel" /> + type="org.oppia.android.app.hintsandsolution.HintsViewModel" /> + type="org.oppia.android.app.hintsandsolution.HintsViewModel" /> - + diff --git a/app/src/main/res/layout-land/lessons_chapter_view.xml b/app/src/main/res/layout-land/lessons_chapter_view.xml index 2b9f5181d26..03cfc75286c 100644 --- a/app/src/main/res/layout-land/lessons_chapter_view.xml +++ b/app/src/main/res/layout-land/lessons_chapter_view.xml @@ -5,7 +5,7 @@ - + + type="org.oppia.android.app.model.ChapterSummary" /> + type="org.oppia.android.app.player.state.itemviewmodel.NextButtonViewModel" /> + type="org.oppia.android.app.player.state.itemviewmodel.NumericInputViewModel" /> - + type="org.oppia.android.app.onboarding.OnboardingNavigationListener" /> + type="org.oppia.android.app.onboarding.OnboardingViewModel" /> + type="org.oppia.android.app.onboarding.OnboardingSlideViewModel" /> + type="org.oppia.android.app.onboarding.OnboardingSlideFinalViewModel" /> + type="org.oppia.android.app.home.recentlyplayed.OngoingStoryViewModel" /> - - + + type="org.oppia.android.app.ongoingtopiclist.OngoingTopicItemViewModel" /> - + type="org.oppia.android.app.ongoingtopiclist.OngoingTopicListViewModel" /> + type="org.oppia.android.app.options.OptionsAppLanguageViewModel" /> + type="org.oppia.android.app.options.OptionsAudioLanguageViewModel" /> + type="org.oppia.android.app.options.OptionsReadingTextSizeViewModel" /> + type="org.oppia.android.app.options.OptionControlsViewModel" /> + type="org.oppia.android.app.profile.PinPasswordViewModel" /> + type="org.oppia.android.app.player.state.itemviewmodel.PreviousButtonViewModel" /> + type="org.oppia.android.app.player.state.itemviewmodel.PreviousResponsesHeaderViewModel" /> + type="org.oppia.android.app.profile.ProfileChooserViewModel" /> + type="org.oppia.android.app.model.ProfileChooserUiModel" /> + type="org.oppia.android.app.settings.profile.ProfileEditViewModel" /> + type="org.oppia.android.app.settings.profile.ProfileListViewModel" /> + type="org.oppia.android.app.model.Profile" /> + type="org.oppia.android.app.profileprogress.ProfilePictureActivityViewModel" /> + type="org.oppia.android.app.profileprogress.ProfileProgressViewModel" /> + type="org.oppia.android.app.profileprogress.ProfileProgressHeaderViewModel" /> + type="org.oppia.android.app.profileprogress.RecentlyPlayedStorySummaryViewModel" /> - + type="org.oppia.android.app.settings.profile.ProfileRenameViewModel" /> - + type="org.oppia.android.app.settings.profile.ProfileResetPinViewModel" /> - - + type="org.oppia.android.app.home.topiclist.PromotedStoryViewModel" /> - + type="org.oppia.android.app.home.topiclist.PromotedStoryListViewModel" /> + type="org.oppia.android.app.topic.questionplayer.QuestionPlayerViewModel" /> + type="org.oppia.android.app.player.state.itemviewmodel.ReplayButtonViewModel" /> + type="org.oppia.android.app.profile.ResetPinViewModel" /> - + type="org.oppia.android.app.player.state.itemviewmodel.ReturnToTopicButtonViewModel" /> + type="org.oppia.android.app.topic.revisioncard.RevisionCardViewModel" /> + type="org.oppia.android.app.home.recentlyplayed.SectionTitleViewModel" /> - + + type="org.oppia.android.app.player.state.itemviewmodel.SelectionInteractionViewModel" /> - + type="org.oppia.android.app.hintsandsolution.SolutionViewModel" /> + type="org.oppia.android.app.player.state.StateViewModel" /> - + + type="org.oppia.android.app.story.storyitemviewmodel.StoryChapterSummaryViewModel" /> + type="org.oppia.android.app.story.StoryViewModel" /> + type="org.oppia.android.app.story.storyitemviewmodel.StoryHeaderViewModel" /> + type="org.oppia.android.app.player.state.itemviewmodel.SubmitButtonViewModel" /> + type="org.oppia.android.app.model.ListOfSetsOfHtmlStrings" /> + type="org.oppia.android.app.player.state.itemviewmodel.SubmittedAnswerViewModel" /> + type="org.oppia.android.app.player.state.itemviewmodel.TextInputViewModel" /> - + type="org.oppia.android.app.topic.info.TopicInfoViewModel" /> + type="org.oppia.android.app.topic.lessons.StorySummaryViewModel" /> - diff --git a/app/src/main/res/layout-land/topic_lessons_title.xml b/app/src/main/res/layout-land/topic_lessons_title.xml index 76b2cf3642d..360b9aa809a 100644 --- a/app/src/main/res/layout-land/topic_lessons_title.xml +++ b/app/src/main/res/layout-land/topic_lessons_title.xml @@ -7,7 +7,7 @@ + type="org.oppia.android.app.home.recentlyplayed.SectionTitleViewModel" /> + type="org.oppia.android.app.topic.practice.practiceitemviewmodel.TopicPracticeFooterViewModel" /> + type="org.oppia.android.app.topic.practice.TopicPracticeViewModel" /> + type="org.oppia.android.app.topic.practice.practiceitemviewmodel.TopicPracticeHeaderViewModel" /> + type="org.oppia.android.app.topic.practice.practiceitemviewmodel.TopicPracticeSubtopicViewModel" /> + type="org.oppia.android.app.topic.revision.TopicRevisionViewModel" /> - + + type="org.oppia.android.app.topic.revision.revisionitemviewmodel.TopicRevisionItemViewModel" /> - + type="org.oppia.android.app.home.topiclist.TopicSummaryViewModel" /> - + type="org.oppia.android.app.walkthrough.end.WalkthroughFinalViewModel" /> + type="org.oppia.android.app.walkthrough.end.WalkthroughEndPageChanger" /> + type="org.oppia.android.app.walkthrough.welcome.WalkthroughWelcomeViewModel" /> + type="org.oppia.android.app.walkthrough.WalkthroughPageChanger" /> + type="org.oppia.android.app.home.WelcomeViewModel" /> + type="org.oppia.android.app.completedstorylist.CompletedStoryItemViewModel" /> - + type="org.oppia.android.app.completedstorylist.CompletedStoryListViewModel" /> + type="org.oppia.android.app.topic.conceptcard.ConceptCardViewModel" /> + type="org.oppia.android.app.player.state.itemviewmodel.ContentViewModel" /> + type="org.oppia.android.app.player.state.itemviewmodel.ContinueInteractionViewModel" /> + type="org.oppia.android.app.player.state.itemviewmodel.ContinueNavigationButtonViewModel" /> + type="org.oppia.android.app.player.state.itemviewmodel.DragAndDropSortInteractionViewModel" /> @@ -55,7 +55,7 @@ android:textStyle="italic" android:visibility="@{viewModel.getGroupingStatus()? View.VISIBLE : View.GONE}" /> - + type="org.oppia.android.app.player.state.itemviewmodel.FeedbackViewModel" /> + type="org.oppia.android.app.player.state.itemviewmodel.FractionInteractionViewModel" /> - + type="org.oppia.android.app.hintsandsolution.HintsViewModel" /> + type="org.oppia.android.app.hintsandsolution.HintsViewModel" /> - + diff --git a/app/src/main/res/layout-sw600dp-land/next_button_item.xml b/app/src/main/res/layout-sw600dp-land/next_button_item.xml index 686b50b3c37..3ec2e087267 100644 --- a/app/src/main/res/layout-sw600dp-land/next_button_item.xml +++ b/app/src/main/res/layout-sw600dp-land/next_button_item.xml @@ -8,7 +8,7 @@ + type="org.oppia.android.app.player.state.itemviewmodel.NextButtonViewModel" /> + type="org.oppia.android.app.player.state.itemviewmodel.NumericInputViewModel" /> - + type="org.oppia.android.app.onboarding.OnboardingNavigationListener" /> + type="org.oppia.android.app.onboarding.OnboardingViewModel" /> + type="org.oppia.android.app.onboarding.OnboardingSlideViewModel" /> + type="org.oppia.android.app.onboarding.OnboardingSlideFinalViewModel" /> + type="org.oppia.android.app.home.recentlyplayed.OngoingStoryViewModel" /> - - + + type="org.oppia.android.app.ongoingtopiclist.OngoingTopicItemViewModel" /> - + type="org.oppia.android.app.ongoingtopiclist.OngoingTopicListViewModel" /> + type="org.oppia.android.app.player.state.itemviewmodel.PreviousButtonViewModel" /> + type="org.oppia.android.app.player.state.itemviewmodel.PreviousResponsesHeaderViewModel" /> + type="org.oppia.android.app.profile.ProfileChooserViewModel" /> + type="org.oppia.android.app.model.ProfileChooserUiModel" /> + type="org.oppia.android.app.profileprogress.ProfileProgressViewModel" /> + type="org.oppia.android.app.profileprogress.ProfileProgressHeaderViewModel" /> + type="org.oppia.android.app.profileprogress.RecentlyPlayedStorySummaryViewModel" /> - + type="org.oppia.android.app.home.topiclist.PromotedStoryViewModel" /> - + type="org.oppia.android.app.home.topiclist.PromotedStoryListViewModel" /> + type="org.oppia.android.app.topic.questionplayer.QuestionPlayerViewModel" /> + type="org.oppia.android.app.player.state.itemviewmodel.ReplayButtonViewModel" /> + type="org.oppia.android.app.player.state.itemviewmodel.ReturnToTopicButtonViewModel" /> + type="org.oppia.android.app.home.recentlyplayed.SectionTitleViewModel" /> - + + type="org.oppia.android.app.player.state.itemviewmodel.SelectionInteractionViewModel" /> - + type="org.oppia.android.app.hintsandsolution.SolutionViewModel" /> + type="org.oppia.android.app.player.state.StateViewModel" /> + type="org.oppia.android.app.player.state.itemviewmodel.SubmitButtonViewModel" /> + type="org.oppia.android.app.model.ListOfSetsOfHtmlStrings" /> + type="org.oppia.android.app.player.state.itemviewmodel.SubmittedAnswerViewModel" /> + type="org.oppia.android.app.player.state.itemviewmodel.TextInputViewModel" /> - + type="org.oppia.android.app.topic.TopicViewModel" /> + type="org.oppia.android.app.topic.info.TopicInfoViewModel" /> - + type="org.oppia.android.app.topic.lessons.StorySummaryViewModel" /> - diff --git a/app/src/main/res/layout-sw600dp-land/topic_lessons_title.xml b/app/src/main/res/layout-sw600dp-land/topic_lessons_title.xml index 9b12b88323a..22bf62179d9 100644 --- a/app/src/main/res/layout-sw600dp-land/topic_lessons_title.xml +++ b/app/src/main/res/layout-sw600dp-land/topic_lessons_title.xml @@ -7,7 +7,7 @@ + type="org.oppia.android.app.home.recentlyplayed.SectionTitleViewModel" /> + type="org.oppia.android.app.topic.practice.practiceitemviewmodel.TopicPracticeFooterViewModel" /> + type="org.oppia.android.app.topic.practice.TopicPracticeViewModel" /> + type="org.oppia.android.app.topic.practice.practiceitemviewmodel.TopicPracticeHeaderViewModel" /> + type="org.oppia.android.app.topic.practice.practiceitemviewmodel.TopicPracticeSubtopicViewModel" /> + type="org.oppia.android.app.topic.revision.TopicRevisionViewModel" /> - + + type="org.oppia.android.app.topic.revision.revisionitemviewmodel.TopicRevisionItemViewModel" /> - + type="org.oppia.android.app.home.topiclist.TopicSummaryViewModel" /> - + type="org.oppia.android.app.home.WelcomeViewModel" /> + type="org.oppia.android.app.completedstorylist.CompletedStoryItemViewModel" /> - + type="org.oppia.android.app.completedstorylist.CompletedStoryListViewModel" /> + type="org.oppia.android.app.topic.conceptcard.ConceptCardViewModel" /> + type="org.oppia.android.app.player.state.itemviewmodel.ContentViewModel" /> + type="org.oppia.android.app.player.state.itemviewmodel.ContinueInteractionViewModel" /> + type="org.oppia.android.app.player.state.itemviewmodel.ContinueNavigationButtonViewModel" /> + type="org.oppia.android.app.player.state.itemviewmodel.DragAndDropSortInteractionViewModel" /> @@ -55,7 +55,7 @@ android:textStyle="italic" android:visibility="@{viewModel.getGroupingStatus()? View.VISIBLE : View.GONE}" /> - + type="org.oppia.android.app.player.state.itemviewmodel.FeedbackViewModel" /> + type="org.oppia.android.app.player.state.itemviewmodel.FractionInteractionViewModel" /> - + type="org.oppia.android.app.hintsandsolution.HintsViewModel" /> + type="org.oppia.android.app.hintsandsolution.HintsViewModel" /> - + diff --git a/app/src/main/res/layout-sw600dp-port/next_button_item.xml b/app/src/main/res/layout-sw600dp-port/next_button_item.xml index 6cc25e336b8..825e51486f1 100644 --- a/app/src/main/res/layout-sw600dp-port/next_button_item.xml +++ b/app/src/main/res/layout-sw600dp-port/next_button_item.xml @@ -8,7 +8,7 @@ + type="org.oppia.android.app.player.state.itemviewmodel.NextButtonViewModel" /> + type="org.oppia.android.app.player.state.itemviewmodel.NumericInputViewModel" /> - + type="org.oppia.android.app.onboarding.OnboardingNavigationListener" /> + type="org.oppia.android.app.onboarding.OnboardingViewModel" /> + type="org.oppia.android.app.onboarding.OnboardingSlideViewModel" /> + type="org.oppia.android.app.onboarding.OnboardingSlideFinalViewModel" /> + type="org.oppia.android.app.home.recentlyplayed.OngoingStoryViewModel" /> - - + + type="org.oppia.android.app.ongoingtopiclist.OngoingTopicItemViewModel" /> - + type="org.oppia.android.app.ongoingtopiclist.OngoingTopicListViewModel" /> + type="org.oppia.android.app.player.state.itemviewmodel.PreviousButtonViewModel" /> + type="org.oppia.android.app.player.state.itemviewmodel.PreviousResponsesHeaderViewModel" /> + type="org.oppia.android.app.profile.ProfileChooserViewModel" /> + type="org.oppia.android.app.model.ProfileChooserUiModel" /> + type="org.oppia.android.app.profileprogress.ProfileProgressViewModel" /> + type="org.oppia.android.app.profileprogress.ProfileProgressHeaderViewModel" /> + type="org.oppia.android.app.profileprogress.RecentlyPlayedStorySummaryViewModel" /> - + type="org.oppia.android.app.home.topiclist.PromotedStoryViewModel" /> - + type="org.oppia.android.app.home.topiclist.PromotedStoryListViewModel" /> + type="org.oppia.android.app.topic.questionplayer.QuestionPlayerViewModel" /> + type="org.oppia.android.app.player.state.itemviewmodel.ReplayButtonViewModel" /> + type="org.oppia.android.app.player.state.itemviewmodel.ReturnToTopicButtonViewModel" /> + type="org.oppia.android.app.home.recentlyplayed.SectionTitleViewModel" /> - + + type="org.oppia.android.app.player.state.itemviewmodel.SelectionInteractionViewModel" /> - + type="org.oppia.android.app.hintsandsolution.SolutionViewModel" /> + type="org.oppia.android.app.player.state.StateViewModel" /> + type="org.oppia.android.app.player.state.itemviewmodel.SubmitButtonViewModel" /> + type="org.oppia.android.app.model.ListOfSetsOfHtmlStrings" /> + type="org.oppia.android.app.player.state.itemviewmodel.SubmittedAnswerViewModel" /> + type="org.oppia.android.app.player.state.itemviewmodel.TextInputViewModel" /> - + type="org.oppia.android.app.topic.TopicViewModel" /> + type="org.oppia.android.app.topic.info.TopicInfoViewModel" /> - + type="org.oppia.android.app.topic.lessons.StorySummaryViewModel" /> - diff --git a/app/src/main/res/layout-sw600dp-port/topic_lessons_title.xml b/app/src/main/res/layout-sw600dp-port/topic_lessons_title.xml index f7ef79deefa..92870b2865b 100644 --- a/app/src/main/res/layout-sw600dp-port/topic_lessons_title.xml +++ b/app/src/main/res/layout-sw600dp-port/topic_lessons_title.xml @@ -7,7 +7,7 @@ + type="org.oppia.android.app.home.recentlyplayed.SectionTitleViewModel" /> + type="org.oppia.android.app.topic.practice.practiceitemviewmodel.TopicPracticeFooterViewModel" /> + type="org.oppia.android.app.topic.practice.TopicPracticeViewModel"/> + type="org.oppia.android.app.topic.practice.practiceitemviewmodel.TopicPracticeHeaderViewModel" /> + type="org.oppia.android.app.topic.practice.practiceitemviewmodel.TopicPracticeSubtopicViewModel" /> + type="org.oppia.android.app.topic.revision.TopicRevisionViewModel" /> - + + type="org.oppia.android.app.topic.revision.revisionitemviewmodel.TopicRevisionItemViewModel" /> - + type="org.oppia.android.app.home.WelcomeViewModel" /> + type="org.oppia.android.app.administratorcontrols.administratorcontrolsitemviewmodel.AdministratorControlsAccountActionsViewModel" /> + type="org.oppia.android.app.administratorcontrols.AdministratorControlsViewModel" /> + type="org.oppia.android.app.administratorcontrols.administratorcontrolsitemviewmodel.AdministratorControlsAppInformationViewModel" /> + type="org.oppia.android.app.administratorcontrols.administratorcontrolsitemviewmodel.AdministratorControlsDownloadPermissionsViewModel" /> + type="org.oppia.android.app.administratorcontrols.AdministratorControlsViewModel" /> + type="org.oppia.android.app.administratorcontrols.administratorcontrolsitemviewmodel.AdministratorControlsGeneralViewModel" /> + type="org.oppia.android.app.administratorcontrols.AdministratorControlsViewModel" /> + type="org.oppia.android.app.administratorcontrols.administratorcontrolsitemviewmodel.AdministratorControlsProfileViewModel" /> + type="org.oppia.android.app.administratorcontrols.appversion.AppVersionViewModel" /> + type="org.oppia.android.app.options.OptionControlsViewModel" /> + type="org.oppia.android.app.options.OptionsAppLanguageViewModel" /> + type="org.oppia.android.app.options.OptionControlsViewModel" /> + type="org.oppia.android.app.options.OptionsAudioLanguageViewModel" /> + type="org.oppia.android.app.options.OptionControlsViewModel" /> + type="org.oppia.android.app.options.OptionsReadingTextSizeViewModel" /> + type="org.oppia.android.app.settings.profile.ProfileListViewModel" /> + type="org.oppia.android.app.player.state.itemviewmodel.FractionInteractionViewModel" /> + type="org.oppia.android.app.player.state.itemviewmodel.NumericInputViewModel" /> + type="org.oppia.android.app.player.state.itemviewmodel.TextInputViewModel" /> + type="org.oppia.android.app.player.state.itemviewmodel.RatioExpressionInputInteractionViewModel" /> - - - - + type="org.oppia.android.app.profile.AddProfileViewModel" /> - - - + type="org.oppia.android.app.profile.AdminAuthViewModel" /> - + type="org.oppia.android.app.profile.AdminPinViewModel" /> - - + type="org.oppia.android.app.profile.AdminSettingsViewModel" /> - + type="org.oppia.android.app.administratorcontrols.administratorcontrolsitemviewmodel.AdministratorControlsAccountActionsViewModel" /> + type="org.oppia.android.app.administratorcontrols.administratorcontrolsitemviewmodel.AdministratorControlsAppInformationViewModel" /> + type="org.oppia.android.app.administratorcontrols.administratorcontrolsitemviewmodel.AdministratorControlsDownloadPermissionsViewModel" /> + type="org.oppia.android.app.administratorcontrols.AdministratorControlsViewModel" /> + type="org.oppia.android.app.administratorcontrols.administratorcontrolsitemviewmodel.AdministratorControlsGeneralViewModel" /> + type="org.oppia.android.app.administratorcontrols.administratorcontrolsitemviewmodel.AdministratorControlsProfileViewModel" /> + type="org.oppia.android.app.administratorcontrols.appversion.AppVersionViewModel" /> - + + type="org.oppia.android.app.player.audio.LanguageInterface" /> + type="org.oppia.android.app.player.audio.AudioViewModel" /> + type="org.oppia.android.app.completedstorylist.CompletedStoryItemViewModel" /> - + type="org.oppia.android.app.completedstorylist.CompletedStoryListViewModel" /> + type="org.oppia.android.app.topic.conceptcard.ConceptCardViewModel" /> + type="org.oppia.android.app.player.state.itemviewmodel.ContentViewModel" /> + type="org.oppia.android.app.player.state.itemviewmodel.ContinueInteractionViewModel" /> + type="org.oppia.android.app.player.state.itemviewmodel.ContinueNavigationButtonViewModel" /> - + diff --git a/app/src/main/res/layout/drag_drop_interaction_item.xml b/app/src/main/res/layout/drag_drop_interaction_item.xml index da7abf87cdc..b91824c26d3 100644 --- a/app/src/main/res/layout/drag_drop_interaction_item.xml +++ b/app/src/main/res/layout/drag_drop_interaction_item.xml @@ -8,7 +8,7 @@ + type="org.oppia.android.app.player.state.itemviewmodel.DragAndDropSortInteractionViewModel" /> @@ -56,7 +56,7 @@ app:layoutMarginStart="@{viewModel.isSplitView ? @dimen/margin_16 : @dimen/margin_12}" app:layoutMarginTop="@{viewModel.isSplitView ? @dimen/margin_16 : @dimen/margin_8}" /> - + type="org.oppia.android.app.player.state.itemviewmodel.DragDropInteractionContentViewModel" /> + type="org.oppia.android.app.drawer.NavigationDrawerFooterViewModel" /> + type="org.oppia.android.app.player.exploration.ExplorationViewModel" /> + type="org.oppia.android.app.help.faq.faqItemViewModel.FAQContentViewModel" /> + type="org.oppia.android.app.help.faq.faqItemViewModel.FAQHeaderViewModel" /> + type="org.oppia.android.app.help.faq.FAQListViewModel" /> + type="org.oppia.android.app.player.state.itemviewmodel.FeedbackViewModel" /> + type="org.oppia.android.app.player.state.itemviewmodel.FractionInteractionViewModel" /> - + type="org.oppia.android.app.help.HelpListViewModel" /> + type="org.oppia.android.app.help.HelpItemViewModel" /> + type="org.oppia.android.app.hintsandsolution.HintsViewModel" /> + type="org.oppia.android.app.hintsandsolution.HintsViewModel" /> - + diff --git a/app/src/main/res/layout/image_region_selection_interaction_item.xml b/app/src/main/res/layout/image_region_selection_interaction_item.xml index 0fe36146797..4db03eca83a 100644 --- a/app/src/main/res/layout/image_region_selection_interaction_item.xml +++ b/app/src/main/res/layout/image_region_selection_interaction_item.xml @@ -8,7 +8,7 @@ + type="org.oppia.android.app.player.state.itemviewmodel.ImageRegionSelectionInteractionViewModel" /> - - + type="org.oppia.android.app.player.state.itemviewmodel.SelectionInteractionContentViewModel"/> - + + type="org.oppia.android.app.model.ChapterSummary" /> + type="org.oppia.android.app.player.state.itemviewmodel.SelectionInteractionContentViewModel" /> + type="org.oppia.android.app.drawer.NavigationDrawerHeaderViewModel" /> + type="org.oppia.android.app.player.state.itemviewmodel.NextButtonViewModel" /> + type="org.oppia.android.app.player.state.itemviewmodel.NumericInputViewModel" /> - + type="org.oppia.android.app.onboarding.OnboardingNavigationListener" /> + type="org.oppia.android.app.onboarding.OnboardingViewModel" /> + type="org.oppia.android.app.onboarding.OnboardingSlideViewModel" /> + type="org.oppia.android.app.onboarding.OnboardingSlideFinalViewModel" /> + type="org.oppia.android.app.home.recentlyplayed.OngoingStoryViewModel" /> - - + + type="org.oppia.android.app.ongoingtopiclist.OngoingTopicItemViewModel" /> - + type="org.oppia.android.app.ongoingtopiclist.OngoingTopicListViewModel" /> + type="org.oppia.android.app.options.OptionsAppLanguageViewModel" /> + type="org.oppia.android.app.options.OptionsAudioLanguageViewModel" /> + type="org.oppia.android.app.options.OptionsReadingTextSizeViewModel" /> + type="org.oppia.android.app.options.OptionControlsViewModel" /> + type="org.oppia.android.app.profile.PinPasswordViewModel" /> + type="org.oppia.android.app.player.state.itemviewmodel.PreviousButtonViewModel" /> + type="org.oppia.android.app.player.state.itemviewmodel.PreviousResponsesHeaderViewModel" /> + type="org.oppia.android.app.profile.ProfileChooserViewModel" /> + type="org.oppia.android.app.model.ProfileChooserUiModel" /> + type="org.oppia.android.app.settings.profile.ProfileEditViewModel" /> + type="org.oppia.android.app.settings.profile.ProfileListViewModel" /> + type="org.oppia.android.app.model.Profile" /> + type="org.oppia.android.app.profileprogress.ProfilePictureActivityViewModel" /> + type="org.oppia.android.app.profileprogress.ProfileProgressViewModel" /> + type="org.oppia.android.app.profileprogress.ProfileProgressHeaderViewModel" /> + type="org.oppia.android.app.profileprogress.RecentlyPlayedStorySummaryViewModel" /> - + type="org.oppia.android.app.settings.profile.ProfileRenameViewModel" /> - + type="org.oppia.android.app.settings.profile.ProfileResetPinViewModel" /> - - + type="org.oppia.android.app.home.topiclist.PromotedStoryViewModel" /> - + type="org.oppia.android.app.home.topiclist.PromotedStoryListViewModel" /> + type="org.oppia.android.app.topic.questionplayer.QuestionPlayerViewModel" /> + type="org.oppia.android.app.player.state.itemviewmodel.RatioExpressionInputInteractionViewModel" /> - + type="org.oppia.android.app.player.state.itemviewmodel.ReplayButtonViewModel" /> + type="org.oppia.android.app.profile.ResetPinViewModel" /> - + type="org.oppia.android.app.player.state.itemviewmodel.ReturnToTopicButtonViewModel" /> + type="org.oppia.android.app.topic.revisioncard.RevisionCardViewModel" /> + type="org.oppia.android.app.home.recentlyplayed.SectionTitleViewModel" /> - + + type="org.oppia.android.app.player.state.itemviewmodel.SelectionInteractionViewModel" /> - + type="org.oppia.android.app.hintsandsolution.SolutionViewModel" /> + type="org.oppia.android.app.player.state.StateViewModel" /> + type="org.oppia.android.app.player.state.testing.StateFragmentTestViewModel" /> - + + type="org.oppia.android.app.story.storyitemviewmodel.StoryChapterSummaryViewModel" /> - + type="org.oppia.android.app.story.StoryViewModel" /> + type="org.oppia.android.app.story.storyitemviewmodel.StoryHeaderViewModel" /> + type="org.oppia.android.app.player.state.itemviewmodel.SubmitButtonViewModel" /> + type="org.oppia.android.app.model.ListOfSetsOfHtmlStrings" /> + type="org.oppia.android.app.player.state.itemviewmodel.SubmittedAnswerViewModel" /> + type="org.oppia.android.app.model.StringList" /> + type="org.oppia.android.app.testing.BindableAdapterTestViewModel" /> + type="org.oppia.android.app.model.TestModel" /> + type="org.oppia.android.app.model.TestModel" /> + type="org.oppia.android.app.player.state.itemviewmodel.TextInputViewModel" /> - + type="org.oppia.android.app.topic.TopicViewModel" /> + type="org.oppia.android.app.topic.info.TopicInfoViewModel" /> - + type="org.oppia.android.app.topic.lessons.StorySummaryViewModel" /> - diff --git a/app/src/main/res/layout/topic_lessons_title.xml b/app/src/main/res/layout/topic_lessons_title.xml index e570d4deda4..1f3ef752d58 100644 --- a/app/src/main/res/layout/topic_lessons_title.xml +++ b/app/src/main/res/layout/topic_lessons_title.xml @@ -7,7 +7,7 @@ + type="org.oppia.android.app.home.recentlyplayed.SectionTitleViewModel" /> + type="org.oppia.android.app.topic.practice.practiceitemviewmodel.TopicPracticeFooterViewModel" /> + type="org.oppia.android.app.topic.practice.TopicPracticeViewModel"/> + type="org.oppia.android.app.topic.practice.practiceitemviewmodel.TopicPracticeHeaderViewModel" /> + type="org.oppia.android.app.topic.practice.practiceitemviewmodel.TopicPracticeSubtopicViewModel" /> + type="org.oppia.android.app.topic.revision.TopicRevisionViewModel" /> - + + type="org.oppia.android.app.topic.revision.revisionitemviewmodel.TopicRevisionItemViewModel" /> - + type="org.oppia.android.app.home.topiclist.TopicSummaryViewModel" /> - - + diff --git a/app/src/main/res/layout/walkthrough_activity.xml b/app/src/main/res/layout/walkthrough_activity.xml index 9c2ca86cbea..114fd74982c 100644 --- a/app/src/main/res/layout/walkthrough_activity.xml +++ b/app/src/main/res/layout/walkthrough_activity.xml @@ -8,11 +8,11 @@ + type="org.oppia.android.app.walkthrough.WalkthroughActivityListener" /> + type="org.oppia.android.app.walkthrough.WalkthroughViewModel" /> + type="org.oppia.android.app.walkthrough.end.WalkthroughFinalViewModel" /> + type="org.oppia.android.app.walkthrough.end.WalkthroughEndPageChanger" /> + type="org.oppia.android.app.walkthrough.topiclist.topiclistviewmodel.WalkthroughTopicHeaderViewModel" /> + type="org.oppia.android.app.walkthrough.topiclist.WalkthroughTopicViewModel" /> diff --git a/app/src/main/res/layout/walkthrough_topic_summary_view.xml b/app/src/main/res/layout/walkthrough_topic_summary_view.xml index b3214fecf2f..ebeaf5f716c 100644 --- a/app/src/main/res/layout/walkthrough_topic_summary_view.xml +++ b/app/src/main/res/layout/walkthrough_topic_summary_view.xml @@ -6,7 +6,7 @@ + type="org.oppia.android.app.walkthrough.topiclist.topiclistviewmodel.WalkthroughTopicSummaryViewModel" /> + type="org.oppia.android.app.walkthrough.welcome.WalkthroughWelcomeViewModel" /> + type="org.oppia.android.app.walkthrough.WalkthroughPageChanger" /> + type="org.oppia.android.app.home.WelcomeViewModel" /> scenario.onActivity { diff --git a/app/src/sharedTest/java/org/oppia/android/app/testing/InputInteractionViewTestActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/testing/InputInteractionViewTestActivityTest.kt index 7c01cecbb1d..b9ad95c1cf2 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/testing/InputInteractionViewTestActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/testing/InputInteractionViewTestActivityTest.kt @@ -1,4 +1,4 @@ -package org.oppia.app.testing +package org.oppia.android.app.testing import android.content.res.Configuration import androidx.test.core.app.ActivityScenario @@ -15,8 +15,8 @@ import com.google.common.truth.Truth.assertThat import org.junit.Ignore import org.junit.Test import org.junit.runner.RunWith -import org.oppia.app.R -import org.oppia.app.model.InteractionObject +import org.oppia.android.R +import org.oppia.android.app.model.InteractionObject import org.robolectric.annotation.LooperMode /** Tests for [InputInteractionViewTestActivity]. */ diff --git a/app/src/sharedTest/java/org/oppia/android/app/testing/NavigationDrawerTestActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/testing/NavigationDrawerTestActivityTest.kt index c28ad807d38..46e74b303e5 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/testing/NavigationDrawerTestActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/testing/NavigationDrawerTestActivityTest.kt @@ -1,4 +1,4 @@ -package org.oppia.app.testing +package org.oppia.android.app.testing import android.app.Application import android.content.Context @@ -52,23 +52,23 @@ import org.junit.Before import org.junit.Ignore import org.junit.Test import org.junit.runner.RunWith -import org.oppia.app.R -import org.oppia.app.administratorcontrols.AdministratorControlsActivity -import org.oppia.app.model.ProfileId -import org.oppia.app.mydownloads.MyDownloadsActivity -import org.oppia.app.profile.ProfileChooserActivity -import org.oppia.app.recyclerview.RecyclerViewMatcher.Companion.atPositionOnView -import org.oppia.app.utility.OrientationChangeAction.Companion.orientationLandscape -import org.oppia.domain.oppialogger.LogStorageModule -import org.oppia.domain.topic.StoryProgressTestHelper -import org.oppia.testing.TestDispatcherModule -import org.oppia.testing.TestLogReportingModule -import org.oppia.testing.profile.ProfileTestHelper -import org.oppia.util.logging.EnableConsoleLog -import org.oppia.util.logging.EnableFileLog -import org.oppia.util.logging.GlobalLogLevel -import org.oppia.util.logging.LogLevel -import org.oppia.util.system.OppiaClock +import org.oppia.android.R +import org.oppia.android.app.administratorcontrols.AdministratorControlsActivity +import org.oppia.android.app.model.ProfileId +import org.oppia.android.app.mydownloads.MyDownloadsActivity +import org.oppia.android.app.profile.ProfileChooserActivity +import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.atPositionOnView +import org.oppia.android.app.utility.OrientationChangeAction.Companion.orientationLandscape +import org.oppia.android.domain.oppialogger.LogStorageModule +import org.oppia.android.domain.topic.StoryProgressTestHelper +import org.oppia.android.testing.TestDispatcherModule +import org.oppia.android.testing.TestLogReportingModule +import org.oppia.android.testing.profile.ProfileTestHelper +import org.oppia.android.util.logging.EnableConsoleLog +import org.oppia.android.util.logging.EnableFileLog +import org.oppia.android.util.logging.GlobalLogLevel +import org.oppia.android.util.logging.LogLevel +import org.oppia.android.util.system.OppiaClock import org.robolectric.annotation.LooperMode import javax.inject.Inject import javax.inject.Singleton diff --git a/app/src/sharedTest/java/org/oppia/android/app/testing/TestFontScaleConfigurationUtilActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/testing/TestFontScaleConfigurationUtilActivityTest.kt index 71da7ba13ef..cf10952b326 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/testing/TestFontScaleConfigurationUtilActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/testing/TestFontScaleConfigurationUtilActivityTest.kt @@ -1,4 +1,4 @@ -package org.oppia.app.testing +package org.oppia.android.app.testing import android.content.Context import android.content.Intent @@ -13,9 +13,9 @@ import org.junit.After import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.oppia.app.R -import org.oppia.app.model.ReadingTextSize -import org.oppia.app.utility.FontSizeMatcher.Companion.withFontSize +import org.oppia.android.R +import org.oppia.android.app.model.ReadingTextSize +import org.oppia.android.app.utility.FontSizeMatcher.Companion.withFontSize import org.robolectric.annotation.LooperMode /** Tests for [TestFontScaleConfigurationUtilActivity]. */ diff --git a/app/src/sharedTest/java/org/oppia/android/app/testing/TopicTestActivityForStoryTest.kt b/app/src/sharedTest/java/org/oppia/android/app/testing/TopicTestActivityForStoryTest.kt index 47d73d6af10..22698074c08 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/testing/TopicTestActivityForStoryTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/testing/TopicTestActivityForStoryTest.kt @@ -1,4 +1,4 @@ -package org.oppia.app.testing +package org.oppia.android.app.testing import androidx.recyclerview.widget.RecyclerView import androidx.test.core.app.ActivityScenario.launch @@ -13,11 +13,11 @@ import androidx.test.ext.junit.runners.AndroidJUnit4 import org.hamcrest.Matchers.containsString import org.junit.Test import org.junit.runner.RunWith -import org.oppia.app.R -import org.oppia.app.recyclerview.RecyclerViewMatcher.Companion.atPosition -import org.oppia.app.recyclerview.RecyclerViewMatcher.Companion.atPositionOnView -import org.oppia.app.topic.TopicTab -import org.oppia.app.utility.EspressoTestsMatchers.matchCurrentTabTitle +import org.oppia.android.R +import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.atPosition +import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.atPositionOnView +import org.oppia.android.app.topic.TopicTab +import org.oppia.android.app.utility.EspressoTestsMatchers.matchCurrentTabTitle import org.robolectric.annotation.LooperMode /** Tests for [TopicTestActivityForStory]. */ diff --git a/app/src/sharedTest/java/org/oppia/android/app/topic/TopicFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/topic/TopicFragmentTest.kt index ed9808d43b0..3e519b1e71f 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/topic/TopicFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/topic/TopicFragmentTest.kt @@ -1,4 +1,4 @@ -package org.oppia.app.topic +package org.oppia.android.app.topic import android.app.Application import android.content.Context @@ -32,14 +32,14 @@ import org.hamcrest.CoreMatchers.containsString import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith -import org.oppia.app.R -import org.oppia.app.recyclerview.RecyclerViewMatcher.Companion.atPosition -import org.oppia.app.recyclerview.RecyclerViewMatcher.Companion.atPositionOnView -import org.oppia.app.utility.EspressoTestsMatchers.matchCurrentTabTitle -import org.oppia.app.utility.OrientationChangeAction.Companion.orientationLandscape -import org.oppia.domain.topic.FRACTIONS_TOPIC_ID -import org.oppia.util.threading.BackgroundDispatcher -import org.oppia.util.threading.BlockingDispatcher +import org.oppia.android.R +import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.atPosition +import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.atPositionOnView +import org.oppia.android.app.utility.EspressoTestsMatchers.matchCurrentTabTitle +import org.oppia.android.app.utility.OrientationChangeAction.Companion.orientationLandscape +import org.oppia.android.domain.topic.FRACTIONS_TOPIC_ID +import org.oppia.android.util.threading.BackgroundDispatcher +import org.oppia.android.util.threading.BlockingDispatcher import org.robolectric.annotation.LooperMode import javax.inject.Singleton diff --git a/app/src/sharedTest/java/org/oppia/android/app/topic/conceptcard/ConceptCardFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/topic/conceptcard/ConceptCardFragmentTest.kt index 56e28c501cb..668644205fc 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/topic/conceptcard/ConceptCardFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/topic/conceptcard/ConceptCardFragmentTest.kt @@ -1,4 +1,4 @@ -package org.oppia.app.topic.conceptcard +package org.oppia.android.app.topic.conceptcard import android.app.Application import android.content.Context @@ -25,12 +25,12 @@ import org.hamcrest.Matchers.not import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.oppia.app.R -import org.oppia.app.parser.RichTextViewMatcher.Companion.containsRichText -import org.oppia.app.testing.ConceptCardFragmentTestActivity -import org.oppia.app.utility.OrientationChangeAction.Companion.orientationLandscape -import org.oppia.util.threading.BackgroundDispatcher -import org.oppia.util.threading.BlockingDispatcher +import org.oppia.android.R +import org.oppia.android.app.parser.RichTextViewMatcher.Companion.containsRichText +import org.oppia.android.app.testing.ConceptCardFragmentTestActivity +import org.oppia.android.app.utility.OrientationChangeAction.Companion.orientationLandscape +import org.oppia.android.util.threading.BackgroundDispatcher +import org.oppia.android.util.threading.BlockingDispatcher import org.robolectric.annotation.LooperMode import javax.inject.Singleton diff --git a/app/src/sharedTest/java/org/oppia/android/app/topic/info/TopicInfoFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/topic/info/TopicInfoFragmentTest.kt index fad8b6da2cb..6798ddbe550 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/topic/info/TopicInfoFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/topic/info/TopicInfoFragmentTest.kt @@ -1,4 +1,4 @@ -package org.oppia.app.topic.info +package org.oppia.android.app.topic.info import android.view.View import android.widget.TextView @@ -26,11 +26,11 @@ import org.hamcrest.TypeSafeMatcher import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.oppia.app.R -import org.oppia.app.topic.TopicActivity -import org.oppia.app.utility.EspressoTestsMatchers.withDrawable -import org.oppia.app.utility.OrientationChangeAction.Companion.orientationLandscape -import org.oppia.domain.topic.RATIOS_TOPIC_ID +import org.oppia.android.R +import org.oppia.android.app.topic.TopicActivity +import org.oppia.android.app.utility.EspressoTestsMatchers.withDrawable +import org.oppia.android.app.utility.OrientationChangeAction.Companion.orientationLandscape +import org.oppia.android.domain.topic.RATIOS_TOPIC_ID import org.robolectric.annotation.LooperMode private const val TEST_TOPIC_ID = "GJ2rLXRKD5hw" diff --git a/app/src/sharedTest/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentTest.kt index 87cce8a02ba..23057f9a7f5 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentTest.kt @@ -1,4 +1,4 @@ -package org.oppia.app.topic.lessons +package org.oppia.android.app.topic.lessons import android.app.Application import android.content.Context @@ -45,28 +45,28 @@ import org.junit.After import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.oppia.app.R -import org.oppia.app.model.ProfileId -import org.oppia.app.player.exploration.ExplorationActivity -import org.oppia.app.recyclerview.RecyclerViewMatcher.Companion.atPosition -import org.oppia.app.recyclerview.RecyclerViewMatcher.Companion.atPositionOnView -import org.oppia.app.story.StoryActivity -import org.oppia.app.topic.TopicActivity -import org.oppia.app.topic.TopicTab -import org.oppia.app.utility.EspressoTestsMatchers.withDrawable -import org.oppia.app.utility.OrientationChangeAction.Companion.orientationLandscape -import org.oppia.domain.oppialogger.LogStorageModule -import org.oppia.domain.topic.RATIOS_EXPLORATION_ID_0 -import org.oppia.domain.topic.RATIOS_STORY_ID_0 -import org.oppia.domain.topic.RATIOS_TOPIC_ID -import org.oppia.domain.topic.StoryProgressTestHelper -import org.oppia.testing.TestDispatcherModule -import org.oppia.testing.TestLogReportingModule -import org.oppia.testing.profile.ProfileTestHelper -import org.oppia.util.logging.EnableConsoleLog -import org.oppia.util.logging.EnableFileLog -import org.oppia.util.logging.GlobalLogLevel -import org.oppia.util.logging.LogLevel +import org.oppia.android.R +import org.oppia.android.app.model.ProfileId +import org.oppia.android.app.player.exploration.ExplorationActivity +import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.atPosition +import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.atPositionOnView +import org.oppia.android.app.story.StoryActivity +import org.oppia.android.app.topic.TopicActivity +import org.oppia.android.app.topic.TopicTab +import org.oppia.android.app.utility.EspressoTestsMatchers.withDrawable +import org.oppia.android.app.utility.OrientationChangeAction.Companion.orientationLandscape +import org.oppia.android.domain.oppialogger.LogStorageModule +import org.oppia.android.domain.topic.RATIOS_EXPLORATION_ID_0 +import org.oppia.android.domain.topic.RATIOS_STORY_ID_0 +import org.oppia.android.domain.topic.RATIOS_TOPIC_ID +import org.oppia.android.domain.topic.StoryProgressTestHelper +import org.oppia.android.testing.TestDispatcherModule +import org.oppia.android.testing.TestLogReportingModule +import org.oppia.android.testing.profile.ProfileTestHelper +import org.oppia.android.util.logging.EnableConsoleLog +import org.oppia.android.util.logging.EnableFileLog +import org.oppia.android.util.logging.GlobalLogLevel +import org.oppia.android.util.logging.LogLevel import org.robolectric.annotation.LooperMode import java.util.concurrent.AbstractExecutorService import java.util.concurrent.TimeUnit diff --git a/app/src/sharedTest/java/org/oppia/android/app/topic/practice/TopicPracticeFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/topic/practice/TopicPracticeFragmentTest.kt index 77d6542e9c1..fa3df576c9a 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/topic/practice/TopicPracticeFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/topic/practice/TopicPracticeFragmentTest.kt @@ -1,4 +1,4 @@ -package org.oppia.app.topic.practice +package org.oppia.android.app.topic.practice import android.app.Application import android.content.Context @@ -35,15 +35,15 @@ import org.junit.Before import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith -import org.oppia.app.R -import org.oppia.app.recyclerview.RecyclerViewMatcher.Companion.atPositionOnView -import org.oppia.app.topic.TopicActivity -import org.oppia.app.topic.TopicTab -import org.oppia.app.topic.questionplayer.QuestionPlayerActivity -import org.oppia.app.utility.OrientationChangeAction.Companion.orientationLandscape -import org.oppia.domain.topic.FRACTIONS_TOPIC_ID -import org.oppia.util.threading.BackgroundDispatcher -import org.oppia.util.threading.BlockingDispatcher +import org.oppia.android.R +import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.atPositionOnView +import org.oppia.android.app.topic.TopicActivity +import org.oppia.android.app.topic.TopicTab +import org.oppia.android.app.topic.questionplayer.QuestionPlayerActivity +import org.oppia.android.app.utility.OrientationChangeAction.Companion.orientationLandscape +import org.oppia.android.domain.topic.FRACTIONS_TOPIC_ID +import org.oppia.android.util.threading.BackgroundDispatcher +import org.oppia.android.util.threading.BlockingDispatcher import org.robolectric.annotation.LooperMode import javax.inject.Singleton diff --git a/app/src/sharedTest/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivityTest.kt index 7141ee85e63..5d160a63222 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivityTest.kt @@ -1,4 +1,4 @@ -package org.oppia.app.topic.questionplayer +package org.oppia.android.app.topic.questionplayer import android.app.Application import android.content.Context @@ -39,51 +39,51 @@ import org.junit.After import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.oppia.app.R -import org.oppia.app.activity.ActivityComponent -import org.oppia.app.application.ActivityComponentFactory -import org.oppia.app.application.ApplicationComponent -import org.oppia.app.application.ApplicationInjector -import org.oppia.app.application.ApplicationInjectorProvider -import org.oppia.app.application.ApplicationModule -import org.oppia.app.application.ApplicationStartupListenerModule -import org.oppia.app.player.state.hintsandsolution.HintsAndSolutionConfigFastShowTestModule -import org.oppia.app.player.state.itemviewmodel.StateItemViewModel -import org.oppia.app.player.state.itemviewmodel.StateItemViewModel.ViewType.FEEDBACK -import org.oppia.app.player.state.itemviewmodel.StateItemViewModel.ViewType.SELECTION_INTERACTION -import org.oppia.app.recyclerview.RecyclerViewMatcher.Companion.atPositionOnView -import org.oppia.app.shim.ViewBindingShimModule -import org.oppia.app.utility.OrientationChangeAction.Companion.orientationLandscape -import org.oppia.domain.classify.InteractionsModule -import org.oppia.domain.classify.rules.continueinteraction.ContinueModule -import org.oppia.domain.classify.rules.dragAndDropSortInput.DragDropSortInputModule -import org.oppia.domain.classify.rules.fractioninput.FractionInputModule -import org.oppia.domain.classify.rules.imageClickInput.ImageClickInputModule -import org.oppia.domain.classify.rules.itemselectioninput.ItemSelectionInputModule -import org.oppia.domain.classify.rules.multiplechoiceinput.MultipleChoiceInputModule -import org.oppia.domain.classify.rules.numberwithunits.NumberWithUnitsRuleModule -import org.oppia.domain.classify.rules.numericinput.NumericInputRuleModule -import org.oppia.domain.classify.rules.ratioinput.RatioInputModule -import org.oppia.domain.classify.rules.textinput.TextInputRuleModule -import org.oppia.domain.onboarding.ExpirationMetaDataRetrieverModule -import org.oppia.domain.oppialogger.LogStorageModule -import org.oppia.domain.question.QuestionCountPerTrainingSession -import org.oppia.domain.question.QuestionTrainingSeed -import org.oppia.domain.topic.FRACTIONS_SKILL_ID_0 -import org.oppia.domain.topic.PrimeTopicAssetsControllerModule -import org.oppia.testing.CoroutineExecutorService -import org.oppia.testing.TestAccessibilityModule -import org.oppia.testing.TestCoroutineDispatchers -import org.oppia.testing.TestDispatcherModule -import org.oppia.testing.TestLogReportingModule -import org.oppia.testing.profile.ProfileTestHelper -import org.oppia.util.caching.testing.CachingTestModule -import org.oppia.util.gcsresource.GcsResourceModule -import org.oppia.util.logging.LoggerModule -import org.oppia.util.parser.GlideImageLoaderModule -import org.oppia.util.parser.HtmlParserEntityTypeModule -import org.oppia.util.parser.ImageParsingModule -import org.oppia.util.threading.BackgroundDispatcher +import org.oppia.android.R +import org.oppia.android.app.activity.ActivityComponent +import org.oppia.android.app.application.ActivityComponentFactory +import org.oppia.android.app.application.ApplicationComponent +import org.oppia.android.app.application.ApplicationInjector +import org.oppia.android.app.application.ApplicationInjectorProvider +import org.oppia.android.app.application.ApplicationModule +import org.oppia.android.app.application.ApplicationStartupListenerModule +import org.oppia.android.app.player.state.hintsandsolution.HintsAndSolutionConfigFastShowTestModule +import org.oppia.android.app.player.state.itemviewmodel.StateItemViewModel +import org.oppia.android.app.player.state.itemviewmodel.StateItemViewModel.ViewType.FEEDBACK +import org.oppia.android.app.player.state.itemviewmodel.StateItemViewModel.ViewType.SELECTION_INTERACTION +import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.atPositionOnView +import org.oppia.android.app.shim.ViewBindingShimModule +import org.oppia.android.app.utility.OrientationChangeAction.Companion.orientationLandscape +import org.oppia.android.domain.classify.InteractionsModule +import org.oppia.android.domain.classify.rules.continueinteraction.ContinueModule +import org.oppia.android.domain.classify.rules.dragAndDropSortInput.DragDropSortInputModule +import org.oppia.android.domain.classify.rules.fractioninput.FractionInputModule +import org.oppia.android.domain.classify.rules.imageClickInput.ImageClickInputModule +import org.oppia.android.domain.classify.rules.itemselectioninput.ItemSelectionInputModule +import org.oppia.android.domain.classify.rules.multiplechoiceinput.MultipleChoiceInputModule +import org.oppia.android.domain.classify.rules.numberwithunits.NumberWithUnitsRuleModule +import org.oppia.android.domain.classify.rules.numericinput.NumericInputRuleModule +import org.oppia.android.domain.classify.rules.ratioinput.RatioInputModule +import org.oppia.android.domain.classify.rules.textinput.TextInputRuleModule +import org.oppia.android.domain.onboarding.ExpirationMetaDataRetrieverModule +import org.oppia.android.domain.oppialogger.LogStorageModule +import org.oppia.android.domain.question.QuestionCountPerTrainingSession +import org.oppia.android.domain.question.QuestionTrainingSeed +import org.oppia.android.domain.topic.FRACTIONS_SKILL_ID_0 +import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule +import org.oppia.android.testing.CoroutineExecutorService +import org.oppia.android.testing.TestAccessibilityModule +import org.oppia.android.testing.TestCoroutineDispatchers +import org.oppia.android.testing.TestDispatcherModule +import org.oppia.android.testing.TestLogReportingModule +import org.oppia.android.testing.profile.ProfileTestHelper +import org.oppia.android.util.caching.testing.CachingTestModule +import org.oppia.android.util.gcsresource.GcsResourceModule +import org.oppia.android.util.logging.LoggerModule +import org.oppia.android.util.parser.GlideImageLoaderModule +import org.oppia.android.util.parser.HtmlParserEntityTypeModule +import org.oppia.android.util.parser.ImageParsingModule +import org.oppia.android.util.threading.BackgroundDispatcher import org.robolectric.annotation.Config import org.robolectric.annotation.LooperMode import javax.inject.Inject diff --git a/app/src/sharedTest/java/org/oppia/android/app/topic/revision/TopicRevisionFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/topic/revision/TopicRevisionFragmentTest.kt index 4ef998be82a..d1c70e9d340 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/topic/revision/TopicRevisionFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/topic/revision/TopicRevisionFragmentTest.kt @@ -1,4 +1,4 @@ -package org.oppia.app.topic.revision +package org.oppia.android.app.topic.revision import android.app.Application import android.content.Context @@ -30,15 +30,15 @@ import org.junit.Before import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith -import org.oppia.app.R -import org.oppia.app.recyclerview.RecyclerViewMatcher.Companion.atPosition -import org.oppia.app.topic.TopicActivity -import org.oppia.app.topic.TopicTab -import org.oppia.app.utility.EspressoTestsMatchers.withDrawable -import org.oppia.app.utility.OrientationChangeAction.Companion.orientationLandscape -import org.oppia.domain.topic.FRACTIONS_TOPIC_ID -import org.oppia.util.threading.BackgroundDispatcher -import org.oppia.util.threading.BlockingDispatcher +import org.oppia.android.R +import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.atPosition +import org.oppia.android.app.topic.TopicActivity +import org.oppia.android.app.topic.TopicTab +import org.oppia.android.app.utility.EspressoTestsMatchers.withDrawable +import org.oppia.android.app.utility.OrientationChangeAction.Companion.orientationLandscape +import org.oppia.android.domain.topic.FRACTIONS_TOPIC_ID +import org.oppia.android.util.threading.BackgroundDispatcher +import org.oppia.android.util.threading.BlockingDispatcher import org.robolectric.annotation.LooperMode import javax.inject.Singleton diff --git a/app/src/sharedTest/java/org/oppia/android/app/topic/revisioncard/RevisionCardFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/topic/revisioncard/RevisionCardFragmentTest.kt index 6130fd30058..22fc30aa939 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/topic/revisioncard/RevisionCardFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/topic/revisioncard/RevisionCardFragmentTest.kt @@ -1,4 +1,4 @@ -package org.oppia.app.topic.revisioncard +package org.oppia.android.app.topic.revisioncard import android.content.Context import androidx.test.core.app.ActivityScenario.launch @@ -22,16 +22,16 @@ import org.junit.After import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.oppia.app.R -import org.oppia.app.help.HelpActivity -import org.oppia.app.options.OptionsActivity -import org.oppia.app.parser.RichTextViewMatcher.Companion.containsRichText -import org.oppia.app.player.exploration.ExplorationActivity -import org.oppia.app.topic.revisioncard.RevisionCardActivity.Companion.createRevisionCardActivityIntent // ktlint-disable max-line-length -import org.oppia.app.utility.OrientationChangeAction.Companion.orientationLandscape -import org.oppia.domain.topic.FRACTIONS_TOPIC_ID -import org.oppia.domain.topic.SUBTOPIC_TOPIC_ID -import org.oppia.domain.topic.SUBTOPIC_TOPIC_ID_2 +import org.oppia.android.R +import org.oppia.android.app.help.HelpActivity +import org.oppia.android.app.options.OptionsActivity +import org.oppia.android.app.parser.RichTextViewMatcher.Companion.containsRichText +import org.oppia.android.app.player.exploration.ExplorationActivity +import org.oppia.android.app.topic.revisioncard.RevisionCardActivity.Companion.createRevisionCardActivityIntent // ktlint-disable max-line-length +import org.oppia.android.app.utility.OrientationChangeAction.Companion.orientationLandscape +import org.oppia.android.domain.topic.FRACTIONS_TOPIC_ID +import org.oppia.android.domain.topic.SUBTOPIC_TOPIC_ID +import org.oppia.android.domain.topic.SUBTOPIC_TOPIC_ID_2 import org.robolectric.annotation.LooperMode import javax.inject.Inject diff --git a/app/src/sharedTest/java/org/oppia/android/app/utility/ClickActions.kt b/app/src/sharedTest/java/org/oppia/android/app/utility/ClickActions.kt index 533ab29298e..d089db49756 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/utility/ClickActions.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/utility/ClickActions.kt @@ -1,4 +1,4 @@ -package org.oppia.app.utility +package org.oppia.android.app.utility import androidx.test.espresso.ViewAction import androidx.test.espresso.action.CoordinatesProvider diff --git a/app/src/sharedTest/java/org/oppia/android/app/utility/DragViewAction.kt b/app/src/sharedTest/java/org/oppia/android/app/utility/DragViewAction.kt index b2527565d2d..ad7eba48065 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/utility/DragViewAction.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/utility/DragViewAction.kt @@ -1,4 +1,4 @@ -package org.oppia.app.utility +package org.oppia.android.app.utility import android.view.View import android.view.ViewConfiguration diff --git a/app/src/sharedTest/java/org/oppia/android/app/utility/DrawableMatcher.kt b/app/src/sharedTest/java/org/oppia/android/app/utility/DrawableMatcher.kt index e101d3f7799..7d787a6284d 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/utility/DrawableMatcher.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/utility/DrawableMatcher.kt @@ -1,4 +1,4 @@ -package org.oppia.app.utility +package org.oppia.android.app.utility import android.graphics.Bitmap import android.graphics.Canvas diff --git a/app/src/sharedTest/java/org/oppia/android/app/utility/EspressoTestsMatchers.kt b/app/src/sharedTest/java/org/oppia/android/app/utility/EspressoTestsMatchers.kt index 41dfc608511..9ba196eb585 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/utility/EspressoTestsMatchers.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/utility/EspressoTestsMatchers.kt @@ -1,8 +1,8 @@ -package org.oppia.app.utility +package org.oppia.android.app.utility import android.view.View import org.hamcrest.Matcher -import org.oppia.app.utility.TabMatcher.Companion.matchCurrentTabTitleCheck +import org.oppia.android.app.utility.TabMatcher.Companion.matchCurrentTabTitleCheck // https://medium.com/@dbottillo/android-ui-test-espresso-matcher-for-imageview-1a28c832626f#.4snjg8frw /** This object mainly facilitates as bridge between test-cases and various custom test-matchers. */ diff --git a/app/src/sharedTest/java/org/oppia/android/app/utility/FontSizeMatcher.kt b/app/src/sharedTest/java/org/oppia/android/app/utility/FontSizeMatcher.kt index 1759999e559..95c9082f62c 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/utility/FontSizeMatcher.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/utility/FontSizeMatcher.kt @@ -1,4 +1,4 @@ -package org.oppia.app.utility +package org.oppia.android.app.utility import android.view.View import android.widget.TextView diff --git a/app/src/sharedTest/java/org/oppia/android/app/utility/MockitoKotlinHelper.kt b/app/src/sharedTest/java/org/oppia/android/app/utility/MockitoKotlinHelper.kt index 382a2cce429..fb8163791b8 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/utility/MockitoKotlinHelper.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/utility/MockitoKotlinHelper.kt @@ -1,4 +1,4 @@ -package org.oppia.app.utility +package org.oppia.android.app.utility import org.mockito.ArgumentCaptor diff --git a/app/src/sharedTest/java/org/oppia/android/app/utility/OrientationChangeAction.kt b/app/src/sharedTest/java/org/oppia/android/app/utility/OrientationChangeAction.kt index b76707b6b2f..031ebdf695c 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/utility/OrientationChangeAction.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/utility/OrientationChangeAction.kt @@ -1,4 +1,4 @@ -package org.oppia.app.utility +package org.oppia.android.app.utility import android.app.Activity import android.content.Context diff --git a/app/src/sharedTest/java/org/oppia/android/app/utility/ProgressMatcher.kt b/app/src/sharedTest/java/org/oppia/android/app/utility/ProgressMatcher.kt index 0c9dc8db8c8..79866fdcce9 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/utility/ProgressMatcher.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/utility/ProgressMatcher.kt @@ -1,4 +1,4 @@ -package org.oppia.app.utility +package org.oppia.android.app.utility import android.view.View import android.widget.ProgressBar diff --git a/app/src/sharedTest/java/org/oppia/android/app/utility/RatioExtensionsTest.kt b/app/src/sharedTest/java/org/oppia/android/app/utility/RatioExtensionsTest.kt index be3a9b15ccd..92e71320d1a 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/utility/RatioExtensionsTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/utility/RatioExtensionsTest.kt @@ -1,4 +1,4 @@ -package org.oppia.app.utility +package org.oppia.android.app.utility import android.content.Context import androidx.test.core.app.ApplicationProvider @@ -7,7 +7,7 @@ import com.google.common.truth.Truth.assertThat import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.oppia.app.model.RatioExpression +import org.oppia.android.app.model.RatioExpression import org.robolectric.annotation.LooperMode /** Tests for [RatioExtensions]. */ diff --git a/app/src/sharedTest/java/org/oppia/android/app/utility/TabMatcher.kt b/app/src/sharedTest/java/org/oppia/android/app/utility/TabMatcher.kt index 23a97f88232..4ebe6b9f762 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/utility/TabMatcher.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/utility/TabMatcher.kt @@ -1,4 +1,4 @@ -package org.oppia.app.utility +package org.oppia.android.app.utility import android.view.View import androidx.test.espresso.PerformException diff --git a/app/src/sharedTest/java/org/oppia/android/app/walkthrough/WalkthroughActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/walkthrough/WalkthroughActivityTest.kt index b3e8145bef5..801cf73d30b 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/walkthrough/WalkthroughActivityTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/walkthrough/WalkthroughActivityTest.kt @@ -1,4 +1,4 @@ -package org.oppia.app.walkthrough +package org.oppia.android.app.walkthrough import androidx.test.core.app.ActivityScenario.launch import androidx.test.espresso.Espresso.onView @@ -15,9 +15,9 @@ import androidx.test.ext.junit.runners.AndroidJUnit4 import org.hamcrest.CoreMatchers.allOf import org.junit.Test import org.junit.runner.RunWith -import org.oppia.app.R -import org.oppia.app.utility.OrientationChangeAction.Companion.orientationLandscape -import org.oppia.app.utility.ProgressMatcher.Companion.withProgress +import org.oppia.android.R +import org.oppia.android.app.utility.OrientationChangeAction.Companion.orientationLandscape +import org.oppia.android.app.utility.ProgressMatcher.Companion.withProgress import org.robolectric.annotation.LooperMode /** Tests for [WalkthroughActivity]. */ diff --git a/app/src/sharedTest/java/org/oppia/android/app/walkthrough/WalkthroughFinalFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/walkthrough/WalkthroughFinalFragmentTest.kt index 06655405f2e..cd5c870bfcc 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/walkthrough/WalkthroughFinalFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/walkthrough/WalkthroughFinalFragmentTest.kt @@ -1,4 +1,4 @@ -package org.oppia.app.walkthrough +package org.oppia.android.app.walkthrough import android.content.Intent import androidx.recyclerview.widget.RecyclerView @@ -20,10 +20,10 @@ import org.junit.After import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.oppia.app.R -import org.oppia.app.recyclerview.RecyclerViewMatcher.Companion.atPositionOnView -import org.oppia.app.utility.OrientationChangeAction.Companion.orientationLandscape -import org.oppia.app.utility.ProgressMatcher.Companion.withProgress +import org.oppia.android.R +import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.atPositionOnView +import org.oppia.android.app.utility.OrientationChangeAction.Companion.orientationLandscape +import org.oppia.android.app.utility.ProgressMatcher.Companion.withProgress import org.robolectric.annotation.LooperMode /** Tests for [WalkthroughFinalFragment]. */ diff --git a/app/src/sharedTest/java/org/oppia/android/app/walkthrough/WalkthroughTopicListFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/walkthrough/WalkthroughTopicListFragmentTest.kt index 6738cac9146..240a5b56f87 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/walkthrough/WalkthroughTopicListFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/walkthrough/WalkthroughTopicListFragmentTest.kt @@ -1,4 +1,4 @@ -package org.oppia.app.walkthrough +package org.oppia.android.app.walkthrough import android.content.Intent import androidx.recyclerview.widget.RecyclerView @@ -19,9 +19,9 @@ import org.junit.After import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.oppia.app.R -import org.oppia.app.recyclerview.RecyclerViewMatcher.Companion.atPositionOnView -import org.oppia.app.utility.OrientationChangeAction.Companion.orientationLandscape +import org.oppia.android.R +import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.atPositionOnView +import org.oppia.android.app.utility.OrientationChangeAction.Companion.orientationLandscape import org.robolectric.annotation.LooperMode /** Tests for [WalkthroughTopicListFragment]. */ diff --git a/app/src/sharedTest/java/org/oppia/android/app/walkthrough/WalkthroughWelcomeFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/walkthrough/WalkthroughWelcomeFragmentTest.kt index 5da5063fae2..2535efbe45f 100644 --- a/app/src/sharedTest/java/org/oppia/android/app/walkthrough/WalkthroughWelcomeFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/android/app/walkthrough/WalkthroughWelcomeFragmentTest.kt @@ -1,4 +1,4 @@ -package org.oppia.app.walkthrough +package org.oppia.android.app.walkthrough import android.app.Application import android.content.Context @@ -23,18 +23,18 @@ import org.junit.After import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.oppia.app.R -import org.oppia.app.model.ProfileId -import org.oppia.app.onboarding.OnboardingActivity -import org.oppia.app.utility.OrientationChangeAction.Companion.orientationLandscape -import org.oppia.domain.oppialogger.LogStorageModule -import org.oppia.testing.TestDispatcherModule -import org.oppia.testing.TestLogReportingModule -import org.oppia.testing.profile.ProfileTestHelper -import org.oppia.util.logging.EnableConsoleLog -import org.oppia.util.logging.EnableFileLog -import org.oppia.util.logging.GlobalLogLevel -import org.oppia.util.logging.LogLevel +import org.oppia.android.R +import org.oppia.android.app.model.ProfileId +import org.oppia.android.app.onboarding.OnboardingActivity +import org.oppia.android.app.utility.OrientationChangeAction.Companion.orientationLandscape +import org.oppia.android.domain.oppialogger.LogStorageModule +import org.oppia.android.testing.TestDispatcherModule +import org.oppia.android.testing.TestLogReportingModule +import org.oppia.android.testing.profile.ProfileTestHelper +import org.oppia.android.util.logging.EnableConsoleLog +import org.oppia.android.util.logging.EnableFileLog +import org.oppia.android.util.logging.GlobalLogLevel +import org.oppia.android.util.logging.LogLevel import org.robolectric.annotation.LooperMode import javax.inject.Inject import javax.inject.Singleton diff --git a/app/src/test/AndroidManifest.xml b/app/src/test/AndroidManifest.xml index f2c2dfe4048..e736a543908 100644 --- a/app/src/test/AndroidManifest.xml +++ b/app/src/test/AndroidManifest.xml @@ -1,5 +1,5 @@ + package="org.oppia.android.app.test"> diff --git a/app/src/test/java/DataBinderMapperImpl.java b/app/src/test/java/DataBinderMapperImpl.java index dccd01beea7..ac0c59c0d95 100644 --- a/app/src/test/java/DataBinderMapperImpl.java +++ b/app/src/test/java/DataBinderMapperImpl.java @@ -9,6 +9,6 @@ */ public final class DataBinderMapperImpl extends MergedDataBinderMapper { DataBinderMapperImpl() { - addMapper(new org.oppia.app.test.DataBinderMapperImpl()); + addMapper(new org.oppia.android.app.test.DataBinderMapperImpl()); } } diff --git a/app/src/test/java/org/oppia/android/app/home/HomeActivityLocalTest.kt b/app/src/test/java/org/oppia/android/app/home/HomeActivityLocalTest.kt index db734e56dec..929ed6d3ea8 100644 --- a/app/src/test/java/org/oppia/android/app/home/HomeActivityLocalTest.kt +++ b/app/src/test/java/org/oppia/android/app/home/HomeActivityLocalTest.kt @@ -1,4 +1,4 @@ -package org.oppia.app.home +package org.oppia.android.app.home import android.app.Application import android.content.Intent @@ -13,41 +13,41 @@ import org.junit.After import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.oppia.app.activity.ActivityComponent -import org.oppia.app.application.ActivityComponentFactory -import org.oppia.app.application.ApplicationComponent -import org.oppia.app.application.ApplicationModule -import org.oppia.app.application.ApplicationStartupListenerModule -import org.oppia.app.model.EventLog -import org.oppia.app.model.EventLog.Context.ActivityContextCase.ACTIVITYCONTEXT_NOT_SET -import org.oppia.app.player.state.hintsandsolution.HintsAndSolutionConfigModule -import org.oppia.app.shim.IntentFactoryShimModule -import org.oppia.app.shim.ViewBindingShimModule -import org.oppia.domain.classify.InteractionsModule -import org.oppia.domain.classify.rules.continueinteraction.ContinueModule -import org.oppia.domain.classify.rules.dragAndDropSortInput.DragDropSortInputModule -import org.oppia.domain.classify.rules.fractioninput.FractionInputModule -import org.oppia.domain.classify.rules.imageClickInput.ImageClickInputModule -import org.oppia.domain.classify.rules.itemselectioninput.ItemSelectionInputModule -import org.oppia.domain.classify.rules.multiplechoiceinput.MultipleChoiceInputModule -import org.oppia.domain.classify.rules.numberwithunits.NumberWithUnitsRuleModule -import org.oppia.domain.classify.rules.numericinput.NumericInputRuleModule -import org.oppia.domain.classify.rules.ratioinput.RatioInputModule -import org.oppia.domain.classify.rules.textinput.TextInputRuleModule -import org.oppia.domain.onboarding.ExpirationMetaDataRetrieverModule -import org.oppia.domain.oppialogger.LogStorageModule -import org.oppia.domain.question.QuestionModule -import org.oppia.domain.topic.PrimeTopicAssetsControllerModule -import org.oppia.testing.FakeEventLogger -import org.oppia.testing.TestAccessibilityModule -import org.oppia.testing.TestDispatcherModule -import org.oppia.testing.TestLogReportingModule -import org.oppia.util.caching.testing.CachingTestModule -import org.oppia.util.gcsresource.GcsResourceModule -import org.oppia.util.logging.LoggerModule -import org.oppia.util.parser.GlideImageLoaderModule -import org.oppia.util.parser.HtmlParserEntityTypeModule -import org.oppia.util.parser.ImageParsingModule +import org.oppia.android.app.activity.ActivityComponent +import org.oppia.android.app.application.ActivityComponentFactory +import org.oppia.android.app.application.ApplicationComponent +import org.oppia.android.app.application.ApplicationModule +import org.oppia.android.app.application.ApplicationStartupListenerModule +import org.oppia.android.app.model.EventLog +import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.ACTIVITYCONTEXT_NOT_SET +import org.oppia.android.app.player.state.hintsandsolution.HintsAndSolutionConfigModule +import org.oppia.android.app.shim.IntentFactoryShimModule +import org.oppia.android.app.shim.ViewBindingShimModule +import org.oppia.android.domain.classify.InteractionsModule +import org.oppia.android.domain.classify.rules.continueinteraction.ContinueModule +import org.oppia.android.domain.classify.rules.dragAndDropSortInput.DragDropSortInputModule +import org.oppia.android.domain.classify.rules.fractioninput.FractionInputModule +import org.oppia.android.domain.classify.rules.imageClickInput.ImageClickInputModule +import org.oppia.android.domain.classify.rules.itemselectioninput.ItemSelectionInputModule +import org.oppia.android.domain.classify.rules.multiplechoiceinput.MultipleChoiceInputModule +import org.oppia.android.domain.classify.rules.numberwithunits.NumberWithUnitsRuleModule +import org.oppia.android.domain.classify.rules.numericinput.NumericInputRuleModule +import org.oppia.android.domain.classify.rules.ratioinput.RatioInputModule +import org.oppia.android.domain.classify.rules.textinput.TextInputRuleModule +import org.oppia.android.domain.onboarding.ExpirationMetaDataRetrieverModule +import org.oppia.android.domain.oppialogger.LogStorageModule +import org.oppia.android.domain.question.QuestionModule +import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule +import org.oppia.android.testing.FakeEventLogger +import org.oppia.android.testing.TestAccessibilityModule +import org.oppia.android.testing.TestDispatcherModule +import org.oppia.android.testing.TestLogReportingModule +import org.oppia.android.util.caching.testing.CachingTestModule +import org.oppia.android.util.gcsresource.GcsResourceModule +import org.oppia.android.util.logging.LoggerModule +import org.oppia.android.util.parser.GlideImageLoaderModule +import org.oppia.android.util.parser.HtmlParserEntityTypeModule +import org.oppia.android.util.parser.ImageParsingModule import org.robolectric.annotation.Config import org.robolectric.annotation.LooperMode import javax.inject.Inject diff --git a/app/src/test/java/org/oppia/android/app/parser/StringToRatioParserTest.kt b/app/src/test/java/org/oppia/android/app/parser/StringToRatioParserTest.kt index d7526d1fafb..9718cc4fe3f 100644 --- a/app/src/test/java/org/oppia/android/app/parser/StringToRatioParserTest.kt +++ b/app/src/test/java/org/oppia/android/app/parser/StringToRatioParserTest.kt @@ -1,4 +1,4 @@ -package org.oppia.app.parser +package org.oppia.android.app.parser import android.content.Context import androidx.test.core.app.ApplicationProvider @@ -7,7 +7,7 @@ import com.google.common.truth.Truth.assertThat import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.oppia.app.model.RatioExpression +import org.oppia.android.app.model.RatioExpression import org.robolectric.annotation.LooperMode import kotlin.reflect.KClass import kotlin.reflect.full.cast diff --git a/app/src/test/java/org/oppia/android/app/player/exploration/ExplorationActivityLocalTest.kt b/app/src/test/java/org/oppia/android/app/player/exploration/ExplorationActivityLocalTest.kt index 3d4332fc900..c05e3799e57 100644 --- a/app/src/test/java/org/oppia/android/app/player/exploration/ExplorationActivityLocalTest.kt +++ b/app/src/test/java/org/oppia/android/app/player/exploration/ExplorationActivityLocalTest.kt @@ -1,4 +1,4 @@ -package org.oppia.app.player.exploration +package org.oppia.android.app.player.exploration import android.app.Application import android.content.Intent @@ -11,47 +11,47 @@ import dagger.Component import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.oppia.app.activity.ActivityComponent -import org.oppia.app.application.ActivityComponentFactory -import org.oppia.app.application.ApplicationComponent -import org.oppia.app.application.ApplicationModule -import org.oppia.app.application.ApplicationStartupListenerModule -import org.oppia.app.model.EventLog -import org.oppia.app.model.EventLog.Context.ActivityContextCase.EXPLORATION_CONTEXT -import org.oppia.app.player.state.hintsandsolution.HintsAndSolutionConfigModule -import org.oppia.app.shim.IntentFactoryShimModule -import org.oppia.app.shim.ViewBindingShimModule -import org.oppia.app.testing.ExplorationInjectionActivity -import org.oppia.domain.classify.InteractionsModule -import org.oppia.domain.classify.rules.continueinteraction.ContinueModule -import org.oppia.domain.classify.rules.dragAndDropSortInput.DragDropSortInputModule -import org.oppia.domain.classify.rules.fractioninput.FractionInputModule -import org.oppia.domain.classify.rules.imageClickInput.ImageClickInputModule -import org.oppia.domain.classify.rules.itemselectioninput.ItemSelectionInputModule -import org.oppia.domain.classify.rules.multiplechoiceinput.MultipleChoiceInputModule -import org.oppia.domain.classify.rules.numberwithunits.NumberWithUnitsRuleModule -import org.oppia.domain.classify.rules.numericinput.NumericInputRuleModule -import org.oppia.domain.classify.rules.ratioinput.RatioInputModule -import org.oppia.domain.classify.rules.textinput.TextInputRuleModule -import org.oppia.domain.exploration.ExplorationDataController -import org.oppia.domain.onboarding.ExpirationMetaDataRetrieverModule -import org.oppia.domain.oppialogger.LogStorageModule -import org.oppia.domain.question.QuestionModule -import org.oppia.domain.topic.PrimeTopicAssetsControllerModule -import org.oppia.domain.topic.TEST_EXPLORATION_ID_2 -import org.oppia.domain.topic.TEST_STORY_ID_0 -import org.oppia.domain.topic.TEST_TOPIC_ID_0 -import org.oppia.testing.FakeEventLogger -import org.oppia.testing.TestAccessibilityModule -import org.oppia.testing.TestDispatcherModule -import org.oppia.testing.TestLogReportingModule -import org.oppia.util.caching.testing.CachingTestModule -import org.oppia.util.gcsresource.GcsResourceModule -import org.oppia.util.logging.LoggerModule -import org.oppia.util.networking.NetworkConnectionUtil -import org.oppia.util.parser.GlideImageLoaderModule -import org.oppia.util.parser.HtmlParserEntityTypeModule -import org.oppia.util.parser.ImageParsingModule +import org.oppia.android.app.activity.ActivityComponent +import org.oppia.android.app.application.ActivityComponentFactory +import org.oppia.android.app.application.ApplicationComponent +import org.oppia.android.app.application.ApplicationModule +import org.oppia.android.app.application.ApplicationStartupListenerModule +import org.oppia.android.app.model.EventLog +import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.EXPLORATION_CONTEXT +import org.oppia.android.app.player.state.hintsandsolution.HintsAndSolutionConfigModule +import org.oppia.android.app.shim.IntentFactoryShimModule +import org.oppia.android.app.shim.ViewBindingShimModule +import org.oppia.android.app.testing.ExplorationInjectionActivity +import org.oppia.android.domain.classify.InteractionsModule +import org.oppia.android.domain.classify.rules.continueinteraction.ContinueModule +import org.oppia.android.domain.classify.rules.dragAndDropSortInput.DragDropSortInputModule +import org.oppia.android.domain.classify.rules.fractioninput.FractionInputModule +import org.oppia.android.domain.classify.rules.imageClickInput.ImageClickInputModule +import org.oppia.android.domain.classify.rules.itemselectioninput.ItemSelectionInputModule +import org.oppia.android.domain.classify.rules.multiplechoiceinput.MultipleChoiceInputModule +import org.oppia.android.domain.classify.rules.numberwithunits.NumberWithUnitsRuleModule +import org.oppia.android.domain.classify.rules.numericinput.NumericInputRuleModule +import org.oppia.android.domain.classify.rules.ratioinput.RatioInputModule +import org.oppia.android.domain.classify.rules.textinput.TextInputRuleModule +import org.oppia.android.domain.exploration.ExplorationDataController +import org.oppia.android.domain.onboarding.ExpirationMetaDataRetrieverModule +import org.oppia.android.domain.oppialogger.LogStorageModule +import org.oppia.android.domain.question.QuestionModule +import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule +import org.oppia.android.domain.topic.TEST_EXPLORATION_ID_2 +import org.oppia.android.domain.topic.TEST_STORY_ID_0 +import org.oppia.android.domain.topic.TEST_TOPIC_ID_0 +import org.oppia.android.testing.FakeEventLogger +import org.oppia.android.testing.TestAccessibilityModule +import org.oppia.android.testing.TestDispatcherModule +import org.oppia.android.testing.TestLogReportingModule +import org.oppia.android.util.caching.testing.CachingTestModule +import org.oppia.android.util.gcsresource.GcsResourceModule +import org.oppia.android.util.logging.LoggerModule +import org.oppia.android.util.networking.NetworkConnectionUtil +import org.oppia.android.util.parser.GlideImageLoaderModule +import org.oppia.android.util.parser.HtmlParserEntityTypeModule +import org.oppia.android.util.parser.ImageParsingModule import org.robolectric.annotation.Config import org.robolectric.annotation.LooperMode import javax.inject.Inject diff --git a/app/src/test/java/org/oppia/android/app/player/state/StateFragmentLocalTest.kt b/app/src/test/java/org/oppia/android/app/player/state/StateFragmentLocalTest.kt index 7434783724d..d568391d22c 100644 --- a/app/src/test/java/org/oppia/android/app/player/state/StateFragmentLocalTest.kt +++ b/app/src/test/java/org/oppia/android/app/player/state/StateFragmentLocalTest.kt @@ -1,4 +1,4 @@ -package org.oppia.app.player.state +package org.oppia.android.app.player.state import android.app.Application import android.content.Context @@ -42,59 +42,59 @@ import org.junit.After import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.oppia.app.R -import org.oppia.app.activity.ActivityComponent -import org.oppia.app.application.ActivityComponentFactory -import org.oppia.app.application.ApplicationComponent -import org.oppia.app.application.ApplicationContext -import org.oppia.app.application.ApplicationInjector -import org.oppia.app.application.ApplicationInjectorProvider -import org.oppia.app.application.ApplicationModule -import org.oppia.app.application.ApplicationStartupListenerModule -import org.oppia.app.hintsandsolution.TAG_REVEAL_SOLUTION_DIALOG -import org.oppia.app.player.exploration.TAG_HINTS_AND_SOLUTION_DIALOG -import org.oppia.app.player.state.hintsandsolution.HintsAndSolutionConfigModule -import org.oppia.app.player.state.itemviewmodel.StateItemViewModel -import org.oppia.app.player.state.itemviewmodel.StateItemViewModel.ViewType.CONTINUE_NAVIGATION_BUTTON -import org.oppia.app.player.state.itemviewmodel.StateItemViewModel.ViewType.FRACTION_INPUT_INTERACTION -import org.oppia.app.player.state.itemviewmodel.StateItemViewModel.ViewType.NEXT_NAVIGATION_BUTTON -import org.oppia.app.player.state.itemviewmodel.StateItemViewModel.ViewType.PREVIOUS_RESPONSES_HEADER -import org.oppia.app.player.state.itemviewmodel.StateItemViewModel.ViewType.SELECTION_INTERACTION -import org.oppia.app.player.state.itemviewmodel.StateItemViewModel.ViewType.SUBMIT_ANSWER_BUTTON -import org.oppia.app.player.state.testing.StateFragmentTestActivity -import org.oppia.app.recyclerview.RecyclerViewMatcher -import org.oppia.app.shim.ViewBindingShimModule -import org.oppia.domain.classify.InteractionsModule -import org.oppia.domain.classify.rules.continueinteraction.ContinueModule -import org.oppia.domain.classify.rules.dragAndDropSortInput.DragDropSortInputModule -import org.oppia.domain.classify.rules.fractioninput.FractionInputModule -import org.oppia.domain.classify.rules.imageClickInput.ImageClickInputModule -import org.oppia.domain.classify.rules.itemselectioninput.ItemSelectionInputModule -import org.oppia.domain.classify.rules.multiplechoiceinput.MultipleChoiceInputModule -import org.oppia.domain.classify.rules.numberwithunits.NumberWithUnitsRuleModule -import org.oppia.domain.classify.rules.numericinput.NumericInputRuleModule -import org.oppia.domain.classify.rules.ratioinput.RatioInputModule -import org.oppia.domain.classify.rules.textinput.TextInputRuleModule -import org.oppia.domain.onboarding.ExpirationMetaDataRetrieverModule -import org.oppia.domain.oppialogger.LogStorageModule -import org.oppia.domain.question.QuestionModule -import org.oppia.domain.topic.FRACTIONS_EXPLORATION_ID_1 -import org.oppia.domain.topic.PrimeTopicAssetsControllerModule -import org.oppia.domain.topic.TEST_STORY_ID_0 -import org.oppia.domain.topic.TEST_TOPIC_ID_0 -import org.oppia.testing.CoroutineExecutorService -import org.oppia.testing.TestAccessibilityModule -import org.oppia.testing.TestCoroutineDispatchers -import org.oppia.testing.TestDispatcherModule -import org.oppia.testing.TestLogReportingModule -import org.oppia.testing.profile.ProfileTestHelper -import org.oppia.util.caching.testing.CachingTestModule -import org.oppia.util.gcsresource.GcsResourceModule -import org.oppia.util.logging.LoggerModule -import org.oppia.util.parser.GlideImageLoaderModule -import org.oppia.util.parser.HtmlParserEntityTypeModule -import org.oppia.util.parser.ImageParsingModule -import org.oppia.util.threading.BackgroundDispatcher +import org.oppia.android.R +import org.oppia.android.app.activity.ActivityComponent +import org.oppia.android.app.application.ActivityComponentFactory +import org.oppia.android.app.application.ApplicationComponent +import org.oppia.android.app.application.ApplicationContext +import org.oppia.android.app.application.ApplicationInjector +import org.oppia.android.app.application.ApplicationInjectorProvider +import org.oppia.android.app.application.ApplicationModule +import org.oppia.android.app.application.ApplicationStartupListenerModule +import org.oppia.android.app.hintsandsolution.TAG_REVEAL_SOLUTION_DIALOG +import org.oppia.android.app.player.exploration.TAG_HINTS_AND_SOLUTION_DIALOG +import org.oppia.android.app.player.state.hintsandsolution.HintsAndSolutionConfigModule +import org.oppia.android.app.player.state.itemviewmodel.StateItemViewModel +import org.oppia.android.app.player.state.itemviewmodel.StateItemViewModel.ViewType.CONTINUE_NAVIGATION_BUTTON +import org.oppia.android.app.player.state.itemviewmodel.StateItemViewModel.ViewType.FRACTION_INPUT_INTERACTION +import org.oppia.android.app.player.state.itemviewmodel.StateItemViewModel.ViewType.NEXT_NAVIGATION_BUTTON +import org.oppia.android.app.player.state.itemviewmodel.StateItemViewModel.ViewType.PREVIOUS_RESPONSES_HEADER +import org.oppia.android.app.player.state.itemviewmodel.StateItemViewModel.ViewType.SELECTION_INTERACTION +import org.oppia.android.app.player.state.itemviewmodel.StateItemViewModel.ViewType.SUBMIT_ANSWER_BUTTON +import org.oppia.android.app.player.state.testing.StateFragmentTestActivity +import org.oppia.android.app.recyclerview.RecyclerViewMatcher +import org.oppia.android.app.shim.ViewBindingShimModule +import org.oppia.android.domain.classify.InteractionsModule +import org.oppia.android.domain.classify.rules.continueinteraction.ContinueModule +import org.oppia.android.domain.classify.rules.dragAndDropSortInput.DragDropSortInputModule +import org.oppia.android.domain.classify.rules.fractioninput.FractionInputModule +import org.oppia.android.domain.classify.rules.imageClickInput.ImageClickInputModule +import org.oppia.android.domain.classify.rules.itemselectioninput.ItemSelectionInputModule +import org.oppia.android.domain.classify.rules.multiplechoiceinput.MultipleChoiceInputModule +import org.oppia.android.domain.classify.rules.numberwithunits.NumberWithUnitsRuleModule +import org.oppia.android.domain.classify.rules.numericinput.NumericInputRuleModule +import org.oppia.android.domain.classify.rules.ratioinput.RatioInputModule +import org.oppia.android.domain.classify.rules.textinput.TextInputRuleModule +import org.oppia.android.domain.onboarding.ExpirationMetaDataRetrieverModule +import org.oppia.android.domain.oppialogger.LogStorageModule +import org.oppia.android.domain.question.QuestionModule +import org.oppia.android.domain.topic.FRACTIONS_EXPLORATION_ID_1 +import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule +import org.oppia.android.domain.topic.TEST_STORY_ID_0 +import org.oppia.android.domain.topic.TEST_TOPIC_ID_0 +import org.oppia.android.testing.CoroutineExecutorService +import org.oppia.android.testing.TestAccessibilityModule +import org.oppia.android.testing.TestCoroutineDispatchers +import org.oppia.android.testing.TestDispatcherModule +import org.oppia.android.testing.TestLogReportingModule +import org.oppia.android.testing.profile.ProfileTestHelper +import org.oppia.android.util.caching.testing.CachingTestModule +import org.oppia.android.util.gcsresource.GcsResourceModule +import org.oppia.android.util.logging.LoggerModule +import org.oppia.android.util.parser.GlideImageLoaderModule +import org.oppia.android.util.parser.HtmlParserEntityTypeModule +import org.oppia.android.util.parser.ImageParsingModule +import org.oppia.android.util.threading.BackgroundDispatcher import org.robolectric.annotation.Config import org.robolectric.annotation.LooperMode import org.robolectric.shadows.ShadowMediaPlayer diff --git a/app/src/test/java/org/oppia/android/app/profile/ProfileChooserFragmentLocalTest.kt b/app/src/test/java/org/oppia/android/app/profile/ProfileChooserFragmentLocalTest.kt index 8e73c5f09d7..bc4fbb3c8c1 100644 --- a/app/src/test/java/org/oppia/android/app/profile/ProfileChooserFragmentLocalTest.kt +++ b/app/src/test/java/org/oppia/android/app/profile/ProfileChooserFragmentLocalTest.kt @@ -1,4 +1,4 @@ -package org.oppia.app.profile +package org.oppia.android.app.profile import android.app.Application import android.content.Intent @@ -13,43 +13,43 @@ import org.junit.After import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.oppia.app.activity.ActivityComponent -import org.oppia.app.application.ActivityComponentFactory -import org.oppia.app.application.ApplicationComponent -import org.oppia.app.application.ApplicationInjector -import org.oppia.app.application.ApplicationInjectorProvider -import org.oppia.app.application.ApplicationModule -import org.oppia.app.application.ApplicationStartupListenerModule -import org.oppia.app.model.EventLog.Context.ActivityContextCase.ACTIVITYCONTEXT_NOT_SET -import org.oppia.app.model.EventLog.EventAction -import org.oppia.app.model.EventLog.Priority -import org.oppia.app.player.state.hintsandsolution.HintsAndSolutionConfigModule -import org.oppia.app.shim.ViewBindingShimModule -import org.oppia.domain.classify.InteractionsModule -import org.oppia.domain.classify.rules.continueinteraction.ContinueModule -import org.oppia.domain.classify.rules.dragAndDropSortInput.DragDropSortInputModule -import org.oppia.domain.classify.rules.fractioninput.FractionInputModule -import org.oppia.domain.classify.rules.imageClickInput.ImageClickInputModule -import org.oppia.domain.classify.rules.itemselectioninput.ItemSelectionInputModule -import org.oppia.domain.classify.rules.multiplechoiceinput.MultipleChoiceInputModule -import org.oppia.domain.classify.rules.numberwithunits.NumberWithUnitsRuleModule -import org.oppia.domain.classify.rules.numericinput.NumericInputRuleModule -import org.oppia.domain.classify.rules.ratioinput.RatioInputModule -import org.oppia.domain.classify.rules.textinput.TextInputRuleModule -import org.oppia.domain.onboarding.ExpirationMetaDataRetrieverModule -import org.oppia.domain.oppialogger.LogStorageModule -import org.oppia.domain.question.QuestionModule -import org.oppia.domain.topic.PrimeTopicAssetsControllerModule -import org.oppia.testing.FakeEventLogger -import org.oppia.testing.TestAccessibilityModule -import org.oppia.testing.TestDispatcherModule -import org.oppia.testing.TestLogReportingModule -import org.oppia.util.caching.testing.CachingTestModule -import org.oppia.util.gcsresource.GcsResourceModule -import org.oppia.util.logging.LoggerModule -import org.oppia.util.parser.GlideImageLoaderModule -import org.oppia.util.parser.HtmlParserEntityTypeModule -import org.oppia.util.parser.ImageParsingModule +import org.oppia.android.app.activity.ActivityComponent +import org.oppia.android.app.application.ActivityComponentFactory +import org.oppia.android.app.application.ApplicationComponent +import org.oppia.android.app.application.ApplicationInjector +import org.oppia.android.app.application.ApplicationInjectorProvider +import org.oppia.android.app.application.ApplicationModule +import org.oppia.android.app.application.ApplicationStartupListenerModule +import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.ACTIVITYCONTEXT_NOT_SET +import org.oppia.android.app.model.EventLog.EventAction +import org.oppia.android.app.model.EventLog.Priority +import org.oppia.android.app.player.state.hintsandsolution.HintsAndSolutionConfigModule +import org.oppia.android.app.shim.ViewBindingShimModule +import org.oppia.android.domain.classify.InteractionsModule +import org.oppia.android.domain.classify.rules.continueinteraction.ContinueModule +import org.oppia.android.domain.classify.rules.dragAndDropSortInput.DragDropSortInputModule +import org.oppia.android.domain.classify.rules.fractioninput.FractionInputModule +import org.oppia.android.domain.classify.rules.imageClickInput.ImageClickInputModule +import org.oppia.android.domain.classify.rules.itemselectioninput.ItemSelectionInputModule +import org.oppia.android.domain.classify.rules.multiplechoiceinput.MultipleChoiceInputModule +import org.oppia.android.domain.classify.rules.numberwithunits.NumberWithUnitsRuleModule +import org.oppia.android.domain.classify.rules.numericinput.NumericInputRuleModule +import org.oppia.android.domain.classify.rules.ratioinput.RatioInputModule +import org.oppia.android.domain.classify.rules.textinput.TextInputRuleModule +import org.oppia.android.domain.onboarding.ExpirationMetaDataRetrieverModule +import org.oppia.android.domain.oppialogger.LogStorageModule +import org.oppia.android.domain.question.QuestionModule +import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule +import org.oppia.android.testing.FakeEventLogger +import org.oppia.android.testing.TestAccessibilityModule +import org.oppia.android.testing.TestDispatcherModule +import org.oppia.android.testing.TestLogReportingModule +import org.oppia.android.util.caching.testing.CachingTestModule +import org.oppia.android.util.gcsresource.GcsResourceModule +import org.oppia.android.util.logging.LoggerModule +import org.oppia.android.util.parser.GlideImageLoaderModule +import org.oppia.android.util.parser.HtmlParserEntityTypeModule +import org.oppia.android.util.parser.ImageParsingModule import org.robolectric.annotation.Config import org.robolectric.annotation.LooperMode import javax.inject.Inject diff --git a/app/src/test/java/org/oppia/android/app/story/StoryActivityLocalTest.kt b/app/src/test/java/org/oppia/android/app/story/StoryActivityLocalTest.kt index 7986a7f765d..c056e9aeaf8 100644 --- a/app/src/test/java/org/oppia/android/app/story/StoryActivityLocalTest.kt +++ b/app/src/test/java/org/oppia/android/app/story/StoryActivityLocalTest.kt @@ -1,4 +1,4 @@ -package org.oppia.app.story +package org.oppia.android.app.story import android.app.Application import android.content.Intent @@ -13,42 +13,42 @@ import org.junit.After import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.oppia.app.activity.ActivityComponent -import org.oppia.app.application.ActivityComponentFactory -import org.oppia.app.application.ApplicationComponent -import org.oppia.app.application.ApplicationInjector -import org.oppia.app.application.ApplicationInjectorProvider -import org.oppia.app.application.ApplicationModule -import org.oppia.app.application.ApplicationStartupListenerModule -import org.oppia.app.model.EventLog -import org.oppia.app.model.EventLog.Context.ActivityContextCase.STORY_CONTEXT -import org.oppia.app.player.state.hintsandsolution.HintsAndSolutionConfigModule -import org.oppia.app.shim.ViewBindingShimModule -import org.oppia.domain.classify.InteractionsModule -import org.oppia.domain.classify.rules.continueinteraction.ContinueModule -import org.oppia.domain.classify.rules.dragAndDropSortInput.DragDropSortInputModule -import org.oppia.domain.classify.rules.fractioninput.FractionInputModule -import org.oppia.domain.classify.rules.imageClickInput.ImageClickInputModule -import org.oppia.domain.classify.rules.itemselectioninput.ItemSelectionInputModule -import org.oppia.domain.classify.rules.multiplechoiceinput.MultipleChoiceInputModule -import org.oppia.domain.classify.rules.numberwithunits.NumberWithUnitsRuleModule -import org.oppia.domain.classify.rules.numericinput.NumericInputRuleModule -import org.oppia.domain.classify.rules.ratioinput.RatioInputModule -import org.oppia.domain.classify.rules.textinput.TextInputRuleModule -import org.oppia.domain.onboarding.ExpirationMetaDataRetrieverModule -import org.oppia.domain.oppialogger.LogStorageModule -import org.oppia.domain.question.QuestionModule -import org.oppia.domain.topic.PrimeTopicAssetsControllerModule -import org.oppia.testing.FakeEventLogger -import org.oppia.testing.TestAccessibilityModule -import org.oppia.testing.TestDispatcherModule -import org.oppia.testing.TestLogReportingModule -import org.oppia.util.caching.testing.CachingTestModule -import org.oppia.util.gcsresource.GcsResourceModule -import org.oppia.util.logging.LoggerModule -import org.oppia.util.parser.GlideImageLoaderModule -import org.oppia.util.parser.HtmlParserEntityTypeModule -import org.oppia.util.parser.ImageParsingModule +import org.oppia.android.app.activity.ActivityComponent +import org.oppia.android.app.application.ActivityComponentFactory +import org.oppia.android.app.application.ApplicationComponent +import org.oppia.android.app.application.ApplicationInjector +import org.oppia.android.app.application.ApplicationInjectorProvider +import org.oppia.android.app.application.ApplicationModule +import org.oppia.android.app.application.ApplicationStartupListenerModule +import org.oppia.android.app.model.EventLog +import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.STORY_CONTEXT +import org.oppia.android.app.player.state.hintsandsolution.HintsAndSolutionConfigModule +import org.oppia.android.app.shim.ViewBindingShimModule +import org.oppia.android.domain.classify.InteractionsModule +import org.oppia.android.domain.classify.rules.continueinteraction.ContinueModule +import org.oppia.android.domain.classify.rules.dragAndDropSortInput.DragDropSortInputModule +import org.oppia.android.domain.classify.rules.fractioninput.FractionInputModule +import org.oppia.android.domain.classify.rules.imageClickInput.ImageClickInputModule +import org.oppia.android.domain.classify.rules.itemselectioninput.ItemSelectionInputModule +import org.oppia.android.domain.classify.rules.multiplechoiceinput.MultipleChoiceInputModule +import org.oppia.android.domain.classify.rules.numberwithunits.NumberWithUnitsRuleModule +import org.oppia.android.domain.classify.rules.numericinput.NumericInputRuleModule +import org.oppia.android.domain.classify.rules.ratioinput.RatioInputModule +import org.oppia.android.domain.classify.rules.textinput.TextInputRuleModule +import org.oppia.android.domain.onboarding.ExpirationMetaDataRetrieverModule +import org.oppia.android.domain.oppialogger.LogStorageModule +import org.oppia.android.domain.question.QuestionModule +import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule +import org.oppia.android.testing.FakeEventLogger +import org.oppia.android.testing.TestAccessibilityModule +import org.oppia.android.testing.TestDispatcherModule +import org.oppia.android.testing.TestLogReportingModule +import org.oppia.android.util.caching.testing.CachingTestModule +import org.oppia.android.util.gcsresource.GcsResourceModule +import org.oppia.android.util.logging.LoggerModule +import org.oppia.android.util.parser.GlideImageLoaderModule +import org.oppia.android.util.parser.HtmlParserEntityTypeModule +import org.oppia.android.util.parser.ImageParsingModule import org.robolectric.annotation.Config import org.robolectric.annotation.LooperMode import javax.inject.Inject diff --git a/app/src/test/java/org/oppia/android/app/testing/CompletedStoryListSpanTest.kt b/app/src/test/java/org/oppia/android/app/testing/CompletedStoryListSpanTest.kt index 1ead1411a49..96a894b726d 100644 --- a/app/src/test/java/org/oppia/android/app/testing/CompletedStoryListSpanTest.kt +++ b/app/src/test/java/org/oppia/android/app/testing/CompletedStoryListSpanTest.kt @@ -1,4 +1,4 @@ -package org.oppia.app.testing +package org.oppia.android.app.testing import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.RecyclerView @@ -12,9 +12,9 @@ import org.junit.After import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.oppia.app.R -import org.oppia.app.completedstorylist.CompletedStoryListActivity -import org.oppia.app.completedstorylist.CompletedStoryListFragment.Companion.COMPLETED_STORY_LIST_FRAGMENT_TAG +import org.oppia.android.R +import org.oppia.android.app.completedstorylist.CompletedStoryListActivity +import org.oppia.android.app.completedstorylist.CompletedStoryListFragment.Companion.COMPLETED_STORY_LIST_FRAGMENT_TAG import org.robolectric.annotation.Config import org.robolectric.annotation.LooperMode diff --git a/app/src/test/java/org/oppia/android/app/testing/OngoingTopicListSpanTest.kt b/app/src/test/java/org/oppia/android/app/testing/OngoingTopicListSpanTest.kt index 9272773b4e4..6122310e859 100644 --- a/app/src/test/java/org/oppia/android/app/testing/OngoingTopicListSpanTest.kt +++ b/app/src/test/java/org/oppia/android/app/testing/OngoingTopicListSpanTest.kt @@ -1,4 +1,4 @@ -package org.oppia.app.testing +package org.oppia.android.app.testing import android.view.View import androidx.recyclerview.widget.GridLayoutManager @@ -13,9 +13,9 @@ import org.junit.After import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.oppia.app.R -import org.oppia.app.ongoingtopiclist.OngoingTopicListActivity -import org.oppia.app.ongoingtopiclist.OngoingTopicListFragment +import org.oppia.android.R +import org.oppia.android.app.ongoingtopiclist.OngoingTopicListActivity +import org.oppia.android.app.ongoingtopiclist.OngoingTopicListFragment import org.robolectric.annotation.Config import org.robolectric.annotation.LooperMode diff --git a/app/src/test/java/org/oppia/android/app/testing/ProfileChooserSpanTest.kt b/app/src/test/java/org/oppia/android/app/testing/ProfileChooserSpanTest.kt index 93cd8ab8d6e..2c80beb1ca1 100644 --- a/app/src/test/java/org/oppia/android/app/testing/ProfileChooserSpanTest.kt +++ b/app/src/test/java/org/oppia/android/app/testing/ProfileChooserSpanTest.kt @@ -1,4 +1,4 @@ -package org.oppia.app.testing +package org.oppia.android.app.testing import android.view.View import androidx.recyclerview.widget.GridLayoutManager @@ -13,7 +13,7 @@ import org.junit.After import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.oppia.app.profile.ProfileChooserFragment +import org.oppia.android.app.profile.ProfileChooserFragment import org.robolectric.annotation.Config import org.robolectric.annotation.LooperMode diff --git a/app/src/test/java/org/oppia/android/app/testing/ProfileProgressSpanCount.kt b/app/src/test/java/org/oppia/android/app/testing/ProfileProgressSpanCount.kt index 6e77b045ed0..a6df21207f3 100644 --- a/app/src/test/java/org/oppia/android/app/testing/ProfileProgressSpanCount.kt +++ b/app/src/test/java/org/oppia/android/app/testing/ProfileProgressSpanCount.kt @@ -1,4 +1,4 @@ -package org.oppia.app.testing +package org.oppia.android.app.testing import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.RecyclerView @@ -12,9 +12,9 @@ import org.junit.After import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.oppia.app.R -import org.oppia.app.profileprogress.ProfileProgressActivity -import org.oppia.app.profileprogress.ProfileProgressFragment +import org.oppia.android.R +import org.oppia.android.app.profileprogress.ProfileProgressActivity +import org.oppia.android.app.profileprogress.ProfileProgressFragment import org.robolectric.annotation.Config import org.robolectric.annotation.LooperMode diff --git a/app/src/test/java/org/oppia/android/app/testing/TopicRevisionSpanTest.kt b/app/src/test/java/org/oppia/android/app/testing/TopicRevisionSpanTest.kt index 79d6d9013d7..2f0ed58e86d 100644 --- a/app/src/test/java/org/oppia/android/app/testing/TopicRevisionSpanTest.kt +++ b/app/src/test/java/org/oppia/android/app/testing/TopicRevisionSpanTest.kt @@ -1,4 +1,4 @@ -package org.oppia.app.testing +package org.oppia.android.app.testing import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.RecyclerView @@ -12,8 +12,8 @@ import org.junit.After import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.oppia.app.R -import org.oppia.app.topic.revision.TopicRevisionFragment +import org.oppia.android.R +import org.oppia.android.app.topic.revision.TopicRevisionFragment import org.robolectric.annotation.Config import org.robolectric.annotation.LooperMode diff --git a/app/src/test/java/org/oppia/android/app/testing/administratorcontrols/AdministratorControlsFragmentTest.kt b/app/src/test/java/org/oppia/android/app/testing/administratorcontrols/AdministratorControlsFragmentTest.kt index 9e1fb06f17a..57193abb89c 100644 --- a/app/src/test/java/org/oppia/android/app/testing/administratorcontrols/AdministratorControlsFragmentTest.kt +++ b/app/src/test/java/org/oppia/android/app/testing/administratorcontrols/AdministratorControlsFragmentTest.kt @@ -1,4 +1,4 @@ -package org.oppia.app.testing.administratorcontrols +package org.oppia.android.app.testing.administratorcontrols import android.content.Intent import androidx.recyclerview.widget.RecyclerView @@ -18,12 +18,12 @@ import org.junit.After import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.oppia.app.R -import org.oppia.app.administratorcontrols.AdministratorControlsActivity -import org.oppia.app.administratorcontrols.appversion.AppVersionActivity -import org.oppia.app.administratorcontrols.appversion.AppVersionFragment -import org.oppia.app.settings.profile.ProfileListActivity -import org.oppia.app.settings.profile.ProfileListFragment +import org.oppia.android.R +import org.oppia.android.app.administratorcontrols.AdministratorControlsActivity +import org.oppia.android.app.administratorcontrols.appversion.AppVersionActivity +import org.oppia.android.app.administratorcontrols.appversion.AppVersionFragment +import org.oppia.android.app.settings.profile.ProfileListActivity +import org.oppia.android.app.settings.profile.ProfileListFragment import org.robolectric.annotation.Config @RunWith(AndroidJUnit4::class) diff --git a/app/src/test/java/org/oppia/android/app/testing/options/AppLanguageFragmentTest.kt b/app/src/test/java/org/oppia/android/app/testing/options/AppLanguageFragmentTest.kt index a574039584a..a102124c6d4 100644 --- a/app/src/test/java/org/oppia/android/app/testing/options/AppLanguageFragmentTest.kt +++ b/app/src/test/java/org/oppia/android/app/testing/options/AppLanguageFragmentTest.kt @@ -1,4 +1,4 @@ -package org.oppia.app.testing.options +package org.oppia.android.app.testing.options import android.app.Application import android.content.Context @@ -22,46 +22,46 @@ import org.junit.After import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.oppia.app.R -import org.oppia.app.activity.ActivityComponent -import org.oppia.app.application.ActivityComponentFactory -import org.oppia.app.application.ApplicationComponent -import org.oppia.app.application.ApplicationModule -import org.oppia.app.application.ApplicationStartupListenerModule -import org.oppia.app.options.APP_LANGUAGE -import org.oppia.app.options.AppLanguageActivity -import org.oppia.app.options.OptionsActivity -import org.oppia.app.player.state.hintsandsolution.HintsAndSolutionConfigModule -import org.oppia.app.recyclerview.RecyclerViewMatcher.Companion.atPositionOnView -import org.oppia.app.shim.ViewBindingShimModule -import org.oppia.app.utility.OrientationChangeAction.Companion.orientationLandscape -import org.oppia.domain.classify.InteractionsModule -import org.oppia.domain.classify.rules.continueinteraction.ContinueModule -import org.oppia.domain.classify.rules.dragAndDropSortInput.DragDropSortInputModule -import org.oppia.domain.classify.rules.fractioninput.FractionInputModule -import org.oppia.domain.classify.rules.imageClickInput.ImageClickInputModule -import org.oppia.domain.classify.rules.itemselectioninput.ItemSelectionInputModule -import org.oppia.domain.classify.rules.multiplechoiceinput.MultipleChoiceInputModule -import org.oppia.domain.classify.rules.numberwithunits.NumberWithUnitsRuleModule -import org.oppia.domain.classify.rules.numericinput.NumericInputRuleModule -import org.oppia.domain.classify.rules.ratioinput.RatioInputModule -import org.oppia.domain.classify.rules.textinput.TextInputRuleModule -import org.oppia.domain.onboarding.ExpirationMetaDataRetrieverModule -import org.oppia.domain.oppialogger.LogStorageModule -import org.oppia.domain.question.QuestionModule -import org.oppia.domain.topic.PrimeTopicAssetsControllerModule -import org.oppia.testing.TestAccessibilityModule -import org.oppia.testing.TestCoroutineDispatchers -import org.oppia.testing.TestDispatcherModule -import org.oppia.testing.TestLogReportingModule -import org.oppia.testing.profile.ProfileTestHelper -import org.oppia.util.caching.CacheAssetsLocally -import org.oppia.util.caching.testing.CachingTestModule -import org.oppia.util.gcsresource.GcsResourceModule -import org.oppia.util.logging.LoggerModule -import org.oppia.util.parser.GlideImageLoaderModule -import org.oppia.util.parser.HtmlParserEntityTypeModule -import org.oppia.util.parser.ImageParsingModule +import org.oppia.android.R +import org.oppia.android.app.activity.ActivityComponent +import org.oppia.android.app.application.ActivityComponentFactory +import org.oppia.android.app.application.ApplicationComponent +import org.oppia.android.app.application.ApplicationModule +import org.oppia.android.app.application.ApplicationStartupListenerModule +import org.oppia.android.app.options.APP_LANGUAGE +import org.oppia.android.app.options.AppLanguageActivity +import org.oppia.android.app.options.OptionsActivity +import org.oppia.android.app.player.state.hintsandsolution.HintsAndSolutionConfigModule +import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.atPositionOnView +import org.oppia.android.app.shim.ViewBindingShimModule +import org.oppia.android.app.utility.OrientationChangeAction.Companion.orientationLandscape +import org.oppia.android.domain.classify.InteractionsModule +import org.oppia.android.domain.classify.rules.continueinteraction.ContinueModule +import org.oppia.android.domain.classify.rules.dragAndDropSortInput.DragDropSortInputModule +import org.oppia.android.domain.classify.rules.fractioninput.FractionInputModule +import org.oppia.android.domain.classify.rules.imageClickInput.ImageClickInputModule +import org.oppia.android.domain.classify.rules.itemselectioninput.ItemSelectionInputModule +import org.oppia.android.domain.classify.rules.multiplechoiceinput.MultipleChoiceInputModule +import org.oppia.android.domain.classify.rules.numberwithunits.NumberWithUnitsRuleModule +import org.oppia.android.domain.classify.rules.numericinput.NumericInputRuleModule +import org.oppia.android.domain.classify.rules.ratioinput.RatioInputModule +import org.oppia.android.domain.classify.rules.textinput.TextInputRuleModule +import org.oppia.android.domain.onboarding.ExpirationMetaDataRetrieverModule +import org.oppia.android.domain.oppialogger.LogStorageModule +import org.oppia.android.domain.question.QuestionModule +import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule +import org.oppia.android.testing.TestAccessibilityModule +import org.oppia.android.testing.TestCoroutineDispatchers +import org.oppia.android.testing.TestDispatcherModule +import org.oppia.android.testing.TestLogReportingModule +import org.oppia.android.testing.profile.ProfileTestHelper +import org.oppia.android.util.caching.CacheAssetsLocally +import org.oppia.android.util.caching.testing.CachingTestModule +import org.oppia.android.util.gcsresource.GcsResourceModule +import org.oppia.android.util.logging.LoggerModule +import org.oppia.android.util.parser.GlideImageLoaderModule +import org.oppia.android.util.parser.HtmlParserEntityTypeModule +import org.oppia.android.util.parser.ImageParsingModule import org.robolectric.annotation.Config import org.robolectric.annotation.LooperMode import javax.inject.Inject diff --git a/app/src/test/java/org/oppia/android/app/testing/options/DefaultAudioFragmentTest.kt b/app/src/test/java/org/oppia/android/app/testing/options/DefaultAudioFragmentTest.kt index 4c95046fcec..22a873db58a 100644 --- a/app/src/test/java/org/oppia/android/app/testing/options/DefaultAudioFragmentTest.kt +++ b/app/src/test/java/org/oppia/android/app/testing/options/DefaultAudioFragmentTest.kt @@ -1,4 +1,4 @@ -package org.oppia.app.testing.options +package org.oppia.android.app.testing.options import android.app.Application import android.content.Context @@ -22,46 +22,46 @@ import org.junit.After import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.oppia.app.R -import org.oppia.app.activity.ActivityComponent -import org.oppia.app.application.ActivityComponentFactory -import org.oppia.app.application.ApplicationComponent -import org.oppia.app.application.ApplicationModule -import org.oppia.app.application.ApplicationStartupListenerModule -import org.oppia.app.options.AUDIO_LANGUAGE -import org.oppia.app.options.DefaultAudioActivity -import org.oppia.app.options.OptionsActivity -import org.oppia.app.player.state.hintsandsolution.HintsAndSolutionConfigModule -import org.oppia.app.recyclerview.RecyclerViewMatcher.Companion.atPositionOnView -import org.oppia.app.shim.ViewBindingShimModule -import org.oppia.app.utility.OrientationChangeAction.Companion.orientationLandscape -import org.oppia.domain.classify.InteractionsModule -import org.oppia.domain.classify.rules.continueinteraction.ContinueModule -import org.oppia.domain.classify.rules.dragAndDropSortInput.DragDropSortInputModule -import org.oppia.domain.classify.rules.fractioninput.FractionInputModule -import org.oppia.domain.classify.rules.imageClickInput.ImageClickInputModule -import org.oppia.domain.classify.rules.itemselectioninput.ItemSelectionInputModule -import org.oppia.domain.classify.rules.multiplechoiceinput.MultipleChoiceInputModule -import org.oppia.domain.classify.rules.numberwithunits.NumberWithUnitsRuleModule -import org.oppia.domain.classify.rules.numericinput.NumericInputRuleModule -import org.oppia.domain.classify.rules.ratioinput.RatioInputModule -import org.oppia.domain.classify.rules.textinput.TextInputRuleModule -import org.oppia.domain.onboarding.ExpirationMetaDataRetrieverModule -import org.oppia.domain.oppialogger.LogStorageModule -import org.oppia.domain.question.QuestionModule -import org.oppia.domain.topic.PrimeTopicAssetsControllerModule -import org.oppia.testing.TestAccessibilityModule -import org.oppia.testing.TestCoroutineDispatchers -import org.oppia.testing.TestDispatcherModule -import org.oppia.testing.TestLogReportingModule -import org.oppia.testing.profile.ProfileTestHelper -import org.oppia.util.caching.CacheAssetsLocally -import org.oppia.util.caching.testing.CachingTestModule -import org.oppia.util.gcsresource.GcsResourceModule -import org.oppia.util.logging.LoggerModule -import org.oppia.util.parser.GlideImageLoaderModule -import org.oppia.util.parser.HtmlParserEntityTypeModule -import org.oppia.util.parser.ImageParsingModule +import org.oppia.android.R +import org.oppia.android.app.activity.ActivityComponent +import org.oppia.android.app.application.ActivityComponentFactory +import org.oppia.android.app.application.ApplicationComponent +import org.oppia.android.app.application.ApplicationModule +import org.oppia.android.app.application.ApplicationStartupListenerModule +import org.oppia.android.app.options.AUDIO_LANGUAGE +import org.oppia.android.app.options.DefaultAudioActivity +import org.oppia.android.app.options.OptionsActivity +import org.oppia.android.app.player.state.hintsandsolution.HintsAndSolutionConfigModule +import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.atPositionOnView +import org.oppia.android.app.shim.ViewBindingShimModule +import org.oppia.android.app.utility.OrientationChangeAction.Companion.orientationLandscape +import org.oppia.android.domain.classify.InteractionsModule +import org.oppia.android.domain.classify.rules.continueinteraction.ContinueModule +import org.oppia.android.domain.classify.rules.dragAndDropSortInput.DragDropSortInputModule +import org.oppia.android.domain.classify.rules.fractioninput.FractionInputModule +import org.oppia.android.domain.classify.rules.imageClickInput.ImageClickInputModule +import org.oppia.android.domain.classify.rules.itemselectioninput.ItemSelectionInputModule +import org.oppia.android.domain.classify.rules.multiplechoiceinput.MultipleChoiceInputModule +import org.oppia.android.domain.classify.rules.numberwithunits.NumberWithUnitsRuleModule +import org.oppia.android.domain.classify.rules.numericinput.NumericInputRuleModule +import org.oppia.android.domain.classify.rules.ratioinput.RatioInputModule +import org.oppia.android.domain.classify.rules.textinput.TextInputRuleModule +import org.oppia.android.domain.onboarding.ExpirationMetaDataRetrieverModule +import org.oppia.android.domain.oppialogger.LogStorageModule +import org.oppia.android.domain.question.QuestionModule +import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule +import org.oppia.android.testing.TestAccessibilityModule +import org.oppia.android.testing.TestCoroutineDispatchers +import org.oppia.android.testing.TestDispatcherModule +import org.oppia.android.testing.TestLogReportingModule +import org.oppia.android.testing.profile.ProfileTestHelper +import org.oppia.android.util.caching.CacheAssetsLocally +import org.oppia.android.util.caching.testing.CachingTestModule +import org.oppia.android.util.gcsresource.GcsResourceModule +import org.oppia.android.util.logging.LoggerModule +import org.oppia.android.util.parser.GlideImageLoaderModule +import org.oppia.android.util.parser.HtmlParserEntityTypeModule +import org.oppia.android.util.parser.ImageParsingModule import org.robolectric.annotation.Config import org.robolectric.annotation.LooperMode import javax.inject.Inject diff --git a/app/src/test/java/org/oppia/android/app/testing/options/OptionsFragmentTest.kt b/app/src/test/java/org/oppia/android/app/testing/options/OptionsFragmentTest.kt index 952ea78ff16..ee4b00d9bf7 100644 --- a/app/src/test/java/org/oppia/android/app/testing/options/OptionsFragmentTest.kt +++ b/app/src/test/java/org/oppia/android/app/testing/options/OptionsFragmentTest.kt @@ -1,4 +1,4 @@ -package org.oppia.app.testing.options +package org.oppia.android.app.testing.options import android.content.Intent import androidx.test.core.app.ActivityScenario.launch @@ -16,18 +16,18 @@ import org.junit.After import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.oppia.app.R -import org.oppia.app.options.APP_LANGUAGE -import org.oppia.app.options.AUDIO_LANGUAGE -import org.oppia.app.options.AppLanguageActivity -import org.oppia.app.options.AppLanguageFragment -import org.oppia.app.options.DefaultAudioActivity -import org.oppia.app.options.DefaultAudioFragment -import org.oppia.app.options.OptionsActivity -import org.oppia.app.options.READING_TEXT_SIZE -import org.oppia.app.options.ReadingTextSizeActivity -import org.oppia.app.options.ReadingTextSizeFragment -import org.oppia.app.recyclerview.RecyclerViewMatcher.Companion.atPositionOnView +import org.oppia.android.R +import org.oppia.android.app.options.APP_LANGUAGE +import org.oppia.android.app.options.AUDIO_LANGUAGE +import org.oppia.android.app.options.AppLanguageActivity +import org.oppia.android.app.options.AppLanguageFragment +import org.oppia.android.app.options.DefaultAudioActivity +import org.oppia.android.app.options.DefaultAudioFragment +import org.oppia.android.app.options.OptionsActivity +import org.oppia.android.app.options.READING_TEXT_SIZE +import org.oppia.android.app.options.ReadingTextSizeActivity +import org.oppia.android.app.options.ReadingTextSizeFragment +import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.atPositionOnView import org.robolectric.annotation.Config import org.robolectric.annotation.LooperMode diff --git a/app/src/test/java/org/oppia/android/app/testing/options/ReadingTextSizeFragmentTest.kt b/app/src/test/java/org/oppia/android/app/testing/options/ReadingTextSizeFragmentTest.kt index 715d1b4832c..37a5f3dcb72 100644 --- a/app/src/test/java/org/oppia/android/app/testing/options/ReadingTextSizeFragmentTest.kt +++ b/app/src/test/java/org/oppia/android/app/testing/options/ReadingTextSizeFragmentTest.kt @@ -1,4 +1,4 @@ -package org.oppia.app.testing.options +package org.oppia.android.app.testing.options import android.app.Application import android.content.Context @@ -30,46 +30,46 @@ import org.junit.After import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.oppia.app.R -import org.oppia.app.activity.ActivityComponent -import org.oppia.app.application.ActivityComponentFactory -import org.oppia.app.application.ApplicationComponent -import org.oppia.app.application.ApplicationModule -import org.oppia.app.application.ApplicationStartupListenerModule -import org.oppia.app.options.OptionsActivity -import org.oppia.app.options.READING_TEXT_SIZE -import org.oppia.app.options.ReadingTextSizeActivity -import org.oppia.app.player.state.hintsandsolution.HintsAndSolutionConfigModule -import org.oppia.app.recyclerview.RecyclerViewMatcher.Companion.atPositionOnView -import org.oppia.app.shim.ViewBindingShimModule -import org.oppia.app.utility.OrientationChangeAction.Companion.orientationLandscape -import org.oppia.domain.classify.InteractionsModule -import org.oppia.domain.classify.rules.continueinteraction.ContinueModule -import org.oppia.domain.classify.rules.dragAndDropSortInput.DragDropSortInputModule -import org.oppia.domain.classify.rules.fractioninput.FractionInputModule -import org.oppia.domain.classify.rules.imageClickInput.ImageClickInputModule -import org.oppia.domain.classify.rules.itemselectioninput.ItemSelectionInputModule -import org.oppia.domain.classify.rules.multiplechoiceinput.MultipleChoiceInputModule -import org.oppia.domain.classify.rules.numberwithunits.NumberWithUnitsRuleModule -import org.oppia.domain.classify.rules.numericinput.NumericInputRuleModule -import org.oppia.domain.classify.rules.ratioinput.RatioInputModule -import org.oppia.domain.classify.rules.textinput.TextInputRuleModule -import org.oppia.domain.onboarding.ExpirationMetaDataRetrieverModule -import org.oppia.domain.oppialogger.LogStorageModule -import org.oppia.domain.question.QuestionModule -import org.oppia.domain.topic.PrimeTopicAssetsControllerModule -import org.oppia.testing.TestAccessibilityModule -import org.oppia.testing.TestCoroutineDispatchers -import org.oppia.testing.TestDispatcherModule -import org.oppia.testing.TestLogReportingModule -import org.oppia.testing.profile.ProfileTestHelper -import org.oppia.util.caching.CacheAssetsLocally -import org.oppia.util.caching.testing.CachingTestModule -import org.oppia.util.gcsresource.GcsResourceModule -import org.oppia.util.logging.LoggerModule -import org.oppia.util.parser.GlideImageLoaderModule -import org.oppia.util.parser.HtmlParserEntityTypeModule -import org.oppia.util.parser.ImageParsingModule +import org.oppia.android.R +import org.oppia.android.app.activity.ActivityComponent +import org.oppia.android.app.application.ActivityComponentFactory +import org.oppia.android.app.application.ApplicationComponent +import org.oppia.android.app.application.ApplicationModule +import org.oppia.android.app.application.ApplicationStartupListenerModule +import org.oppia.android.app.options.OptionsActivity +import org.oppia.android.app.options.READING_TEXT_SIZE +import org.oppia.android.app.options.ReadingTextSizeActivity +import org.oppia.android.app.player.state.hintsandsolution.HintsAndSolutionConfigModule +import org.oppia.android.app.recyclerview.RecyclerViewMatcher.Companion.atPositionOnView +import org.oppia.android.app.shim.ViewBindingShimModule +import org.oppia.android.app.utility.OrientationChangeAction.Companion.orientationLandscape +import org.oppia.android.domain.classify.InteractionsModule +import org.oppia.android.domain.classify.rules.continueinteraction.ContinueModule +import org.oppia.android.domain.classify.rules.dragAndDropSortInput.DragDropSortInputModule +import org.oppia.android.domain.classify.rules.fractioninput.FractionInputModule +import org.oppia.android.domain.classify.rules.imageClickInput.ImageClickInputModule +import org.oppia.android.domain.classify.rules.itemselectioninput.ItemSelectionInputModule +import org.oppia.android.domain.classify.rules.multiplechoiceinput.MultipleChoiceInputModule +import org.oppia.android.domain.classify.rules.numberwithunits.NumberWithUnitsRuleModule +import org.oppia.android.domain.classify.rules.numericinput.NumericInputRuleModule +import org.oppia.android.domain.classify.rules.ratioinput.RatioInputModule +import org.oppia.android.domain.classify.rules.textinput.TextInputRuleModule +import org.oppia.android.domain.onboarding.ExpirationMetaDataRetrieverModule +import org.oppia.android.domain.oppialogger.LogStorageModule +import org.oppia.android.domain.question.QuestionModule +import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule +import org.oppia.android.testing.TestAccessibilityModule +import org.oppia.android.testing.TestCoroutineDispatchers +import org.oppia.android.testing.TestDispatcherModule +import org.oppia.android.testing.TestLogReportingModule +import org.oppia.android.testing.profile.ProfileTestHelper +import org.oppia.android.util.caching.CacheAssetsLocally +import org.oppia.android.util.caching.testing.CachingTestModule +import org.oppia.android.util.gcsresource.GcsResourceModule +import org.oppia.android.util.logging.LoggerModule +import org.oppia.android.util.parser.GlideImageLoaderModule +import org.oppia.android.util.parser.HtmlParserEntityTypeModule +import org.oppia.android.util.parser.ImageParsingModule import org.robolectric.annotation.Config import org.robolectric.annotation.LooperMode import javax.inject.Inject diff --git a/app/src/test/java/org/oppia/android/app/testing/player/split/PlayerSplitScreenTesting.kt b/app/src/test/java/org/oppia/android/app/testing/player/split/PlayerSplitScreenTesting.kt index 9c2b9d2e3b0..7f4f621ba00 100644 --- a/app/src/test/java/org/oppia/android/app/testing/player/split/PlayerSplitScreenTesting.kt +++ b/app/src/test/java/org/oppia/android/app/testing/player/split/PlayerSplitScreenTesting.kt @@ -1,4 +1,4 @@ -package org.oppia.app.testing.player.split +package org.oppia.android.app.testing.player.split import androidx.test.core.app.ActivityScenario.launch import androidx.test.core.app.ApplicationProvider @@ -10,8 +10,8 @@ import org.junit.After import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.oppia.app.testing.ExplorationTestActivity -import org.oppia.app.utility.SplitScreenManager +import org.oppia.android.app.testing.ExplorationTestActivity +import org.oppia.android.app.utility.SplitScreenManager import org.robolectric.annotation.Config // Devices reference: https://material.io/resources/devices/ diff --git a/app/src/test/java/org/oppia/android/app/testing/player/state/StateFragmentAccessibilityTest.kt b/app/src/test/java/org/oppia/android/app/testing/player/state/StateFragmentAccessibilityTest.kt index 4393e87ec40..1d2f8a747d6 100644 --- a/app/src/test/java/org/oppia/android/app/testing/player/state/StateFragmentAccessibilityTest.kt +++ b/app/src/test/java/org/oppia/android/app/testing/player/state/StateFragmentAccessibilityTest.kt @@ -1,4 +1,4 @@ -package org.oppia.app.testing.player.state +package org.oppia.android.app.testing.player.state import android.app.Application import android.content.Context @@ -16,49 +16,49 @@ import dagger.Component import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.oppia.app.R -import org.oppia.app.activity.ActivityComponent -import org.oppia.app.application.ActivityComponentFactory -import org.oppia.app.application.ApplicationComponent -import org.oppia.app.application.ApplicationContext -import org.oppia.app.application.ApplicationModule -import org.oppia.app.application.ApplicationStartupListenerModule -import org.oppia.app.player.state.StateFragment -import org.oppia.app.player.state.hintsandsolution.HintsAndSolutionConfigModule -import org.oppia.app.player.state.testing.StateFragmentTestActivity -import org.oppia.app.recyclerview.RecyclerViewMatcher -import org.oppia.app.shim.IntentFactoryShimModule -import org.oppia.app.shim.ViewBindingShimModule -import org.oppia.domain.classify.InteractionsModule -import org.oppia.domain.classify.rules.continueinteraction.ContinueModule -import org.oppia.domain.classify.rules.dragAndDropSortInput.DragDropSortInputModule -import org.oppia.domain.classify.rules.fractioninput.FractionInputModule -import org.oppia.domain.classify.rules.imageClickInput.ImageClickInputModule -import org.oppia.domain.classify.rules.itemselectioninput.ItemSelectionInputModule -import org.oppia.domain.classify.rules.multiplechoiceinput.MultipleChoiceInputModule -import org.oppia.domain.classify.rules.numberwithunits.NumberWithUnitsRuleModule -import org.oppia.domain.classify.rules.numericinput.NumericInputRuleModule -import org.oppia.domain.classify.rules.ratioinput.RatioInputModule -import org.oppia.domain.classify.rules.textinput.TextInputRuleModule -import org.oppia.domain.onboarding.ExpirationMetaDataRetrieverModule -import org.oppia.domain.oppialogger.LogStorageModule -import org.oppia.domain.question.QuestionModule -import org.oppia.domain.topic.PrimeTopicAssetsControllerModule -import org.oppia.domain.topic.TEST_EXPLORATION_ID_4 -import org.oppia.domain.topic.TEST_STORY_ID_0 -import org.oppia.domain.topic.TEST_TOPIC_ID_0 -import org.oppia.testing.TestAccessibilityModule -import org.oppia.testing.TestCoroutineDispatchers -import org.oppia.testing.TestDispatcherModule -import org.oppia.testing.TestLogReportingModule -import org.oppia.testing.profile.ProfileTestHelper -import org.oppia.util.accessibility.FakeAccessibilityManager -import org.oppia.util.caching.testing.CachingTestModule -import org.oppia.util.gcsresource.GcsResourceModule -import org.oppia.util.logging.LoggerModule -import org.oppia.util.parser.GlideImageLoaderModule -import org.oppia.util.parser.HtmlParserEntityTypeModule -import org.oppia.util.parser.ImageParsingModule +import org.oppia.android.R +import org.oppia.android.app.activity.ActivityComponent +import org.oppia.android.app.application.ActivityComponentFactory +import org.oppia.android.app.application.ApplicationComponent +import org.oppia.android.app.application.ApplicationContext +import org.oppia.android.app.application.ApplicationModule +import org.oppia.android.app.application.ApplicationStartupListenerModule +import org.oppia.android.app.player.state.StateFragment +import org.oppia.android.app.player.state.hintsandsolution.HintsAndSolutionConfigModule +import org.oppia.android.app.player.state.testing.StateFragmentTestActivity +import org.oppia.android.app.recyclerview.RecyclerViewMatcher +import org.oppia.android.app.shim.IntentFactoryShimModule +import org.oppia.android.app.shim.ViewBindingShimModule +import org.oppia.android.domain.classify.InteractionsModule +import org.oppia.android.domain.classify.rules.continueinteraction.ContinueModule +import org.oppia.android.domain.classify.rules.dragAndDropSortInput.DragDropSortInputModule +import org.oppia.android.domain.classify.rules.fractioninput.FractionInputModule +import org.oppia.android.domain.classify.rules.imageClickInput.ImageClickInputModule +import org.oppia.android.domain.classify.rules.itemselectioninput.ItemSelectionInputModule +import org.oppia.android.domain.classify.rules.multiplechoiceinput.MultipleChoiceInputModule +import org.oppia.android.domain.classify.rules.numberwithunits.NumberWithUnitsRuleModule +import org.oppia.android.domain.classify.rules.numericinput.NumericInputRuleModule +import org.oppia.android.domain.classify.rules.ratioinput.RatioInputModule +import org.oppia.android.domain.classify.rules.textinput.TextInputRuleModule +import org.oppia.android.domain.onboarding.ExpirationMetaDataRetrieverModule +import org.oppia.android.domain.oppialogger.LogStorageModule +import org.oppia.android.domain.question.QuestionModule +import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule +import org.oppia.android.domain.topic.TEST_EXPLORATION_ID_4 +import org.oppia.android.domain.topic.TEST_STORY_ID_0 +import org.oppia.android.domain.topic.TEST_TOPIC_ID_0 +import org.oppia.android.testing.TestAccessibilityModule +import org.oppia.android.testing.TestCoroutineDispatchers +import org.oppia.android.testing.TestDispatcherModule +import org.oppia.android.testing.TestLogReportingModule +import org.oppia.android.testing.profile.ProfileTestHelper +import org.oppia.android.util.accessibility.FakeAccessibilityManager +import org.oppia.android.util.caching.testing.CachingTestModule +import org.oppia.android.util.gcsresource.GcsResourceModule +import org.oppia.android.util.logging.LoggerModule +import org.oppia.android.util.parser.GlideImageLoaderModule +import org.oppia.android.util.parser.HtmlParserEntityTypeModule +import org.oppia.android.util.parser.ImageParsingModule import org.robolectric.annotation.Config import org.robolectric.annotation.LooperMode import javax.inject.Inject diff --git a/app/src/test/java/org/oppia/android/app/topic/info/TopicInfoFragmentLocalTest.kt b/app/src/test/java/org/oppia/android/app/topic/info/TopicInfoFragmentLocalTest.kt index bb4f2998136..39a381509d4 100644 --- a/app/src/test/java/org/oppia/android/app/topic/info/TopicInfoFragmentLocalTest.kt +++ b/app/src/test/java/org/oppia/android/app/topic/info/TopicInfoFragmentLocalTest.kt @@ -1,4 +1,4 @@ -package org.oppia.app.topic.info +package org.oppia.android.app.topic.info import android.app.Application import androidx.appcompat.app.AppCompatActivity @@ -10,43 +10,43 @@ import dagger.Component import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.oppia.app.activity.ActivityComponent -import org.oppia.app.application.ActivityComponentFactory -import org.oppia.app.application.ApplicationComponent -import org.oppia.app.application.ApplicationInjector -import org.oppia.app.application.ApplicationInjectorProvider -import org.oppia.app.application.ApplicationModule -import org.oppia.app.application.ApplicationStartupListenerModule -import org.oppia.app.model.EventLog -import org.oppia.app.model.EventLog.Context.ActivityContextCase.TOPIC_CONTEXT -import org.oppia.app.player.state.hintsandsolution.HintsAndSolutionConfigModule -import org.oppia.app.shim.ViewBindingShimModule -import org.oppia.app.topic.TopicActivity -import org.oppia.domain.classify.InteractionsModule -import org.oppia.domain.classify.rules.continueinteraction.ContinueModule -import org.oppia.domain.classify.rules.dragAndDropSortInput.DragDropSortInputModule -import org.oppia.domain.classify.rules.fractioninput.FractionInputModule -import org.oppia.domain.classify.rules.imageClickInput.ImageClickInputModule -import org.oppia.domain.classify.rules.itemselectioninput.ItemSelectionInputModule -import org.oppia.domain.classify.rules.multiplechoiceinput.MultipleChoiceInputModule -import org.oppia.domain.classify.rules.numberwithunits.NumberWithUnitsRuleModule -import org.oppia.domain.classify.rules.numericinput.NumericInputRuleModule -import org.oppia.domain.classify.rules.ratioinput.RatioInputModule -import org.oppia.domain.classify.rules.textinput.TextInputRuleModule -import org.oppia.domain.onboarding.ExpirationMetaDataRetrieverModule -import org.oppia.domain.oppialogger.LogStorageModule -import org.oppia.domain.question.QuestionModule -import org.oppia.domain.topic.PrimeTopicAssetsControllerModule -import org.oppia.testing.FakeEventLogger -import org.oppia.testing.TestAccessibilityModule -import org.oppia.testing.TestDispatcherModule -import org.oppia.testing.TestLogReportingModule -import org.oppia.util.caching.testing.CachingTestModule -import org.oppia.util.gcsresource.GcsResourceModule -import org.oppia.util.logging.LoggerModule -import org.oppia.util.parser.GlideImageLoaderModule -import org.oppia.util.parser.HtmlParserEntityTypeModule -import org.oppia.util.parser.ImageParsingModule +import org.oppia.android.app.activity.ActivityComponent +import org.oppia.android.app.application.ActivityComponentFactory +import org.oppia.android.app.application.ApplicationComponent +import org.oppia.android.app.application.ApplicationInjector +import org.oppia.android.app.application.ApplicationInjectorProvider +import org.oppia.android.app.application.ApplicationModule +import org.oppia.android.app.application.ApplicationStartupListenerModule +import org.oppia.android.app.model.EventLog +import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.TOPIC_CONTEXT +import org.oppia.android.app.player.state.hintsandsolution.HintsAndSolutionConfigModule +import org.oppia.android.app.shim.ViewBindingShimModule +import org.oppia.android.app.topic.TopicActivity +import org.oppia.android.domain.classify.InteractionsModule +import org.oppia.android.domain.classify.rules.continueinteraction.ContinueModule +import org.oppia.android.domain.classify.rules.dragAndDropSortInput.DragDropSortInputModule +import org.oppia.android.domain.classify.rules.fractioninput.FractionInputModule +import org.oppia.android.domain.classify.rules.imageClickInput.ImageClickInputModule +import org.oppia.android.domain.classify.rules.itemselectioninput.ItemSelectionInputModule +import org.oppia.android.domain.classify.rules.multiplechoiceinput.MultipleChoiceInputModule +import org.oppia.android.domain.classify.rules.numberwithunits.NumberWithUnitsRuleModule +import org.oppia.android.domain.classify.rules.numericinput.NumericInputRuleModule +import org.oppia.android.domain.classify.rules.ratioinput.RatioInputModule +import org.oppia.android.domain.classify.rules.textinput.TextInputRuleModule +import org.oppia.android.domain.onboarding.ExpirationMetaDataRetrieverModule +import org.oppia.android.domain.oppialogger.LogStorageModule +import org.oppia.android.domain.question.QuestionModule +import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule +import org.oppia.android.testing.FakeEventLogger +import org.oppia.android.testing.TestAccessibilityModule +import org.oppia.android.testing.TestDispatcherModule +import org.oppia.android.testing.TestLogReportingModule +import org.oppia.android.util.caching.testing.CachingTestModule +import org.oppia.android.util.gcsresource.GcsResourceModule +import org.oppia.android.util.logging.LoggerModule +import org.oppia.android.util.parser.GlideImageLoaderModule +import org.oppia.android.util.parser.HtmlParserEntityTypeModule +import org.oppia.android.util.parser.ImageParsingModule import org.robolectric.annotation.Config import org.robolectric.annotation.LooperMode import javax.inject.Inject diff --git a/app/src/test/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentLocalTest.kt b/app/src/test/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentLocalTest.kt index 5199c679aa3..0d6552a1d7f 100644 --- a/app/src/test/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentLocalTest.kt +++ b/app/src/test/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentLocalTest.kt @@ -1,4 +1,4 @@ -package org.oppia.app.topic.lessons +package org.oppia.android.app.topic.lessons import android.app.Application import androidx.appcompat.app.AppCompatActivity @@ -10,42 +10,42 @@ import dagger.Component import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.oppia.app.activity.ActivityComponent -import org.oppia.app.application.ActivityComponentFactory -import org.oppia.app.application.ApplicationComponent -import org.oppia.app.application.ApplicationInjector -import org.oppia.app.application.ApplicationInjectorProvider -import org.oppia.app.application.ApplicationModule -import org.oppia.app.application.ApplicationStartupListenerModule -import org.oppia.app.model.EventLog -import org.oppia.app.player.state.hintsandsolution.HintsAndSolutionConfigModule -import org.oppia.app.shim.ViewBindingShimModule -import org.oppia.app.topic.TopicActivity -import org.oppia.domain.classify.InteractionsModule -import org.oppia.domain.classify.rules.continueinteraction.ContinueModule -import org.oppia.domain.classify.rules.dragAndDropSortInput.DragDropSortInputModule -import org.oppia.domain.classify.rules.fractioninput.FractionInputModule -import org.oppia.domain.classify.rules.imageClickInput.ImageClickInputModule -import org.oppia.domain.classify.rules.itemselectioninput.ItemSelectionInputModule -import org.oppia.domain.classify.rules.multiplechoiceinput.MultipleChoiceInputModule -import org.oppia.domain.classify.rules.numberwithunits.NumberWithUnitsRuleModule -import org.oppia.domain.classify.rules.numericinput.NumericInputRuleModule -import org.oppia.domain.classify.rules.ratioinput.RatioInputModule -import org.oppia.domain.classify.rules.textinput.TextInputRuleModule -import org.oppia.domain.onboarding.ExpirationMetaDataRetrieverModule -import org.oppia.domain.oppialogger.LogStorageModule -import org.oppia.domain.question.QuestionModule -import org.oppia.domain.topic.PrimeTopicAssetsControllerModule -import org.oppia.testing.FakeEventLogger -import org.oppia.testing.TestAccessibilityModule -import org.oppia.testing.TestDispatcherModule -import org.oppia.testing.TestLogReportingModule -import org.oppia.util.caching.testing.CachingTestModule -import org.oppia.util.gcsresource.GcsResourceModule -import org.oppia.util.logging.LoggerModule -import org.oppia.util.parser.GlideImageLoaderModule -import org.oppia.util.parser.HtmlParserEntityTypeModule -import org.oppia.util.parser.ImageParsingModule +import org.oppia.android.app.activity.ActivityComponent +import org.oppia.android.app.application.ActivityComponentFactory +import org.oppia.android.app.application.ApplicationComponent +import org.oppia.android.app.application.ApplicationInjector +import org.oppia.android.app.application.ApplicationInjectorProvider +import org.oppia.android.app.application.ApplicationModule +import org.oppia.android.app.application.ApplicationStartupListenerModule +import org.oppia.android.app.model.EventLog +import org.oppia.android.app.player.state.hintsandsolution.HintsAndSolutionConfigModule +import org.oppia.android.app.shim.ViewBindingShimModule +import org.oppia.android.app.topic.TopicActivity +import org.oppia.android.domain.classify.InteractionsModule +import org.oppia.android.domain.classify.rules.continueinteraction.ContinueModule +import org.oppia.android.domain.classify.rules.dragAndDropSortInput.DragDropSortInputModule +import org.oppia.android.domain.classify.rules.fractioninput.FractionInputModule +import org.oppia.android.domain.classify.rules.imageClickInput.ImageClickInputModule +import org.oppia.android.domain.classify.rules.itemselectioninput.ItemSelectionInputModule +import org.oppia.android.domain.classify.rules.multiplechoiceinput.MultipleChoiceInputModule +import org.oppia.android.domain.classify.rules.numberwithunits.NumberWithUnitsRuleModule +import org.oppia.android.domain.classify.rules.numericinput.NumericInputRuleModule +import org.oppia.android.domain.classify.rules.ratioinput.RatioInputModule +import org.oppia.android.domain.classify.rules.textinput.TextInputRuleModule +import org.oppia.android.domain.onboarding.ExpirationMetaDataRetrieverModule +import org.oppia.android.domain.oppialogger.LogStorageModule +import org.oppia.android.domain.question.QuestionModule +import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule +import org.oppia.android.testing.FakeEventLogger +import org.oppia.android.testing.TestAccessibilityModule +import org.oppia.android.testing.TestDispatcherModule +import org.oppia.android.testing.TestLogReportingModule +import org.oppia.android.util.caching.testing.CachingTestModule +import org.oppia.android.util.gcsresource.GcsResourceModule +import org.oppia.android.util.logging.LoggerModule +import org.oppia.android.util.parser.GlideImageLoaderModule +import org.oppia.android.util.parser.HtmlParserEntityTypeModule +import org.oppia.android.util.parser.ImageParsingModule import org.robolectric.annotation.Config import org.robolectric.annotation.LooperMode import javax.inject.Inject diff --git a/app/src/test/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivityLocalTest.kt b/app/src/test/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivityLocalTest.kt index 4d827c6ba96..d016655931c 100644 --- a/app/src/test/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivityLocalTest.kt +++ b/app/src/test/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerActivityLocalTest.kt @@ -1,4 +1,4 @@ -package org.oppia.app.topic.questionplayer +package org.oppia.android.app.topic.questionplayer import android.app.Application import android.content.Context @@ -27,45 +27,45 @@ import org.hamcrest.Matcher import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.oppia.app.R -import org.oppia.app.activity.ActivityComponent -import org.oppia.app.application.ActivityComponentFactory -import org.oppia.app.application.ApplicationComponent -import org.oppia.app.application.ApplicationContext -import org.oppia.app.application.ApplicationInjector -import org.oppia.app.application.ApplicationInjectorProvider -import org.oppia.app.application.ApplicationModule -import org.oppia.app.application.ApplicationStartupListenerModule -import org.oppia.app.player.state.hintsandsolution.HintsAndSolutionConfigModule -import org.oppia.app.player.state.itemviewmodel.StateItemViewModel -import org.oppia.app.shim.ViewBindingShimModule -import org.oppia.domain.classify.InteractionsModule -import org.oppia.domain.classify.rules.continueinteraction.ContinueModule -import org.oppia.domain.classify.rules.dragAndDropSortInput.DragDropSortInputModule -import org.oppia.domain.classify.rules.fractioninput.FractionInputModule -import org.oppia.domain.classify.rules.imageClickInput.ImageClickInputModule -import org.oppia.domain.classify.rules.itemselectioninput.ItemSelectionInputModule -import org.oppia.domain.classify.rules.multiplechoiceinput.MultipleChoiceInputModule -import org.oppia.domain.classify.rules.numberwithunits.NumberWithUnitsRuleModule -import org.oppia.domain.classify.rules.numericinput.NumericInputRuleModule -import org.oppia.domain.classify.rules.ratioinput.RatioInputModule -import org.oppia.domain.classify.rules.textinput.TextInputRuleModule -import org.oppia.domain.onboarding.ExpirationMetaDataRetrieverModule -import org.oppia.domain.oppialogger.LogStorageModule -import org.oppia.domain.question.QuestionModule -import org.oppia.domain.topic.PrimeTopicAssetsControllerModule -import org.oppia.domain.topic.TEST_SKILL_ID_1 -import org.oppia.testing.TestAccessibilityModule -import org.oppia.testing.TestCoroutineDispatchers -import org.oppia.testing.TestDispatcherModule -import org.oppia.testing.TestLogReportingModule -import org.oppia.testing.profile.ProfileTestHelper -import org.oppia.util.caching.testing.CachingTestModule -import org.oppia.util.gcsresource.GcsResourceModule -import org.oppia.util.logging.LoggerModule -import org.oppia.util.parser.GlideImageLoaderModule -import org.oppia.util.parser.HtmlParserEntityTypeModule -import org.oppia.util.parser.ImageParsingModule +import org.oppia.android.R +import org.oppia.android.app.activity.ActivityComponent +import org.oppia.android.app.application.ActivityComponentFactory +import org.oppia.android.app.application.ApplicationComponent +import org.oppia.android.app.application.ApplicationContext +import org.oppia.android.app.application.ApplicationInjector +import org.oppia.android.app.application.ApplicationInjectorProvider +import org.oppia.android.app.application.ApplicationModule +import org.oppia.android.app.application.ApplicationStartupListenerModule +import org.oppia.android.app.player.state.hintsandsolution.HintsAndSolutionConfigModule +import org.oppia.android.app.player.state.itemviewmodel.StateItemViewModel +import org.oppia.android.app.shim.ViewBindingShimModule +import org.oppia.android.domain.classify.InteractionsModule +import org.oppia.android.domain.classify.rules.continueinteraction.ContinueModule +import org.oppia.android.domain.classify.rules.dragAndDropSortInput.DragDropSortInputModule +import org.oppia.android.domain.classify.rules.fractioninput.FractionInputModule +import org.oppia.android.domain.classify.rules.imageClickInput.ImageClickInputModule +import org.oppia.android.domain.classify.rules.itemselectioninput.ItemSelectionInputModule +import org.oppia.android.domain.classify.rules.multiplechoiceinput.MultipleChoiceInputModule +import org.oppia.android.domain.classify.rules.numberwithunits.NumberWithUnitsRuleModule +import org.oppia.android.domain.classify.rules.numericinput.NumericInputRuleModule +import org.oppia.android.domain.classify.rules.ratioinput.RatioInputModule +import org.oppia.android.domain.classify.rules.textinput.TextInputRuleModule +import org.oppia.android.domain.onboarding.ExpirationMetaDataRetrieverModule +import org.oppia.android.domain.oppialogger.LogStorageModule +import org.oppia.android.domain.question.QuestionModule +import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule +import org.oppia.android.domain.topic.TEST_SKILL_ID_1 +import org.oppia.android.testing.TestAccessibilityModule +import org.oppia.android.testing.TestCoroutineDispatchers +import org.oppia.android.testing.TestDispatcherModule +import org.oppia.android.testing.TestLogReportingModule +import org.oppia.android.testing.profile.ProfileTestHelper +import org.oppia.android.util.caching.testing.CachingTestModule +import org.oppia.android.util.gcsresource.GcsResourceModule +import org.oppia.android.util.logging.LoggerModule +import org.oppia.android.util.parser.GlideImageLoaderModule +import org.oppia.android.util.parser.HtmlParserEntityTypeModule +import org.oppia.android.util.parser.ImageParsingModule import org.robolectric.annotation.Config import org.robolectric.annotation.LooperMode import javax.inject.Inject diff --git a/app/src/test/java/org/oppia/android/app/topic/revisioncard/RevisionCardActivityLocalTest.kt b/app/src/test/java/org/oppia/android/app/topic/revisioncard/RevisionCardActivityLocalTest.kt index ed169c20dac..d95af1cf17e 100644 --- a/app/src/test/java/org/oppia/android/app/topic/revisioncard/RevisionCardActivityLocalTest.kt +++ b/app/src/test/java/org/oppia/android/app/topic/revisioncard/RevisionCardActivityLocalTest.kt @@ -1,4 +1,4 @@ -package org.oppia.app.topic.revisioncard +package org.oppia.android.app.topic.revisioncard import android.app.Application import androidx.appcompat.app.AppCompatActivity @@ -10,44 +10,44 @@ import dagger.Component import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.oppia.app.activity.ActivityComponent -import org.oppia.app.application.ActivityComponentFactory -import org.oppia.app.application.ApplicationComponent -import org.oppia.app.application.ApplicationInjector -import org.oppia.app.application.ApplicationInjectorProvider -import org.oppia.app.application.ApplicationModule -import org.oppia.app.application.ApplicationStartupListenerModule -import org.oppia.app.model.EventLog -import org.oppia.app.model.EventLog.Context.ActivityContextCase.REVISION_CARD_CONTEXT -import org.oppia.app.player.state.hintsandsolution.HintsAndSolutionConfigModule -import org.oppia.app.shim.ViewBindingShimModule -import org.oppia.domain.classify.InteractionsModule -import org.oppia.domain.classify.rules.continueinteraction.ContinueModule -import org.oppia.domain.classify.rules.dragAndDropSortInput.DragDropSortInputModule -import org.oppia.domain.classify.rules.fractioninput.FractionInputModule -import org.oppia.domain.classify.rules.imageClickInput.ImageClickInputModule -import org.oppia.domain.classify.rules.itemselectioninput.ItemSelectionInputModule -import org.oppia.domain.classify.rules.multiplechoiceinput.MultipleChoiceInputModule -import org.oppia.domain.classify.rules.numberwithunits.NumberWithUnitsRuleModule -import org.oppia.domain.classify.rules.numericinput.NumericInputRuleModule -import org.oppia.domain.classify.rules.ratioinput.RatioInputModule -import org.oppia.domain.classify.rules.textinput.TextInputRuleModule -import org.oppia.domain.onboarding.ExpirationMetaDataRetrieverModule -import org.oppia.domain.oppialogger.LogStorageModule -import org.oppia.domain.question.QuestionModule -import org.oppia.domain.topic.FRACTIONS_TOPIC_ID -import org.oppia.domain.topic.PrimeTopicAssetsControllerModule -import org.oppia.domain.topic.SUBTOPIC_TOPIC_ID -import org.oppia.testing.FakeEventLogger -import org.oppia.testing.TestAccessibilityModule -import org.oppia.testing.TestDispatcherModule -import org.oppia.testing.TestLogReportingModule -import org.oppia.util.caching.testing.CachingTestModule -import org.oppia.util.gcsresource.GcsResourceModule -import org.oppia.util.logging.LoggerModule -import org.oppia.util.parser.GlideImageLoaderModule -import org.oppia.util.parser.HtmlParserEntityTypeModule -import org.oppia.util.parser.ImageParsingModule +import org.oppia.android.app.activity.ActivityComponent +import org.oppia.android.app.application.ActivityComponentFactory +import org.oppia.android.app.application.ApplicationComponent +import org.oppia.android.app.application.ApplicationInjector +import org.oppia.android.app.application.ApplicationInjectorProvider +import org.oppia.android.app.application.ApplicationModule +import org.oppia.android.app.application.ApplicationStartupListenerModule +import org.oppia.android.app.model.EventLog +import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.REVISION_CARD_CONTEXT +import org.oppia.android.app.player.state.hintsandsolution.HintsAndSolutionConfigModule +import org.oppia.android.app.shim.ViewBindingShimModule +import org.oppia.android.domain.classify.InteractionsModule +import org.oppia.android.domain.classify.rules.continueinteraction.ContinueModule +import org.oppia.android.domain.classify.rules.dragAndDropSortInput.DragDropSortInputModule +import org.oppia.android.domain.classify.rules.fractioninput.FractionInputModule +import org.oppia.android.domain.classify.rules.imageClickInput.ImageClickInputModule +import org.oppia.android.domain.classify.rules.itemselectioninput.ItemSelectionInputModule +import org.oppia.android.domain.classify.rules.multiplechoiceinput.MultipleChoiceInputModule +import org.oppia.android.domain.classify.rules.numberwithunits.NumberWithUnitsRuleModule +import org.oppia.android.domain.classify.rules.numericinput.NumericInputRuleModule +import org.oppia.android.domain.classify.rules.ratioinput.RatioInputModule +import org.oppia.android.domain.classify.rules.textinput.TextInputRuleModule +import org.oppia.android.domain.onboarding.ExpirationMetaDataRetrieverModule +import org.oppia.android.domain.oppialogger.LogStorageModule +import org.oppia.android.domain.question.QuestionModule +import org.oppia.android.domain.topic.FRACTIONS_TOPIC_ID +import org.oppia.android.domain.topic.PrimeTopicAssetsControllerModule +import org.oppia.android.domain.topic.SUBTOPIC_TOPIC_ID +import org.oppia.android.testing.FakeEventLogger +import org.oppia.android.testing.TestAccessibilityModule +import org.oppia.android.testing.TestDispatcherModule +import org.oppia.android.testing.TestLogReportingModule +import org.oppia.android.util.caching.testing.CachingTestModule +import org.oppia.android.util.gcsresource.GcsResourceModule +import org.oppia.android.util.logging.LoggerModule +import org.oppia.android.util.parser.GlideImageLoaderModule +import org.oppia.android.util.parser.HtmlParserEntityTypeModule +import org.oppia.android.util.parser.ImageParsingModule import org.robolectric.annotation.Config import org.robolectric.annotation.LooperMode import javax.inject.Inject diff --git a/app/test_with_resources.bzl b/app/test_with_resources.bzl index 53315045471..a68d361cfd9 100644 --- a/app/test_with_resources.bzl +++ b/app/test_with_resources.bzl @@ -1,20 +1,20 @@ def test_with_resources(file): - ''' - Genrule for test files. + """ + Genrule for test files. - Because each databinding library must have a unique package name and manifest, resources must be - imported using the proper package name when building with Bazel. This genrule alters those imports - in order to keep Gradle building. - ''' - native.genrule( - name = "update_" + file[0:-3], - srcs = [file], - outs = [file[0:-3] + "_updated.kt"], - cmd = ''' + Because each databinding library must have a unique package name and manifest, resources must be + imported using the proper package name when building with Bazel. This genrule alters those imports + in order to keep Gradle building. + """ + native.genrule( + name = "update_" + file[0:-3], + srcs = [file], + outs = [file[0:-3] + "_updated.kt"], + cmd = """ cat $(SRCS) | - sed 's/import org.oppia.app.R/import org.oppia.app.test.R/g' | - sed 's/import org.oppia.app.databinding./import org.oppia.app.databinding.databinding./g' > $(OUTS) - ''', - ) + sed 's/import org.oppia.android.R/import org.oppia.android.app.test.R/g' | + sed 's/import org.oppia.android.databinding./import org.oppia.android.app.databinding.databinding./g' > $(OUTS) + """, + ) - return "update_" + file[0:-3] + return "update_" + file[0:-3] diff --git a/data/BUILD.bazel b/data/BUILD.bazel index 45fdc0831aa..a0d3e2dbd63 100644 --- a/data/BUILD.bazel +++ b/data/BUILD.bazel @@ -1,7 +1,7 @@ # TODO(#1532): Rename file to 'BUILD' post-Gradle. -''' +""" This library provides data to the rest of the application. -''' +""" load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") load("@rules_jvm_external//:defs.bzl", "artifact") @@ -9,9 +9,10 @@ load("@dagger//:workspace_defs.bzl", "dagger_rules") kt_android_library( name = "persistent_cache_store", - custom_package = "org.oppia.data.persistence", - srcs = ["src/main/java/org/oppia/data/persistence/PersistentCacheStore.kt"], + srcs = ["src/main/java/org/oppia/android/data/persistence/PersistentCacheStore.kt"], + custom_package = "org.oppia.android.data.persistence", manifest = "src/main/AndroidManifest.xml", + visibility = ["//visibility:public"], deps = [ ":dagger", "//model", @@ -21,7 +22,6 @@ kt_android_library( artifact("com.caverock:androidsvg-aar"), artifact("androidx.lifecycle:lifecycle-livedata-ktx"), ], - visibility = ["//visibility:public"], ) dagger_rules() diff --git a/data/src/main/AndroidManifest.xml b/data/src/main/AndroidManifest.xml index fdb94b1021d..d6fa9e7e109 100644 --- a/data/src/main/AndroidManifest.xml +++ b/data/src/main/AndroidManifest.xml @@ -1 +1 @@ - + diff --git a/data/src/main/java/org/oppia/android/data/Constants.kt b/data/src/main/java/org/oppia/android/data/Constants.kt index 51cd0651f72..af4151dea4e 100755 --- a/data/src/main/java/org/oppia/android/data/Constants.kt +++ b/data/src/main/java/org/oppia/android/data/Constants.kt @@ -1,4 +1,4 @@ -package org.oppia.data +package org.oppia.android.data /** An object that contains constants for data module */ object Constants { diff --git a/data/src/main/java/org/oppia/android/data/backends/gae/NetworkInterceptor.kt b/data/src/main/java/org/oppia/android/data/backends/gae/NetworkInterceptor.kt index 82b42cd0a86..23032163499 100755 --- a/data/src/main/java/org/oppia/android/data/backends/gae/NetworkInterceptor.kt +++ b/data/src/main/java/org/oppia/android/data/backends/gae/NetworkInterceptor.kt @@ -1,9 +1,9 @@ -package org.oppia.data.backends.gae +package org.oppia.android.data.backends.gae import okhttp3.Interceptor import okhttp3.Response import okhttp3.ResponseBody -import org.oppia.data.Constants +import org.oppia.android.data.Constants import java.io.IOException import javax.inject.Inject import javax.inject.Singleton diff --git a/data/src/main/java/org/oppia/android/data/backends/gae/NetworkModule.kt b/data/src/main/java/org/oppia/android/data/backends/gae/NetworkModule.kt index 6613c28611f..7947e9cafe0 100644 --- a/data/src/main/java/org/oppia/android/data/backends/gae/NetworkModule.kt +++ b/data/src/main/java/org/oppia/android/data/backends/gae/NetworkModule.kt @@ -1,10 +1,10 @@ -package org.oppia.data.backends.gae +package org.oppia.android.data.backends.gae import dagger.Module import dagger.Provides import okhttp3.OkHttpClient -import org.oppia.data.backends.gae.api.ClassroomService -import org.oppia.data.backends.gae.api.TopicService +import org.oppia.android.data.backends.gae.api.ClassroomService +import org.oppia.android.data.backends.gae.api.TopicService import retrofit2.Retrofit import retrofit2.converter.moshi.MoshiConverterFactory import javax.inject.Qualifier diff --git a/data/src/main/java/org/oppia/android/data/backends/gae/NetworkSettings.kt b/data/src/main/java/org/oppia/android/data/backends/gae/NetworkSettings.kt index f0f1324a897..716b3c8ee2f 100755 --- a/data/src/main/java/org/oppia/android/data/backends/gae/NetworkSettings.kt +++ b/data/src/main/java/org/oppia/android/data/backends/gae/NetworkSettings.kt @@ -1,4 +1,4 @@ -package org.oppia.data.backends.gae +package org.oppia.android.data.backends.gae /** An object that contains functions and constants specifically related to network only. */ object NetworkSettings { diff --git a/data/src/main/java/org/oppia/android/data/backends/gae/api/ClassroomService.kt b/data/src/main/java/org/oppia/android/data/backends/gae/api/ClassroomService.kt index 8be7e104913..39b1afd32aa 100644 --- a/data/src/main/java/org/oppia/android/data/backends/gae/api/ClassroomService.kt +++ b/data/src/main/java/org/oppia/android/data/backends/gae/api/ClassroomService.kt @@ -1,6 +1,6 @@ -package org.oppia.data.backends.gae.api +package org.oppia.android.data.backends.gae.api -import org.oppia.data.backends.gae.model.GaeClassroom +import org.oppia.android.data.backends.gae.model.GaeClassroom import retrofit2.Call import retrofit2.http.GET import retrofit2.http.Path diff --git a/data/src/main/java/org/oppia/android/data/backends/gae/api/ConceptCardService.kt b/data/src/main/java/org/oppia/android/data/backends/gae/api/ConceptCardService.kt index 4e5df016396..a23b7a3427c 100644 --- a/data/src/main/java/org/oppia/android/data/backends/gae/api/ConceptCardService.kt +++ b/data/src/main/java/org/oppia/android/data/backends/gae/api/ConceptCardService.kt @@ -1,6 +1,6 @@ -package org.oppia.data.backends.gae.api +package org.oppia.android.data.backends.gae.api -import org.oppia.data.backends.gae.model.GaeConceptCard +import org.oppia.android.data.backends.gae.model.GaeConceptCard import retrofit2.Call import retrofit2.http.GET import retrofit2.http.Query diff --git a/data/src/main/java/org/oppia/android/data/backends/gae/api/ExplorationService.kt b/data/src/main/java/org/oppia/android/data/backends/gae/api/ExplorationService.kt index b1d8cc4335b..1237fcb29a2 100755 --- a/data/src/main/java/org/oppia/android/data/backends/gae/api/ExplorationService.kt +++ b/data/src/main/java/org/oppia/android/data/backends/gae/api/ExplorationService.kt @@ -1,6 +1,6 @@ -package org.oppia.data.backends.gae.api +package org.oppia.android.data.backends.gae.api -import org.oppia.data.backends.gae.model.GaeExplorationContainer +import org.oppia.android.data.backends.gae.model.GaeExplorationContainer import retrofit2.Call import retrofit2.http.GET import retrofit2.http.Path diff --git a/data/src/main/java/org/oppia/android/data/backends/gae/api/QuestionPlayerService.kt b/data/src/main/java/org/oppia/android/data/backends/gae/api/QuestionPlayerService.kt index decc7028d14..b104b35ee81 100644 --- a/data/src/main/java/org/oppia/android/data/backends/gae/api/QuestionPlayerService.kt +++ b/data/src/main/java/org/oppia/android/data/backends/gae/api/QuestionPlayerService.kt @@ -1,6 +1,6 @@ -package org.oppia.data.backends.gae.api +package org.oppia.android.data.backends.gae.api -import org.oppia.data.backends.gae.model.GaeQuestionPlayer +import org.oppia.android.data.backends.gae.model.GaeQuestionPlayer import retrofit2.Call import retrofit2.http.GET import retrofit2.http.Query diff --git a/data/src/main/java/org/oppia/android/data/backends/gae/api/StoryService.kt b/data/src/main/java/org/oppia/android/data/backends/gae/api/StoryService.kt index 95d43060551..ca618a2688c 100644 --- a/data/src/main/java/org/oppia/android/data/backends/gae/api/StoryService.kt +++ b/data/src/main/java/org/oppia/android/data/backends/gae/api/StoryService.kt @@ -1,6 +1,6 @@ -package org.oppia.data.backends.gae.api +package org.oppia.android.data.backends.gae.api -import org.oppia.data.backends.gae.model.GaeStory +import org.oppia.android.data.backends.gae.model.GaeStory import retrofit2.Call import retrofit2.http.GET import retrofit2.http.Path diff --git a/data/src/main/java/org/oppia/android/data/backends/gae/api/SubtopicService.kt b/data/src/main/java/org/oppia/android/data/backends/gae/api/SubtopicService.kt index 6f92e5bfa0d..3eaded654a3 100644 --- a/data/src/main/java/org/oppia/android/data/backends/gae/api/SubtopicService.kt +++ b/data/src/main/java/org/oppia/android/data/backends/gae/api/SubtopicService.kt @@ -1,6 +1,6 @@ -package org.oppia.data.backends.gae.api +package org.oppia.android.data.backends.gae.api -import org.oppia.data.backends.gae.model.GaeSubtopic +import org.oppia.android.data.backends.gae.model.GaeSubtopic import retrofit2.Call import retrofit2.http.GET import retrofit2.http.Path diff --git a/data/src/main/java/org/oppia/android/data/backends/gae/api/TopicService.kt b/data/src/main/java/org/oppia/android/data/backends/gae/api/TopicService.kt index cca682631da..04248ea5d2c 100755 --- a/data/src/main/java/org/oppia/android/data/backends/gae/api/TopicService.kt +++ b/data/src/main/java/org/oppia/android/data/backends/gae/api/TopicService.kt @@ -1,6 +1,6 @@ -package org.oppia.data.backends.gae.api +package org.oppia.android.data.backends.gae.api -import org.oppia.data.backends.gae.model.GaeTopic +import org.oppia.android.data.backends.gae.model.GaeTopic import retrofit2.Call import retrofit2.http.GET import retrofit2.http.Path diff --git a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeAnswerGroup.kt b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeAnswerGroup.kt index 9153c4d3225..71317e86858 100755 --- a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeAnswerGroup.kt +++ b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeAnswerGroup.kt @@ -1,4 +1,4 @@ -package org.oppia.data.backends.gae.model +package org.oppia.android.data.backends.gae.model import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeClassroom.kt b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeClassroom.kt index 4ce97c7a50d..9d9a1363299 100644 --- a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeClassroom.kt +++ b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeClassroom.kt @@ -1,4 +1,4 @@ -package org.oppia.data.backends.gae.model +package org.oppia.android.data.backends.gae.model import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeConceptCard.kt b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeConceptCard.kt index e0a9adca92b..d50d816c8a8 100644 --- a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeConceptCard.kt +++ b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeConceptCard.kt @@ -1,4 +1,4 @@ -package org.oppia.data.backends.gae.model +package org.oppia.android.data.backends.gae.model import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeCustomizationArgs.kt b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeCustomizationArgs.kt index b650088f88f..1fd42f4bb84 100755 --- a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeCustomizationArgs.kt +++ b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeCustomizationArgs.kt @@ -1,4 +1,4 @@ -package org.oppia.data.backends.gae.model +package org.oppia.android.data.backends.gae.model import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeExpSummary.kt b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeExpSummary.kt index f37d4c254c5..1c85bf5b94e 100644 --- a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeExpSummary.kt +++ b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeExpSummary.kt @@ -1,4 +1,4 @@ -package org.oppia.data.backends.gae.model +package org.oppia.android.data.backends.gae.model import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeExploration.kt b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeExploration.kt index 54b1f18463d..14d610d4e98 100755 --- a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeExploration.kt +++ b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeExploration.kt @@ -1,4 +1,4 @@ -package org.oppia.data.backends.gae.model +package org.oppia.android.data.backends.gae.model import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeExplorationContainer.kt b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeExplorationContainer.kt index 8f82c34982b..9a3491dc121 100755 --- a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeExplorationContainer.kt +++ b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeExplorationContainer.kt @@ -1,4 +1,4 @@ -package org.oppia.data.backends.gae.model +package org.oppia.android.data.backends.gae.model import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeHint.kt b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeHint.kt index a543b5117e0..4802f860541 100755 --- a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeHint.kt +++ b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeHint.kt @@ -1,4 +1,4 @@ -package org.oppia.data.backends.gae.model +package org.oppia.android.data.backends.gae.model import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeInteractionInstance.kt b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeInteractionInstance.kt index 8e1c11043fe..dbc4e678562 100755 --- a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeInteractionInstance.kt +++ b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeInteractionInstance.kt @@ -1,4 +1,4 @@ -package org.oppia.data.backends.gae.model +package org.oppia.android.data.backends.gae.model import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeOutcome.kt b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeOutcome.kt index 5cfe406698e..75566a5f225 100755 --- a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeOutcome.kt +++ b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeOutcome.kt @@ -1,4 +1,4 @@ -package org.oppia.data.backends.gae.model +package org.oppia.android.data.backends.gae.model import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeParamChange.kt b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeParamChange.kt index 306b433fce1..6e4f59be254 100755 --- a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeParamChange.kt +++ b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeParamChange.kt @@ -1,4 +1,4 @@ -package org.oppia.data.backends.gae.model +package org.oppia.android.data.backends.gae.model import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeParamSpec.kt b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeParamSpec.kt index 66d1035458e..b85870be504 100755 --- a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeParamSpec.kt +++ b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeParamSpec.kt @@ -1,4 +1,4 @@ -package org.oppia.data.backends.gae.model +package org.oppia.android.data.backends.gae.model import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeQuestion.kt b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeQuestion.kt index 57edbbbdc9b..f6bb8344394 100644 --- a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeQuestion.kt +++ b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeQuestion.kt @@ -1,4 +1,4 @@ -package org.oppia.data.backends.gae.model +package org.oppia.android.data.backends.gae.model import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeQuestionPlayer.kt b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeQuestionPlayer.kt index 99020aca918..445d4c3548b 100644 --- a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeQuestionPlayer.kt +++ b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeQuestionPlayer.kt @@ -1,4 +1,4 @@ -package org.oppia.data.backends.gae.model +package org.oppia.android.data.backends.gae.model import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeRecordedVoiceovers.kt b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeRecordedVoiceovers.kt index 44adf31d175..38bfd33b17a 100755 --- a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeRecordedVoiceovers.kt +++ b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeRecordedVoiceovers.kt @@ -1,4 +1,4 @@ -package org.oppia.data.backends.gae.model +package org.oppia.android.data.backends.gae.model import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeRuleSpec.kt b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeRuleSpec.kt index 5999ba187c7..e088a75e06b 100755 --- a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeRuleSpec.kt +++ b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeRuleSpec.kt @@ -1,4 +1,4 @@ -package org.oppia.data.backends.gae.model +package org.oppia.android.data.backends.gae.model import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeSkillContents.kt b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeSkillContents.kt index 0cf5f32e137..7b6249c5986 100644 --- a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeSkillContents.kt +++ b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeSkillContents.kt @@ -1,4 +1,4 @@ -package org.oppia.data.backends.gae.model +package org.oppia.android.data.backends.gae.model import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeSolution.kt b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeSolution.kt index 0c58247ec30..cb30bac73bc 100755 --- a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeSolution.kt +++ b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeSolution.kt @@ -1,4 +1,4 @@ -package org.oppia.data.backends.gae.model +package org.oppia.android.data.backends.gae.model import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeState.kt b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeState.kt index 7018e98440c..941cdecd343 100755 --- a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeState.kt +++ b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeState.kt @@ -1,4 +1,4 @@ -package org.oppia.data.backends.gae.model +package org.oppia.android.data.backends.gae.model import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeStateClassifier.kt b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeStateClassifier.kt index b8c65b34cda..1ebac543064 100755 --- a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeStateClassifier.kt +++ b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeStateClassifier.kt @@ -1,4 +1,4 @@ -package org.oppia.data.backends.gae.model +package org.oppia.android.data.backends.gae.model import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeStory.kt b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeStory.kt index 85e39de5926..d9e6d3a1446 100644 --- a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeStory.kt +++ b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeStory.kt @@ -1,4 +1,4 @@ -package org.oppia.data.backends.gae.model +package org.oppia.android.data.backends.gae.model import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeStoryNode.kt b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeStoryNode.kt index bbed2120355..0af8d6db5c4 100644 --- a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeStoryNode.kt +++ b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeStoryNode.kt @@ -1,4 +1,4 @@ -package org.oppia.data.backends.gae.model +package org.oppia.android.data.backends.gae.model import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeStorySummary.kt b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeStorySummary.kt index 6349dec8a26..a07193046af 100755 --- a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeStorySummary.kt +++ b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeStorySummary.kt @@ -1,4 +1,4 @@ -package org.oppia.data.backends.gae.model +package org.oppia.android.data.backends.gae.model import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeSubtitledHtml.kt b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeSubtitledHtml.kt index 88142c15681..eb4a4accf86 100755 --- a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeSubtitledHtml.kt +++ b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeSubtitledHtml.kt @@ -1,4 +1,4 @@ -package org.oppia.data.backends.gae.model +package org.oppia.android.data.backends.gae.model import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeSubtopic.kt b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeSubtopic.kt index bfb2950c569..e40cc97e7d5 100644 --- a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeSubtopic.kt +++ b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeSubtopic.kt @@ -1,4 +1,4 @@ -package org.oppia.data.backends.gae.model +package org.oppia.android.data.backends.gae.model import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeSubtopicPageContents.kt b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeSubtopicPageContents.kt index 966ef455212..e8cf5a20a15 100644 --- a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeSubtopicPageContents.kt +++ b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeSubtopicPageContents.kt @@ -1,4 +1,4 @@ -package org.oppia.data.backends.gae.model +package org.oppia.android.data.backends.gae.model import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeSubtopicSummary.kt b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeSubtopicSummary.kt index 8c5ef08d201..4e7bfe2e83b 100755 --- a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeSubtopicSummary.kt +++ b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeSubtopicSummary.kt @@ -1,4 +1,4 @@ -package org.oppia.data.backends.gae.model +package org.oppia.android.data.backends.gae.model import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeTopic.kt b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeTopic.kt index cf2a8871e99..18194cc4ae2 100755 --- a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeTopic.kt +++ b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeTopic.kt @@ -1,4 +1,4 @@ -package org.oppia.data.backends.gae.model +package org.oppia.android.data.backends.gae.model import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeTopicSummary.kt b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeTopicSummary.kt index b9486155270..81985fa2c8f 100644 --- a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeTopicSummary.kt +++ b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeTopicSummary.kt @@ -1,4 +1,4 @@ -package org.oppia.data.backends.gae.model +package org.oppia.android.data.backends.gae.model import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeVoiceover.kt b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeVoiceover.kt index 9b5dc66b6b9..9ef839aab7e 100755 --- a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeVoiceover.kt +++ b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeVoiceover.kt @@ -1,4 +1,4 @@ -package org.oppia.data.backends.gae.model +package org.oppia.android.data.backends.gae.model import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeWrittenTranslation.kt b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeWrittenTranslation.kt index b03520e9ac9..3a1a03a88ce 100755 --- a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeWrittenTranslation.kt +++ b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeWrittenTranslation.kt @@ -1,4 +1,4 @@ -package org.oppia.data.backends.gae.model +package org.oppia.android.data.backends.gae.model import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeWrittenTranslations.kt b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeWrittenTranslations.kt index 7d33487e3e2..858c959e93e 100755 --- a/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeWrittenTranslations.kt +++ b/data/src/main/java/org/oppia/android/data/backends/gae/model/GaeWrittenTranslations.kt @@ -1,4 +1,4 @@ -package org.oppia.data.backends.gae.model +package org.oppia.android.data.backends.gae.model import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/data/src/main/java/org/oppia/android/data/persistence/PersistentCacheStore.kt b/data/src/main/java/org/oppia/android/data/persistence/PersistentCacheStore.kt index e28186a3297..e9bd6e381e6 100644 --- a/data/src/main/java/org/oppia/android/data/persistence/PersistentCacheStore.kt +++ b/data/src/main/java/org/oppia/android/data/persistence/PersistentCacheStore.kt @@ -1,15 +1,15 @@ -package org.oppia.data.persistence +package org.oppia.android.data.persistence import android.content.Context import androidx.annotation.GuardedBy import com.google.protobuf.MessageLite import kotlinx.coroutines.Deferred -import org.oppia.app.model.ProfileId -import org.oppia.util.data.AsyncDataSubscriptionManager -import org.oppia.util.data.AsyncResult -import org.oppia.util.data.DataProvider -import org.oppia.util.data.InMemoryBlockingCache -import org.oppia.util.profile.DirectoryManagementUtil +import org.oppia.android.app.model.ProfileId +import org.oppia.android.util.data.AsyncDataSubscriptionManager +import org.oppia.android.util.data.AsyncResult +import org.oppia.android.util.data.DataProvider +import org.oppia.android.util.data.InMemoryBlockingCache +import org.oppia.android.util.profile.DirectoryManagementUtil import java.io.File import java.io.FileInputStream import java.io.FileOutputStream diff --git a/data/src/test/java/org/oppia/android/data/backends/ApiUtils.kt b/data/src/test/java/org/oppia/android/data/backends/ApiUtils.kt index 0294ced59d3..42b85362931 100644 --- a/data/src/test/java/org/oppia/android/data/backends/ApiUtils.kt +++ b/data/src/test/java/org/oppia/android/data/backends/ApiUtils.kt @@ -1,4 +1,4 @@ -package org.oppia.data.backends +package org.oppia.android.data.backends import org.json.JSONException import org.json.JSONObject diff --git a/data/src/test/java/org/oppia/android/data/backends/api/MockClassroomService.kt b/data/src/test/java/org/oppia/android/data/backends/api/MockClassroomService.kt index 7005fe4a589..c742faf4b53 100755 --- a/data/src/test/java/org/oppia/android/data/backends/api/MockClassroomService.kt +++ b/data/src/test/java/org/oppia/android/data/backends/api/MockClassroomService.kt @@ -1,12 +1,12 @@ -package org.oppia.data.backends.api +package org.oppia.android.data.backends.api import com.squareup.moshi.JsonAdapter import com.squareup.moshi.Moshi -import org.oppia.data.backends.ApiUtils -import org.oppia.data.backends.gae.NetworkInterceptor -import org.oppia.data.backends.gae.NetworkSettings -import org.oppia.data.backends.gae.api.ClassroomService -import org.oppia.data.backends.gae.model.GaeClassroom +import org.oppia.android.data.backends.ApiUtils +import org.oppia.android.data.backends.gae.NetworkInterceptor +import org.oppia.android.data.backends.gae.NetworkSettings +import org.oppia.android.data.backends.gae.api.ClassroomService +import org.oppia.android.data.backends.gae.model.GaeClassroom import retrofit2.Call import retrofit2.mock.BehaviorDelegate diff --git a/data/src/test/java/org/oppia/android/data/backends/api/MockConceptCardService.kt b/data/src/test/java/org/oppia/android/data/backends/api/MockConceptCardService.kt index 552908f935b..a1ca6c8584a 100644 --- a/data/src/test/java/org/oppia/android/data/backends/api/MockConceptCardService.kt +++ b/data/src/test/java/org/oppia/android/data/backends/api/MockConceptCardService.kt @@ -1,12 +1,12 @@ -package org.oppia.data.backends.api +package org.oppia.android.data.backends.api import com.squareup.moshi.JsonAdapter import com.squareup.moshi.Moshi -import org.oppia.data.backends.ApiUtils -import org.oppia.data.backends.gae.NetworkInterceptor -import org.oppia.data.backends.gae.NetworkSettings -import org.oppia.data.backends.gae.api.ConceptCardService -import org.oppia.data.backends.gae.model.GaeConceptCard +import org.oppia.android.data.backends.ApiUtils +import org.oppia.android.data.backends.gae.NetworkInterceptor +import org.oppia.android.data.backends.gae.NetworkSettings +import org.oppia.android.data.backends.gae.api.ConceptCardService +import org.oppia.android.data.backends.gae.model.GaeConceptCard import retrofit2.Call import retrofit2.mock.BehaviorDelegate diff --git a/data/src/test/java/org/oppia/android/data/backends/api/MockExplorationService.kt b/data/src/test/java/org/oppia/android/data/backends/api/MockExplorationService.kt index c509612a395..10fcef0e6fe 100755 --- a/data/src/test/java/org/oppia/android/data/backends/api/MockExplorationService.kt +++ b/data/src/test/java/org/oppia/android/data/backends/api/MockExplorationService.kt @@ -1,12 +1,12 @@ -package org.oppia.data.backends.api +package org.oppia.android.data.backends.api import com.squareup.moshi.JsonAdapter import com.squareup.moshi.Moshi -import org.oppia.data.backends.ApiUtils -import org.oppia.data.backends.gae.NetworkInterceptor -import org.oppia.data.backends.gae.NetworkSettings -import org.oppia.data.backends.gae.api.ExplorationService -import org.oppia.data.backends.gae.model.GaeExplorationContainer +import org.oppia.android.data.backends.ApiUtils +import org.oppia.android.data.backends.gae.NetworkInterceptor +import org.oppia.android.data.backends.gae.NetworkSettings +import org.oppia.android.data.backends.gae.api.ExplorationService +import org.oppia.android.data.backends.gae.model.GaeExplorationContainer import retrofit2.Call import retrofit2.mock.BehaviorDelegate diff --git a/data/src/test/java/org/oppia/android/data/backends/api/MockQuestionPlayerService.kt b/data/src/test/java/org/oppia/android/data/backends/api/MockQuestionPlayerService.kt index 32908eb9447..df4a54c45aa 100644 --- a/data/src/test/java/org/oppia/android/data/backends/api/MockQuestionPlayerService.kt +++ b/data/src/test/java/org/oppia/android/data/backends/api/MockQuestionPlayerService.kt @@ -1,12 +1,12 @@ -package org.oppia.data.backends.api +package org.oppia.android.data.backends.api import com.squareup.moshi.JsonAdapter import com.squareup.moshi.Moshi -import org.oppia.data.backends.ApiUtils -import org.oppia.data.backends.gae.NetworkInterceptor -import org.oppia.data.backends.gae.NetworkSettings -import org.oppia.data.backends.gae.api.QuestionPlayerService -import org.oppia.data.backends.gae.model.GaeQuestionPlayer +import org.oppia.android.data.backends.ApiUtils +import org.oppia.android.data.backends.gae.NetworkInterceptor +import org.oppia.android.data.backends.gae.NetworkSettings +import org.oppia.android.data.backends.gae.api.QuestionPlayerService +import org.oppia.android.data.backends.gae.model.GaeQuestionPlayer import retrofit2.Call import retrofit2.mock.BehaviorDelegate diff --git a/data/src/test/java/org/oppia/android/data/backends/api/MockStoryService.kt b/data/src/test/java/org/oppia/android/data/backends/api/MockStoryService.kt index 37c63963a42..6388f7e89fb 100644 --- a/data/src/test/java/org/oppia/android/data/backends/api/MockStoryService.kt +++ b/data/src/test/java/org/oppia/android/data/backends/api/MockStoryService.kt @@ -1,12 +1,12 @@ -package org.oppia.data.backends.api +package org.oppia.android.data.backends.api import com.squareup.moshi.JsonAdapter import com.squareup.moshi.Moshi -import org.oppia.data.backends.ApiUtils -import org.oppia.data.backends.gae.NetworkInterceptor -import org.oppia.data.backends.gae.NetworkSettings -import org.oppia.data.backends.gae.api.StoryService -import org.oppia.data.backends.gae.model.GaeStory +import org.oppia.android.data.backends.ApiUtils +import org.oppia.android.data.backends.gae.NetworkInterceptor +import org.oppia.android.data.backends.gae.NetworkSettings +import org.oppia.android.data.backends.gae.api.StoryService +import org.oppia.android.data.backends.gae.model.GaeStory import retrofit2.Call import retrofit2.mock.BehaviorDelegate diff --git a/data/src/test/java/org/oppia/android/data/backends/api/MockSubtopicService.kt b/data/src/test/java/org/oppia/android/data/backends/api/MockSubtopicService.kt index 17f1f76ea26..f0ec38041f3 100644 --- a/data/src/test/java/org/oppia/android/data/backends/api/MockSubtopicService.kt +++ b/data/src/test/java/org/oppia/android/data/backends/api/MockSubtopicService.kt @@ -1,12 +1,12 @@ -package org.oppia.data.backends.api +package org.oppia.android.data.backends.api import com.squareup.moshi.JsonAdapter import com.squareup.moshi.Moshi -import org.oppia.data.backends.ApiUtils -import org.oppia.data.backends.gae.NetworkInterceptor -import org.oppia.data.backends.gae.NetworkSettings -import org.oppia.data.backends.gae.api.SubtopicService -import org.oppia.data.backends.gae.model.GaeSubtopic +import org.oppia.android.data.backends.ApiUtils +import org.oppia.android.data.backends.gae.NetworkInterceptor +import org.oppia.android.data.backends.gae.NetworkSettings +import org.oppia.android.data.backends.gae.api.SubtopicService +import org.oppia.android.data.backends.gae.model.GaeSubtopic import retrofit2.Call import retrofit2.mock.BehaviorDelegate diff --git a/data/src/test/java/org/oppia/android/data/backends/api/MockTopicService.kt b/data/src/test/java/org/oppia/android/data/backends/api/MockTopicService.kt index c3b934a70cb..0224f8001c7 100644 --- a/data/src/test/java/org/oppia/android/data/backends/api/MockTopicService.kt +++ b/data/src/test/java/org/oppia/android/data/backends/api/MockTopicService.kt @@ -1,12 +1,12 @@ -package org.oppia.data.backends.api +package org.oppia.android.data.backends.api import com.squareup.moshi.JsonAdapter import com.squareup.moshi.Moshi -import org.oppia.data.backends.ApiUtils -import org.oppia.data.backends.gae.NetworkInterceptor -import org.oppia.data.backends.gae.NetworkSettings -import org.oppia.data.backends.gae.api.TopicService -import org.oppia.data.backends.gae.model.GaeTopic +import org.oppia.android.data.backends.ApiUtils +import org.oppia.android.data.backends.gae.NetworkInterceptor +import org.oppia.android.data.backends.gae.NetworkSettings +import org.oppia.android.data.backends.gae.api.TopicService +import org.oppia.android.data.backends.gae.model.GaeTopic import retrofit2.Call import retrofit2.mock.BehaviorDelegate diff --git a/data/src/test/java/org/oppia/android/data/backends/test/MockClassroomTest.kt b/data/src/test/java/org/oppia/android/data/backends/test/MockClassroomTest.kt index 0f58a9a9c41..ec920ac69b3 100755 --- a/data/src/test/java/org/oppia/android/data/backends/test/MockClassroomTest.kt +++ b/data/src/test/java/org/oppia/android/data/backends/test/MockClassroomTest.kt @@ -1,4 +1,4 @@ -package org.oppia.data.backends.test +package org.oppia.android.data.backends.test import androidx.test.ext.junit.runners.AndroidJUnit4 import com.google.common.truth.Truth.assertThat @@ -6,10 +6,10 @@ import okhttp3.OkHttpClient import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.oppia.data.backends.api.MockClassroomService -import org.oppia.data.backends.gae.NetworkInterceptor -import org.oppia.data.backends.gae.NetworkSettings -import org.oppia.data.backends.gae.api.ClassroomService +import org.oppia.android.data.backends.api.MockClassroomService +import org.oppia.android.data.backends.gae.NetworkInterceptor +import org.oppia.android.data.backends.gae.NetworkSettings +import org.oppia.android.data.backends.gae.api.ClassroomService import org.robolectric.annotation.LooperMode import retrofit2.Retrofit import retrofit2.converter.moshi.MoshiConverterFactory diff --git a/data/src/test/java/org/oppia/android/data/backends/test/MockConceptCardTest.kt b/data/src/test/java/org/oppia/android/data/backends/test/MockConceptCardTest.kt index 078b2a834fb..8b5a4607eae 100755 --- a/data/src/test/java/org/oppia/android/data/backends/test/MockConceptCardTest.kt +++ b/data/src/test/java/org/oppia/android/data/backends/test/MockConceptCardTest.kt @@ -1,4 +1,4 @@ -package org.oppia.data.backends.test +package org.oppia.android.data.backends.test import androidx.test.ext.junit.runners.AndroidJUnit4 import com.google.common.truth.Truth.assertThat @@ -6,10 +6,10 @@ import okhttp3.OkHttpClient import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.oppia.data.backends.api.MockConceptCardService -import org.oppia.data.backends.gae.NetworkInterceptor -import org.oppia.data.backends.gae.NetworkSettings -import org.oppia.data.backends.gae.api.ConceptCardService +import org.oppia.android.data.backends.api.MockConceptCardService +import org.oppia.android.data.backends.gae.NetworkInterceptor +import org.oppia.android.data.backends.gae.NetworkSettings +import org.oppia.android.data.backends.gae.api.ConceptCardService import org.robolectric.annotation.LooperMode import retrofit2.Retrofit import retrofit2.converter.moshi.MoshiConverterFactory diff --git a/data/src/test/java/org/oppia/android/data/backends/test/MockExplorationTest.kt b/data/src/test/java/org/oppia/android/data/backends/test/MockExplorationTest.kt index eaa2b84c519..d57b4781aab 100755 --- a/data/src/test/java/org/oppia/android/data/backends/test/MockExplorationTest.kt +++ b/data/src/test/java/org/oppia/android/data/backends/test/MockExplorationTest.kt @@ -1,4 +1,4 @@ -package org.oppia.data.backends.test +package org.oppia.android.data.backends.test import androidx.test.ext.junit.runners.AndroidJUnit4 import com.google.common.truth.Truth.assertThat @@ -6,10 +6,10 @@ import okhttp3.OkHttpClient import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.oppia.data.backends.api.MockExplorationService -import org.oppia.data.backends.gae.NetworkInterceptor -import org.oppia.data.backends.gae.NetworkSettings -import org.oppia.data.backends.gae.api.ExplorationService +import org.oppia.android.data.backends.api.MockExplorationService +import org.oppia.android.data.backends.gae.NetworkInterceptor +import org.oppia.android.data.backends.gae.NetworkSettings +import org.oppia.android.data.backends.gae.api.ExplorationService import org.robolectric.annotation.LooperMode import retrofit2.Retrofit import retrofit2.converter.moshi.MoshiConverterFactory diff --git a/data/src/test/java/org/oppia/android/data/backends/test/MockQuestionPlayerTest.kt b/data/src/test/java/org/oppia/android/data/backends/test/MockQuestionPlayerTest.kt index b2fd7e92b69..028cfaec51e 100755 --- a/data/src/test/java/org/oppia/android/data/backends/test/MockQuestionPlayerTest.kt +++ b/data/src/test/java/org/oppia/android/data/backends/test/MockQuestionPlayerTest.kt @@ -1,4 +1,4 @@ -package org.oppia.data.backends.test +package org.oppia.android.data.backends.test import androidx.test.ext.junit.runners.AndroidJUnit4 import com.google.common.truth.Truth.assertThat @@ -6,10 +6,10 @@ import okhttp3.OkHttpClient import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.oppia.data.backends.api.MockQuestionPlayerService -import org.oppia.data.backends.gae.NetworkInterceptor -import org.oppia.data.backends.gae.NetworkSettings -import org.oppia.data.backends.gae.api.QuestionPlayerService +import org.oppia.android.data.backends.api.MockQuestionPlayerService +import org.oppia.android.data.backends.gae.NetworkInterceptor +import org.oppia.android.data.backends.gae.NetworkSettings +import org.oppia.android.data.backends.gae.api.QuestionPlayerService import org.robolectric.annotation.LooperMode import retrofit2.Retrofit import retrofit2.converter.moshi.MoshiConverterFactory diff --git a/data/src/test/java/org/oppia/android/data/backends/test/MockStoryTest.kt b/data/src/test/java/org/oppia/android/data/backends/test/MockStoryTest.kt index 41616db3f77..944036cf935 100755 --- a/data/src/test/java/org/oppia/android/data/backends/test/MockStoryTest.kt +++ b/data/src/test/java/org/oppia/android/data/backends/test/MockStoryTest.kt @@ -1,4 +1,4 @@ -package org.oppia.data.backends.test +package org.oppia.android.data.backends.test import androidx.test.ext.junit.runners.AndroidJUnit4 import com.google.common.truth.Truth.assertThat @@ -6,10 +6,10 @@ import okhttp3.OkHttpClient import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.oppia.data.backends.api.MockStoryService -import org.oppia.data.backends.gae.NetworkInterceptor -import org.oppia.data.backends.gae.NetworkSettings -import org.oppia.data.backends.gae.api.StoryService +import org.oppia.android.data.backends.api.MockStoryService +import org.oppia.android.data.backends.gae.NetworkInterceptor +import org.oppia.android.data.backends.gae.NetworkSettings +import org.oppia.android.data.backends.gae.api.StoryService import org.robolectric.annotation.LooperMode import retrofit2.Retrofit import retrofit2.converter.moshi.MoshiConverterFactory diff --git a/data/src/test/java/org/oppia/android/data/backends/test/MockSubtopicTest.kt b/data/src/test/java/org/oppia/android/data/backends/test/MockSubtopicTest.kt index 6e4f43d13a7..7cfb13a9084 100755 --- a/data/src/test/java/org/oppia/android/data/backends/test/MockSubtopicTest.kt +++ b/data/src/test/java/org/oppia/android/data/backends/test/MockSubtopicTest.kt @@ -1,4 +1,4 @@ -package org.oppia.data.backends.test +package org.oppia.android.data.backends.test import androidx.test.ext.junit.runners.AndroidJUnit4 import com.google.common.truth.Truth.assertThat @@ -6,10 +6,10 @@ import okhttp3.OkHttpClient import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.oppia.data.backends.api.MockSubtopicService -import org.oppia.data.backends.gae.NetworkInterceptor -import org.oppia.data.backends.gae.NetworkSettings -import org.oppia.data.backends.gae.api.SubtopicService +import org.oppia.android.data.backends.api.MockSubtopicService +import org.oppia.android.data.backends.gae.NetworkInterceptor +import org.oppia.android.data.backends.gae.NetworkSettings +import org.oppia.android.data.backends.gae.api.SubtopicService import org.robolectric.annotation.LooperMode import retrofit2.Retrofit import retrofit2.converter.moshi.MoshiConverterFactory diff --git a/data/src/test/java/org/oppia/android/data/backends/test/MockTopicTest.kt b/data/src/test/java/org/oppia/android/data/backends/test/MockTopicTest.kt index 91048cdb441..23dce9603c1 100755 --- a/data/src/test/java/org/oppia/android/data/backends/test/MockTopicTest.kt +++ b/data/src/test/java/org/oppia/android/data/backends/test/MockTopicTest.kt @@ -1,4 +1,4 @@ -package org.oppia.data.backends.test +package org.oppia.android.data.backends.test import androidx.test.ext.junit.runners.AndroidJUnit4 import com.google.common.truth.Truth.assertThat @@ -6,10 +6,10 @@ import okhttp3.OkHttpClient import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.oppia.data.backends.api.MockTopicService -import org.oppia.data.backends.gae.NetworkInterceptor -import org.oppia.data.backends.gae.NetworkSettings -import org.oppia.data.backends.gae.api.TopicService +import org.oppia.android.data.backends.api.MockTopicService +import org.oppia.android.data.backends.gae.NetworkInterceptor +import org.oppia.android.data.backends.gae.NetworkSettings +import org.oppia.android.data.backends.gae.api.TopicService import org.robolectric.annotation.LooperMode import retrofit2.Retrofit import retrofit2.converter.moshi.MoshiConverterFactory diff --git a/data/src/test/java/org/oppia/android/data/backends/test/NetworkInterceptorTest.kt b/data/src/test/java/org/oppia/android/data/backends/test/NetworkInterceptorTest.kt index 0642a1babf3..f4b99965c64 100755 --- a/data/src/test/java/org/oppia/android/data/backends/test/NetworkInterceptorTest.kt +++ b/data/src/test/java/org/oppia/android/data/backends/test/NetworkInterceptorTest.kt @@ -1,4 +1,4 @@ -package org.oppia.data.backends.test +package org.oppia.android.data.backends.test import android.app.Application import androidx.test.core.app.ApplicationProvider @@ -11,10 +11,10 @@ import dagger.Provides import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.oppia.data.backends.ApiUtils -import org.oppia.data.backends.api.MockTopicService -import org.oppia.data.backends.gae.NetworkInterceptor -import org.oppia.data.backends.gae.NetworkModule +import org.oppia.android.data.backends.ApiUtils +import org.oppia.android.data.backends.api.MockTopicService +import org.oppia.android.data.backends.gae.NetworkInterceptor +import org.oppia.android.data.backends.gae.NetworkModule import org.robolectric.annotation.LooperMode import retrofit2.Retrofit import javax.inject.Inject diff --git a/data/src/test/java/org/oppia/android/data/persistence/PersistentCacheStoreTest.kt b/data/src/test/java/org/oppia/android/data/persistence/PersistentCacheStoreTest.kt index 6d2e5d8eefe..b30730b48fc 100644 --- a/data/src/test/java/org/oppia/android/data/persistence/PersistentCacheStoreTest.kt +++ b/data/src/test/java/org/oppia/android/data/persistence/PersistentCacheStoreTest.kt @@ -1,4 +1,4 @@ -package org.oppia.data.persistence +package org.oppia.android.data.persistence import android.app.Application import android.content.Context @@ -27,13 +27,13 @@ import org.mockito.Mockito.verify import org.mockito.Mockito.verifyZeroInteractions import org.mockito.junit.MockitoJUnit import org.mockito.junit.MockitoRule -import org.oppia.app.model.TestMessage -import org.oppia.testing.TestCoroutineDispatchers -import org.oppia.testing.TestDispatcherModule -import org.oppia.testing.TestLogReportingModule -import org.oppia.util.data.AsyncResult -import org.oppia.util.data.DataProviders -import org.oppia.util.threading.BackgroundDispatcher +import org.oppia.android.app.model.TestMessage +import org.oppia.android.testing.TestCoroutineDispatchers +import org.oppia.android.testing.TestDispatcherModule +import org.oppia.android.testing.TestLogReportingModule +import org.oppia.android.util.data.AsyncResult +import org.oppia.android.util.data.DataProviders +import org.oppia.android.util.threading.BackgroundDispatcher import org.robolectric.annotation.Config import org.robolectric.annotation.LooperMode import java.io.File diff --git a/domain/BUILD.bazel b/domain/BUILD.bazel index 43b3ea816d3..3839e7d9eaf 100644 --- a/domain/BUILD.bazel +++ b/domain/BUILD.bazel @@ -1,7 +1,7 @@ # TODO(#1532): Rename file to 'BUILD' post-Gradle. -''' +""" This library contains the frontend controller and business service logic for the application. -''' +""" load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") load("@rules_jvm_external//:defs.bzl", "artifact") @@ -10,220 +10,220 @@ load("//domain:domain_test.bzl", "domain_test") kt_android_library( name = "domain", - custom_package = "org.oppia.domain", - srcs = glob(["src/main/java/org/oppia/domain/**/*.kt"]), + srcs = glob(["src/main/java/org/oppia/android/domain/**/*.kt"]), assets = glob(["src/main/assets/**"]), assets_dir = "src/main/assets/", + custom_package = "org.oppia.android.domain", manifest = "src/main/AndroidManifest.xml", + visibility = ["//visibility:public"], deps = [ ":dagger", "//data:persistent_cache_store", ], - visibility = ["//visibility:public"], ) TEST_DEPS = [ - ":dagger", - ":domain", - "//data:persistent_cache_store", - "//model", - "//testing", - "@robolectric//bazel:android-all", - artifact("androidx.arch.core:core-testing"), - artifact("androidx.test.ext:junit"), - artifact("com.google.truth:truth"), - artifact("org.jetbrains.kotlin:kotlin-test-junit"), - artifact("org.jetbrains.kotlin:kotlin-reflect"), + ":dagger", + ":domain", + "//data:persistent_cache_store", + "//model", + "//testing", + "@robolectric//bazel:android-all", + artifact("androidx.arch.core:core-testing"), + artifact("androidx.test.ext:junit"), + artifact("com.google.truth:truth"), + artifact("org.jetbrains.kotlin:kotlin-test-junit"), + artifact("org.jetbrains.kotlin:kotlin-reflect"), ] domain_test( name = "AudioPlayerControllerTest", - srcs = ["src/test/java/org/oppia/domain/audio/AudioPlayerControllerTest.kt"], - test_class = "org.oppia.domain.audio.AudioPlayerControllerTest", + srcs = ["src/test/java/org/oppia/android/domain/audio/AudioPlayerControllerTest.kt"], + test_class = "org.oppia.android.domain.audio.AudioPlayerControllerTest", deps = TEST_DEPS, ) domain_test( name = "CellularAudioDialogControllerTest", - srcs = ["src/test/java/org/oppia/domain/audio/CellularAudioDialogControllerTest.kt"], - test_class = "org.oppia.domain.audio.CellularAudioDialogControllerTest", + srcs = ["src/test/java/org/oppia/android/domain/audio/CellularAudioDialogControllerTest.kt"], + test_class = "org.oppia.android.domain.audio.CellularAudioDialogControllerTest", deps = TEST_DEPS, ) domain_test( name = "AnswerClassificationControllerTest", - srcs = ["src/test/java/org/oppia/domain/classify/AnswerClassificationControllerTest.kt"], - test_class = "org.oppia.domain.classify.AnswerClassificationControllerTest", + srcs = ["src/test/java/org/oppia/android/domain/classify/AnswerClassificationControllerTest.kt"], + test_class = "org.oppia.android.domain.classify.AnswerClassificationControllerTest", deps = TEST_DEPS, ) domain_test( name = "NumericInputEqualsRuleClassifierProviderTest", - srcs = ["src/test/java/org/oppia/domain/classify/NumericInputEqualsRuleClassifierProviderTest.kt"], - test_class = "org.oppia.domain.classify.NumericInputEqualsRuleClassifierProviderTest", + srcs = ["src/test/java/org/oppia/android/domain/classify/NumericInputEqualsRuleClassifierProviderTest.kt"], + test_class = "org.oppia.android.domain.classify.NumericInputEqualsRuleClassifierProviderTest", deps = TEST_DEPS, ) domain_test( name = "DragDropSortInputHasElementXAtPositionYRuleClassifierProviderTest", srcs = [ - "src/test/java/org/oppia/domain/classify/rules/dragAndDropSortInput/DragDropSortInputHasElementXAtPositionYRuleClassifierProviderTest.kt" + "src/test/java/org/oppia/android/domain/classify/rules/dragAndDropSortInput/DragDropSortInputHasElementXAtPositionYRuleClassifierProviderTest.kt", ], - test_class = "org.oppia.domain.classify.rules.dragAndDropSortInput.DragDropSortInputHasElementXAtPositionYRuleClassifierProviderTest", + test_class = "org.oppia.android.domain.classify.rules.dragAndDropSortInput.DragDropSortInputHasElementXAtPositionYRuleClassifierProviderTest", deps = TEST_DEPS, ) domain_test( name = "DragDropSortInputHasElementXBeforeElementYRuleClassifierProviderTest", srcs = [ - "src/test/java/org/oppia/domain/classify/rules/dragAndDropSortInput/DragDropSortInputHasElementXBeforeElementYRuleClassifierProviderTest.kt" + "src/test/java/org/oppia/android/domain/classify/rules/dragAndDropSortInput/DragDropSortInputHasElementXBeforeElementYRuleClassifierProviderTest.kt", ], - test_class = "org.oppia.domain.classify.rules.dragAndDropSortInput.DragDropSortInputHasElementXBeforeElementYRuleClassifierProviderTest", + test_class = "org.oppia.android.domain.classify.rules.dragAndDropSortInput.DragDropSortInputHasElementXBeforeElementYRuleClassifierProviderTest", deps = TEST_DEPS, ) domain_test( name = "DragDropSortInputIsEqualToOrderingClassifierProviderTest", srcs = [ - "src/test/java/org/oppia/domain/classify/rules/dragAndDropSortInput/DragDropSortInputIsEqualToOrderingClassifierProviderTest.kt" + "src/test/java/org/oppia/android/domain/classify/rules/dragAndDropSortInput/DragDropSortInputIsEqualToOrderingClassifierProviderTest.kt", ], - test_class = "org.oppia.domain.classify.rules.dragAndDropSortInput.DragDropSortInputIsEqualToOrderingClassifierProviderTest", + test_class = "org.oppia.android.domain.classify.rules.dragAndDropSortInput.DragDropSortInputIsEqualToOrderingClassifierProviderTest", deps = TEST_DEPS, ) domain_test( name = "DragDropSortInputIsEqualToOrderingWithOneItemAtIncorrectPositionClassifierProviderTest", srcs = [ - "src/test/java/org/oppia/domain/classify/rules/dragAndDropSortInput/DragDropSortInputIsEqualToOrderingWithOneItemAtIncorrectPositionClassifierProviderTest.kt" + "src/test/java/org/oppia/android/domain/classify/rules/dragAndDropSortInput/DragDropSortInputIsEqualToOrderingWithOneItemAtIncorrectPositionClassifierProviderTest.kt", ], - test_class = "org.oppia.domain.classify.rules.dragAndDropSortInput.DragDropSortInputIsEqualToOrderingWithOneItemAtIncorrectPositionClassifierProviderTest", + test_class = "org.oppia.android.domain.classify.rules.dragAndDropSortInput.DragDropSortInputIsEqualToOrderingWithOneItemAtIncorrectPositionClassifierProviderTest", deps = TEST_DEPS, ) domain_test( name = "ImageClickInputIsInRegionRuleClassifierProviderTest", srcs = [ - "src/test/java/org/oppia/domain/classify/rules/imageClickInput/ImageClickInputIsInRegionRuleClassifierProviderTest.kt" + "src/test/java/org/oppia/android/domain/classify/rules/imageClickInput/ImageClickInputIsInRegionRuleClassifierProviderTest.kt", ], - test_class = "org.oppia.domain.classify.rules.imageClickInput.ImageClickInputIsInRegionRuleClassifierProviderTest", + test_class = "org.oppia.android.domain.classify.rules.imageClickInput.ImageClickInputIsInRegionRuleClassifierProviderTest", deps = TEST_DEPS, ) domain_test( name = "MultipleChoiceInputEqualsRuleClassifierProviderTest", srcs = [ - "src/test/java/org/oppia/domain/classify/rules/multiplechoiceinput/MultipleChoiceInputEqualsRuleClassifierProviderTest.kt" + "src/test/java/org/oppia/android/domain/classify/rules/multiplechoiceinput/MultipleChoiceInputEqualsRuleClassifierProviderTest.kt", ], - test_class = "org.oppia.domain.classify.rules.multiplechoiceinput.MultipleChoiceInputEqualsRuleClassifierProviderTest", + test_class = "org.oppia.android.domain.classify.rules.multiplechoiceinput.MultipleChoiceInputEqualsRuleClassifierProviderTest", deps = TEST_DEPS, ) domain_test( name = "TextInputContainsRuleClassifierProviderTest", srcs = [ - "src/test/java/org/oppia/domain/classify/rules/textinput/TextInputContainsRuleClassifierProviderTest.kt" + "src/test/java/org/oppia/android/domain/classify/rules/textinput/TextInputContainsRuleClassifierProviderTest.kt", ], - test_class = "org.oppia.domain.classify.rules.textinput.TextInputContainsRuleClassifierProviderTest", + test_class = "org.oppia.android.domain.classify.rules.textinput.TextInputContainsRuleClassifierProviderTest", deps = TEST_DEPS, ) domain_test( name = "TextInputEqualsRuleClassifierProviderTest", srcs = [ - "src/test/java/org/oppia/domain/classify/rules/textinput/TextInputEqualsRuleClassifierProviderTest.kt" + "src/test/java/org/oppia/android/domain/classify/rules/textinput/TextInputEqualsRuleClassifierProviderTest.kt", ], - test_class = "org.oppia.domain.classify.rules.textinput.TextInputEqualsRuleClassifierProviderTest", + test_class = "org.oppia.android.domain.classify.rules.textinput.TextInputEqualsRuleClassifierProviderTest", deps = TEST_DEPS, ) domain_test( name = "ExplorationDataControllerTest", - srcs = ["src/test/java/org/oppia/domain/exploration/ExplorationDataControllerTest.kt"], - test_class = "org.oppia.domain.exploration.ExplorationDataControllerTest", + srcs = ["src/test/java/org/oppia/android/domain/exploration/ExplorationDataControllerTest.kt"], + test_class = "org.oppia.android.domain.exploration.ExplorationDataControllerTest", deps = TEST_DEPS, ) domain_test( name = "ExplorationProgressControllerTest", - srcs = ["src/test/java/org/oppia/domain/exploration/ExplorationProgressControllerTest.kt"], - test_class = "org.oppia.domain.exploration.ExplorationProgressControllerTest", + srcs = ["src/test/java/org/oppia/android/domain/exploration/ExplorationProgressControllerTest.kt"], + test_class = "org.oppia.android.domain.exploration.ExplorationProgressControllerTest", deps = TEST_DEPS, ) domain_test( name = "AppStartupStateControllerTest", - srcs = ["src/test/java/org/oppia/domain/onboarding/AppStartupStateControllerTest.kt"], - test_class = "org.oppia.domain.onboarding.AppStartupStateControllerTest", + srcs = ["src/test/java/org/oppia/android/domain/onboarding/AppStartupStateControllerTest.kt"], + test_class = "org.oppia.android.domain.onboarding.AppStartupStateControllerTest", deps = TEST_DEPS, ) domain_test( name = "AnalyticsControllerTest", - srcs = ["src/test/java/org/oppia/domain/oppialogger/analytics/AnalyticsControllerTest.kt"], - test_class = "org.oppia.domain.oppialogger.analytics.AnalyticsControllerTest", + srcs = ["src/test/java/org/oppia/android/domain/oppialogger/analytics/AnalyticsControllerTest.kt"], + test_class = "org.oppia.android.domain.oppialogger.analytics.AnalyticsControllerTest", deps = TEST_DEPS, ) domain_test( name = "ProfileManagementControllerTest", - srcs = ["src/test/java/org/oppia/domain/profile/ProfileManagementControllerTest.kt"], - test_class = "org.oppia.domain.profile.ProfileManagementControllerTest", + srcs = ["src/test/java/org/oppia/android/domain/profile/ProfileManagementControllerTest.kt"], + test_class = "org.oppia.android.domain.profile.ProfileManagementControllerTest", deps = TEST_DEPS, ) domain_test( name = "QuestionAssessmentProgressControllerTest", - srcs = ["src/test/java/org/oppia/domain/question/QuestionAssessmentProgressControllerTest.kt"], - test_class = "org.oppia.domain.question.QuestionAssessmentProgressControllerTest", + srcs = ["src/test/java/org/oppia/android/domain/question/QuestionAssessmentProgressControllerTest.kt"], + test_class = "org.oppia.android.domain.question.QuestionAssessmentProgressControllerTest", deps = TEST_DEPS, ) domain_test( name = "QuestionTrainingControllerTest", - srcs = ["src/test/java/org/oppia/domain/question/QuestionTrainingControllerTest.kt"], - test_class = "org.oppia.domain.question.QuestionTrainingControllerTest", + srcs = ["src/test/java/org/oppia/android/domain/question/QuestionTrainingControllerTest.kt"], + test_class = "org.oppia.android.domain.question.QuestionTrainingControllerTest", deps = TEST_DEPS, ) domain_test( name = "StoryProgressControllerTest", - srcs = ["src/test/java/org/oppia/domain/topic/StoryProgressControllerTest.kt"], - test_class = "org.oppia.domain.topic.StoryProgressControllerTest", + srcs = ["src/test/java/org/oppia/android/domain/topic/StoryProgressControllerTest.kt"], + test_class = "org.oppia.android.domain.topic.StoryProgressControllerTest", deps = TEST_DEPS, ) domain_test( name = "StoryProgressTestHelperTest", - srcs = ["src/test/java/org/oppia/domain/topic/StoryProgressTestHelperTest.kt"], - test_class = "org.oppia.domain.topic.StoryProgressTestHelperTest", + srcs = ["src/test/java/org/oppia/android/domain/topic/StoryProgressTestHelperTest.kt"], + test_class = "org.oppia.android.domain.topic.StoryProgressTestHelperTest", deps = TEST_DEPS, ) domain_test( name = "TopicControllerTest", - srcs = ["src/test/java/org/oppia/domain/topic/TopicControllerTest.kt"], - test_class = "org.oppia.domain.topic.TopicControllerTest", + srcs = ["src/test/java/org/oppia/android/domain/topic/TopicControllerTest.kt"], + test_class = "org.oppia.android.domain.topic.TopicControllerTest", deps = TEST_DEPS, ) domain_test( name = "TopicListControllerTest", - srcs = ["src/test/java/org/oppia/domain/topic/TopicListControllerTest.kt"], - test_class = "org.oppia.domain.topic.TopicListControllerTest", + srcs = ["src/test/java/org/oppia/android/domain/topic/TopicListControllerTest.kt"], + test_class = "org.oppia.android.domain.topic.TopicListControllerTest", deps = TEST_DEPS, ) domain_test( name = "InteractionObjectExtensionsTest", - srcs = ["src/test/java/org/oppia/domain/util/InteractionObjectExtensionsTest.kt"], - test_class = "org.oppia.domain.util.InteractionObjectExtensionsTest", + srcs = ["src/test/java/org/oppia/android/domain/util/InteractionObjectExtensionsTest.kt"], + test_class = "org.oppia.android.domain.util.InteractionObjectExtensionsTest", deps = TEST_DEPS, ) domain_test( name = "StateRetrieverTest", - srcs = ["src/test/java/org/oppia/domain/util/StateRetrieverTest.kt"], - test_class = "org.oppia.domain.util.StateRetrieverTest", + srcs = ["src/test/java/org/oppia/android/domain/util/StateRetrieverTest.kt"], + test_class = "org.oppia.android.domain.util.StateRetrieverTest", deps = TEST_DEPS, ) diff --git a/domain/domain_test.bzl b/domain/domain_test.bzl index c850af1d1f1..420187822ee 100644 --- a/domain/domain_test.bzl +++ b/domain/domain_test.bzl @@ -1,24 +1,25 @@ load("//:oppia_android_test.bzl", "oppia_android_test") + # TODO(#1620): Remove module-specific test macros once Gradle is removed def domain_test(name, srcs, test_class, deps): - ''' - Creates individual tests for test files in the domain module. + ''' + Creates individual tests for test files in the domain module. - Args: - name: str. The name of the Kotlin test file without the '.kt' suffix. - srcs: list of str. The list of test files to be run. - test_class: str. The package of the src file. Example: If the src is 'AsyncResultTest.kt', - then the test_class would be "org.oppia.util.data.AsyncResultTest". - deps: list of str. The list of dependencies needed to build and run this test. - ''' + Args: + name: str. The name of the Kotlin test file without the '.kt' suffix. + srcs: list of str. The list of test files to be run. + test_class: str. The package of the src file. Example: If the src is 'AsyncResultTest.kt', + then the test_class would be "org.oppia.util.data.AsyncResultTest". + deps: list of str. The list of dependencies needed to build and run this test. + ''' - oppia_android_test( - name = name, - srcs = srcs, - custom_package = "org.oppia.domain", - test_class = test_class, - test_manifest = "src/test/AndroidManifest.xml", - assets = native.glob(["src/main/assets/**"]), - assets_dir = "src/main/assets/", - deps = deps, - ) + oppia_android_test( + name = name, + srcs = srcs, + custom_package = "org.oppia.android.domain", + test_class = test_class, + test_manifest = "src/test/AndroidManifest.xml", + assets = native.glob(["src/main/assets/**"]), + assets_dir = "src/main/assets/", + deps = deps, + ) diff --git a/domain/src/main/AndroidManifest.xml b/domain/src/main/AndroidManifest.xml index 4a39ed248b5..122cc4becd3 100644 --- a/domain/src/main/AndroidManifest.xml +++ b/domain/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ + package="org.oppia.android.domain"> diff --git a/domain/src/main/java/org/oppia/android/domain/audio/AudioPlayerController.kt b/domain/src/main/java/org/oppia/android/domain/audio/AudioPlayerController.kt index efb4df6739a..2b9ae99689a 100644 --- a/domain/src/main/java/org/oppia/android/domain/audio/AudioPlayerController.kt +++ b/domain/src/main/java/org/oppia/android/domain/audio/AudioPlayerController.kt @@ -1,4 +1,4 @@ -package org.oppia.domain.audio +package org.oppia.android.domain.audio import android.media.MediaDataSource import android.media.MediaPlayer @@ -11,13 +11,13 @@ import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Job import kotlinx.coroutines.delay import kotlinx.coroutines.launch -import org.oppia.domain.oppialogger.exceptions.ExceptionsController -import org.oppia.util.caching.AssetRepository -import org.oppia.util.caching.CacheAssetsLocally -import org.oppia.util.data.AsyncResult -import org.oppia.util.logging.ConsoleLogger -import org.oppia.util.system.OppiaClock -import org.oppia.util.threading.BackgroundDispatcher +import org.oppia.android.domain.oppialogger.exceptions.ExceptionsController +import org.oppia.android.util.caching.AssetRepository +import org.oppia.android.util.caching.CacheAssetsLocally +import org.oppia.android.util.data.AsyncResult +import org.oppia.android.util.logging.ConsoleLogger +import org.oppia.android.util.system.OppiaClock +import org.oppia.android.util.threading.BackgroundDispatcher import java.io.IOException import java.util.concurrent.TimeUnit import java.util.concurrent.locks.ReentrantLock diff --git a/domain/src/main/java/org/oppia/android/domain/audio/CellularAudioDialogController.kt b/domain/src/main/java/org/oppia/android/domain/audio/CellularAudioDialogController.kt index 9d66ca49ad5..997a4678613 100644 --- a/domain/src/main/java/org/oppia/android/domain/audio/CellularAudioDialogController.kt +++ b/domain/src/main/java/org/oppia/android/domain/audio/CellularAudioDialogController.kt @@ -1,11 +1,11 @@ -package org.oppia.domain.audio +package org.oppia.android.domain.audio import androidx.lifecycle.LiveData -import org.oppia.app.model.CellularDataPreference -import org.oppia.data.persistence.PersistentCacheStore -import org.oppia.util.data.AsyncResult -import org.oppia.util.data.DataProviders -import org.oppia.util.logging.ConsoleLogger +import org.oppia.android.app.model.CellularDataPreference +import org.oppia.android.data.persistence.PersistentCacheStore +import org.oppia.android.util.data.AsyncResult +import org.oppia.android.util.data.DataProviders +import org.oppia.android.util.logging.ConsoleLogger import javax.inject.Inject import javax.inject.Singleton diff --git a/domain/src/main/java/org/oppia/android/domain/classify/AnswerClassificationController.kt b/domain/src/main/java/org/oppia/android/domain/classify/AnswerClassificationController.kt index 1f1decb1552..55541446237 100644 --- a/domain/src/main/java/org/oppia/android/domain/classify/AnswerClassificationController.kt +++ b/domain/src/main/java/org/oppia/android/domain/classify/AnswerClassificationController.kt @@ -1,16 +1,16 @@ -package org.oppia.domain.classify +package org.oppia.android.domain.classify -import org.oppia.app.model.AnswerGroup -import org.oppia.app.model.Interaction -import org.oppia.app.model.InteractionObject -import org.oppia.app.model.Outcome +import org.oppia.android.app.model.AnswerGroup +import org.oppia.android.app.model.Interaction +import org.oppia.android.app.model.InteractionObject +import org.oppia.android.app.model.Outcome import javax.inject.Inject // TODO(#59): Restrict the visibility of this class to only other controllers. /** * Controller responsible for classifying user answers to a specific outcome based on Oppia's interaction rule engine. * This controller is not meant to be interacted with directly by the UI. Instead, UIs wanting to submit answers should - * do so via various progress controllers, like [org.oppia.domain.topic.StoryProgressController]. + * do so via various progress controllers, like [org.oppia.android.domain.topic.StoryProgressController]. * * This controller should only be interacted with via background threads. */ diff --git a/domain/src/main/java/org/oppia/android/domain/classify/GenericInteractionClassifier.kt b/domain/src/main/java/org/oppia/android/domain/classify/GenericInteractionClassifier.kt index 882dd5acff0..384cc77091f 100644 --- a/domain/src/main/java/org/oppia/android/domain/classify/GenericInteractionClassifier.kt +++ b/domain/src/main/java/org/oppia/android/domain/classify/GenericInteractionClassifier.kt @@ -1,4 +1,4 @@ -package org.oppia.domain.classify +package org.oppia.android.domain.classify /** A general-purpose [InteractionClassifier] that utilizes a Dagger-bound [RuleClassifier] map. */ internal class GenericInteractionClassifier( diff --git a/domain/src/main/java/org/oppia/android/domain/classify/InteractionClassifier.kt b/domain/src/main/java/org/oppia/android/domain/classify/InteractionClassifier.kt index 5fc1dd8097b..4008133e854 100644 --- a/domain/src/main/java/org/oppia/android/domain/classify/InteractionClassifier.kt +++ b/domain/src/main/java/org/oppia/android/domain/classify/InteractionClassifier.kt @@ -1,4 +1,4 @@ -package org.oppia.domain.classify +package org.oppia.android.domain.classify /** * An answer classifier for a specific interaction type. Instances of this classifier should be bound to a map of diff --git a/domain/src/main/java/org/oppia/android/domain/classify/InteractionsModule.kt b/domain/src/main/java/org/oppia/android/domain/classify/InteractionsModule.kt index 453fe38c211..4175bda19eb 100644 --- a/domain/src/main/java/org/oppia/android/domain/classify/InteractionsModule.kt +++ b/domain/src/main/java/org/oppia/android/domain/classify/InteractionsModule.kt @@ -1,19 +1,19 @@ -package org.oppia.domain.classify +package org.oppia.android.domain.classify import dagger.Module import dagger.Provides import dagger.multibindings.IntoMap import dagger.multibindings.StringKey -import org.oppia.domain.classify.rules.ContinueRules -import org.oppia.domain.classify.rules.DragDropSortInputRules -import org.oppia.domain.classify.rules.FractionInputRules -import org.oppia.domain.classify.rules.ImageClickInputRules -import org.oppia.domain.classify.rules.ItemSelectionInputRules -import org.oppia.domain.classify.rules.MultipleChoiceInputRules -import org.oppia.domain.classify.rules.NumberWithUnitsRules -import org.oppia.domain.classify.rules.NumericInputRules -import org.oppia.domain.classify.rules.RatioExpressionInputRules -import org.oppia.domain.classify.rules.TextInputRules +import org.oppia.android.domain.classify.rules.ContinueRules +import org.oppia.android.domain.classify.rules.DragDropSortInputRules +import org.oppia.android.domain.classify.rules.FractionInputRules +import org.oppia.android.domain.classify.rules.ImageClickInputRules +import org.oppia.android.domain.classify.rules.ItemSelectionInputRules +import org.oppia.android.domain.classify.rules.MultipleChoiceInputRules +import org.oppia.android.domain.classify.rules.NumberWithUnitsRules +import org.oppia.android.domain.classify.rules.NumericInputRules +import org.oppia.android.domain.classify.rules.RatioExpressionInputRules +import org.oppia.android.domain.classify.rules.TextInputRules /** Module that provides a map of [InteractionClassifier]s. */ @Module diff --git a/domain/src/main/java/org/oppia/android/domain/classify/RuleClassifier.kt b/domain/src/main/java/org/oppia/android/domain/classify/RuleClassifier.kt index 729545db581..f308473634c 100644 --- a/domain/src/main/java/org/oppia/android/domain/classify/RuleClassifier.kt +++ b/domain/src/main/java/org/oppia/android/domain/classify/RuleClassifier.kt @@ -1,6 +1,6 @@ -package org.oppia.domain.classify +package org.oppia.android.domain.classify -import org.oppia.app.model.InteractionObject +import org.oppia.android.app.model.InteractionObject /** An answer classifier for a specific interaction rule. */ interface RuleClassifier { diff --git a/domain/src/main/java/org/oppia/android/domain/classify/rules/GenericRuleClassifier.kt b/domain/src/main/java/org/oppia/android/domain/classify/rules/GenericRuleClassifier.kt index 5e52607fac4..4e8a3fc545c 100644 --- a/domain/src/main/java/org/oppia/android/domain/classify/rules/GenericRuleClassifier.kt +++ b/domain/src/main/java/org/oppia/android/domain/classify/rules/GenericRuleClassifier.kt @@ -1,7 +1,7 @@ -package org.oppia.domain.classify.rules +package org.oppia.android.domain.classify.rules -import org.oppia.app.model.InteractionObject -import org.oppia.domain.classify.RuleClassifier +import org.oppia.android.app.model.InteractionObject +import org.oppia.android.domain.classify.RuleClassifier import javax.inject.Inject /** diff --git a/domain/src/main/java/org/oppia/android/domain/classify/rules/InteractionObjectTypeExtractorRepository.kt b/domain/src/main/java/org/oppia/android/domain/classify/rules/InteractionObjectTypeExtractorRepository.kt index dd60f82c52c..83cd6b97f26 100644 --- a/domain/src/main/java/org/oppia/android/domain/classify/rules/InteractionObjectTypeExtractorRepository.kt +++ b/domain/src/main/java/org/oppia/android/domain/classify/rules/InteractionObjectTypeExtractorRepository.kt @@ -1,7 +1,7 @@ -package org.oppia.domain.classify.rules +package org.oppia.android.domain.classify.rules -import org.oppia.app.model.InteractionObject -import org.oppia.app.model.InteractionObject.ObjectTypeCase +import org.oppia.android.app.model.InteractionObject +import org.oppia.android.app.model.InteractionObject.ObjectTypeCase import javax.inject.Inject import javax.inject.Singleton import kotlin.reflect.KClass diff --git a/domain/src/main/java/org/oppia/android/domain/classify/rules/RuleClassifierProvider.kt b/domain/src/main/java/org/oppia/android/domain/classify/rules/RuleClassifierProvider.kt index e73ac1d2920..f25e3dedd56 100644 --- a/domain/src/main/java/org/oppia/android/domain/classify/rules/RuleClassifierProvider.kt +++ b/domain/src/main/java/org/oppia/android/domain/classify/rules/RuleClassifierProvider.kt @@ -1,6 +1,6 @@ -package org.oppia.domain.classify.rules +package org.oppia.android.domain.classify.rules -import org.oppia.domain.classify.RuleClassifier +import org.oppia.android.domain.classify.RuleClassifier /** Provider for [RuleClassifier]s. */ interface RuleClassifierProvider { diff --git a/domain/src/main/java/org/oppia/android/domain/classify/rules/RuleQualifiers.kt b/domain/src/main/java/org/oppia/android/domain/classify/rules/RuleQualifiers.kt index 16096a14fbf..a868bd537f0 100644 --- a/domain/src/main/java/org/oppia/android/domain/classify/rules/RuleQualifiers.kt +++ b/domain/src/main/java/org/oppia/android/domain/classify/rules/RuleQualifiers.kt @@ -1,4 +1,4 @@ -package org.oppia.domain.classify.rules +package org.oppia.android.domain.classify.rules import javax.inject.Qualifier diff --git a/domain/src/main/java/org/oppia/android/domain/classify/rules/continueinteraction/ContinueModule.kt b/domain/src/main/java/org/oppia/android/domain/classify/rules/continueinteraction/ContinueModule.kt index 476d61ee448..bc36fe8f9f5 100644 --- a/domain/src/main/java/org/oppia/android/domain/classify/rules/continueinteraction/ContinueModule.kt +++ b/domain/src/main/java/org/oppia/android/domain/classify/rules/continueinteraction/ContinueModule.kt @@ -1,9 +1,9 @@ -package org.oppia.domain.classify.rules.continueinteraction +package org.oppia.android.domain.classify.rules.continueinteraction import dagger.Module import dagger.multibindings.Multibinds -import org.oppia.domain.classify.RuleClassifier -import org.oppia.domain.classify.rules.ContinueRules +import org.oppia.android.domain.classify.RuleClassifier +import org.oppia.android.domain.classify.rules.ContinueRules /** Module that binds rule classifiers corresponding to the continue interaction. */ @Module diff --git a/domain/src/main/java/org/oppia/android/domain/classify/rules/dragAndDropSortInput/DragDropSortInputHasElementXAtPositionYClassifierProvider.kt b/domain/src/main/java/org/oppia/android/domain/classify/rules/dragAndDropSortInput/DragDropSortInputHasElementXAtPositionYClassifierProvider.kt index 2804dcb15cb..a44bd6f0be8 100644 --- a/domain/src/main/java/org/oppia/android/domain/classify/rules/dragAndDropSortInput/DragDropSortInputHasElementXAtPositionYClassifierProvider.kt +++ b/domain/src/main/java/org/oppia/android/domain/classify/rules/dragAndDropSortInput/DragDropSortInputHasElementXAtPositionYClassifierProvider.kt @@ -1,10 +1,10 @@ -package org.oppia.domain.classify.rules.dragAndDropSortInput +package org.oppia.android.domain.classify.rules.dragAndDropSortInput -import org.oppia.app.model.InteractionObject -import org.oppia.app.model.ListOfSetsOfHtmlStrings -import org.oppia.domain.classify.RuleClassifier -import org.oppia.domain.classify.rules.GenericRuleClassifier -import org.oppia.domain.classify.rules.RuleClassifierProvider +import org.oppia.android.app.model.InteractionObject +import org.oppia.android.app.model.ListOfSetsOfHtmlStrings +import org.oppia.android.domain.classify.RuleClassifier +import org.oppia.android.domain.classify.rules.GenericRuleClassifier +import org.oppia.android.domain.classify.rules.RuleClassifierProvider import javax.inject.Inject /** diff --git a/domain/src/main/java/org/oppia/android/domain/classify/rules/dragAndDropSortInput/DragDropSortInputHasElementXBeforeElementYClassifierProvider.kt b/domain/src/main/java/org/oppia/android/domain/classify/rules/dragAndDropSortInput/DragDropSortInputHasElementXBeforeElementYClassifierProvider.kt index 4113c71c6f3..8ab6a761f70 100644 --- a/domain/src/main/java/org/oppia/android/domain/classify/rules/dragAndDropSortInput/DragDropSortInputHasElementXBeforeElementYClassifierProvider.kt +++ b/domain/src/main/java/org/oppia/android/domain/classify/rules/dragAndDropSortInput/DragDropSortInputHasElementXBeforeElementYClassifierProvider.kt @@ -1,10 +1,10 @@ -package org.oppia.domain.classify.rules.dragAndDropSortInput +package org.oppia.android.domain.classify.rules.dragAndDropSortInput -import org.oppia.app.model.InteractionObject -import org.oppia.app.model.ListOfSetsOfHtmlStrings -import org.oppia.domain.classify.RuleClassifier -import org.oppia.domain.classify.rules.GenericRuleClassifier -import org.oppia.domain.classify.rules.RuleClassifierProvider +import org.oppia.android.app.model.InteractionObject +import org.oppia.android.app.model.ListOfSetsOfHtmlStrings +import org.oppia.android.domain.classify.RuleClassifier +import org.oppia.android.domain.classify.rules.GenericRuleClassifier +import org.oppia.android.domain.classify.rules.RuleClassifierProvider import javax.inject.Inject /** diff --git a/domain/src/main/java/org/oppia/android/domain/classify/rules/dragAndDropSortInput/DragDropSortInputIsEqualToOrderingClassifierProvider.kt b/domain/src/main/java/org/oppia/android/domain/classify/rules/dragAndDropSortInput/DragDropSortInputIsEqualToOrderingClassifierProvider.kt index 8d701f5e7ce..33fc26fdb52 100644 --- a/domain/src/main/java/org/oppia/android/domain/classify/rules/dragAndDropSortInput/DragDropSortInputIsEqualToOrderingClassifierProvider.kt +++ b/domain/src/main/java/org/oppia/android/domain/classify/rules/dragAndDropSortInput/DragDropSortInputIsEqualToOrderingClassifierProvider.kt @@ -1,11 +1,11 @@ -package org.oppia.domain.classify.rules.dragAndDropSortInput +package org.oppia.android.domain.classify.rules.dragAndDropSortInput -import org.oppia.app.model.InteractionObject -import org.oppia.app.model.ListOfSetsOfHtmlStrings -import org.oppia.app.model.StringList -import org.oppia.domain.classify.RuleClassifier -import org.oppia.domain.classify.rules.GenericRuleClassifier -import org.oppia.domain.classify.rules.RuleClassifierProvider +import org.oppia.android.app.model.InteractionObject +import org.oppia.android.app.model.ListOfSetsOfHtmlStrings +import org.oppia.android.app.model.StringList +import org.oppia.android.domain.classify.RuleClassifier +import org.oppia.android.domain.classify.rules.GenericRuleClassifier +import org.oppia.android.domain.classify.rules.RuleClassifierProvider import javax.inject.Inject /** diff --git a/domain/src/main/java/org/oppia/android/domain/classify/rules/dragAndDropSortInput/DragDropSortInputIsEqualToOrderingWithOneItemAtIncorrectPositionClassifierProvider.kt b/domain/src/main/java/org/oppia/android/domain/classify/rules/dragAndDropSortInput/DragDropSortInputIsEqualToOrderingWithOneItemAtIncorrectPositionClassifierProvider.kt index e128443b014..4a2b7d27e6a 100644 --- a/domain/src/main/java/org/oppia/android/domain/classify/rules/dragAndDropSortInput/DragDropSortInputIsEqualToOrderingWithOneItemAtIncorrectPositionClassifierProvider.kt +++ b/domain/src/main/java/org/oppia/android/domain/classify/rules/dragAndDropSortInput/DragDropSortInputIsEqualToOrderingWithOneItemAtIncorrectPositionClassifierProvider.kt @@ -1,11 +1,11 @@ -package org.oppia.domain.classify.rules.dragAndDropSortInput +package org.oppia.android.domain.classify.rules.dragAndDropSortInput -import org.oppia.app.model.InteractionObject -import org.oppia.app.model.ListOfSetsOfHtmlStrings -import org.oppia.app.model.StringList -import org.oppia.domain.classify.RuleClassifier -import org.oppia.domain.classify.rules.GenericRuleClassifier -import org.oppia.domain.classify.rules.RuleClassifierProvider +import org.oppia.android.app.model.InteractionObject +import org.oppia.android.app.model.ListOfSetsOfHtmlStrings +import org.oppia.android.app.model.StringList +import org.oppia.android.domain.classify.RuleClassifier +import org.oppia.android.domain.classify.rules.GenericRuleClassifier +import org.oppia.android.domain.classify.rules.RuleClassifierProvider import javax.inject.Inject /** diff --git a/domain/src/main/java/org/oppia/android/domain/classify/rules/dragAndDropSortInput/DragDropSortInputModule.kt b/domain/src/main/java/org/oppia/android/domain/classify/rules/dragAndDropSortInput/DragDropSortInputModule.kt index 375363a8b85..e0d24d4fc2f 100644 --- a/domain/src/main/java/org/oppia/android/domain/classify/rules/dragAndDropSortInput/DragDropSortInputModule.kt +++ b/domain/src/main/java/org/oppia/android/domain/classify/rules/dragAndDropSortInput/DragDropSortInputModule.kt @@ -1,11 +1,11 @@ -package org.oppia.domain.classify.rules.dragAndDropSortInput +package org.oppia.android.domain.classify.rules.dragAndDropSortInput import dagger.Module import dagger.Provides import dagger.multibindings.IntoMap import dagger.multibindings.StringKey -import org.oppia.domain.classify.RuleClassifier -import org.oppia.domain.classify.rules.DragDropSortInputRules +import org.oppia.android.domain.classify.RuleClassifier +import org.oppia.android.domain.classify.rules.DragDropSortInputRules /** Module that binds rule classifiers corresponding to the drag drop sort input interaction. */ @Module diff --git a/domain/src/main/java/org/oppia/android/domain/classify/rules/fractioninput/FractionInputHasDenominatorEqualToRuleClassifierProvider.kt b/domain/src/main/java/org/oppia/android/domain/classify/rules/fractioninput/FractionInputHasDenominatorEqualToRuleClassifierProvider.kt index ae90443e72b..e64bff15038 100644 --- a/domain/src/main/java/org/oppia/android/domain/classify/rules/fractioninput/FractionInputHasDenominatorEqualToRuleClassifierProvider.kt +++ b/domain/src/main/java/org/oppia/android/domain/classify/rules/fractioninput/FractionInputHasDenominatorEqualToRuleClassifierProvider.kt @@ -1,10 +1,10 @@ -package org.oppia.domain.classify.rules.fractioninput +package org.oppia.android.domain.classify.rules.fractioninput -import org.oppia.app.model.Fraction -import org.oppia.app.model.InteractionObject -import org.oppia.domain.classify.RuleClassifier -import org.oppia.domain.classify.rules.GenericRuleClassifier -import org.oppia.domain.classify.rules.RuleClassifierProvider +import org.oppia.android.app.model.Fraction +import org.oppia.android.app.model.InteractionObject +import org.oppia.android.domain.classify.RuleClassifier +import org.oppia.android.domain.classify.rules.GenericRuleClassifier +import org.oppia.android.domain.classify.rules.RuleClassifierProvider import javax.inject.Inject /** diff --git a/domain/src/main/java/org/oppia/android/domain/classify/rules/fractioninput/FractionInputHasFractionalPartExactlyEqualToRuleClassifierProvider.kt b/domain/src/main/java/org/oppia/android/domain/classify/rules/fractioninput/FractionInputHasFractionalPartExactlyEqualToRuleClassifierProvider.kt index 4cfe65d605e..a9122923685 100644 --- a/domain/src/main/java/org/oppia/android/domain/classify/rules/fractioninput/FractionInputHasFractionalPartExactlyEqualToRuleClassifierProvider.kt +++ b/domain/src/main/java/org/oppia/android/domain/classify/rules/fractioninput/FractionInputHasFractionalPartExactlyEqualToRuleClassifierProvider.kt @@ -1,10 +1,10 @@ -package org.oppia.domain.classify.rules.fractioninput +package org.oppia.android.domain.classify.rules.fractioninput -import org.oppia.app.model.Fraction -import org.oppia.app.model.InteractionObject -import org.oppia.domain.classify.RuleClassifier -import org.oppia.domain.classify.rules.GenericRuleClassifier -import org.oppia.domain.classify.rules.RuleClassifierProvider +import org.oppia.android.app.model.Fraction +import org.oppia.android.app.model.InteractionObject +import org.oppia.android.domain.classify.RuleClassifier +import org.oppia.android.domain.classify.rules.GenericRuleClassifier +import org.oppia.android.domain.classify.rules.RuleClassifierProvider import javax.inject.Inject /** diff --git a/domain/src/main/java/org/oppia/android/domain/classify/rules/fractioninput/FractionInputHasIntegerPartEqualToRuleClassifierProvider.kt b/domain/src/main/java/org/oppia/android/domain/classify/rules/fractioninput/FractionInputHasIntegerPartEqualToRuleClassifierProvider.kt index 937d8423f56..aef3c7bdbc6 100644 --- a/domain/src/main/java/org/oppia/android/domain/classify/rules/fractioninput/FractionInputHasIntegerPartEqualToRuleClassifierProvider.kt +++ b/domain/src/main/java/org/oppia/android/domain/classify/rules/fractioninput/FractionInputHasIntegerPartEqualToRuleClassifierProvider.kt @@ -1,10 +1,10 @@ -package org.oppia.domain.classify.rules.fractioninput +package org.oppia.android.domain.classify.rules.fractioninput -import org.oppia.app.model.Fraction -import org.oppia.app.model.InteractionObject -import org.oppia.domain.classify.RuleClassifier -import org.oppia.domain.classify.rules.GenericRuleClassifier -import org.oppia.domain.classify.rules.RuleClassifierProvider +import org.oppia.android.app.model.Fraction +import org.oppia.android.app.model.InteractionObject +import org.oppia.android.domain.classify.RuleClassifier +import org.oppia.android.domain.classify.rules.GenericRuleClassifier +import org.oppia.android.domain.classify.rules.RuleClassifierProvider import javax.inject.Inject /** diff --git a/domain/src/main/java/org/oppia/android/domain/classify/rules/fractioninput/FractionInputHasNoFractionalPartRuleClassifierProvider.kt b/domain/src/main/java/org/oppia/android/domain/classify/rules/fractioninput/FractionInputHasNoFractionalPartRuleClassifierProvider.kt index 430a340012b..2711696ed13 100644 --- a/domain/src/main/java/org/oppia/android/domain/classify/rules/fractioninput/FractionInputHasNoFractionalPartRuleClassifierProvider.kt +++ b/domain/src/main/java/org/oppia/android/domain/classify/rules/fractioninput/FractionInputHasNoFractionalPartRuleClassifierProvider.kt @@ -1,10 +1,10 @@ -package org.oppia.domain.classify.rules.fractioninput +package org.oppia.android.domain.classify.rules.fractioninput -import org.oppia.app.model.Fraction -import org.oppia.app.model.InteractionObject -import org.oppia.domain.classify.RuleClassifier -import org.oppia.domain.classify.rules.GenericRuleClassifier -import org.oppia.domain.classify.rules.RuleClassifierProvider +import org.oppia.android.app.model.Fraction +import org.oppia.android.app.model.InteractionObject +import org.oppia.android.domain.classify.RuleClassifier +import org.oppia.android.domain.classify.rules.GenericRuleClassifier +import org.oppia.android.domain.classify.rules.RuleClassifierProvider import javax.inject.Inject /** diff --git a/domain/src/main/java/org/oppia/android/domain/classify/rules/fractioninput/FractionInputHasNumeratorEqualToRuleClassifierProvider.kt b/domain/src/main/java/org/oppia/android/domain/classify/rules/fractioninput/FractionInputHasNumeratorEqualToRuleClassifierProvider.kt index 7bd8ad212ca..475a17ea6da 100644 --- a/domain/src/main/java/org/oppia/android/domain/classify/rules/fractioninput/FractionInputHasNumeratorEqualToRuleClassifierProvider.kt +++ b/domain/src/main/java/org/oppia/android/domain/classify/rules/fractioninput/FractionInputHasNumeratorEqualToRuleClassifierProvider.kt @@ -1,10 +1,10 @@ -package org.oppia.domain.classify.rules.fractioninput +package org.oppia.android.domain.classify.rules.fractioninput -import org.oppia.app.model.Fraction -import org.oppia.app.model.InteractionObject -import org.oppia.domain.classify.RuleClassifier -import org.oppia.domain.classify.rules.GenericRuleClassifier -import org.oppia.domain.classify.rules.RuleClassifierProvider +import org.oppia.android.app.model.Fraction +import org.oppia.android.app.model.InteractionObject +import org.oppia.android.domain.classify.RuleClassifier +import org.oppia.android.domain.classify.rules.GenericRuleClassifier +import org.oppia.android.domain.classify.rules.RuleClassifierProvider import javax.inject.Inject /** diff --git a/domain/src/main/java/org/oppia/android/domain/classify/rules/fractioninput/FractionInputIsEquivalentToAndInSimplestFormRuleClassifierProvider.kt b/domain/src/main/java/org/oppia/android/domain/classify/rules/fractioninput/FractionInputIsEquivalentToAndInSimplestFormRuleClassifierProvider.kt index adb418e22ba..bffab3f96d6 100644 --- a/domain/src/main/java/org/oppia/android/domain/classify/rules/fractioninput/FractionInputIsEquivalentToAndInSimplestFormRuleClassifierProvider.kt +++ b/domain/src/main/java/org/oppia/android/domain/classify/rules/fractioninput/FractionInputIsEquivalentToAndInSimplestFormRuleClassifierProvider.kt @@ -1,13 +1,13 @@ -package org.oppia.domain.classify.rules.fractioninput +package org.oppia.android.domain.classify.rules.fractioninput -import org.oppia.app.model.Fraction -import org.oppia.app.model.InteractionObject -import org.oppia.domain.classify.RuleClassifier -import org.oppia.domain.classify.rules.GenericRuleClassifier -import org.oppia.domain.classify.rules.RuleClassifierProvider -import org.oppia.domain.util.approximatelyEquals -import org.oppia.domain.util.toFloat -import org.oppia.domain.util.toSimplestForm +import org.oppia.android.app.model.Fraction +import org.oppia.android.app.model.InteractionObject +import org.oppia.android.domain.classify.RuleClassifier +import org.oppia.android.domain.classify.rules.GenericRuleClassifier +import org.oppia.android.domain.classify.rules.RuleClassifierProvider +import org.oppia.android.domain.util.approximatelyEquals +import org.oppia.android.domain.util.toFloat +import org.oppia.android.domain.util.toSimplestForm import javax.inject.Inject /** diff --git a/domain/src/main/java/org/oppia/android/domain/classify/rules/fractioninput/FractionInputIsEquivalentToRuleClassifierProvider.kt b/domain/src/main/java/org/oppia/android/domain/classify/rules/fractioninput/FractionInputIsEquivalentToRuleClassifierProvider.kt index 88853185ccc..c3c2abbc51c 100644 --- a/domain/src/main/java/org/oppia/android/domain/classify/rules/fractioninput/FractionInputIsEquivalentToRuleClassifierProvider.kt +++ b/domain/src/main/java/org/oppia/android/domain/classify/rules/fractioninput/FractionInputIsEquivalentToRuleClassifierProvider.kt @@ -1,12 +1,12 @@ -package org.oppia.domain.classify.rules.fractioninput +package org.oppia.android.domain.classify.rules.fractioninput -import org.oppia.app.model.Fraction -import org.oppia.app.model.InteractionObject -import org.oppia.domain.classify.RuleClassifier -import org.oppia.domain.classify.rules.GenericRuleClassifier -import org.oppia.domain.classify.rules.RuleClassifierProvider -import org.oppia.domain.util.approximatelyEquals -import org.oppia.domain.util.toFloat +import org.oppia.android.app.model.Fraction +import org.oppia.android.app.model.InteractionObject +import org.oppia.android.domain.classify.RuleClassifier +import org.oppia.android.domain.classify.rules.GenericRuleClassifier +import org.oppia.android.domain.classify.rules.RuleClassifierProvider +import org.oppia.android.domain.util.approximatelyEquals +import org.oppia.android.domain.util.toFloat import javax.inject.Inject /** diff --git a/domain/src/main/java/org/oppia/android/domain/classify/rules/fractioninput/FractionInputIsExactlyEqualToRuleClassifierProvider.kt b/domain/src/main/java/org/oppia/android/domain/classify/rules/fractioninput/FractionInputIsExactlyEqualToRuleClassifierProvider.kt index eea7487901a..86f51fb2365 100644 --- a/domain/src/main/java/org/oppia/android/domain/classify/rules/fractioninput/FractionInputIsExactlyEqualToRuleClassifierProvider.kt +++ b/domain/src/main/java/org/oppia/android/domain/classify/rules/fractioninput/FractionInputIsExactlyEqualToRuleClassifierProvider.kt @@ -1,10 +1,10 @@ -package org.oppia.domain.classify.rules.fractioninput +package org.oppia.android.domain.classify.rules.fractioninput -import org.oppia.app.model.Fraction -import org.oppia.app.model.InteractionObject -import org.oppia.domain.classify.RuleClassifier -import org.oppia.domain.classify.rules.GenericRuleClassifier -import org.oppia.domain.classify.rules.RuleClassifierProvider +import org.oppia.android.app.model.Fraction +import org.oppia.android.app.model.InteractionObject +import org.oppia.android.domain.classify.RuleClassifier +import org.oppia.android.domain.classify.rules.GenericRuleClassifier +import org.oppia.android.domain.classify.rules.RuleClassifierProvider import javax.inject.Inject /** diff --git a/domain/src/main/java/org/oppia/android/domain/classify/rules/fractioninput/FractionInputIsGreaterThanRuleClassifierProvider.kt b/domain/src/main/java/org/oppia/android/domain/classify/rules/fractioninput/FractionInputIsGreaterThanRuleClassifierProvider.kt index f83ed38efed..f738189f27c 100644 --- a/domain/src/main/java/org/oppia/android/domain/classify/rules/fractioninput/FractionInputIsGreaterThanRuleClassifierProvider.kt +++ b/domain/src/main/java/org/oppia/android/domain/classify/rules/fractioninput/FractionInputIsGreaterThanRuleClassifierProvider.kt @@ -1,11 +1,11 @@ -package org.oppia.domain.classify.rules.fractioninput +package org.oppia.android.domain.classify.rules.fractioninput -import org.oppia.app.model.Fraction -import org.oppia.app.model.InteractionObject -import org.oppia.domain.classify.RuleClassifier -import org.oppia.domain.classify.rules.GenericRuleClassifier -import org.oppia.domain.classify.rules.RuleClassifierProvider -import org.oppia.domain.util.toFloat +import org.oppia.android.app.model.Fraction +import org.oppia.android.app.model.InteractionObject +import org.oppia.android.domain.classify.RuleClassifier +import org.oppia.android.domain.classify.rules.GenericRuleClassifier +import org.oppia.android.domain.classify.rules.RuleClassifierProvider +import org.oppia.android.domain.util.toFloat import javax.inject.Inject /** diff --git a/domain/src/main/java/org/oppia/android/domain/classify/rules/fractioninput/FractionInputIsLessThanRuleClassifierProvider.kt b/domain/src/main/java/org/oppia/android/domain/classify/rules/fractioninput/FractionInputIsLessThanRuleClassifierProvider.kt index 5671c13e029..c562efba493 100644 --- a/domain/src/main/java/org/oppia/android/domain/classify/rules/fractioninput/FractionInputIsLessThanRuleClassifierProvider.kt +++ b/domain/src/main/java/org/oppia/android/domain/classify/rules/fractioninput/FractionInputIsLessThanRuleClassifierProvider.kt @@ -1,11 +1,11 @@ -package org.oppia.domain.classify.rules.fractioninput +package org.oppia.android.domain.classify.rules.fractioninput -import org.oppia.app.model.Fraction -import org.oppia.app.model.InteractionObject -import org.oppia.domain.classify.RuleClassifier -import org.oppia.domain.classify.rules.GenericRuleClassifier -import org.oppia.domain.classify.rules.RuleClassifierProvider -import org.oppia.domain.util.toFloat +import org.oppia.android.app.model.Fraction +import org.oppia.android.app.model.InteractionObject +import org.oppia.android.domain.classify.RuleClassifier +import org.oppia.android.domain.classify.rules.GenericRuleClassifier +import org.oppia.android.domain.classify.rules.RuleClassifierProvider +import org.oppia.android.domain.util.toFloat import javax.inject.Inject /** diff --git a/domain/src/main/java/org/oppia/android/domain/classify/rules/fractioninput/FractionInputModule.kt b/domain/src/main/java/org/oppia/android/domain/classify/rules/fractioninput/FractionInputModule.kt index 3ef57b4be5c..51b5c5466c8 100644 --- a/domain/src/main/java/org/oppia/android/domain/classify/rules/fractioninput/FractionInputModule.kt +++ b/domain/src/main/java/org/oppia/android/domain/classify/rules/fractioninput/FractionInputModule.kt @@ -1,11 +1,11 @@ -package org.oppia.domain.classify.rules.fractioninput +package org.oppia.android.domain.classify.rules.fractioninput import dagger.Module import dagger.Provides import dagger.multibindings.IntoMap import dagger.multibindings.StringKey -import org.oppia.domain.classify.RuleClassifier -import org.oppia.domain.classify.rules.FractionInputRules +import org.oppia.android.domain.classify.RuleClassifier +import org.oppia.android.domain.classify.rules.FractionInputRules /** Module that binds rule classifiers corresponding to the fraction input interaction. */ @Module diff --git a/domain/src/main/java/org/oppia/android/domain/classify/rules/imageClickInput/ImageClickInputIsInRegionRuleClassifierProvider.kt b/domain/src/main/java/org/oppia/android/domain/classify/rules/imageClickInput/ImageClickInputIsInRegionRuleClassifierProvider.kt index 69b10733ed2..7112092eaf0 100644 --- a/domain/src/main/java/org/oppia/android/domain/classify/rules/imageClickInput/ImageClickInputIsInRegionRuleClassifierProvider.kt +++ b/domain/src/main/java/org/oppia/android/domain/classify/rules/imageClickInput/ImageClickInputIsInRegionRuleClassifierProvider.kt @@ -1,10 +1,10 @@ -package org.oppia.domain.classify.rules.imageClickInput +package org.oppia.android.domain.classify.rules.imageClickInput -import org.oppia.app.model.ClickOnImage -import org.oppia.app.model.InteractionObject -import org.oppia.domain.classify.RuleClassifier -import org.oppia.domain.classify.rules.GenericRuleClassifier -import org.oppia.domain.classify.rules.RuleClassifierProvider +import org.oppia.android.app.model.ClickOnImage +import org.oppia.android.app.model.InteractionObject +import org.oppia.android.domain.classify.RuleClassifier +import org.oppia.android.domain.classify.rules.GenericRuleClassifier +import org.oppia.android.domain.classify.rules.RuleClassifierProvider import javax.inject.Inject /** diff --git a/domain/src/main/java/org/oppia/android/domain/classify/rules/imageClickInput/ImageClickInputModule.kt b/domain/src/main/java/org/oppia/android/domain/classify/rules/imageClickInput/ImageClickInputModule.kt index e441b81fe8c..06692f30c75 100644 --- a/domain/src/main/java/org/oppia/android/domain/classify/rules/imageClickInput/ImageClickInputModule.kt +++ b/domain/src/main/java/org/oppia/android/domain/classify/rules/imageClickInput/ImageClickInputModule.kt @@ -1,11 +1,11 @@ -package org.oppia.domain.classify.rules.imageClickInput +package org.oppia.android.domain.classify.rules.imageClickInput import dagger.Module import dagger.Provides import dagger.multibindings.IntoMap import dagger.multibindings.StringKey -import org.oppia.domain.classify.RuleClassifier -import org.oppia.domain.classify.rules.ImageClickInputRules +import org.oppia.android.domain.classify.RuleClassifier +import org.oppia.android.domain.classify.rules.ImageClickInputRules /** Module that binds rule classifiers corresponding to the image click input interaction. */ @Module diff --git a/domain/src/main/java/org/oppia/android/domain/classify/rules/itemselectioninput/ItemSelectionInputContainsAtLeastOneOfRuleClassifierProvider.kt b/domain/src/main/java/org/oppia/android/domain/classify/rules/itemselectioninput/ItemSelectionInputContainsAtLeastOneOfRuleClassifierProvider.kt index 656782444be..37c034c5e5f 100644 --- a/domain/src/main/java/org/oppia/android/domain/classify/rules/itemselectioninput/ItemSelectionInputContainsAtLeastOneOfRuleClassifierProvider.kt +++ b/domain/src/main/java/org/oppia/android/domain/classify/rules/itemselectioninput/ItemSelectionInputContainsAtLeastOneOfRuleClassifierProvider.kt @@ -1,10 +1,10 @@ -package org.oppia.domain.classify.rules.itemselectioninput +package org.oppia.android.domain.classify.rules.itemselectioninput -import org.oppia.app.model.InteractionObject -import org.oppia.app.model.StringList -import org.oppia.domain.classify.RuleClassifier -import org.oppia.domain.classify.rules.GenericRuleClassifier -import org.oppia.domain.classify.rules.RuleClassifierProvider +import org.oppia.android.app.model.InteractionObject +import org.oppia.android.app.model.StringList +import org.oppia.android.domain.classify.RuleClassifier +import org.oppia.android.domain.classify.rules.GenericRuleClassifier +import org.oppia.android.domain.classify.rules.RuleClassifierProvider import javax.inject.Inject /** diff --git a/domain/src/main/java/org/oppia/android/domain/classify/rules/itemselectioninput/ItemSelectionInputDoesNotContainAtLeastOneOfRuleClassifierProvider.kt b/domain/src/main/java/org/oppia/android/domain/classify/rules/itemselectioninput/ItemSelectionInputDoesNotContainAtLeastOneOfRuleClassifierProvider.kt index a942e27033e..0b2ce625d99 100644 --- a/domain/src/main/java/org/oppia/android/domain/classify/rules/itemselectioninput/ItemSelectionInputDoesNotContainAtLeastOneOfRuleClassifierProvider.kt +++ b/domain/src/main/java/org/oppia/android/domain/classify/rules/itemselectioninput/ItemSelectionInputDoesNotContainAtLeastOneOfRuleClassifierProvider.kt @@ -1,10 +1,10 @@ -package org.oppia.domain.classify.rules.itemselectioninput +package org.oppia.android.domain.classify.rules.itemselectioninput -import org.oppia.app.model.InteractionObject -import org.oppia.app.model.StringList -import org.oppia.domain.classify.RuleClassifier -import org.oppia.domain.classify.rules.GenericRuleClassifier -import org.oppia.domain.classify.rules.RuleClassifierProvider +import org.oppia.android.app.model.InteractionObject +import org.oppia.android.app.model.StringList +import org.oppia.android.domain.classify.RuleClassifier +import org.oppia.android.domain.classify.rules.GenericRuleClassifier +import org.oppia.android.domain.classify.rules.RuleClassifierProvider import javax.inject.Inject /** diff --git a/domain/src/main/java/org/oppia/android/domain/classify/rules/itemselectioninput/ItemSelectionInputEqualsRuleClassifierProvider.kt b/domain/src/main/java/org/oppia/android/domain/classify/rules/itemselectioninput/ItemSelectionInputEqualsRuleClassifierProvider.kt index 4aa864388d9..fa9e574d998 100644 --- a/domain/src/main/java/org/oppia/android/domain/classify/rules/itemselectioninput/ItemSelectionInputEqualsRuleClassifierProvider.kt +++ b/domain/src/main/java/org/oppia/android/domain/classify/rules/itemselectioninput/ItemSelectionInputEqualsRuleClassifierProvider.kt @@ -1,10 +1,10 @@ -package org.oppia.domain.classify.rules.itemselectioninput +package org.oppia.android.domain.classify.rules.itemselectioninput -import org.oppia.app.model.InteractionObject -import org.oppia.app.model.StringList -import org.oppia.domain.classify.RuleClassifier -import org.oppia.domain.classify.rules.GenericRuleClassifier -import org.oppia.domain.classify.rules.RuleClassifierProvider +import org.oppia.android.app.model.InteractionObject +import org.oppia.android.app.model.StringList +import org.oppia.android.domain.classify.RuleClassifier +import org.oppia.android.domain.classify.rules.GenericRuleClassifier +import org.oppia.android.domain.classify.rules.RuleClassifierProvider import javax.inject.Inject /** diff --git a/domain/src/main/java/org/oppia/android/domain/classify/rules/itemselectioninput/ItemSelectionInputIsProperSubsetOfRuleClassifierProvider.kt b/domain/src/main/java/org/oppia/android/domain/classify/rules/itemselectioninput/ItemSelectionInputIsProperSubsetOfRuleClassifierProvider.kt index fa7e82af0e1..6e773b1ea7b 100644 --- a/domain/src/main/java/org/oppia/android/domain/classify/rules/itemselectioninput/ItemSelectionInputIsProperSubsetOfRuleClassifierProvider.kt +++ b/domain/src/main/java/org/oppia/android/domain/classify/rules/itemselectioninput/ItemSelectionInputIsProperSubsetOfRuleClassifierProvider.kt @@ -1,10 +1,10 @@ -package org.oppia.domain.classify.rules.itemselectioninput +package org.oppia.android.domain.classify.rules.itemselectioninput -import org.oppia.app.model.InteractionObject -import org.oppia.app.model.StringList -import org.oppia.domain.classify.RuleClassifier -import org.oppia.domain.classify.rules.GenericRuleClassifier -import org.oppia.domain.classify.rules.RuleClassifierProvider +import org.oppia.android.app.model.InteractionObject +import org.oppia.android.app.model.StringList +import org.oppia.android.domain.classify.RuleClassifier +import org.oppia.android.domain.classify.rules.GenericRuleClassifier +import org.oppia.android.domain.classify.rules.RuleClassifierProvider import javax.inject.Inject /** diff --git a/domain/src/main/java/org/oppia/android/domain/classify/rules/itemselectioninput/ItemSelectionInputModule.kt b/domain/src/main/java/org/oppia/android/domain/classify/rules/itemselectioninput/ItemSelectionInputModule.kt index 9b39da06b19..56c0cebb6bd 100644 --- a/domain/src/main/java/org/oppia/android/domain/classify/rules/itemselectioninput/ItemSelectionInputModule.kt +++ b/domain/src/main/java/org/oppia/android/domain/classify/rules/itemselectioninput/ItemSelectionInputModule.kt @@ -1,11 +1,11 @@ -package org.oppia.domain.classify.rules.itemselectioninput +package org.oppia.android.domain.classify.rules.itemselectioninput import dagger.Module import dagger.Provides import dagger.multibindings.IntoMap import dagger.multibindings.StringKey -import org.oppia.domain.classify.RuleClassifier -import org.oppia.domain.classify.rules.ItemSelectionInputRules +import org.oppia.android.domain.classify.RuleClassifier +import org.oppia.android.domain.classify.rules.ItemSelectionInputRules /** Module that binds rule classifiers corresponding to the item selection choice input interaction. */ @Module diff --git a/domain/src/main/java/org/oppia/android/domain/classify/rules/multiplechoiceinput/MultipleChoiceInputEqualsRuleClassifierProvider.kt b/domain/src/main/java/org/oppia/android/domain/classify/rules/multiplechoiceinput/MultipleChoiceInputEqualsRuleClassifierProvider.kt index 4ad16402482..c179cdac354 100644 --- a/domain/src/main/java/org/oppia/android/domain/classify/rules/multiplechoiceinput/MultipleChoiceInputEqualsRuleClassifierProvider.kt +++ b/domain/src/main/java/org/oppia/android/domain/classify/rules/multiplechoiceinput/MultipleChoiceInputEqualsRuleClassifierProvider.kt @@ -1,9 +1,9 @@ -package org.oppia.domain.classify.rules.multiplechoiceinput +package org.oppia.android.domain.classify.rules.multiplechoiceinput -import org.oppia.app.model.InteractionObject -import org.oppia.domain.classify.RuleClassifier -import org.oppia.domain.classify.rules.GenericRuleClassifier -import org.oppia.domain.classify.rules.RuleClassifierProvider +import org.oppia.android.app.model.InteractionObject +import org.oppia.android.domain.classify.RuleClassifier +import org.oppia.android.domain.classify.rules.GenericRuleClassifier +import org.oppia.android.domain.classify.rules.RuleClassifierProvider import javax.inject.Inject /** diff --git a/domain/src/main/java/org/oppia/android/domain/classify/rules/multiplechoiceinput/MultipleChoiceInputModule.kt b/domain/src/main/java/org/oppia/android/domain/classify/rules/multiplechoiceinput/MultipleChoiceInputModule.kt index ee6c0e22839..3e8f1e16d4b 100644 --- a/domain/src/main/java/org/oppia/android/domain/classify/rules/multiplechoiceinput/MultipleChoiceInputModule.kt +++ b/domain/src/main/java/org/oppia/android/domain/classify/rules/multiplechoiceinput/MultipleChoiceInputModule.kt @@ -1,11 +1,11 @@ -package org.oppia.domain.classify.rules.multiplechoiceinput +package org.oppia.android.domain.classify.rules.multiplechoiceinput import dagger.Module import dagger.Provides import dagger.multibindings.IntoMap import dagger.multibindings.StringKey -import org.oppia.domain.classify.RuleClassifier -import org.oppia.domain.classify.rules.MultipleChoiceInputRules +import org.oppia.android.domain.classify.RuleClassifier +import org.oppia.android.domain.classify.rules.MultipleChoiceInputRules /** Module that binds rule classifiers corresponding to the multiple choice input interaction. */ @Module diff --git a/domain/src/main/java/org/oppia/android/domain/classify/rules/numberwithunits/NumberWithUnitsIsEqualToRuleClassifierProvider.kt b/domain/src/main/java/org/oppia/android/domain/classify/rules/numberwithunits/NumberWithUnitsIsEqualToRuleClassifierProvider.kt index 477764d9d5a..4fa9de516df 100644 --- a/domain/src/main/java/org/oppia/android/domain/classify/rules/numberwithunits/NumberWithUnitsIsEqualToRuleClassifierProvider.kt +++ b/domain/src/main/java/org/oppia/android/domain/classify/rules/numberwithunits/NumberWithUnitsIsEqualToRuleClassifierProvider.kt @@ -1,12 +1,12 @@ -package org.oppia.domain.classify.rules.numberwithunits +package org.oppia.android.domain.classify.rules.numberwithunits -import org.oppia.app.model.Fraction -import org.oppia.app.model.InteractionObject -import org.oppia.app.model.NumberWithUnits -import org.oppia.domain.classify.RuleClassifier -import org.oppia.domain.classify.rules.GenericRuleClassifier -import org.oppia.domain.classify.rules.RuleClassifierProvider -import org.oppia.domain.util.approximatelyEquals +import org.oppia.android.app.model.Fraction +import org.oppia.android.app.model.InteractionObject +import org.oppia.android.app.model.NumberWithUnits +import org.oppia.android.domain.classify.RuleClassifier +import org.oppia.android.domain.classify.rules.GenericRuleClassifier +import org.oppia.android.domain.classify.rules.RuleClassifierProvider +import org.oppia.android.domain.util.approximatelyEquals import javax.inject.Inject /** diff --git a/domain/src/main/java/org/oppia/android/domain/classify/rules/numberwithunits/NumberWithUnitsIsEquivalentToRuleClassifierProvider.kt b/domain/src/main/java/org/oppia/android/domain/classify/rules/numberwithunits/NumberWithUnitsIsEquivalentToRuleClassifierProvider.kt index c53cdab84b4..c994c87ae99 100644 --- a/domain/src/main/java/org/oppia/android/domain/classify/rules/numberwithunits/NumberWithUnitsIsEquivalentToRuleClassifierProvider.kt +++ b/domain/src/main/java/org/oppia/android/domain/classify/rules/numberwithunits/NumberWithUnitsIsEquivalentToRuleClassifierProvider.kt @@ -1,12 +1,12 @@ -package org.oppia.domain.classify.rules.numberwithunits +package org.oppia.android.domain.classify.rules.numberwithunits -import org.oppia.app.model.InteractionObject -import org.oppia.app.model.NumberWithUnits -import org.oppia.domain.classify.RuleClassifier -import org.oppia.domain.classify.rules.GenericRuleClassifier -import org.oppia.domain.classify.rules.RuleClassifierProvider -import org.oppia.domain.util.approximatelyEquals -import org.oppia.domain.util.toFloat +import org.oppia.android.app.model.InteractionObject +import org.oppia.android.app.model.NumberWithUnits +import org.oppia.android.domain.classify.RuleClassifier +import org.oppia.android.domain.classify.rules.GenericRuleClassifier +import org.oppia.android.domain.classify.rules.RuleClassifierProvider +import org.oppia.android.domain.util.approximatelyEquals +import org.oppia.android.domain.util.toFloat import javax.inject.Inject /** diff --git a/domain/src/main/java/org/oppia/android/domain/classify/rules/numberwithunits/NumberWithUnitsRuleModule.kt b/domain/src/main/java/org/oppia/android/domain/classify/rules/numberwithunits/NumberWithUnitsRuleModule.kt index 076a57cf3f3..b3effdc29cb 100644 --- a/domain/src/main/java/org/oppia/android/domain/classify/rules/numberwithunits/NumberWithUnitsRuleModule.kt +++ b/domain/src/main/java/org/oppia/android/domain/classify/rules/numberwithunits/NumberWithUnitsRuleModule.kt @@ -1,11 +1,11 @@ -package org.oppia.domain.classify.rules.numberwithunits +package org.oppia.android.domain.classify.rules.numberwithunits import dagger.Module import dagger.Provides import dagger.multibindings.IntoMap import dagger.multibindings.StringKey -import org.oppia.domain.classify.RuleClassifier -import org.oppia.domain.classify.rules.NumberWithUnitsRules +import org.oppia.android.domain.classify.RuleClassifier +import org.oppia.android.domain.classify.rules.NumberWithUnitsRules /** Module that binds rule classifiers corresponding to the number with units interaction. */ @Module diff --git a/domain/src/main/java/org/oppia/android/domain/classify/rules/numericinput/NumericInputEqualsRuleClassifierProvider.kt b/domain/src/main/java/org/oppia/android/domain/classify/rules/numericinput/NumericInputEqualsRuleClassifierProvider.kt index 8267c03b863..df4dc9c591f 100644 --- a/domain/src/main/java/org/oppia/android/domain/classify/rules/numericinput/NumericInputEqualsRuleClassifierProvider.kt +++ b/domain/src/main/java/org/oppia/android/domain/classify/rules/numericinput/NumericInputEqualsRuleClassifierProvider.kt @@ -1,10 +1,10 @@ -package org.oppia.domain.classify.rules.numericinput +package org.oppia.android.domain.classify.rules.numericinput -import org.oppia.app.model.InteractionObject -import org.oppia.domain.classify.RuleClassifier -import org.oppia.domain.classify.rules.GenericRuleClassifier -import org.oppia.domain.classify.rules.RuleClassifierProvider -import org.oppia.domain.util.approximatelyEquals +import org.oppia.android.app.model.InteractionObject +import org.oppia.android.domain.classify.RuleClassifier +import org.oppia.android.domain.classify.rules.GenericRuleClassifier +import org.oppia.android.domain.classify.rules.RuleClassifierProvider +import org.oppia.android.domain.util.approximatelyEquals import javax.inject.Inject /** diff --git a/domain/src/main/java/org/oppia/android/domain/classify/rules/numericinput/NumericInputIsGreaterThanOrEqualToRuleClassifierProvider.kt b/domain/src/main/java/org/oppia/android/domain/classify/rules/numericinput/NumericInputIsGreaterThanOrEqualToRuleClassifierProvider.kt index 93e3a80228f..6416890a774 100644 --- a/domain/src/main/java/org/oppia/android/domain/classify/rules/numericinput/NumericInputIsGreaterThanOrEqualToRuleClassifierProvider.kt +++ b/domain/src/main/java/org/oppia/android/domain/classify/rules/numericinput/NumericInputIsGreaterThanOrEqualToRuleClassifierProvider.kt @@ -1,9 +1,9 @@ -package org.oppia.domain.classify.rules.numericinput +package org.oppia.android.domain.classify.rules.numericinput -import org.oppia.app.model.InteractionObject -import org.oppia.domain.classify.RuleClassifier -import org.oppia.domain.classify.rules.GenericRuleClassifier -import org.oppia.domain.classify.rules.RuleClassifierProvider +import org.oppia.android.app.model.InteractionObject +import org.oppia.android.domain.classify.RuleClassifier +import org.oppia.android.domain.classify.rules.GenericRuleClassifier +import org.oppia.android.domain.classify.rules.RuleClassifierProvider import javax.inject.Inject /** diff --git a/domain/src/main/java/org/oppia/android/domain/classify/rules/numericinput/NumericInputIsGreaterThanRuleClassifierProvider.kt b/domain/src/main/java/org/oppia/android/domain/classify/rules/numericinput/NumericInputIsGreaterThanRuleClassifierProvider.kt index 4c104f003c4..981f9064ae5 100644 --- a/domain/src/main/java/org/oppia/android/domain/classify/rules/numericinput/NumericInputIsGreaterThanRuleClassifierProvider.kt +++ b/domain/src/main/java/org/oppia/android/domain/classify/rules/numericinput/NumericInputIsGreaterThanRuleClassifierProvider.kt @@ -1,9 +1,9 @@ -package org.oppia.domain.classify.rules.numericinput +package org.oppia.android.domain.classify.rules.numericinput -import org.oppia.app.model.InteractionObject -import org.oppia.domain.classify.RuleClassifier -import org.oppia.domain.classify.rules.GenericRuleClassifier -import org.oppia.domain.classify.rules.RuleClassifierProvider +import org.oppia.android.app.model.InteractionObject +import org.oppia.android.domain.classify.RuleClassifier +import org.oppia.android.domain.classify.rules.GenericRuleClassifier +import org.oppia.android.domain.classify.rules.RuleClassifierProvider import javax.inject.Inject /** diff --git a/domain/src/main/java/org/oppia/android/domain/classify/rules/numericinput/NumericInputIsInclusivelyBetweenRuleClassifierProvider.kt b/domain/src/main/java/org/oppia/android/domain/classify/rules/numericinput/NumericInputIsInclusivelyBetweenRuleClassifierProvider.kt index 96d57c0a02c..6ceacb52ae8 100644 --- a/domain/src/main/java/org/oppia/android/domain/classify/rules/numericinput/NumericInputIsInclusivelyBetweenRuleClassifierProvider.kt +++ b/domain/src/main/java/org/oppia/android/domain/classify/rules/numericinput/NumericInputIsInclusivelyBetweenRuleClassifierProvider.kt @@ -1,9 +1,9 @@ -package org.oppia.domain.classify.rules.numericinput +package org.oppia.android.domain.classify.rules.numericinput -import org.oppia.app.model.InteractionObject -import org.oppia.domain.classify.RuleClassifier -import org.oppia.domain.classify.rules.GenericRuleClassifier -import org.oppia.domain.classify.rules.RuleClassifierProvider +import org.oppia.android.app.model.InteractionObject +import org.oppia.android.domain.classify.RuleClassifier +import org.oppia.android.domain.classify.rules.GenericRuleClassifier +import org.oppia.android.domain.classify.rules.RuleClassifierProvider import javax.inject.Inject /** diff --git a/domain/src/main/java/org/oppia/android/domain/classify/rules/numericinput/NumericInputIsLessThanOrEqualToRuleClassifierProvider.kt b/domain/src/main/java/org/oppia/android/domain/classify/rules/numericinput/NumericInputIsLessThanOrEqualToRuleClassifierProvider.kt index 359dab7a32b..5685ae912be 100644 --- a/domain/src/main/java/org/oppia/android/domain/classify/rules/numericinput/NumericInputIsLessThanOrEqualToRuleClassifierProvider.kt +++ b/domain/src/main/java/org/oppia/android/domain/classify/rules/numericinput/NumericInputIsLessThanOrEqualToRuleClassifierProvider.kt @@ -1,9 +1,9 @@ -package org.oppia.domain.classify.rules.numericinput +package org.oppia.android.domain.classify.rules.numericinput -import org.oppia.app.model.InteractionObject -import org.oppia.domain.classify.RuleClassifier -import org.oppia.domain.classify.rules.GenericRuleClassifier -import org.oppia.domain.classify.rules.RuleClassifierProvider +import org.oppia.android.app.model.InteractionObject +import org.oppia.android.domain.classify.RuleClassifier +import org.oppia.android.domain.classify.rules.GenericRuleClassifier +import org.oppia.android.domain.classify.rules.RuleClassifierProvider import javax.inject.Inject /** diff --git a/domain/src/main/java/org/oppia/android/domain/classify/rules/numericinput/NumericInputIsLessThanRuleClassifierProvider.kt b/domain/src/main/java/org/oppia/android/domain/classify/rules/numericinput/NumericInputIsLessThanRuleClassifierProvider.kt index 980e66a9eab..2d737b89b3a 100644 --- a/domain/src/main/java/org/oppia/android/domain/classify/rules/numericinput/NumericInputIsLessThanRuleClassifierProvider.kt +++ b/domain/src/main/java/org/oppia/android/domain/classify/rules/numericinput/NumericInputIsLessThanRuleClassifierProvider.kt @@ -1,9 +1,9 @@ -package org.oppia.domain.classify.rules.numericinput +package org.oppia.android.domain.classify.rules.numericinput -import org.oppia.app.model.InteractionObject -import org.oppia.domain.classify.RuleClassifier -import org.oppia.domain.classify.rules.GenericRuleClassifier -import org.oppia.domain.classify.rules.RuleClassifierProvider +import org.oppia.android.app.model.InteractionObject +import org.oppia.android.domain.classify.RuleClassifier +import org.oppia.android.domain.classify.rules.GenericRuleClassifier +import org.oppia.android.domain.classify.rules.RuleClassifierProvider import javax.inject.Inject /** diff --git a/domain/src/main/java/org/oppia/android/domain/classify/rules/numericinput/NumericInputIsWithinToleranceRuleClassifierProvider.kt b/domain/src/main/java/org/oppia/android/domain/classify/rules/numericinput/NumericInputIsWithinToleranceRuleClassifierProvider.kt index 8287e098c4c..2ee0f2d2584 100644 --- a/domain/src/main/java/org/oppia/android/domain/classify/rules/numericinput/NumericInputIsWithinToleranceRuleClassifierProvider.kt +++ b/domain/src/main/java/org/oppia/android/domain/classify/rules/numericinput/NumericInputIsWithinToleranceRuleClassifierProvider.kt @@ -1,9 +1,9 @@ -package org.oppia.domain.classify.rules.numericinput +package org.oppia.android.domain.classify.rules.numericinput -import org.oppia.app.model.InteractionObject -import org.oppia.domain.classify.RuleClassifier -import org.oppia.domain.classify.rules.GenericRuleClassifier -import org.oppia.domain.classify.rules.RuleClassifierProvider +import org.oppia.android.app.model.InteractionObject +import org.oppia.android.domain.classify.RuleClassifier +import org.oppia.android.domain.classify.rules.GenericRuleClassifier +import org.oppia.android.domain.classify.rules.RuleClassifierProvider import javax.inject.Inject /** diff --git a/domain/src/main/java/org/oppia/android/domain/classify/rules/numericinput/NumericInputRuleModule.kt b/domain/src/main/java/org/oppia/android/domain/classify/rules/numericinput/NumericInputRuleModule.kt index eb47261a5c0..ba3f9fa74aa 100644 --- a/domain/src/main/java/org/oppia/android/domain/classify/rules/numericinput/NumericInputRuleModule.kt +++ b/domain/src/main/java/org/oppia/android/domain/classify/rules/numericinput/NumericInputRuleModule.kt @@ -1,11 +1,11 @@ -package org.oppia.domain.classify.rules.numericinput +package org.oppia.android.domain.classify.rules.numericinput import dagger.Module import dagger.Provides import dagger.multibindings.IntoMap import dagger.multibindings.StringKey -import org.oppia.domain.classify.RuleClassifier -import org.oppia.domain.classify.rules.NumericInputRules +import org.oppia.android.domain.classify.RuleClassifier +import org.oppia.android.domain.classify.rules.NumericInputRules /** Module that binds rule classifiers corresponding to the numeric input interaction. */ @Module diff --git a/domain/src/main/java/org/oppia/android/domain/classify/rules/ratioinput/RatioInputEqualsRuleClassifierProvider.kt b/domain/src/main/java/org/oppia/android/domain/classify/rules/ratioinput/RatioInputEqualsRuleClassifierProvider.kt index f22881f24cf..e27bb871863 100644 --- a/domain/src/main/java/org/oppia/android/domain/classify/rules/ratioinput/RatioInputEqualsRuleClassifierProvider.kt +++ b/domain/src/main/java/org/oppia/android/domain/classify/rules/ratioinput/RatioInputEqualsRuleClassifierProvider.kt @@ -1,10 +1,10 @@ -package org.oppia.domain.classify.rules.ratioinput +package org.oppia.android.domain.classify.rules.ratioinput -import org.oppia.app.model.InteractionObject -import org.oppia.app.model.RatioExpression -import org.oppia.domain.classify.RuleClassifier -import org.oppia.domain.classify.rules.GenericRuleClassifier -import org.oppia.domain.classify.rules.RuleClassifierProvider +import org.oppia.android.app.model.InteractionObject +import org.oppia.android.app.model.RatioExpression +import org.oppia.android.domain.classify.RuleClassifier +import org.oppia.android.domain.classify.rules.GenericRuleClassifier +import org.oppia.android.domain.classify.rules.RuleClassifierProvider import javax.inject.Inject /** diff --git a/domain/src/main/java/org/oppia/android/domain/classify/rules/ratioinput/RatioInputHasNumberOfTermsEqualToClassifierProvider.kt b/domain/src/main/java/org/oppia/android/domain/classify/rules/ratioinput/RatioInputHasNumberOfTermsEqualToClassifierProvider.kt index 36624b5a1ed..e7428765bdf 100644 --- a/domain/src/main/java/org/oppia/android/domain/classify/rules/ratioinput/RatioInputHasNumberOfTermsEqualToClassifierProvider.kt +++ b/domain/src/main/java/org/oppia/android/domain/classify/rules/ratioinput/RatioInputHasNumberOfTermsEqualToClassifierProvider.kt @@ -1,10 +1,10 @@ -package org.oppia.domain.classify.rules.ratioinput +package org.oppia.android.domain.classify.rules.ratioinput -import org.oppia.app.model.InteractionObject -import org.oppia.app.model.RatioExpression -import org.oppia.domain.classify.RuleClassifier -import org.oppia.domain.classify.rules.GenericRuleClassifier -import org.oppia.domain.classify.rules.RuleClassifierProvider +import org.oppia.android.app.model.InteractionObject +import org.oppia.android.app.model.RatioExpression +import org.oppia.android.domain.classify.RuleClassifier +import org.oppia.android.domain.classify.rules.GenericRuleClassifier +import org.oppia.android.domain.classify.rules.RuleClassifierProvider import javax.inject.Inject /** diff --git a/domain/src/main/java/org/oppia/android/domain/classify/rules/ratioinput/RatioInputIsEquivalentRuleClassifierProvider.kt b/domain/src/main/java/org/oppia/android/domain/classify/rules/ratioinput/RatioInputIsEquivalentRuleClassifierProvider.kt index d431d7cc76f..2c6f24b7b52 100644 --- a/domain/src/main/java/org/oppia/android/domain/classify/rules/ratioinput/RatioInputIsEquivalentRuleClassifierProvider.kt +++ b/domain/src/main/java/org/oppia/android/domain/classify/rules/ratioinput/RatioInputIsEquivalentRuleClassifierProvider.kt @@ -1,11 +1,11 @@ -package org.oppia.domain.classify.rules.ratioinput +package org.oppia.android.domain.classify.rules.ratioinput -import org.oppia.app.model.InteractionObject -import org.oppia.app.model.RatioExpression -import org.oppia.domain.classify.RuleClassifier -import org.oppia.domain.classify.rules.GenericRuleClassifier -import org.oppia.domain.classify.rules.RuleClassifierProvider -import org.oppia.domain.util.toSimplestForm +import org.oppia.android.app.model.InteractionObject +import org.oppia.android.app.model.RatioExpression +import org.oppia.android.domain.classify.RuleClassifier +import org.oppia.android.domain.classify.rules.GenericRuleClassifier +import org.oppia.android.domain.classify.rules.RuleClassifierProvider +import org.oppia.android.domain.util.toSimplestForm import javax.inject.Inject /** diff --git a/domain/src/main/java/org/oppia/android/domain/classify/rules/ratioinput/RatioInputModule.kt b/domain/src/main/java/org/oppia/android/domain/classify/rules/ratioinput/RatioInputModule.kt index 4159ddc45a8..98419db8772 100644 --- a/domain/src/main/java/org/oppia/android/domain/classify/rules/ratioinput/RatioInputModule.kt +++ b/domain/src/main/java/org/oppia/android/domain/classify/rules/ratioinput/RatioInputModule.kt @@ -1,11 +1,11 @@ -package org.oppia.domain.classify.rules.ratioinput +package org.oppia.android.domain.classify.rules.ratioinput import dagger.Module import dagger.Provides import dagger.multibindings.IntoMap import dagger.multibindings.StringKey -import org.oppia.domain.classify.RuleClassifier -import org.oppia.domain.classify.rules.RatioExpressionInputRules +import org.oppia.android.domain.classify.RuleClassifier +import org.oppia.android.domain.classify.rules.RatioExpressionInputRules /** Module that binds rule classifiers corresponding to the ratio input interaction. */ @Module diff --git a/domain/src/main/java/org/oppia/android/domain/classify/rules/textinput/TextInputCaseSensitiveEqualsRuleClassifierProvider.kt b/domain/src/main/java/org/oppia/android/domain/classify/rules/textinput/TextInputCaseSensitiveEqualsRuleClassifierProvider.kt index 676ee5d5014..9ca72ec9cee 100644 --- a/domain/src/main/java/org/oppia/android/domain/classify/rules/textinput/TextInputCaseSensitiveEqualsRuleClassifierProvider.kt +++ b/domain/src/main/java/org/oppia/android/domain/classify/rules/textinput/TextInputCaseSensitiveEqualsRuleClassifierProvider.kt @@ -1,10 +1,10 @@ -package org.oppia.domain.classify.rules.textinput +package org.oppia.android.domain.classify.rules.textinput -import org.oppia.app.model.InteractionObject -import org.oppia.domain.classify.RuleClassifier -import org.oppia.domain.classify.rules.GenericRuleClassifier -import org.oppia.domain.classify.rules.RuleClassifierProvider -import org.oppia.domain.util.normalizeWhitespace +import org.oppia.android.app.model.InteractionObject +import org.oppia.android.domain.classify.RuleClassifier +import org.oppia.android.domain.classify.rules.GenericRuleClassifier +import org.oppia.android.domain.classify.rules.RuleClassifierProvider +import org.oppia.android.domain.util.normalizeWhitespace import javax.inject.Inject /** diff --git a/domain/src/main/java/org/oppia/android/domain/classify/rules/textinput/TextInputContainsRuleClassifierProvider.kt b/domain/src/main/java/org/oppia/android/domain/classify/rules/textinput/TextInputContainsRuleClassifierProvider.kt index c842ebc806b..3b7a09179d1 100644 --- a/domain/src/main/java/org/oppia/android/domain/classify/rules/textinput/TextInputContainsRuleClassifierProvider.kt +++ b/domain/src/main/java/org/oppia/android/domain/classify/rules/textinput/TextInputContainsRuleClassifierProvider.kt @@ -1,10 +1,10 @@ -package org.oppia.domain.classify.rules.textinput +package org.oppia.android.domain.classify.rules.textinput -import org.oppia.app.model.InteractionObject -import org.oppia.domain.classify.RuleClassifier -import org.oppia.domain.classify.rules.GenericRuleClassifier -import org.oppia.domain.classify.rules.RuleClassifierProvider -import org.oppia.domain.util.normalizeWhitespace +import org.oppia.android.app.model.InteractionObject +import org.oppia.android.domain.classify.RuleClassifier +import org.oppia.android.domain.classify.rules.GenericRuleClassifier +import org.oppia.android.domain.classify.rules.RuleClassifierProvider +import org.oppia.android.domain.util.normalizeWhitespace import javax.inject.Inject /** diff --git a/domain/src/main/java/org/oppia/android/domain/classify/rules/textinput/TextInputEqualsRuleClassifierProvider.kt b/domain/src/main/java/org/oppia/android/domain/classify/rules/textinput/TextInputEqualsRuleClassifierProvider.kt index 007b8c75a06..cd401205cde 100644 --- a/domain/src/main/java/org/oppia/android/domain/classify/rules/textinput/TextInputEqualsRuleClassifierProvider.kt +++ b/domain/src/main/java/org/oppia/android/domain/classify/rules/textinput/TextInputEqualsRuleClassifierProvider.kt @@ -1,10 +1,10 @@ -package org.oppia.domain.classify.rules.textinput +package org.oppia.android.domain.classify.rules.textinput -import org.oppia.app.model.InteractionObject -import org.oppia.domain.classify.RuleClassifier -import org.oppia.domain.classify.rules.GenericRuleClassifier -import org.oppia.domain.classify.rules.RuleClassifierProvider -import org.oppia.domain.util.normalizeWhitespace +import org.oppia.android.app.model.InteractionObject +import org.oppia.android.domain.classify.RuleClassifier +import org.oppia.android.domain.classify.rules.GenericRuleClassifier +import org.oppia.android.domain.classify.rules.RuleClassifierProvider +import org.oppia.android.domain.util.normalizeWhitespace import javax.inject.Inject /** diff --git a/domain/src/main/java/org/oppia/android/domain/classify/rules/textinput/TextInputFuzzyEqualsRuleClassifierProvider.kt b/domain/src/main/java/org/oppia/android/domain/classify/rules/textinput/TextInputFuzzyEqualsRuleClassifierProvider.kt index 8d3beddb3b4..8bd46fe57fa 100644 --- a/domain/src/main/java/org/oppia/android/domain/classify/rules/textinput/TextInputFuzzyEqualsRuleClassifierProvider.kt +++ b/domain/src/main/java/org/oppia/android/domain/classify/rules/textinput/TextInputFuzzyEqualsRuleClassifierProvider.kt @@ -1,10 +1,10 @@ -package org.oppia.domain.classify.rules.textinput +package org.oppia.android.domain.classify.rules.textinput -import org.oppia.app.model.InteractionObject -import org.oppia.domain.classify.RuleClassifier -import org.oppia.domain.classify.rules.GenericRuleClassifier -import org.oppia.domain.classify.rules.RuleClassifierProvider -import org.oppia.domain.util.normalizeWhitespace +import org.oppia.android.app.model.InteractionObject +import org.oppia.android.domain.classify.RuleClassifier +import org.oppia.android.domain.classify.rules.GenericRuleClassifier +import org.oppia.android.domain.classify.rules.RuleClassifierProvider +import org.oppia.android.domain.util.normalizeWhitespace import javax.inject.Inject /** diff --git a/domain/src/main/java/org/oppia/android/domain/classify/rules/textinput/TextInputRuleModule.kt b/domain/src/main/java/org/oppia/android/domain/classify/rules/textinput/TextInputRuleModule.kt index cfb9cd46cfa..44ed5fff32d 100644 --- a/domain/src/main/java/org/oppia/android/domain/classify/rules/textinput/TextInputRuleModule.kt +++ b/domain/src/main/java/org/oppia/android/domain/classify/rules/textinput/TextInputRuleModule.kt @@ -1,11 +1,11 @@ -package org.oppia.domain.classify.rules.textinput +package org.oppia.android.domain.classify.rules.textinput import dagger.Module import dagger.Provides import dagger.multibindings.IntoMap import dagger.multibindings.StringKey -import org.oppia.domain.classify.RuleClassifier -import org.oppia.domain.classify.rules.TextInputRules +import org.oppia.android.domain.classify.RuleClassifier +import org.oppia.android.domain.classify.rules.TextInputRules /** Module that binds rule classifiers corresponding to the text input interaction. */ @Module diff --git a/domain/src/main/java/org/oppia/android/domain/classify/rules/textinput/TextInputStartsWithRuleClassifierProvider.kt b/domain/src/main/java/org/oppia/android/domain/classify/rules/textinput/TextInputStartsWithRuleClassifierProvider.kt index 6d33a5d0d53..cae7de7e095 100644 --- a/domain/src/main/java/org/oppia/android/domain/classify/rules/textinput/TextInputStartsWithRuleClassifierProvider.kt +++ b/domain/src/main/java/org/oppia/android/domain/classify/rules/textinput/TextInputStartsWithRuleClassifierProvider.kt @@ -1,10 +1,10 @@ -package org.oppia.domain.classify.rules.textinput +package org.oppia.android.domain.classify.rules.textinput -import org.oppia.app.model.InteractionObject -import org.oppia.domain.classify.RuleClassifier -import org.oppia.domain.classify.rules.GenericRuleClassifier -import org.oppia.domain.classify.rules.RuleClassifierProvider -import org.oppia.domain.util.normalizeWhitespace +import org.oppia.android.app.model.InteractionObject +import org.oppia.android.domain.classify.RuleClassifier +import org.oppia.android.domain.classify.rules.GenericRuleClassifier +import org.oppia.android.domain.classify.rules.RuleClassifierProvider +import org.oppia.android.domain.util.normalizeWhitespace import javax.inject.Inject /** diff --git a/domain/src/main/java/org/oppia/android/domain/exploration/ExplorationDataController.kt b/domain/src/main/java/org/oppia/android/domain/exploration/ExplorationDataController.kt index 8d7ba97b9a8..bdc7049becf 100644 --- a/domain/src/main/java/org/oppia/android/domain/exploration/ExplorationDataController.kt +++ b/domain/src/main/java/org/oppia/android/domain/exploration/ExplorationDataController.kt @@ -1,12 +1,12 @@ -package org.oppia.domain.exploration +package org.oppia.android.domain.exploration import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData -import org.oppia.app.model.Exploration -import org.oppia.domain.oppialogger.exceptions.ExceptionsController -import org.oppia.util.data.AsyncResult -import org.oppia.util.data.DataProviders -import org.oppia.util.system.OppiaClock +import org.oppia.android.app.model.Exploration +import org.oppia.android.domain.oppialogger.exceptions.ExceptionsController +import org.oppia.android.util.data.AsyncResult +import org.oppia.android.util.data.DataProviders +import org.oppia.android.util.system.OppiaClock import javax.inject.Inject private const val EXPLORATION_DATA_PROVIDER_ID = "ExplorationDataProvider" diff --git a/domain/src/main/java/org/oppia/android/domain/exploration/ExplorationProgress.kt b/domain/src/main/java/org/oppia/android/domain/exploration/ExplorationProgress.kt index 80cdac6d420..152f2ff027c 100644 --- a/domain/src/main/java/org/oppia/android/domain/exploration/ExplorationProgress.kt +++ b/domain/src/main/java/org/oppia/android/domain/exploration/ExplorationProgress.kt @@ -1,9 +1,9 @@ -package org.oppia.domain.exploration +package org.oppia.android.domain.exploration -import org.oppia.app.model.Exploration -import org.oppia.app.model.State -import org.oppia.domain.state.StateDeck -import org.oppia.domain.state.StateGraph +import org.oppia.android.app.model.Exploration +import org.oppia.android.app.model.State +import org.oppia.android.domain.state.StateDeck +import org.oppia.android.domain.state.StateGraph // TODO(#186): Use an interaction repository to retrieve whether a specific ID corresponds to a terminal interaction. private const val TERMINAL_INTERACTION_ID = "EndExploration" diff --git a/domain/src/main/java/org/oppia/android/domain/exploration/ExplorationProgressController.kt b/domain/src/main/java/org/oppia/android/domain/exploration/ExplorationProgressController.kt index 5a00b8c3fb9..15e26052915 100644 --- a/domain/src/main/java/org/oppia/android/domain/exploration/ExplorationProgressController.kt +++ b/domain/src/main/java/org/oppia/android/domain/exploration/ExplorationProgressController.kt @@ -1,20 +1,20 @@ -package org.oppia.domain.exploration +package org.oppia.android.domain.exploration import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData -import org.oppia.app.model.AnswerOutcome -import org.oppia.app.model.EphemeralState -import org.oppia.app.model.Exploration -import org.oppia.app.model.Hint -import org.oppia.app.model.Solution -import org.oppia.app.model.State -import org.oppia.app.model.UserAnswer -import org.oppia.domain.classify.AnswerClassificationController -import org.oppia.domain.oppialogger.exceptions.ExceptionsController -import org.oppia.util.data.AsyncDataSubscriptionManager -import org.oppia.util.data.AsyncResult -import org.oppia.util.data.DataProviders -import org.oppia.util.system.OppiaClock +import org.oppia.android.app.model.AnswerOutcome +import org.oppia.android.app.model.EphemeralState +import org.oppia.android.app.model.Exploration +import org.oppia.android.app.model.Hint +import org.oppia.android.app.model.Solution +import org.oppia.android.app.model.State +import org.oppia.android.app.model.UserAnswer +import org.oppia.android.domain.classify.AnswerClassificationController +import org.oppia.android.domain.oppialogger.exceptions.ExceptionsController +import org.oppia.android.util.data.AsyncDataSubscriptionManager +import org.oppia.android.util.data.AsyncResult +import org.oppia.android.util.data.DataProviders +import org.oppia.android.util.system.OppiaClock import java.util.concurrent.locks.ReentrantLock import javax.inject.Inject import javax.inject.Singleton diff --git a/domain/src/main/java/org/oppia/android/domain/exploration/ExplorationRetriever.kt b/domain/src/main/java/org/oppia/android/domain/exploration/ExplorationRetriever.kt index 58a0829e3b6..5a124c10a5c 100644 --- a/domain/src/main/java/org/oppia/android/domain/exploration/ExplorationRetriever.kt +++ b/domain/src/main/java/org/oppia/android/domain/exploration/ExplorationRetriever.kt @@ -1,10 +1,10 @@ -package org.oppia.domain.exploration +package org.oppia.android.domain.exploration import org.json.JSONObject -import org.oppia.app.model.Exploration -import org.oppia.app.model.State -import org.oppia.domain.util.JsonAssetRetriever -import org.oppia.domain.util.StateRetriever +import org.oppia.android.app.model.Exploration +import org.oppia.android.app.model.State +import org.oppia.android.domain.util.JsonAssetRetriever +import org.oppia.android.domain.util.StateRetriever import javax.inject.Inject // TODO(#59): Make this class inaccessible outside of the domain package except for tests. UI code should not be allowed diff --git a/domain/src/main/java/org/oppia/android/domain/onboarding/AppStartupStateController.kt b/domain/src/main/java/org/oppia/android/domain/onboarding/AppStartupStateController.kt index c4936521fa9..e815cc4734f 100644 --- a/domain/src/main/java/org/oppia/android/domain/onboarding/AppStartupStateController.kt +++ b/domain/src/main/java/org/oppia/android/domain/onboarding/AppStartupStateController.kt @@ -1,13 +1,13 @@ -package org.oppia.domain.onboarding +package org.oppia.android.domain.onboarding import androidx.lifecycle.LiveData -import org.oppia.app.model.AppStartupState -import org.oppia.app.model.AppStartupState.StartupMode -import org.oppia.app.model.OnboardingState -import org.oppia.data.persistence.PersistentCacheStore -import org.oppia.util.data.AsyncResult -import org.oppia.util.data.DataProviders -import org.oppia.util.logging.ConsoleLogger +import org.oppia.android.app.model.AppStartupState +import org.oppia.android.app.model.AppStartupState.StartupMode +import org.oppia.android.app.model.OnboardingState +import org.oppia.android.data.persistence.PersistentCacheStore +import org.oppia.android.util.data.AsyncResult +import org.oppia.android.util.data.DataProviders +import org.oppia.android.util.logging.ConsoleLogger import java.text.ParseException import java.text.SimpleDateFormat import java.util.Date diff --git a/domain/src/main/java/org/oppia/android/domain/onboarding/ExpirationMetaDataRetriever.kt b/domain/src/main/java/org/oppia/android/domain/onboarding/ExpirationMetaDataRetriever.kt index 96fa1ce962f..83ec268cc56 100644 --- a/domain/src/main/java/org/oppia/android/domain/onboarding/ExpirationMetaDataRetriever.kt +++ b/domain/src/main/java/org/oppia/android/domain/onboarding/ExpirationMetaDataRetriever.kt @@ -1,4 +1,4 @@ -package org.oppia.domain.onboarding +package org.oppia.android.domain.onboarding import android.os.Bundle diff --git a/domain/src/main/java/org/oppia/android/domain/onboarding/ExpirationMetaDataRetrieverImpl.kt b/domain/src/main/java/org/oppia/android/domain/onboarding/ExpirationMetaDataRetrieverImpl.kt index 0f39944f938..0caa7cb1a57 100644 --- a/domain/src/main/java/org/oppia/android/domain/onboarding/ExpirationMetaDataRetrieverImpl.kt +++ b/domain/src/main/java/org/oppia/android/domain/onboarding/ExpirationMetaDataRetrieverImpl.kt @@ -1,4 +1,4 @@ -package org.oppia.domain.onboarding +package org.oppia.android.domain.onboarding import android.content.Context import android.content.pm.PackageManager diff --git a/domain/src/main/java/org/oppia/android/domain/onboarding/ExpirationMetaDataRetrieverModule.kt b/domain/src/main/java/org/oppia/android/domain/onboarding/ExpirationMetaDataRetrieverModule.kt index e1d8eb5b88c..57c509c9dbb 100644 --- a/domain/src/main/java/org/oppia/android/domain/onboarding/ExpirationMetaDataRetrieverModule.kt +++ b/domain/src/main/java/org/oppia/android/domain/onboarding/ExpirationMetaDataRetrieverModule.kt @@ -1,4 +1,4 @@ -package org.oppia.domain.onboarding +package org.oppia.android.domain.onboarding import dagger.Binds import dagger.Module diff --git a/domain/src/main/java/org/oppia/android/domain/onboarding/testing/ExpirationMetaDataRetrieverTestModule.kt b/domain/src/main/java/org/oppia/android/domain/onboarding/testing/ExpirationMetaDataRetrieverTestModule.kt index 6984c8fe7a4..dffdaa68164 100644 --- a/domain/src/main/java/org/oppia/android/domain/onboarding/testing/ExpirationMetaDataRetrieverTestModule.kt +++ b/domain/src/main/java/org/oppia/android/domain/onboarding/testing/ExpirationMetaDataRetrieverTestModule.kt @@ -1,8 +1,8 @@ -package org.oppia.domain.onboarding.testing +package org.oppia.android.domain.onboarding.testing import dagger.Binds import dagger.Module -import org.oppia.domain.onboarding.ExpirationMetaDataRetriever +import org.oppia.android.domain.onboarding.ExpirationMetaDataRetriever /** Module for providing a fake [ExpirationMetaDataRetriever] implementation. */ @Module diff --git a/domain/src/main/java/org/oppia/android/domain/onboarding/testing/FakeExpirationMetaDataRetriever.kt b/domain/src/main/java/org/oppia/android/domain/onboarding/testing/FakeExpirationMetaDataRetriever.kt index b32dec61a40..3cc47e10ebe 100644 --- a/domain/src/main/java/org/oppia/android/domain/onboarding/testing/FakeExpirationMetaDataRetriever.kt +++ b/domain/src/main/java/org/oppia/android/domain/onboarding/testing/FakeExpirationMetaDataRetriever.kt @@ -1,7 +1,7 @@ -package org.oppia.domain.onboarding.testing +package org.oppia.android.domain.onboarding.testing import android.os.Bundle -import org.oppia.domain.onboarding.ExpirationMetaDataRetriever +import org.oppia.android.domain.onboarding.ExpirationMetaDataRetriever import javax.inject.Inject import javax.inject.Singleton diff --git a/domain/src/main/java/org/oppia/android/domain/oppialogger/ApplicationStartupListener.kt b/domain/src/main/java/org/oppia/android/domain/oppialogger/ApplicationStartupListener.kt index a6ca1c8cf2a..1a0b2c91411 100644 --- a/domain/src/main/java/org/oppia/android/domain/oppialogger/ApplicationStartupListener.kt +++ b/domain/src/main/java/org/oppia/android/domain/oppialogger/ApplicationStartupListener.kt @@ -1,4 +1,4 @@ -package org.oppia.domain.oppialogger +package org.oppia.android.domain.oppialogger /** Listener that gets created at application startup. */ interface ApplicationStartupListener { diff --git a/domain/src/main/java/org/oppia/android/domain/oppialogger/LogStorageModule.kt b/domain/src/main/java/org/oppia/android/domain/oppialogger/LogStorageModule.kt index d96be530aae..558b4f84ce0 100644 --- a/domain/src/main/java/org/oppia/android/domain/oppialogger/LogStorageModule.kt +++ b/domain/src/main/java/org/oppia/android/domain/oppialogger/LogStorageModule.kt @@ -1,4 +1,4 @@ -package org.oppia.domain.oppialogger +package org.oppia.android.domain.oppialogger import dagger.Module import dagger.Provides diff --git a/domain/src/main/java/org/oppia/android/domain/oppialogger/OppiaLogger.kt b/domain/src/main/java/org/oppia/android/domain/oppialogger/OppiaLogger.kt index e7bdeda37bc..065a904ac09 100644 --- a/domain/src/main/java/org/oppia/android/domain/oppialogger/OppiaLogger.kt +++ b/domain/src/main/java/org/oppia/android/domain/oppialogger/OppiaLogger.kt @@ -1,8 +1,8 @@ -package org.oppia.domain.oppialogger +package org.oppia.android.domain.oppialogger -import org.oppia.app.model.EventLog -import org.oppia.app.model.EventLog.EventAction -import org.oppia.domain.oppialogger.analytics.AnalyticsController +import org.oppia.android.app.model.EventLog +import org.oppia.android.app.model.EventLog.EventAction +import org.oppia.android.domain.oppialogger.analytics.AnalyticsController import javax.inject.Inject /** Logger that handles event logging. */ diff --git a/domain/src/main/java/org/oppia/android/domain/oppialogger/analytics/AnalyticsController.kt b/domain/src/main/java/org/oppia/android/domain/oppialogger/analytics/AnalyticsController.kt index 1c5f5b10b61..c0fdabe8ede 100644 --- a/domain/src/main/java/org/oppia/android/domain/oppialogger/analytics/AnalyticsController.kt +++ b/domain/src/main/java/org/oppia/android/domain/oppialogger/analytics/AnalyticsController.kt @@ -1,19 +1,19 @@ -package org.oppia.domain.oppialogger.analytics +package org.oppia.android.domain.oppialogger.analytics import androidx.lifecycle.LiveData -import org.oppia.app.model.EventLog -import org.oppia.app.model.EventLog.EventAction -import org.oppia.app.model.EventLog.Priority -import org.oppia.app.model.OppiaEventLogs -import org.oppia.data.persistence.PersistentCacheStore -import org.oppia.domain.oppialogger.EventLogStorageCacheSize -import org.oppia.util.data.AsyncResult -import org.oppia.util.data.DataProviders -import org.oppia.util.logging.ConsoleLogger -import org.oppia.util.logging.EventLogger -import org.oppia.util.logging.ExceptionLogger -import org.oppia.util.networking.NetworkConnectionUtil -import org.oppia.util.networking.NetworkConnectionUtil.ConnectionStatus.NONE +import org.oppia.android.app.model.EventLog +import org.oppia.android.app.model.EventLog.EventAction +import org.oppia.android.app.model.EventLog.Priority +import org.oppia.android.app.model.OppiaEventLogs +import org.oppia.android.data.persistence.PersistentCacheStore +import org.oppia.android.domain.oppialogger.EventLogStorageCacheSize +import org.oppia.android.util.data.AsyncResult +import org.oppia.android.util.data.DataProviders +import org.oppia.android.util.logging.ConsoleLogger +import org.oppia.android.util.logging.EventLogger +import org.oppia.android.util.logging.ExceptionLogger +import org.oppia.android.util.networking.NetworkConnectionUtil +import org.oppia.android.util.networking.NetworkConnectionUtil.ConnectionStatus.NONE import javax.inject.Inject /** Controller for handling analytics event logging. diff --git a/domain/src/main/java/org/oppia/android/domain/oppialogger/exceptions/ExceptionsController.kt b/domain/src/main/java/org/oppia/android/domain/oppialogger/exceptions/ExceptionsController.kt index 6d6a0068399..8615778fc56 100644 --- a/domain/src/main/java/org/oppia/android/domain/oppialogger/exceptions/ExceptionsController.kt +++ b/domain/src/main/java/org/oppia/android/domain/oppialogger/exceptions/ExceptionsController.kt @@ -1,15 +1,15 @@ -package org.oppia.domain.oppialogger.exceptions +package org.oppia.android.domain.oppialogger.exceptions import androidx.lifecycle.LiveData -import org.oppia.app.model.ExceptionLog -import org.oppia.app.model.ExceptionLog.ExceptionType -import org.oppia.app.model.OppiaExceptionLogs -import org.oppia.data.persistence.PersistentCacheStore -import org.oppia.domain.oppialogger.ExceptionLogStorageCacheSize -import org.oppia.util.data.DataProvider -import org.oppia.util.logging.ConsoleLogger -import org.oppia.util.logging.ExceptionLogger -import org.oppia.util.networking.NetworkConnectionUtil +import org.oppia.android.app.model.ExceptionLog +import org.oppia.android.app.model.ExceptionLog.ExceptionType +import org.oppia.android.app.model.OppiaExceptionLogs +import org.oppia.android.data.persistence.PersistentCacheStore +import org.oppia.android.domain.oppialogger.ExceptionLogStorageCacheSize +import org.oppia.android.util.data.DataProvider +import org.oppia.android.util.logging.ConsoleLogger +import org.oppia.android.util.logging.ExceptionLogger +import org.oppia.android.util.networking.NetworkConnectionUtil import javax.inject.Inject private const val EXCEPTIONS_CONTROLLER = "Exceptions Controller" @@ -97,7 +97,7 @@ class ExceptionsController @Inject constructor( stackTraceElement: StackTraceElement ): ExceptionLog.StackTraceElement { return ExceptionLog.StackTraceElement.newBuilder() - .setFileName(stackTraceElement.fileName) + .setFileName(stackTraceElement.fileName ?: "") // Sometimes the file name is unavailable. .setMethodName(stackTraceElement.methodName) .setLineNumber(stackTraceElement.lineNumber) .setDeclaringClass(stackTraceElement.className) diff --git a/domain/src/main/java/org/oppia/android/domain/oppialogger/exceptions/UncaughtExceptionLoggerModule.kt b/domain/src/main/java/org/oppia/android/domain/oppialogger/exceptions/UncaughtExceptionLoggerModule.kt index de0f59ee7e8..dacf51c29fe 100644 --- a/domain/src/main/java/org/oppia/android/domain/oppialogger/exceptions/UncaughtExceptionLoggerModule.kt +++ b/domain/src/main/java/org/oppia/android/domain/oppialogger/exceptions/UncaughtExceptionLoggerModule.kt @@ -1,9 +1,9 @@ -package org.oppia.domain.oppialogger.exceptions +package org.oppia.android.domain.oppialogger.exceptions import dagger.Binds import dagger.Module import dagger.multibindings.IntoSet -import org.oppia.domain.oppialogger.ApplicationStartupListener +import org.oppia.android.domain.oppialogger.ApplicationStartupListener /** Binds [UncaughtExceptionLoggerStartupListener] as an [ApplicationStartupListener] */ @Module diff --git a/domain/src/main/java/org/oppia/android/domain/oppialogger/exceptions/UncaughtExceptionLoggerStartupListener.kt b/domain/src/main/java/org/oppia/android/domain/oppialogger/exceptions/UncaughtExceptionLoggerStartupListener.kt index 4fadf8abf1f..818e6f379c3 100644 --- a/domain/src/main/java/org/oppia/android/domain/oppialogger/exceptions/UncaughtExceptionLoggerStartupListener.kt +++ b/domain/src/main/java/org/oppia/android/domain/oppialogger/exceptions/UncaughtExceptionLoggerStartupListener.kt @@ -1,8 +1,8 @@ -package org.oppia.domain.oppialogger.exceptions +package org.oppia.android.domain.oppialogger.exceptions -import org.oppia.domain.oppialogger.ApplicationStartupListener -import org.oppia.util.logging.ConsoleLogger -import org.oppia.util.system.OppiaClock +import org.oppia.android.domain.oppialogger.ApplicationStartupListener +import org.oppia.android.util.logging.ConsoleLogger +import org.oppia.android.util.system.OppiaClock import javax.inject.Inject /** Handler for catching fatal exceptions before the defaultUncaughtExceptionHandler. */ diff --git a/domain/src/main/java/org/oppia/android/domain/profile/ProfileManagementController.kt b/domain/src/main/java/org/oppia/android/domain/profile/ProfileManagementController.kt index 82123769101..e9c671b80d8 100644 --- a/domain/src/main/java/org/oppia/android/domain/profile/ProfileManagementController.kt +++ b/domain/src/main/java/org/oppia/android/domain/profile/ProfileManagementController.kt @@ -1,4 +1,4 @@ -package org.oppia.domain.profile +package org.oppia.android.domain.profile import android.content.Context import android.graphics.Bitmap @@ -10,22 +10,22 @@ import androidx.exifinterface.media.ExifInterface import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import kotlinx.coroutines.Deferred -import org.oppia.app.model.AppLanguage -import org.oppia.app.model.AudioLanguage -import org.oppia.app.model.DeviceSettings -import org.oppia.app.model.Profile -import org.oppia.app.model.ProfileAvatar -import org.oppia.app.model.ProfileDatabase -import org.oppia.app.model.ProfileId -import org.oppia.app.model.ReadingTextSize -import org.oppia.data.persistence.PersistentCacheStore -import org.oppia.domain.oppialogger.exceptions.ExceptionsController -import org.oppia.util.data.AsyncResult -import org.oppia.util.data.DataProvider -import org.oppia.util.data.DataProviders -import org.oppia.util.logging.ConsoleLogger -import org.oppia.util.profile.DirectoryManagementUtil -import org.oppia.util.system.OppiaClock +import org.oppia.android.app.model.AppLanguage +import org.oppia.android.app.model.AudioLanguage +import org.oppia.android.app.model.DeviceSettings +import org.oppia.android.app.model.Profile +import org.oppia.android.app.model.ProfileAvatar +import org.oppia.android.app.model.ProfileDatabase +import org.oppia.android.app.model.ProfileId +import org.oppia.android.app.model.ReadingTextSize +import org.oppia.android.data.persistence.PersistentCacheStore +import org.oppia.android.domain.oppialogger.exceptions.ExceptionsController +import org.oppia.android.util.data.AsyncResult +import org.oppia.android.util.data.DataProvider +import org.oppia.android.util.data.DataProviders +import org.oppia.android.util.logging.ConsoleLogger +import org.oppia.android.util.profile.DirectoryManagementUtil +import org.oppia.android.util.system.OppiaClock import java.io.File import java.io.FileOutputStream import java.util.Date diff --git a/domain/src/main/java/org/oppia/android/domain/question/QuestionAssessmentProgress.kt b/domain/src/main/java/org/oppia/android/domain/question/QuestionAssessmentProgress.kt index f25b36b5a6d..f254f04c8b9 100644 --- a/domain/src/main/java/org/oppia/android/domain/question/QuestionAssessmentProgress.kt +++ b/domain/src/main/java/org/oppia/android/domain/question/QuestionAssessmentProgress.kt @@ -1,9 +1,9 @@ -package org.oppia.domain.question +package org.oppia.android.domain.question -import org.oppia.app.model.Question -import org.oppia.app.model.State -import org.oppia.domain.state.StateDeck -import org.oppia.domain.state.StateList +import org.oppia.android.app.model.Question +import org.oppia.android.app.model.State +import org.oppia.android.domain.state.StateDeck +import org.oppia.android.domain.state.StateList /** * Private class that encapsulates the mutable state of a question progress controller. This class is not thread-safe, diff --git a/domain/src/main/java/org/oppia/android/domain/question/QuestionAssessmentProgressController.kt b/domain/src/main/java/org/oppia/android/domain/question/QuestionAssessmentProgressController.kt index 4ce6dfe0830..950f47322c8 100644 --- a/domain/src/main/java/org/oppia/android/domain/question/QuestionAssessmentProgressController.kt +++ b/domain/src/main/java/org/oppia/android/domain/question/QuestionAssessmentProgressController.kt @@ -1,23 +1,23 @@ -package org.oppia.domain.question +package org.oppia.android.domain.question import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData -import org.oppia.app.model.AnsweredQuestionOutcome -import org.oppia.app.model.EphemeralQuestion -import org.oppia.app.model.Hint -import org.oppia.app.model.Question -import org.oppia.app.model.Solution -import org.oppia.app.model.State -import org.oppia.app.model.UserAnswer -import org.oppia.domain.classify.AnswerClassificationController -import org.oppia.domain.oppialogger.exceptions.ExceptionsController -import org.oppia.domain.question.QuestionAssessmentProgress.TrainStage -import org.oppia.util.data.AsyncDataSubscriptionManager -import org.oppia.util.data.AsyncResult -import org.oppia.util.data.DataProvider -import org.oppia.util.data.DataProviders -import org.oppia.util.data.DataProviders.NestedTransformedDataProvider -import org.oppia.util.system.OppiaClock +import org.oppia.android.app.model.AnsweredQuestionOutcome +import org.oppia.android.app.model.EphemeralQuestion +import org.oppia.android.app.model.Hint +import org.oppia.android.app.model.Question +import org.oppia.android.app.model.Solution +import org.oppia.android.app.model.State +import org.oppia.android.app.model.UserAnswer +import org.oppia.android.domain.classify.AnswerClassificationController +import org.oppia.android.domain.oppialogger.exceptions.ExceptionsController +import org.oppia.android.domain.question.QuestionAssessmentProgress.TrainStage +import org.oppia.android.util.data.AsyncDataSubscriptionManager +import org.oppia.android.util.data.AsyncResult +import org.oppia.android.util.data.DataProvider +import org.oppia.android.util.data.DataProviders +import org.oppia.android.util.data.DataProviders.NestedTransformedDataProvider +import org.oppia.android.util.system.OppiaClock import java.util.concurrent.locks.ReentrantLock import javax.inject.Inject import javax.inject.Singleton diff --git a/domain/src/main/java/org/oppia/android/domain/question/QuestionConstantsProvider.kt b/domain/src/main/java/org/oppia/android/domain/question/QuestionConstantsProvider.kt index bb05d27bf24..72a50b492c6 100644 --- a/domain/src/main/java/org/oppia/android/domain/question/QuestionConstantsProvider.kt +++ b/domain/src/main/java/org/oppia/android/domain/question/QuestionConstantsProvider.kt @@ -1,4 +1,4 @@ -package org.oppia.domain.question +package org.oppia.android.domain.question import dagger.Module import dagger.Provides diff --git a/domain/src/main/java/org/oppia/android/domain/question/QuestionRetriever.kt b/domain/src/main/java/org/oppia/android/domain/question/QuestionRetriever.kt index 7d6b89b68e8..c65cbb8f427 100644 --- a/domain/src/main/java/org/oppia/android/domain/question/QuestionRetriever.kt +++ b/domain/src/main/java/org/oppia/android/domain/question/QuestionRetriever.kt @@ -1,9 +1,9 @@ -package org.oppia.domain.question +package org.oppia.android.domain.question import org.json.JSONObject -import org.oppia.app.model.Question -import org.oppia.domain.util.JsonAssetRetriever -import org.oppia.domain.util.StateRetriever +import org.oppia.android.app.model.Question +import org.oppia.android.domain.util.JsonAssetRetriever +import org.oppia.android.domain.util.StateRetriever import javax.inject.Inject // TODO(#1580): Restrict access using Bazel visibilities. diff --git a/domain/src/main/java/org/oppia/android/domain/question/QuestionTrainingConstantsProvider.kt b/domain/src/main/java/org/oppia/android/domain/question/QuestionTrainingConstantsProvider.kt index 6d5cbd865ae..764afc39cfa 100644 --- a/domain/src/main/java/org/oppia/android/domain/question/QuestionTrainingConstantsProvider.kt +++ b/domain/src/main/java/org/oppia/android/domain/question/QuestionTrainingConstantsProvider.kt @@ -1,4 +1,4 @@ -package org.oppia.domain.question +package org.oppia.android.domain.question import javax.inject.Inject import javax.inject.Singleton diff --git a/domain/src/main/java/org/oppia/android/domain/question/QuestionTrainingController.kt b/domain/src/main/java/org/oppia/android/domain/question/QuestionTrainingController.kt index 0f17361dc22..895839598a2 100644 --- a/domain/src/main/java/org/oppia/android/domain/question/QuestionTrainingController.kt +++ b/domain/src/main/java/org/oppia/android/domain/question/QuestionTrainingController.kt @@ -1,14 +1,14 @@ -package org.oppia.domain.question +package org.oppia.android.domain.question import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData -import org.oppia.app.model.Question -import org.oppia.domain.oppialogger.exceptions.ExceptionsController -import org.oppia.domain.topic.TopicController -import org.oppia.util.data.AsyncResult -import org.oppia.util.data.DataProvider -import org.oppia.util.data.DataProviders -import org.oppia.util.system.OppiaClock +import org.oppia.android.app.model.Question +import org.oppia.android.domain.oppialogger.exceptions.ExceptionsController +import org.oppia.android.domain.topic.TopicController +import org.oppia.android.util.data.AsyncResult +import org.oppia.android.util.data.DataProvider +import org.oppia.android.util.data.DataProviders +import org.oppia.android.util.system.OppiaClock import javax.inject.Inject import javax.inject.Singleton import kotlin.random.Random diff --git a/domain/src/main/java/org/oppia/android/domain/state/StateDeck.kt b/domain/src/main/java/org/oppia/android/domain/state/StateDeck.kt index 6b00d99be6c..029f26d1de0 100644 --- a/domain/src/main/java/org/oppia/android/domain/state/StateDeck.kt +++ b/domain/src/main/java/org/oppia/android/domain/state/StateDeck.kt @@ -1,14 +1,14 @@ -package org.oppia.domain.state - -import org.oppia.app.model.AnswerAndResponse -import org.oppia.app.model.CompletedState -import org.oppia.app.model.EphemeralState -import org.oppia.app.model.Hint -import org.oppia.app.model.PendingState -import org.oppia.app.model.Solution -import org.oppia.app.model.State -import org.oppia.app.model.SubtitledHtml -import org.oppia.app.model.UserAnswer +package org.oppia.android.domain.state + +import org.oppia.android.app.model.AnswerAndResponse +import org.oppia.android.app.model.CompletedState +import org.oppia.android.app.model.EphemeralState +import org.oppia.android.app.model.Hint +import org.oppia.android.app.model.PendingState +import org.oppia.android.app.model.Solution +import org.oppia.android.app.model.State +import org.oppia.android.app.model.SubtitledHtml +import org.oppia.android.app.model.UserAnswer // TODO(#59): Hide the visibility of this class to domain implementations. diff --git a/domain/src/main/java/org/oppia/android/domain/state/StateGraph.kt b/domain/src/main/java/org/oppia/android/domain/state/StateGraph.kt index 3a3ffa8abd8..29f8e9a3753 100644 --- a/domain/src/main/java/org/oppia/android/domain/state/StateGraph.kt +++ b/domain/src/main/java/org/oppia/android/domain/state/StateGraph.kt @@ -1,10 +1,10 @@ -package org.oppia.domain.state +package org.oppia.android.domain.state -import org.oppia.app.model.AnswerOutcome -import org.oppia.app.model.Hint -import org.oppia.app.model.Outcome -import org.oppia.app.model.Solution -import org.oppia.app.model.State +import org.oppia.android.app.model.AnswerOutcome +import org.oppia.android.app.model.Hint +import org.oppia.android.app.model.Outcome +import org.oppia.android.app.model.Solution +import org.oppia.android.app.model.State /** * Graph that provides lookup access for [State]s and functionality for processing the outcome of a submitted learner diff --git a/domain/src/main/java/org/oppia/android/domain/state/StateList.kt b/domain/src/main/java/org/oppia/android/domain/state/StateList.kt index 2fc5eb7aaaf..ef618bed21c 100644 --- a/domain/src/main/java/org/oppia/android/domain/state/StateList.kt +++ b/domain/src/main/java/org/oppia/android/domain/state/StateList.kt @@ -1,11 +1,11 @@ -package org.oppia.domain.state +package org.oppia.android.domain.state -import org.oppia.app.model.AnsweredQuestionOutcome -import org.oppia.app.model.Hint -import org.oppia.app.model.Outcome -import org.oppia.app.model.Question -import org.oppia.app.model.Solution -import org.oppia.app.model.State +import org.oppia.android.app.model.AnsweredQuestionOutcome +import org.oppia.android.app.model.Hint +import org.oppia.android.app.model.Outcome +import org.oppia.android.app.model.Question +import org.oppia.android.app.model.Solution +import org.oppia.android.app.model.State /** * List that provides lookup access for [State]s based on a list of [Question]s and functionality for processing the diff --git a/domain/src/main/java/org/oppia/android/domain/topic/ConceptCardRetriever.kt b/domain/src/main/java/org/oppia/android/domain/topic/ConceptCardRetriever.kt index 3e2c4947cdb..d6f953e8ee2 100644 --- a/domain/src/main/java/org/oppia/android/domain/topic/ConceptCardRetriever.kt +++ b/domain/src/main/java/org/oppia/android/domain/topic/ConceptCardRetriever.kt @@ -1,14 +1,14 @@ -package org.oppia.domain.topic +package org.oppia.android.domain.topic import org.json.JSONArray import org.json.JSONObject -import org.oppia.app.model.ConceptCard -import org.oppia.app.model.SubtitledHtml -import org.oppia.app.model.Translation -import org.oppia.app.model.TranslationMapping -import org.oppia.app.model.Voiceover -import org.oppia.app.model.VoiceoverMapping -import org.oppia.domain.util.JsonAssetRetriever +import org.oppia.android.app.model.ConceptCard +import org.oppia.android.app.model.SubtitledHtml +import org.oppia.android.app.model.Translation +import org.oppia.android.app.model.TranslationMapping +import org.oppia.android.app.model.Voiceover +import org.oppia.android.app.model.VoiceoverMapping +import org.oppia.android.domain.util.JsonAssetRetriever import javax.inject.Inject // TODO(#1580): Restrict access using Bazel visibilities. diff --git a/domain/src/main/java/org/oppia/android/domain/topic/PrimeTopicAssetsController.kt b/domain/src/main/java/org/oppia/android/domain/topic/PrimeTopicAssetsController.kt index ddb1a178068..ae12645932c 100644 --- a/domain/src/main/java/org/oppia/android/domain/topic/PrimeTopicAssetsController.kt +++ b/domain/src/main/java/org/oppia/android/domain/topic/PrimeTopicAssetsController.kt @@ -1,10 +1,10 @@ -package org.oppia.domain.topic +package org.oppia.android.domain.topic // TODO(#169): Remove this controller & download priming once downloads are properly supported. /** * Controller for conditionally pre-priming assets to enable full download support. Whether - * downloading is enabled is gated by the [org.oppia.util.caching.CacheAssetsLocally] annotation. + * downloading is enabled is gated by the [org.oppia.android.util.caching.CacheAssetsLocally] annotation. */ interface PrimeTopicAssetsController { /** diff --git a/domain/src/main/java/org/oppia/android/domain/topic/PrimeTopicAssetsControllerImpl.kt b/domain/src/main/java/org/oppia/android/domain/topic/PrimeTopicAssetsControllerImpl.kt index 978498f14e3..c4b248041f4 100644 --- a/domain/src/main/java/org/oppia/android/domain/topic/PrimeTopicAssetsControllerImpl.kt +++ b/domain/src/main/java/org/oppia/android/domain/topic/PrimeTopicAssetsControllerImpl.kt @@ -1,4 +1,4 @@ -package org.oppia.domain.topic +package org.oppia.android.domain.topic import android.annotation.SuppressLint import android.app.Activity @@ -22,39 +22,39 @@ import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.asCoroutineDispatcher import kotlinx.coroutines.async import kotlinx.coroutines.launch -import org.oppia.app.model.AnswerGroup -import org.oppia.app.model.ChapterSummary -import org.oppia.app.model.ConceptCard -import org.oppia.app.model.Exploration -import org.oppia.app.model.Hint -import org.oppia.app.model.Interaction -import org.oppia.app.model.Outcome -import org.oppia.app.model.Question -import org.oppia.app.model.RevisionCard -import org.oppia.app.model.SchemaObject -import org.oppia.app.model.SchemaObject.ObjectTypeCase.SUBTITLED_HTML -import org.oppia.app.model.SchemaObjectList -import org.oppia.app.model.Solution -import org.oppia.app.model.State -import org.oppia.app.model.StorySummary -import org.oppia.app.model.SubtitledHtml -import org.oppia.app.model.Subtopic -import org.oppia.app.model.Topic -import org.oppia.domain.exploration.ExplorationRetriever -import org.oppia.domain.question.QuestionRetriever -import org.oppia.domain.util.JsonAssetRetriever -import org.oppia.util.caching.AssetRepository -import org.oppia.util.caching.TopicListToCache -import org.oppia.util.gcsresource.DefaultResourceBucketName -import org.oppia.util.gcsresource.QuestionResourceBucketName -import org.oppia.util.logging.ConsoleLogger -import org.oppia.util.parser.ConceptCardHtmlParserEntityType -import org.oppia.util.parser.DefaultGcsPrefix -import org.oppia.util.parser.ExplorationHtmlParserEntityType -import org.oppia.util.parser.ImageDownloadUrlTemplate -import org.oppia.util.parser.StoryHtmlParserEntityType -import org.oppia.util.parser.ThumbnailDownloadUrlTemplate -import org.oppia.util.parser.TopicHtmlParserEntityType +import org.oppia.android.app.model.AnswerGroup +import org.oppia.android.app.model.ChapterSummary +import org.oppia.android.app.model.ConceptCard +import org.oppia.android.app.model.Exploration +import org.oppia.android.app.model.Hint +import org.oppia.android.app.model.Interaction +import org.oppia.android.app.model.Outcome +import org.oppia.android.app.model.Question +import org.oppia.android.app.model.RevisionCard +import org.oppia.android.app.model.SchemaObject +import org.oppia.android.app.model.SchemaObject.ObjectTypeCase.SUBTITLED_HTML +import org.oppia.android.app.model.SchemaObjectList +import org.oppia.android.app.model.Solution +import org.oppia.android.app.model.State +import org.oppia.android.app.model.StorySummary +import org.oppia.android.app.model.SubtitledHtml +import org.oppia.android.app.model.Subtopic +import org.oppia.android.app.model.Topic +import org.oppia.android.domain.exploration.ExplorationRetriever +import org.oppia.android.domain.question.QuestionRetriever +import org.oppia.android.domain.util.JsonAssetRetriever +import org.oppia.android.util.caching.AssetRepository +import org.oppia.android.util.caching.TopicListToCache +import org.oppia.android.util.gcsresource.DefaultResourceBucketName +import org.oppia.android.util.gcsresource.QuestionResourceBucketName +import org.oppia.android.util.logging.ConsoleLogger +import org.oppia.android.util.parser.ConceptCardHtmlParserEntityType +import org.oppia.android.util.parser.DefaultGcsPrefix +import org.oppia.android.util.parser.ExplorationHtmlParserEntityType +import org.oppia.android.util.parser.ImageDownloadUrlTemplate +import org.oppia.android.util.parser.StoryHtmlParserEntityType +import org.oppia.android.util.parser.ThumbnailDownloadUrlTemplate +import org.oppia.android.util.parser.TopicHtmlParserEntityType import java.util.concurrent.Executors import java.util.concurrent.atomic.AtomicBoolean import java.util.concurrent.atomic.AtomicInteger diff --git a/domain/src/main/java/org/oppia/android/domain/topic/PrimeTopicAssetsControllerModule.kt b/domain/src/main/java/org/oppia/android/domain/topic/PrimeTopicAssetsControllerModule.kt index 223c68ac0b4..c815aca413a 100644 --- a/domain/src/main/java/org/oppia/android/domain/topic/PrimeTopicAssetsControllerModule.kt +++ b/domain/src/main/java/org/oppia/android/domain/topic/PrimeTopicAssetsControllerModule.kt @@ -1,8 +1,8 @@ -package org.oppia.domain.topic +package org.oppia.android.domain.topic import dagger.Module import dagger.Provides -import org.oppia.util.caching.CacheAssetsLocally +import org.oppia.android.util.caching.CacheAssetsLocally import javax.inject.Provider /** diff --git a/domain/src/main/java/org/oppia/android/domain/topic/RevisionCardRetriever.kt b/domain/src/main/java/org/oppia/android/domain/topic/RevisionCardRetriever.kt index 24ec3510955..15a7027823d 100644 --- a/domain/src/main/java/org/oppia/android/domain/topic/RevisionCardRetriever.kt +++ b/domain/src/main/java/org/oppia/android/domain/topic/RevisionCardRetriever.kt @@ -1,8 +1,8 @@ -package org.oppia.domain.topic +package org.oppia.android.domain.topic -import org.oppia.app.model.RevisionCard -import org.oppia.app.model.SubtitledHtml -import org.oppia.domain.util.JsonAssetRetriever +import org.oppia.android.app.model.RevisionCard +import org.oppia.android.app.model.SubtitledHtml +import org.oppia.android.domain.util.JsonAssetRetriever import javax.inject.Inject // TODO(#1580): Restrict access using Bazel visibilities. diff --git a/domain/src/main/java/org/oppia/android/domain/topic/StoryProgressController.kt b/domain/src/main/java/org/oppia/android/domain/topic/StoryProgressController.kt index 1781b2adb9d..49c38d3c2f5 100644 --- a/domain/src/main/java/org/oppia/android/domain/topic/StoryProgressController.kt +++ b/domain/src/main/java/org/oppia/android/domain/topic/StoryProgressController.kt @@ -1,18 +1,18 @@ -package org.oppia.domain.topic +package org.oppia.android.domain.topic import androidx.lifecycle.LiveData import kotlinx.coroutines.Deferred -import org.oppia.app.model.ChapterPlayState -import org.oppia.app.model.ChapterProgress -import org.oppia.app.model.ProfileId -import org.oppia.app.model.StoryProgress -import org.oppia.app.model.TopicProgress -import org.oppia.app.model.TopicProgressDatabase -import org.oppia.data.persistence.PersistentCacheStore -import org.oppia.util.data.AsyncResult -import org.oppia.util.data.DataProvider -import org.oppia.util.data.DataProviders -import org.oppia.util.logging.ConsoleLogger +import org.oppia.android.app.model.ChapterPlayState +import org.oppia.android.app.model.ChapterProgress +import org.oppia.android.app.model.ProfileId +import org.oppia.android.app.model.StoryProgress +import org.oppia.android.app.model.TopicProgress +import org.oppia.android.app.model.TopicProgressDatabase +import org.oppia.android.data.persistence.PersistentCacheStore +import org.oppia.android.util.data.AsyncResult +import org.oppia.android.util.data.DataProvider +import org.oppia.android.util.data.DataProviders +import org.oppia.android.util.logging.ConsoleLogger import javax.inject.Inject import javax.inject.Singleton diff --git a/domain/src/main/java/org/oppia/android/domain/topic/StoryProgressTestHelper.kt b/domain/src/main/java/org/oppia/android/domain/topic/StoryProgressTestHelper.kt index f88b5aeae4c..bae93039f53 100644 --- a/domain/src/main/java/org/oppia/android/domain/topic/StoryProgressTestHelper.kt +++ b/domain/src/main/java/org/oppia/android/domain/topic/StoryProgressTestHelper.kt @@ -1,6 +1,6 @@ -package org.oppia.domain.topic +package org.oppia.android.domain.topic -import org.oppia.app.model.ProfileId +import org.oppia.android.app.model.ProfileId import java.util.Date import javax.inject.Inject diff --git a/domain/src/main/java/org/oppia/android/domain/topic/TopicController.kt b/domain/src/main/java/org/oppia/android/domain/topic/TopicController.kt index 502b28b3531..705238e0a41 100755 --- a/domain/src/main/java/org/oppia/android/domain/topic/TopicController.kt +++ b/domain/src/main/java/org/oppia/android/domain/topic/TopicController.kt @@ -1,34 +1,34 @@ -package org.oppia.domain.topic +package org.oppia.android.domain.topic import android.graphics.Color import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import org.json.JSONArray import org.json.JSONObject -import org.oppia.app.model.ChapterPlayState -import org.oppia.app.model.ChapterProgress -import org.oppia.app.model.ChapterSummary -import org.oppia.app.model.CompletedStory -import org.oppia.app.model.CompletedStoryList -import org.oppia.app.model.ConceptCard -import org.oppia.app.model.LessonThumbnail -import org.oppia.app.model.LessonThumbnailGraphic -import org.oppia.app.model.OngoingTopicList -import org.oppia.app.model.ProfileId -import org.oppia.app.model.Question -import org.oppia.app.model.RevisionCard -import org.oppia.app.model.StoryProgress -import org.oppia.app.model.StorySummary -import org.oppia.app.model.Subtopic -import org.oppia.app.model.Topic -import org.oppia.app.model.TopicProgress -import org.oppia.domain.oppialogger.exceptions.ExceptionsController -import org.oppia.domain.question.QuestionRetriever -import org.oppia.domain.util.JsonAssetRetriever -import org.oppia.util.data.AsyncResult -import org.oppia.util.data.DataProvider -import org.oppia.util.data.DataProviders -import org.oppia.util.system.OppiaClock +import org.oppia.android.app.model.ChapterPlayState +import org.oppia.android.app.model.ChapterProgress +import org.oppia.android.app.model.ChapterSummary +import org.oppia.android.app.model.CompletedStory +import org.oppia.android.app.model.CompletedStoryList +import org.oppia.android.app.model.ConceptCard +import org.oppia.android.app.model.LessonThumbnail +import org.oppia.android.app.model.LessonThumbnailGraphic +import org.oppia.android.app.model.OngoingTopicList +import org.oppia.android.app.model.ProfileId +import org.oppia.android.app.model.Question +import org.oppia.android.app.model.RevisionCard +import org.oppia.android.app.model.StoryProgress +import org.oppia.android.app.model.StorySummary +import org.oppia.android.app.model.Subtopic +import org.oppia.android.app.model.Topic +import org.oppia.android.app.model.TopicProgress +import org.oppia.android.domain.oppialogger.exceptions.ExceptionsController +import org.oppia.android.domain.question.QuestionRetriever +import org.oppia.android.domain.util.JsonAssetRetriever +import org.oppia.android.util.data.AsyncResult +import org.oppia.android.util.data.DataProvider +import org.oppia.android.util.data.DataProviders +import org.oppia.android.util.system.OppiaClock import javax.inject.Inject import javax.inject.Singleton diff --git a/domain/src/main/java/org/oppia/android/domain/topic/TopicListController.kt b/domain/src/main/java/org/oppia/android/domain/topic/TopicListController.kt index 785ec846623..5b93ff2ba2d 100644 --- a/domain/src/main/java/org/oppia/android/domain/topic/TopicListController.kt +++ b/domain/src/main/java/org/oppia/android/domain/topic/TopicListController.kt @@ -1,24 +1,24 @@ -package org.oppia.domain.topic +package org.oppia.android.domain.topic import android.graphics.Color import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import org.json.JSONObject -import org.oppia.app.model.ChapterPlayState -import org.oppia.app.model.ChapterProgress -import org.oppia.app.model.ChapterSummary -import org.oppia.app.model.LessonThumbnail -import org.oppia.app.model.LessonThumbnailGraphic -import org.oppia.app.model.OngoingStoryList -import org.oppia.app.model.ProfileId -import org.oppia.app.model.PromotedStory -import org.oppia.app.model.Topic -import org.oppia.app.model.TopicList -import org.oppia.app.model.TopicProgress -import org.oppia.app.model.TopicSummary -import org.oppia.domain.util.JsonAssetRetriever -import org.oppia.util.data.AsyncResult -import org.oppia.util.data.DataProviders +import org.oppia.android.app.model.ChapterPlayState +import org.oppia.android.app.model.ChapterProgress +import org.oppia.android.app.model.ChapterSummary +import org.oppia.android.app.model.LessonThumbnail +import org.oppia.android.app.model.LessonThumbnailGraphic +import org.oppia.android.app.model.OngoingStoryList +import org.oppia.android.app.model.ProfileId +import org.oppia.android.app.model.PromotedStory +import org.oppia.android.app.model.Topic +import org.oppia.android.app.model.TopicList +import org.oppia.android.app.model.TopicProgress +import org.oppia.android.app.model.TopicSummary +import org.oppia.android.domain.util.JsonAssetRetriever +import org.oppia.android.util.data.AsyncResult +import org.oppia.android.util.data.DataProviders import java.util.Date import java.util.concurrent.TimeUnit import javax.inject.Inject diff --git a/domain/src/main/java/org/oppia/android/domain/util/FloatExtensions.kt b/domain/src/main/java/org/oppia/android/domain/util/FloatExtensions.kt index 4cf7d05fbbd..5ce8d4b0c10 100644 --- a/domain/src/main/java/org/oppia/android/domain/util/FloatExtensions.kt +++ b/domain/src/main/java/org/oppia/android/domain/util/FloatExtensions.kt @@ -1,4 +1,4 @@ -package org.oppia.domain.util +package org.oppia.android.domain.util import kotlin.math.abs diff --git a/domain/src/main/java/org/oppia/android/domain/util/FractionExtensions.kt b/domain/src/main/java/org/oppia/android/domain/util/FractionExtensions.kt index 546a955b114..878576da012 100644 --- a/domain/src/main/java/org/oppia/android/domain/util/FractionExtensions.kt +++ b/domain/src/main/java/org/oppia/android/domain/util/FractionExtensions.kt @@ -1,6 +1,6 @@ -package org.oppia.domain.util +package org.oppia.android.domain.util -import org.oppia.app.model.Fraction +import org.oppia.android.app.model.Fraction /** * Returns a float version of this fraction. diff --git a/domain/src/main/java/org/oppia/android/domain/util/InteractionObjectExtensions.kt b/domain/src/main/java/org/oppia/android/domain/util/InteractionObjectExtensions.kt index 4a318bc19df..3088363ce2e 100644 --- a/domain/src/main/java/org/oppia/android/domain/util/InteractionObjectExtensions.kt +++ b/domain/src/main/java/org/oppia/android/domain/util/InteractionObjectExtensions.kt @@ -1,26 +1,26 @@ -package org.oppia.domain.util +package org.oppia.android.domain.util -import org.oppia.app.model.ClickOnImage -import org.oppia.app.model.Fraction -import org.oppia.app.model.ImageWithRegions -import org.oppia.app.model.InteractionObject -import org.oppia.app.model.InteractionObject.ObjectTypeCase.BOOL_VALUE -import org.oppia.app.model.InteractionObject.ObjectTypeCase.CLICK_ON_IMAGE -import org.oppia.app.model.InteractionObject.ObjectTypeCase.FRACTION -import org.oppia.app.model.InteractionObject.ObjectTypeCase.IMAGE_WITH_REGIONS -import org.oppia.app.model.InteractionObject.ObjectTypeCase.LIST_OF_SETS_OF_HTML_STRING -import org.oppia.app.model.InteractionObject.ObjectTypeCase.NON_NEGATIVE_INT -import org.oppia.app.model.InteractionObject.ObjectTypeCase.NORMALIZED_STRING -import org.oppia.app.model.InteractionObject.ObjectTypeCase.NUMBER_WITH_UNITS -import org.oppia.app.model.InteractionObject.ObjectTypeCase.OBJECTTYPE_NOT_SET -import org.oppia.app.model.InteractionObject.ObjectTypeCase.RATIO_EXPRESSION -import org.oppia.app.model.InteractionObject.ObjectTypeCase.REAL -import org.oppia.app.model.InteractionObject.ObjectTypeCase.SET_OF_HTML_STRING -import org.oppia.app.model.InteractionObject.ObjectTypeCase.SIGNED_INT -import org.oppia.app.model.ListOfSetsOfHtmlStrings -import org.oppia.app.model.NumberUnit -import org.oppia.app.model.NumberWithUnits -import org.oppia.app.model.StringList +import org.oppia.android.app.model.ClickOnImage +import org.oppia.android.app.model.Fraction +import org.oppia.android.app.model.ImageWithRegions +import org.oppia.android.app.model.InteractionObject +import org.oppia.android.app.model.InteractionObject.ObjectTypeCase.BOOL_VALUE +import org.oppia.android.app.model.InteractionObject.ObjectTypeCase.CLICK_ON_IMAGE +import org.oppia.android.app.model.InteractionObject.ObjectTypeCase.FRACTION +import org.oppia.android.app.model.InteractionObject.ObjectTypeCase.IMAGE_WITH_REGIONS +import org.oppia.android.app.model.InteractionObject.ObjectTypeCase.LIST_OF_SETS_OF_HTML_STRING +import org.oppia.android.app.model.InteractionObject.ObjectTypeCase.NON_NEGATIVE_INT +import org.oppia.android.app.model.InteractionObject.ObjectTypeCase.NORMALIZED_STRING +import org.oppia.android.app.model.InteractionObject.ObjectTypeCase.NUMBER_WITH_UNITS +import org.oppia.android.app.model.InteractionObject.ObjectTypeCase.OBJECTTYPE_NOT_SET +import org.oppia.android.app.model.InteractionObject.ObjectTypeCase.RATIO_EXPRESSION +import org.oppia.android.app.model.InteractionObject.ObjectTypeCase.REAL +import org.oppia.android.app.model.InteractionObject.ObjectTypeCase.SET_OF_HTML_STRING +import org.oppia.android.app.model.InteractionObject.ObjectTypeCase.SIGNED_INT +import org.oppia.android.app.model.ListOfSetsOfHtmlStrings +import org.oppia.android.app.model.NumberUnit +import org.oppia.android.app.model.NumberWithUnits +import org.oppia.android.app.model.StringList /** Returns a parsable string representation of a user-submitted answer version of this [InteractionObject]. */ fun InteractionObject.toAnswerString(): String { diff --git a/domain/src/main/java/org/oppia/android/domain/util/JsonAssetRetriever.kt b/domain/src/main/java/org/oppia/android/domain/util/JsonAssetRetriever.kt index 1bd48d609ce..6bae4a984b4 100644 --- a/domain/src/main/java/org/oppia/android/domain/util/JsonAssetRetriever.kt +++ b/domain/src/main/java/org/oppia/android/domain/util/JsonAssetRetriever.kt @@ -1,8 +1,8 @@ -package org.oppia.domain.util +package org.oppia.android.domain.util import org.json.JSONArray import org.json.JSONObject -import org.oppia.util.caching.AssetRepository +import org.oppia.android.util.caching.AssetRepository import javax.inject.Inject /** Utility that retrieves JSON assets and converts them to JSON objects. */ diff --git a/domain/src/main/java/org/oppia/android/domain/util/RatioExtensions.kt b/domain/src/main/java/org/oppia/android/domain/util/RatioExtensions.kt index a7cfac9ee4a..821fa274e31 100644 --- a/domain/src/main/java/org/oppia/android/domain/util/RatioExtensions.kt +++ b/domain/src/main/java/org/oppia/android/domain/util/RatioExtensions.kt @@ -1,6 +1,6 @@ -package org.oppia.domain.util +package org.oppia.android.domain.util -import org.oppia.app.model.RatioExpression +import org.oppia.android.app.model.RatioExpression /** * Returns this Ratio in its most simplified form. diff --git a/domain/src/main/java/org/oppia/android/domain/util/StateRetriever.kt b/domain/src/main/java/org/oppia/android/domain/util/StateRetriever.kt index 481216fccc4..7b3a4c6f028 100644 --- a/domain/src/main/java/org/oppia/android/domain/util/StateRetriever.kt +++ b/domain/src/main/java/org/oppia/android/domain/util/StateRetriever.kt @@ -1,34 +1,34 @@ -package org.oppia.domain.util +package org.oppia.android.domain.util import org.json.JSONArray import org.json.JSONObject -import org.oppia.app.model.AnswerGroup -import org.oppia.app.model.CorrectAnswer -import org.oppia.app.model.CustomSchemaValue -import org.oppia.app.model.Fraction -import org.oppia.app.model.Hint -import org.oppia.app.model.ImageWithRegions -import org.oppia.app.model.ImageWithRegions.LabeledRegion -import org.oppia.app.model.ImageWithRegions.LabeledRegion.Region.NormalizedRectangle2d -import org.oppia.app.model.ImageWithRegions.LabeledRegion.Region.RegionType -import org.oppia.app.model.Interaction -import org.oppia.app.model.InteractionObject -import org.oppia.app.model.ListOfSetsOfHtmlStrings -import org.oppia.app.model.NumberUnit -import org.oppia.app.model.NumberWithUnits -import org.oppia.app.model.Outcome -import org.oppia.app.model.Point2d -import org.oppia.app.model.RatioExpression -import org.oppia.app.model.RuleSpec -import org.oppia.app.model.SchemaObject -import org.oppia.app.model.SchemaObjectList -import org.oppia.app.model.Solution -import org.oppia.app.model.State -import org.oppia.app.model.StringList -import org.oppia.app.model.SubtitledHtml -import org.oppia.app.model.SubtitledUnicode -import org.oppia.app.model.Voiceover -import org.oppia.app.model.VoiceoverMapping +import org.oppia.android.app.model.AnswerGroup +import org.oppia.android.app.model.CorrectAnswer +import org.oppia.android.app.model.CustomSchemaValue +import org.oppia.android.app.model.Fraction +import org.oppia.android.app.model.Hint +import org.oppia.android.app.model.ImageWithRegions +import org.oppia.android.app.model.ImageWithRegions.LabeledRegion +import org.oppia.android.app.model.ImageWithRegions.LabeledRegion.Region.NormalizedRectangle2d +import org.oppia.android.app.model.ImageWithRegions.LabeledRegion.Region.RegionType +import org.oppia.android.app.model.Interaction +import org.oppia.android.app.model.InteractionObject +import org.oppia.android.app.model.ListOfSetsOfHtmlStrings +import org.oppia.android.app.model.NumberUnit +import org.oppia.android.app.model.NumberWithUnits +import org.oppia.android.app.model.Outcome +import org.oppia.android.app.model.Point2d +import org.oppia.android.app.model.RatioExpression +import org.oppia.android.app.model.RuleSpec +import org.oppia.android.app.model.SchemaObject +import org.oppia.android.app.model.SchemaObjectList +import org.oppia.android.app.model.Solution +import org.oppia.android.app.model.State +import org.oppia.android.app.model.StringList +import org.oppia.android.app.model.SubtitledHtml +import org.oppia.android.app.model.SubtitledUnicode +import org.oppia.android.app.model.Voiceover +import org.oppia.android.app.model.VoiceoverMapping import javax.inject.Inject /** Utility that helps create a [State] object given its JSON representation. */ diff --git a/domain/src/main/java/org/oppia/android/domain/util/StringExtensions.kt b/domain/src/main/java/org/oppia/android/domain/util/StringExtensions.kt index a1cd62714c7..0dbdc30fc86 100644 --- a/domain/src/main/java/org/oppia/android/domain/util/StringExtensions.kt +++ b/domain/src/main/java/org/oppia/android/domain/util/StringExtensions.kt @@ -1,4 +1,4 @@ -package org.oppia.domain.util +package org.oppia.android.domain.util /** * Normalizes whitespace in the specified string in a way consistent with Oppia web: diff --git a/domain/src/test/AndroidManifest.xml b/domain/src/test/AndroidManifest.xml index 2dc4e167ac0..cd36d7f734a 100644 --- a/domain/src/test/AndroidManifest.xml +++ b/domain/src/test/AndroidManifest.xml @@ -1,6 +1,6 @@ + package="org.oppia.android.domain"> diff --git a/domain/src/test/java/org/oppia/android/domain/audio/AudioPlayerControllerTest.kt b/domain/src/test/java/org/oppia/android/domain/audio/AudioPlayerControllerTest.kt index 5e396446837..4382663d423 100644 --- a/domain/src/test/java/org/oppia/android/domain/audio/AudioPlayerControllerTest.kt +++ b/domain/src/test/java/org/oppia/android/domain/audio/AudioPlayerControllerTest.kt @@ -1,4 +1,4 @@ -package org.oppia.domain.audio +package org.oppia.android.domain.audio import android.app.Application import android.content.Context @@ -22,19 +22,19 @@ import org.mockito.Mockito.atLeastOnce import org.mockito.Mockito.verify import org.mockito.junit.MockitoJUnit import org.mockito.junit.MockitoRule -import org.oppia.domain.audio.AudioPlayerController.PlayProgress -import org.oppia.domain.audio.AudioPlayerController.PlayStatus -import org.oppia.domain.oppialogger.LogStorageModule -import org.oppia.testing.FakeExceptionLogger -import org.oppia.testing.TestCoroutineDispatchers -import org.oppia.testing.TestDispatcherModule -import org.oppia.testing.TestLogReportingModule -import org.oppia.util.caching.CacheAssetsLocally -import org.oppia.util.data.AsyncResult -import org.oppia.util.logging.EnableConsoleLog -import org.oppia.util.logging.EnableFileLog -import org.oppia.util.logging.GlobalLogLevel -import org.oppia.util.logging.LogLevel +import org.oppia.android.domain.audio.AudioPlayerController.PlayProgress +import org.oppia.android.domain.audio.AudioPlayerController.PlayStatus +import org.oppia.android.domain.oppialogger.LogStorageModule +import org.oppia.android.testing.FakeExceptionLogger +import org.oppia.android.testing.TestCoroutineDispatchers +import org.oppia.android.testing.TestDispatcherModule +import org.oppia.android.testing.TestLogReportingModule +import org.oppia.android.util.caching.CacheAssetsLocally +import org.oppia.android.util.data.AsyncResult +import org.oppia.android.util.logging.EnableConsoleLog +import org.oppia.android.util.logging.EnableFileLog +import org.oppia.android.util.logging.GlobalLogLevel +import org.oppia.android.util.logging.LogLevel import org.robolectric.Shadows import org.robolectric.annotation.Config import org.robolectric.annotation.LooperMode diff --git a/domain/src/test/java/org/oppia/android/domain/audio/CellularAudioDialogControllerTest.kt b/domain/src/test/java/org/oppia/android/domain/audio/CellularAudioDialogControllerTest.kt index 1e89f089467..d2257d63a36 100644 --- a/domain/src/test/java/org/oppia/android/domain/audio/CellularAudioDialogControllerTest.kt +++ b/domain/src/test/java/org/oppia/android/domain/audio/CellularAudioDialogControllerTest.kt @@ -1,4 +1,4 @@ -package org.oppia.domain.audio +package org.oppia.android.domain.audio import android.app.Application import android.content.Context @@ -21,15 +21,15 @@ import org.mockito.Mockito.atLeastOnce import org.mockito.Mockito.verify import org.mockito.junit.MockitoJUnit import org.mockito.junit.MockitoRule -import org.oppia.app.model.CellularDataPreference -import org.oppia.testing.TestCoroutineDispatchers -import org.oppia.testing.TestDispatcherModule -import org.oppia.testing.TestLogReportingModule -import org.oppia.util.data.AsyncResult -import org.oppia.util.logging.EnableConsoleLog -import org.oppia.util.logging.EnableFileLog -import org.oppia.util.logging.GlobalLogLevel -import org.oppia.util.logging.LogLevel +import org.oppia.android.app.model.CellularDataPreference +import org.oppia.android.testing.TestCoroutineDispatchers +import org.oppia.android.testing.TestDispatcherModule +import org.oppia.android.testing.TestLogReportingModule +import org.oppia.android.util.data.AsyncResult +import org.oppia.android.util.logging.EnableConsoleLog +import org.oppia.android.util.logging.EnableFileLog +import org.oppia.android.util.logging.GlobalLogLevel +import org.oppia.android.util.logging.LogLevel import org.robolectric.annotation.Config import org.robolectric.annotation.LooperMode import javax.inject.Inject diff --git a/domain/src/test/java/org/oppia/android/domain/classify/AnswerClassificationControllerTest.kt b/domain/src/test/java/org/oppia/android/domain/classify/AnswerClassificationControllerTest.kt index 8e674f43b91..8a0d218fc07 100644 --- a/domain/src/test/java/org/oppia/android/domain/classify/AnswerClassificationControllerTest.kt +++ b/domain/src/test/java/org/oppia/android/domain/classify/AnswerClassificationControllerTest.kt @@ -1,4 +1,4 @@ -package org.oppia.domain.classify +package org.oppia.android.domain.classify import android.app.Application import android.content.Context @@ -13,26 +13,26 @@ import org.junit.Assert.fail import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.oppia.app.model.AnswerGroup -import org.oppia.app.model.Fraction -import org.oppia.app.model.Interaction -import org.oppia.app.model.InteractionObject -import org.oppia.app.model.NumberUnit -import org.oppia.app.model.NumberWithUnits -import org.oppia.app.model.Outcome -import org.oppia.app.model.RuleSpec -import org.oppia.app.model.StringList -import org.oppia.app.model.SubtitledHtml -import org.oppia.domain.classify.rules.continueinteraction.ContinueModule -import org.oppia.domain.classify.rules.dragAndDropSortInput.DragDropSortInputModule -import org.oppia.domain.classify.rules.fractioninput.FractionInputModule -import org.oppia.domain.classify.rules.imageClickInput.ImageClickInputModule -import org.oppia.domain.classify.rules.itemselectioninput.ItemSelectionInputModule -import org.oppia.domain.classify.rules.multiplechoiceinput.MultipleChoiceInputModule -import org.oppia.domain.classify.rules.numberwithunits.NumberWithUnitsRuleModule -import org.oppia.domain.classify.rules.numericinput.NumericInputRuleModule -import org.oppia.domain.classify.rules.ratioinput.RatioInputModule -import org.oppia.domain.classify.rules.textinput.TextInputRuleModule +import org.oppia.android.app.model.AnswerGroup +import org.oppia.android.app.model.Fraction +import org.oppia.android.app.model.Interaction +import org.oppia.android.app.model.InteractionObject +import org.oppia.android.app.model.NumberUnit +import org.oppia.android.app.model.NumberWithUnits +import org.oppia.android.app.model.Outcome +import org.oppia.android.app.model.RuleSpec +import org.oppia.android.app.model.StringList +import org.oppia.android.app.model.SubtitledHtml +import org.oppia.android.domain.classify.rules.continueinteraction.ContinueModule +import org.oppia.android.domain.classify.rules.dragAndDropSortInput.DragDropSortInputModule +import org.oppia.android.domain.classify.rules.fractioninput.FractionInputModule +import org.oppia.android.domain.classify.rules.imageClickInput.ImageClickInputModule +import org.oppia.android.domain.classify.rules.itemselectioninput.ItemSelectionInputModule +import org.oppia.android.domain.classify.rules.multiplechoiceinput.MultipleChoiceInputModule +import org.oppia.android.domain.classify.rules.numberwithunits.NumberWithUnitsRuleModule +import org.oppia.android.domain.classify.rules.numericinput.NumericInputRuleModule +import org.oppia.android.domain.classify.rules.ratioinput.RatioInputModule +import org.oppia.android.domain.classify.rules.textinput.TextInputRuleModule import org.robolectric.annotation.Config import org.robolectric.annotation.LooperMode import javax.inject.Inject diff --git a/domain/src/test/java/org/oppia/android/domain/classify/NumericInputEqualsRuleClassifierProviderTest.kt b/domain/src/test/java/org/oppia/android/domain/classify/NumericInputEqualsRuleClassifierProviderTest.kt index ebb6a7ec2a2..16a03de9beb 100644 --- a/domain/src/test/java/org/oppia/android/domain/classify/NumericInputEqualsRuleClassifierProviderTest.kt +++ b/domain/src/test/java/org/oppia/android/domain/classify/NumericInputEqualsRuleClassifierProviderTest.kt @@ -1,4 +1,4 @@ -package org.oppia.domain.classify +package org.oppia.android.domain.classify import android.app.Application import androidx.test.core.app.ApplicationProvider @@ -9,9 +9,9 @@ import dagger.Component import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.oppia.app.model.InteractionObject -import org.oppia.domain.classify.rules.numericinput.NumericInputEqualsRuleClassifierProvider -import org.oppia.domain.util.FLOAT_EQUALITY_INTERVAL +import org.oppia.android.app.model.InteractionObject +import org.oppia.android.domain.classify.rules.numericinput.NumericInputEqualsRuleClassifierProvider +import org.oppia.android.domain.util.FLOAT_EQUALITY_INTERVAL import org.robolectric.annotation.Config import org.robolectric.annotation.LooperMode import javax.inject.Inject diff --git a/domain/src/test/java/org/oppia/android/domain/classify/rules/NumericInputIsGreaterThanOrEqualToRuleClassifierProviderTest.kt b/domain/src/test/java/org/oppia/android/domain/classify/rules/NumericInputIsGreaterThanOrEqualToRuleClassifierProviderTest.kt index 42bb7c6d39a..124d1d78fd1 100644 --- a/domain/src/test/java/org/oppia/android/domain/classify/rules/NumericInputIsGreaterThanOrEqualToRuleClassifierProviderTest.kt +++ b/domain/src/test/java/org/oppia/android/domain/classify/rules/NumericInputIsGreaterThanOrEqualToRuleClassifierProviderTest.kt @@ -1,4 +1,4 @@ -package org.oppia.domain.classify.rules +package org.oppia.android.domain.classify.rules import android.app.Application import androidx.test.core.app.ApplicationProvider @@ -9,8 +9,8 @@ import dagger.Component import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.oppia.app.model.InteractionObject -import org.oppia.domain.classify.rules.numericinput.NumericInputIsGreaterThanOrEqualToRuleClassifierProvider +import org.oppia.android.app.model.InteractionObject +import org.oppia.android.domain.classify.rules.numericinput.NumericInputIsGreaterThanOrEqualToRuleClassifierProvider import org.robolectric.annotation.Config import org.robolectric.annotation.LooperMode import javax.inject.Inject diff --git a/domain/src/test/java/org/oppia/android/domain/classify/rules/NumericInputIsGreaterThanRuleClassifierProviderTest.kt b/domain/src/test/java/org/oppia/android/domain/classify/rules/NumericInputIsGreaterThanRuleClassifierProviderTest.kt index 1f056980e6b..acff85c905b 100644 --- a/domain/src/test/java/org/oppia/android/domain/classify/rules/NumericInputIsGreaterThanRuleClassifierProviderTest.kt +++ b/domain/src/test/java/org/oppia/android/domain/classify/rules/NumericInputIsGreaterThanRuleClassifierProviderTest.kt @@ -1,4 +1,4 @@ -package org.oppia.domain.classify.rules +package org.oppia.android.domain.classify.rules import android.app.Application import androidx.test.core.app.ApplicationProvider @@ -9,8 +9,8 @@ import dagger.Component import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.oppia.app.model.InteractionObject -import org.oppia.domain.classify.rules.numericinput.NumericInputIsGreaterThanRuleClassifierProvider +import org.oppia.android.app.model.InteractionObject +import org.oppia.android.domain.classify.rules.numericinput.NumericInputIsGreaterThanRuleClassifierProvider import org.robolectric.annotation.Config import org.robolectric.annotation.LooperMode import javax.inject.Inject diff --git a/domain/src/test/java/org/oppia/android/domain/classify/rules/NumericInputIsLessThanOrEqualToRuleClassifierProviderTest.kt b/domain/src/test/java/org/oppia/android/domain/classify/rules/NumericInputIsLessThanOrEqualToRuleClassifierProviderTest.kt index 7477cdccccf..b9984a2f025 100644 --- a/domain/src/test/java/org/oppia/android/domain/classify/rules/NumericInputIsLessThanOrEqualToRuleClassifierProviderTest.kt +++ b/domain/src/test/java/org/oppia/android/domain/classify/rules/NumericInputIsLessThanOrEqualToRuleClassifierProviderTest.kt @@ -1,4 +1,4 @@ -package org.oppia.domain.classify.rules +package org.oppia.android.domain.classify.rules import android.app.Application import androidx.test.core.app.ApplicationProvider @@ -9,8 +9,8 @@ import dagger.Component import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.oppia.app.model.InteractionObject -import org.oppia.domain.classify.rules.numericinput.NumericInputIsLessThanOrEqualToRuleClassifierProvider +import org.oppia.android.app.model.InteractionObject +import org.oppia.android.domain.classify.rules.numericinput.NumericInputIsLessThanOrEqualToRuleClassifierProvider import org.robolectric.annotation.Config import org.robolectric.annotation.LooperMode import javax.inject.Inject diff --git a/domain/src/test/java/org/oppia/android/domain/classify/rules/NumericInputIsLessThanRuleClassifierProviderTest.kt b/domain/src/test/java/org/oppia/android/domain/classify/rules/NumericInputIsLessThanRuleClassifierProviderTest.kt index afaec004335..3793f7e0ce7 100644 --- a/domain/src/test/java/org/oppia/android/domain/classify/rules/NumericInputIsLessThanRuleClassifierProviderTest.kt +++ b/domain/src/test/java/org/oppia/android/domain/classify/rules/NumericInputIsLessThanRuleClassifierProviderTest.kt @@ -1,4 +1,4 @@ -package org.oppia.domain.classify.rules +package org.oppia.android.domain.classify.rules import android.app.Application import androidx.test.core.app.ApplicationProvider @@ -9,8 +9,8 @@ import dagger.Component import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.oppia.app.model.InteractionObject -import org.oppia.domain.classify.rules.numericinput.NumericInputIsLessThanRuleClassifierProvider +import org.oppia.android.app.model.InteractionObject +import org.oppia.android.domain.classify.rules.numericinput.NumericInputIsLessThanRuleClassifierProvider import org.robolectric.annotation.Config import org.robolectric.annotation.LooperMode import javax.inject.Inject diff --git a/domain/src/test/java/org/oppia/android/domain/classify/rules/dragAndDropSortInput/DragDropSortInputHasElementXAtPositionYRuleClassifierProviderTest.kt b/domain/src/test/java/org/oppia/android/domain/classify/rules/dragAndDropSortInput/DragDropSortInputHasElementXAtPositionYRuleClassifierProviderTest.kt index f156787071d..c4cc5f1cca6 100644 --- a/domain/src/test/java/org/oppia/android/domain/classify/rules/dragAndDropSortInput/DragDropSortInputHasElementXAtPositionYRuleClassifierProviderTest.kt +++ b/domain/src/test/java/org/oppia/android/domain/classify/rules/dragAndDropSortInput/DragDropSortInputHasElementXAtPositionYRuleClassifierProviderTest.kt @@ -1,4 +1,4 @@ -package org.oppia.domain.classify.rules.dragAndDropSortInput +package org.oppia.android.domain.classify.rules.dragAndDropSortInput import android.app.Application import androidx.test.core.app.ApplicationProvider @@ -9,10 +9,10 @@ import dagger.Component import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.oppia.app.model.InteractionObject -import org.oppia.app.model.ListOfSetsOfHtmlStrings -import org.oppia.app.model.StringList -import org.oppia.domain.classify.RuleClassifier +import org.oppia.android.app.model.InteractionObject +import org.oppia.android.app.model.ListOfSetsOfHtmlStrings +import org.oppia.android.app.model.StringList +import org.oppia.android.domain.classify.RuleClassifier import org.robolectric.annotation.Config import org.robolectric.annotation.LooperMode import javax.inject.Inject diff --git a/domain/src/test/java/org/oppia/android/domain/classify/rules/dragAndDropSortInput/DragDropSortInputHasElementXBeforeElementYRuleClassifierProviderTest.kt b/domain/src/test/java/org/oppia/android/domain/classify/rules/dragAndDropSortInput/DragDropSortInputHasElementXBeforeElementYRuleClassifierProviderTest.kt index e092c2eea55..84e8b93aba8 100644 --- a/domain/src/test/java/org/oppia/android/domain/classify/rules/dragAndDropSortInput/DragDropSortInputHasElementXBeforeElementYRuleClassifierProviderTest.kt +++ b/domain/src/test/java/org/oppia/android/domain/classify/rules/dragAndDropSortInput/DragDropSortInputHasElementXBeforeElementYRuleClassifierProviderTest.kt @@ -1,4 +1,4 @@ -package org.oppia.domain.classify.rules.dragAndDropSortInput +package org.oppia.android.domain.classify.rules.dragAndDropSortInput import android.app.Application import androidx.test.core.app.ApplicationProvider @@ -9,10 +9,10 @@ import dagger.Component import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.oppia.app.model.InteractionObject -import org.oppia.app.model.ListOfSetsOfHtmlStrings -import org.oppia.app.model.StringList -import org.oppia.domain.classify.RuleClassifier +import org.oppia.android.app.model.InteractionObject +import org.oppia.android.app.model.ListOfSetsOfHtmlStrings +import org.oppia.android.app.model.StringList +import org.oppia.android.domain.classify.RuleClassifier import org.robolectric.annotation.Config import org.robolectric.annotation.LooperMode import javax.inject.Inject diff --git a/domain/src/test/java/org/oppia/android/domain/classify/rules/dragAndDropSortInput/DragDropSortInputIsEqualToOrderingClassifierProviderTest.kt b/domain/src/test/java/org/oppia/android/domain/classify/rules/dragAndDropSortInput/DragDropSortInputIsEqualToOrderingClassifierProviderTest.kt index 25f9c27cde2..264577f86f0 100644 --- a/domain/src/test/java/org/oppia/android/domain/classify/rules/dragAndDropSortInput/DragDropSortInputIsEqualToOrderingClassifierProviderTest.kt +++ b/domain/src/test/java/org/oppia/android/domain/classify/rules/dragAndDropSortInput/DragDropSortInputIsEqualToOrderingClassifierProviderTest.kt @@ -1,4 +1,4 @@ -package org.oppia.domain.classify.rules.dragAndDropSortInput +package org.oppia.android.domain.classify.rules.dragAndDropSortInput import android.app.Application import androidx.test.core.app.ApplicationProvider @@ -9,10 +9,10 @@ import dagger.Component import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.oppia.app.model.InteractionObject -import org.oppia.app.model.ListOfSetsOfHtmlStrings -import org.oppia.app.model.StringList -import org.oppia.domain.classify.RuleClassifier +import org.oppia.android.app.model.InteractionObject +import org.oppia.android.app.model.ListOfSetsOfHtmlStrings +import org.oppia.android.app.model.StringList +import org.oppia.android.domain.classify.RuleClassifier import org.robolectric.annotation.Config import org.robolectric.annotation.LooperMode import javax.inject.Inject diff --git a/domain/src/test/java/org/oppia/android/domain/classify/rules/dragAndDropSortInput/DragDropSortInputIsEqualToOrderingWithOneItemAtIncorrectPositionClassifierProviderTest.kt b/domain/src/test/java/org/oppia/android/domain/classify/rules/dragAndDropSortInput/DragDropSortInputIsEqualToOrderingWithOneItemAtIncorrectPositionClassifierProviderTest.kt index a8d9c6a4555..7c12ed6cc9e 100644 --- a/domain/src/test/java/org/oppia/android/domain/classify/rules/dragAndDropSortInput/DragDropSortInputIsEqualToOrderingWithOneItemAtIncorrectPositionClassifierProviderTest.kt +++ b/domain/src/test/java/org/oppia/android/domain/classify/rules/dragAndDropSortInput/DragDropSortInputIsEqualToOrderingWithOneItemAtIncorrectPositionClassifierProviderTest.kt @@ -1,4 +1,4 @@ -package org.oppia.domain.classify.rules.dragAndDropSortInput +package org.oppia.android.domain.classify.rules.dragAndDropSortInput import android.app.Application import androidx.test.core.app.ApplicationProvider @@ -9,10 +9,10 @@ import dagger.Component import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.oppia.app.model.InteractionObject -import org.oppia.app.model.ListOfSetsOfHtmlStrings -import org.oppia.app.model.StringList -import org.oppia.domain.classify.RuleClassifier +import org.oppia.android.app.model.InteractionObject +import org.oppia.android.app.model.ListOfSetsOfHtmlStrings +import org.oppia.android.app.model.StringList +import org.oppia.android.domain.classify.RuleClassifier import org.robolectric.annotation.Config import org.robolectric.annotation.LooperMode import javax.inject.Inject diff --git a/domain/src/test/java/org/oppia/android/domain/classify/rules/imageClickInput/ImageClickInputIsInRegionRuleClassifierProviderTest.kt b/domain/src/test/java/org/oppia/android/domain/classify/rules/imageClickInput/ImageClickInputIsInRegionRuleClassifierProviderTest.kt index 1b0a4890b4a..51546f40de7 100644 --- a/domain/src/test/java/org/oppia/android/domain/classify/rules/imageClickInput/ImageClickInputIsInRegionRuleClassifierProviderTest.kt +++ b/domain/src/test/java/org/oppia/android/domain/classify/rules/imageClickInput/ImageClickInputIsInRegionRuleClassifierProviderTest.kt @@ -1,4 +1,4 @@ -package org.oppia.domain.classify.rules.imageClickInput +package org.oppia.android.domain.classify.rules.imageClickInput import android.app.Application import androidx.test.core.app.ApplicationProvider @@ -9,10 +9,10 @@ import dagger.Component import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.oppia.app.model.ClickOnImage -import org.oppia.app.model.InteractionObject -import org.oppia.app.model.Point2d -import org.oppia.domain.classify.RuleClassifier +import org.oppia.android.app.model.ClickOnImage +import org.oppia.android.app.model.InteractionObject +import org.oppia.android.app.model.Point2d +import org.oppia.android.domain.classify.RuleClassifier import org.robolectric.annotation.Config import org.robolectric.annotation.LooperMode import javax.inject.Inject diff --git a/domain/src/test/java/org/oppia/android/domain/classify/rules/multiplechoiceinput/MultipleChoiceInputEqualsRuleClassifierProviderTest.kt b/domain/src/test/java/org/oppia/android/domain/classify/rules/multiplechoiceinput/MultipleChoiceInputEqualsRuleClassifierProviderTest.kt index 2290a47ac8d..d16871e25dc 100644 --- a/domain/src/test/java/org/oppia/android/domain/classify/rules/multiplechoiceinput/MultipleChoiceInputEqualsRuleClassifierProviderTest.kt +++ b/domain/src/test/java/org/oppia/android/domain/classify/rules/multiplechoiceinput/MultipleChoiceInputEqualsRuleClassifierProviderTest.kt @@ -1,4 +1,4 @@ -package org.oppia.domain.classify.rules.multiplechoiceinput +package org.oppia.android.domain.classify.rules.multiplechoiceinput import android.app.Application import androidx.test.core.app.ApplicationProvider @@ -9,7 +9,7 @@ import dagger.Component import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.oppia.app.model.InteractionObject +import org.oppia.android.app.model.InteractionObject import org.robolectric.annotation.Config import org.robolectric.annotation.LooperMode import javax.inject.Inject diff --git a/domain/src/test/java/org/oppia/android/domain/classify/rules/ratioinput/RatioInputEqualsRuleClassifierProviderTest.kt b/domain/src/test/java/org/oppia/android/domain/classify/rules/ratioinput/RatioInputEqualsRuleClassifierProviderTest.kt index 798706222db..f94bb780e03 100644 --- a/domain/src/test/java/org/oppia/android/domain/classify/rules/ratioinput/RatioInputEqualsRuleClassifierProviderTest.kt +++ b/domain/src/test/java/org/oppia/android/domain/classify/rules/ratioinput/RatioInputEqualsRuleClassifierProviderTest.kt @@ -1,4 +1,4 @@ -package org.oppia.domain.classify.rules.ratioinput +package org.oppia.android.domain.classify.rules.ratioinput import android.app.Application import androidx.test.core.app.ApplicationProvider @@ -9,9 +9,9 @@ import dagger.Component import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.oppia.app.model.InteractionObject -import org.oppia.app.model.RatioExpression -import org.oppia.domain.classify.RuleClassifier +import org.oppia.android.app.model.InteractionObject +import org.oppia.android.app.model.RatioExpression +import org.oppia.android.domain.classify.RuleClassifier import org.robolectric.annotation.Config import org.robolectric.annotation.LooperMode import javax.inject.Inject diff --git a/domain/src/test/java/org/oppia/android/domain/classify/rules/ratioinput/RatioInputHasNumberOfTermsEqualToClassifierProviderTest.kt b/domain/src/test/java/org/oppia/android/domain/classify/rules/ratioinput/RatioInputHasNumberOfTermsEqualToClassifierProviderTest.kt index e5dec69efe6..4999d584086 100644 --- a/domain/src/test/java/org/oppia/android/domain/classify/rules/ratioinput/RatioInputHasNumberOfTermsEqualToClassifierProviderTest.kt +++ b/domain/src/test/java/org/oppia/android/domain/classify/rules/ratioinput/RatioInputHasNumberOfTermsEqualToClassifierProviderTest.kt @@ -1,4 +1,4 @@ -package org.oppia.domain.classify.rules.ratioinput +package org.oppia.android.domain.classify.rules.ratioinput import android.app.Application import androidx.test.core.app.ApplicationProvider @@ -9,9 +9,9 @@ import dagger.Component import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.oppia.app.model.InteractionObject -import org.oppia.app.model.RatioExpression -import org.oppia.domain.classify.RuleClassifier +import org.oppia.android.app.model.InteractionObject +import org.oppia.android.app.model.RatioExpression +import org.oppia.android.domain.classify.RuleClassifier import org.robolectric.annotation.Config import org.robolectric.annotation.LooperMode import javax.inject.Inject diff --git a/domain/src/test/java/org/oppia/android/domain/classify/rules/ratioinput/RatioInputIsEquivalentRuleClassifierProviderTest.kt b/domain/src/test/java/org/oppia/android/domain/classify/rules/ratioinput/RatioInputIsEquivalentRuleClassifierProviderTest.kt index 4b64b0b8538..1ff04d31213 100644 --- a/domain/src/test/java/org/oppia/android/domain/classify/rules/ratioinput/RatioInputIsEquivalentRuleClassifierProviderTest.kt +++ b/domain/src/test/java/org/oppia/android/domain/classify/rules/ratioinput/RatioInputIsEquivalentRuleClassifierProviderTest.kt @@ -1,4 +1,4 @@ -package org.oppia.domain.classify.rules.ratioinput +package org.oppia.android.domain.classify.rules.ratioinput import android.app.Application import androidx.test.core.app.ApplicationProvider @@ -9,9 +9,9 @@ import dagger.Component import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.oppia.app.model.InteractionObject -import org.oppia.app.model.RatioExpression -import org.oppia.domain.classify.RuleClassifier +import org.oppia.android.app.model.InteractionObject +import org.oppia.android.app.model.RatioExpression +import org.oppia.android.domain.classify.RuleClassifier import org.robolectric.annotation.Config import org.robolectric.annotation.LooperMode import javax.inject.Inject diff --git a/domain/src/test/java/org/oppia/android/domain/classify/rules/textinput/TextInputContainsRuleClassifierProviderTest.kt b/domain/src/test/java/org/oppia/android/domain/classify/rules/textinput/TextInputContainsRuleClassifierProviderTest.kt index cb2d4aeea5e..7837c259677 100644 --- a/domain/src/test/java/org/oppia/android/domain/classify/rules/textinput/TextInputContainsRuleClassifierProviderTest.kt +++ b/domain/src/test/java/org/oppia/android/domain/classify/rules/textinput/TextInputContainsRuleClassifierProviderTest.kt @@ -1,4 +1,4 @@ -package org.oppia.domain.classify.rules.textinput +package org.oppia.android.domain.classify.rules.textinput import android.app.Application import androidx.test.core.app.ApplicationProvider @@ -9,7 +9,7 @@ import dagger.Component import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.oppia.app.model.InteractionObject +import org.oppia.android.app.model.InteractionObject import org.robolectric.annotation.Config import org.robolectric.annotation.LooperMode import javax.inject.Inject diff --git a/domain/src/test/java/org/oppia/android/domain/classify/rules/textinput/TextInputEqualsRuleClassifierProviderTest.kt b/domain/src/test/java/org/oppia/android/domain/classify/rules/textinput/TextInputEqualsRuleClassifierProviderTest.kt index 27191593c36..9cd1243fcbc 100644 --- a/domain/src/test/java/org/oppia/android/domain/classify/rules/textinput/TextInputEqualsRuleClassifierProviderTest.kt +++ b/domain/src/test/java/org/oppia/android/domain/classify/rules/textinput/TextInputEqualsRuleClassifierProviderTest.kt @@ -1,4 +1,4 @@ -package org.oppia.domain.classify.rules.textinput +package org.oppia.android.domain.classify.rules.textinput import android.app.Application import androidx.test.core.app.ApplicationProvider @@ -9,7 +9,7 @@ import dagger.Component import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.oppia.app.model.InteractionObject +import org.oppia.android.app.model.InteractionObject import org.robolectric.annotation.Config import org.robolectric.annotation.LooperMode import javax.inject.Inject diff --git a/domain/src/test/java/org/oppia/android/domain/exploration/ExplorationDataControllerTest.kt b/domain/src/test/java/org/oppia/android/domain/exploration/ExplorationDataControllerTest.kt index 6e3784c8ba6..4f17f770412 100644 --- a/domain/src/test/java/org/oppia/android/domain/exploration/ExplorationDataControllerTest.kt +++ b/domain/src/test/java/org/oppia/android/domain/exploration/ExplorationDataControllerTest.kt @@ -1,4 +1,4 @@ -package org.oppia.domain.exploration +package org.oppia.android.domain.exploration import android.app.Application import android.content.Context @@ -21,38 +21,38 @@ import org.mockito.Mockito.atLeastOnce import org.mockito.Mockito.verify import org.mockito.junit.MockitoJUnit import org.mockito.junit.MockitoRule -import org.oppia.app.model.Exploration -import org.oppia.domain.classify.InteractionsModule -import org.oppia.domain.classify.rules.continueinteraction.ContinueModule -import org.oppia.domain.classify.rules.dragAndDropSortInput.DragDropSortInputModule -import org.oppia.domain.classify.rules.fractioninput.FractionInputModule -import org.oppia.domain.classify.rules.imageClickInput.ImageClickInputModule -import org.oppia.domain.classify.rules.itemselectioninput.ItemSelectionInputModule -import org.oppia.domain.classify.rules.multiplechoiceinput.MultipleChoiceInputModule -import org.oppia.domain.classify.rules.numberwithunits.NumberWithUnitsRuleModule -import org.oppia.domain.classify.rules.numericinput.NumericInputRuleModule -import org.oppia.domain.classify.rules.ratioinput.RatioInputModule -import org.oppia.domain.classify.rules.textinput.TextInputRuleModule -import org.oppia.domain.oppialogger.LogStorageModule -import org.oppia.domain.topic.FRACTIONS_EXPLORATION_ID_0 -import org.oppia.domain.topic.FRACTIONS_EXPLORATION_ID_1 -import org.oppia.domain.topic.RATIOS_EXPLORATION_ID_0 -import org.oppia.domain.topic.RATIOS_EXPLORATION_ID_1 -import org.oppia.domain.topic.RATIOS_EXPLORATION_ID_2 -import org.oppia.domain.topic.RATIOS_EXPLORATION_ID_3 -import org.oppia.domain.topic.TEST_EXPLORATION_ID_0 -import org.oppia.domain.topic.TEST_EXPLORATION_ID_1 -import org.oppia.domain.topic.TEST_EXPLORATION_ID_3 -import org.oppia.domain.topic.TEST_EXPLORATION_ID_4 -import org.oppia.testing.FakeExceptionLogger -import org.oppia.testing.TestCoroutineDispatchers -import org.oppia.testing.TestDispatcherModule -import org.oppia.testing.TestLogReportingModule -import org.oppia.util.data.AsyncResult -import org.oppia.util.logging.EnableConsoleLog -import org.oppia.util.logging.EnableFileLog -import org.oppia.util.logging.GlobalLogLevel -import org.oppia.util.logging.LogLevel +import org.oppia.android.app.model.Exploration +import org.oppia.android.domain.classify.InteractionsModule +import org.oppia.android.domain.classify.rules.continueinteraction.ContinueModule +import org.oppia.android.domain.classify.rules.dragAndDropSortInput.DragDropSortInputModule +import org.oppia.android.domain.classify.rules.fractioninput.FractionInputModule +import org.oppia.android.domain.classify.rules.imageClickInput.ImageClickInputModule +import org.oppia.android.domain.classify.rules.itemselectioninput.ItemSelectionInputModule +import org.oppia.android.domain.classify.rules.multiplechoiceinput.MultipleChoiceInputModule +import org.oppia.android.domain.classify.rules.numberwithunits.NumberWithUnitsRuleModule +import org.oppia.android.domain.classify.rules.numericinput.NumericInputRuleModule +import org.oppia.android.domain.classify.rules.ratioinput.RatioInputModule +import org.oppia.android.domain.classify.rules.textinput.TextInputRuleModule +import org.oppia.android.domain.oppialogger.LogStorageModule +import org.oppia.android.domain.topic.FRACTIONS_EXPLORATION_ID_0 +import org.oppia.android.domain.topic.FRACTIONS_EXPLORATION_ID_1 +import org.oppia.android.domain.topic.RATIOS_EXPLORATION_ID_0 +import org.oppia.android.domain.topic.RATIOS_EXPLORATION_ID_1 +import org.oppia.android.domain.topic.RATIOS_EXPLORATION_ID_2 +import org.oppia.android.domain.topic.RATIOS_EXPLORATION_ID_3 +import org.oppia.android.domain.topic.TEST_EXPLORATION_ID_0 +import org.oppia.android.domain.topic.TEST_EXPLORATION_ID_1 +import org.oppia.android.domain.topic.TEST_EXPLORATION_ID_3 +import org.oppia.android.domain.topic.TEST_EXPLORATION_ID_4 +import org.oppia.android.testing.FakeExceptionLogger +import org.oppia.android.testing.TestCoroutineDispatchers +import org.oppia.android.testing.TestDispatcherModule +import org.oppia.android.testing.TestLogReportingModule +import org.oppia.android.util.data.AsyncResult +import org.oppia.android.util.logging.EnableConsoleLog +import org.oppia.android.util.logging.EnableFileLog +import org.oppia.android.util.logging.GlobalLogLevel +import org.oppia.android.util.logging.LogLevel import org.robolectric.annotation.Config import org.robolectric.annotation.LooperMode import java.io.FileNotFoundException diff --git a/domain/src/test/java/org/oppia/android/domain/exploration/ExplorationProgressControllerTest.kt b/domain/src/test/java/org/oppia/android/domain/exploration/ExplorationProgressControllerTest.kt index a1d0f4611cd..82fff801e29 100644 --- a/domain/src/test/java/org/oppia/android/domain/exploration/ExplorationProgressControllerTest.kt +++ b/domain/src/test/java/org/oppia/android/domain/exploration/ExplorationProgressControllerTest.kt @@ -1,4 +1,4 @@ -package org.oppia.domain.exploration +package org.oppia.android.domain.exploration import android.app.Application import android.content.Context @@ -22,40 +22,40 @@ import org.mockito.Mockito.atLeastOnce import org.mockito.Mockito.verify import org.mockito.junit.MockitoJUnit import org.mockito.junit.MockitoRule -import org.oppia.app.model.AnswerOutcome -import org.oppia.app.model.EphemeralState -import org.oppia.app.model.EphemeralState.StateTypeCase.COMPLETED_STATE -import org.oppia.app.model.EphemeralState.StateTypeCase.PENDING_STATE -import org.oppia.app.model.EphemeralState.StateTypeCase.TERMINAL_STATE -import org.oppia.app.model.Exploration -import org.oppia.app.model.Hint -import org.oppia.app.model.InteractionObject -import org.oppia.app.model.Solution -import org.oppia.app.model.UserAnswer -import org.oppia.domain.classify.InteractionsModule -import org.oppia.domain.classify.rules.continueinteraction.ContinueModule -import org.oppia.domain.classify.rules.dragAndDropSortInput.DragDropSortInputModule -import org.oppia.domain.classify.rules.fractioninput.FractionInputModule -import org.oppia.domain.classify.rules.imageClickInput.ImageClickInputModule -import org.oppia.domain.classify.rules.itemselectioninput.ItemSelectionInputModule -import org.oppia.domain.classify.rules.multiplechoiceinput.MultipleChoiceInputModule -import org.oppia.domain.classify.rules.numberwithunits.NumberWithUnitsRuleModule -import org.oppia.domain.classify.rules.numericinput.NumericInputRuleModule -import org.oppia.domain.classify.rules.ratioinput.RatioInputModule -import org.oppia.domain.classify.rules.textinput.TextInputRuleModule -import org.oppia.domain.oppialogger.LogStorageModule -import org.oppia.domain.topic.TEST_EXPLORATION_ID_0 -import org.oppia.domain.topic.TEST_EXPLORATION_ID_1 -import org.oppia.domain.util.toAnswerString -import org.oppia.testing.FakeExceptionLogger -import org.oppia.testing.TestCoroutineDispatchers -import org.oppia.testing.TestDispatcherModule -import org.oppia.testing.TestLogReportingModule -import org.oppia.util.data.AsyncResult -import org.oppia.util.logging.EnableConsoleLog -import org.oppia.util.logging.EnableFileLog -import org.oppia.util.logging.GlobalLogLevel -import org.oppia.util.logging.LogLevel +import org.oppia.android.app.model.AnswerOutcome +import org.oppia.android.app.model.EphemeralState +import org.oppia.android.app.model.EphemeralState.StateTypeCase.COMPLETED_STATE +import org.oppia.android.app.model.EphemeralState.StateTypeCase.PENDING_STATE +import org.oppia.android.app.model.EphemeralState.StateTypeCase.TERMINAL_STATE +import org.oppia.android.app.model.Exploration +import org.oppia.android.app.model.Hint +import org.oppia.android.app.model.InteractionObject +import org.oppia.android.app.model.Solution +import org.oppia.android.app.model.UserAnswer +import org.oppia.android.domain.classify.InteractionsModule +import org.oppia.android.domain.classify.rules.continueinteraction.ContinueModule +import org.oppia.android.domain.classify.rules.dragAndDropSortInput.DragDropSortInputModule +import org.oppia.android.domain.classify.rules.fractioninput.FractionInputModule +import org.oppia.android.domain.classify.rules.imageClickInput.ImageClickInputModule +import org.oppia.android.domain.classify.rules.itemselectioninput.ItemSelectionInputModule +import org.oppia.android.domain.classify.rules.multiplechoiceinput.MultipleChoiceInputModule +import org.oppia.android.domain.classify.rules.numberwithunits.NumberWithUnitsRuleModule +import org.oppia.android.domain.classify.rules.numericinput.NumericInputRuleModule +import org.oppia.android.domain.classify.rules.ratioinput.RatioInputModule +import org.oppia.android.domain.classify.rules.textinput.TextInputRuleModule +import org.oppia.android.domain.oppialogger.LogStorageModule +import org.oppia.android.domain.topic.TEST_EXPLORATION_ID_0 +import org.oppia.android.domain.topic.TEST_EXPLORATION_ID_1 +import org.oppia.android.domain.util.toAnswerString +import org.oppia.android.testing.FakeExceptionLogger +import org.oppia.android.testing.TestCoroutineDispatchers +import org.oppia.android.testing.TestDispatcherModule +import org.oppia.android.testing.TestLogReportingModule +import org.oppia.android.util.data.AsyncResult +import org.oppia.android.util.logging.EnableConsoleLog +import org.oppia.android.util.logging.EnableFileLog +import org.oppia.android.util.logging.GlobalLogLevel +import org.oppia.android.util.logging.LogLevel import org.robolectric.annotation.Config import org.robolectric.annotation.LooperMode import java.io.FileNotFoundException diff --git a/domain/src/test/java/org/oppia/android/domain/onboarding/AppStartupStateControllerTest.kt b/domain/src/test/java/org/oppia/android/domain/onboarding/AppStartupStateControllerTest.kt index bea0edbcbee..b6ee12cfb20 100644 --- a/domain/src/test/java/org/oppia/android/domain/onboarding/AppStartupStateControllerTest.kt +++ b/domain/src/test/java/org/oppia/android/domain/onboarding/AppStartupStateControllerTest.kt @@ -1,4 +1,4 @@ -package org.oppia.domain.onboarding +package org.oppia.android.domain.onboarding import android.app.Application import android.content.Context @@ -25,21 +25,21 @@ import org.mockito.Mockito.atLeastOnce import org.mockito.Mockito.verify import org.mockito.junit.MockitoJUnit import org.mockito.junit.MockitoRule -import org.oppia.app.model.AppStartupState -import org.oppia.app.model.AppStartupState.StartupMode -import org.oppia.app.model.AppStartupState.StartupMode.APP_IS_DEPRECATED -import org.oppia.app.model.AppStartupState.StartupMode.USER_IS_ONBOARDED -import org.oppia.app.model.AppStartupState.StartupMode.USER_NOT_YET_ONBOARDED -import org.oppia.app.model.OnboardingState -import org.oppia.data.persistence.PersistentCacheStore -import org.oppia.testing.TestCoroutineDispatchers -import org.oppia.testing.TestDispatcherModule -import org.oppia.testing.TestLogReportingModule -import org.oppia.util.data.AsyncResult -import org.oppia.util.logging.EnableConsoleLog -import org.oppia.util.logging.EnableFileLog -import org.oppia.util.logging.GlobalLogLevel -import org.oppia.util.logging.LogLevel +import org.oppia.android.app.model.AppStartupState +import org.oppia.android.app.model.AppStartupState.StartupMode +import org.oppia.android.app.model.AppStartupState.StartupMode.APP_IS_DEPRECATED +import org.oppia.android.app.model.AppStartupState.StartupMode.USER_IS_ONBOARDED +import org.oppia.android.app.model.AppStartupState.StartupMode.USER_NOT_YET_ONBOARDED +import org.oppia.android.app.model.OnboardingState +import org.oppia.android.data.persistence.PersistentCacheStore +import org.oppia.android.testing.TestCoroutineDispatchers +import org.oppia.android.testing.TestDispatcherModule +import org.oppia.android.testing.TestLogReportingModule +import org.oppia.android.util.data.AsyncResult +import org.oppia.android.util.logging.EnableConsoleLog +import org.oppia.android.util.logging.EnableFileLog +import org.oppia.android.util.logging.GlobalLogLevel +import org.oppia.android.util.logging.LogLevel import org.robolectric.Shadows.shadowOf import org.robolectric.annotation.Config import java.text.SimpleDateFormat diff --git a/domain/src/test/java/org/oppia/android/domain/oppialogger/OppiaLoggerTest.kt b/domain/src/test/java/org/oppia/android/domain/oppialogger/OppiaLoggerTest.kt index 733c544d9e7..30de9feba66 100644 --- a/domain/src/test/java/org/oppia/android/domain/oppialogger/OppiaLoggerTest.kt +++ b/domain/src/test/java/org/oppia/android/domain/oppialogger/OppiaLoggerTest.kt @@ -1,4 +1,4 @@ -package org.oppia.domain.oppialogger +package org.oppia.android.domain.oppialogger import android.app.Application import android.content.Context @@ -12,20 +12,20 @@ import dagger.Provides import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.oppia.app.model.EventLog -import org.oppia.domain.oppialogger.analytics.TEST_EXPLORATION_ID -import org.oppia.domain.oppialogger.analytics.TEST_QUESTION_ID -import org.oppia.domain.oppialogger.analytics.TEST_SKILL_ID -import org.oppia.domain.oppialogger.analytics.TEST_SKILL_LIST_ID -import org.oppia.domain.oppialogger.analytics.TEST_STORY_ID -import org.oppia.domain.oppialogger.analytics.TEST_SUB_TOPIC_ID -import org.oppia.domain.oppialogger.analytics.TEST_TOPIC_ID -import org.oppia.testing.TestDispatcherModule -import org.oppia.testing.TestLogReportingModule -import org.oppia.util.logging.EnableConsoleLog -import org.oppia.util.logging.EnableFileLog -import org.oppia.util.logging.GlobalLogLevel -import org.oppia.util.logging.LogLevel +import org.oppia.android.app.model.EventLog +import org.oppia.android.domain.oppialogger.analytics.TEST_EXPLORATION_ID +import org.oppia.android.domain.oppialogger.analytics.TEST_QUESTION_ID +import org.oppia.android.domain.oppialogger.analytics.TEST_SKILL_ID +import org.oppia.android.domain.oppialogger.analytics.TEST_SKILL_LIST_ID +import org.oppia.android.domain.oppialogger.analytics.TEST_STORY_ID +import org.oppia.android.domain.oppialogger.analytics.TEST_SUB_TOPIC_ID +import org.oppia.android.domain.oppialogger.analytics.TEST_TOPIC_ID +import org.oppia.android.testing.TestDispatcherModule +import org.oppia.android.testing.TestLogReportingModule +import org.oppia.android.util.logging.EnableConsoleLog +import org.oppia.android.util.logging.EnableFileLog +import org.oppia.android.util.logging.GlobalLogLevel +import org.oppia.android.util.logging.LogLevel import org.robolectric.annotation.Config import org.robolectric.annotation.LooperMode import javax.inject.Inject diff --git a/domain/src/test/java/org/oppia/android/domain/oppialogger/analytics/AnalyticsControllerTest.kt b/domain/src/test/java/org/oppia/android/domain/oppialogger/analytics/AnalyticsControllerTest.kt index 1a98b9875a5..6d682aa2467 100644 --- a/domain/src/test/java/org/oppia/android/domain/oppialogger/analytics/AnalyticsControllerTest.kt +++ b/domain/src/test/java/org/oppia/android/domain/oppialogger/analytics/AnalyticsControllerTest.kt @@ -1,4 +1,4 @@ -package org.oppia.domain.oppialogger.analytics +package org.oppia.android.domain.oppialogger.analytics import android.app.Application import android.content.Context @@ -21,29 +21,29 @@ import org.mockito.Mockito.atLeastOnce import org.mockito.Mockito.verify import org.mockito.junit.MockitoJUnit import org.mockito.junit.MockitoRule -import org.oppia.app.model.EventLog.Context.ActivityContextCase.ACTIVITYCONTEXT_NOT_SET -import org.oppia.app.model.EventLog.Context.ActivityContextCase.CONCEPT_CARD_CONTEXT -import org.oppia.app.model.EventLog.Context.ActivityContextCase.EXPLORATION_CONTEXT -import org.oppia.app.model.EventLog.Context.ActivityContextCase.QUESTION_CONTEXT -import org.oppia.app.model.EventLog.Context.ActivityContextCase.REVISION_CARD_CONTEXT -import org.oppia.app.model.EventLog.Context.ActivityContextCase.STORY_CONTEXT -import org.oppia.app.model.EventLog.Context.ActivityContextCase.TOPIC_CONTEXT -import org.oppia.app.model.EventLog.EventAction -import org.oppia.app.model.EventLog.Priority -import org.oppia.app.model.OppiaEventLogs -import org.oppia.domain.oppialogger.EventLogStorageCacheSize -import org.oppia.domain.oppialogger.OppiaLogger -import org.oppia.testing.FakeEventLogger -import org.oppia.testing.TestCoroutineDispatchers -import org.oppia.testing.TestDispatcherModule -import org.oppia.testing.TestLogReportingModule -import org.oppia.util.data.AsyncResult -import org.oppia.util.logging.EnableConsoleLog -import org.oppia.util.logging.EnableFileLog -import org.oppia.util.logging.GlobalLogLevel -import org.oppia.util.logging.LogLevel -import org.oppia.util.networking.NetworkConnectionUtil -import org.oppia.util.networking.NetworkConnectionUtil.ConnectionStatus.NONE +import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.ACTIVITYCONTEXT_NOT_SET +import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.CONCEPT_CARD_CONTEXT +import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.EXPLORATION_CONTEXT +import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.QUESTION_CONTEXT +import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.REVISION_CARD_CONTEXT +import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.STORY_CONTEXT +import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.TOPIC_CONTEXT +import org.oppia.android.app.model.EventLog.EventAction +import org.oppia.android.app.model.EventLog.Priority +import org.oppia.android.app.model.OppiaEventLogs +import org.oppia.android.domain.oppialogger.EventLogStorageCacheSize +import org.oppia.android.domain.oppialogger.OppiaLogger +import org.oppia.android.testing.FakeEventLogger +import org.oppia.android.testing.TestCoroutineDispatchers +import org.oppia.android.testing.TestDispatcherModule +import org.oppia.android.testing.TestLogReportingModule +import org.oppia.android.util.data.AsyncResult +import org.oppia.android.util.logging.EnableConsoleLog +import org.oppia.android.util.logging.EnableFileLog +import org.oppia.android.util.logging.GlobalLogLevel +import org.oppia.android.util.logging.LogLevel +import org.oppia.android.util.networking.NetworkConnectionUtil +import org.oppia.android.util.networking.NetworkConnectionUtil.ConnectionStatus.NONE import org.robolectric.annotation.Config import org.robolectric.annotation.LooperMode import javax.inject.Inject diff --git a/domain/src/test/java/org/oppia/android/domain/oppialogger/exceptions/ExceptionsControllerTest.kt b/domain/src/test/java/org/oppia/android/domain/oppialogger/exceptions/ExceptionsControllerTest.kt index acd2c4cc333..78630928cb6 100644 --- a/domain/src/test/java/org/oppia/android/domain/oppialogger/exceptions/ExceptionsControllerTest.kt +++ b/domain/src/test/java/org/oppia/android/domain/oppialogger/exceptions/ExceptionsControllerTest.kt @@ -1,4 +1,4 @@ -package org.oppia.domain.oppialogger.exceptions +package org.oppia.android.domain.oppialogger.exceptions import android.app.Application import android.content.Context @@ -21,20 +21,20 @@ import org.mockito.Mockito.atLeastOnce import org.mockito.Mockito.verify import org.mockito.junit.MockitoJUnit import org.mockito.junit.MockitoRule -import org.oppia.app.model.ExceptionLog.ExceptionType -import org.oppia.app.model.OppiaExceptionLogs -import org.oppia.domain.oppialogger.ExceptionLogStorageCacheSize -import org.oppia.testing.FakeExceptionLogger -import org.oppia.testing.TestCoroutineDispatchers -import org.oppia.testing.TestDispatcherModule -import org.oppia.testing.TestLogReportingModule -import org.oppia.util.data.AsyncResult -import org.oppia.util.data.DataProviders -import org.oppia.util.logging.EnableConsoleLog -import org.oppia.util.logging.EnableFileLog -import org.oppia.util.logging.GlobalLogLevel -import org.oppia.util.logging.LogLevel -import org.oppia.util.networking.NetworkConnectionUtil +import org.oppia.android.app.model.ExceptionLog.ExceptionType +import org.oppia.android.app.model.OppiaExceptionLogs +import org.oppia.android.domain.oppialogger.ExceptionLogStorageCacheSize +import org.oppia.android.testing.FakeExceptionLogger +import org.oppia.android.testing.TestCoroutineDispatchers +import org.oppia.android.testing.TestDispatcherModule +import org.oppia.android.testing.TestLogReportingModule +import org.oppia.android.util.data.AsyncResult +import org.oppia.android.util.data.DataProviders +import org.oppia.android.util.logging.EnableConsoleLog +import org.oppia.android.util.logging.EnableFileLog +import org.oppia.android.util.logging.GlobalLogLevel +import org.oppia.android.util.logging.LogLevel +import org.oppia.android.util.networking.NetworkConnectionUtil import org.robolectric.annotation.Config import org.robolectric.annotation.LooperMode import javax.inject.Inject diff --git a/domain/src/test/java/org/oppia/android/domain/oppialogger/exceptions/UncaughtExceptionLoggerStartupListenerTest.kt b/domain/src/test/java/org/oppia/android/domain/oppialogger/exceptions/UncaughtExceptionLoggerStartupListenerTest.kt index 7719d3b689b..58d0487f493 100644 --- a/domain/src/test/java/org/oppia/android/domain/oppialogger/exceptions/UncaughtExceptionLoggerStartupListenerTest.kt +++ b/domain/src/test/java/org/oppia/android/domain/oppialogger/exceptions/UncaughtExceptionLoggerStartupListenerTest.kt @@ -1,4 +1,4 @@ -package org.oppia.domain.oppialogger.exceptions +package org.oppia.android.domain.oppialogger.exceptions import android.app.Application import android.content.Context @@ -21,19 +21,19 @@ import org.mockito.Mockito.atLeastOnce import org.mockito.Mockito.verify import org.mockito.junit.MockitoJUnit import org.mockito.junit.MockitoRule -import org.oppia.app.model.OppiaExceptionLogs -import org.oppia.domain.oppialogger.ExceptionLogStorageCacheSize -import org.oppia.testing.FakeExceptionLogger -import org.oppia.testing.TestCoroutineDispatchers -import org.oppia.testing.TestDispatcherModule -import org.oppia.testing.TestLogReportingModule -import org.oppia.util.data.AsyncResult -import org.oppia.util.data.DataProviders -import org.oppia.util.logging.EnableConsoleLog -import org.oppia.util.logging.EnableFileLog -import org.oppia.util.logging.GlobalLogLevel -import org.oppia.util.logging.LogLevel -import org.oppia.util.networking.NetworkConnectionUtil +import org.oppia.android.app.model.OppiaExceptionLogs +import org.oppia.android.domain.oppialogger.ExceptionLogStorageCacheSize +import org.oppia.android.testing.FakeExceptionLogger +import org.oppia.android.testing.TestCoroutineDispatchers +import org.oppia.android.testing.TestDispatcherModule +import org.oppia.android.testing.TestLogReportingModule +import org.oppia.android.util.data.AsyncResult +import org.oppia.android.util.data.DataProviders +import org.oppia.android.util.logging.EnableConsoleLog +import org.oppia.android.util.logging.EnableFileLog +import org.oppia.android.util.logging.GlobalLogLevel +import org.oppia.android.util.logging.LogLevel +import org.oppia.android.util.networking.NetworkConnectionUtil import org.robolectric.annotation.Config import javax.inject.Inject import javax.inject.Qualifier diff --git a/domain/src/test/java/org/oppia/android/domain/profile/ProfileManagementControllerTest.kt b/domain/src/test/java/org/oppia/android/domain/profile/ProfileManagementControllerTest.kt index 9615e4fd815..c435dc8c6fa 100644 --- a/domain/src/test/java/org/oppia/android/domain/profile/ProfileManagementControllerTest.kt +++ b/domain/src/test/java/org/oppia/android/domain/profile/ProfileManagementControllerTest.kt @@ -1,4 +1,4 @@ -package org.oppia.domain.profile +package org.oppia.android.domain.profile import android.app.Application import android.content.Context @@ -21,23 +21,23 @@ import org.mockito.Mockito.atLeastOnce import org.mockito.Mockito.verify import org.mockito.junit.MockitoJUnit import org.mockito.junit.MockitoRule -import org.oppia.app.model.AppLanguage -import org.oppia.app.model.AudioLanguage -import org.oppia.app.model.DeviceSettings -import org.oppia.app.model.Profile -import org.oppia.app.model.ProfileDatabase -import org.oppia.app.model.ProfileId -import org.oppia.app.model.ReadingTextSize -import org.oppia.domain.oppialogger.LogStorageModule -import org.oppia.testing.TestCoroutineDispatchers -import org.oppia.testing.TestDispatcherModule -import org.oppia.testing.TestLogReportingModule -import org.oppia.testing.profile.ProfileTestHelper -import org.oppia.util.data.AsyncResult -import org.oppia.util.logging.EnableConsoleLog -import org.oppia.util.logging.EnableFileLog -import org.oppia.util.logging.GlobalLogLevel -import org.oppia.util.logging.LogLevel +import org.oppia.android.app.model.AppLanguage +import org.oppia.android.app.model.AudioLanguage +import org.oppia.android.app.model.DeviceSettings +import org.oppia.android.app.model.Profile +import org.oppia.android.app.model.ProfileDatabase +import org.oppia.android.app.model.ProfileId +import org.oppia.android.app.model.ReadingTextSize +import org.oppia.android.domain.oppialogger.LogStorageModule +import org.oppia.android.testing.TestCoroutineDispatchers +import org.oppia.android.testing.TestDispatcherModule +import org.oppia.android.testing.TestLogReportingModule +import org.oppia.android.testing.profile.ProfileTestHelper +import org.oppia.android.util.data.AsyncResult +import org.oppia.android.util.logging.EnableConsoleLog +import org.oppia.android.util.logging.EnableFileLog +import org.oppia.android.util.logging.GlobalLogLevel +import org.oppia.android.util.logging.LogLevel import org.robolectric.annotation.Config import org.robolectric.annotation.LooperMode import java.io.File @@ -530,7 +530,7 @@ class ProfileManagementControllerTest { verifyUpdateFailed() assertThat(updateResultCaptor.value.getErrorOrNull()).hasMessageThat() .contains( - "org.oppia.domain.profile.ProfileManagementController\$ProfileNotFoundException: " + + "org.oppia.android.domain.profile.ProfileManagementController\$ProfileNotFoundException: " + "ProfileId 6 is not associated with an existing profile" ) } @@ -949,7 +949,7 @@ class ProfileManagementControllerTest { private fun getAbsoluteDirPath(path: String): String { /** - * context.filesDir.toString() looks like /tmp/robolectric-Method_test_name/org.oppia.util.test-dataDir/files + * context.filesDir.toString() looks like /tmp/robolectric-Method_test_name/org.oppia.android.util.test-dataDir/files * dropLast(5) removes files from the path and then it appends the real path with "app_" as a prefix */ return context.filesDir.toString().dropLast(5) + "app_" + path diff --git a/domain/src/test/java/org/oppia/android/domain/question/QuestionAssessmentProgressControllerTest.kt b/domain/src/test/java/org/oppia/android/domain/question/QuestionAssessmentProgressControllerTest.kt index 490aa758200..ecc12c7fc39 100644 --- a/domain/src/test/java/org/oppia/android/domain/question/QuestionAssessmentProgressControllerTest.kt +++ b/domain/src/test/java/org/oppia/android/domain/question/QuestionAssessmentProgressControllerTest.kt @@ -1,4 +1,4 @@ -package org.oppia.domain.question +package org.oppia.android.domain.question import android.app.Application import android.content.Context @@ -22,39 +22,39 @@ import org.mockito.Mockito.atLeastOnce import org.mockito.Mockito.verify import org.mockito.junit.MockitoJUnit import org.mockito.junit.MockitoRule -import org.oppia.app.model.AnsweredQuestionOutcome -import org.oppia.app.model.EphemeralQuestion -import org.oppia.app.model.EphemeralState.StateTypeCase.COMPLETED_STATE -import org.oppia.app.model.EphemeralState.StateTypeCase.PENDING_STATE -import org.oppia.app.model.EphemeralState.StateTypeCase.TERMINAL_STATE -import org.oppia.app.model.Hint -import org.oppia.app.model.InteractionObject -import org.oppia.app.model.Solution -import org.oppia.app.model.UserAnswer -import org.oppia.domain.classify.InteractionsModule -import org.oppia.domain.classify.rules.continueinteraction.ContinueModule -import org.oppia.domain.classify.rules.dragAndDropSortInput.DragDropSortInputModule -import org.oppia.domain.classify.rules.fractioninput.FractionInputModule -import org.oppia.domain.classify.rules.imageClickInput.ImageClickInputModule -import org.oppia.domain.classify.rules.itemselectioninput.ItemSelectionInputModule -import org.oppia.domain.classify.rules.multiplechoiceinput.MultipleChoiceInputModule -import org.oppia.domain.classify.rules.numberwithunits.NumberWithUnitsRuleModule -import org.oppia.domain.classify.rules.numericinput.NumericInputRuleModule -import org.oppia.domain.classify.rules.ratioinput.RatioInputModule -import org.oppia.domain.classify.rules.textinput.TextInputRuleModule -import org.oppia.domain.oppialogger.LogStorageModule -import org.oppia.domain.topic.TEST_SKILL_ID_0 -import org.oppia.domain.topic.TEST_SKILL_ID_1 -import org.oppia.domain.topic.TEST_SKILL_ID_2 -import org.oppia.testing.FakeExceptionLogger -import org.oppia.testing.TestCoroutineDispatchers -import org.oppia.testing.TestDispatcherModule -import org.oppia.testing.TestLogReportingModule -import org.oppia.util.data.AsyncResult -import org.oppia.util.logging.EnableConsoleLog -import org.oppia.util.logging.EnableFileLog -import org.oppia.util.logging.GlobalLogLevel -import org.oppia.util.logging.LogLevel +import org.oppia.android.app.model.AnsweredQuestionOutcome +import org.oppia.android.app.model.EphemeralQuestion +import org.oppia.android.app.model.EphemeralState.StateTypeCase.COMPLETED_STATE +import org.oppia.android.app.model.EphemeralState.StateTypeCase.PENDING_STATE +import org.oppia.android.app.model.EphemeralState.StateTypeCase.TERMINAL_STATE +import org.oppia.android.app.model.Hint +import org.oppia.android.app.model.InteractionObject +import org.oppia.android.app.model.Solution +import org.oppia.android.app.model.UserAnswer +import org.oppia.android.domain.classify.InteractionsModule +import org.oppia.android.domain.classify.rules.continueinteraction.ContinueModule +import org.oppia.android.domain.classify.rules.dragAndDropSortInput.DragDropSortInputModule +import org.oppia.android.domain.classify.rules.fractioninput.FractionInputModule +import org.oppia.android.domain.classify.rules.imageClickInput.ImageClickInputModule +import org.oppia.android.domain.classify.rules.itemselectioninput.ItemSelectionInputModule +import org.oppia.android.domain.classify.rules.multiplechoiceinput.MultipleChoiceInputModule +import org.oppia.android.domain.classify.rules.numberwithunits.NumberWithUnitsRuleModule +import org.oppia.android.domain.classify.rules.numericinput.NumericInputRuleModule +import org.oppia.android.domain.classify.rules.ratioinput.RatioInputModule +import org.oppia.android.domain.classify.rules.textinput.TextInputRuleModule +import org.oppia.android.domain.oppialogger.LogStorageModule +import org.oppia.android.domain.topic.TEST_SKILL_ID_0 +import org.oppia.android.domain.topic.TEST_SKILL_ID_1 +import org.oppia.android.domain.topic.TEST_SKILL_ID_2 +import org.oppia.android.testing.FakeExceptionLogger +import org.oppia.android.testing.TestCoroutineDispatchers +import org.oppia.android.testing.TestDispatcherModule +import org.oppia.android.testing.TestLogReportingModule +import org.oppia.android.util.data.AsyncResult +import org.oppia.android.util.logging.EnableConsoleLog +import org.oppia.android.util.logging.EnableFileLog +import org.oppia.android.util.logging.GlobalLogLevel +import org.oppia.android.util.logging.LogLevel import org.robolectric.annotation.Config import org.robolectric.annotation.LooperMode import javax.inject.Inject diff --git a/domain/src/test/java/org/oppia/android/domain/question/QuestionTrainingControllerTest.kt b/domain/src/test/java/org/oppia/android/domain/question/QuestionTrainingControllerTest.kt index 1c66b75ed67..95bba0b6bd4 100644 --- a/domain/src/test/java/org/oppia/android/domain/question/QuestionTrainingControllerTest.kt +++ b/domain/src/test/java/org/oppia/android/domain/question/QuestionTrainingControllerTest.kt @@ -1,4 +1,4 @@ -package org.oppia.domain.question +package org.oppia.android.domain.question import android.app.Application import android.content.Context @@ -21,34 +21,34 @@ import org.mockito.Mockito.atLeastOnce import org.mockito.Mockito.verify import org.mockito.junit.MockitoJUnit import org.mockito.junit.MockitoRule -import org.oppia.app.model.EphemeralQuestion -import org.oppia.domain.classify.InteractionsModule -import org.oppia.domain.classify.rules.continueinteraction.ContinueModule -import org.oppia.domain.classify.rules.dragAndDropSortInput.DragDropSortInputModule -import org.oppia.domain.classify.rules.fractioninput.FractionInputModule -import org.oppia.domain.classify.rules.imageClickInput.ImageClickInputModule -import org.oppia.domain.classify.rules.itemselectioninput.ItemSelectionInputModule -import org.oppia.domain.classify.rules.multiplechoiceinput.MultipleChoiceInputModule -import org.oppia.domain.classify.rules.numberwithunits.NumberWithUnitsRuleModule -import org.oppia.domain.classify.rules.numericinput.NumericInputRuleModule -import org.oppia.domain.classify.rules.ratioinput.RatioInputModule -import org.oppia.domain.classify.rules.textinput.TextInputRuleModule -import org.oppia.domain.oppialogger.LogStorageModule -import org.oppia.domain.topic.TEST_QUESTION_ID_0 -import org.oppia.domain.topic.TEST_QUESTION_ID_1 -import org.oppia.domain.topic.TEST_QUESTION_ID_3 -import org.oppia.domain.topic.TEST_SKILL_ID_0 -import org.oppia.domain.topic.TEST_SKILL_ID_1 -import org.oppia.domain.topic.TEST_SKILL_ID_2 -import org.oppia.testing.FakeExceptionLogger -import org.oppia.testing.TestCoroutineDispatchers -import org.oppia.testing.TestDispatcherModule -import org.oppia.testing.TestLogReportingModule -import org.oppia.util.data.AsyncResult -import org.oppia.util.logging.EnableConsoleLog -import org.oppia.util.logging.EnableFileLog -import org.oppia.util.logging.GlobalLogLevel -import org.oppia.util.logging.LogLevel +import org.oppia.android.app.model.EphemeralQuestion +import org.oppia.android.domain.classify.InteractionsModule +import org.oppia.android.domain.classify.rules.continueinteraction.ContinueModule +import org.oppia.android.domain.classify.rules.dragAndDropSortInput.DragDropSortInputModule +import org.oppia.android.domain.classify.rules.fractioninput.FractionInputModule +import org.oppia.android.domain.classify.rules.imageClickInput.ImageClickInputModule +import org.oppia.android.domain.classify.rules.itemselectioninput.ItemSelectionInputModule +import org.oppia.android.domain.classify.rules.multiplechoiceinput.MultipleChoiceInputModule +import org.oppia.android.domain.classify.rules.numberwithunits.NumberWithUnitsRuleModule +import org.oppia.android.domain.classify.rules.numericinput.NumericInputRuleModule +import org.oppia.android.domain.classify.rules.ratioinput.RatioInputModule +import org.oppia.android.domain.classify.rules.textinput.TextInputRuleModule +import org.oppia.android.domain.oppialogger.LogStorageModule +import org.oppia.android.domain.topic.TEST_QUESTION_ID_0 +import org.oppia.android.domain.topic.TEST_QUESTION_ID_1 +import org.oppia.android.domain.topic.TEST_QUESTION_ID_3 +import org.oppia.android.domain.topic.TEST_SKILL_ID_0 +import org.oppia.android.domain.topic.TEST_SKILL_ID_1 +import org.oppia.android.domain.topic.TEST_SKILL_ID_2 +import org.oppia.android.testing.FakeExceptionLogger +import org.oppia.android.testing.TestCoroutineDispatchers +import org.oppia.android.testing.TestDispatcherModule +import org.oppia.android.testing.TestLogReportingModule +import org.oppia.android.util.data.AsyncResult +import org.oppia.android.util.logging.EnableConsoleLog +import org.oppia.android.util.logging.EnableFileLog +import org.oppia.android.util.logging.GlobalLogLevel +import org.oppia.android.util.logging.LogLevel import org.robolectric.annotation.Config import org.robolectric.annotation.LooperMode import javax.inject.Inject diff --git a/domain/src/test/java/org/oppia/android/domain/topic/StoryProgressControllerTest.kt b/domain/src/test/java/org/oppia/android/domain/topic/StoryProgressControllerTest.kt index 77d750df3b0..23fd1a3e5cf 100644 --- a/domain/src/test/java/org/oppia/android/domain/topic/StoryProgressControllerTest.kt +++ b/domain/src/test/java/org/oppia/android/domain/topic/StoryProgressControllerTest.kt @@ -1,4 +1,4 @@ -package org.oppia.domain.topic +package org.oppia.android.domain.topic import android.app.Application import android.content.Context @@ -21,18 +21,18 @@ import org.mockito.Mockito.atLeastOnce import org.mockito.Mockito.verify import org.mockito.junit.MockitoJUnit import org.mockito.junit.MockitoRule -import org.oppia.app.model.ProfileId -import org.oppia.domain.oppialogger.LogStorageModule -import org.oppia.testing.TestCoroutineDispatchers -import org.oppia.testing.TestDispatcherModule -import org.oppia.testing.TestLogReportingModule -import org.oppia.testing.profile.ProfileTestHelper -import org.oppia.util.caching.CacheAssetsLocally -import org.oppia.util.data.AsyncResult -import org.oppia.util.logging.EnableConsoleLog -import org.oppia.util.logging.EnableFileLog -import org.oppia.util.logging.GlobalLogLevel -import org.oppia.util.logging.LogLevel +import org.oppia.android.app.model.ProfileId +import org.oppia.android.domain.oppialogger.LogStorageModule +import org.oppia.android.testing.TestCoroutineDispatchers +import org.oppia.android.testing.TestDispatcherModule +import org.oppia.android.testing.TestLogReportingModule +import org.oppia.android.testing.profile.ProfileTestHelper +import org.oppia.android.util.caching.CacheAssetsLocally +import org.oppia.android.util.data.AsyncResult +import org.oppia.android.util.logging.EnableConsoleLog +import org.oppia.android.util.logging.EnableFileLog +import org.oppia.android.util.logging.GlobalLogLevel +import org.oppia.android.util.logging.LogLevel import org.robolectric.annotation.Config import org.robolectric.annotation.LooperMode import java.util.Date diff --git a/domain/src/test/java/org/oppia/android/domain/topic/StoryProgressTestHelperTest.kt b/domain/src/test/java/org/oppia/android/domain/topic/StoryProgressTestHelperTest.kt index 6f11749b3d5..f445e251649 100644 --- a/domain/src/test/java/org/oppia/android/domain/topic/StoryProgressTestHelperTest.kt +++ b/domain/src/test/java/org/oppia/android/domain/topic/StoryProgressTestHelperTest.kt @@ -1,4 +1,4 @@ -package org.oppia.domain.topic +package org.oppia.android.domain.topic import android.app.Application import android.content.Context @@ -21,26 +21,26 @@ import org.mockito.Mockito.atLeastOnce import org.mockito.Mockito.verify import org.mockito.junit.MockitoJUnit import org.mockito.junit.MockitoRule -import org.oppia.app.model.ChapterPlayState -import org.oppia.app.model.CompletedStoryList -import org.oppia.app.model.OngoingStoryList -import org.oppia.app.model.OngoingTopicList -import org.oppia.app.model.ProfileId -import org.oppia.app.model.StorySummary -import org.oppia.app.model.Topic -import org.oppia.domain.oppialogger.LogStorageModule -import org.oppia.testing.TestCoroutineDispatchers -import org.oppia.testing.TestDispatcherModule -import org.oppia.testing.TestLogReportingModule -import org.oppia.util.caching.CacheAssetsLocally -import org.oppia.util.data.AsyncResult -import org.oppia.util.gcsresource.DefaultResourceBucketName -import org.oppia.util.logging.EnableConsoleLog -import org.oppia.util.logging.EnableFileLog -import org.oppia.util.logging.GlobalLogLevel -import org.oppia.util.logging.LogLevel -import org.oppia.util.parser.DefaultGcsPrefix -import org.oppia.util.parser.ImageDownloadUrlTemplate +import org.oppia.android.app.model.ChapterPlayState +import org.oppia.android.app.model.CompletedStoryList +import org.oppia.android.app.model.OngoingStoryList +import org.oppia.android.app.model.OngoingTopicList +import org.oppia.android.app.model.ProfileId +import org.oppia.android.app.model.StorySummary +import org.oppia.android.app.model.Topic +import org.oppia.android.domain.oppialogger.LogStorageModule +import org.oppia.android.testing.TestCoroutineDispatchers +import org.oppia.android.testing.TestDispatcherModule +import org.oppia.android.testing.TestLogReportingModule +import org.oppia.android.util.caching.CacheAssetsLocally +import org.oppia.android.util.data.AsyncResult +import org.oppia.android.util.gcsresource.DefaultResourceBucketName +import org.oppia.android.util.logging.EnableConsoleLog +import org.oppia.android.util.logging.EnableFileLog +import org.oppia.android.util.logging.GlobalLogLevel +import org.oppia.android.util.logging.LogLevel +import org.oppia.android.util.parser.DefaultGcsPrefix +import org.oppia.android.util.parser.ImageDownloadUrlTemplate import org.robolectric.annotation.Config import org.robolectric.annotation.LooperMode import javax.inject.Inject diff --git a/domain/src/test/java/org/oppia/android/domain/topic/TopicControllerTest.kt b/domain/src/test/java/org/oppia/android/domain/topic/TopicControllerTest.kt index 38da4643142..1a60a2dbce7 100755 --- a/domain/src/test/java/org/oppia/android/domain/topic/TopicControllerTest.kt +++ b/domain/src/test/java/org/oppia/android/domain/topic/TopicControllerTest.kt @@ -1,4 +1,4 @@ -package org.oppia.domain.topic +package org.oppia.android.domain.topic import android.app.Application import android.content.Context @@ -22,27 +22,27 @@ import org.mockito.Mockito.atLeastOnce import org.mockito.Mockito.verify import org.mockito.junit.MockitoJUnit import org.mockito.junit.MockitoRule -import org.oppia.app.model.ChapterPlayState -import org.oppia.app.model.ChapterSummary -import org.oppia.app.model.CompletedStoryList -import org.oppia.app.model.LessonThumbnailGraphic -import org.oppia.app.model.OngoingTopicList -import org.oppia.app.model.ProfileId -import org.oppia.app.model.Question -import org.oppia.app.model.StorySummary -import org.oppia.app.model.Topic -import org.oppia.domain.oppialogger.LogStorageModule -import org.oppia.testing.FakeExceptionLogger -import org.oppia.testing.TestCoroutineDispatchers -import org.oppia.testing.TestDispatcherModule -import org.oppia.testing.TestLogReportingModule -import org.oppia.util.caching.CacheAssetsLocally -import org.oppia.util.data.AsyncResult -import org.oppia.util.data.DataProviders -import org.oppia.util.logging.EnableConsoleLog -import org.oppia.util.logging.EnableFileLog -import org.oppia.util.logging.GlobalLogLevel -import org.oppia.util.logging.LogLevel +import org.oppia.android.app.model.ChapterPlayState +import org.oppia.android.app.model.ChapterSummary +import org.oppia.android.app.model.CompletedStoryList +import org.oppia.android.app.model.LessonThumbnailGraphic +import org.oppia.android.app.model.OngoingTopicList +import org.oppia.android.app.model.ProfileId +import org.oppia.android.app.model.Question +import org.oppia.android.app.model.StorySummary +import org.oppia.android.app.model.Topic +import org.oppia.android.domain.oppialogger.LogStorageModule +import org.oppia.android.testing.FakeExceptionLogger +import org.oppia.android.testing.TestCoroutineDispatchers +import org.oppia.android.testing.TestDispatcherModule +import org.oppia.android.testing.TestLogReportingModule +import org.oppia.android.util.caching.CacheAssetsLocally +import org.oppia.android.util.data.AsyncResult +import org.oppia.android.util.data.DataProviders +import org.oppia.android.util.logging.EnableConsoleLog +import org.oppia.android.util.logging.EnableFileLog +import org.oppia.android.util.logging.GlobalLogLevel +import org.oppia.android.util.logging.LogLevel import org.robolectric.annotation.Config import org.robolectric.annotation.LooperMode import java.io.FileNotFoundException diff --git a/domain/src/test/java/org/oppia/android/domain/topic/TopicListControllerTest.kt b/domain/src/test/java/org/oppia/android/domain/topic/TopicListControllerTest.kt index daac4319294..50d8888eb7a 100644 --- a/domain/src/test/java/org/oppia/android/domain/topic/TopicListControllerTest.kt +++ b/domain/src/test/java/org/oppia/android/domain/topic/TopicListControllerTest.kt @@ -1,4 +1,4 @@ -package org.oppia.domain.topic +package org.oppia.android.domain.topic import android.app.Application import android.content.Context @@ -22,23 +22,23 @@ import org.mockito.Mockito.atLeastOnce import org.mockito.Mockito.verify import org.mockito.junit.MockitoJUnit import org.mockito.junit.MockitoRule -import org.oppia.app.model.LessonThumbnailGraphic -import org.oppia.app.model.OngoingStoryList -import org.oppia.app.model.ProfileId -import org.oppia.app.model.PromotedStory -import org.oppia.domain.oppialogger.LogStorageModule -import org.oppia.testing.TestCoroutineDispatchers -import org.oppia.testing.TestDispatcherModule -import org.oppia.testing.TestLogReportingModule -import org.oppia.util.caching.CacheAssetsLocally -import org.oppia.util.data.AsyncResult -import org.oppia.util.gcsresource.DefaultResourceBucketName -import org.oppia.util.logging.EnableConsoleLog -import org.oppia.util.logging.EnableFileLog -import org.oppia.util.logging.GlobalLogLevel -import org.oppia.util.logging.LogLevel -import org.oppia.util.parser.DefaultGcsPrefix -import org.oppia.util.parser.ImageDownloadUrlTemplate +import org.oppia.android.app.model.LessonThumbnailGraphic +import org.oppia.android.app.model.OngoingStoryList +import org.oppia.android.app.model.ProfileId +import org.oppia.android.app.model.PromotedStory +import org.oppia.android.domain.oppialogger.LogStorageModule +import org.oppia.android.testing.TestCoroutineDispatchers +import org.oppia.android.testing.TestDispatcherModule +import org.oppia.android.testing.TestLogReportingModule +import org.oppia.android.util.caching.CacheAssetsLocally +import org.oppia.android.util.data.AsyncResult +import org.oppia.android.util.gcsresource.DefaultResourceBucketName +import org.oppia.android.util.logging.EnableConsoleLog +import org.oppia.android.util.logging.EnableFileLog +import org.oppia.android.util.logging.GlobalLogLevel +import org.oppia.android.util.logging.LogLevel +import org.oppia.android.util.parser.DefaultGcsPrefix +import org.oppia.android.util.parser.ImageDownloadUrlTemplate import org.robolectric.annotation.Config import org.robolectric.annotation.LooperMode import java.util.Date diff --git a/domain/src/test/java/org/oppia/android/domain/util/InteractionObjectExtensionsTest.kt b/domain/src/test/java/org/oppia/android/domain/util/InteractionObjectExtensionsTest.kt index b2617814a0b..8e3f3afd864 100644 --- a/domain/src/test/java/org/oppia/android/domain/util/InteractionObjectExtensionsTest.kt +++ b/domain/src/test/java/org/oppia/android/domain/util/InteractionObjectExtensionsTest.kt @@ -1,20 +1,20 @@ -package org.oppia.domain.util +package org.oppia.android.domain.util import androidx.test.ext.junit.runners.AndroidJUnit4 import com.google.common.truth.Truth.assertThat import org.junit.Test import org.junit.runner.RunWith -import org.oppia.app.model.ClickOnImage -import org.oppia.app.model.ImageWithRegions -import org.oppia.app.model.ImageWithRegions.LabeledRegion -import org.oppia.app.model.ImageWithRegions.LabeledRegion.Region -import org.oppia.app.model.ImageWithRegions.LabeledRegion.Region.NormalizedRectangle2d -import org.oppia.app.model.ImageWithRegions.LabeledRegion.Region.RegionType.RECTANGLE -import org.oppia.app.model.InteractionObject -import org.oppia.app.model.ListOfSetsOfHtmlStrings -import org.oppia.app.model.Point2d -import org.oppia.app.model.RatioExpression -import org.oppia.app.model.StringList +import org.oppia.android.app.model.ClickOnImage +import org.oppia.android.app.model.ImageWithRegions +import org.oppia.android.app.model.ImageWithRegions.LabeledRegion +import org.oppia.android.app.model.ImageWithRegions.LabeledRegion.Region +import org.oppia.android.app.model.ImageWithRegions.LabeledRegion.Region.NormalizedRectangle2d +import org.oppia.android.app.model.ImageWithRegions.LabeledRegion.Region.RegionType.RECTANGLE +import org.oppia.android.app.model.InteractionObject +import org.oppia.android.app.model.ListOfSetsOfHtmlStrings +import org.oppia.android.app.model.Point2d +import org.oppia.android.app.model.RatioExpression +import org.oppia.android.app.model.StringList import org.robolectric.annotation.Config import org.robolectric.annotation.LooperMode diff --git a/domain/src/test/java/org/oppia/android/domain/util/RatioExtensionsTest.kt b/domain/src/test/java/org/oppia/android/domain/util/RatioExtensionsTest.kt index 3981a78cbcb..dffb8e65b2f 100644 --- a/domain/src/test/java/org/oppia/android/domain/util/RatioExtensionsTest.kt +++ b/domain/src/test/java/org/oppia/android/domain/util/RatioExtensionsTest.kt @@ -1,10 +1,10 @@ -package org.oppia.domain.util +package org.oppia.android.domain.util import androidx.test.ext.junit.runners.AndroidJUnit4 import com.google.common.truth.Truth.assertThat import org.junit.Test import org.junit.runner.RunWith -import org.oppia.app.model.RatioExpression +import org.oppia.android.app.model.RatioExpression import org.robolectric.annotation.LooperMode /** Tests for [RatioExtensions]. */ diff --git a/domain/src/test/java/org/oppia/android/domain/util/StateRetrieverTest.kt b/domain/src/test/java/org/oppia/android/domain/util/StateRetrieverTest.kt index 5705c86d5a5..f0e972ea904 100644 --- a/domain/src/test/java/org/oppia/android/domain/util/StateRetrieverTest.kt +++ b/domain/src/test/java/org/oppia/android/domain/util/StateRetrieverTest.kt @@ -1,4 +1,4 @@ -package org.oppia.domain.util +package org.oppia.android.domain.util import android.app.Application import android.content.Context @@ -12,19 +12,19 @@ import dagger.Provides import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.oppia.app.model.AnswerGroup -import org.oppia.app.model.InteractionObject -import org.oppia.app.model.ListOfSetsOfHtmlStrings -import org.oppia.app.model.RatioExpression -import org.oppia.app.model.RuleSpec -import org.oppia.app.model.State -import org.oppia.app.model.StringList -import org.oppia.testing.TestDispatcherModule -import org.oppia.util.caching.CacheAssetsLocally -import org.oppia.util.logging.EnableConsoleLog -import org.oppia.util.logging.EnableFileLog -import org.oppia.util.logging.GlobalLogLevel -import org.oppia.util.logging.LogLevel +import org.oppia.android.app.model.AnswerGroup +import org.oppia.android.app.model.InteractionObject +import org.oppia.android.app.model.ListOfSetsOfHtmlStrings +import org.oppia.android.app.model.RatioExpression +import org.oppia.android.app.model.RuleSpec +import org.oppia.android.app.model.State +import org.oppia.android.app.model.StringList +import org.oppia.android.testing.TestDispatcherModule +import org.oppia.android.util.caching.CacheAssetsLocally +import org.oppia.android.util.logging.EnableConsoleLog +import org.oppia.android.util.logging.EnableFileLog +import org.oppia.android.util.logging.GlobalLogLevel +import org.oppia.android.util.logging.LogLevel import org.robolectric.annotation.Config import org.robolectric.annotation.LooperMode import javax.inject.Inject diff --git a/domain/src/test/java/org/oppia/android/domain/util/StringExtensionsTest.kt b/domain/src/test/java/org/oppia/android/domain/util/StringExtensionsTest.kt index 71a23bff249..f345fd1d134 100644 --- a/domain/src/test/java/org/oppia/android/domain/util/StringExtensionsTest.kt +++ b/domain/src/test/java/org/oppia/android/domain/util/StringExtensionsTest.kt @@ -1,4 +1,4 @@ -package org.oppia.domain.util +package org.oppia.android.domain.util import androidx.test.ext.junit.runners.AndroidJUnit4 import com.google.common.truth.Truth.assertThat diff --git a/model/src/main/proto/example.proto b/model/src/main/proto/example.proto index 32e8a705ce1..72876b20a4b 100644 --- a/model/src/main/proto/example.proto +++ b/model/src/main/proto/example.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package model; -option java_package = "org.oppia.app.model"; +option java_package = "org.oppia.android.app.model"; option java_multiple_files = true; message TestMessage { diff --git a/model/src/main/proto/exploration.proto b/model/src/main/proto/exploration.proto index 9512605f7e3..da6f5fd85d1 100644 --- a/model/src/main/proto/exploration.proto +++ b/model/src/main/proto/exploration.proto @@ -8,11 +8,11 @@ import "interaction_object.proto"; import "translation.proto"; import "voiceover.proto"; -option java_package = "org.oppia.app.model"; +option java_package = "org.oppia.android.app.model"; option java_multiple_files = true; // Structure for a single exploration. -// Maps from: data/src/main/java/org/oppia/data/backends/gae/model/GaeExploration.kt +// Maps from: data/src/main/java/org.oppia.android.android/data/backends/gae/model/GaeExploration.kt message Exploration { // The ID of the exploration. string id = 1; @@ -29,7 +29,7 @@ message Exploration { } // Structure for a param change. -// Maps from: data/src/main/java/org/oppia/data/backends/gae/model/GaeParamChange.kt +// Maps from: data/src/main/java/org.oppia.android.android/data/backends/gae/model/GaeParamChange.kt message ParamChange { string generator_id = 1; string name = 2; @@ -37,7 +37,7 @@ message ParamChange { } // Structure for a param spec. -// Maps from: data/src/main/java/org/oppia/data/backends/gae/model/GaeParamSpec.kt +// Maps from: data/src/main/java/org.oppia.android.android/data/backends/gae/model/GaeParamSpec.kt message ParamSpec { ObjectType obj_type = 1; } @@ -49,7 +49,7 @@ enum ObjectType { } // Structure for a single state -// Maps from: data/src/main/java/org/oppia/data/backends/gae/model/GaeState.kt +// Maps from: data/src/main/java/org.oppia.android.android/data/backends/gae/model/GaeState.kt message State { // The name of the State. string name = 1; @@ -76,7 +76,7 @@ message ParamChangeCustomizationArgs { } // Structure for a single interaction -// Maps from: data/src/main/java/org/oppia/data/backends/gae/model/GaeInteractionInstance.kt +// Maps from: data/src/main/java/org.oppia.android.android/data/backends/gae/model/GaeInteractionInstance.kt message Interaction { string id = 1; repeated AnswerGroup answer_groups = 2; @@ -117,7 +117,7 @@ message CustomSchemaValue { } // Structure for a single answer group -// Maps from: data/src/main/java/org/oppia/data/backends/gae/model/GaeAnswerGroup.kt +// Maps from: data/src/main/java/org.oppia.android.android/data/backends/gae/model/GaeAnswerGroup.kt message AnswerGroup { string tagged_skill_misconception_id = 1; Outcome outcome = 2; @@ -132,7 +132,7 @@ message TrainingData { } // Structure for a single solution -// Maps from: data/src/main/java/org/oppia/data/backends/gae/model/GaeSolution.kt +// Maps from: data/src/main/java/org.oppia.android.android/data/backends/gae/model/GaeSolution.kt message Solution { string interaction_id = 1; // Flag that is true if correct_answer is the only correct answer of the question. @@ -146,7 +146,7 @@ message Solution { } // Structure for a Correct answer in Solution -// Maps from: data/src/main/java/org/oppia/data/backends/gae/model/GaeSolution.kt +// Maps from: data/src/main/java/org.oppia.android.android/data/backends/gae/model/GaeSolution.kt message CorrectAnswer { int32 denominator = 1; int32 numerator = 2; @@ -156,7 +156,7 @@ message CorrectAnswer { } // Structure for a single hint -// Maps from: data/src/main/java/org/oppia/data/backends/gae/model/GaeHint.kt +// Maps from: data/src/main/java/org.oppia.android.android/data/backends/gae/model/GaeHint.kt message Hint { // Hint data. SubtitledHtml hint_content = 1; @@ -167,7 +167,7 @@ message Hint { } // Structure for a single outcome -// Maps from: data/src/main/java/org/oppia/data/backends/gae/model/GaeOutcome.kt +// Maps from: data/src/main/java/org.oppia.android.android/data/backends/gae/model/GaeOutcome.kt message Outcome { string dest_state_name = 1; string refresher_exploration_id = 2; diff --git a/model/src/main/proto/interaction_object.proto b/model/src/main/proto/interaction_object.proto index 3700ccfb69a..212f696ade9 100644 --- a/model/src/main/proto/interaction_object.proto +++ b/model/src/main/proto/interaction_object.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package model; -option java_package = "org.oppia.app.model"; +option java_package = "org.oppia.android.app.model"; option java_multiple_files = true; // Structure for any interaction object diff --git a/model/src/main/proto/onboarding.proto b/model/src/main/proto/onboarding.proto index f55d1684650..1b87d5671b0 100644 --- a/model/src/main/proto/onboarding.proto +++ b/model/src/main/proto/onboarding.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package model; -option java_package = "org.oppia.app.model"; +option java_package = "org.oppia.android.app.model"; option java_multiple_files = true; // Describes the state the user is in upon opening the app. diff --git a/model/src/main/proto/oppia_logger.proto b/model/src/main/proto/oppia_logger.proto index ed29dd0697c..e6c55b758a8 100644 --- a/model/src/main/proto/oppia_logger.proto +++ b/model/src/main/proto/oppia_logger.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package model; -option java_package = "org.oppia.app.model"; +option java_package = "org.oppia.android.app.model"; option java_multiple_files = true; // Structure for an event log. diff --git a/model/src/main/proto/profile.proto b/model/src/main/proto/profile.proto index 110fdfc66f5..5c6a9009ae0 100644 --- a/model/src/main/proto/profile.proto +++ b/model/src/main/proto/profile.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package model; -option java_package = "org.oppia.app.model"; +option java_package = "org.oppia.android.app.model"; option java_multiple_files = true; // Top level proto used to store last used id and all profiles. diff --git a/model/src/main/proto/question.proto b/model/src/main/proto/question.proto index 4d8974fc237..1f31babd384 100644 --- a/model/src/main/proto/question.proto +++ b/model/src/main/proto/question.proto @@ -5,7 +5,7 @@ package model; import "exploration.proto"; import "subtitled_html.proto"; -option java_package = "org.oppia.app.model"; +option java_package = "org.oppia.android.app.model"; option java_multiple_files = true; // Represents a question that can be used to determine how well a learner understands specific skills. diff --git a/model/src/main/proto/subtitled_html.proto b/model/src/main/proto/subtitled_html.proto index 5d0dcdc6a9a..e22f1f1c61d 100644 --- a/model/src/main/proto/subtitled_html.proto +++ b/model/src/main/proto/subtitled_html.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package model; -option java_package = "org.oppia.app.model"; +option java_package = "org.oppia.android.app.model"; option java_multiple_files = true; message SubtitledHtml { diff --git a/model/src/main/proto/subtitled_unicode.proto b/model/src/main/proto/subtitled_unicode.proto index 4de914cf39e..42743b364d8 100644 --- a/model/src/main/proto/subtitled_unicode.proto +++ b/model/src/main/proto/subtitled_unicode.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package model; -option java_package = "org.oppia.app.model"; +option java_package = "org.oppia.android.app.model"; option java_multiple_files = true; // Corresponds to a textual value that can be translated or spoken. diff --git a/model/src/main/proto/thumbnail.proto b/model/src/main/proto/thumbnail.proto index b8168e0f84d..607860ba30a 100644 --- a/model/src/main/proto/thumbnail.proto +++ b/model/src/main/proto/thumbnail.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package model; -option java_package = "org.oppia.app.model"; +option java_package = "org.oppia.android.app.model"; option java_multiple_files = true; // Represents the thumbnail that should be rendered for a lesson. diff --git a/model/src/main/proto/topic.proto b/model/src/main/proto/topic.proto index 1869b2c3aea..8e68f41dad5 100755 --- a/model/src/main/proto/topic.proto +++ b/model/src/main/proto/topic.proto @@ -7,7 +7,7 @@ import "thumbnail.proto"; import "translation.proto"; import "voiceover.proto"; -option java_package = "org.oppia.app.model"; +option java_package = "org.oppia.android.app.model"; option java_multiple_files = true; // Corresponds to a single topic that can be read, played, trained, or reviewed. diff --git a/model/src/main/proto/translation.proto b/model/src/main/proto/translation.proto index b311617585a..6ce348fa0ab 100644 --- a/model/src/main/proto/translation.proto +++ b/model/src/main/proto/translation.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package model; -option java_package = "org.oppia.app.model"; +option java_package = "org.oppia.android.app.model"; option java_multiple_files = true; message TranslationMapping { @@ -11,7 +11,7 @@ message TranslationMapping { } // Structure for a single translation -// Maps from: data/src/main/java/org/oppia/data/backends/gae/model/GaeWrittenTranslation.kt +// Maps from: data/src/main/java/org.oppia.android.android/data/backends/gae/model/GaeWrittenTranslation.kt message Translation { string html = 1; bool needs_update = 2; diff --git a/model/src/main/proto/voiceover.proto b/model/src/main/proto/voiceover.proto index 74cf1b7b37e..cfba38f9679 100644 --- a/model/src/main/proto/voiceover.proto +++ b/model/src/main/proto/voiceover.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package model; -option java_package = "org.oppia.app.model"; +option java_package = "org.oppia.android.app.model"; option java_multiple_files = true; message VoiceoverMapping { @@ -11,7 +11,7 @@ message VoiceoverMapping { } // Structure for a single voiceover -// Maps from: data/src/main/java/org/oppia/data/backends/gae/model/GaeVoiceover.kt +// Maps from: data/src/main/java/org.oppia.android.android/data/backends/gae/model/GaeVoiceover.kt message Voiceover { int64 file_size_bytes = 1; bool needs_update = 2; diff --git a/oppia_android_test.bzl b/oppia_android_test.bzl index fafa68db14a..4902a0a9aea 100644 --- a/oppia_android_test.bzl +++ b/oppia_android_test.bzl @@ -1,41 +1,52 @@ load("@rules_jvm_external//:defs.bzl", "artifact") load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") -def oppia_android_test(name, srcs, test_manifest, custom_package, test_class, deps, - enable_data_binding=False, assets=None, assets_dir=None): - ''' - Creates an Oppia test target for running the specified test as an Android local test with Kotlin - support. Note that this creates an additional, internal library. +def oppia_android_test( + name, + srcs, + test_manifest, + custom_package, + test_class, + deps, + enable_data_binding = False, + assets = None, + assets_dir = None, + **kwargs): + ''' + Creates an Oppia test target for running the specified test as an Android local test with Kotlin + support. Note that this creates an additional, internal library. - Args: - name: str. The name of the Kotlin test file without the '.kt' suffix. - srcs: list of str. The name of the Kotlin test files to be run. - test_manifest: str. The path to the test manifest file. - custom_package: str. The module's package. Example: 'org.oppia.utility'. - test_class: The package of the src file. For example, if the src is 'FakeEventLoggerTest.kt', - then the test_class would be "org.oppia.testing.FakeEventLoggerTest". - enable_data_binding: boolean. Indicates whether the test enables data-binding. - deps: list of str. The list of dependencies needed to run the tests. - assets: list of str. A list of assets needed to run the tests. - assets_dir: str. The path to the assets directory. - ''' + Args: + name: str. The name of the Kotlin test file without the '.kt' suffix. + srcs: list of str. The name of the Kotlin test files to be run. + test_manifest: str. The path to the test manifest file. + custom_package: str. The module's package. Example: 'org.oppia.utility'. + test_class: The package of the src file. For example, if the src is 'FakeEventLoggerTest.kt', + then the test_class would be "org.oppia.testing.FakeEventLoggerTest". + enable_data_binding: boolean. Indicates whether the test enables data-binding. + deps: list of str. The list of dependencies needed to run the tests. + assets: list of str. A list of assets needed to run the tests. + assets_dir: str. The path to the assets directory. + kwargs: additional parameters to pass to android_local_test. + ''' - kt_android_library( - name = name + "_lib", - custom_package = custom_package, - srcs = srcs, - deps = deps, - testonly = True, - manifest = test_manifest, - assets = assets, - assets_dir = assets_dir, - enable_data_binding = enable_data_binding, - ) + kt_android_library( + name = name + "_lib", + custom_package = custom_package, + srcs = srcs, + deps = deps, + testonly = True, + manifest = test_manifest, + assets = assets, + assets_dir = assets_dir, + enable_data_binding = enable_data_binding, + ) - native.android_local_test( - name = name, - custom_package = custom_package, - test_class = test_class, - manifest = test_manifest, - deps = [ ":" + name + "_lib",] + deps, - ) + native.android_local_test( + name = name, + custom_package = custom_package, + test_class = test_class, + manifest = test_manifest, + deps = [":" + name + "_lib"] + deps, + **kwargs + ) diff --git a/testing/BUILD.bazel b/testing/BUILD.bazel index fa7a4744437..05be294813e 100644 --- a/testing/BUILD.bazel +++ b/testing/BUILD.bazel @@ -1,7 +1,7 @@ # TODO(#1532): Rename file to 'BUILD' post-Gradle. -''' +""" This library contains fake objects used for testing as well as tests for these objects. -''' +""" load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") load("@rules_jvm_external//:defs.bzl", "artifact") @@ -11,29 +11,29 @@ load("//testing:testing_test.bzl", "testing_test") # Library for general-purpose testing fakes. kt_android_library( - name = "testing", - custom_package = "org.oppia.testing", - srcs = glob(["src/main/java/org/oppia/testing/**/*.kt"]), - manifest = "src/main/AndroidManifest.xml", - deps = [ - ":dagger", - "//utility", + name = "testing", + srcs = glob(["src/main/java/org/oppia/android/testing/**/*.kt"]), + custom_package = "org.oppia.android.testing", + manifest = "src/main/AndroidManifest.xml", + visibility = ["//visibility:public"], + deps = [ + ":dagger", "//domain", - artifact("org.jetbrains.kotlinx:kotlinx-coroutines-test"), - artifact("org.robolectric:robolectric"), - artifact("org.jetbrains.kotlin:kotlin-reflect"), - artifact("androidx.lifecycle:lifecycle-livedata-ktx"), - artifact("com.google.truth:truth"), - artifact("androidx.test.ext:junit"), - artifact("org.mockito:mockito-core"), - artifact("junit:junit:4.12"), - artifact("androidx.test.espresso:espresso-contrib:3.1.0"), - artifact("androidx.test.espresso:espresso-core:3.2.0"), - artifact("androidx.test.espresso:espresso-intents:3.1.0"), - artifact("androidx.test:runner:1.2.0"), - ], - visibility = ["//visibility:public"], - ) + "//utility", + artifact("org.jetbrains.kotlinx:kotlinx-coroutines-test"), + artifact("org.robolectric:robolectric"), + artifact("org.jetbrains.kotlin:kotlin-reflect"), + artifact("androidx.lifecycle:lifecycle-livedata-ktx"), + artifact("com.google.truth:truth"), + artifact("androidx.test.ext:junit"), + artifact("org.mockito:mockito-core"), + artifact("junit:junit:4.12"), + artifact("androidx.test.espresso:espresso-contrib:3.1.0"), + artifact("androidx.test.espresso:espresso-core:3.2.0"), + artifact("androidx.test.espresso:espresso-intents:3.1.0"), + artifact("androidx.test:runner:1.2.0"), + ], +) TEST_DEPS = [ ":testing", @@ -55,29 +55,29 @@ TEST_DEPS = [ testing_test( name = "CoroutineExecutorServiceTest", - srcs = ["src/test/java/org/oppia/testing/CoroutineExecutorServiceTest.kt"], - test_class = "org.oppia.testing.CoroutineExecutorServiceTest", + srcs = ["src/test/java/org/oppia/android/testing/CoroutineExecutorServiceTest.kt"], + test_class = "org.oppia.android.testing.CoroutineExecutorServiceTest", deps = TEST_DEPS, ) testing_test( name = "FakeEventLoggerTest", - srcs = ["src/test/java/org/oppia/testing/FakeEventLoggerTest.kt"], - test_class = "org.oppia.testing.FakeEventLoggerTest", + srcs = ["src/test/java/org/oppia/android/testing/FakeEventLoggerTest.kt"], + test_class = "org.oppia.android.testing.FakeEventLoggerTest", deps = TEST_DEPS, ) testing_test( name = "FakeExceptionLoggerTest", - srcs = ["src/test/java/org/oppia/testing/FakeExceptionLoggerTest.kt"], - test_class = "org.oppia.testing.FakeExceptionLoggerTest", + srcs = ["src/test/java/org/oppia/android/testing/FakeExceptionLoggerTest.kt"], + test_class = "org.oppia.android.testing.FakeExceptionLoggerTest", deps = TEST_DEPS, ) testing_test( name = "ProfileTestHelperTest", - srcs = ["src/test/java/org/oppia/testing/profile/ProfileTestHelperTest.kt"], - test_class = "org.oppia.testing.profile.ProfileTestHelperTest", + srcs = ["src/test/java/org/oppia/android/testing/profile/ProfileTestHelperTest.kt"], + test_class = "org.oppia.android.testing.profile.ProfileTestHelperTest", deps = TEST_DEPS, ) diff --git a/testing/src/main/AndroidManifest.xml b/testing/src/main/AndroidManifest.xml index 0120380ba65..971a9c38503 100644 --- a/testing/src/main/AndroidManifest.xml +++ b/testing/src/main/AndroidManifest.xml @@ -1 +1 @@ - + diff --git a/testing/src/main/java/org/oppia/android/testing/CoroutineExecutorService.kt b/testing/src/main/java/org/oppia/android/testing/CoroutineExecutorService.kt index 19c471cbe01..a5e03ec7886 100644 --- a/testing/src/main/java/org/oppia/android/testing/CoroutineExecutorService.kt +++ b/testing/src/main/java/org/oppia/android/testing/CoroutineExecutorService.kt @@ -1,4 +1,4 @@ -package org.oppia.testing +package org.oppia.android.testing import androidx.annotation.VisibleForTesting import kotlinx.coroutines.CoroutineDispatcher diff --git a/testing/src/main/java/org/oppia/android/testing/FakeEventLogger.kt b/testing/src/main/java/org/oppia/android/testing/FakeEventLogger.kt index 3c2ae8fd164..542f2337393 100644 --- a/testing/src/main/java/org/oppia/android/testing/FakeEventLogger.kt +++ b/testing/src/main/java/org/oppia/android/testing/FakeEventLogger.kt @@ -1,7 +1,7 @@ -package org.oppia.testing +package org.oppia.android.testing -import org.oppia.app.model.EventLog -import org.oppia.util.logging.EventLogger +import org.oppia.android.app.model.EventLog +import org.oppia.android.util.logging.EventLogger import javax.inject.Inject import javax.inject.Singleton diff --git a/testing/src/main/java/org/oppia/android/testing/FakeExceptionLogger.kt b/testing/src/main/java/org/oppia/android/testing/FakeExceptionLogger.kt index a9a0c504ff5..5a3469f70fe 100644 --- a/testing/src/main/java/org/oppia/android/testing/FakeExceptionLogger.kt +++ b/testing/src/main/java/org/oppia/android/testing/FakeExceptionLogger.kt @@ -1,6 +1,6 @@ -package org.oppia.testing +package org.oppia.android.testing -import org.oppia.util.logging.ExceptionLogger +import org.oppia.android.util.logging.ExceptionLogger import javax.inject.Inject import javax.inject.Singleton import kotlin.Exception diff --git a/testing/src/main/java/org/oppia/android/testing/FakeSystemClock.kt b/testing/src/main/java/org/oppia/android/testing/FakeSystemClock.kt index 78e68d13fd8..0d8527dd77c 100644 --- a/testing/src/main/java/org/oppia/android/testing/FakeSystemClock.kt +++ b/testing/src/main/java/org/oppia/android/testing/FakeSystemClock.kt @@ -1,4 +1,4 @@ -package org.oppia.testing +package org.oppia.android.testing import android.os.SystemClock import java.lang.reflect.Method diff --git a/testing/src/main/java/org/oppia/android/testing/IsOnRobolectric.kt b/testing/src/main/java/org/oppia/android/testing/IsOnRobolectric.kt index 79e64528634..8de835f7c7f 100644 --- a/testing/src/main/java/org/oppia/android/testing/IsOnRobolectric.kt +++ b/testing/src/main/java/org/oppia/android/testing/IsOnRobolectric.kt @@ -1,4 +1,4 @@ -package org.oppia.testing +package org.oppia.android.testing import javax.inject.Qualifier diff --git a/testing/src/main/java/org/oppia/android/testing/OppiaTestAnnotations.kt b/testing/src/main/java/org/oppia/android/testing/OppiaTestAnnotations.kt index 04e02c76fa5..3e66ec94e50 100644 --- a/testing/src/main/java/org/oppia/android/testing/OppiaTestAnnotations.kt +++ b/testing/src/main/java/org/oppia/android/testing/OppiaTestAnnotations.kt @@ -1,7 +1,7 @@ -package org.oppia.testing +package org.oppia.android.testing -import org.oppia.testing.TestPlatform.ESPRESSO -import org.oppia.testing.TestPlatform.ROBOLECTRIC +import org.oppia.android.testing.TestPlatform.ESPRESSO +import org.oppia.android.testing.TestPlatform.ROBOLECTRIC /** Specifies a test platform to target in conjunction with [RunOn]. */ enum class TestPlatform { diff --git a/testing/src/main/java/org/oppia/android/testing/OppiaTestRule.kt b/testing/src/main/java/org/oppia/android/testing/OppiaTestRule.kt index 358ec27bec5..dd2f0b2a06d 100644 --- a/testing/src/main/java/org/oppia/android/testing/OppiaTestRule.kt +++ b/testing/src/main/java/org/oppia/android/testing/OppiaTestRule.kt @@ -1,4 +1,4 @@ -package org.oppia.testing +package org.oppia.android.testing import android.os.Build import org.junit.AssumptionViolatedException diff --git a/testing/src/main/java/org/oppia/android/testing/OppiaTestRunner.kt b/testing/src/main/java/org/oppia/android/testing/OppiaTestRunner.kt index f45023c153f..30a9a81d934 100644 --- a/testing/src/main/java/org/oppia/android/testing/OppiaTestRunner.kt +++ b/testing/src/main/java/org/oppia/android/testing/OppiaTestRunner.kt @@ -1,4 +1,4 @@ -package org.oppia.testing +package org.oppia.android.testing import android.app.Application import android.content.Context diff --git a/testing/src/main/java/org/oppia/android/testing/TestAccessibilityModule.kt b/testing/src/main/java/org/oppia/android/testing/TestAccessibilityModule.kt index 13753bded32..2e93ee7e310 100644 --- a/testing/src/main/java/org/oppia/android/testing/TestAccessibilityModule.kt +++ b/testing/src/main/java/org/oppia/android/testing/TestAccessibilityModule.kt @@ -1,9 +1,9 @@ -package org.oppia.testing +package org.oppia.android.testing import dagger.Binds import dagger.Module -import org.oppia.util.accessibility.CustomAccessibilityManager -import org.oppia.util.accessibility.FakeAccessibilityManager +import org.oppia.android.util.accessibility.CustomAccessibilityManager +import org.oppia.android.util.accessibility.FakeAccessibilityManager /** Provides fake accessible status for testing. */ @Module diff --git a/testing/src/main/java/org/oppia/android/testing/TestCoroutineDispatcher.kt b/testing/src/main/java/org/oppia/android/testing/TestCoroutineDispatcher.kt index 756a0ccd2ea..3622a0130d5 100644 --- a/testing/src/main/java/org/oppia/android/testing/TestCoroutineDispatcher.kt +++ b/testing/src/main/java/org/oppia/android/testing/TestCoroutineDispatcher.kt @@ -1,4 +1,4 @@ -package org.oppia.testing +package org.oppia.android.testing import android.os.Build import kotlinx.coroutines.CoroutineDispatcher diff --git a/testing/src/main/java/org/oppia/android/testing/TestCoroutineDispatcherEspressoImpl.kt b/testing/src/main/java/org/oppia/android/testing/TestCoroutineDispatcherEspressoImpl.kt index 53bd332423c..af8227c3853 100644 --- a/testing/src/main/java/org/oppia/android/testing/TestCoroutineDispatcherEspressoImpl.kt +++ b/testing/src/main/java/org/oppia/android/testing/TestCoroutineDispatcherEspressoImpl.kt @@ -1,4 +1,4 @@ -package org.oppia.testing +package org.oppia.android.testing import kotlinx.coroutines.CancellableContinuation import kotlinx.coroutines.CoroutineDispatcher diff --git a/testing/src/main/java/org/oppia/android/testing/TestCoroutineDispatcherRobolectricImpl.kt b/testing/src/main/java/org/oppia/android/testing/TestCoroutineDispatcherRobolectricImpl.kt index 8c37569b052..10b68593676 100644 --- a/testing/src/main/java/org/oppia/android/testing/TestCoroutineDispatcherRobolectricImpl.kt +++ b/testing/src/main/java/org/oppia/android/testing/TestCoroutineDispatcherRobolectricImpl.kt @@ -1,4 +1,4 @@ -package org.oppia.testing +package org.oppia.android.testing import android.annotation.SuppressLint import kotlinx.coroutines.CancellableContinuation diff --git a/testing/src/main/java/org/oppia/android/testing/TestCoroutineDispatchers.kt b/testing/src/main/java/org/oppia/android/testing/TestCoroutineDispatchers.kt index e0a71dd415e..3450bd13500 100644 --- a/testing/src/main/java/org/oppia/android/testing/TestCoroutineDispatchers.kt +++ b/testing/src/main/java/org/oppia/android/testing/TestCoroutineDispatchers.kt @@ -1,4 +1,4 @@ -package org.oppia.testing +package org.oppia.android.testing // TODO(#1274): Add thorough testing for this class. diff --git a/testing/src/main/java/org/oppia/android/testing/TestCoroutineDispatchersEspressoImpl.kt b/testing/src/main/java/org/oppia/android/testing/TestCoroutineDispatchersEspressoImpl.kt index 0a23e798c90..378c35984ce 100644 --- a/testing/src/main/java/org/oppia/android/testing/TestCoroutineDispatchersEspressoImpl.kt +++ b/testing/src/main/java/org/oppia/android/testing/TestCoroutineDispatchersEspressoImpl.kt @@ -1,9 +1,9 @@ -package org.oppia.testing +package org.oppia.android.testing import androidx.test.espresso.Espresso.onIdle import androidx.test.espresso.IdlingRegistry import androidx.test.espresso.IdlingResource -import org.oppia.testing.TestCoroutineDispatcher.TaskIdleListener +import org.oppia.android.testing.TestCoroutineDispatcher.TaskIdleListener import javax.inject.Inject /** diff --git a/testing/src/main/java/org/oppia/android/testing/TestCoroutineDispatchersRobolectricImpl.kt b/testing/src/main/java/org/oppia/android/testing/TestCoroutineDispatchersRobolectricImpl.kt index 01abe336a82..1086ae10ee6 100644 --- a/testing/src/main/java/org/oppia/android/testing/TestCoroutineDispatchersRobolectricImpl.kt +++ b/testing/src/main/java/org/oppia/android/testing/TestCoroutineDispatchersRobolectricImpl.kt @@ -1,4 +1,4 @@ -package org.oppia.testing +package org.oppia.android.testing import java.lang.reflect.Method import java.time.Duration diff --git a/testing/src/main/java/org/oppia/android/testing/TestDispatcherModule.kt b/testing/src/main/java/org/oppia/android/testing/TestDispatcherModule.kt index f5366a62e72..b64d9b7997f 100644 --- a/testing/src/main/java/org/oppia/android/testing/TestDispatcherModule.kt +++ b/testing/src/main/java/org/oppia/android/testing/TestDispatcherModule.kt @@ -1,4 +1,4 @@ -package org.oppia.testing +package org.oppia.android.testing import android.os.Build import dagger.Module @@ -7,8 +7,8 @@ import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.InternalCoroutinesApi import kotlinx.coroutines.asCoroutineDispatcher -import org.oppia.util.threading.BackgroundDispatcher -import org.oppia.util.threading.BlockingDispatcher +import org.oppia.android.util.threading.BackgroundDispatcher +import org.oppia.android.util.threading.BlockingDispatcher import java.util.concurrent.Executors import javax.inject.Provider import javax.inject.Singleton diff --git a/testing/src/main/java/org/oppia/android/testing/TestDispatchers.kt b/testing/src/main/java/org/oppia/android/testing/TestDispatchers.kt index faf0026debb..c994d7bb4e7 100644 --- a/testing/src/main/java/org/oppia/android/testing/TestDispatchers.kt +++ b/testing/src/main/java/org/oppia/android/testing/TestDispatchers.kt @@ -1,4 +1,4 @@ -package org.oppia.testing +package org.oppia.android.testing import javax.inject.Qualifier diff --git a/testing/src/main/java/org/oppia/android/testing/TestLogReportingModule.kt b/testing/src/main/java/org/oppia/android/testing/TestLogReportingModule.kt index b01f1a8723e..627577511ac 100644 --- a/testing/src/main/java/org/oppia/android/testing/TestLogReportingModule.kt +++ b/testing/src/main/java/org/oppia/android/testing/TestLogReportingModule.kt @@ -1,9 +1,9 @@ -package org.oppia.testing +package org.oppia.android.testing import dagger.Binds import dagger.Module -import org.oppia.util.logging.EventLogger -import org.oppia.util.logging.ExceptionLogger +import org.oppia.android.util.logging.EventLogger +import org.oppia.android.util.logging.ExceptionLogger /** Provides fake log reporting dependencies. */ @Module diff --git a/testing/src/main/java/org/oppia/android/testing/profile/ProfileTestHelper.kt b/testing/src/main/java/org/oppia/android/testing/profile/ProfileTestHelper.kt index e51b8e9d41a..0b75d759e66 100644 --- a/testing/src/main/java/org/oppia/android/testing/profile/ProfileTestHelper.kt +++ b/testing/src/main/java/org/oppia/android/testing/profile/ProfileTestHelper.kt @@ -1,10 +1,10 @@ -package org.oppia.testing.profile +package org.oppia.android.testing.profile import androidx.lifecycle.LiveData -import org.oppia.app.model.ProfileId -import org.oppia.domain.profile.ProfileManagementController -import org.oppia.testing.TestCoroutineDispatchers -import org.oppia.util.data.AsyncResult +import org.oppia.android.app.model.ProfileId +import org.oppia.android.domain.profile.ProfileManagementController +import org.oppia.android.testing.TestCoroutineDispatchers +import org.oppia.android.util.data.AsyncResult import javax.inject.Inject /** This helper allows tests to easily create new profiles and switch between them. */ diff --git a/testing/src/test/AndroidManifest.xml b/testing/src/test/AndroidManifest.xml index 866b17b8a84..3579da0b010 100644 --- a/testing/src/test/AndroidManifest.xml +++ b/testing/src/test/AndroidManifest.xml @@ -1,5 +1,5 @@ + package="org.oppia.android.testing"> diff --git a/testing/src/test/java/org/oppia/android/testing/CoroutineExecutorServiceTest.kt b/testing/src/test/java/org/oppia/android/testing/CoroutineExecutorServiceTest.kt index 8ce666c8580..862a89542e6 100644 --- a/testing/src/test/java/org/oppia/android/testing/CoroutineExecutorServiceTest.kt +++ b/testing/src/test/java/org/oppia/android/testing/CoroutineExecutorServiceTest.kt @@ -1,4 +1,4 @@ -package org.oppia.testing +package org.oppia.android.testing import android.app.Application import android.content.Context @@ -29,8 +29,8 @@ import org.mockito.Mockito.never import org.mockito.Mockito.verify import org.mockito.junit.MockitoJUnit import org.mockito.junit.MockitoRule -import org.oppia.util.data.AsyncResult -import org.oppia.util.threading.BackgroundDispatcher +import org.oppia.android.util.data.AsyncResult +import org.oppia.android.util.threading.BackgroundDispatcher import org.robolectric.annotation.LooperMode import java.util.concurrent.Callable import java.util.concurrent.ExecutionException diff --git a/testing/src/test/java/org/oppia/android/testing/FakeEventLoggerTest.kt b/testing/src/test/java/org/oppia/android/testing/FakeEventLoggerTest.kt index b01c6f623c4..b37ba2bddd6 100644 --- a/testing/src/test/java/org/oppia/android/testing/FakeEventLoggerTest.kt +++ b/testing/src/test/java/org/oppia/android/testing/FakeEventLoggerTest.kt @@ -1,4 +1,4 @@ -package org.oppia.testing +package org.oppia.android.testing import android.app.Application import android.content.Context @@ -13,9 +13,9 @@ import org.junit.Assert.fail import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.oppia.app.model.EventLog -import org.oppia.app.model.EventLog.Priority -import org.oppia.util.logging.EventLogger +import org.oppia.android.app.model.EventLog +import org.oppia.android.app.model.EventLog.Priority +import org.oppia.android.util.logging.EventLogger import org.robolectric.annotation.Config import org.robolectric.annotation.LooperMode import javax.inject.Inject diff --git a/testing/src/test/java/org/oppia/android/testing/FakeExceptionLoggerTest.kt b/testing/src/test/java/org/oppia/android/testing/FakeExceptionLoggerTest.kt index 51c4ca3a928..f6acda127f4 100644 --- a/testing/src/test/java/org/oppia/android/testing/FakeExceptionLoggerTest.kt +++ b/testing/src/test/java/org/oppia/android/testing/FakeExceptionLoggerTest.kt @@ -1,4 +1,4 @@ -package org.oppia.testing +package org.oppia.android.testing import android.app.Application import android.content.Context @@ -13,7 +13,7 @@ import org.junit.Assert.fail import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.oppia.util.logging.ExceptionLogger +import org.oppia.android.util.logging.ExceptionLogger import org.robolectric.annotation.Config import org.robolectric.annotation.LooperMode import javax.inject.Inject diff --git a/testing/src/test/java/org/oppia/android/testing/profile/ProfileTestHelperTest.kt b/testing/src/test/java/org/oppia/android/testing/profile/ProfileTestHelperTest.kt index 7e2806b5191..6fbb60d6ccf 100644 --- a/testing/src/test/java/org/oppia/android/testing/profile/ProfileTestHelperTest.kt +++ b/testing/src/test/java/org/oppia/android/testing/profile/ProfileTestHelperTest.kt @@ -1,4 +1,4 @@ -package org.oppia.testing.profile +package org.oppia.android.testing.profile import android.app.Application import android.content.Context @@ -21,17 +21,17 @@ import org.mockito.Mockito.atLeastOnce import org.mockito.Mockito.verify import org.mockito.junit.MockitoJUnit import org.mockito.junit.MockitoRule -import org.oppia.app.model.Profile -import org.oppia.domain.oppialogger.LogStorageModule -import org.oppia.domain.profile.ProfileManagementController -import org.oppia.testing.TestCoroutineDispatchers -import org.oppia.testing.TestDispatcherModule -import org.oppia.testing.TestLogReportingModule -import org.oppia.util.data.AsyncResult -import org.oppia.util.logging.EnableConsoleLog -import org.oppia.util.logging.EnableFileLog -import org.oppia.util.logging.GlobalLogLevel -import org.oppia.util.logging.LogLevel +import org.oppia.android.app.model.Profile +import org.oppia.android.domain.oppialogger.LogStorageModule +import org.oppia.android.domain.profile.ProfileManagementController +import org.oppia.android.testing.TestCoroutineDispatchers +import org.oppia.android.testing.TestDispatcherModule +import org.oppia.android.testing.TestLogReportingModule +import org.oppia.android.util.data.AsyncResult +import org.oppia.android.util.logging.EnableConsoleLog +import org.oppia.android.util.logging.EnableFileLog +import org.oppia.android.util.logging.GlobalLogLevel +import org.oppia.android.util.logging.LogLevel import org.robolectric.annotation.Config import org.robolectric.annotation.LooperMode import javax.inject.Inject diff --git a/testing/testing_test.bzl b/testing/testing_test.bzl index f66b4982093..3b40b5e462d 100644 --- a/testing/testing_test.bzl +++ b/testing/testing_test.bzl @@ -1,22 +1,23 @@ load("//:oppia_android_test.bzl", "oppia_android_test") + # TODO(#1620): Remove module-specific test macros once Gradle is removed def testing_test(name, srcs, test_class, deps): - ''' - Creates individual tests for test files in the testing module. + ''' + Creates individual tests for test files in the testing module. - Args: - name: str. The name of the Kotlin test file without the '.kt' suffix. - src: list of str. The list of test files to be run. - test_class: str. The package of the src file. Example: If the src is 'FakeEventLoggerTest.kt', - then the test_class would be "org.oppia.testing.FakeEventLoggerTest". - deps: list of str. The list of dependencies needed to build and run this test. - ''' + Args: + name: str. The name of the Kotlin test file without the '.kt' suffix. + src: list of str. The list of test files to be run. + test_class: str. The package of the src file. Example: If the src is 'FakeEventLoggerTest.kt', + then the test_class would be "org.oppia.testing.FakeEventLoggerTest". + deps: list of str. The list of dependencies needed to build and run this test. + ''' - oppia_android_test( - name = name, - srcs = srcs, - custom_package = "org.oppia.testing", - test_class = test_class, - test_manifest = "src/test/AndroidManifest.xml", - deps = deps, - ) + oppia_android_test( + name = name, + srcs = srcs, + custom_package = "org.oppia.android.testing", + test_class = test_class, + test_manifest = "src/test/AndroidManifest.xml", + deps = deps, + ) diff --git a/utility/BUILD.bazel b/utility/BUILD.bazel index e60259fe61a..458c11e337d 100644 --- a/utility/BUILD.bazel +++ b/utility/BUILD.bazel @@ -1,7 +1,7 @@ # TODO(#1532): Rename file to 'BUILD' post-Gradle. -''' +""" This library contains utilities that all other modules, minus model, depend on. -''' +""" load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library") load("@rules_jvm_external//:defs.bzl", "artifact") @@ -12,21 +12,22 @@ load("//utility:utility_test.bzl", "utility_test") # Library for general-purpose utilities. kt_android_library( name = "utility", - custom_package = "org.oppia.util", - srcs = glob(["src/main/java/org/oppia/util/**/*.kt"]), - resource_files = glob(["src/main/res/**/*.xml"]), + srcs = glob(["src/main/java/org/oppia/android/util/**/*.kt"]), + custom_package = "org.oppia.android.util", manifest = "src/main/AndroidManifest.xml", + resource_files = glob(["src/main/res/**/*.xml"]), + visibility = ["//visibility:public"], deps = [ ":dagger", - "//model", "//app:crashlytics", "//app:crashlytics_deps", + "//model", artifact("org.jetbrains.kotlinx:kotlinx-coroutines-core"), artifact("androidx.appcompat:appcompat"), artifact("com.github.bumptech.glide:glide"), + artifact("com.google.guava:guava"), artifact("com.caverock:androidsvg-aar"), ], - visibility = ["//visibility:public"], ) TEST_DEPS = [ @@ -46,57 +47,57 @@ TEST_DEPS = [ utility_test( name = "AsyncResultTest", - srcs = ["src/test/java/org/oppia/util/data/AsyncResultTest.kt"], - test_class = "org.oppia.util.data.AsyncResultTest", + srcs = ["src/test/java/org/oppia/android/util/data/AsyncResultTest.kt"], + test_class = "org.oppia.android.util.data.AsyncResultTest", deps = TEST_DEPS, ) utility_test( name = "DataProvidersTest", - srcs = ["src/test/java/org/oppia/util/data/DataProvidersTest.kt"], - test_class = "org.oppia.util.data.DataProvidersTest", + srcs = ["src/test/java/org/oppia/android/util/data/DataProvidersTest.kt"], + test_class = "org.oppia.android.util.data.DataProvidersTest", deps = TEST_DEPS, ) utility_test( name = "InMemoryBlockingCacheTest", - srcs = ["src/test/java/org/oppia/util/data/InMemoryBlockingCacheTest.kt"], - test_class = "org.oppia.util.data.InMemoryBlockingCacheTest", + srcs = ["src/test/java/org/oppia/android/util/data/InMemoryBlockingCacheTest.kt"], + test_class = "org.oppia.android.util.data.InMemoryBlockingCacheTest", deps = TEST_DEPS, ) utility_test( name = "DateTimeUtilTest", - srcs = ["src/test/java/org/oppia/util/datetime/DateTimeUtilTest.kt"], - test_class = "org.oppia.util.datetime.DateTimeUtilTest", + srcs = ["src/test/java/org/oppia/android/util/datetime/DateTimeUtilTest.kt"], + test_class = "org.oppia.android.util.datetime.DateTimeUtilTest", deps = TEST_DEPS, ) utility_test( name = "EventBundleCreatorTest", - srcs = ["src/test/java/org/oppia/util/logging/EventBundleCreatorTest.kt"], - test_class = "org.oppia.util.logging.EventBundleCreatorTest", + srcs = ["src/test/java/org/oppia/android/util/logging/EventBundleCreatorTest.kt"], + test_class = "org.oppia.android.util.logging.EventBundleCreatorTest", deps = TEST_DEPS, ) utility_test( name = "NetworkConnectionUtilTest", - srcs = ["src/test/java/org/oppia/util/networking/NetworkConnectionUtilTest.kt"], - test_class = "org.oppia.util.networking.NetworkConnectionUtilTest", + srcs = ["src/test/java/org/oppia/android/util/networking/NetworkConnectionUtilTest.kt"], + test_class = "org.oppia.android.util.networking.NetworkConnectionUtilTest", deps = TEST_DEPS, ) utility_test( name = "DirectoryManagementUtilTest", - srcs = ["src/test/java/org/oppia/util/profile/DirectoryManagementUtilTest.kt"], - test_class = "org.oppia.util.profile.DirectoryManagementUtilTest", + srcs = ["src/test/java/org/oppia/android/util/profile/DirectoryManagementUtilTest.kt"], + test_class = "org.oppia.android.util.profile.DirectoryManagementUtilTest", deps = TEST_DEPS, ) utility_test( name = "OppiaDateTimeFormatterTest", - srcs = ["src/test/java/org/oppia/util/system/OppiaDateTimeFormatterTest.kt"], - test_class = "org.oppia.util.system.OppiaDateTimeFormatterTest", + srcs = ["src/test/java/org/oppia/android/util/system/OppiaDateTimeFormatterTest.kt"], + test_class = "org.oppia.android.util.system.OppiaDateTimeFormatterTest", deps = TEST_DEPS, ) diff --git a/utility/src/main/AndroidManifest.xml b/utility/src/main/AndroidManifest.xml index 90ee2370213..723e35df8ea 100644 --- a/utility/src/main/AndroidManifest.xml +++ b/utility/src/main/AndroidManifest.xml @@ -1,4 +1,4 @@ + package="org.oppia.android.util"> diff --git a/utility/src/main/java/org/oppia/android/util/accessibility/AccessibilityModule.kt b/utility/src/main/java/org/oppia/android/util/accessibility/AccessibilityModule.kt index a076a24f562..ec650fa875a 100644 --- a/utility/src/main/java/org/oppia/android/util/accessibility/AccessibilityModule.kt +++ b/utility/src/main/java/org/oppia/android/util/accessibility/AccessibilityModule.kt @@ -1,4 +1,4 @@ -package org.oppia.util.accessibility +package org.oppia.android.util.accessibility import android.content.Context import android.view.accessibility.AccessibilityManager diff --git a/utility/src/main/java/org/oppia/android/util/accessibility/AndroidAccessibilityManager.kt b/utility/src/main/java/org/oppia/android/util/accessibility/AndroidAccessibilityManager.kt index 72c179191ba..161b93e9f49 100644 --- a/utility/src/main/java/org/oppia/android/util/accessibility/AndroidAccessibilityManager.kt +++ b/utility/src/main/java/org/oppia/android/util/accessibility/AndroidAccessibilityManager.kt @@ -1,4 +1,4 @@ -package org.oppia.util.accessibility +package org.oppia.android.util.accessibility import android.view.accessibility.AccessibilityManager diff --git a/utility/src/main/java/org/oppia/android/util/accessibility/CustomAccessibilityManager.kt b/utility/src/main/java/org/oppia/android/util/accessibility/CustomAccessibilityManager.kt index 023784a136d..42543363ce2 100644 --- a/utility/src/main/java/org/oppia/android/util/accessibility/CustomAccessibilityManager.kt +++ b/utility/src/main/java/org/oppia/android/util/accessibility/CustomAccessibilityManager.kt @@ -1,4 +1,4 @@ -package org.oppia.util.accessibility +package org.oppia.android.util.accessibility interface CustomAccessibilityManager { fun isScreenReaderEnabled(): Boolean diff --git a/utility/src/main/java/org/oppia/android/util/accessibility/FakeAccessibilityManager.kt b/utility/src/main/java/org/oppia/android/util/accessibility/FakeAccessibilityManager.kt index 7c56cb49f76..58979c5c8fc 100644 --- a/utility/src/main/java/org/oppia/android/util/accessibility/FakeAccessibilityManager.kt +++ b/utility/src/main/java/org/oppia/android/util/accessibility/FakeAccessibilityManager.kt @@ -1,4 +1,4 @@ -package org.oppia.util.accessibility +package org.oppia.android.util.accessibility import javax.inject.Inject import javax.inject.Singleton diff --git a/utility/src/main/java/org/oppia/android/util/caching/AssetRepository.kt b/utility/src/main/java/org/oppia/android/util/caching/AssetRepository.kt index 6d7b6250721..4292a103375 100644 --- a/utility/src/main/java/org/oppia/android/util/caching/AssetRepository.kt +++ b/utility/src/main/java/org/oppia/android/util/caching/AssetRepository.kt @@ -1,7 +1,7 @@ -package org.oppia.util.caching +package org.oppia.android.util.caching import android.content.Context -import org.oppia.util.logging.ConsoleLogger +import org.oppia.android.util.logging.ConsoleLogger import java.io.File import java.io.InputStream import java.io.OutputStream diff --git a/utility/src/main/java/org/oppia/android/util/caching/CacheAssetsLocally.kt b/utility/src/main/java/org/oppia/android/util/caching/CacheAssetsLocally.kt index 8d946ec2a55..38bb3b50816 100644 --- a/utility/src/main/java/org/oppia/android/util/caching/CacheAssetsLocally.kt +++ b/utility/src/main/java/org/oppia/android/util/caching/CacheAssetsLocally.kt @@ -1,4 +1,4 @@ -package org.oppia.util.caching +package org.oppia.android.util.caching import javax.inject.Qualifier diff --git a/utility/src/main/java/org/oppia/android/util/caching/CachingModule.kt b/utility/src/main/java/org/oppia/android/util/caching/CachingModule.kt index 2cae1591063..94bebc7a3ab 100644 --- a/utility/src/main/java/org/oppia/android/util/caching/CachingModule.kt +++ b/utility/src/main/java/org/oppia/android/util/caching/CachingModule.kt @@ -1,4 +1,4 @@ -package org.oppia.util.caching +package org.oppia.android.util.caching import dagger.Module import dagger.Provides diff --git a/utility/src/main/java/org/oppia/android/util/caching/TopicListToCache.kt b/utility/src/main/java/org/oppia/android/util/caching/TopicListToCache.kt index 1714bc9b9d8..a3241720f8d 100644 --- a/utility/src/main/java/org/oppia/android/util/caching/TopicListToCache.kt +++ b/utility/src/main/java/org/oppia/android/util/caching/TopicListToCache.kt @@ -1,4 +1,4 @@ -package org.oppia.util.caching +package org.oppia.android.util.caching import javax.inject.Qualifier diff --git a/utility/src/main/java/org/oppia/android/util/caching/testing/CachingTestModule.kt b/utility/src/main/java/org/oppia/android/util/caching/testing/CachingTestModule.kt index 46b3fc1017c..a2a6ca4a40e 100644 --- a/utility/src/main/java/org/oppia/android/util/caching/testing/CachingTestModule.kt +++ b/utility/src/main/java/org/oppia/android/util/caching/testing/CachingTestModule.kt @@ -1,9 +1,9 @@ -package org.oppia.util.caching.testing +package org.oppia.android.util.caching.testing import dagger.Module import dagger.Provides -import org.oppia.util.caching.CacheAssetsLocally -import org.oppia.util.caching.TopicListToCache +import org.oppia.android.util.caching.CacheAssetsLocally +import org.oppia.android.util.caching.TopicListToCache /** * Provides test dependencies corresponding to the app's caching policies. In particular, this diff --git a/utility/src/main/java/org/oppia/android/util/data/AsyncDataSubscriptionManager.kt b/utility/src/main/java/org/oppia/android/util/data/AsyncDataSubscriptionManager.kt index 2378bf32717..3935893ea04 100644 --- a/utility/src/main/java/org/oppia/android/util/data/AsyncDataSubscriptionManager.kt +++ b/utility/src/main/java/org/oppia/android/util/data/AsyncDataSubscriptionManager.kt @@ -1,13 +1,13 @@ -package org.oppia.util.data +package org.oppia.android.util.data import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch -import org.oppia.util.threading.BackgroundDispatcher -import org.oppia.util.threading.ConcurrentQueueMap -import org.oppia.util.threading.dequeue -import org.oppia.util.threading.enqueue -import org.oppia.util.threading.getQueue +import org.oppia.android.util.threading.BackgroundDispatcher +import org.oppia.android.util.threading.ConcurrentQueueMap +import org.oppia.android.util.threading.dequeue +import org.oppia.android.util.threading.enqueue +import org.oppia.android.util.threading.getQueue import javax.inject.Inject import javax.inject.Singleton diff --git a/utility/src/main/java/org/oppia/android/util/data/AsyncResult.kt b/utility/src/main/java/org/oppia/android/util/data/AsyncResult.kt index d262121ff99..7889986d6a1 100644 --- a/utility/src/main/java/org/oppia/android/util/data/AsyncResult.kt +++ b/utility/src/main/java/org/oppia/android/util/data/AsyncResult.kt @@ -1,4 +1,4 @@ -package org.oppia.util.data +package org.oppia.android.util.data import android.os.SystemClock diff --git a/utility/src/main/java/org/oppia/android/util/data/DataProvider.kt b/utility/src/main/java/org/oppia/android/util/data/DataProvider.kt index 9c10374f987..e3c6f31f70d 100644 --- a/utility/src/main/java/org/oppia/android/util/data/DataProvider.kt +++ b/utility/src/main/java/org/oppia/android/util/data/DataProvider.kt @@ -1,4 +1,4 @@ -package org.oppia.util.data +package org.oppia.android.util.data /** * Represents a provider of data that can be delivered and changed asynchronously. diff --git a/utility/src/main/java/org/oppia/android/util/data/DataProviders.kt b/utility/src/main/java/org/oppia/android/util/data/DataProviders.kt index 1b058ff2221..e22694c5aae 100644 --- a/utility/src/main/java/org/oppia/android/util/data/DataProviders.kt +++ b/utility/src/main/java/org/oppia/android/util/data/DataProviders.kt @@ -1,12 +1,12 @@ -package org.oppia.util.data +package org.oppia.android.util.data import androidx.lifecycle.LiveData import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Job import kotlinx.coroutines.launch -import org.oppia.util.logging.ExceptionLogger -import org.oppia.util.threading.BackgroundDispatcher +import org.oppia.android.util.logging.ExceptionLogger +import org.oppia.android.util.threading.BackgroundDispatcher import java.util.concurrent.atomic.AtomicBoolean import java.util.concurrent.atomic.AtomicReference import javax.inject.Inject diff --git a/utility/src/main/java/org/oppia/android/util/data/InMemoryBlockingCache.kt b/utility/src/main/java/org/oppia/android/util/data/InMemoryBlockingCache.kt index 26fd20d6d65..0229c013ea7 100644 --- a/utility/src/main/java/org/oppia/android/util/data/InMemoryBlockingCache.kt +++ b/utility/src/main/java/org/oppia/android/util/data/InMemoryBlockingCache.kt @@ -1,10 +1,10 @@ -package org.oppia.util.data +package org.oppia.android.util.data import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Deferred import kotlinx.coroutines.async -import org.oppia.util.threading.BlockingDispatcher +import org.oppia.android.util.threading.BlockingDispatcher import javax.inject.Inject import javax.inject.Singleton diff --git a/utility/src/main/java/org/oppia/android/util/datetime/DateTimeUtil.kt b/utility/src/main/java/org/oppia/android/util/datetime/DateTimeUtil.kt index 20d7420061f..a33df2ab20b 100644 --- a/utility/src/main/java/org/oppia/android/util/datetime/DateTimeUtil.kt +++ b/utility/src/main/java/org/oppia/android/util/datetime/DateTimeUtil.kt @@ -1,8 +1,8 @@ -package org.oppia.util.datetime +package org.oppia.android.util.datetime import android.content.Context -import org.oppia.util.R -import org.oppia.util.system.OppiaClock +import org.oppia.android.util.R +import org.oppia.android.util.system.OppiaClock import java.util.Calendar import javax.inject.Inject import javax.inject.Singleton diff --git a/utility/src/main/java/org/oppia/android/util/extensions/LiveDataExt.kt b/utility/src/main/java/org/oppia/android/util/extensions/LiveDataExt.kt index 1adec3f221d..80285c107d3 100644 --- a/utility/src/main/java/org/oppia/android/util/extensions/LiveDataExt.kt +++ b/utility/src/main/java/org/oppia/android/util/extensions/LiveDataExt.kt @@ -1,4 +1,4 @@ -package org.oppia.util.extensions +package org.oppia.android.util.extensions import androidx.lifecycle.LifecycleOwner import androidx.lifecycle.LiveData diff --git a/utility/src/main/java/org/oppia/android/util/gcsresource/GcsResouceAnnotations.kt b/utility/src/main/java/org/oppia/android/util/gcsresource/GcsResouceAnnotations.kt index 26e8d8a18cb..bef2267cbb5 100644 --- a/utility/src/main/java/org/oppia/android/util/gcsresource/GcsResouceAnnotations.kt +++ b/utility/src/main/java/org/oppia/android/util/gcsresource/GcsResouceAnnotations.kt @@ -1,5 +1,5 @@ // ktlint-disable filename -package org.oppia.util.gcsresource +package org.oppia.android.util.gcsresource import javax.inject.Qualifier diff --git a/utility/src/main/java/org/oppia/android/util/gcsresource/GcsResourceModule.kt b/utility/src/main/java/org/oppia/android/util/gcsresource/GcsResourceModule.kt index 518d8061789..7132f8ca913 100644 --- a/utility/src/main/java/org/oppia/android/util/gcsresource/GcsResourceModule.kt +++ b/utility/src/main/java/org/oppia/android/util/gcsresource/GcsResourceModule.kt @@ -1,4 +1,4 @@ -package org.oppia.util.gcsresource +package org.oppia.android.util.gcsresource import dagger.Module import dagger.Provides diff --git a/utility/src/main/java/org/oppia/android/util/logging/ConsoleLogger.kt b/utility/src/main/java/org/oppia/android/util/logging/ConsoleLogger.kt index badec55136a..43ca580b1c1 100644 --- a/utility/src/main/java/org/oppia/android/util/logging/ConsoleLogger.kt +++ b/utility/src/main/java/org/oppia/android/util/logging/ConsoleLogger.kt @@ -1,11 +1,11 @@ -package org.oppia.util.logging +package org.oppia.android.util.logging import android.content.Context import android.util.Log import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch -import org.oppia.util.threading.BlockingDispatcher +import org.oppia.android.util.threading.BlockingDispatcher import java.io.File import java.util.Calendar import javax.inject.Inject diff --git a/utility/src/main/java/org/oppia/android/util/logging/EventBundleCreator.kt b/utility/src/main/java/org/oppia/android/util/logging/EventBundleCreator.kt index 72248a85062..358ca03f073 100644 --- a/utility/src/main/java/org/oppia/android/util/logging/EventBundleCreator.kt +++ b/utility/src/main/java/org/oppia/android/util/logging/EventBundleCreator.kt @@ -1,14 +1,14 @@ -package org.oppia.util.logging +package org.oppia.android.util.logging import android.os.Bundle -import org.oppia.app.model.EventLog -import org.oppia.app.model.EventLog.Context.ActivityContextCase.ACTIVITYCONTEXT_NOT_SET -import org.oppia.app.model.EventLog.Context.ActivityContextCase.CONCEPT_CARD_CONTEXT -import org.oppia.app.model.EventLog.Context.ActivityContextCase.EXPLORATION_CONTEXT -import org.oppia.app.model.EventLog.Context.ActivityContextCase.QUESTION_CONTEXT -import org.oppia.app.model.EventLog.Context.ActivityContextCase.REVISION_CARD_CONTEXT -import org.oppia.app.model.EventLog.Context.ActivityContextCase.STORY_CONTEXT -import org.oppia.app.model.EventLog.Context.ActivityContextCase.TOPIC_CONTEXT +import org.oppia.android.app.model.EventLog +import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.ACTIVITYCONTEXT_NOT_SET +import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.CONCEPT_CARD_CONTEXT +import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.EXPLORATION_CONTEXT +import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.QUESTION_CONTEXT +import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.REVISION_CARD_CONTEXT +import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.STORY_CONTEXT +import org.oppia.android.app.model.EventLog.Context.ActivityContextCase.TOPIC_CONTEXT const val TIMESTAMP_KEY = "timestamp" const val TOPIC_ID_KEY = "topicId" diff --git a/utility/src/main/java/org/oppia/android/util/logging/EventLogger.kt b/utility/src/main/java/org/oppia/android/util/logging/EventLogger.kt index 74f10a33791..b01657321e3 100644 --- a/utility/src/main/java/org/oppia/android/util/logging/EventLogger.kt +++ b/utility/src/main/java/org/oppia/android/util/logging/EventLogger.kt @@ -1,6 +1,6 @@ -package org.oppia.util.logging +package org.oppia.android.util.logging -import org.oppia.app.model.EventLog +import org.oppia.android.app.model.EventLog /** * Logger for tracking events. diff --git a/utility/src/main/java/org/oppia/android/util/logging/ExceptionLogger.kt b/utility/src/main/java/org/oppia/android/util/logging/ExceptionLogger.kt index 12f355d8f54..4ce3477f3a4 100644 --- a/utility/src/main/java/org/oppia/android/util/logging/ExceptionLogger.kt +++ b/utility/src/main/java/org/oppia/android/util/logging/ExceptionLogger.kt @@ -1,4 +1,4 @@ -package org.oppia.util.logging +package org.oppia.android.util.logging import java.lang.Exception diff --git a/utility/src/main/java/org/oppia/android/util/logging/LogLevel.kt b/utility/src/main/java/org/oppia/android/util/logging/LogLevel.kt index 38041d6a557..2813eccc54c 100644 --- a/utility/src/main/java/org/oppia/android/util/logging/LogLevel.kt +++ b/utility/src/main/java/org/oppia/android/util/logging/LogLevel.kt @@ -1,4 +1,4 @@ -package org.oppia.util.logging +package org.oppia.android.util.logging import android.util.Log diff --git a/utility/src/main/java/org/oppia/android/util/logging/LoggerModule.kt b/utility/src/main/java/org/oppia/android/util/logging/LoggerModule.kt index 2df99a13ba8..7ecc054a7bb 100644 --- a/utility/src/main/java/org/oppia/android/util/logging/LoggerModule.kt +++ b/utility/src/main/java/org/oppia/android/util/logging/LoggerModule.kt @@ -1,4 +1,4 @@ -package org.oppia.util.logging +package org.oppia.android.util.logging import dagger.Module import dagger.Provides diff --git a/utility/src/main/java/org/oppia/android/util/logging/LoggingAnnotations.kt b/utility/src/main/java/org/oppia/android/util/logging/LoggingAnnotations.kt index 24b654385d7..8226bdeb598 100644 --- a/utility/src/main/java/org/oppia/android/util/logging/LoggingAnnotations.kt +++ b/utility/src/main/java/org/oppia/android/util/logging/LoggingAnnotations.kt @@ -1,4 +1,4 @@ -package org.oppia.util.logging +package org.oppia.android.util.logging import javax.inject.Qualifier diff --git a/utility/src/main/java/org/oppia/android/util/logging/firebase/FirebaseEventLogger.kt b/utility/src/main/java/org/oppia/android/util/logging/firebase/FirebaseEventLogger.kt index e7fe6546dd3..cfaecc282db 100644 --- a/utility/src/main/java/org/oppia/android/util/logging/firebase/FirebaseEventLogger.kt +++ b/utility/src/main/java/org/oppia/android/util/logging/firebase/FirebaseEventLogger.kt @@ -1,12 +1,12 @@ -package org.oppia.util.logging.firebase +package org.oppia.android.util.logging.firebase import android.content.Context import android.net.ConnectivityManager import android.os.Bundle import com.google.firebase.analytics.FirebaseAnalytics -import org.oppia.app.model.EventLog -import org.oppia.util.logging.EventBundleCreator -import org.oppia.util.logging.EventLogger +import org.oppia.android.app.model.EventLog +import org.oppia.android.util.logging.EventBundleCreator +import org.oppia.android.util.logging.EventLogger import java.util.Locale import javax.inject.Singleton diff --git a/utility/src/main/java/org/oppia/android/util/logging/firebase/FirebaseExceptionLogger.kt b/utility/src/main/java/org/oppia/android/util/logging/firebase/FirebaseExceptionLogger.kt index 2238412882d..d0d23389b3d 100644 --- a/utility/src/main/java/org/oppia/android/util/logging/firebase/FirebaseExceptionLogger.kt +++ b/utility/src/main/java/org/oppia/android/util/logging/firebase/FirebaseExceptionLogger.kt @@ -1,7 +1,7 @@ -package org.oppia.util.logging.firebase +package org.oppia.android.util.logging.firebase import com.google.firebase.crashlytics.FirebaseCrashlytics -import org.oppia.util.logging.ExceptionLogger +import org.oppia.android.util.logging.ExceptionLogger /** Logger for providing custom crash reporting to Firebase Crashlytics. */ class FirebaseExceptionLogger( diff --git a/utility/src/main/java/org/oppia/android/util/logging/firebase/LogReportingModule.kt b/utility/src/main/java/org/oppia/android/util/logging/firebase/LogReportingModule.kt index c92567e31c9..cf4ace6ef5f 100644 --- a/utility/src/main/java/org/oppia/android/util/logging/firebase/LogReportingModule.kt +++ b/utility/src/main/java/org/oppia/android/util/logging/firebase/LogReportingModule.kt @@ -1,4 +1,4 @@ -package org.oppia.util.logging.firebase +package org.oppia.android.util.logging.firebase import android.app.Application import android.content.Context @@ -6,9 +6,9 @@ import com.google.firebase.analytics.FirebaseAnalytics import com.google.firebase.crashlytics.FirebaseCrashlytics import dagger.Module import dagger.Provides -import org.oppia.util.logging.EventBundleCreator -import org.oppia.util.logging.EventLogger -import org.oppia.util.logging.ExceptionLogger +import org.oppia.android.util.logging.EventBundleCreator +import org.oppia.android.util.logging.EventLogger +import org.oppia.android.util.logging.ExceptionLogger import javax.inject.Singleton /** Provides Firebase-specific logging implementations. */ diff --git a/utility/src/main/java/org/oppia/android/util/networking/NetworkConnectionUtil.kt b/utility/src/main/java/org/oppia/android/util/networking/NetworkConnectionUtil.kt index 045a95b6275..cf84277fa52 100644 --- a/utility/src/main/java/org/oppia/android/util/networking/NetworkConnectionUtil.kt +++ b/utility/src/main/java/org/oppia/android/util/networking/NetworkConnectionUtil.kt @@ -1,4 +1,4 @@ -package org.oppia.util.networking +package org.oppia.android.util.networking import android.content.Context import android.net.ConnectivityManager diff --git a/utility/src/main/java/org/oppia/android/util/parser/BulletTagHandler.kt b/utility/src/main/java/org/oppia/android/util/parser/BulletTagHandler.kt index aa52678d31a..9d31556b75a 100644 --- a/utility/src/main/java/org/oppia/android/util/parser/BulletTagHandler.kt +++ b/utility/src/main/java/org/oppia/android/util/parser/BulletTagHandler.kt @@ -1,4 +1,4 @@ -package org.oppia.util.parser +package org.oppia.android.util.parser import android.text.Editable import android.text.Spannable diff --git a/utility/src/main/java/org/oppia/android/util/parser/CustomBulletSpan.kt b/utility/src/main/java/org/oppia/android/util/parser/CustomBulletSpan.kt index c03f55b891f..b3750629289 100755 --- a/utility/src/main/java/org/oppia/android/util/parser/CustomBulletSpan.kt +++ b/utility/src/main/java/org/oppia/android/util/parser/CustomBulletSpan.kt @@ -1,4 +1,4 @@ -package org.oppia.util.parser +package org.oppia.android.util.parser import android.content.Context import android.graphics.Canvas @@ -8,7 +8,7 @@ import android.graphics.Path.Direction import android.text.Layout import android.text.Spanned import android.text.style.LeadingMarginSpan -import org.oppia.util.R +import org.oppia.android.util.R // TODO(#562): Add screenshot tests to check whether the drawing logic works correctly on all devices. diff --git a/utility/src/main/java/org/oppia/android/util/parser/CustomHtmlContentHandler.kt b/utility/src/main/java/org/oppia/android/util/parser/CustomHtmlContentHandler.kt index 309d90aa1d5..9684e5cc0a3 100644 --- a/utility/src/main/java/org/oppia/android/util/parser/CustomHtmlContentHandler.kt +++ b/utility/src/main/java/org/oppia/android/util/parser/CustomHtmlContentHandler.kt @@ -1,4 +1,4 @@ -package org.oppia.util.parser +package org.oppia.android.util.parser import android.text.Editable import android.text.Html diff --git a/utility/src/main/java/org/oppia/android/util/parser/ExplorationHtmlParserEntityType.kt b/utility/src/main/java/org/oppia/android/util/parser/ExplorationHtmlParserEntityType.kt index 7207433af77..f002e7f7e43 100644 --- a/utility/src/main/java/org/oppia/android/util/parser/ExplorationHtmlParserEntityType.kt +++ b/utility/src/main/java/org/oppia/android/util/parser/ExplorationHtmlParserEntityType.kt @@ -1,4 +1,4 @@ -package org.oppia.util.parser +package org.oppia.android.util.parser import javax.inject.Qualifier diff --git a/utility/src/main/java/org/oppia/android/util/parser/GlideImageLoader.kt b/utility/src/main/java/org/oppia/android/util/parser/GlideImageLoader.kt index 41d92d171af..2519ee43f6c 100644 --- a/utility/src/main/java/org/oppia/android/util/parser/GlideImageLoader.kt +++ b/utility/src/main/java/org/oppia/android/util/parser/GlideImageLoader.kt @@ -1,4 +1,4 @@ -package org.oppia.util.parser +package org.oppia.android.util.parser import android.content.Context import android.graphics.Bitmap @@ -7,8 +7,8 @@ import com.bumptech.glide.Glide import com.bumptech.glide.RequestBuilder import com.bumptech.glide.load.engine.DiskCacheStrategy import com.bumptech.glide.request.RequestOptions -import org.oppia.util.caching.AssetRepository -import org.oppia.util.caching.CacheAssetsLocally +import org.oppia.android.util.caching.AssetRepository +import org.oppia.android.util.caching.CacheAssetsLocally import javax.inject.Inject /** An [ImageLoader] that uses Glide. */ diff --git a/utility/src/main/java/org/oppia/android/util/parser/GlideImageLoaderModule.kt b/utility/src/main/java/org/oppia/android/util/parser/GlideImageLoaderModule.kt index 7a3289fb77f..a8fe125eabe 100644 --- a/utility/src/main/java/org/oppia/android/util/parser/GlideImageLoaderModule.kt +++ b/utility/src/main/java/org/oppia/android/util/parser/GlideImageLoaderModule.kt @@ -1,4 +1,4 @@ -package org.oppia.util.parser +package org.oppia.android.util.parser import dagger.Binds import dagger.Module diff --git a/utility/src/main/java/org/oppia/android/util/parser/HtmlParser.kt b/utility/src/main/java/org/oppia/android/util/parser/HtmlParser.kt index a792c25449a..30edbcaa5cf 100755 --- a/utility/src/main/java/org/oppia/android/util/parser/HtmlParser.kt +++ b/utility/src/main/java/org/oppia/android/util/parser/HtmlParser.kt @@ -1,4 +1,4 @@ -package org.oppia.util.parser +package org.oppia.android.util.parser import android.text.Editable import android.text.Spannable diff --git a/utility/src/main/java/org/oppia/android/util/parser/HtmlParserEntityTypeModule.kt b/utility/src/main/java/org/oppia/android/util/parser/HtmlParserEntityTypeModule.kt index d9fe77785fb..f434acff0cd 100755 --- a/utility/src/main/java/org/oppia/android/util/parser/HtmlParserEntityTypeModule.kt +++ b/utility/src/main/java/org/oppia/android/util/parser/HtmlParserEntityTypeModule.kt @@ -1,4 +1,4 @@ -package org.oppia.util.parser +package org.oppia.android.util.parser import dagger.Module import dagger.Provides diff --git a/utility/src/main/java/org/oppia/android/util/parser/ImageAssetFetcher.kt b/utility/src/main/java/org/oppia/android/util/parser/ImageAssetFetcher.kt index 1c21e0ee02c..6971822ba20 100644 --- a/utility/src/main/java/org/oppia/android/util/parser/ImageAssetFetcher.kt +++ b/utility/src/main/java/org/oppia/android/util/parser/ImageAssetFetcher.kt @@ -1,4 +1,4 @@ -package org.oppia.util.parser +package org.oppia.android.util.parser /** Fetcher for image assets from the app's local asset repository. */ internal interface ImageAssetFetcher { diff --git a/utility/src/main/java/org/oppia/android/util/parser/ImageLoader.kt b/utility/src/main/java/org/oppia/android/util/parser/ImageLoader.kt index 4d32837cc2b..33f22933711 100644 --- a/utility/src/main/java/org/oppia/android/util/parser/ImageLoader.kt +++ b/utility/src/main/java/org/oppia/android/util/parser/ImageLoader.kt @@ -1,4 +1,4 @@ -package org.oppia.util.parser +package org.oppia.android.util.parser import android.graphics.Bitmap import android.graphics.drawable.PictureDrawable diff --git a/utility/src/main/java/org/oppia/android/util/parser/ImageParsingAnnotations.kt b/utility/src/main/java/org/oppia/android/util/parser/ImageParsingAnnotations.kt index 8d8526141eb..8a81b11f85d 100644 --- a/utility/src/main/java/org/oppia/android/util/parser/ImageParsingAnnotations.kt +++ b/utility/src/main/java/org/oppia/android/util/parser/ImageParsingAnnotations.kt @@ -1,4 +1,4 @@ -package org.oppia.util.parser +package org.oppia.android.util.parser import javax.inject.Qualifier diff --git a/utility/src/main/java/org/oppia/android/util/parser/ImageParsingModule.kt b/utility/src/main/java/org/oppia/android/util/parser/ImageParsingModule.kt index f0a72f40170..1b7256fc39d 100755 --- a/utility/src/main/java/org/oppia/android/util/parser/ImageParsingModule.kt +++ b/utility/src/main/java/org/oppia/android/util/parser/ImageParsingModule.kt @@ -1,4 +1,4 @@ -package org.oppia.util.parser +package org.oppia.android.util.parser import dagger.Module import dagger.Provides diff --git a/utility/src/main/java/org/oppia/android/util/parser/ImageTargets.kt b/utility/src/main/java/org/oppia/android/util/parser/ImageTargets.kt index e9165aafa12..199930d20a8 100644 --- a/utility/src/main/java/org/oppia/android/util/parser/ImageTargets.kt +++ b/utility/src/main/java/org/oppia/android/util/parser/ImageTargets.kt @@ -1,4 +1,4 @@ -package org.oppia.util.parser +package org.oppia.android.util.parser import android.widget.ImageView import com.bumptech.glide.request.target.CustomTarget diff --git a/utility/src/main/java/org/oppia/android/util/parser/RepositoryGlideModule.kt b/utility/src/main/java/org/oppia/android/util/parser/RepositoryGlideModule.kt index e63db7422f3..71e5061ddd5 100644 --- a/utility/src/main/java/org/oppia/android/util/parser/RepositoryGlideModule.kt +++ b/utility/src/main/java/org/oppia/android/util/parser/RepositoryGlideModule.kt @@ -1,4 +1,4 @@ -package org.oppia.util.parser +package org.oppia.android.util.parser import android.content.Context import android.graphics.drawable.PictureDrawable @@ -7,7 +7,7 @@ import com.bumptech.glide.Registry import com.bumptech.glide.annotation.GlideModule import com.bumptech.glide.module.AppGlideModule import com.caverock.androidsvg.SVG -import org.oppia.util.caching.AssetRepository +import org.oppia.android.util.caching.AssetRepository import java.io.InputStream /** Custom [AppGlideModule] to enable loading images from [AssetRepository] via Glide. */ diff --git a/utility/src/main/java/org/oppia/android/util/parser/RepositoryModelLoader.kt b/utility/src/main/java/org/oppia/android/util/parser/RepositoryModelLoader.kt index be03fa289c6..f7a9bcf29f4 100644 --- a/utility/src/main/java/org/oppia/android/util/parser/RepositoryModelLoader.kt +++ b/utility/src/main/java/org/oppia/android/util/parser/RepositoryModelLoader.kt @@ -1,4 +1,4 @@ -package org.oppia.util.parser +package org.oppia.android.util.parser import com.bumptech.glide.Priority import com.bumptech.glide.load.DataSource diff --git a/utility/src/main/java/org/oppia/android/util/parser/SvgDecoder.kt b/utility/src/main/java/org/oppia/android/util/parser/SvgDecoder.kt index 352d7a373fd..e166a77aaee 100644 --- a/utility/src/main/java/org/oppia/android/util/parser/SvgDecoder.kt +++ b/utility/src/main/java/org/oppia/android/util/parser/SvgDecoder.kt @@ -1,4 +1,4 @@ -package org.oppia.util.parser +package org.oppia.android.util.parser import com.bumptech.glide.load.Options import com.bumptech.glide.load.ResourceDecoder diff --git a/utility/src/main/java/org/oppia/android/util/parser/SvgDrawableTranscoder.kt b/utility/src/main/java/org/oppia/android/util/parser/SvgDrawableTranscoder.kt index f30a5464898..6305673a801 100644 --- a/utility/src/main/java/org/oppia/android/util/parser/SvgDrawableTranscoder.kt +++ b/utility/src/main/java/org/oppia/android/util/parser/SvgDrawableTranscoder.kt @@ -1,4 +1,4 @@ -package org.oppia.util.parser +package org.oppia.android.util.parser import android.graphics.drawable.PictureDrawable import com.bumptech.glide.load.Options diff --git a/utility/src/main/java/org/oppia/android/util/parser/UrlImageParser.kt b/utility/src/main/java/org/oppia/android/util/parser/UrlImageParser.kt index 4d5ff59aff6..aa166d6f528 100644 --- a/utility/src/main/java/org/oppia/android/util/parser/UrlImageParser.kt +++ b/utility/src/main/java/org/oppia/android/util/parser/UrlImageParser.kt @@ -1,4 +1,4 @@ -package org.oppia.util.parser +package org.oppia.android.util.parser import android.content.Context import android.graphics.Bitmap @@ -14,7 +14,7 @@ import android.view.ViewTreeObserver import android.widget.TextView import com.bumptech.glide.request.target.CustomTarget import com.bumptech.glide.request.transition.Transition -import org.oppia.util.R +import org.oppia.android.util.R import javax.inject.Inject import kotlin.math.max diff --git a/utility/src/main/java/org/oppia/android/util/profile/DirectoryManagementUtil.kt b/utility/src/main/java/org/oppia/android/util/profile/DirectoryManagementUtil.kt index fd6c40717fa..2445898378f 100644 --- a/utility/src/main/java/org/oppia/android/util/profile/DirectoryManagementUtil.kt +++ b/utility/src/main/java/org/oppia/android/util/profile/DirectoryManagementUtil.kt @@ -1,4 +1,4 @@ -package org.oppia.util.profile +package org.oppia.android.util.profile import android.content.Context import java.io.File diff --git a/utility/src/main/java/org/oppia/android/util/statusbar/StatusBarColor.kt b/utility/src/main/java/org/oppia/android/util/statusbar/StatusBarColor.kt index 7b646ff0461..d46c49fcbcb 100644 --- a/utility/src/main/java/org/oppia/android/util/statusbar/StatusBarColor.kt +++ b/utility/src/main/java/org/oppia/android/util/statusbar/StatusBarColor.kt @@ -1,4 +1,4 @@ -package org.oppia.util.statusbar +package org.oppia.android.util.statusbar import android.os.Build import android.view.View diff --git a/utility/src/main/java/org/oppia/android/util/system/OppiaClock.kt b/utility/src/main/java/org/oppia/android/util/system/OppiaClock.kt index e81d275ac27..56b14ad72e4 100644 --- a/utility/src/main/java/org/oppia/android/util/system/OppiaClock.kt +++ b/utility/src/main/java/org/oppia/android/util/system/OppiaClock.kt @@ -1,4 +1,4 @@ -package org.oppia.util.system +package org.oppia.android.util.system import android.annotation.SuppressLint import android.os.SystemClock diff --git a/utility/src/main/java/org/oppia/android/util/system/OppiaDateTimeFormatter.kt b/utility/src/main/java/org/oppia/android/util/system/OppiaDateTimeFormatter.kt index c309aa4884b..1c3851530b4 100644 --- a/utility/src/main/java/org/oppia/android/util/system/OppiaDateTimeFormatter.kt +++ b/utility/src/main/java/org/oppia/android/util/system/OppiaDateTimeFormatter.kt @@ -1,4 +1,4 @@ -package org.oppia.util.system +package org.oppia.android.util.system import java.text.SimpleDateFormat import java.util.Calendar diff --git a/utility/src/main/java/org/oppia/android/util/threading/BackgroundDispatcher.kt b/utility/src/main/java/org/oppia/android/util/threading/BackgroundDispatcher.kt index 17686df8638..17b64a0b16b 100644 --- a/utility/src/main/java/org/oppia/android/util/threading/BackgroundDispatcher.kt +++ b/utility/src/main/java/org/oppia/android/util/threading/BackgroundDispatcher.kt @@ -1,4 +1,4 @@ -package org.oppia.util.threading +package org.oppia.android.util.threading import javax.inject.Qualifier diff --git a/utility/src/main/java/org/oppia/android/util/threading/BlockingDispatcher.kt b/utility/src/main/java/org/oppia/android/util/threading/BlockingDispatcher.kt index 40aa4199d6f..8488adcd750 100644 --- a/utility/src/main/java/org/oppia/android/util/threading/BlockingDispatcher.kt +++ b/utility/src/main/java/org/oppia/android/util/threading/BlockingDispatcher.kt @@ -1,4 +1,4 @@ -package org.oppia.util.threading +package org.oppia.android.util.threading import javax.inject.Qualifier diff --git a/utility/src/main/java/org/oppia/android/util/threading/ConcurrentCollections.kt b/utility/src/main/java/org/oppia/android/util/threading/ConcurrentCollections.kt index 107a86b1be0..97e84384b7b 100644 --- a/utility/src/main/java/org/oppia/android/util/threading/ConcurrentCollections.kt +++ b/utility/src/main/java/org/oppia/android/util/threading/ConcurrentCollections.kt @@ -1,4 +1,4 @@ -package org.oppia.util.threading +package org.oppia.android.util.threading import java.util.concurrent.ConcurrentHashMap import java.util.concurrent.ConcurrentLinkedQueue diff --git a/utility/src/main/java/org/oppia/android/util/threading/DispatcherModule.kt b/utility/src/main/java/org/oppia/android/util/threading/DispatcherModule.kt index 1250489ddab..8b3862ccd48 100644 --- a/utility/src/main/java/org/oppia/android/util/threading/DispatcherModule.kt +++ b/utility/src/main/java/org/oppia/android/util/threading/DispatcherModule.kt @@ -1,4 +1,4 @@ -package org.oppia.util.threading +package org.oppia.android.util.threading import dagger.Module import dagger.Provides diff --git a/utility/src/test/AndroidManifest.xml b/utility/src/test/AndroidManifest.xml index 0e527c3295d..68183c98725 100644 --- a/utility/src/test/AndroidManifest.xml +++ b/utility/src/test/AndroidManifest.xml @@ -1,5 +1,5 @@ + package="org.oppia.android.util"> diff --git a/utility/src/test/java/org/oppia/android/util/data/AsyncResultTest.kt b/utility/src/test/java/org/oppia/android/util/data/AsyncResultTest.kt index 086a3faef87..542860cd631 100644 --- a/utility/src/test/java/org/oppia/android/util/data/AsyncResultTest.kt +++ b/utility/src/test/java/org/oppia/android/util/data/AsyncResultTest.kt @@ -1,4 +1,4 @@ -package org.oppia.util.data +package org.oppia.android.util.data import android.app.Application import androidx.test.core.app.ApplicationProvider @@ -11,11 +11,11 @@ import kotlinx.coroutines.async import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.oppia.testing.BackgroundTestDispatcher -import org.oppia.testing.FakeSystemClock -import org.oppia.testing.TestCoroutineDispatcher -import org.oppia.testing.TestCoroutineDispatchers -import org.oppia.testing.TestDispatcherModule +import org.oppia.android.testing.BackgroundTestDispatcher +import org.oppia.android.testing.FakeSystemClock +import org.oppia.android.testing.TestCoroutineDispatcher +import org.oppia.android.testing.TestCoroutineDispatchers +import org.oppia.android.testing.TestDispatcherModule import org.robolectric.annotation.LooperMode import javax.inject.Inject import javax.inject.Singleton diff --git a/utility/src/test/java/org/oppia/android/util/data/DataProvidersTest.kt b/utility/src/test/java/org/oppia/android/util/data/DataProvidersTest.kt index d871d41ed88..c037368b9d3 100644 --- a/utility/src/test/java/org/oppia/android/util/data/DataProvidersTest.kt +++ b/utility/src/test/java/org/oppia/android/util/data/DataProvidersTest.kt @@ -1,4 +1,4 @@ -package org.oppia.util.data +package org.oppia.android.util.data import android.app.Application import android.content.Context @@ -26,11 +26,11 @@ import org.mockito.Mockito.verify import org.mockito.Mockito.verifyZeroInteractions import org.mockito.junit.MockitoJUnit import org.mockito.junit.MockitoRule -import org.oppia.testing.FakeExceptionLogger -import org.oppia.testing.TestCoroutineDispatchers -import org.oppia.testing.TestDispatcherModule -import org.oppia.testing.TestLogReportingModule -import org.oppia.util.threading.BackgroundDispatcher +import org.oppia.android.testing.FakeExceptionLogger +import org.oppia.android.testing.TestCoroutineDispatchers +import org.oppia.android.testing.TestDispatcherModule +import org.oppia.android.testing.TestLogReportingModule +import org.oppia.android.util.threading.BackgroundDispatcher import org.robolectric.annotation.Config import org.robolectric.annotation.LooperMode import javax.inject.Inject diff --git a/utility/src/test/java/org/oppia/android/util/data/InMemoryBlockingCacheTest.kt b/utility/src/test/java/org/oppia/android/util/data/InMemoryBlockingCacheTest.kt index e406a842a28..6b4e05beb29 100644 --- a/utility/src/test/java/org/oppia/android/util/data/InMemoryBlockingCacheTest.kt +++ b/utility/src/test/java/org/oppia/android/util/data/InMemoryBlockingCacheTest.kt @@ -1,4 +1,4 @@ -package org.oppia.util.data +package org.oppia.android.util.data import android.app.Application import android.content.Context @@ -16,9 +16,9 @@ import kotlinx.coroutines.async import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.oppia.testing.TestCoroutineDispatcher -import org.oppia.testing.TestCoroutineDispatchers -import org.oppia.testing.TestDispatcherModule +import org.oppia.android.testing.TestCoroutineDispatcher +import org.oppia.android.testing.TestCoroutineDispatchers +import org.oppia.android.testing.TestDispatcherModule import org.robolectric.annotation.Config import org.robolectric.annotation.LooperMode import java.util.concurrent.Executors diff --git a/utility/src/test/java/org/oppia/android/util/datetime/DateTimeUtilTest.kt b/utility/src/test/java/org/oppia/android/util/datetime/DateTimeUtilTest.kt index f6b0eb98fca..bdeb877455f 100644 --- a/utility/src/test/java/org/oppia/android/util/datetime/DateTimeUtilTest.kt +++ b/utility/src/test/java/org/oppia/android/util/datetime/DateTimeUtilTest.kt @@ -1,4 +1,4 @@ -package org.oppia.util.datetime +package org.oppia.android.util.datetime import android.app.Application import android.content.Context @@ -12,12 +12,12 @@ import dagger.Provides import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.oppia.testing.TestDispatcherModule -import org.oppia.util.logging.EnableConsoleLog -import org.oppia.util.logging.EnableFileLog -import org.oppia.util.logging.GlobalLogLevel -import org.oppia.util.logging.LogLevel -import org.oppia.util.system.OppiaClock +import org.oppia.android.testing.TestDispatcherModule +import org.oppia.android.util.logging.EnableConsoleLog +import org.oppia.android.util.logging.EnableFileLog +import org.oppia.android.util.logging.GlobalLogLevel +import org.oppia.android.util.logging.LogLevel +import org.oppia.android.util.system.OppiaClock import org.robolectric.annotation.Config import org.robolectric.annotation.LooperMode import javax.inject.Inject diff --git a/utility/src/test/java/org/oppia/android/util/logging/EventBundleCreatorTest.kt b/utility/src/test/java/org/oppia/android/util/logging/EventBundleCreatorTest.kt index 18a31f4ca0b..19e1515bd8d 100644 --- a/utility/src/test/java/org/oppia/android/util/logging/EventBundleCreatorTest.kt +++ b/utility/src/test/java/org/oppia/android/util/logging/EventBundleCreatorTest.kt @@ -1,4 +1,4 @@ -package org.oppia.util.logging +package org.oppia.android.util.logging import android.app.Application import android.content.Context @@ -12,7 +12,7 @@ import dagger.Provides import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.oppia.app.model.EventLog +import org.oppia.android.app.model.EventLog import org.robolectric.annotation.Config import org.robolectric.annotation.LooperMode import javax.inject.Singleton diff --git a/utility/src/test/java/org/oppia/android/util/networking/NetworkConnectionUtilTest.kt b/utility/src/test/java/org/oppia/android/util/networking/NetworkConnectionUtilTest.kt index 2ff12cfa637..7c149d4ef6d 100644 --- a/utility/src/test/java/org/oppia/android/util/networking/NetworkConnectionUtilTest.kt +++ b/utility/src/test/java/org/oppia/android/util/networking/NetworkConnectionUtilTest.kt @@ -1,4 +1,4 @@ -package org.oppia.util.networking +package org.oppia.android.util.networking import android.app.Application import android.content.Context @@ -13,11 +13,11 @@ import dagger.Provides import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.oppia.testing.TestDispatcherModule -import org.oppia.util.logging.EnableConsoleLog -import org.oppia.util.logging.EnableFileLog -import org.oppia.util.logging.GlobalLogLevel -import org.oppia.util.logging.LogLevel +import org.oppia.android.testing.TestDispatcherModule +import org.oppia.android.util.logging.EnableConsoleLog +import org.oppia.android.util.logging.EnableFileLog +import org.oppia.android.util.logging.GlobalLogLevel +import org.oppia.android.util.logging.LogLevel import org.robolectric.Shadows.shadowOf import org.robolectric.annotation.Config import org.robolectric.annotation.LooperMode diff --git a/utility/src/test/java/org/oppia/android/util/parser/CustomHtmlContentHandlerTest.kt b/utility/src/test/java/org/oppia/android/util/parser/CustomHtmlContentHandlerTest.kt index e391a12ae4c..c9dddfcc9b2 100644 --- a/utility/src/test/java/org/oppia/android/util/parser/CustomHtmlContentHandlerTest.kt +++ b/utility/src/test/java/org/oppia/android/util/parser/CustomHtmlContentHandlerTest.kt @@ -1,4 +1,4 @@ -package org.oppia.util.parser +package org.oppia.android.util.parser import android.text.Editable import android.text.Html diff --git a/utility/src/test/java/org/oppia/android/util/profile/DirectoryManagementUtilTest.kt b/utility/src/test/java/org/oppia/android/util/profile/DirectoryManagementUtilTest.kt index bf2b028e362..a90802f3239 100644 --- a/utility/src/test/java/org/oppia/android/util/profile/DirectoryManagementUtilTest.kt +++ b/utility/src/test/java/org/oppia/android/util/profile/DirectoryManagementUtilTest.kt @@ -1,4 +1,4 @@ -package org.oppia.util.profile +package org.oppia.android.util.profile import android.app.Application import android.content.Context @@ -12,11 +12,11 @@ import dagger.Provides import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.oppia.testing.TestDispatcherModule -import org.oppia.util.logging.EnableConsoleLog -import org.oppia.util.logging.EnableFileLog -import org.oppia.util.logging.GlobalLogLevel -import org.oppia.util.logging.LogLevel +import org.oppia.android.testing.TestDispatcherModule +import org.oppia.android.util.logging.EnableConsoleLog +import org.oppia.android.util.logging.EnableFileLog +import org.oppia.android.util.logging.GlobalLogLevel +import org.oppia.android.util.logging.LogLevel import org.robolectric.annotation.Config import org.robolectric.annotation.LooperMode import java.io.File @@ -132,7 +132,7 @@ class DirectoryManagementUtilTest { private fun getAbsoluteDirPath(path: String): String { /** - * context.filesDir.toString() looks like /tmp/robolectric-Method_test_name/org.oppia.util.test-dataDir/files + * context.filesDir.toString() looks like /tmp/robolectric-Method_test_name/org.oppia.android.util.test-dataDir/files * dropLast(5) removes files from the path and then it appends the real path with "app_" as a prefix */ return context.filesDir.toString().dropLast(5) + "app_" + path diff --git a/utility/src/test/java/org/oppia/android/util/system/OppiaDateTimeFormatterTest.kt b/utility/src/test/java/org/oppia/android/util/system/OppiaDateTimeFormatterTest.kt index 278985636a3..9a1f778630a 100644 --- a/utility/src/test/java/org/oppia/android/util/system/OppiaDateTimeFormatterTest.kt +++ b/utility/src/test/java/org/oppia/android/util/system/OppiaDateTimeFormatterTest.kt @@ -1,4 +1,4 @@ -package org.oppia.util.system +package org.oppia.android.util.system import android.app.Application import android.content.Context diff --git a/utility/utility_test.bzl b/utility/utility_test.bzl index 71885bb006c..6277dcfa0a4 100644 --- a/utility/utility_test.bzl +++ b/utility/utility_test.bzl @@ -1,22 +1,23 @@ load("//:oppia_android_test.bzl", "oppia_android_test") + # TODO(#1620): Remove module-specific test macros once Gradle is removed def utility_test(name, srcs, test_class, deps): - ''' - Creates individual tests for test files in the utility module. + ''' + Creates individual tests for test files in the utility module. - Args: - name: str. The name of the Kotlin test file without the '.kt' suffix. - srcs: list of str. The list of test files to be run. - test_class: str. The package of the src file. Example: If the src is 'AsyncResultTest.kt', - then the test_class would be "org.oppia.util.data.AsyncResultTest". - deps: list of str. The list of dependencies needed to build and run this test. - ''' + Args: + name: str. The name of the Kotlin test file without the '.kt' suffix. + srcs: list of str. The list of test files to be run. + test_class: str. The package of the src file. Example: If the src is 'AsyncResultTest.kt', + then the test_class would be "org.oppia.util.data.AsyncResultTest". + deps: list of str. The list of dependencies needed to build and run this test. + ''' - oppia_android_test( - name = name, - srcs = srcs, - custom_package = "org.oppia.util", - test_class = test_class, - test_manifest = "src/test/AndroidManifest.xml", - deps = deps, - ) + oppia_android_test( + name = name, + srcs = srcs, + custom_package = "org.oppia.android.util", + test_class = test_class, + test_manifest = "src/test/AndroidManifest.xml", + deps = deps, + )