Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #3384 : Arrange strings file #5252

Closed
wants to merge 17 commits into from
Closed

Fix #3384 : Arrange strings file #5252

wants to merge 17 commits into from

Conversation

MohitGupta121
Copy link
Member

Explanation

Fix #3384 : Arrange strings file as per below criteria:

Screen/Toolbar Titles
Used in manifest label, toolbar title and activity label test.
Pattern: activity_name_activity_title

Example: administrator_controls_activty_title

App Content Strings
Pattern: activity_name_view_component_type

administrator_controls_activity_profile_management_label
administrator_controls_activity_account_actions_label
administrator_controls_activity_logout_item_text
administrator_controls_activity_app_version_item

Shared Strings
Pattern: view_component_description

reading_text_size_item_text_small
reading_text_size_item_medium

Test Strings
Pattern: test_file_name_view_component_type

Dialogs
Pattern: dialog_name_view_component_type

Grouping Pattern:

<!-- AdministratorControlActivity -->
….
….
<!-- GeneralAvailabilityUpgradeNoticeDialogFragment -->
…..
<!-- ProgressDatabaseFullDialog -->

Essential Checklist

  • The PR title and explanation each start with "Fix #bugnum: " (If this PR fixes part of an issue, prefix the title with "Fix part of #bugnum: ...".)
  • Any changes to scripts/assets files have their rationale included in the PR explanation.
  • The PR follows the style guide.
  • The PR does not contain any unnecessary code changes from Android Studio (reference).
  • The PR is made from a branch that's not called "develop" and is up-to-date with "develop".
  • The PR is assigned to the appropriate reviewers (reference).

Copy link
Member Author

@MohitGupta121 MohitGupta121 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@adhiamboperes PTAL, I updated this PR as we discussed along with the review suggestions from last #5236 (review) review comments. You should contiune the review from those comment.

Copy link
Collaborator

@adhiamboperes adhiamboperes left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @MohitGupta121, I took a pass, the previous comments have been sufficiently adressed. I just had a couple more.

Please fix the merge conflicts as well.

app/src/main/res/values/strings.xml Outdated Show resolved Hide resolved
app/src/main/res/values/strings.xml Outdated Show resolved Hide resolved
@MohitGupta121 MohitGupta121 removed the stale Corresponds to items that haven't seen a recent update and may be automatically closed. label Dec 22, 2023
Copy link

oppiabot bot commented Dec 29, 2023

Hi @MohitGupta121, I'm going to mark this PR as stale because it hasn't had any updates for 7 days. If no further activity occurs within 7 days, it will be automatically closed so that others can take up the issue.
If you are still working on this PR, please make a follow-up commit within 3 days (and submit it for review, if applicable). Please also let us know if you are stuck so we can help you!

@oppiabot oppiabot bot added the stale Corresponds to items that haven't seen a recent update and may be automatically closed. label Dec 29, 2023
@MohitGupta121 MohitGupta121 removed the stale Corresponds to items that haven't seen a recent update and may be automatically closed. label Dec 29, 2023
Copy link

oppiabot bot commented Jan 5, 2024

Hi @MohitGupta121, I'm going to mark this PR as stale because it hasn't had any updates for 7 days. If no further activity occurs within 7 days, it will be automatically closed so that others can take up the issue.
If you are still working on this PR, please make a follow-up commit within 3 days (and submit it for review, if applicable). Please also let us know if you are stuck so we can help you!

@oppiabot oppiabot bot added the stale Corresponds to items that haven't seen a recent update and may be automatically closed. label Jan 5, 2024
@MohitGupta121 MohitGupta121 removed the stale Corresponds to items that haven't seen a recent update and may be automatically closed. label Jan 6, 2024
Copy link

oppiabot bot commented Jan 13, 2024

Hi @MohitGupta121, I'm going to mark this PR as stale because it hasn't had any updates for 7 days. If no further activity occurs within 7 days, it will be automatically closed so that others can take up the issue.
If you are still working on this PR, please make a follow-up commit within 3 days (and submit it for review, if applicable). Please also let us know if you are stuck so we can help you!

@oppiabot oppiabot bot added the stale Corresponds to items that haven't seen a recent update and may be automatically closed. label Jan 13, 2024
@oppiabot oppiabot bot closed this Jan 20, 2024
@MohitGupta121 MohitGupta121 removed the stale Corresponds to items that haven't seen a recent update and may be automatically closed. label Jan 23, 2024
@MohitGupta121
Copy link
Member Author

@adhiamboperes @BenHenning could you please reopen this PR and pass your final review @BenHenning

Copy link

oppiabot bot commented Feb 21, 2024

Hi @MohitGupta121, I'm going to mark this PR as stale because it hasn't had any updates for 7 days. If no further activity occurs within 7 days, it will be automatically closed so that others can take up the issue.
If you are still working on this PR, please make a follow-up commit within 3 days (and submit it for review, if applicable). Please also let us know if you are stuck so we can help you!

@oppiabot oppiabot bot added the stale Corresponds to items that haven't seen a recent update and may be automatically closed. label Feb 21, 2024
@MohitGupta121 MohitGupta121 removed the stale Corresponds to items that haven't seen a recent update and may be automatically closed. label Feb 26, 2024
Copy link

oppiabot bot commented Mar 4, 2024

Hi @MohitGupta121, I'm going to mark this PR as stale because it hasn't had any updates for 7 days. If no further activity occurs within 7 days, it will be automatically closed so that others can take up the issue.
If you are still working on this PR, please make a follow-up commit within 3 days (and submit it for review, if applicable). Please also let us know if you are stuck so we can help you!

@oppiabot oppiabot bot added the stale Corresponds to items that haven't seen a recent update and may be automatically closed. label Mar 4, 2024
@adhiamboperes adhiamboperes removed the stale Corresponds to items that haven't seen a recent update and may be automatically closed. label Mar 8, 2024
@adhiamboperes
Copy link
Collaborator

@MohitGupta121, could you please resolve the conflics here?

@XichengSpencer, PTAL for a review pass.

<string name="walkthrough_activity_pick_different_topic_text">Pick a \ndifferent topic.</string>
<string name="walkthrough_activity_are_you_interested_text">Are you interested in:\n%s?</string>
<string name="walkthrough_activity_back_button_text">Back Button</string>
<!-- GeneralStrings -->
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

String in this section maybe needs a bit of alphabetical arrangement

Copy link

oppiabot bot commented Mar 19, 2024

Hi @MohitGupta121, I'm going to mark this PR as stale because it hasn't had any updates for 7 days. If no further activity occurs within 7 days, it will be automatically closed so that others can take up the issue.
If you are still working on this PR, please make a follow-up commit within 3 days (and submit it for review, if applicable). Please also let us know if you are stuck so we can help you!

@oppiabot oppiabot bot added the stale Corresponds to items that haven't seen a recent update and may be automatically closed. label Mar 19, 2024
@oppiabot oppiabot bot closed this Mar 26, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
stale Corresponds to items that haven't seen a recent update and may be automatically closed.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Arrange string resources based on screens
4 participants