From 4b3be3d050d43c8d6c6918a4b8e6c4cb3568e509 Mon Sep 17 00:00:00 2001 From: MohitGupta121 Date: Fri, 17 Nov 2023 17:14:18 +0530 Subject: [PATCH 01/16] arrange string inital --- app/src/main/AndroidManifest.xml | 8 +- .../AdministratorControlsActivity.kt | 6 +- .../AdministratorControlsActivityPresenter.kt | 2 +- .../LogoutDialogFragment.kt | 6 +- .../appversion/AppVersionViewModel.kt | 2 +- ...pterNotStartedContainerConstraintLayout.kt | 2 +- .../app/customview/PromotedStoryCardView.kt | 2 +- .../databinding/TextViewBindingAdapters.java | 4 +- .../app/drawer/ExitProfileDialogFragment.kt | 4 +- .../NavigationDrawerFragmentPresenter.kt | 8 +- .../drawer/NavigationDrawerHeaderViewModel.kt | 2 +- .../oppia/android/app/help/HelpActivity.kt | 2 +- .../android/app/help/HelpActivityPresenter.kt | 8 +- .../android/app/help/HelpItemViewModel.kt | 6 +- .../android/app/help/HelpListViewModel.kt | 6 +- .../app/help/faq/FAQListActivityPresenter.kt | 2 +- .../faqsingle/FAQSingleActivityPresenter.kt | 2 +- ...HintsAndSolutionDialogFragmentPresenter.kt | 2 +- .../HintsAndSolutionViewModel.kt | 2 +- .../RevealSolutionDialogFragment.kt | 8 +- .../app/hintsandsolution/SolutionViewModel.kt | 4 +- .../PromotedStoryListViewModel.kt | 4 +- .../recentlyplayed/PromotedStoryViewModel.kt | 2 +- .../RecentlyPlayedActivityPresenter.kt | 4 +- .../recentlyplayed/RecentlyPlayedViewModel.kt | 4 +- .../MyDownloadsFragmentPresenter.kt | 4 +- .../app/onboarding/OnboadingSlideViewModel.kt | 14 +- .../onboarding/OnboardingFragmentPresenter.kt | 2 +- .../app/onboarding/OnboardingViewModel.kt | 2 +- .../android/app/options/OptionsActivity.kt | 8 +- .../OptionsReadingTextSizeViewModel.kt | 8 +- .../app/options/TextSizeItemViewModel.kt | 8 +- .../player/audio/AudioFragmentPresenter.kt | 8 +- .../app/player/audio/AudioViewModel.kt | 2 +- .../audio/CellularAudioDialogFragment.kt | 8 +- .../player/audio/LanguageDialogFragment.kt | 6 +- .../ExplorationActivityPresenter.kt | 2 +- .../ExplorationFragmentPresenter.kt | 2 +- .../DragDropInteractionContentViewModel.kt | 13 +- .../FractionInteractionViewModel.kt | 4 +- ...mageRegionSelectionInteractionViewModel.kt | 2 +- .../MathExpressionInteractionsViewModel.kt | 72 +- .../PreviousResponsesHeaderViewModel.kt | 2 +- .../ProgressDatabaseFullDialogFragment.kt | 10 +- .../StopExplorationDialogFragment.kt | 4 +- .../UnsavedExplorationDialogFragment.kt | 4 +- .../app/policies/PoliciesActivityPresenter.kt | 4 +- .../app/policies/PoliciesFragmentPresenter.kt | 4 +- .../profile/AddProfileActivityPresenter.kt | 18 +- .../app/profile/AdminAuthActivityPresenter.kt | 14 +- .../app/profile/AdminPinActivityPresenter.kt | 6 +- .../AdminSettingsDialogFragmentPresenter.kt | 12 +- .../profile/PinPasswordActivityPresenter.kt | 22 +- .../app/profile/PinPasswordViewModel.kt | 2 +- .../ResetPinDialogFragmentPresenter.kt | 10 +- .../android/app/profile/ResetPinViewModel.kt | 2 +- .../ProfilePictureEditDialogFragment.kt | 4 +- .../ProfileProgressActivityPresenter.kt | 2 +- .../RecentlyPlayedStorySummaryViewModel.kt | 2 +- .../ProfileEditDeletionDialogFragment.kt | 8 +- .../profile/ProfileRenameFragmentPresenter.kt | 6 +- .../ProfileResetPinFragmentPresenter.kt | 6 +- .../app/story/StoryFragmentPresenter.kt | 2 +- .../StoryChapterSummaryViewModel.kt | 2 +- .../app/topic/TopicFragmentPresenter.kt | 4 +- .../org/oppia/android/app/topic/TopicTab.kt | 16 +- .../oppia/android/app/topic/TopicViewModel.kt | 2 +- .../ConceptCardFragmentPresenter.kt | 2 +- .../app/topic/info/TopicInfoViewModel.kt | 2 +- .../topic/lessons/ChapterSummaryViewModel.kt | 10 +- .../topic/lessons/StorySummaryViewModel.kt | 6 +- .../questionplayer/QuestionPlayerViewModel.kt | 4 +- .../app/utility/datetime/DateTimeUtil.kt | 6 +- .../end/WalkthroughFinalFragmentPresenter.kt | 2 +- .../WalkthroughWelcomeFragmentPresenter.kt | 2 +- .../res/layout-land/onboarding_fragment.xml | 4 +- .../layout-land/onboarding_slide_final.xml | 6 +- .../layout-land/profile_chooser_add_view.xml | 4 +- .../layout-land/profile_chooser_fragment.xml | 6 +- .../profile_chooser_profile_view.xml | 2 +- .../res/layout-land/profile_edit_fragment.xml | 16 +- .../layout-land/profile_progress_header.xml | 12 +- .../layout-land/question_player_fragment.xml | 8 +- .../res/layout-land/story_chapter_view.xml | 2 +- .../main/res/layout-land/survey_fragment.xml | 2 +- .../res/layout-land/topic_info_fragment.xml | 4 +- .../walkthrough_final_fragment.xml | 10 +- .../walkthrough_welcome_fragment.xml | 4 +- .../faq_single_activity.xml | 2 +- .../onboarding_fragment.xml | 4 +- .../onboarding_slide_final.xml | 6 +- .../profile_chooser_add_view.xml | 4 +- .../profile_chooser_profile_view.xml | 2 +- .../question_player_fragment.xml | 8 +- .../topic_info_fragment.xml | 4 +- .../topic_lessons_story_summary.xml | 4 +- .../onboarding_fragment.xml | 4 +- .../onboarding_slide_final.xml | 6 +- .../profile_chooser_add_view.xml | 4 +- .../profile_chooser_profile_view.xml | 2 +- .../question_player_fragment.xml | 8 +- .../topic_info_fragment.xml | 4 +- ...istrator_controls_app_information_view.xml | 4 +- ...trator_controls_learner_analytics_view.xml | 2 +- .../administrator_controls_profile_view.xml | 4 +- .../layout-sw600dp/option_app_language.xml | 2 +- .../layout-sw600dp/option_story_text_size.xml | 2 +- .../profile_chooser_fragment.xml | 6 +- .../profile_progress_header.xml | 12 +- .../res/layout-sw600dp/story_chapter_view.xml | 2 +- .../res/layout-sw600dp/story_fragment.xml | 2 +- .../layout-sw600dp/topic_lessons_title.xml | 2 +- .../activity_input_interaction_view_test.xml | 2 +- .../main/res/layout/add_profile_activity.xml | 26 +- .../main/res/layout/admin_auth_activity.xml | 12 +- .../main/res/layout/admin_pin_activity.xml | 10 +- .../main/res/layout/admin_settings_dialog.xml | 2 +- ...istrator_controls_account_actions_view.xml | 4 +- ...istrator_controls_app_information_view.xml | 4 +- ...tor_controls_download_permissions_view.xml | 10 +- .../administrator_controls_general_view.xml | 4 +- ...trator_controls_learner_analytics_view.xml | 2 +- .../administrator_controls_profile_view.xml | 4 +- app/src/main/res/layout/all_topics.xml | 2 +- .../main/res/layout/app_language_activity.xml | 2 +- .../main/res/layout/app_version_activity.xml | 4 +- app/src/main/res/layout/audio_fragment.xml | 6 +- .../res/layout/audio_language_activity.xml | 2 +- .../res/layout/beta_notice_dialog_content.xml | 4 +- .../bottom_sheet_options_menu_fragment.xml | 6 +- .../main/res/layout/cellular_data_dialog.xml | 2 +- .../layout/completed_story_list_fragment.xml | 2 +- .../main/res/layout/concept_card_fragment.xml | 2 +- .../concept_card_fragment_test_activity.xml | 4 +- .../res/layout/continue_interaction_item.xml | 2 +- .../continue_navigation_button_item.xml | 2 +- .../res/layout/drag_drop_interaction_item.xml | 2 +- app/src/main/res/layout/drawer_fragment.xml | 4 +- .../main/res/layout/exploration_activity.xml | 2 +- .../res/layout/exploration_test_activity.xml | 2 +- app/src/main/res/layout/faq_item_header.xml | 2 +- .../main/res/layout/faq_single_activity.xml | 2 +- .../layout/force_network_type_fragment.xml | 2 +- app/src/main/res/layout/hint_summary.xml | 4 +- .../layout/hints_and_solution_fragment.xml | 2 +- .../layout/license_text_viewer_activity.xml | 2 +- .../mark_chapters_completed_fragment.xml | 2 +- .../mark_stories_completed_fragment.xml | 2 +- .../layout/mark_topics_completed_fragment.xml | 2 +- .../math_expression_parser_fragment.xml | 2 +- .../layout/numeric_input_interaction_item.xml | 2 +- .../main/res/layout/onboarding_fragment.xml | 4 +- .../res/layout/onboarding_slide_final.xml | 6 +- .../layout/ongoing_topic_list_fragment.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 +- .../main/res/layout/pin_password_activity.xml | 14 +- app/src/main/res/layout/policies_activity.xml | 2 +- .../layout/profile_and_device_id_activity.xml | 2 +- .../res/layout/profile_chooser_add_view.xml | 4 +- .../res/layout/profile_chooser_fragment.xml | 6 +- .../layout/profile_chooser_profile_view.xml | 2 +- .../main/res/layout/profile_edit_activity.xml | 2 +- .../main/res/layout/profile_edit_fragment.xml | 16 +- .../main/res/layout/profile_list_fragment.xml | 2 +- .../res/layout/profile_list_profile_view.xml | 2 +- .../res/layout/profile_picture_activity.xml | 2 +- .../layout/profile_picture_edit_dialog.xml | 4 +- .../res/layout/profile_progress_header.xml | 12 +- .../res/layout/profile_rename_activity.xml | 2 +- .../res/layout/profile_rename_fragment.xml | 4 +- .../res/layout/profile_reset_pin_activity.xml | 2 +- .../res/layout/profile_reset_pin_fragment.xml | 8 +- .../main/res/layout/promoted_story_list.xml | 2 +- .../res/layout/question_player_activity.xml | 2 +- .../res/layout/question_player_fragment.xml | 8 +- .../res/layout/reading_text_size_activity.xml | 4 +- .../res/layout/recently_played_activity.xml | 4 +- .../main/res/layout/replay_button_item.xml | 2 +- .../res/layout/resume_lesson_activity.xml | 2 +- .../layout/return_to_topic_button_item.xml | 2 +- .../res/layout/revision_card_activity.xml | 4 +- app/src/main/res/layout/solution_summary.xml | 8 +- app/src/main/res/layout/splash_activity.xml | 2 +- .../spotlight_fragment_test_activity.xml | 2 +- app/src/main/res/layout/state_fragment.xml | 6 +- .../layout/state_fragment_test_activity.xml | 2 +- .../main/res/layout/story_chapter_view.xml | 2 +- app/src/main/res/layout/story_fragment.xml | 2 +- .../main/res/layout/submit_button_item.xml | 2 +- app/src/main/res/layout/survey_fragment.xml | 2 +- .../test_margin_bindable_adapter_activity.xml | 2 +- .../layout/text_input_interaction_item.xml | 2 +- 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_header_view.xml | 4 +- .../res/layout/view_event_logs_fragment.xml | 2 +- .../main/res/layout/walkthrough_activity.xml | 2 +- .../res/layout/walkthrough_final_fragment.xml | 10 +- .../layout/walkthrough_topic_header_view.xml | 2 +- .../layout/walkthrough_welcome_fragment.xml | 4 +- .../main/res/menu/navigation_drawer_menu.xml | 8 +- app/src/main/res/values-ar/strings.xml | 684 ++++++------- app/src/main/res/values-pcm-rNG/strings.xml | 821 ++++++++------- app/src/main/res/values-pt-rBR/strings.xml | 674 ++++++------ app/src/main/res/values-sw/strings.xml | 589 ++++++----- app/src/main/res/values/strings.xml | 956 +++++++++--------- app/src/main/res/values/styles.xml | 4 +- .../AdministratorControlsActivityTest.kt | 48 +- .../AdministratorControlsFragmentTest.kt | 10 +- .../AppVersionActivityTest.kt | 6 +- .../DeveloperOptionsActivityTest.kt | 2 +- .../android/app/faq/FAQListFragmentTest.kt | 2 +- .../android/app/help/HelpFragmentTest.kt | 26 +- .../android/app/home/HomeActivityTest.kt | 20 +- .../app/home/RecentlyPlayedFragmentTest.kt | 18 +- .../mydownloads/MyDownloadsFragmentTest.kt | 2 +- .../notice/BetaNoticeDialogFragmentTest.kt | 4 +- .../app/onboarding/OnboardingFragmentTest.kt | 38 +- .../app/options/OptionsFragmentTest.kt | 2 +- .../app/player/audio/AudioFragmentTest.kt | 16 +- .../exploration/BottomSheetOptionsMenuTest.kt | 6 +- .../exploration/ExplorationActivityTest.kt | 78 +- .../app/player/state/StateFragmentTest.kt | 36 +- .../app/policies/PoliciesActivityTest.kt | 4 +- .../app/profile/AddProfileActivityTest.kt | 32 +- .../app/profile/AdminAuthActivityTest.kt | 30 +- .../app/profile/AdminPinActivityTest.kt | 14 +- .../app/profile/PinPasswordActivityTest.kt | 90 +- .../app/profile/ProfileChooserFragmentTest.kt | 14 +- .../ProfilePictureActivityTest.kt | 2 +- .../ProfileProgressFragmentTest.kt | 28 +- .../profile/ProfileEditActivityTest.kt | 4 +- .../profile/ProfileEditFragmentTest.kt | 6 +- .../profile/ProfileListFragmentTest.kt | 4 +- .../profile/ProfileRenameFragmentTest.kt | 6 +- .../profile/ProfileResetPinFragmentTest.kt | 12 +- .../android/app/splash/SplashActivityTest.kt | 6 +- .../android/app/story/StoryFragmentTest.kt | 4 +- .../android/app/survey/SurveyFragmentTest.kt | 2 +- .../NavigationDrawerActivityDebugTest.kt | 22 +- .../NavigationDrawerActivityProdTest.kt | 98 +- .../android/app/topic/TopicActivityTest.kt | 2 +- .../android/app/topic/TopicFragmentTest.kt | 16 +- .../conceptcard/ConceptCardFragmentTest.kt | 6 +- .../app/topic/info/TopicInfoFragmentTest.kt | 8 +- .../practice/TopicPracticeFragmentTest.kt | 6 +- .../revisioncard/RevisionCardActivityTest.kt | 16 +- .../revisioncard/RevisionCardFragmentTest.kt | 10 +- .../walkthrough/WalkthroughActivityTest.kt | 2 +- .../WalkthroughTopicListFragmentTest.kt | 2 +- .../WalkthroughWelcomeFragmentTest.kt | 2 +- .../player/state/StateFragmentLocalTest.kt | 6 +- instrumentation/src/java/AndroidManifest.xml | 6 +- wiki/Oppia-Android-Testing.md | 8 +- wiki/Spotlight-Guide.md | 2 +- 260 files changed, 2746 insertions(+), 2781 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c324a1a7119..010e38311ae 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -26,7 +26,7 @@ android:value="2020-09-01" /> { setExtraControlsTitle( - resourceHandler.getStringInLocale(R.string.administrator_controls_edit_profiles) + resourceHandler.getStringInLocale(R.string.administrator_controls_fragment_edit_profiles_text) ) loadProfileList() } diff --git a/app/src/main/java/org/oppia/android/app/administratorcontrols/LogoutDialogFragment.kt b/app/src/main/java/org/oppia/android/app/administratorcontrols/LogoutDialogFragment.kt index f53e3244ee3..7182ae898a1 100644 --- a/app/src/main/java/org/oppia/android/app/administratorcontrols/LogoutDialogFragment.kt +++ b/app/src/main/java/org/oppia/android/app/administratorcontrols/LogoutDialogFragment.kt @@ -30,11 +30,11 @@ class LogoutDialogFragment : InjectableDialogFragment() { override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { return AlertDialog.Builder(requireContext(), R.style.OppiaAlertDialogTheme) - .setMessage(R.string.log_out_dialog_message) - .setNegativeButton(R.string.log_out_dialog_cancel_button) { dialog, _ -> + .setMessage(R.string.log_out_dialog_message_text) + .setNegativeButton(R.string.log_out_dialog_cancel_button_text) { dialog, _ -> dialog.dismiss() } - .setPositiveButton(R.string.log_out_dialog_okay_button) { _, _ -> + .setPositiveButton(R.string.log_out_dialog_okay_button_text) { _, _ -> val intent = ProfileChooserActivity.createProfileChooserActivity(activity!!) startActivity(intent) }.create() 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 f67614fd3be..3ffb261407e 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 @@ -27,7 +27,7 @@ class AppVersionViewModel @Inject constructor( /** Returns a localized, human-readable lastUpdateDateTime. */ fun computeLastUpdatedDateText(): String = resourceHandler.getStringInLocaleWithWrapping( - R.string.app_last_update_date, getDateTime(lastUpdateDateTime) + R.string.app_version_fragment_last_update_date_text, getDateTime(lastUpdateDateTime) ) private fun getDateTime(lastUpdateTime: Long): String = diff --git a/app/src/main/java/org/oppia/android/app/customview/ChapterNotStartedContainerConstraintLayout.kt b/app/src/main/java/org/oppia/android/app/customview/ChapterNotStartedContainerConstraintLayout.kt index b20920c763a..6d0b923ff0a 100644 --- a/app/src/main/java/org/oppia/android/app/customview/ChapterNotStartedContainerConstraintLayout.kt +++ b/app/src/main/java/org/oppia/android/app/customview/ChapterNotStartedContainerConstraintLayout.kt @@ -56,7 +56,7 @@ class ChapterNotStartedContainerConstraintLayout @JvmOverloads constructor( isSpotlit = true val spotlightTarget = SpotlightTarget( this, - resourceHandler.getStringInLocale(R.string.first_chapter_spotlight_hint), + resourceHandler.getStringInLocale(R.string.topic_fragment_first_chapter_spotlight_hint), feature = Spotlight.FeatureCase.FIRST_CHAPTER ) if (index == 0) { diff --git a/app/src/main/java/org/oppia/android/app/customview/PromotedStoryCardView.kt b/app/src/main/java/org/oppia/android/app/customview/PromotedStoryCardView.kt index ca104409df7..6b8c2e7ab07 100644 --- a/app/src/main/java/org/oppia/android/app/customview/PromotedStoryCardView.kt +++ b/app/src/main/java/org/oppia/android/app/customview/PromotedStoryCardView.kt @@ -37,7 +37,7 @@ class PromotedStoryCardView @JvmOverloads constructor( isSpotlit = true val spotlightTarget = SpotlightTarget( this, - resourceHandler.getStringInLocale(R.string.promoted_story_spotlight_hint), + resourceHandler.getStringInLocale(R.string.home_story_promoted_story_spotlight_hint), feature = Spotlight.FeatureCase.PROMOTED_STORIES ) checkNotNull(getSpotlightManager()).requestSpotlightViewWithDelayedLayout(spotlightTarget) 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 591e8c88738..1100d6e89fb 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 @@ -25,7 +25,7 @@ public static void setProfileDataText(@NonNull TextView textView, long timestamp AppLanguageResourceHandler resourceHandler = getResourceHandler(textView); String time = resourceHandler.computeDateString(timestamp); textView.setText(resourceHandler.getStringInLocaleWithWrapping( - R.string.profile_edit_created, + R.string.profile_edit_activity_created_text, time )); } @@ -34,7 +34,7 @@ public static void setProfileDataText(@NonNull TextView textView, long timestamp @BindingAdapter("profile:lastVisited") public static void setProfileLastVisitedText(@NonNull TextView textView, long timestamp) { AppLanguageResourceHandler resourceHandler = getResourceHandler(textView); - String profileLastUsed = resourceHandler.getStringInLocale(R.string.profile_last_used); + String profileLastUsed = resourceHandler.getStringInLocale(R.string.profile_edit_activity_last_used_text); String timeAgoTimeStamp = getTimeAgo(textView, timestamp); String profileLastVisited = resourceHandler.getStringInLocaleWithWrapping( R.string.profile_last_visited, diff --git a/app/src/main/java/org/oppia/android/app/drawer/ExitProfileDialogFragment.kt b/app/src/main/java/org/oppia/android/app/drawer/ExitProfileDialogFragment.kt index 7900163e9a5..4276230d6eb 100644 --- a/app/src/main/java/org/oppia/android/app/drawer/ExitProfileDialogFragment.kt +++ b/app/src/main/java/org/oppia/android/app/drawer/ExitProfileDialogFragment.kt @@ -66,10 +66,10 @@ class ExitProfileDialogFragment : InjectableDialogFragment() { val alertDialog = AlertDialog .Builder(ContextThemeWrapper(activity as Context, R.style.OppiaAlertDialogTheme)) .setMessage(R.string.home_activity_back_dialog_message) - .setNegativeButton(R.string.home_activity_back_dialog_cancel) { dialog, _ -> + .setNegativeButton(R.string.home_activity_back_dialog_cancel_button) { dialog, _ -> dialog.dismiss() } - .setPositiveButton(R.string.home_activity_back_dialog_exit) { _, _ -> + .setPositiveButton(R.string.home_activity_back_dialog_exit_button) { _, _ -> // TODO(#3641): Investigate on using finish instead of intent. val intent = ProfileChooserActivity.createProfileChooserActivity(activity!!) if (!restoreLastCheckedItem) { 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 44fb2ec9945..36f176e73be 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 @@ -412,8 +412,8 @@ class NavigationDrawerFragmentPresenter @Inject constructor( fragment.activity, drawerLayout, toolbar, - R.string.drawer_open_content_description, - R.string.drawer_close_content_description + R.string.navigation_drawer_fragment_open_content_description, + R.string.navigation_drawer_fragment_close_content_description ) { override fun onDrawerOpened(drawerView: View) { super.onDrawerOpened(drawerView) @@ -451,8 +451,8 @@ class NavigationDrawerFragmentPresenter @Inject constructor( fragment.activity, drawerLayout, toolbar, - R.string.drawer_open_content_description, - R.string.drawer_close_content_description + R.string.navigation_drawer_fragment_open_content_description, + R.string.navigation_drawer_fragment_close_content_description ) { override fun onDrawerOpened(drawerView: View) { super.onDrawerOpened(drawerView) 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 d75c0d03287..2902fe16fa0 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 @@ -49,7 +49,7 @@ class NavigationDrawerHeaderViewModel @Inject constructor( ) } - fun getBarSeparator() = resourceHandler.getStringInLocale(R.string.bar_separator) + fun getBarSeparator() = resourceHandler.getStringInLocale(R.string.navigation_drawer_fragment_bar_separator_text) private fun computeProfileTopicProgressText(): String { return resourceHandler.getQuantityStringInLocaleWithWrapping( 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 8d1182d5105..f92de92c60e 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 @@ -82,7 +82,7 @@ class HelpActivity : selectedLicenseIndex, policiesActivityParams ) - title = resourceHandler.getStringInLocale(R.string.menu_help) + title = resourceHandler.getStringInLocale(R.string.menu_help_text) } companion object { 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 29f2aa8123b..690f6c39ec7 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 @@ -281,7 +281,7 @@ class HelpActivityPresenter @Inject constructor( when (fragmentTag) { LICENSE_LIST_FRAGMENT_TAG -> { val thirdPartyDependenciesList = resourceHandler.getStringInLocale( - R.string.help_activity_third_party_dependencies_list + R.string.help_activity_third_party_dependencies_text ) activity.findViewById(R.id.help_multipane_options_back_button) .contentDescription = resourceHandler.getStringInLocaleWithoutWrapping( @@ -291,7 +291,7 @@ class HelpActivityPresenter @Inject constructor( } LICENSE_TEXT_FRAGMENT_TAG -> { val copyrightLicensesList = resourceHandler.getStringInLocale( - R.string.help_activity_copyright_licenses_list + R.string.help_activity_copyright_licenses_text ) activity.findViewById(R.id.help_multipane_options_back_button) .contentDescription = resourceHandler.getStringInLocaleWithoutWrapping( @@ -337,10 +337,10 @@ class HelpActivityPresenter @Inject constructor( private fun selectPoliciesFragment(policyPage: PolicyPage) { when (policyPage) { PolicyPage.PRIVACY_POLICY -> setMultipaneContainerTitle( - resourceHandler.getStringInLocale(R.string.privacy_policy_title) + resourceHandler.getStringInLocale(R.string.policy_activity_privacy_policy_title) ) PolicyPage.TERMS_OF_SERVICE -> setMultipaneContainerTitle( - resourceHandler.getStringInLocale(R.string.terms_of_service_title) + resourceHandler.getStringInLocale(R.string.policy_activity_terms_of_service_title) ) else -> { } } 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 a2472a4e3e1..04375e62bda 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 @@ -16,7 +16,7 @@ class HelpItemViewModel( ) : ObservableViewModel() { fun onClick(title: String) { when (title) { - resourceHandler.getStringInLocale(R.string.frequently_asked_questions_FAQ) -> { + resourceHandler.getStringInLocale(R.string.help_activity_faq_text) -> { if (isMultipane) { val loadFaqListFragmentListener = activity as LoadFaqListFragmentListener loadFaqListFragmentListener.loadFaqListFragment() @@ -36,10 +36,10 @@ class HelpItemViewModel( routeToThirdPartyDependencyListListener.onRouteToThirdPartyDependencyList() } } - resourceHandler.getStringInLocale(R.string.privacy_policy_title) -> { + resourceHandler.getStringInLocale(R.string.policy_activity_privacy_policy_title) -> { loadPolicyPage(PolicyPage.PRIVACY_POLICY) } - resourceHandler.getStringInLocale(R.string.terms_of_service_title) -> { + resourceHandler.getStringInLocale(R.string.policy_activity_terms_of_service_title) -> { loadPolicyPage(PolicyPage.TERMS_OF_SERVICE) } } 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 3684a6b4e29..833c9a42c84 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 @@ -19,15 +19,15 @@ class HelpListViewModel @Inject constructor( private fun getRecyclerViewItemList(): ArrayList { for (item in HelpItems.values()) { val category = when (item) { - HelpItems.FAQ -> resourceHandler.getStringInLocale(R.string.frequently_asked_questions_FAQ) + HelpItems.FAQ -> resourceHandler.getStringInLocale(R.string.help_activity_faq_text) HelpItems.THIRD_PARTY -> resourceHandler.getStringInLocale( R.string.third_party_dependency_list_activity_title ) HelpItems.PRIVACY_POLICY -> resourceHandler.getStringInLocale( - R.string.privacy_policy_title + R.string.policy_activity_privacy_policy_title ) HelpItems.TERMS_OF_SERVICE -> resourceHandler.getStringInLocale( - R.string.terms_of_service_title + R.string.policy_activity_terms_of_service_title ) } arrayList += HelpItemViewModel( 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 ed02ae5770d..ca7b87ce030 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 @@ -26,7 +26,7 @@ class FAQListActivityPresenter @Inject constructor( faqListActivityToolbar = binding.faqListActivityToolbar activity.setSupportActionBar(faqListActivityToolbar) - activity.supportActionBar!!.title = resourceHandler.getStringInLocale(R.string.FAQs) + activity.supportActionBar!!.title = resourceHandler.getStringInLocale(R.string.faq_list_activity_title) activity.supportActionBar!!.setDisplayShowHomeEnabled(true) activity.supportActionBar!!.setDisplayHomeAsUpEnabled(true) 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 4802913476e..00798dd2e96 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 @@ -34,7 +34,7 @@ class FAQSingleActivityPresenter @Inject constructor( faqSingleActivityToolbar = binding.faqSingleActivityToolbar activity.setSupportActionBar(faqSingleActivityToolbar) - activity.supportActionBar!!.title = resourceHandler.getStringInLocale(R.string.FAQs) + activity.supportActionBar!!.title = resourceHandler.getStringInLocale(R.string.faq_list_activity_title) activity.supportActionBar!!.setDisplayShowHomeEnabled(true) activity.supportActionBar!!.setDisplayHomeAsUpEnabled(true) 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 670afb8c3c5..ea22690af8c 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 @@ -92,7 +92,7 @@ class HintsAndSolutionDialogFragmentPresenter @Inject constructor( HintsAndSolutionFragmentBinding.inflate(inflater, container, /* attachToRoot= */ false) binding.hintsAndSolutionToolbar.setNavigationIcon(R.drawable.ic_close_white_24dp) binding.hintsAndSolutionToolbar.setNavigationContentDescription( - R.string.hints_and_solution_close_icon_description + R.string.hint_solution_dialog_close_icon_description ) binding.hintsAndSolutionToolbar.setNavigationOnClickListener { (fragment.requireActivity() as? HintsAndSolutionListener)?.dismiss() diff --git a/app/src/main/java/org/oppia/android/app/hintsandsolution/HintsAndSolutionViewModel.kt b/app/src/main/java/org/oppia/android/app/hintsandsolution/HintsAndSolutionViewModel.kt index f604f7f6547..1040b00bc71 100644 --- a/app/src/main/java/org/oppia/android/app/hintsandsolution/HintsAndSolutionViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/hintsandsolution/HintsAndSolutionViewModel.kt @@ -69,7 +69,7 @@ class HintsAndSolutionViewModel private constructor( ): HintViewModel { return HintViewModel( title = resourceHandler.getStringInLocaleWithWrapping( - R.string.hint_list_item_number, + R.string.hint_solution_dialog_reveal_hint_text, resourceHandler.toHumanReadableString(hintIndex + 1) ), hintSummary = translationController.extractString( 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 384213caf6d..f0fe9e054d5 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 @@ -42,14 +42,14 @@ class RevealSolutionDialogFragment : InjectableDialogFragment() { return AlertDialog .Builder(ContextThemeWrapper(activity as Context, R.style.OppiaDialogFragmentTheme)) - .setTitle(R.string.reveal_solution) + .setTitle(R.string.hint_solution_dialog_reveal_solution_text) .setView(view) - .setMessage(resourceHandler.getStringInLocale(R.string.this_will_reveal_the_solution)) - .setPositiveButton(resourceHandler.getStringInLocale(R.string.reveal)) { _, _ -> + .setMessage(resourceHandler.getStringInLocale(R.string.hint_solution_dialog_reveal_dialog_solution_text)) + .setPositiveButton(resourceHandler.getStringInLocale(R.string.hint_solution_dialog_reveal_dialog_button_text)) { _, _ -> revealSolutionInterface.revealSolution() dismiss() } - .setNegativeButton(R.string.cellular_data_alert_dialog_cancel_button) { _, _ -> + .setNegativeButton(R.string.cellular_audio_dialog_cancel_button_text) { _, _ -> dismiss() } .create() 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 cd70ceaae8e..2059b14b3f7 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 @@ -78,8 +78,8 @@ class SolutionViewModel private constructor( val correctAnswerContentDescription: String by lazy { computeCorrectAnswerContentDescription() } private val correctAnswerTextStringResId = if (isSolutionExclusive) { - R.string.hints_list_exclusive_solution_text - } else R.string.hints_list_possible_solution_text + R.string.hint_solution_dialog_exclusive_solution_text + } else R.string.hint_solution_dialog_possible_solution_text private fun computeCorrectAnswerHtml(): String { val answerTextHtml = when (correctAnswer.objectTypeCase) { diff --git a/app/src/main/java/org/oppia/android/app/home/promotedlist/PromotedStoryListViewModel.kt b/app/src/main/java/org/oppia/android/app/home/promotedlist/PromotedStoryListViewModel.kt index 993212cdf41..906ef3b164d 100644 --- a/app/src/main/java/org/oppia/android/app/home/promotedlist/PromotedStoryListViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/home/promotedlist/PromotedStoryListViewModel.kt @@ -41,10 +41,10 @@ class PromotedStoryListViewModel( resourceHandler.getStringInLocale(R.string.stories_for_you) } recentlyPlayedStoryList.isNotEmpty() -> { - resourceHandler.getStringInLocale(R.string.recently_played_stories) + resourceHandler.getStringInLocale(R.string.home_activity_recently_played_stories) } else -> { - resourceHandler.getStringInLocale(R.string.last_played_stories) + resourceHandler.getStringInLocale(R.string.home_activity_last_played_stories) } } } diff --git a/app/src/main/java/org/oppia/android/app/home/recentlyplayed/PromotedStoryViewModel.kt b/app/src/main/java/org/oppia/android/app/home/recentlyplayed/PromotedStoryViewModel.kt index f93fba2613c..06b60075c61 100755 --- a/app/src/main/java/org/oppia/android/app/home/recentlyplayed/PromotedStoryViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/home/recentlyplayed/PromotedStoryViewModel.kt @@ -131,7 +131,7 @@ class PromotedStoryViewModel( */ fun computeLessonThumbnailContentDescription(): String { return resourceHandler.getStringInLocaleWithWrapping( - R.string.lesson_thumbnail_content_description, nextChapterTitle + R.string.home_activity_lesson_thumbnail_description, nextChapterTitle ) } } 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 9eef029e29b..a7b3afb5192 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 @@ -50,13 +50,13 @@ class RecentlyPlayedActivityPresenter @Inject constructor( resourceHandler.getStringInLocale(R.string.stories_for_you) } RecentlyPlayedActivityTitle.LAST_PLAYED_STORIES -> { - resourceHandler.getStringInLocale(R.string.last_played_stories) + resourceHandler.getStringInLocale(R.string.home_activity_last_played_stories) } RecentlyPlayedActivityTitle.RECOMMENDED_STORIES -> { resourceHandler.getStringInLocale(R.string.recommended_stories) } else -> { - resourceHandler.getStringInLocale(R.string.recently_played_activity) + resourceHandler.getStringInLocale(R.string.recently_played_activity_title) } } } diff --git a/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedViewModel.kt b/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedViewModel.kt index 7716fdf11f5..c2bf98155ae 100644 --- a/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedViewModel.kt @@ -112,7 +112,7 @@ class RecentlyPlayedViewModel private constructor( ) { val recentSectionTitleViewModel = SectionTitleViewModel( - resourceHandler.getStringInLocale(R.string.ongoing_story_last_week), false + resourceHandler.getStringInLocale(R.string.home_activity_ongoing_story_last_week), false ) itemList.add(recentSectionTitleViewModel) recentlyPlayedStoryList.forEachIndexed { index, promotedStory -> @@ -128,7 +128,7 @@ class RecentlyPlayedViewModel private constructor( val showDivider = itemList.isNotEmpty() val olderSectionTitleViewModel = SectionTitleViewModel( - resourceHandler.getStringInLocale(R.string.ongoing_story_last_month), + resourceHandler.getStringInLocale(R.string.home_activity_ongoing_story_last_month), showDivider ) itemList.add(olderSectionTitleViewModel) 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 acad9aa15d5..9e521f52302 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 @@ -46,8 +46,8 @@ class MyDownloadsFragmentPresenter @Inject constructor( TabLayoutMediator(tabLayout, viewPager2) { tab, position -> when (position) { - 0 -> tab.text = resourceHandler.getStringInLocale(R.string.tab_downloads) - 1 -> tab.text = resourceHandler.getStringInLocale(R.string.tab_updates) + 0 -> tab.text = resourceHandler.getStringInLocale(R.string.my_downloads_fragment_tab_download_text) + 1 -> tab.text = resourceHandler.getStringInLocale(R.string.my_downloads_fragment_tab_updates_text) } }.attach() } 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 83b02f89172..2f07cc1181d 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 @@ -20,7 +20,7 @@ class OnboardingSlideViewModel( val title = ObservableField(getOnboardingSlide0Title()) val description = - ObservableField(resourceHandler.getStringInLocale(R.string.onboarding_slide_0_description)) + ObservableField(resourceHandler.getStringInLocale(R.string.onboarding_activity_slide_0_description)) private val orientation = Resources.getSystem().configuration.orientation init { @@ -40,7 +40,7 @@ class OnboardingSlideViewModel( slideImage.set(R.drawable.ic_portrait_onboarding_0) } title.set(getOnboardingSlide0Title()) - description.set(resourceHandler.getStringInLocale(R.string.onboarding_slide_0_description)) + description.set(resourceHandler.getStringInLocale(R.string.onboarding_activity_slide_0_description)) } ViewPagerSlide.SLIDE_1 -> { if (orientation == Configuration.ORIENTATION_LANDSCAPE) { @@ -52,8 +52,8 @@ class OnboardingSlideViewModel( } else if (orientation == Configuration.ORIENTATION_PORTRAIT) { slideImage.set(R.drawable.ic_portrait_onboarding_1) } - title.set(resourceHandler.getStringInLocale(R.string.onboarding_slide_1_title)) - description.set(resourceHandler.getStringInLocale(R.string.onboarding_slide_1_description)) + title.set(resourceHandler.getStringInLocale(R.string.onboarding_activity_slide_1_title)) + description.set(resourceHandler.getStringInLocale(R.string.onboarding_activity_slide_1_description)) } ViewPagerSlide.SLIDE_2 -> { if (orientation == Configuration.ORIENTATION_LANDSCAPE) { @@ -65,14 +65,14 @@ class OnboardingSlideViewModel( } else if (orientation == Configuration.ORIENTATION_PORTRAIT) { slideImage.set(R.drawable.ic_portrait_onboarding_2) } - title.set(resourceHandler.getStringInLocale(R.string.onboarding_slide_2_title)) - description.set(resourceHandler.getStringInLocale(R.string.onboarding_slide_2_description)) + title.set(resourceHandler.getStringInLocale(R.string.onboarding_activity_slide_2_title)) + description.set(resourceHandler.getStringInLocale(R.string.onboarding_activity_slide_2_description)) } } } private fun getOnboardingSlide0Title(): String { val appName = resourceHandler.getStringInLocale(R.string.app_name) - return resourceHandler.getStringInLocaleWithWrapping(R.string.onboarding_slide_0_title, appName) + return resourceHandler.getStringInLocaleWithWrapping(R.string.onboarding_activity_slide_0_title, appName) } } 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 1551e6c4199..efe15a02638 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 @@ -131,7 +131,7 @@ class OnboardingFragmentPresenter @Inject constructor( val completeString: String = resourceHandler.getStringInLocaleWithWrapping( - R.string.agree_to_terms, + R.string.policy_activity_agree_to_terms_text, resourceHandler.getStringInLocale(R.string.app_name) ) binding.slideTermsOfServiceAndPrivacyPolicyLinksTextView.text = htmlParserFactory.create( 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 f7f80e412cb..f4d5bc5aa76 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 @@ -27,7 +27,7 @@ class OnboardingViewModel @Inject constructor( private fun computeSlideDotsContainerContentDescription(slideNumber: Int): String { return resourceHandler.getStringInLocaleWithWrapping( - R.string.onboarding_slide_dots_content_description, + R.string.onboarding_activity_slide_dots_content_description, (slideNumber + 1).toString(), totalNumberOfSlides.toString() ) 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 50484e5ff1e..adac20e31c2 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 @@ -94,7 +94,7 @@ class OptionsActivity : selectedFragment, profileId!! ) - title = resourceHandler.getStringInLocale(R.string.menu_options) + title = resourceHandler.getStringInLocale(R.string.menu_options_text) } override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { @@ -146,7 +146,7 @@ class OptionsActivity : override fun loadReadingTextSizeFragment(textSize: ReadingTextSize) { selectedFragment = READING_TEXT_SIZE_FRAGMENT optionActivityPresenter.setExtraOptionTitle( - resourceHandler.getStringInLocale(R.string.reading_text_size) + resourceHandler.getStringInLocale(R.string.option_activity_reading_text_size) ) optionActivityPresenter.loadReadingTextSizeFragment(textSize) } @@ -154,7 +154,7 @@ class OptionsActivity : override fun loadAppLanguageFragment(appLanguage: OppiaLanguage) { selectedFragment = APP_LANGUAGE_FRAGMENT optionActivityPresenter.setExtraOptionTitle( - resourceHandler.getStringInLocale(R.string.app_language) + resourceHandler.getStringInLocale(R.string.option_activity_app_language_text) ) optionActivityPresenter.loadAppLanguageFragment(appLanguage) } @@ -162,7 +162,7 @@ class OptionsActivity : override fun loadAudioLanguageFragment(audioLanguage: AudioLanguage) { selectedFragment = AUDIO_LANGUAGE_FRAGMENT optionActivityPresenter.setExtraOptionTitle( - resourceHandler.getStringInLocale(R.string.audio_language) + resourceHandler.getStringInLocale(R.string.option_activity_audio_language_text) ) optionActivityPresenter.loadAudioLanguageFragment(audioLanguage) } 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 626069bec7f..3a7cb086e1a 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 @@ -16,12 +16,12 @@ class OptionsReadingTextSizeViewModel( get() { return when (readingTextSize.get()!!) { ReadingTextSize.SMALL_TEXT_SIZE -> - resourceHandler.getStringInLocale(R.string.reading_text_size_small) + resourceHandler.getStringInLocale(R.string.option_activity_reading_text_size_small) ReadingTextSize.MEDIUM_TEXT_SIZE -> - resourceHandler.getStringInLocale(R.string.reading_text_size_medium) + resourceHandler.getStringInLocale(R.string.option_activity_reading_text_size_medium) ReadingTextSize.LARGE_TEXT_SIZE -> - resourceHandler.getStringInLocale(R.string.reading_text_size_large) - else -> resourceHandler.getStringInLocale(R.string.reading_text_size_extra_large) + resourceHandler.getStringInLocale(R.string.option_activity_reading_text_size_large) + else -> resourceHandler.getStringInLocale(R.string.option_activity_reading_text_size_extra_large) } } diff --git a/app/src/main/java/org/oppia/android/app/options/TextSizeItemViewModel.kt b/app/src/main/java/org/oppia/android/app/options/TextSizeItemViewModel.kt index 1b3fda584af..f5203a3f319 100644 --- a/app/src/main/java/org/oppia/android/app/options/TextSizeItemViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/options/TextSizeItemViewModel.kt @@ -27,12 +27,12 @@ class TextSizeItemViewModel( val textSizeName: String by lazy { when (readingTextSize) { ReadingTextSize.SMALL_TEXT_SIZE -> - resourceHandler.getStringInLocale(R.string.reading_text_size_small) + resourceHandler.getStringInLocale(R.string.option_activity_reading_text_size_small) ReadingTextSize.MEDIUM_TEXT_SIZE -> - resourceHandler.getStringInLocale(R.string.reading_text_size_medium) + resourceHandler.getStringInLocale(R.string.option_activity_reading_text_size_medium) ReadingTextSize.LARGE_TEXT_SIZE -> - resourceHandler.getStringInLocale(R.string.reading_text_size_large) - else -> resourceHandler.getStringInLocale(R.string.reading_text_size_extra_large) + resourceHandler.getStringInLocale(R.string.option_activity_reading_text_size_large) + else -> resourceHandler.getStringInLocale(R.string.option_activity_reading_text_size_extra_large) } } val textSize: Float by lazy { 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 02bcc3deb32..8d7c884a545 100644 --- 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 @@ -135,7 +135,7 @@ class AudioFragmentPresenter @Inject constructor( private fun startSpotlights() { val audioLanguageIconSpotlightTarget = SpotlightTarget( binding.audioLanguageIcon, - resourceHandler.getStringInLocale(R.string.voiceover_language_icon_spotlight_hint), + resourceHandler.getStringInLocale(R.string.audio_fragment_voiceover_language_icon_spotlight_hint), SpotlightShape.Circle, Spotlight.FeatureCase.VOICEOVER_LANGUAGE_ICON ) @@ -335,10 +335,10 @@ class AudioFragmentPresenter @Inject constructor( private fun showOfflineDialog() { AlertDialog.Builder(activity, R.style.OppiaAlertDialogTheme) - .setTitle(resourceHandler.getStringInLocale(R.string.audio_dialog_offline_title)) - .setMessage(resourceHandler.getStringInLocale(R.string.audio_dialog_offline_message)) + .setTitle(resourceHandler.getStringInLocale(R.string.audio_fragment_offline_dialog_title)) + .setMessage(resourceHandler.getStringInLocale(R.string.audio_fragment_offline_dialog_message)) .setPositiveButton( - resourceHandler.getStringInLocale(R.string.audio_dialog_offline_positive) + resourceHandler.getStringInLocale(R.string.audio_fragment_offline_dialog_positive_button_text) ) { dialog, _ -> dialog.dismiss() }.create().show() 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 07037abd873..7ab82bbb427 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 @@ -147,7 +147,7 @@ class AudioViewModel @Inject constructor( fun computeAudioUnavailabilityString(languageName: String): String { return resourceHandler.getStringInLocaleWithWrapping( - R.string.audio_unavailable_in_selected_language, languageName + R.string.audio_fragment_audio_unavailable_text, languageName ) } 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 50a0025a83a..549880c87a6 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 @@ -39,14 +39,14 @@ class CellularAudioDialogFragment : InjectableDialogFragment() { return AlertDialog .Builder(ContextThemeWrapper(activity as Context, R.style.OppiaDialogFragmentTheme)) - .setTitle(R.string.cellular_data_alert_dialog_title) + .setTitle(R.string.cellular_audio_dialog_title) .setView(view) - .setMessage(R.string.cellular_data_alert_dialog_description) - .setPositiveButton(R.string.cellular_data_alert_dialog_okay_button) { _, _ -> + .setMessage(R.string.cellular_audio_dialog_description) + .setPositiveButton(R.string.cellular_audio_dialog_okay_button_text) { _, _ -> cellularDataInterface.enableAudioWhileOnCellular(checkBox.isChecked) dismiss() } - .setNegativeButton(R.string.cellular_data_alert_dialog_cancel_button) { _, _ -> + .setNegativeButton(R.string.cellular_audio_dialog_cancel_button_text) { _, _ -> cellularDataInterface.disableAudioWhileOnCellular(checkBox.isChecked) dismiss() } 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 275705a0ed9..4f1b0927333 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 @@ -85,17 +85,17 @@ class LanguageDialogFragment : InjectableDialogFragment() { return AlertDialog .Builder(ContextThemeWrapper(activity as Context, R.style.OppiaDialogFragmentTheme)) - .setTitle(R.string.audio_language_select_dialog_title) + .setTitle(R.string.audio_language_dialog_title) .setSingleChoiceItems(options, selectedIndex) { dialog, which -> selectedIndex = which } - .setPositiveButton(R.string.audio_language_select_dialog_okay_button) { _, _ -> + .setPositiveButton(R.string.audio_language_dialog_okay_button_text) { _, _ -> if (selectedIndex != -1) { languageInterface.onLanguageSelected(languageCodeArrayList[selectedIndex]) } dismiss() } - .setNegativeButton(R.string.audio_language_select_dialog_cancel_button) { _, _ -> + .setNegativeButton(R.string.audio_language_dialog_cancel_button_text) { _, _ -> dismiss() } .create() 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 cd4a33b2d24..4d0a1dba14e 100644 --- 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 @@ -164,7 +164,7 @@ class ExplorationActivityPresenter @Inject constructor( val audioPlayerSpotlightTarget = SpotlightTarget( it, resourceHandler.getStringInLocaleWithWrapping( - R.string.voiceover_icon_spotlight_hint, + R.string.exploration_activity_voiceover_icon_spotlight_hint, resourceHandler.getStringInLocale(R.string.app_name) ), SpotlightShape.Circle, 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 8796b96b672..876d5762193 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 @@ -95,7 +95,7 @@ class ExplorationFragmentPresenter @Inject constructor( // This toolbar contains only one image button, which is the back navigation icon. val backButtonSpotlightTarget = SpotlightTarget( it, - resourceHandler.getStringInLocale(R.string.exploration_exit_button_spotlight_hint), + resourceHandler.getStringInLocale(R.string.exploration_activity_exit_button_spotlight_hint), SpotlightShape.Circle, Spotlight.FeatureCase.LESSONS_BACK_BUTTON ) 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 f0bdcf3ef2f..af0f4cd2acb 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 @@ -44,28 +44,29 @@ class DragDropInteractionContentViewModel( fun computeDragDropMoveUpItemContentDescription(): String { return if (itemIndex != 0) { resourceHandler.getStringInLocaleWithWrapping( - R.string.move_item_up_content_description, itemIndex.toString() + R.string.state_fragment_drag_drop_interaction_move_item_up_content_description, itemIndex.toString() ) - } else resourceHandler.getStringInLocale(R.string.up_button_disabled) + } else resourceHandler.getStringInLocale(R.string.state_fragment_drag_drop_interaction_up_button_disabled) } fun computeDragDropMoveDownItemContentDescription(): String { return if (itemIndex != listSize - 1) { resourceHandler.getStringInLocaleWithWrapping( - R.string.move_item_down_content_description, (itemIndex + 2).toString() + R.string.state_fragment_drag_drop_interaction_move_item_down_content_description, + (itemIndex + 2).toString() ) - } else resourceHandler.getStringInLocale(R.string.down_button_disabled) + } else resourceHandler.getStringInLocale(R.string.state_fragment_drag_drop_interaction_down_button_disabled) } fun computeDragDropGroupItemContentDescription(): String { return resourceHandler.getStringInLocaleWithWrapping( - R.string.link_to_item_below, (itemIndex + 2).toString() + R.string.state_fragment_drag_drop_interaction_link_to_item_below, (itemIndex + 2).toString() ) } fun computeDragDropUnlinkItemContentDescription(): String { return resourceHandler.getStringInLocaleWithWrapping( - R.string.unlink_items, (itemIndex + 1).toString() + R.string.state_fragment_drag_drop_interaction_unlink_items, (itemIndex + 1).toString() ) } } 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 22d42a74744..be8850f4dae 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 @@ -123,8 +123,8 @@ class FractionInteractionViewModel private constructor( customPlaceholder1.isNotEmpty() -> customPlaceholder1 customPlaceholder2.isNotEmpty() -> customPlaceholder2 !allowNonzeroIntegerPart -> - resourceHandler.getStringInLocale(R.string.fractions_default_hint_text_no_integer) - else -> resourceHandler.getStringInLocale(R.string.fractions_default_hint_text) + resourceHandler.getStringInLocale(R.string.state_fragment_fraction_input_interaction_no_integer_hint) + else -> resourceHandler.getStringInLocale(R.string.state_fragment_fraction_input_interaction_hint) } } 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 0c4029e940e..f0bc8727896 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 @@ -76,7 +76,7 @@ class ImageRegionSelectionInteractionViewModel private constructor( clickOnImage = parseClickOnImage(answerTextString) }.build() plainAnswer = resourceHandler.getStringInLocaleWithWrapping( - R.string.image_interaction_answer_text, + R.string.state_fragment_image_interaction_answer_text, answerTextString ) this.writtenTranslationContext = diff --git a/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/MathExpressionInteractionsViewModel.kt b/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/MathExpressionInteractionsViewModel.kt index 5d0822fae6c..c394bfd06d8 100644 --- a/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/MathExpressionInteractionsViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/MathExpressionInteractionsViewModel.kt @@ -293,7 +293,7 @@ class MathExpressionInteractionsViewModel private constructor( /** Defines the view model behaviors corresponding to numeric expressions. */ NUMERIC_EXPRESSION( ViewType.NUMERIC_EXPRESSION_INPUT_INTERACTION, - defaultHintTextStringId = R.string.numeric_expression_default_hint_text, + defaultHintTextStringId = R.string.state_fragment_numeric_input_interaction_default_hint, hasPlaceholder = true, hasCustomVariables = false ) { @@ -332,7 +332,7 @@ class MathExpressionInteractionsViewModel private constructor( /** Defines the view model behaviors corresponding to algebraic expressions. */ ALGEBRAIC_EXPRESSION( ViewType.ALGEBRAIC_EXPRESSION_INPUT_INTERACTION, - defaultHintTextStringId = R.string.algebraic_expression_default_hint_text, + defaultHintTextStringId = R.string.state_fragment_algebraic_input_interaction_default_hint, hasPlaceholder = false, hasCustomVariables = true ) { @@ -370,7 +370,7 @@ class MathExpressionInteractionsViewModel private constructor( /** Defines the view model behaviors corresponding to math equations. */ MATH_EQUATION( ViewType.MATH_EQUATION_INPUT_INTERACTION, - defaultHintTextStringId = R.string.math_equation_default_hint_text, + defaultHintTextStringId = R.string.state_fragment_math_equation_default_hint, hasPlaceholder = false, hasCustomVariables = true ) { @@ -418,106 +418,106 @@ class MathExpressionInteractionsViewModel private constructor( is MathParsingResult.Failure -> when (val error = parseResult.error) { is DisabledVariablesInUseError -> { appLanguageResourceHandler.getStringInLocaleWithWrapping( - R.string.math_expression_error_invalid_variable, + R.string.state_fragment_math_expression_invalid_variable_error, error.variables.joinToString(separator = ", ") ) } EquationIsMissingEqualsError -> { appLanguageResourceHandler.getStringInLocale( - R.string.math_expression_error_missing_equals + R.string.state_fragment_math_expression_missing_equals_error ) } EquationHasTooManyEqualsError -> { appLanguageResourceHandler.getStringInLocale( - R.string.math_expression_error_more_than_one_equals + R.string.state_fragment_math_expression_more_than_one_equals_error ) } EquationMissingLhsOrRhsError -> { appLanguageResourceHandler.getStringInLocale( - R.string.math_expression_error_hanging_equals + R.string.state_fragment_math_expression_hanging_equals_error ) } ExponentIsVariableExpressionError -> { appLanguageResourceHandler.getStringInLocale( - R.string.math_expression_error_exponent_has_variable + R.string.state_fragment_math_expression_exponent_has_variable_error ) } ExponentTooLargeError -> { appLanguageResourceHandler.getStringInLocale( - R.string.math_expression_error_exponent_too_large + R.string.state_fragment_math_expression_exponent_too_large_error ) } FunctionNameIncompleteError -> { appLanguageResourceHandler.getStringInLocale( - R.string.math_expression_error_incomplete_function_name + R.string.state_fragment_math_expression_incomplete_function_name_error ) } GenericError -> { appLanguageResourceHandler.getStringInLocale( - R.string.math_expression_error_generic + R.string.state_fragment_math_expression_generic_error ) } HangingSquareRootError -> { appLanguageResourceHandler.getStringInLocale( - R.string.math_expression_error_hanging_square_root + R.string.state_fragment_math_expression_hanging_square_root_error ) } is InvalidFunctionInUseError -> { appLanguageResourceHandler.getStringInLocaleWithWrapping( - R.string.math_expression_error_unsupported_function, error.functionName + R.string.state_fragment_math_expression_unsupported_function_error, error.functionName ) } is MultipleRedundantParenthesesError -> { appLanguageResourceHandler.getStringInLocaleWithWrapping( - R.string.math_expression_error_multiple_redundant_parentheses, error.rawExpression + R.string.state_fragment_math_expression_multiple_redundant_parentheses_error, error.rawExpression ) } NestedExponentsError -> { appLanguageResourceHandler.getStringInLocale( - R.string.math_expression_error_nested_exponent + R.string.state_fragment_math_expression_nested_exponent_error ) } is NoVariableOrNumberAfterBinaryOperatorError -> when (error.operator) { UnaryOperator.ADD -> { appLanguageResourceHandler.getStringInLocaleWithWrapping( - R.string.math_expression_error_missing_rhs_for_addition_operator, + R.string.state_fragment_math_expression_missing_rhs_for_addition_error, error.operatorSymbol ) } UnaryOperator.SUBTRACT -> { appLanguageResourceHandler.getStringInLocaleWithWrapping( - R.string.math_expression_error_missing_rhs_for_subtraction_operator, + R.string.state_fragment_math_expression_missing_rhs_for_subtraction_error, error.operatorSymbol ) } UnaryOperator.MULTIPLY -> { appLanguageResourceHandler.getStringInLocaleWithWrapping( - R.string.math_expression_error_missing_rhs_for_multiplication_operator, + R.string.state_fragment_math_expression_missing_rhs_for_multiplication_error, error.operatorSymbol ) } UnaryOperator.DIVIDE -> { appLanguageResourceHandler.getStringInLocaleWithWrapping( - R.string.math_expression_error_missing_rhs_for_division_operator, + R.string.state_fragment_math_expression_missing_rhs_for_division_error, error.operatorSymbol ) } UnaryOperator.EXPONENTIATE -> { appLanguageResourceHandler.getStringInLocaleWithWrapping( - R.string.math_expression_error_missing_rhs_for_exponentiation_operator, + R.string.state_fragment_math_expression_missing_rhs_for_exponentiation_error, error.operatorSymbol ) } UnaryOperator.OPERATOR_UNSPECIFIED, UnaryOperator.UNRECOGNIZED -> { appLanguageResourceHandler.getStringInLocale( - R.string.math_expression_error_generic + R.string.state_fragment_math_expression_generic_error ) } } is NoVariableOrNumberBeforeBinaryOperatorError -> when (error.operator) { UnaryOperator.ADD -> { appLanguageResourceHandler.getStringInLocaleWithWrapping( - R.string.math_expression_error_missing_lhs_for_addition_operator, + R.string.state_fragment_math_expression_missing_lhs_for_addition_error, error.operatorSymbol ) } @@ -525,81 +525,81 @@ class MathExpressionInteractionsViewModel private constructor( UnaryOperator.SUBTRACT -> error("This case should never happen.") UnaryOperator.MULTIPLY -> { appLanguageResourceHandler.getStringInLocaleWithWrapping( - R.string.math_expression_error_missing_lhs_for_multiplication_operator, + R.string.state_fragment_math_expression_missing_lhs_for_multiplication_error, error.operatorSymbol ) } UnaryOperator.DIVIDE -> { appLanguageResourceHandler.getStringInLocaleWithWrapping( - R.string.math_expression_error_missing_lhs_for_division_operator, + R.string.state_fragment_math_expression_missing_lhs_for_division_error, error.operatorSymbol ) } UnaryOperator.EXPONENTIATE -> { appLanguageResourceHandler.getStringInLocaleWithWrapping( - R.string.math_expression_error_missing_lhs_for_exponentiation_operator, + R.string.state_fragment_math_expression_missing_lhs_for_exponentiation_error, error.operatorSymbol ) } UnaryOperator.OPERATOR_UNSPECIFIED, UnaryOperator.UNRECOGNIZED -> { appLanguageResourceHandler.getStringInLocale( - R.string.math_expression_error_generic + R.string.state_fragment_math_expression_generic_error ) } } is NumberAfterVariableError -> { appLanguageResourceHandler.getStringInLocaleWithWrapping( - R.string.math_expression_error_number_after_var_term, + R.string.state_fragment_math_expression_number_after_var_error, error.variable, error.number.toPlainText() ) } is RedundantParenthesesForIndividualTermsError -> { appLanguageResourceHandler.getStringInLocaleWithWrapping( - R.string.math_expression_error_redundant_parentheses_individual_term, + R.string.state_fragment_math_expression_individual_redundant_parentheses_error, error.rawExpression ) } is SingleRedundantParenthesesError -> { appLanguageResourceHandler.getStringInLocaleWithWrapping( - R.string.math_expression_error_single_redundant_parentheses, error.rawExpression + R.string.state_fragment_math_expression_single_redundant_parentheses_error, error.rawExpression ) } SpacesBetweenNumbersError -> { appLanguageResourceHandler.getStringInLocale( - R.string.math_expression_error_spaces_in_numerical_input + R.string.state_fragment_math_expression_space_error ) } is SubsequentBinaryOperatorsError -> { appLanguageResourceHandler.getStringInLocaleWithWrapping( - R.string.math_expression_error_consecutive_binary_operators, + R.string.state_fragment_math_expression_consecutive_binary_operators_error, error.operator1, error.operator2 ) } is SubsequentUnaryOperatorsError -> { appLanguageResourceHandler.getStringInLocale( - R.string.math_expression_error_consecutive_unary_operators + R.string.state_fragment_math_expression_consecutive_unary_operators_error ) } TermDividedByZeroError -> { appLanguageResourceHandler.getStringInLocale( - R.string.math_expression_error_term_divided_by_zero + R.string.state_fragment_math_expression_divided_by_zero_error ) } UnbalancedParenthesesError -> { appLanguageResourceHandler.getStringInLocale( - R.string.math_expression_error_unbalanced_parentheses + R.string.state_fragment_math_expression_unbalanced_parentheses_error ) } is UnnecessarySymbolsError -> { appLanguageResourceHandler.getStringInLocaleWithWrapping( - R.string.math_expression_error_unnecessary_symbols, error.invalidSymbol + R.string.state_fragment_math_expression_unnecessary_symbols_error, error.invalidSymbol ) } VariableInNumericExpressionError -> { appLanguageResourceHandler.getStringInLocale( - R.string.math_expression_error_variable_in_numeric_expression + R.string.state_fragment_math_expression_variable_in_numeric_error ) } } 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 2fbdb5d1d5e..0bf4707c196 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 @@ -20,7 +20,7 @@ class PreviousResponsesHeaderViewModel( /** Returns the user-readable header text for previous responses. */ fun computePreviousResponsesHeaderText(): String { return resourceHandler.getStringInLocaleWithWrapping( - R.string.previous_responses_header, previousAnswerCount.toString() + R.string.state_fragment_previous_responses_header, previousAnswerCount.toString() ) } } diff --git a/app/src/main/java/org/oppia/android/app/player/stopplaying/ProgressDatabaseFullDialogFragment.kt b/app/src/main/java/org/oppia/android/app/player/stopplaying/ProgressDatabaseFullDialogFragment.kt index 02e34e987eb..588ba2217b7 100644 --- a/app/src/main/java/org/oppia/android/app/player/stopplaying/ProgressDatabaseFullDialogFragment.kt +++ b/app/src/main/java/org/oppia/android/app/player/stopplaying/ProgressDatabaseFullDialogFragment.kt @@ -62,26 +62,26 @@ class ProgressDatabaseFullDialogFragment : InjectableDialogFragment() { return AlertDialog .Builder(ContextThemeWrapper(activity as Context, R.style.OppiaDialogFragmentTheme)) - .setTitle(R.string.progress_database_full_dialog_title) + .setTitle(R.string.stop_exploration_dialog_progress_full_title) .setMessage( resourceHandler.getStringInLocaleWithWrapping( - R.string.progress_database_full_dialog_description, oldestSavedExplorationTitle + R.string.stop_exploration_dialog_progress_full_description, oldestSavedExplorationTitle ) ) - .setPositiveButton(R.string.progress_database_full_dialog_continue_button) { _, _ -> + .setPositiveButton(R.string.stop_exploration_dialog_progress_full_continue_button) { _, _ -> stopStatePlayingSessionListenerWithSavedProgressListener .deleteOldestProgressAndStopSession() dismiss() } .setNeutralButton( - R.string.progress_database_full_dialog_leave_without_saving_progress_button + R.string.stop_exploration_dialog_progress_full_without_saving_button ) { _, _ -> stopStatePlayingSessionListenerWithSavedProgressListener .deleteCurrentProgressAndStopSession(isCompletion = false) dismiss() } .setNegativeButton( - R.string.progress_database_full_dialog_back_to_lesson_button + R.string.stop_exploration_dialog_progress_full_back_to_lesson_button ) { _, _ -> dismiss() } 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 61e98b2cf59..3a5ec84b328 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 @@ -39,11 +39,11 @@ class StopExplorationDialogFragment : InjectableDialogFragment() { .Builder(ContextThemeWrapper(activity as Context, R.style.OppiaDialogFragmentTheme)) .setTitle(R.string.stop_exploration_dialog_title) .setMessage(R.string.stop_exploration_dialog_description) - .setPositiveButton(R.string.stop_exploration_dialog_leave_button) { _, _ -> + .setPositiveButton(R.string.stop_exploration_dialog_leave_button_text) { _, _ -> stopStatePlayingSessionListener.stopSession() dismiss() } - .setNegativeButton(R.string.stop_exploration_dialog_cancel_button) { _, _ -> + .setNegativeButton(R.string.stop_exploration_dialog_cancel_button_text) { _, _ -> dismiss() } .create() diff --git a/app/src/main/java/org/oppia/android/app/player/stopplaying/UnsavedExplorationDialogFragment.kt b/app/src/main/java/org/oppia/android/app/player/stopplaying/UnsavedExplorationDialogFragment.kt index 3e0c190c47e..0c7d44d73bb 100644 --- a/app/src/main/java/org/oppia/android/app/player/stopplaying/UnsavedExplorationDialogFragment.kt +++ b/app/src/main/java/org/oppia/android/app/player/stopplaying/UnsavedExplorationDialogFragment.kt @@ -39,12 +39,12 @@ class UnsavedExplorationDialogFragment : InjectableDialogFragment() { .Builder(ContextThemeWrapper(activity as Context, R.style.OppiaDialogFragmentTheme)) .setTitle(R.string.unsaved_exploration_dialog_title) .setMessage(R.string.unsaved_exploration_dialog_description) - .setPositiveButton(R.string.unsaved_exploration_dialog_leave_button) { _, _ -> + .setPositiveButton(R.string.unsaved_exploration_dialog_leave_button_text) { _, _ -> stopStatePlayingSessionWithSavedProgressListener .deleteCurrentProgressAndStopSession(isCompletion = false) dismiss() } - .setNegativeButton(R.string.unsaved_exploration_dialog_cancel_button) { _, _ -> + .setNegativeButton(R.string.unsaved_exploration_dialog_cancel_button_text) { _, _ -> dismiss() } .create() diff --git a/app/src/main/java/org/oppia/android/app/policies/PoliciesActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/policies/PoliciesActivityPresenter.kt index 917fe24f75a..681355aed90 100644 --- a/app/src/main/java/org/oppia/android/app/policies/PoliciesActivityPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/policies/PoliciesActivityPresenter.kt @@ -44,9 +44,9 @@ class PoliciesActivityPresenter @Inject constructor( toolbar.title = when (policyPage) { PolicyPage.PRIVACY_POLICY -> - resourceHandler.getStringInLocale(R.string.privacy_policy_title) + resourceHandler.getStringInLocale(R.string.policy_activity_privacy_policy_title) PolicyPage.TERMS_OF_SERVICE -> - resourceHandler.getStringInLocale(R.string.terms_of_service_title) + resourceHandler.getStringInLocale(R.string.policy_activity_terms_of_service_title) PolicyPage.POLICY_PAGE_UNSPECIFIED, PolicyPage.UNRECOGNIZED -> "" } diff --git a/app/src/main/java/org/oppia/android/app/policies/PoliciesFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/policies/PoliciesFragmentPresenter.kt index 4fad16c9462..639008bf0b9 100644 --- a/app/src/main/java/org/oppia/android/app/policies/PoliciesFragmentPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/policies/PoliciesFragmentPresenter.kt @@ -48,11 +48,11 @@ class PoliciesFragmentPresenter @Inject constructor( if (policyPage == PolicyPage.PRIVACY_POLICY) { policyDescription = resourceHandler.getStringInLocale(R.string.privacy_policy_content) - policyWebLink = resourceHandler.getStringInLocale(R.string.privacy_policy_web_link) + policyWebLink = resourceHandler.getStringInLocale(R.string.policy_activity_privacy_web_link) } else if (policyPage == PolicyPage.TERMS_OF_SERVICE) { policyDescription = resourceHandler.getStringInLocale(R.string.terms_of_service_content) - policyWebLink = resourceHandler.getStringInLocale(R.string.terms_of_service_web_link) + policyWebLink = resourceHandler.getStringInLocale(R.string.policy_activity_terms_web_link) } binding.policyDescriptionTextView.text = htmlParserFactory.create( 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 75c8cc2e014..c99b2511e43 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 @@ -79,10 +79,10 @@ class AddProfileActivityPresenter @Inject constructor( } val toolbar = activity.findViewById(R.id.add_profile_activity_toolbar) as Toolbar activity.setSupportActionBar(toolbar) - activity.supportActionBar?.title = resourceHandler.getStringInLocale(R.string.add_profile_title) + activity.supportActionBar?.title = resourceHandler.getStringInLocale(R.string.add_profile_activity_text) activity.supportActionBar?.setDisplayHomeAsUpEnabled(true) activity.supportActionBar?.setHomeAsUpIndicator(R.drawable.ic_close_white_24dp) - activity.supportActionBar?.setHomeActionContentDescription(R.string.admin_auth_close) + activity.supportActionBar?.setHomeActionContentDescription(R.string.admin_auth_activity_tool_bar_content_desc) uploadImageView = binding.addProfileActivityUserImageView Glide.with(activity) @@ -250,7 +250,7 @@ class AddProfileActivityPresenter @Inject constructor( if (name.isEmpty()) { profileViewModel.nameErrorMsg.set( resourceHandler.getStringInLocale( - R.string.add_profile_error_name_empty + R.string.add_profile_activity_name_empty_error_text ) ) failed = true @@ -258,7 +258,7 @@ class AddProfileActivityPresenter @Inject constructor( if (pin.isNotEmpty() && pin.length < 3) { profileViewModel.pinErrorMsg.set( resourceHandler.getStringInLocale( - R.string.add_profile_error_pin_length + R.string.add_profile_activity_pin_length_error_text ) ) failed = true @@ -266,7 +266,7 @@ class AddProfileActivityPresenter @Inject constructor( if (pin != confirmPin) { profileViewModel.confirmPinErrorMsg.set( resourceHandler.getStringInLocale( - R.string.add_profile_error_pin_confirm_wrong + R.string.add_profile_activity_wrong_confirm_pin_error_text ) ) failed = true @@ -289,13 +289,13 @@ class AddProfileActivityPresenter @Inject constructor( is ProfileManagementController.ProfileNameNotUniqueException -> profileViewModel.nameErrorMsg.set( resourceHandler.getStringInLocale( - R.string.add_profile_error_name_not_unique + R.string.add_profile_activity_name_not_unique_error_text ) ) is ProfileManagementController.ProfileNameOnlyLettersException -> profileViewModel.nameErrorMsg.set( resourceHandler.getStringInLocale( - R.string.add_profile_error_name_only_letters + R.string.add_profile_activity_name_only_letters_error_text ) ) } @@ -308,8 +308,8 @@ class AddProfileActivityPresenter @Inject constructor( private fun showInfoDialog() { profileViewModel.showInfoAlertPopup.set(true) alertDialog = AlertDialog.Builder(activity as Context, R.style.OppiaAlertDialogTheme) - .setMessage(R.string.add_profile_pin_info) - .setPositiveButton(R.string.add_profile_close) { dialog, _ -> + .setMessage(R.string.add_profile_activity_pin_info_dialog_text) + .setPositiveButton(R.string.add_profile_activity_close_dialog_text) { dialog, _ -> profileViewModel.showInfoAlertPopup.set(false) dialog.dismiss() } 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 2651603478d..30095494143 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 @@ -96,7 +96,7 @@ class AdminAuthActivityPresenter @Inject constructor( } } else if (inputPin.length == adminPin.length) { authViewModel.errorMessage.set( - resourceHandler.getStringInLocale(R.string.admin_auth_incorrect) + resourceHandler.getStringInLocale(R.string.admin_auth_activity_incorrect_pin_label) ) } } @@ -108,21 +108,21 @@ class AdminAuthActivityPresenter @Inject constructor( activity.title = resourceHandler.getStringInLocale(R.string.admin_auth_activity_access_controls_title) binding?.adminAuthToolbar?.title = - resourceHandler.getStringInLocale(R.string.administrator_controls) + resourceHandler.getStringInLocale(R.string.administrator_controls_activity_title) binding?.adminAuthHeadingTextview?.text = - resourceHandler.getStringInLocale(R.string.admin_auth_heading) + resourceHandler.getStringInLocale(R.string.admin_auth_activity_heading_text) binding?.adminAuthSubText?.text = - resourceHandler.getStringInLocale(R.string.admin_auth_admin_controls_sub) + resourceHandler.getStringInLocale(R.string.admin_auth_activity_controls_subject_text) } AdminAuthEnum.PROFILE_ADD_PROFILE.value -> { activity.title = resourceHandler.getStringInLocale(R.string.admin_auth_activity_add_profiles_title) binding?.adminAuthToolbar?.title = - resourceHandler.getStringInLocale(R.string.add_profile_title) + resourceHandler.getStringInLocale(R.string.add_profile_activity_text) binding?.adminAuthHeadingTextview?.text = - resourceHandler.getStringInLocale(R.string.admin_auth_heading) + resourceHandler.getStringInLocale(R.string.admin_auth_activity_heading_text) binding?.adminAuthSubText?.text = - resourceHandler.getStringInLocale(R.string.admin_auth_sub) + resourceHandler.getStringInLocale(R.string.admin_auth_activity_subject_text) } } } 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 5ab5624b99f..399239b7465 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 @@ -45,7 +45,7 @@ class AdminPinActivityPresenter @Inject constructor( activity.setSupportActionBar(binding.adminPinToolbar) activity.supportActionBar?.setDisplayHomeAsUpEnabled(true) activity.supportActionBar?.setHomeAsUpIndicator(R.drawable.ic_close_white_24dp) - activity.supportActionBar?.setHomeActionContentDescription(R.string.admin_auth_close) + activity.supportActionBar?.setHomeActionContentDescription(R.string.admin_auth_activity_tool_bar_content_desc) binding.apply { lifecycleOwner = activity @@ -95,7 +95,7 @@ class AdminPinActivityPresenter @Inject constructor( if (inputPin.length < 5) { adminViewModel.pinErrorMsg.set( resourceHandler.getStringInLocale( - R.string.admin_pin_error_pin_length + R.string.admin_pin_activity_pin_length_error ) ) failed = true @@ -103,7 +103,7 @@ class AdminPinActivityPresenter @Inject constructor( if (inputPin != confirmPin) { adminViewModel.confirmPinErrorMsg.set( resourceHandler.getStringInLocale( - R.string.admin_pin_error_pin_confirm_wrong + R.string.admin_pin_activity_wrong_pin_text ) ) failed = true 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 c0faded0563..df2432f64cd 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 @@ -58,11 +58,11 @@ class AdminSettingsDialogFragmentPresenter @Inject constructor( } val dialog = AlertDialog.Builder(activity, R.style.OppiaAlertDialogTheme) - .setTitle(R.string.admin_settings_heading) + .setTitle(R.string.admin_settings_dialog_heading) .setView(binding.root) - .setMessage(R.string.admin_settings_sub) - .setPositiveButton(R.string.admin_settings_submit, null) - .setNegativeButton(R.string.admin_settings_cancel) { dialog, _ -> + .setMessage(R.string.admin_settings_dialog_subject_text) + .setPositiveButton(R.string.admin_settings_dialog_submit_button_text, null) + .setNegativeButton(R.string.admin_settings_dialog_cancel_button_text) { dialog, _ -> dialog.dismiss() } .create() @@ -82,7 +82,7 @@ class AdminSettingsDialogFragmentPresenter @Inject constructor( if (binding.adminSettingsInputPinEditText.text?.isEmpty()!!) { adminViewModel.errorMessage.set( resourceHandler.getStringInLocale( - R.string.admin_auth_null + R.string.admin_auth_activity_null_pin_input_label ) ) return@setOnClickListener @@ -92,7 +92,7 @@ class AdminSettingsDialogFragmentPresenter @Inject constructor( } else { adminViewModel.errorMessage.set( resourceHandler.getStringInLocale( - R.string.admin_settings_incorrect + R.string.admin_settings_dialog_incorrect_pin_error_text ) ) } 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 57c999e2586..e5c623af231 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 @@ -103,7 +103,7 @@ class PinPasswordActivityPresenter @Inject constructor( ) } else { pinViewModel.errorMessage.set( - resourceHandler.getStringInLocale(R.string.pin_password_incorrect_pin) + resourceHandler.getStringInLocale(R.string.pin_password_activity_incorrect_pin_error) ) binding.pinPasswordInputPinEditText.startAnimation( AnimationUtils.loadAnimation( @@ -177,14 +177,14 @@ class PinPasswordActivityPresenter @Inject constructor( pinViewModel.showAdminPinForgotPasswordPopUp.set(true) val resetDataButtonText = resourceHandler.getStringInLocaleWithWrapping( - R.string.admin_forgot_pin_reset_app_data_button_text, appName + R.string.pin_password_activity_reset_app_data_button_text, appName ) alertDialog = AlertDialog.Builder(activity, R.style.OppiaAlertDialogTheme) - .setTitle(R.string.pin_password_forgot_title) + .setTitle(R.string.pin_password_activity_dialog_forgot_title) .setMessage( - resourceHandler.getStringInLocaleWithWrapping(R.string.admin_forgot_pin_message, appName) + resourceHandler.getStringInLocaleWithWrapping(R.string.pin_password_activity_dialog_forgot_message, appName) ) - .setNegativeButton(R.string.admin_settings_cancel) { dialog, _ -> + .setNegativeButton(R.string.admin_settings_dialog_cancel_button_text) { dialog, _ -> pinViewModel.showAdminPinForgotPasswordPopUp.set(false) dialog.dismiss() } @@ -202,19 +202,19 @@ class PinPasswordActivityPresenter @Inject constructor( alertDialog = AlertDialog.Builder(activity, R.style.OppiaAlertDialogTheme) .setTitle( resourceHandler.getStringInLocaleWithWrapping( - R.string.admin_confirm_app_wipe_title, appName + R.string.pin_password_activity_reset_dialog_title, appName ) ) .setMessage( resourceHandler.getStringInLocaleWithWrapping( - R.string.admin_confirm_app_wipe_message, appName + R.string.pin_password_activity_reset_dialog_message, appName ) ) - .setNegativeButton(R.string.admin_confirm_app_wipe_negative_button_text) { dialog, _ -> + .setNegativeButton(R.string.pin_password_activity_reset_dialog_negative_button_text) { dialog, _ -> pinViewModel.showAdminPinForgotPasswordPopUp.set(false) dialog.dismiss() } - .setPositiveButton(R.string.admin_confirm_app_wipe_positive_button_text) { dialog, _ -> + .setPositiveButton(R.string.pin_password_activity_reset_dialog_postive_button_text) { dialog, _ -> profileManagementController.deleteAllProfiles().toLiveData().observe( activity, { @@ -244,8 +244,8 @@ class PinPasswordActivityPresenter @Inject constructor( private fun showSuccessDialog() { AlertDialog.Builder(activity, R.style.OppiaAlertDialogTheme) - .setMessage(R.string.pin_password_success) - .setPositiveButton(R.string.pin_password_close) { dialog, _ -> + .setMessage(R.string.pin_password_activity_success_text) + .setPositiveButton(R.string.pin_password_activity_close_text) { dialog, _ -> dialog.dismiss() }.create().show() } 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 a448f9d67e8..07575137176 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 @@ -39,7 +39,7 @@ class PinPasswordViewModel @Inject constructor( val helloText: LiveData by lazy { Transformations.map(profile) { profile -> - resourceHandler.getStringInLocaleWithWrapping(R.string.pin_password_hello, profile.name) + resourceHandler.getStringInLocaleWithWrapping(R.string.pin_password_activity_hello_text, profile.name) } } 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 bf81773b519..875df3c3bc2 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 @@ -66,15 +66,15 @@ class ResetPinDialogFragmentPresenter @Inject constructor( } val dialog = AlertDialog.Builder(activity, R.style.OppiaAlertDialogTheme) - .setTitle(R.string.reset_pin_enter) + .setTitle(R.string.pin_password_activity_reset_pin_dialog_title) .setView(binding.root) .setMessage( resourceHandler.getStringInLocaleWithWrapping( - R.string.reset_pin_enter_dialog_message, name + R.string.pin_password_activity_reset_pin_dialog_message, name ) ) - .setPositiveButton(R.string.admin_settings_submit, null) - .setNegativeButton(R.string.admin_settings_cancel) { dialog, _ -> + .setPositiveButton(R.string.admin_settings_dialog_submit_button_text, null) + .setNegativeButton(R.string.admin_settings_dialog_cancel_button_text) { dialog, _ -> dialog.dismiss() } .create() @@ -108,7 +108,7 @@ class ResetPinDialogFragmentPresenter @Inject constructor( } else { resetViewModel.errorMessage.set( resourceHandler.getStringInLocale( - R.string.add_profile_error_pin_length + R.string.add_profile_activity_pin_length_error_text ) ) } 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 234a30a9f3c..b59a63abc92 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 @@ -25,7 +25,7 @@ class ResetPinViewModel @Inject constructor( private fun computeResetPinInputPinHint(name: String): String { return resourceHandler.getStringInLocaleWithWrapping( - R.string.admin_settings_enter_user_new_pin, name + R.string.admin_settings_dialog_new_pin_text, name ) } } 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 f17a841929d..3b9331e94b0 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 @@ -54,9 +54,9 @@ class ProfilePictureEditDialogFragment : InjectableDialogFragment() { } return AlertDialog .Builder(ContextThemeWrapper(activity as Context, R.style.OppiaDialogFragmentTheme)) - .setTitle(R.string.profile_progress_edit_dialog_title) + .setTitle(R.string.profile_picture_edit_dialog_title) .setView(view) - .setNegativeButton(R.string.profile_picture_edit_alert_dialog_cancel_button) { _, _ -> + .setNegativeButton(R.string.profile_picture_edit_dialog_cancel_button_text) { _, _ -> dismiss() } .create() 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 562e38f3d9f..dcb48a74ebc 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 @@ -36,7 +36,7 @@ class ProfileProgressActivityPresenter @Inject constructor( R.id.profile_progress_activity_toolbar ) as Toolbar activity.setSupportActionBar(toolbar) - (activity.supportActionBar ?: return).setTitle(R.string.profile) + (activity.supportActionBar ?: return).setTitle(R.string.profile_progress_activity_profile_title) (activity.supportActionBar ?: return).setDisplayShowHomeEnabled(true) (activity.supportActionBar ?: return).setDisplayHomeAsUpEnabled(true) toolbar.setNavigationOnClickListener { 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 fabe3eb83dc..940ba45f21a 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 @@ -40,7 +40,7 @@ class RecentlyPlayedStorySummaryViewModel( fun computeLessonThumbnailContentDescription(): String { return resourceHandler.getStringInLocaleWithWrapping( - R.string.lesson_thumbnail_content_description, nextChapterTitle + R.string.home_activity_lesson_thumbnail_description, nextChapterTitle ) } diff --git a/app/src/main/java/org/oppia/android/app/settings/profile/ProfileEditDeletionDialogFragment.kt b/app/src/main/java/org/oppia/android/app/settings/profile/ProfileEditDeletionDialogFragment.kt index 27b1914a650..23917136ef0 100644 --- a/app/src/main/java/org/oppia/android/app/settings/profile/ProfileEditDeletionDialogFragment.kt +++ b/app/src/main/java/org/oppia/android/app/settings/profile/ProfileEditDeletionDialogFragment.kt @@ -48,12 +48,12 @@ class ProfileEditDeletionDialogFragment : InjectableDialogFragment() { parentFragment as ProfileEditFragment val alertDialog = AlertDialog.Builder(activity as Context, R.style.OppiaAlertDialogTheme) - .setTitle(R.string.profile_edit_delete_dialog_title) - .setMessage(R.string.profile_edit_delete_dialog_message) - .setNegativeButton(R.string.profile_edit_delete_dialog_negative) { dialog, _ -> + .setTitle(R.string.profile_edit_activity_dialog_title) + .setMessage(R.string.profile_edit_activity_dialog_message) + .setNegativeButton(R.string.profile_edit_activity_dialog_negative_button) { dialog, _ -> dialog.dismiss() } - .setPositiveButton(R.string.profile_edit_delete_dialog_positive) { dialog, _ -> + .setPositiveButton(R.string.profile_edit_activity_dialog_positive_button) { dialog, _ -> profileEditDialogInterface.deleteProfileByInternalProfileId(internalProfileId) } .create() diff --git a/app/src/main/java/org/oppia/android/app/settings/profile/ProfileRenameFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/settings/profile/ProfileRenameFragmentPresenter.kt index 6350c2e4581..4ec0d2e7116 100644 --- a/app/src/main/java/org/oppia/android/app/settings/profile/ProfileRenameFragmentPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/settings/profile/ProfileRenameFragmentPresenter.kt @@ -57,7 +57,7 @@ class ProfileRenameFragmentPresenter @Inject constructor( .nameErrorMsg .set( resourceHandler.getStringInLocale( - R.string.add_profile_error_name_empty + R.string.add_profile_activity_name_empty_error_text ) ) return@setOnClickListener @@ -110,13 +110,13 @@ class ProfileRenameFragmentPresenter @Inject constructor( is ProfileManagementController.ProfileNameNotUniqueException -> renameViewModel.nameErrorMsg.set( resourceHandler.getStringInLocale( - R.string.add_profile_error_name_not_unique + R.string.add_profile_activity_name_not_unique_error_text ) ) is ProfileManagementController.ProfileNameOnlyLettersException -> renameViewModel.nameErrorMsg.set( resourceHandler.getStringInLocale( - R.string.add_profile_error_name_only_letters + R.string.add_profile_activity_name_only_letters_error_text ) ) } diff --git a/app/src/main/java/org/oppia/android/app/settings/profile/ProfileResetPinFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/settings/profile/ProfileResetPinFragmentPresenter.kt index b4afe1d73e1..d2286eadd1a 100644 --- a/app/src/main/java/org/oppia/android/app/settings/profile/ProfileResetPinFragmentPresenter.kt +++ b/app/src/main/java/org/oppia/android/app/settings/profile/ProfileResetPinFragmentPresenter.kt @@ -103,7 +103,7 @@ class ProfileResetPinFragmentPresenter @Inject constructor( if (pin.length < 5) { viewModel.pinErrorMsg.set( resourceHandler.getStringInLocale( - R.string.profile_reset_pin_error_admin_pin_length + R.string.profile_reset_pin_fragment_error_admin_pin_length ) ) failed = true @@ -112,7 +112,7 @@ class ProfileResetPinFragmentPresenter @Inject constructor( if (pin.length < 3) { viewModel.pinErrorMsg.set( resourceHandler.getStringInLocale( - R.string.profile_reset_pin_error_user_pin_length + R.string.profile_reset_pin_fragment_error_user_pin_length ) ) failed = true @@ -121,7 +121,7 @@ class ProfileResetPinFragmentPresenter @Inject constructor( if (pin != confirmPin) { viewModel.confirmErrorMsg.set( resourceHandler.getStringInLocale( - R.string.add_profile_error_pin_confirm_wrong + R.string.add_profile_activity_wrong_confirm_pin_error_text ) ) failed = true 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 2433999b826..86c2ddc76a6 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 @@ -183,7 +183,7 @@ class StoryFragmentPresenter @Inject constructor( == ChapterPlayState.NOT_PLAYABLE_MISSING_PREREQUISITES ) { val missingPrerequisiteSummary = resourceHandler.getStringInLocaleWithWrapping( - R.string.chapter_prerequisite_title_label, + R.string.topic_fragment_lessons_chapter_prerequisite_label, storyItemViewModel.index.toString(), storyItemViewModel.missingPrerequisiteChapterTitle ) 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 746af71c90b..8971a1ea1ac 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 @@ -120,7 +120,7 @@ class StoryChapterSummaryViewModel( chapterSummary.title, ephemeralChapterSummary.writtenTranslationContext ) return resourceHandler.getStringInLocaleWithWrapping( - R.string.chapter_name, (index + 1).toString(), title + R.string.topic_fragment_lessons_chapter_play_name_text, (index + 1).toString(), title ) } } 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 b7bb9548635..c78185d8f78 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 @@ -89,7 +89,7 @@ class TopicFragmentPresenter @Inject constructor( lessonsTabView?.let { lessonsTabView -> val lessonsTabSpotlightTarget = SpotlightTarget( lessonsTabView, - resourceHandler.getStringInLocale(R.string.topic_lessons_tab_spotlight_hint), + resourceHandler.getStringInLocale(R.string.topic_fragment_lessons_tab_spotlight_hint), SpotlightShape.RoundedRectangle, Spotlight.FeatureCase.TOPIC_LESSON_TAB ) @@ -99,7 +99,7 @@ class TopicFragmentPresenter @Inject constructor( val revisionTabView = tabLayout.getTabAt(computeTabPosition(TopicTab.REVISION))?.view val revisionTabSpotlightTarget = SpotlightTarget( revisionTabView!!, - resourceHandler.getStringInLocale(R.string.topic_revision_tab_spotlight_hint), + resourceHandler.getStringInLocale(R.string.topic_fragment_revision_tab_spotlight_hint), SpotlightShape.RoundedRectangle, Spotlight.FeatureCase.TOPIC_REVISION_TAB ) 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 3fbcead8bb6..117b868e322 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 @@ -15,30 +15,30 @@ enum class TopicTab( INFO( positionWithTwoTabs = -1, positionWithFourTabs = 0, - tabLabelResId = R.string.info, + tabLabelResId = R.string.topic_fragment_info, tabIconResId = R.drawable.ic_info_icon_24dp, - contentDescriptionResId = R.string.info_tab_content_description + contentDescriptionResId = R.string.topic_fragment_info_tab_content_description ), LESSONS( positionWithTwoTabs = 0, positionWithFourTabs = 1, - tabLabelResId = R.string.lessons, + tabLabelResId = R.string.topic_fragment_lessons, tabIconResId = R.drawable.ic_lessons_icon_24dp, - contentDescriptionResId = R.string.lessons_tab_content_description + contentDescriptionResId = R.string.topic_fragment_lessons_tab_content_description ), PRACTICE( positionWithTwoTabs = -1, positionWithFourTabs = 2, - tabLabelResId = R.string.practice, + tabLabelResId = R.string.topic_fragment_practice, tabIconResId = R.drawable.ic_practice_icon_24dp, - contentDescriptionResId = R.string.practice_tab_content_description + contentDescriptionResId = R.string.topic_fragment_practice_tab_content_description ), REVISION( positionWithTwoTabs = 1, positionWithFourTabs = 3, - tabLabelResId = R.string.revision, + tabLabelResId = R.string.topic_fragment_revision, tabIconResId = R.drawable.ic_revision_icon_24dp, - contentDescriptionResId = R.string.revision_tab_content_description + contentDescriptionResId = R.string.topic_fragment_revision_tab_content_description ); companion object { 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 5febc7267c4..baf2c2ff9d3 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 @@ -79,7 +79,7 @@ class TopicViewModel @Inject constructor( translationController.extractString( ephemeralTopic.topic.title, ephemeralTopic.writtenTranslationContext ) - resourceHandler.getStringInLocaleWithWrapping(R.string.topic_name, topicTitle) + resourceHandler.getStringInLocaleWithWrapping(R.string.topic_fragment_name_text, topicTitle) } } 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 b33e85cba61..5660c2e082e 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 @@ -57,7 +57,7 @@ class ConceptCardFragmentPresenter @Inject constructor( binding.conceptCardToolbar.setNavigationIcon(R.drawable.ic_close_white_24dp) binding.conceptCardToolbar.setNavigationContentDescription( - R.string.navigate_up + R.string.navigate_up_text ) binding.conceptCardToolbar.setNavigationOnClickListener { (fragment.requireActivity() as? ConceptCardListener)?.dismissConceptCard() 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 edc1f4f38c2..5a27879a944 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 @@ -76,7 +76,7 @@ class TopicInfoViewModel @Inject constructor( } } ?: resourceHandler.getStringInLocale(R.string.unknown_size) topicSizeText.set( - resourceHandler.getStringInLocaleWithWrapping(R.string.topic_download_text, sizeWithUnit) + resourceHandler.getStringInLocaleWithWrapping(R.string.topic_fragment_download_text, sizeWithUnit) ) } diff --git a/app/src/main/java/org/oppia/android/app/topic/lessons/ChapterSummaryViewModel.kt b/app/src/main/java/org/oppia/android/app/topic/lessons/ChapterSummaryViewModel.kt index 857bf87d91a..dbf31fd6192 100644 --- a/app/src/main/java/org/oppia/android/app/topic/lessons/ChapterSummaryViewModel.kt +++ b/app/src/main/java/org/oppia/android/app/topic/lessons/ChapterSummaryViewModel.kt @@ -27,13 +27,13 @@ class ChapterSummaryViewModel( return when (chapterPlayState) { ChapterPlayState.COMPLETED -> { resourceHandler.getStringInLocaleWithWrapping( - R.string.chapter_completed, (index + 1).toString(), chapterTitle + R.string.topic_fragment_lessons_chapter_completed_text, (index + 1).toString(), chapterTitle ) } ChapterPlayState.NOT_PLAYABLE_MISSING_PREREQUISITES -> { if (previousChapterTitle != null) { resourceHandler.getStringInLocaleWithWrapping( - R.string.chapter_locked_prerequisite_title_label, + R.string.topic_fragment_lessons_chapter_locked_prerequisite_label, (index + 1).toString(), chapterTitle, index.toString(), @@ -41,13 +41,13 @@ class ChapterSummaryViewModel( ) } else { resourceHandler.getStringInLocaleWithWrapping( - R.string.chapter_prerequisite_title_label_without_chapter_title + R.string.topic_fragment_lessons_without_chapter_prerequisite_label ) } } else -> { resourceHandler.getStringInLocaleWithWrapping( - R.string.chapter_in_progress, (index + 1).toString(), chapterTitle + R.string.topic_fragment_lessons_chapter_in_progress_text, (index + 1).toString(), chapterTitle ) } } @@ -55,7 +55,7 @@ class ChapterSummaryViewModel( fun computePlayChapterIndexText(): String { return resourceHandler.getStringInLocaleWithWrapping( - R.string.topic_play_chapter_index, (index + 1).toString() + R.string.topic_fragment_lessons_chapter_play_index, (index + 1).toString() ) } } 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 6e0ef58019f..93cc3805a04 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 @@ -55,16 +55,16 @@ class StorySummaryViewModel( fun computeProgressContainerContentDescription(): String { return if (storyPercentage.get()!! < 100) { "${storyProgressPercentageText.get()} " + - resourceHandler.getStringInLocale(R.string.status_in_progress) + resourceHandler.getStringInLocale(R.string.topic_fragment_lessons_story_status_in_progress) } else { "${storyProgressPercentageText.get()} " + - resourceHandler.getStringInLocale(R.string.status_completed) + resourceHandler.getStringInLocale(R.string.topic_fragment_lessons_story_status_completed) } } private fun computeStoryProgressPercentageText(storyPercentage: Int): String { return resourceHandler.getStringInLocaleWithWrapping( - R.string.topic_story_progress_percentage, storyPercentage.toString() + R.string.topic_fragment_lessons_story_progress_percentage, storyPercentage.toString() ) } 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 ee470eb7b66..d7cb8449951 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 @@ -82,10 +82,10 @@ class QuestionPlayerViewModel @Inject constructor( isAtEndOfSession: Boolean ): String { return if (isAtEndOfSession) { - resourceHandler.getStringInLocale(R.string.question_training_session_progress_finished) + resourceHandler.getStringInLocale(R.string.topic_fragment_question_training_session_progress_finished) } else { resourceHandler.getStringInLocaleWithWrapping( - R.string.question_training_session_progress, + R.string.topic_fragment_question_training_session_progress, currentQuestion.toString(), questionCount.toString() ) diff --git a/app/src/main/java/org/oppia/android/app/utility/datetime/DateTimeUtil.kt b/app/src/main/java/org/oppia/android/app/utility/datetime/DateTimeUtil.kt index 43fb02e01c0..b3b9338e1c5 100644 --- a/app/src/main/java/org/oppia/android/app/utility/datetime/DateTimeUtil.kt +++ b/app/src/main/java/org/oppia/android/app/utility/datetime/DateTimeUtil.kt @@ -18,13 +18,13 @@ class DateTimeUtil @Inject constructor( return when (machineLocale.getCurrentTimeOfDay()) { OppiaLocale.MachineLocale.TimeOfDay.MID_MORNING, OppiaLocale.MachineLocale.TimeOfDay.EARLY_MORNING -> - resourceHandler.getStringInLocale(R.string.home_screen_good_morning_greeting_fragment) + resourceHandler.getStringInLocale(R.string.home_activity_good_morning_greeting_text) OppiaLocale.MachineLocale.TimeOfDay.AFTERNOON -> - resourceHandler.getStringInLocale(R.string.home_screen_good_afternoon_greeting_fragment) + resourceHandler.getStringInLocale(R.string.home_activity_good_afternoon_greeting_text) OppiaLocale.MachineLocale.TimeOfDay.EVENING, OppiaLocale.MachineLocale.TimeOfDay.UNKNOWN, OppiaLocale.MachineLocale.TimeOfDay.LATE_NIGHT -> - resourceHandler.getStringInLocale(R.string.home_screen_good_evening_greeting_fragment) + resourceHandler.getStringInLocale(R.string.home_activity_good_evening_greeting_text) } } 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 1b2658ba0ff..88e9bd7b9ee 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 @@ -79,7 +79,7 @@ class WalkthroughFinalFragmentPresenter @Inject constructor( if (::walkthroughFinalViewModel.isInitialized && ::topicName.isInitialized) { walkthroughFinalViewModel.topicTitle.set( resourceHandler.getStringInLocaleWithWrapping( - R.string.are_you_interested, + R.string.walkthrough_activity_are_you_interested_text, topicName ) ) 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 3c49e08cbc1..6ac4f4708e5 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 @@ -102,7 +102,7 @@ class WalkthroughWelcomeFragmentPresenter @Inject constructor( private fun setProfileName() { if (::walkthroughWelcomeViewModel.isInitialized && ::profileName.isInitialized) { walkthroughWelcomeViewModel.profileName.set( - resourceHandler.getStringInLocaleWithWrapping(R.string.welcome, profileName) + resourceHandler.getStringInLocaleWithWrapping(R.string.walkthrough_activity_welcome_text, profileName) ) } } diff --git a/app/src/main/res/layout-land/onboarding_fragment.xml b/app/src/main/res/layout-land/onboarding_fragment.xml index 5b7c6f69e9b..55483cda7c6 100644 --- a/app/src/main/res/layout-land/onboarding_fragment.xml +++ b/app/src/main/res/layout-land/onboarding_fragment.xml @@ -41,7 +41,7 @@ android:minWidth="48dp" android:minHeight="48dp" android:onClick="@{(v) -> presenter.clickOnSkip()}" - android:text="@string/skip" + android:text="@string/onboarding_activity_skip_text" android:textAllCaps="true" android:textColor="@color/component_color_shared_primary_text_color" android:visibility="@{viewModel.slideNumber != 3 ? View.VISIBLE: View.GONE, default=visible}" @@ -66,7 +66,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginEnd="12dp" - android:contentDescription="@string/next_arrow" + android:contentDescription="@string/onboarding_activity_next_arrow_text" android:gravity="center" android:minWidth="48dp" android:minHeight="48dp" diff --git a/app/src/main/res/layout-land/onboarding_slide_final.xml b/app/src/main/res/layout-land/onboarding_slide_final.xml index a62021edc69..30450646095 100644 --- a/app/src/main/res/layout-land/onboarding_slide_final.xml +++ b/app/src/main/res/layout-land/onboarding_slide_final.xml @@ -44,7 +44,7 @@ android:layout_marginTop="80dp" android:layout_marginEnd="28dp" android:fontFamily="sans-serif-medium" - android:text="@string/onboarding_slide_3_title" + android:text="@string/onboarding_activity_slide_3_title" android:textColor="@color/component_color_shared_primary_text_color" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="1.0" @@ -58,7 +58,7 @@ android:layout_marginStart="20dp" android:layout_marginTop="16dp" android:layout_marginEnd="40dp" - android:text="@string/onboarding_slide_3_description" + android:text="@string/onboarding_activity_slide_3_description" android:textColor="@color/component_color_shared_secondary_1_text_color" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.0" @@ -76,7 +76,7 @@ android:fontFamily="sans-serif-medium" android:minHeight="48dp" android:onClick="@{(v) -> viewModel.clickOnGetStarted()}" - android:text="@string/get_started" + android:text="@string/onboarding_activity_get_started_text" android:textColor="@color/component_color_shared_secondary_4_text_color" android:textSize="14sp" android:textAllCaps="false" diff --git a/app/src/main/res/layout-land/profile_chooser_add_view.xml b/app/src/main/res/layout-land/profile_chooser_add_view.xml index c8921f28044..a8def2505ea 100644 --- a/app/src/main/res/layout-land/profile_chooser_add_view.xml +++ b/app/src/main/res/layout-land/profile_chooser_add_view.xml @@ -45,7 +45,7 @@ android:id="@+id/add_profile_text" style="@style/Caption" android:layout_gravity="center" - android:text="@{hasProfileEverBeenAddedValue ? @string/profile_chooser_add : @string/set_up_multiple_profiles}" + android:text="@{hasProfileEverBeenAddedValue ? @string/profile_chooser_activity_add_text : @string/profile_chooser_activity_set_up_multiple_profiles}" android:textColor="@color/component_color_shared_secondary_4_text_color" /> @@ -103,7 +103,7 @@ style="@style/Subtitle1ViewCenter" android:layout_marginBottom="24dp" android:minHeight="48dp" - android:text="@string/profile_chooser_administrator_controls" + android:text="@string/profile_chooser_activity_administrator_controls_text" android:textColor="@color/component_color_profile_chooser_activity_secondary_options_color" /> diff --git a/app/src/main/res/layout-land/profile_edit_fragment.xml b/app/src/main/res/layout-land/profile_edit_fragment.xml index 352b3c2ce86..a2ab759da8e 100644 --- a/app/src/main/res/layout-land/profile_edit_fragment.xml +++ b/app/src/main/res/layout-land/profile_edit_fragment.xml @@ -84,7 +84,7 @@ android:minHeight="48dp" android:paddingStart="16dp" android:paddingEnd="16dp" - android:text="@string/profile_edit_rename" + android:text="@string/profile_edit_activity_rename_text" android:textAllCaps="false" android:textColor="@color/component_color_shared_primary_text_color" android:textSize="16sp" @@ -103,7 +103,7 @@ android:minHeight="48dp" android:paddingStart="16dp" android:paddingEnd="16dp" - android:text="@string/profile_edit_reset" + android:text="@string/profile_edit_activity_reset_text" android:textAllCaps="false" android:textColor="@color/component_color_shared_primary_text_color" android:textSize="16sp" @@ -123,7 +123,7 @@ android:minHeight="48dp" android:paddingStart="16dp" android:paddingEnd="16dp" - android:text="@string/profile_edit_mark_chapter_completion" + android:text="@string/profile_edit_activity_mark_chapters_for_completion_button_text" android:textAllCaps="false" android:textColor="@color/component_color_shared_primary_text_color" android:textSize="16sp" @@ -154,7 +154,7 @@ android:paddingStart="16dp" android:paddingTop="12dp" android:paddingEnd="24dp" - android:text="@string/profile_edit_enable_quick_lesson_language_switching_label" + android:text="@string/profile_edit_activity_switching_header_text" android:textColor="@color/component_color_shared_primary_text_color" android:textSize="16sp" app:layout_constraintEnd_toStartOf="@+id/profile_edit_enable_in_lesson_language_switching_switch" @@ -171,7 +171,7 @@ android:paddingStart="16dp" android:paddingEnd="24dp" android:paddingBottom="12dp" - android:text="@string/profile_edit_enable_quick_lesson_language_switching_explanation" + android:text="@string/profile_edit_activity_switching_label_text" android:textColor="@color/component_color_shared_secondary_3_text_color" android:textSize="14sp" app:layout_constraintEnd_toStartOf="@+id/profile_edit_enable_in_lesson_language_switching_switch" @@ -215,7 +215,7 @@ android:paddingStart="16dp" android:paddingTop="12dp" android:paddingEnd="24dp" - android:text="@string/profile_edit_allow_download_heading" + android:text="@string/profile_edit_activity_allow_download_heading" android:textColor="@color/component_color_shared_primary_text_color" android:textSize="16sp" app:layout_constraintBottom_toBottomOf="parent" @@ -232,7 +232,7 @@ android:paddingStart="16dp" android:paddingEnd="24dp" android:paddingBottom="12dp" - android:text="@string/profile_edit_allow_download_sub" + android:text="@string/profile_edit_activity_allow_download_sub" android:textColor="@color/component_color_shared_secondary_3_text_color" android:textSize="14sp" app:layout_constraintEnd_toStartOf="@+id/profile_edit_allow_download_switch" @@ -266,7 +266,7 @@ android:minHeight="48dp" android:paddingStart="16dp" android:paddingEnd="16dp" - android:text="@string/profile_edit_delete" + android:text="@string/profile_edit_activity_delete_button_text" android:textAllCaps="false" android:textColor="@color/component_color_profile_edit_activity_delete_button_text_color" android:textSize="16sp" diff --git a/app/src/main/res/layout-land/profile_progress_header.xml b/app/src/main/res/layout-land/profile_progress_header.xml index 994327f7beb..9d4e8e2a4bf 100644 --- a/app/src/main/res/layout-land/profile_progress_header.xml +++ b/app/src/main/res/layout-land/profile_progress_header.xml @@ -25,7 +25,7 @@ android:layout_width="160dp" android:layout_height="160dp" android:clickable="true" - android:contentDescription="@string/current_profile_picture_content_description" + android:contentDescription="@string/add_profile_activity_edit_image_content_description" android:focusable="true" android:onClick="@{() -> viewModel.clickOnProfilePicture()}" android:elevation="4dp" @@ -39,7 +39,7 @@ @@ -157,7 +157,7 @@ android:layout_width="60dp" android:layout_height="wrap_content" android:fontFamily="sans-serif" - android:text="@{viewModel.completedStoryCount != 1 ? @string/stories_completed : @string/story_completed}" + android:text="@{viewModel.completedStoryCount != 1 ? @string/profile_progress_activity_stories_completed_text : @string/profile_progress_activity_story_completed_text}" android:textColor="@color/component_color_shared_primary_text_color" android:textSize="12sp" /> @@ -171,7 +171,7 @@ android:layout_marginTop="64dp" android:fontFamily="sans-serif-medium" android:minHeight="48dp" - android:text="@string/recently_played_stories" + android:text="@string/home_activity_recently_played_stories" android:textColor="@color/component_color_shared_primary_text_color" android:textSize="18sp" android:visibility="@{viewModel.headerTextVisibility}" @@ -187,7 +187,7 @@ android:fontFamily="sans-serif-medium" android:minHeight="48dp" android:onClick="@{() -> viewModel.clickOnViewAll()}" - android:text="@string/view_all" + android:text="@string/home_activity_view_all_text" android:textAllCaps="true" android:textColor="@color/component_color_profile_progress_activity_view_all_text_color" android:textSize="14sp" diff --git a/app/src/main/res/layout-land/question_player_fragment.xml b/app/src/main/res/layout-land/question_player_fragment.xml index 569625bc270..ad785b8bcba 100644 --- a/app/src/main/res/layout-land/question_player_fragment.xml +++ b/app/src/main/res/layout-land/question_player_fragment.xml @@ -27,7 +27,7 @@ android:layout_marginTop="28dp" android:layout_marginEnd="28dp" android:fontFamily="sans-serif" - android:text="@string/question_training_session_finished_header" + android:text="@string/topic_fragment_question_end_session_header_text" android:textColor="@color/component_color_shared_primary_text_color" android:textSize="24sp" android:visibility="gone" @@ -42,7 +42,7 @@ android:layout_marginTop="8dp" android:layout_marginEnd="28dp" android:fontFamily="sans-serif" - android:text="@string/question_training_session_finished_message" + android:text="@string/topic_fragment_question_end_session_body_text" android:textColor="@color/component_color_shared_primary_text_color" android:textSize="16sp" android:visibility="gone" @@ -147,7 +147,7 @@ android:layout_height="6dp" android:layout_gravity="top|end" android:layout_margin="8dp" - android:contentDescription="@string/new_hint_available" + android:contentDescription="@string/question_player_activity_new_hint_available_text" android:visibility="@{viewModel.isHintOpenedAndUnRevealed() ? View.VISIBLE : View.GONE}" app:srcCompat="@drawable/ic_dot_yellow_24dp" /> @@ -156,7 +156,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="12dp" - android:contentDescription="@string/show_hints_and_solution" + android:contentDescription="@string/state_fragment_open_hint_content_description" app:srcCompat="@drawable/ic_hint_bulb_white_24dp" /> diff --git a/app/src/main/res/layout-land/story_chapter_view.xml b/app/src/main/res/layout-land/story_chapter_view.xml index 6c40a6758a7..188e6139c8d 100644 --- a/app/src/main/res/layout-land/story_chapter_view.xml +++ b/app/src/main/res/layout-land/story_chapter_view.xml @@ -92,7 +92,7 @@ android:layout_height="wrap_content" android:layout_marginEnd="8dp" android:layout_marginBottom="4dp" - android:contentDescription="@{@string/chapter_completed}" + android:contentDescription="@{@string/topic_fragment_lessons_chapter_completed_text,}" android:visibility="@{viewModel.chapterSummary.chapterPlayState == ChapterPlayState.COMPLETED ? View.VISIBLE : View.GONE}" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout-land/survey_fragment.xml b/app/src/main/res/layout-land/survey_fragment.xml index d1358390ce6..63a88c9977d 100644 --- a/app/src/main/res/layout-land/survey_fragment.xml +++ b/app/src/main/res/layout-land/survey_fragment.xml @@ -136,7 +136,7 @@ android:layout_height="wrap_content" android:background="@{viewModel.canMoveToNextQuestion ? @drawable/state_button_primary_background : @drawable/state_button_inactive_background}" android:enabled="@{viewModel.canMoveToNextQuestion}" - android:text="@string/next" + android:text="@string/next_text" android:textColor="@{viewModel.canMoveToNextQuestion ? @color/component_color_shared_secondary_4_text_color : @color/component_color_survey_disabled_button_text_color}" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" /> diff --git a/app/src/main/res/layout-land/topic_info_fragment.xml b/app/src/main/res/layout-land/topic_info_fragment.xml index 6ebd9c406d1..be76b2d7d1f 100644 --- a/app/src/main/res/layout-land/topic_info_fragment.xml +++ b/app/src/main/res/layout-land/topic_info_fragment.xml @@ -83,7 +83,7 @@ android:minHeight="48dp" android:onClick="@{(v) -> viewModel.clickSeeMore()}" android:paddingTop="8dp" - android:text="@{viewModel.isDescriptionExpanded() ? @string/see_less : @string/see_more}" + android:text="@{viewModel.isDescriptionExpanded() ? @string/topic_fragment_info_see_less_text : @string/topic_fragment_info_see_more_text}" android:textColor="@color/component_color_shared_active_text_color" android:textSize="16sp" android:textStyle="bold" @@ -115,7 +115,7 @@ android:layout_height="wrap_content" android:layout_marginStart="12dp" android:fontFamily="sans-serif" - android:text="@string/topic_downloaded" + android:text="@string/topic_fragment_info_topic_downloaded" android:textColor="@color/component_color_shared_download_story_text_color" android:textSize="18sp" app:layout_constraintBottom_toBottomOf="@+id/download_status_image_view" diff --git a/app/src/main/res/layout-land/walkthrough_final_fragment.xml b/app/src/main/res/layout-land/walkthrough_final_fragment.xml index 4cc89c8fc26..65e311f5c10 100644 --- a/app/src/main/res/layout-land/walkthrough_final_fragment.xml +++ b/app/src/main/res/layout-land/walkthrough_final_fragment.xml @@ -56,7 +56,7 @@ android:layout_height="wrap_content" android:layout_gravity="center_horizontal" android:fontFamily="sans-serif" - android:text="@string/no" + android:text="@string/walkthrough_activity_no_text" android:textColor="@color/component_color_shared_primary_text_color" android:textSize="20sp" /> @@ -67,7 +67,7 @@ android:layout_gravity="center_horizontal" android:layout_marginTop="40dp" android:fontFamily="sans-serif" - android:text="@string/pick_a_different_topic" + android:text="@string/walkthrough_activity_pick_different_topic_text" android:textColor="@color/component_color_shared_primary_text_color" android:textSize="12sp" /> @@ -89,7 +89,7 @@ android:layout_height="wrap_content" android:layout_gravity="center_horizontal" android:fontFamily="sans-serif" - android:text="@string/yes" + android:text="@string/walkthrough_activity_yes_text" android:textColor="@color/component_color_shared_secondary_6_text_color" android:textSize="20sp" /> @@ -100,7 +100,7 @@ android:layout_gravity="center_horizontal" android:layout_marginTop="40dp" android:fontFamily="sans-serif" - android:text="@string/lets_get_started" + android:text="@string/walkthrough_activity_get_started_text" android:textColor="@color/component_color_shared_secondary_6_text_color" android:textSize="12sp" /> @@ -126,7 +126,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:fontFamily="sans-serif" - android:text="@string/great" + android:text="@string/walkthrough_activity_final_title_text" android:textColor="@color/component_color_shared_primary_text_color" android:textSize="24sp" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout-land/walkthrough_welcome_fragment.xml b/app/src/main/res/layout-land/walkthrough_welcome_fragment.xml index 06c4ed0447f..879b00a58bd 100644 --- a/app/src/main/res/layout-land/walkthrough_welcome_fragment.xml +++ b/app/src/main/res/layout-land/walkthrough_welcome_fragment.xml @@ -46,7 +46,7 @@ android:layout_marginTop="16dp" android:layout_marginEnd="56dp" android:fontFamily="sans-serif" - android:text="@string/walkthrough_welcome_description" + android:text="@string/walkthrough_activity_welcome_description" android:textColor="@color/component_color_shared_primary_text_color" android:textSize="20sp" app:layout_constraintEnd_toEndOf="parent" @@ -71,7 +71,7 @@ android:layout_height="wrap_content" android:layout_marginTop="12dp" android:onClick="@{(v) -> presenter.changePage()}" - android:text="@string/next" + android:text="@string/next_text" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@+id/walkthrough_welcome_image_view" diff --git a/app/src/main/res/layout-sw600dp-land/faq_single_activity.xml b/app/src/main/res/layout-sw600dp-land/faq_single_activity.xml index 1c8f2e70045..49e55f6563e 100644 --- a/app/src/main/res/layout-sw600dp-land/faq_single_activity.xml +++ b/app/src/main/res/layout-sw600dp-land/faq_single_activity.xml @@ -23,7 +23,7 @@ android:background="@color/component_color_shared_activity_toolbar_color" android:fontFamily="sans-serif" android:minHeight="?attr/actionBarSize" - app:navigationContentDescription="@string/navigate_up" + app:navigationContentDescription="@string/navigate_up_text" app:navigationIcon="?attr/homeAsUpIndicator" app:titleTextAppearance="@style/ToolbarTextAppearance" /> diff --git a/app/src/main/res/layout-sw600dp-land/onboarding_fragment.xml b/app/src/main/res/layout-sw600dp-land/onboarding_fragment.xml index 4899d438355..7ed723095cf 100644 --- a/app/src/main/res/layout-sw600dp-land/onboarding_fragment.xml +++ b/app/src/main/res/layout-sw600dp-land/onboarding_fragment.xml @@ -69,7 +69,7 @@ android:layout_marginTop="12dp" android:layout_marginEnd="32dp" android:layout_marginBottom="12dp" - android:contentDescription="@string/next_arrow" + android:contentDescription="@string/onboarding_activity_next_arrow_text" android:gravity="center" android:minWidth="48dp" android:minHeight="48dp" @@ -89,7 +89,7 @@ android:minWidth="48dp" android:minHeight="48dp" android:onClick="@{(v) -> presenter.clickOnSkip()}" - android:text="@string/skip" + android:text="@string/onboarding_activity_skip_text" android:textAllCaps="true" android:textColor="@color/component_color_shared_primary_text_color" android:visibility="@{viewModel.slideNumber != (viewModel.totalNumberOfSlides - 1) ? View.VISIBLE: View.GONE, default=visible}" diff --git a/app/src/main/res/layout-sw600dp-land/onboarding_slide_final.xml b/app/src/main/res/layout-sw600dp-land/onboarding_slide_final.xml index b33f3480486..1d9134137bb 100644 --- a/app/src/main/res/layout-sw600dp-land/onboarding_slide_final.xml +++ b/app/src/main/res/layout-sw600dp-land/onboarding_slide_final.xml @@ -41,7 +41,7 @@ android:layout_width="0dp" android:layout_marginBottom="12dp" android:fontFamily="sans-serif-medium" - android:text="@string/onboarding_slide_3_title" + android:text="@string/onboarding_activity_slide_3_title" android:textColor="@color/component_color_shared_primary_text_color" android:textSize="32sp" app:layout_constraintBottom_toTopOf="@+id/guideline2" @@ -54,7 +54,7 @@ style="@style/Subtitle1ViewCenterHorizontal" android:layout_width="0dp" android:layout_marginTop="12dp" - android:text="@string/onboarding_slide_3_description" + android:text="@string/onboarding_activity_slide_3_description" android:textColor="@color/component_color_shared_secondary_1_text_color" android:textSize="24sp" app:layout_constraintEnd_toStartOf="@+id/guideline3" @@ -70,7 +70,7 @@ android:fontFamily="sans-serif-medium" android:minHeight="48dp" android:onClick="@{(v) -> viewModel.clickOnGetStarted()}" - android:text="@string/get_started" + android:text="@string/onboarding_activity_get_started_text" android:textColor="@color/component_color_shared_secondary_4_text_color" android:textSize="14sp" android:textAllCaps="false" diff --git a/app/src/main/res/layout-sw600dp-land/profile_chooser_add_view.xml b/app/src/main/res/layout-sw600dp-land/profile_chooser_add_view.xml index b4fe8b3ba79..e98ff10583b 100644 --- a/app/src/main/res/layout-sw600dp-land/profile_chooser_add_view.xml +++ b/app/src/main/res/layout-sw600dp-land/profile_chooser_add_view.xml @@ -59,7 +59,7 @@ @@ -69,7 +69,7 @@ android:layout_gravity="center" android:layout_marginTop="4dp" android:fontFamily="sans-serif" - android:text="@string/set_up_multiple_profiles_description" + android:text="@string/profile_chooser_activity_add_profile_description_text" android:textColor="@color/component_color_shared_secondary_4_text_color" android:textSize="16sp" android:visibility="@{hasProfileEverBeenAddedValue ? View.GONE : View.VISIBLE}" /> diff --git a/app/src/main/res/layout-sw600dp-land/profile_chooser_profile_view.xml b/app/src/main/res/layout-sw600dp-land/profile_chooser_profile_view.xml index f70c2bbf2fa..983a1b00b67 100644 --- a/app/src/main/res/layout-sw600dp-land/profile_chooser_profile_view.xml +++ b/app/src/main/res/layout-sw600dp-land/profile_chooser_profile_view.xml @@ -90,7 +90,7 @@ android:layout_height="wrap_content" android:layout_marginTop="4dp" android:gravity="@{hasProfileEverBeenAddedValue ? Gravity.CENTER_HORIZONTAL : Gravity.CENTER_VERTICAL}" - android:text="@string/profile_chooser_admin" + android:text="@string/profile_chooser_activity_admin_text" android:textColor="@color/component_color_shared_secondary_4_text_color" android:visibility="@{viewModel.profile.isAdmin ? View.VISIBLE : View.GONE}" app:layoutMarginTop="@{hasProfileEverBeenAddedValue ? @dimen/profile_chooser_profile_view_is_admin_margin_top_profile_already_added : @dimen/space_0dp}" /> diff --git a/app/src/main/res/layout-sw600dp-land/question_player_fragment.xml b/app/src/main/res/layout-sw600dp-land/question_player_fragment.xml index c720268b937..1954f8b05a4 100644 --- a/app/src/main/res/layout-sw600dp-land/question_player_fragment.xml +++ b/app/src/main/res/layout-sw600dp-land/question_player_fragment.xml @@ -29,7 +29,7 @@ android:layout_marginTop="40dp" android:layout_marginEnd="192dp" android:fontFamily="sans-serif" - android:text="@string/question_training_session_finished_header" + android:text="@string/topic_fragment_question_end_session_header_text" android:textColor="@color/component_color_shared_primary_text_color" android:textSize="24sp" android:visibility="gone" @@ -44,7 +44,7 @@ android:layout_marginTop="8dp" android:layout_marginEnd="192dp" android:fontFamily="sans-serif" - android:text="@string/question_training_session_finished_message" + android:text="@string/topic_fragment_question_end_session_body_text" android:textColor="@color/component_color_shared_primary_text_color" android:textSize="16sp" android:visibility="gone" @@ -151,7 +151,7 @@ android:layout_height="6dp" android:layout_gravity="top|end" android:layout_margin="8dp" - android:contentDescription="@string/new_hint_available" + android:contentDescription="@string/question_player_activity_new_hint_available_text" android:visibility="@{viewModel.isHintOpenedAndUnRevealed() ? View.VISIBLE : View.GONE}" app:srcCompat="@drawable/ic_dot_yellow_24dp" /> @@ -160,7 +160,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="12dp" - android:contentDescription="@string/show_hints_and_solution" + android:contentDescription="@string/state_fragment_open_hint_content_description" app:srcCompat="@drawable/ic_hint_bulb_white_24dp" /> diff --git a/app/src/main/res/layout-sw600dp-land/topic_info_fragment.xml b/app/src/main/res/layout-sw600dp-land/topic_info_fragment.xml index 2f4129184af..fa008999094 100644 --- a/app/src/main/res/layout-sw600dp-land/topic_info_fragment.xml +++ b/app/src/main/res/layout-sw600dp-land/topic_info_fragment.xml @@ -79,7 +79,7 @@ android:minHeight="48dp" android:onClick="@{(v) -> viewModel.clickSeeMore()}" android:paddingTop="8dp" - android:text="@{viewModel.isDescriptionExpanded() ? @string/see_less : @string/see_more}" + android:text="@{viewModel.isDescriptionExpanded() ? @string/topic_fragment_info_see_less_text : @string/topic_fragment_info_see_more_text}" android:textColor="@color/component_color_shared_active_text_color" android:textSize="16sp" android:textStyle="bold" @@ -109,7 +109,7 @@ android:layout_height="wrap_content" android:layout_marginStart="12dp" android:fontFamily="sans-serif" - android:text="@string/topic_downloaded" + android:text="@string/topic_fragment_info_topic_downloaded" android:textColor="@color/component_color_shared_download_story_text_color" android:textSize="18sp" app:layout_constraintBottom_toBottomOf="@+id/download_status_image_view" diff --git a/app/src/main/res/layout-sw600dp-land/topic_lessons_story_summary.xml b/app/src/main/res/layout-sw600dp-land/topic_lessons_story_summary.xml index b4467458dcd..c950c13f00c 100644 --- a/app/src/main/res/layout-sw600dp-land/topic_lessons_story_summary.xml +++ b/app/src/main/res/layout-sw600dp-land/topic_lessons_story_summary.xml @@ -84,7 +84,7 @@ android:layout_height="wrap_content" android:layout_marginTop="4dp" android:fontFamily="sans-serif" - android:text="@{viewModel.storyPercentage != 100? @string/status_in_progress : @string/status_completed}" + android:text="@{viewModel.storyPercentage != 100? @string/topic_fragment_lessons_story_status_in_progress : @string/topic_fragment_lessons_story_status_completed}" android:textColor="@color/component_color_shared_primary_text_color" android:textSize="10sp" android:visibility="@{viewModel.storyPercentage != 0 ? View.VISIBLE : View.GONE}" /> @@ -142,7 +142,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_horizontal|bottom" - android:contentDescription="@{isListExpanded ? @string/hide_chapter_list : @string/show_chapter_list}" + android:contentDescription="@{isListExpanded ? @string/topic_fragment_lessons_hide_chapter_list : @string/topic_fragment_lessons_show_chapter_list}" app:isRotationAnimationClockwise="@{isListExpanded}" app:rotationAnimationAngle="@{180f}" app:srcCompat="@drawable/ic_arrow_drop_down_black_24dp" diff --git a/app/src/main/res/layout-sw600dp-port/onboarding_fragment.xml b/app/src/main/res/layout-sw600dp-port/onboarding_fragment.xml index 18b1555cbcc..6182a571f23 100644 --- a/app/src/main/res/layout-sw600dp-port/onboarding_fragment.xml +++ b/app/src/main/res/layout-sw600dp-port/onboarding_fragment.xml @@ -68,7 +68,7 @@ android:layout_marginTop="12dp" android:layout_marginEnd="32dp" android:layout_marginBottom="12dp" - android:contentDescription="@string/next_arrow" + android:contentDescription="@string/onboarding_activity_next_arrow_text" android:gravity="center" android:minWidth="48dp" android:minHeight="48dp" @@ -89,7 +89,7 @@ android:minWidth="48dp" android:minHeight="48dp" android:onClick="@{(v) -> presenter.clickOnSkip()}" - android:text="@string/skip" + android:text="@string/onboarding_activity_skip_text" android:textAllCaps="true" android:textColor="@color/component_color_shared_primary_text_color" android:visibility="@{viewModel.slideNumber != (viewModel.totalNumberOfSlides - 1) ? View.VISIBLE: View.GONE, default=visible}" diff --git a/app/src/main/res/layout-sw600dp-port/onboarding_slide_final.xml b/app/src/main/res/layout-sw600dp-port/onboarding_slide_final.xml index 7d56635942f..8499020e970 100644 --- a/app/src/main/res/layout-sw600dp-port/onboarding_slide_final.xml +++ b/app/src/main/res/layout-sw600dp-port/onboarding_slide_final.xml @@ -43,7 +43,7 @@ android:layout_marginEnd="160dp" android:fontFamily="sans-serif-medium" android:gravity="center_horizontal" - android:text="@string/onboarding_slide_3_title" + android:text="@string/onboarding_activity_slide_3_title" android:textColor="@color/component_color_shared_primary_text_color" android:textSize="32sp" app:layout_constraintEnd_toEndOf="parent" @@ -59,7 +59,7 @@ android:layout_marginEnd="192dp" android:maxLines="2" android:minLines="2" - android:text="@string/onboarding_slide_3_description" + android:text="@string/onboarding_activity_slide_3_description" android:textColor="@color/component_color_shared_secondary_1_text_color" android:textSize="24sp" app:layout_constraintEnd_toEndOf="parent" @@ -77,7 +77,7 @@ android:fontFamily="sans-serif-medium" android:minHeight="48dp" android:onClick="@{(v) -> viewModel.clickOnGetStarted()}" - android:text="@string/get_started" + android:text="@string/onboarding_activity_get_started_text" android:textColor="@color/component_color_shared_secondary_4_text_color" android:textSize="20sp" android:textAllCaps="false" diff --git a/app/src/main/res/layout-sw600dp-port/profile_chooser_add_view.xml b/app/src/main/res/layout-sw600dp-port/profile_chooser_add_view.xml index af4cad46d7c..fb67d8b95bd 100644 --- a/app/src/main/res/layout-sw600dp-port/profile_chooser_add_view.xml +++ b/app/src/main/res/layout-sw600dp-port/profile_chooser_add_view.xml @@ -58,7 +58,7 @@ @@ -68,7 +68,7 @@ android:layout_gravity="center" android:layout_marginTop="4dp" android:fontFamily="sans-serif" - android:text="@string/set_up_multiple_profiles_description" + android:text="@string/profile_chooser_activity_add_profile_description_text" android:textColor="@color/component_color_shared_secondary_4_text_color" android:textSize="16sp" android:visibility="@{hasProfileEverBeenAddedValue ? View.GONE : View.VISIBLE}" /> diff --git a/app/src/main/res/layout-sw600dp-port/profile_chooser_profile_view.xml b/app/src/main/res/layout-sw600dp-port/profile_chooser_profile_view.xml index 969ca5372d8..a1a76c5fcc5 100644 --- a/app/src/main/res/layout-sw600dp-port/profile_chooser_profile_view.xml +++ b/app/src/main/res/layout-sw600dp-port/profile_chooser_profile_view.xml @@ -89,7 +89,7 @@ android:layout_height="wrap_content" android:layout_marginTop="4dp" android:gravity="@{hasProfileEverBeenAddedValue ? Gravity.CENTER_HORIZONTAL : Gravity.CENTER_VERTICAL}" - android:text="@string/profile_chooser_admin" + android:text="@string/profile_chooser_activity_admin_text" android:textColor="@color/component_color_shared_secondary_4_text_color" android:visibility="@{viewModel.profile.isAdmin ? View.VISIBLE : View.GONE}" /> diff --git a/app/src/main/res/layout-sw600dp-port/question_player_fragment.xml b/app/src/main/res/layout-sw600dp-port/question_player_fragment.xml index 760a1e8c305..1f8fd6426d2 100644 --- a/app/src/main/res/layout-sw600dp-port/question_player_fragment.xml +++ b/app/src/main/res/layout-sw600dp-port/question_player_fragment.xml @@ -29,7 +29,7 @@ android:layout_marginTop="40dp" android:layout_marginEnd="128dp" android:fontFamily="sans-serif" - android:text="@string/question_training_session_finished_header" + android:text="@string/topic_fragment_question_end_session_header_text" android:textColor="@color/component_color_shared_primary_text_color" android:textSize="24sp" android:visibility="gone" @@ -44,7 +44,7 @@ android:layout_marginTop="8dp" android:layout_marginEnd="128dp" android:fontFamily="sans-serif" - android:text="@string/question_training_session_finished_message" + android:text="@string/topic_fragment_question_end_session_body_text" android:textColor="@color/component_color_shared_primary_text_color" android:textSize="16sp" android:visibility="gone" @@ -151,7 +151,7 @@ android:layout_height="6dp" android:layout_gravity="top|end" android:layout_margin="8dp" - android:contentDescription="@string/new_hint_available" + android:contentDescription="@string/question_player_activity_new_hint_available_text" android:visibility="@{viewModel.isHintOpenedAndUnRevealed() ? View.VISIBLE : View.GONE}" app:srcCompat="@drawable/ic_dot_yellow_24dp" /> @@ -160,7 +160,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="12dp" - android:contentDescription="@string/show_hints_and_solution" + android:contentDescription="@string/state_fragment_open_hint_content_description" app:srcCompat="@drawable/ic_hint_bulb_white_24dp" /> diff --git a/app/src/main/res/layout-sw600dp-port/topic_info_fragment.xml b/app/src/main/res/layout-sw600dp-port/topic_info_fragment.xml index e683f6b64e3..fe78c38eda1 100644 --- a/app/src/main/res/layout-sw600dp-port/topic_info_fragment.xml +++ b/app/src/main/res/layout-sw600dp-port/topic_info_fragment.xml @@ -100,7 +100,7 @@ android:minHeight="48dp" android:onClick="@{(v) -> viewModel.clickSeeMore()}" android:paddingTop="8dp" - android:text="@{viewModel.isDescriptionExpanded() ? @string/see_less : @string/see_more}" + android:text="@{viewModel.isDescriptionExpanded() ? @string/topic_fragment_info_see_less_text : @string/topic_fragment_info_see_more_text}" android:textColor="@color/component_color_shared_active_text_color" android:textSize="16sp" android:textStyle="bold" @@ -129,7 +129,7 @@ android:layout_height="wrap_content" android:layout_marginStart="12dp" android:fontFamily="sans-serif" - android:text="@string/topic_downloaded" + android:text="@string/topic_fragment_info_topic_downloaded" android:textColor="@color/component_color_shared_download_story_text_color" android:textSize="18sp" app:layout_constraintBottom_toBottomOf="@+id/download_status_image_view" diff --git a/app/src/main/res/layout-sw600dp/administrator_controls_app_information_view.xml b/app/src/main/res/layout-sw600dp/administrator_controls_app_information_view.xml index 8f676cd9c56..e7e7eeacd2c 100644 --- a/app/src/main/res/layout-sw600dp/administrator_controls_app_information_view.xml +++ b/app/src/main/res/layout-sw600dp/administrator_controls_app_information_view.xml @@ -26,7 +26,7 @@ android:paddingTop="28dp" android:paddingEnd="16dp" android:paddingBottom="20dp" - android:text="@string/administrator_controls_app_information_label" + android:text="@string/administrator_controls_fragment_app_information_text" android:textColor="@color/component_color_shared_active_text_color" app:layout_constraintBottom_toTopOf="@id/app_version_text_view" app:layout_constraintEnd_toEndOf="parent" @@ -43,7 +43,7 @@ android:paddingTop="20dp" android:paddingEnd="16dp" android:paddingBottom="20dp" - android:text="@string/administrator_controls_app_version" + android:text="@string/administrator_controls_fragment_app_version_text" android:textColor="@color/component_color_shared_primary_dark_text_color" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout-sw600dp/administrator_controls_learner_analytics_view.xml b/app/src/main/res/layout-sw600dp/administrator_controls_learner_analytics_view.xml index a9ba3c2c885..2acbc4d2743 100644 --- a/app/src/main/res/layout-sw600dp/administrator_controls_learner_analytics_view.xml +++ b/app/src/main/res/layout-sw600dp/administrator_controls_learner_analytics_view.xml @@ -26,7 +26,7 @@ android:paddingTop="28dp" android:paddingEnd="16dp" android:paddingBottom="20dp" - android:text="@string/learner_analytics_label_text" + android:text="@string/administrator_controls_activity_learner_analytics_text" android:textColor="@color/component_color_shared_active_text_color" app:layout_constraintBottom_toTopOf="@id/profile_and_device_id_text_view" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout-sw600dp/administrator_controls_profile_view.xml b/app/src/main/res/layout-sw600dp/administrator_controls_profile_view.xml index b0230632aea..e10021b2a51 100644 --- a/app/src/main/res/layout-sw600dp/administrator_controls_profile_view.xml +++ b/app/src/main/res/layout-sw600dp/administrator_controls_profile_view.xml @@ -26,7 +26,7 @@ android:paddingTop="28dp" android:paddingEnd="16dp" android:paddingBottom="20dp" - android:text="@string/administrator_controls_profile_management_label" + android:text="@string/administrator_controls_fragment_profile_management_text" android:textColor="@color/component_color_shared_active_text_color" app:layout_constraintBottom_toTopOf="@id/edit_profiles_text_view" app:layout_constraintEnd_toEndOf="parent" @@ -43,7 +43,7 @@ android:paddingTop="20dp" android:paddingEnd="16dp" android:paddingBottom="20dp" - android:text="@string/administrator_controls_edit_profiles" + android:text="@string/administrator_controls_fragment_edit_profiles_text" android:textColor="@color/component_color_shared_primary_dark_text_color" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout-sw600dp/option_app_language.xml b/app/src/main/res/layout-sw600dp/option_app_language.xml index 0a14584f377..74429000c94 100644 --- a/app/src/main/res/layout-sw600dp/option_app_language.xml +++ b/app/src/main/res/layout-sw600dp/option_app_language.xml @@ -31,7 +31,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:fontFamily="sans-serif" - android:text="@string/app_language" + android:text="@string/option_activity_app_language_text" android:textColor="@color/component_color_shared_primary_dark_text_color" android:textSize="16sp" app:layout_constraintBottom_toTopOf="@id/app_language_text_view" diff --git a/app/src/main/res/layout-sw600dp/option_story_text_size.xml b/app/src/main/res/layout-sw600dp/option_story_text_size.xml index 0857ba8b4ca..b6fc4049520 100644 --- a/app/src/main/res/layout-sw600dp/option_story_text_size.xml +++ b/app/src/main/res/layout-sw600dp/option_story_text_size.xml @@ -31,7 +31,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:fontFamily="sans-serif" - android:text="@string/reading_text_size" + android:text="@string/option_activity_reading_text_size" android:textColor="@color/component_color_shared_primary_dark_text_color" android:textSize="16sp" app:layout_constraintBottom_toTopOf="@id/reading_text_size_text_view" diff --git a/app/src/main/res/layout-sw600dp/profile_chooser_fragment.xml b/app/src/main/res/layout-sw600dp/profile_chooser_fragment.xml index e1cda79e5df..02620ae5c74 100644 --- a/app/src/main/res/layout-sw600dp/profile_chooser_fragment.xml +++ b/app/src/main/res/layout-sw600dp/profile_chooser_fragment.xml @@ -47,7 +47,7 @@ style="@style/Subtitle1ViewCenter" android:minHeight="48dp" android:paddingTop="20dp" - android:text="@string/profile_chooser_language" + android:text="@string/profile_chooser_activity_language_text" android:textColor="@color/component_color_profile_chooser_activity_secondary_options_color" android:visibility="gone" app:layout_constraintEnd_toStartOf="@+id/profile_chooser_language_icon" @@ -60,7 +60,7 @@ android:layout_marginStart="@dimen/profile_chooser_profile_select_text_margin_start" android:layout_marginTop="80dp" android:fontFamily="sans-serif" - android:text="@string/profile_chooser_select" + android:text="@string/profile_chooser_activity_select_text" android:textColor="@color/component_color_shared_secondary_4_text_color" android:textSize="36sp" app:layout_constraintStart_toStartOf="parent" @@ -111,7 +111,7 @@ style="@style/Heading1ViewCenter" android:layout_marginBottom="@dimen/profile_chooser_administrator_controls_margin_bottom" android:minHeight="48dp" - android:text="@string/profile_chooser_administrator_controls" + android:text="@string/profile_chooser_activity_administrator_controls_text" android:textColor="@color/component_color_profile_chooser_activity_secondary_options_color" /> @@ -157,7 +157,7 @@ android:layout_width="60dp" android:layout_height="wrap_content" android:fontFamily="sans-serif" - android:text="@{viewModel.completedStoryCount != 1 ? @string/stories_completed : @string/story_completed}" + android:text="@{viewModel.completedStoryCount != 1 ? @string/profile_progress_activity_stories_completed_text : @string/profile_progress_activity_story_completed_text}" android:textColor="@color/component_color_shared_primary_text_color" android:textSize="12sp" /> @@ -172,7 +172,7 @@ android:layout_marginTop="76dp" android:fontFamily="sans-serif-medium" android:minHeight="48dp" - android:text="@string/recently_played_stories" + android:text="@string/home_activity_recently_played_stories" android:textColor="@color/component_color_shared_primary_text_color" android:textSize="18sp" android:visibility="@{viewModel.headerTextVisibility}" @@ -190,7 +190,7 @@ android:gravity="center_vertical" android:minHeight="48dp" android:onClick="@{() -> viewModel.clickOnViewAll()}" - android:text="@string/view_all" + android:text="@string/home_activity_view_all_text" android:textAllCaps="true" android:textColor="@color/component_color_profile_progress_activity_view_all_text_color" android:textSize="14sp" diff --git a/app/src/main/res/layout-sw600dp/story_chapter_view.xml b/app/src/main/res/layout-sw600dp/story_chapter_view.xml index 64800254214..bf3988d2989 100644 --- a/app/src/main/res/layout-sw600dp/story_chapter_view.xml +++ b/app/src/main/res/layout-sw600dp/story_chapter_view.xml @@ -166,7 +166,7 @@ android:layout_height="wrap_content" android:layout_marginEnd="8dp" android:layout_marginBottom="4dp" - android:contentDescription="@{@string/chapter_completed}" + android:contentDescription="@{@string/topic_fragment_lessons_chapter_completed_text,}" android:visibility="@{viewModel.chapterSummary.chapterPlayState == ChapterPlayState.COMPLETED ? View.VISIBLE : View.GONE}" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout-sw600dp/story_fragment.xml b/app/src/main/res/layout-sw600dp/story_fragment.xml index 1c4a22acad5..a5f6b88eb0a 100644 --- a/app/src/main/res/layout-sw600dp/story_fragment.xml +++ b/app/src/main/res/layout-sw600dp/story_fragment.xml @@ -33,7 +33,7 @@ android:gravity="center_vertical" android:minHeight="?attr/actionBarSize" android:theme="@style/Widget.AppCompat.ActionBar" - app:navigationContentDescription="@string/navigate_up" + app:navigationContentDescription="@string/navigate_up_text" app:navigationIcon="?attr/homeAsUpIndicator"> + android:text="@string/home_activity_topic_play_text" /> diff --git a/app/src/main/res/layout/activity_input_interaction_view_test.xml b/app/src/main/res/layout/activity_input_interaction_view_test.xml index dba00bfb1e8..6db387a9e11 100644 --- a/app/src/main/res/layout/activity_input_interaction_view_test.xml +++ b/app/src/main/res/layout/activity_input_interaction_view_test.xml @@ -181,7 +181,7 @@ android:layout_height="wrap_content" android:layout_margin="8dp" android:onClick="getPendingAnswerErrorOnSubmitClick" - android:text="@string/submit_button_text" + android:text="@string/input_interaction_view_test_activity_submit_button" android:textColor="@color/component_color_shared_secondary_4_text_color" /> diff --git a/app/src/main/res/layout/add_profile_activity.xml b/app/src/main/res/layout/add_profile_activity.xml index a3c2adc51e9..e390eb9f125 100644 --- a/app/src/main/res/layout/add_profile_activity.xml +++ b/app/src/main/res/layout/add_profile_activity.xml @@ -49,7 +49,7 @@ android:layout_width="120dp" android:layout_height="120dp" android:clickable="true" - android:contentDescription="@string/current_profile_picture_content_description" + android:contentDescription="@string/add_profile_activity_edit_image_content_description" android:elevation="4dp" android:focusable="true" app:add_shadow="true" @@ -64,7 +64,7 @@ android:id="@+id/add_profile_activity_edit_user_image_view" android:layout_width="48dp" android:layout_height="48dp" - android:contentDescription="@string/edit_profile_picture_content_description" + android:contentDescription="@string/add_profile_activity_edit_user_image_content_description" android:elevation="4dp" android:paddingStart="12dp" android:paddingEnd="0dp" @@ -79,9 +79,9 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="16dp" - android:hint="@string/add_profile_input_name" + android:hint="@string/add_profile_activity_input_name_hint" app:errorMessage="@{viewModel.nameErrorMsg}" - app:helperText="@string/add_profile_required" + app:helperText="@string/add_profile_activity_user_name_helper_text" app:helperTextEnabled="true" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -105,7 +105,7 @@ android:layout_marginTop="@dimen/add_profile_pin_checkbox_margin_top" android:buttonTint="@color/component_color_shared_checkbox_selector" android:minHeight="48dp" - android:text="@string/add_profile_create_a_3_digit_pin" + android:text="@string/add_profile_activity_pin_check_box_text" android:textColor="@color/component_color_shared_secondary_1_text_color" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/add_profile_activity_user_name" /> @@ -114,7 +114,7 @@ android:id="@+id/add_profile_activity_info_image_view" android:layout_width="48dp" android:layout_height="48dp" - android:contentDescription="@string/add_profile_info_content_description" + android:contentDescription="@string/add_profile_activity_info_image_content_description" android:padding="12dp" android:tint="@color/component_color_add_profile_activity_info_icon_color" app:layout_constraintEnd_toEndOf="parent" @@ -137,9 +137,9 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="24dp" - android:hint="@string/add_profile_input_pin" + android:hint="@string/add_profile_activity_input_pin_hint" app:errorMessage="@{viewModel.pinErrorMsg}" - app:helperText="@string/add_profile_required" + app:helperText="@string/add_profile_activity_user_name_helper_text" app:helperTextEnabled="true" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -162,9 +162,9 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/add_profile_confirm_pin_margin_top" - android:hint="@string/add_profile_input_confirm_pin" + android:hint="@string/add_profile_activity_input_confirm_pin_hint" app:errorMessage="@{viewModel.confirmPinErrorMsg}" - app:helperText="@string/add_profile_required" + app:helperText="@string/add_profile_activity_user_name_helper_text" app:helperTextEnabled="true" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -198,7 +198,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:fontFamily="sans-serif" - android:text="@string/add_profile_allow_download_heading" + android:text="@string/add_profile_activity_allow_download_text" android:textColor="@color/component_color_shared_primary_text_color" android:textSize="16sp" app:layout_constraintStart_toStartOf="parent" @@ -210,7 +210,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:fontFamily="sans-serif" - android:text="@string/add_profile_allow_download_sub" + android:text="@string/add_profile_activity_allow_download_sub_text" android:textColor="@color/component_color_shared_secondary_2_text_color" android:textSize="14sp" app:layout_constraintStart_toStartOf="parent" @@ -237,7 +237,7 @@ android:background="@{viewModel.isButtonActive() ? @drawable/state_button_primary_background : @drawable/start_button_transparent_background}" android:enabled="@{viewModel.isButtonActive()}" android:gravity="center" - android:text="@string/add_profile_create_btn" + android:text="@string/add_profile_activity_create_button_text" android:textColor="@{viewModel.isButtonActive() ? @color/component_color_shared_secondary_4_text_color : @color/component_color_shared_button_inactive_text_color }" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@+id/add_profile_activity_pin_constraint_layout" /> diff --git a/app/src/main/res/layout/admin_auth_activity.xml b/app/src/main/res/layout/admin_auth_activity.xml index 37b381f214a..fb3619c9c09 100644 --- a/app/src/main/res/layout/admin_auth_activity.xml +++ b/app/src/main/res/layout/admin_auth_activity.xml @@ -31,9 +31,9 @@ android:background="@color/component_color_shared_activity_toolbar_color" android:fontFamily="sans-serif" android:minHeight="?attr/actionBarSize" - app:navigationContentDescription="@string/admin_auth_close" + app:navigationContentDescription="@string/admin_auth_activity_tool_bar_content_desc" app:navigationIcon="@drawable/ic_close_white_24dp" - app:title="@string/admin_auth_toolbar" + app:title="@string/admin_auth_activity_title" app:titleTextAppearance="@style/ToolbarTextAppearance" app:titleTextColor="@color/component_color_shared_activity_toolbar_text_color" /> @@ -67,7 +67,7 @@ android:layout_marginTop="40dp" android:layout_marginEnd="@dimen/admin_auth_activity_admin_pin_main_text_view_margin_end" android:maxLines="2" - android:text="@string/admin_auth_heading" + android:text="@string/admin_auth_activity_heading_text" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -78,7 +78,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="12dp" - android:text="@string/admin_auth_sub" + android:text="@string/admin_auth_activity_subject_text" android:textColor="@color/component_color_shared_secondary_2_text_color" app:layout_constraintEnd_toEndOf="@id/admin_auth_heading_textview" app:layout_constraintStart_toStartOf="@id/admin_auth_heading_textview" @@ -90,7 +90,7 @@ android:layout_width="@dimen/admin_auth_activity_input_width" android:layout_height="wrap_content" android:layout_marginTop="48dp" - android:hint="@string/admin_auth_pin" + android:hint="@string/admin_auth_activity_input_pin_hint_text" app:errorMessage="@{viewModel.errorMessage}" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -116,7 +116,7 @@ android:background="@{viewModel.isSubmitButtonActive ? @drawable/state_button_primary_background :@drawable/start_button_transparent_background}" android:enabled="@{viewModel.isSubmitButtonActive}" android:minHeight="48dp" - android:text="@string/admin_auth_submit" + android:text="@string/admin_auth_activity_submit_button_text" android:textColor="@{viewModel.isSubmitButtonActive() ? @color/component_color_shared_secondary_4_text_color : @color/component_color_shared_button_inactive_text_color }" app:layout_constraintEnd_toEndOf="@id/admin_auth_input_pin" app:layout_constraintHorizontal_bias="1.0" diff --git a/app/src/main/res/layout/admin_pin_activity.xml b/app/src/main/res/layout/admin_pin_activity.xml index f22760b80dd..47d8d893ef6 100644 --- a/app/src/main/res/layout/admin_pin_activity.xml +++ b/app/src/main/res/layout/admin_pin_activity.xml @@ -57,7 +57,7 @@ android:layout_marginStart="@dimen/admin_pin_activity_admin_pin_main_text_view_margin_start" android:layout_marginTop="32dp" android:layout_marginEnd="@dimen/admin_pin_activity_admin_pin_main_text_view_margin_end" - android:text="@string/admin_pin_requirement_description" + android:text="@string/admin_pin_activity_requirement_description_text" android:textColor="@color/component_color_shared_secondary_1_text_color" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -69,7 +69,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="16dp" - android:text="@string/admin_pin_pin_description" + android:text="@string/admin_pin_activity_warning_text" android:textColor="@color/component_color_shared_secondary_1_text_color" app:layout_constraintEnd_toEndOf="@id/admin_pin_main_text" app:layout_constraintStart_toStartOf="@+id/admin_pin_main_text" @@ -81,7 +81,7 @@ android:layout_width="@dimen/admin_pin_activity_input_width" android:layout_height="wrap_content" android:layout_marginTop="28dp" - android:hint="@string/admin_pin_new_pin" + android:hint="@string/admin_pin_activity_input_new_pin_hint" app:errorMessage="@{viewModel.pinErrorMsg}" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -104,7 +104,7 @@ android:layout_width="@dimen/admin_pin_activity_input_width" android:layout_height="wrap_content" android:layout_marginTop="16dp" - android:hint="@string/admin_pin_new_confirm" + android:hint="@string/admin_pin_activity_input_confirm_pin_hint" app:errorMessage="@{viewModel.confirmPinErrorMsg}" app:layout_constraintEnd_toEndOf="@id/admin_pin_input_pin" app:layout_constraintStart_toStartOf="@id/admin_pin_input_pin" @@ -133,7 +133,7 @@ android:clickable="@{viewModel.isButtonActive()}" android:enabled="@{viewModel.isButtonActive()}" android:minHeight="48dp" - android:text="@string/save" + android:text="@string/admin_pin_activity_submit_button_text android:textColor="@{viewModel.isButtonActive() ? @color/component_color_shared_secondary_4_text_color : @color/component_color_shared_button_inactive_text_color }" app:layout_constraintEnd_toEndOf="@id/admin_pin_input_confirm_pin" app:layout_constraintTop_toBottomOf="@+id/admin_pin_input_confirm_pin" /> diff --git a/app/src/main/res/layout/admin_settings_dialog.xml b/app/src/main/res/layout/admin_settings_dialog.xml index 8e3100fef5b..8b732c10562 100755 --- a/app/src/main/res/layout/admin_settings_dialog.xml +++ b/app/src/main/res/layout/admin_settings_dialog.xml @@ -22,7 +22,7 @@ android:layout_marginTop="32dp" android:layout_marginEnd="24dp" android:layout_marginBottom="20dp" - android:hint="@string/admin_settings_label" + android:hint="@string/admin_settings_dialog_input_pin_hint" app:errorMessage="@{viewModel.errorMessage}"> @@ -60,7 +60,7 @@ android:id="@+id/topic_update_on_wifi_description_text_view" style="@style/Subtitle2ViewStart" android:layout_width="0dp" - android:text="@string/administrator_controls_update_on_wifi_message" + android:text="@string/administrator_controls_fragment_topic_update_on_wifi_description" android:textColor="@color/component_color_shared_secondary_3_text_color" app:layout_constraintEnd_toStartOf="@id/topic_update_on_wifi_switch" app:layout_constraintStart_toStartOf="parent" @@ -116,7 +116,7 @@ android:id="@+id/auto_update_topic_title_text_view" style="@style/Body" android:paddingBottom="4dp" - android:text="@string/administrator_controls_auto_update_title" + android:text="@string/administrator_controls_fragment_auto_update_topic_text" android:textColor="@color/component_color_shared_primary_dark_text_color" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -125,7 +125,7 @@ android:id="@+id/auto_update_topic_description_text_view" style="@style/Subtitle2ViewStart" android:layout_width="0dp" - android:text="@string/administrator_controls_auto_update_message" + android:text="@string/administrator_controls_fragment_auto_update_topic_description" android:textColor="@color/component_color_shared_secondary_3_text_color" app:layout_constraintEnd_toStartOf="@id/auto_update_topic_switch" app:layout_constraintHorizontal_weight="1" diff --git a/app/src/main/res/layout/administrator_controls_general_view.xml b/app/src/main/res/layout/administrator_controls_general_view.xml index 9b815b48f14..7c84c3b126c 100644 --- a/app/src/main/res/layout/administrator_controls_general_view.xml +++ b/app/src/main/res/layout/administrator_controls_general_view.xml @@ -22,7 +22,7 @@ android:paddingTop="@dimen/administrator_controls_general_view_general_text_view_padding_top" android:paddingEnd="@dimen/administrator_controls_general_view_general_text_view_padding_end" android:paddingBottom="20dp" - android:text="@string/administrator_controls_general_label" + android:text="@string/administrator_controls_fragment_general_label" android:textColor="@color/component_color_shared_active_text_color" app:layout_constraintBottom_toTopOf="@id/edit_account_text_view" app:layout_constraintEnd_toEndOf="parent" @@ -38,7 +38,7 @@ android:paddingTop="20dp" android:paddingEnd="@dimen/administrator_controls_general_view_edit_account_text_view_padding_end" android:paddingBottom="20dp" - android:text="@string/administrator_controls_edit_account" + android:text="@string/administrator_controls_fragment_edit_account_text" android:textColor="@color/component_color_shared_primary_dark_text_color" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/administrator_controls_learner_analytics_view.xml b/app/src/main/res/layout/administrator_controls_learner_analytics_view.xml index 2a761c6b17a..4c00c5c394f 100644 --- a/app/src/main/res/layout/administrator_controls_learner_analytics_view.xml +++ b/app/src/main/res/layout/administrator_controls_learner_analytics_view.xml @@ -22,7 +22,7 @@ android:paddingTop="28dp" android:paddingEnd="16dp" android:paddingBottom="20dp" - android:text="@string/learner_analytics_label_text" + android:text="@string/administrator_controls_activity_learner_analytics_text" android:textColor="@color/component_color_shared_active_text_color" app:layout_constraintBottom_toTopOf="@id/profile_and_device_id_text_view" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/administrator_controls_profile_view.xml b/app/src/main/res/layout/administrator_controls_profile_view.xml index b214eaa6d90..83173090866 100644 --- a/app/src/main/res/layout/administrator_controls_profile_view.xml +++ b/app/src/main/res/layout/administrator_controls_profile_view.xml @@ -22,7 +22,7 @@ android:paddingTop="28dp" android:paddingEnd="@dimen/administrator_controls_profile_view_profile_management_text_view_padding_end" android:paddingBottom="20dp" - android:text="@string/administrator_controls_profile_management_label" + android:text="@string/administrator_controls_fragment_profile_management_text" android:textColor="@color/component_color_shared_active_text_color" app:layout_constraintBottom_toTopOf="@id/edit_profiles_text_view" app:layout_constraintEnd_toEndOf="parent" @@ -39,7 +39,7 @@ android:paddingTop="20dp" android:paddingEnd="@dimen/administrator_controls_profile_view_edit_profiles_text_view_padding_end" android:paddingBottom="20dp" - android:text="@string/administrator_controls_edit_profiles" + android:text="@string/administrator_controls_fragment_edit_profiles_text" android:textColor="@color/component_color_shared_primary_dark_text_color" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/all_topics.xml b/app/src/main/res/layout/all_topics.xml index 6d6d101d3dd..38ab9601e7d 100644 --- a/app/src/main/res/layout/all_topics.xml +++ b/app/src/main/res/layout/all_topics.xml @@ -22,7 +22,7 @@ android:layout_marginEnd="@dimen/all_topics_text_margin_end" android:layout_marginBottom="@dimen/all_topics_text_margin_bottom" android:fontFamily="sans-serif-medium" - android:text="@string/select_a_topic_to_start" + android:text="@string/home_activity_all_topics_text" android:textColor="@color/component_color_shared_primary_text_color" android:textSize="18sp" /> diff --git a/app/src/main/res/layout/app_language_activity.xml b/app/src/main/res/layout/app_language_activity.xml index cc731dac72d..9ea35764481 100644 --- a/app/src/main/res/layout/app_language_activity.xml +++ b/app/src/main/res/layout/app_language_activity.xml @@ -22,7 +22,7 @@ android:background="@color/component_color_shared_activity_toolbar_color" android:fontFamily="sans-serif" android:minHeight="?attr/actionBarSize" - app:navigationContentDescription="@string/navigate_up" + app:navigationContentDescription="@string/navigate_up_text" app:navigationIcon="?attr/homeAsUpIndicator" app:title="@string/app_language_activity_title" app:titleTextAppearance="@style/ToolbarTextAppearance" /> diff --git a/app/src/main/res/layout/app_version_activity.xml b/app/src/main/res/layout/app_version_activity.xml index 7a81c2647a2..f7f85e8e535 100644 --- a/app/src/main/res/layout/app_version_activity.xml +++ b/app/src/main/res/layout/app_version_activity.xml @@ -22,10 +22,10 @@ android:background="@color/component_color_shared_activity_toolbar_color" android:minHeight="?attr/actionBarSize" android:textSize="20sp" - app:navigationContentDescription="@string/navigate_up" + app:navigationContentDescription="@string/navigate_up_text" app:navigationIcon="?attr/homeAsUpIndicator" app:popupTheme="@style/ThemeOverlay.AppCompat.Light" - app:title="@string/administrator_controls_app_version" + app:title="@string/administrator_controls_fragment_app_version_text" app:titleTextAppearance="@style/ToolbarTextAppearance" /> diff --git a/app/src/main/res/layout/audio_fragment.xml b/app/src/main/res/layout/audio_fragment.xml index 20ca0081c0e..3ff6503acee 100755 --- a/app/src/main/res/layout/audio_fragment.xml +++ b/app/src/main/res/layout/audio_fragment.xml @@ -56,7 +56,7 @@ android:layout_height="52dp" android:layout_marginStart="8dp" android:clickable="@{viewModel.playStatusLiveData != UiAudioPlayStatus.LOADING}" - android:contentDescription="@{viewModel.playStatusLiveData == UiAudioPlayStatus.PLAYING ? @string/audio_pause_description : @string/audio_play_description}" + android:contentDescription="@{viewModel.playStatusLiveData == UiAudioPlayStatus.PLAYING ? @string/audio_fragment_pause_description : @string/audio_fragment_play_description}" android:onClick="@{(v) -> viewModel.togglePlayPause(viewModel.playStatusLiveData)}" android:visibility="@{viewModel.playStatusLiveData != UiAudioPlayStatus.LOADING ? View.VISIBLE : View.INVISIBLE}" android:padding="12dp" @@ -72,7 +72,7 @@ android:layout_width="0dp" android:layout_height="26dp" android:layout_marginStart="4dp" - android:contentDescription="@string/audio_player_seekbar_content_description" + android:contentDescription="@string/audio_fragment_progress_seek_bar_content_description" android:max="@{viewModel.durationLiveData}" android:maxHeight="4dp" android:minWidth="180dp" @@ -91,7 +91,7 @@ android:id="@+id/audio_language_icon" android:layout_width="48dp" android:layout_height="48dp" - android:contentDescription="@string/audio_language_icon_content_description" + android:contentDescription="@string/audio_fragment_language_icon_content_description" android:gravity="center" android:onClick="@{(v) -> audioFragment.languageSelectionClicked()}" android:padding="12dp" diff --git a/app/src/main/res/layout/audio_language_activity.xml b/app/src/main/res/layout/audio_language_activity.xml index c20c6008011..e7de6f8f30c 100644 --- a/app/src/main/res/layout/audio_language_activity.xml +++ b/app/src/main/res/layout/audio_language_activity.xml @@ -22,7 +22,7 @@ android:background="@color/component_color_shared_activity_toolbar_color" android:fontFamily="sans-serif" android:minHeight="?attr/actionBarSize" - app:navigationContentDescription="@string/navigate_up" + app:navigationContentDescription="@string/navigate_up_text" app:navigationIcon="?attr/homeAsUpIndicator" app:title="@string/audio_language_activity_title" app:titleTextAppearance="@style/ToolbarTextAppearance" /> diff --git a/app/src/main/res/layout/beta_notice_dialog_content.xml b/app/src/main/res/layout/beta_notice_dialog_content.xml index 8a5a5a39b6f..354ca63962f 100755 --- a/app/src/main/res/layout/beta_notice_dialog_content.xml +++ b/app/src/main/res/layout/beta_notice_dialog_content.xml @@ -13,7 +13,7 @@ android:layout_height="wrap_content" android:autoLink="email" android:fontFamily="sans-serif" - android:text="@string/beta_notice_dialog_message" + android:text="@string/beta_notice_dialog_message_text" android:textColor="@color/component_color_shared_primary_text_color" android:textColorLink="@color/component_color_shared_link_text_color" android:textSize="16sp" @@ -28,7 +28,7 @@ android:buttonTint="@color/component_color_shared_checkbox_selector" android:fontFamily="sans-serif" android:minHeight="48dp" - android:text="@string/beta_notice_dialog_do_not_show_again_text" + android:text="@string/beta_notice_dialog_preference_checkbox_text" android:textColor="@color/component_color_shared_primary_text_color" android:textSize="16sp" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/bottom_sheet_options_menu_fragment.xml b/app/src/main/res/layout/bottom_sheet_options_menu_fragment.xml index fe98ab51455..029f7f478b2 100644 --- a/app/src/main/res/layout/bottom_sheet_options_menu_fragment.xml +++ b/app/src/main/res/layout/bottom_sheet_options_menu_fragment.xml @@ -18,7 +18,7 @@ android:drawableTint="@color/component_color_shared_multipane_icon_color" android:gravity="center_vertical" android:minHeight="48dp" - android:text="@string/menu_options" + android:text="@string/menu_options_text" android:textColor="@color/component_color_shared_primary_dark_text_color" android:textSize="20sp" app:drawableStartCompat="@drawable/ic_options_icon_grey_24dp" /> @@ -31,7 +31,7 @@ android:drawableTint="@color/component_color_shared_multipane_icon_color" android:gravity="center_vertical" android:minHeight="48dp" - android:text="@string/menu_help" + android:text="@string/menu_help_text" android:textColor="@color/component_color_shared_primary_dark_text_color" android:textSize="20sp" app:drawableStartCompat="@drawable/ic_baseline_help_outline_24" /> @@ -44,7 +44,7 @@ android:drawableTint="@color/component_color_shared_multipane_icon_color" android:gravity="center_vertical" android:minHeight="48dp" - android:text="@string/bottom_sheet_options_menu_close" + android:text="@string/exploration_activity_options_menu_close_text" android:textColor="@color/component_color_shared_primary_dark_text_color" android:textSize="20sp" app:drawableStartCompat="@drawable/ic_baseline_close_24" /> diff --git a/app/src/main/res/layout/cellular_data_dialog.xml b/app/src/main/res/layout/cellular_data_dialog.xml index 5715d0370e0..b93a28c80f6 100755 --- a/app/src/main/res/layout/cellular_data_dialog.xml +++ b/app/src/main/res/layout/cellular_data_dialog.xml @@ -15,7 +15,7 @@ android:paddingTop="@dimen/cellular_data_dialog_padding" android:paddingEnd="16dp" android:paddingBottom="@dimen/cellular_data_dialog_padding" - android:text="@string/cellular_data_alert_dialog_checkbox" + android:text="@string/cellular_audio_dialog_checkboxes_text" android:textColor="@color/component_color_shared_primary_dark_text_color" android:textSize="16sp" /> diff --git a/app/src/main/res/layout/completed_story_list_fragment.xml b/app/src/main/res/layout/completed_story_list_fragment.xml index c1d2f5c0a9b..6ea2d0bd2e8 100644 --- a/app/src/main/res/layout/completed_story_list_fragment.xml +++ b/app/src/main/res/layout/completed_story_list_fragment.xml @@ -30,7 +30,7 @@ android:background="@color/component_color_shared_activity_toolbar_color" android:fontFamily="sans-serif" android:minHeight="?attr/actionBarSize" - app:navigationContentDescription="@string/navigate_up" + app:navigationContentDescription="@string/navigate_up_text" app:navigationIcon="?attr/homeAsUpIndicator" app:title="@string/completed_story_list_activity_title" app:titleTextAppearance="@style/ToolbarTextAppearance" diff --git a/app/src/main/res/layout/concept_card_fragment.xml b/app/src/main/res/layout/concept_card_fragment.xml index 4dda98feef3..4f139d505e6 100644 --- a/app/src/main/res/layout/concept_card_fragment.xml +++ b/app/src/main/res/layout/concept_card_fragment.xml @@ -23,7 +23,7 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" - app:title="@string/concept_card_toolbar_title" + app:title="@string/concept_card_fragment_title" app:titleTextAppearance="@style/ToolbarTextAppearance" app:titleTextColor="@color/component_color_shared_activity_toolbar_text_color" /> diff --git a/app/src/main/res/layout/concept_card_fragment_test_activity.xml b/app/src/main/res/layout/concept_card_fragment_test_activity.xml index 9f8586d5570..ca783cd366f 100644 --- a/app/src/main/res/layout/concept_card_fragment_test_activity.xml +++ b/app/src/main/res/layout/concept_card_fragment_test_activity.xml @@ -7,13 +7,13 @@ android:id="@+id/open_dialog_0" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="@string/concept_card_one_button_text" + android:text="@string/concept_card_test_activity_one_button_text" android:textAllCaps="false"/>