Fix #3384 : Arranged string resources based on screens #4823
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -85,7 +85,7 @@ class AdministratorControlsActivity : | |
| selectedProfileId, | ||
| isProfileDeletionDialogVisible | ||
| ) | ||
| title = resourceHandler.getStringInLocale(R.string.administrator_controls_activity_label_title) | ||
| } | ||
|
|
||
| override fun routeToAppVersion() { | ||
|
|
@@ -146,7 +146,9 @@ class AdministratorControlsActivity : | |
| lastLoadedFragment = PROFILE_LIST_FRAGMENT | ||
| administratorControlsActivityPresenter | ||
| .setExtraControlsTitle( | ||
| resourceHandler.getStringInLocale( | ||
| R.string.administrator_controls_activity_profile_view_administrator_edit_profiles | ||
| ) | ||
| ) | ||
| administratorControlsActivityPresenter.loadProfileList() | ||
| } | ||
|
|
@@ -155,7 +157,9 @@ class AdministratorControlsActivity : | |
| lastLoadedFragment = APP_VERSION_FRAGMENT | ||
| administratorControlsActivityPresenter | ||
| .setExtraControlsTitle( | ||
| resourceHandler.getStringInLocale( | ||
| R.string.administrator_controls_activity_app_information_view_app_version | ||
| ) | ||
| ) | ||
| administratorControlsActivityPresenter.loadAppVersion() | ||
| } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -187,7 +187,9 @@ class AdministratorControlsActivityPresenter @Inject constructor( | |
| when (currentFragment) { | ||
| is ProfileEditFragment -> { | ||
| setExtraControlsTitle( | ||
| resourceHandler.getStringInLocale( | ||
| R.string.administrator_controls_activity_profile_view_administrator_edit_profiles | ||
| ) | ||
| ) | ||
| loadProfileList() | ||
| } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -28,11 +28,15 @@ class LogoutDialogFragment : InjectableDialogFragment() { | |
|
|
||
| override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { | ||
| return AlertDialog.Builder(requireContext(), R.style.OppiaAlertDialogTheme) | ||
| .setMessage(R.string.administrator_controls_activity_log_out_dialog_fragment_message) | ||
| .setNegativeButton( | ||
| R.string.administrator_controls_activity_log_out_dialog_fragment_cancel_button | ||
| ) { dialog, _ -> | ||
| dialog.dismiss() | ||
| } | ||
| .setPositiveButton( | ||
| R.string.administrator_controls_activity_log_out_dialog_fragment_okay_button | ||
| ) { _, _ -> | ||
| val intent = ProfileChooserActivity.createProfileChooserActivity(activity!!) | ||
| startActivity(intent) | ||
| }.create() | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -21,11 +21,14 @@ class AppVersionViewModel @Inject constructor( | |
| private val lastUpdateDateTime = context.getLastUpdateTime() | ||
|
|
||
| fun computeVersionNameText(): String = | ||
| resourceHandler.getStringInLocaleWithWrapping( | ||
| R.string.administrator_controls_app_version_activity_app_version_name, versionName | ||
| ) | ||
|
|
||
| fun computeLastUpdatedDateText(): String = | ||
| resourceHandler.getStringInLocaleWithWrapping( | ||
| R.string.administrator_controls_app_version_activity_app_last_update_date, | ||
| getDateTime(lastUpdateDateTime) | ||
| ) | ||
|
|
||
| private fun getDateTime(lastUpdateTime: Long): String = | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -56,7 +56,9 @@ class ChapterNotStartedContainerConstraintLayout @JvmOverloads constructor( | |
| isSpotlit = true | ||
| val spotlightTarget = SpotlightTarget( | ||
| this, | ||
| resourceHandler.getStringInLocale( | ||
| R.string.topic_activity_first_chapter_spotlight_hint | ||
| ), | ||
| feature = Spotlight.FeatureCase.FIRST_CHAPTER | ||
| ) | ||
| if (index == 0) { | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -37,7 +37,9 @@ class PromotedStoryCardView @JvmOverloads constructor( | |
| isSpotlit = true | ||
| val spotlightTarget = SpotlightTarget( | ||
| this, | ||
| resourceHandler.getStringInLocale( | ||
| R.string.home_activity_promoted_story_spotlight_hint | ||
| ), | ||
| feature = Spotlight.FeatureCase.PROMOTED_STORIES | ||
| ) | ||
| checkNotNull(getSpotlightManager()).requestSpotlightViewWithDelayedLayout(spotlightTarget) | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -73,13 +73,15 @@ private static String getTimeAgo(View view, long lastVisitedTimestamp) { | |
| AppLanguageResourceHandler resourceHandler = getResourceHandler(view); | ||
|
|
||
| if (timeStampMillis > currentTimeMillis || timeStampMillis <= 0) { | ||
| return resourceHandler.getStringInLocale( | ||
| R.string.text_view_binding_adapters_activity_last_logged_in_recently); | ||
| } | ||
|
|
||
| long timeDifferenceMillis = currentTimeMillis - timeStampMillis; | ||
|
|
||
| if (timeDifferenceMillis < (int) TimeUnit.MINUTES.toMillis(1)) { | ||
| return resourceHandler.getStringInLocale( | ||
| R.string.text_view_binding_adapters_activity_just_now); | ||
| } else if (timeDifferenceMillis < TimeUnit.MINUTES.toMillis(50)) { | ||
| return getPluralString( | ||
| resourceHandler, | ||
|
|
@@ -93,7 +95,8 @@ private static String getTimeAgo(View view, long lastVisitedTimestamp) { | |
| (int) TimeUnit.MILLISECONDS.toHours(timeDifferenceMillis) | ||
| ); | ||
| } else if (timeDifferenceMillis < TimeUnit.DAYS.toMillis(2)) { | ||
| return resourceHandler.getStringInLocale( | ||
| R.string.text_view_binding_adapters_activity_yesterday); | ||
| } | ||
| return getPluralString( | ||
| resourceHandler, | ||
|
|
@@ -109,7 +112,7 @@ private static String getPluralString( | |
| ) { | ||
| // TODO(#3841): Combine these strings together. | ||
| return resourceHandler.getStringInLocaleWithWrapping( | ||
| R.string.text_view_binding_adapters_activity_time_ago, | ||
| resourceHandler.getQuantityStringInLocaleWithWrapping( | ||
| pluralsResId, count, String.valueOf(count) | ||
| ) | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -65,11 +65,15 @@ class ExitProfileDialogFragment : InjectableDialogFragment() { | |
|
|
||
| val alertDialog = AlertDialog | ||
| .Builder(ContextThemeWrapper(activity as Context, R.style.OppiaAlertDialogTheme)) | ||
| .setMessage(R.string.exit_profile_dialog_fragment_home_activity_back_dialog_message) | ||
| .setNegativeButton( | ||
| R.string.exit_profile_dialog_fragment_home_activity_back_dialog_cancel | ||
| ) { dialog, _ -> | ||
| dialog.dismiss() | ||
| } | ||
| .setPositiveButton( | ||
| R.string.exit_profile_dialog_fragment_home_activity_back_dialog_exit | ||
| ) { _, _ -> | ||
| // TODO(#3641): Investigate on using finish instead of intent. | ||
| val intent = ProfileChooserActivity.createProfileChooserActivity(activity!!) | ||
| if (!restoreLastCheckedItem) { | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -412,8 +412,8 @@ class NavigationDrawerFragmentPresenter @Inject constructor( | |
| fragment.activity, | ||
| drawerLayout, | ||
| toolbar, | ||
| R.string.navigation_drawer_activity_drawer_open_content_description, | ||
| R.string.navigation_drawer_activity_drawer_close_content_description | ||
| ) { | ||
| override fun onDrawerOpened(drawerView: View) { | ||
| super.onDrawerOpened(drawerView) | ||
|
|
@@ -449,8 +449,8 @@ class NavigationDrawerFragmentPresenter @Inject constructor( | |
| fragment.activity, | ||
| drawerLayout, | ||
| toolbar, | ||
| R.string.navigation_drawer_activity_drawer_open_content_description, | ||
| R.string.navigation_drawer_activity_drawer_close_content_description | ||
| ) { | ||
| override fun onDrawerOpened(drawerView: View) { | ||
| super.onDrawerOpened(drawerView) | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -48,7 +48,9 @@ class NavigationDrawerHeaderViewModel @Inject constructor( | |
| resourceHandler.getQuantityStringInLocaleWithWrapping( | ||
| R.plurals.ongoing_topic_count, ongoingTopicCount, ongoingTopicCount.toString() | ||
| ) | ||
| val barSeparator = resourceHandler.getStringInLocale( | ||
| R.string.navigation_drawer_activity_bar_separator | ||
| ) | ||
| return "$completedStoryCountText$barSeparator$ongoingTopicCountText" | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -69,7 +69,7 @@ class HelpActivity : | |
| savedInstanceState?.getInt(THIRD_PARTY_DEPENDENCY_INDEX_SAVED_KEY) ?: 0 | ||
| val selectedLicenseIndex = savedInstanceState?.getInt(LICENSE_INDEX_SAVED_KEY) ?: 0 | ||
| selectedHelpOptionsTitle = savedInstanceState?.getStringFromBundle(HELP_OPTIONS_TITLE_SAVED_KEY) | ||
| ?: resourceHandler.getStringInLocale(R.string.faq_single_activity_title) | ||
| val policiesActivityParams = savedInstanceState?.getProto( | ||
| POLICIES_ARGUMENT_PROTO, | ||
| PoliciesActivityParams.getDefaultInstance() | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -222,7 +222,11 @@ class HelpActivityPresenter @Inject constructor( | |
| } | ||
|
|
||
| private fun selectFAQListFragment() { | ||
| setMultipaneContainerTitle( | ||
| resourceHandler.getStringInLocale( | ||
| R.string.faq_single_activity_title | ||
| ) | ||
| ) | ||
| setMultipaneBackButtonVisibility(View.GONE) | ||
| selectedFragmentTag = FAQ_LIST_FRAGMENT_TAG | ||
| selectedHelpOptionTitle = getMultipaneContainerTitle() | ||
|
|
@@ -337,12 +341,12 @@ class HelpActivityPresenter @Inject constructor( | |
| private fun selectPoliciesFragment(policyPage: PolicyPage) { | ||
| when (policyPage) { | ||
| PolicyPage.PRIVACY_POLICY -> setMultipaneContainerTitle( | ||
| resourceHandler.getStringInLocale(R.string.privacy_policy_activity_title) | ||
| ) | ||
| PolicyPage.TERMS_OF_SERVICE -> setMultipaneContainerTitle( | ||
| resourceHandler.getStringInLocale(R.string.terms_of_service_activity_title) | ||
| ) | ||
| else -> {} | ||
| } | ||
| setMultipaneBackButtonVisibility(View.GONE) | ||
| selectedFragmentTag = POLICIES_FRAGMENT_TAG | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -16,7 +16,9 @@ class HelpItemViewModel( | |
| ) : ObservableViewModel() { | ||
| fun onClick(title: String) { | ||
| when (title) { | ||
| resourceHandler.getStringInLocale( | ||
| R.string.help_activity_frequently_asked_questions_FAQ_text | ||
| ) -> { | ||
| if (isMultipane) { | ||
| val loadFaqListFragmentListener = activity as LoadFaqListFragmentListener | ||
| loadFaqListFragmentListener.loadFaqListFragment() | ||
|
|
@@ -36,10 +38,10 @@ class HelpItemViewModel( | |
| routeToThirdPartyDependencyListListener.onRouteToThirdPartyDependencyList() | ||
| } | ||
| } | ||
| resourceHandler.getStringInLocale(R.string.privacy_policy_activity_title) -> { | ||
| loadPolicyPage(PolicyPage.PRIVACY_POLICY) | ||
| } | ||
| resourceHandler.getStringInLocale(R.string.terms_of_service_activity_title) -> { | ||
| loadPolicyPage(PolicyPage.TERMS_OF_SERVICE) | ||
| } | ||
| } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -19,15 +19,17 @@ class HelpListViewModel @Inject constructor( | |
| private fun getRecyclerViewItemList(): ArrayList<HelpItemViewModel> { | ||
| for (item in HelpItems.values()) { | ||
| val category = when (item) { | ||
| HelpItems.FAQ -> resourceHandler.getStringInLocale( | ||
| R.string.help_activity_frequently_asked_questions_FAQ_text | ||
| ) | ||
| HelpItems.THIRD_PARTY -> resourceHandler.getStringInLocale( | ||
| R.string.third_party_dependency_list_activity_title | ||
| ) | ||
| HelpItems.PRIVACY_POLICY -> resourceHandler.getStringInLocale( | ||
| R.string.privacy_policy_activity_title | ||
| ) | ||
| HelpItems.TERMS_OF_SERVICE -> resourceHandler.getStringInLocale( | ||
| R.string.terms_of_service_activity_title | ||
| ) | ||
| } | ||
| arrayList += HelpItemViewModel( | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -87,7 +87,7 @@ class HintsAndSolutionDialogFragmentPresenter @Inject constructor( | |
| this.isSolutionRevealed = isSolutionRevealed | ||
| binding.hintsAndSolutionToolbar.setNavigationIcon(R.drawable.ic_close_white_24dp) | ||
| binding.hintsAndSolutionToolbar.setNavigationContentDescription( | ||
| R.string.hint_and_solution_activity_close_icon_description | ||
| ) | ||
| binding.hintsAndSolutionToolbar.setNavigationOnClickListener { | ||
| (fragment.requireActivity() as? HintsAndSolutionListener)?.dismiss() | ||
|
|
@@ -285,7 +285,7 @@ class HintsAndSolutionDialogFragmentPresenter @Inject constructor( | |
| if (solutionViewModel.correctAnswer.get().isNullOrEmpty()) { | ||
| binding.solutionCorrectAnswer.text = | ||
| resourceHandler.getStringInLocaleWithoutWrapping( | ||
| R.string.hint_and_solution_activity_hints_android_solution_correct_answer, | ||
| solutionViewModel.numerator.get().toString(), | ||
| solutionViewModel.denominator.get().toString() | ||
| ) | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The label should be for the activity and not title.