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.

Sign up for GitHub

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

Jump to bottom

Fix part of #3602 Added label for HomeActivity #3850

Merged
merged 22 commits into from
Nov 17, 2021
Merged

Fix part of #3602 Added label for HomeActivity #3850

Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
0a445ba
Label added for HomeActivity
vrajdesai78 Sep 27, 2021
edcbefb
HomeActivity removed from label exemptions
vrajdesai78 Sep 28, 2021
820c1bd
Removed translatable=false
vrajdesai78 Sep 29, 2021
ea83bd0
Test created for HomeActivity
vrajdesai78 Sep 29, 2021
dc92bc2
Merge branch 'add-label-for-homeactivity' of https://github.com/vrajd…
vrajdesai78 Sep 29, 2021
53bbb7a
Merge branch 'develop' into add-label-for-homeactivity
vrajdesai78 Sep 29, 2021
69adfff
removed summary value
vrajdesai78 Oct 12, 2021
9a9cdd6
Update deploymentTargetDropDown.xml
vrajdesai78 Oct 19, 2021
abcd039
Update deploymentTargetDropDown.xml
vrajdesai78 Oct 19, 2021
f304f1d
Updated testcase
vrajdesai78 Oct 19, 2021
9e580fd
Updated strings.xml
vrajdesai78 Oct 26, 2021
445304d
Delete deploymentTargetDropDown.xml
vrajdesai78 Nov 1, 2021
05a3e52
ActivityTestRule removed
vrajdesai78 Nov 1, 2021
dd5c371
Merge branch 'add-label-for-homeactivity' of https://github.com/vrajd…
vrajdesai78 Nov 1, 2021
7da2231
multiple home string removed
vrajdesai78 Nov 11, 2021
825695e
.idea/runConfigurations.xml file reverted back
vrajdesai78 Nov 12, 2021
1b7ea3e
Removed unused imports
vrajdesai78 Nov 12, 2021
af264b5
reformated code
vrajdesai78 Nov 12, 2021
08b7ae1
Fixed unnecessary changes
vrajdesai78 Nov 13, 2021
680c4e2
String.xml updated
vrajdesai78 Nov 13, 2021
3385770
removed changes from strings.xml
vrajdesai78 Nov 13, 2021
d113c5b
strings.xml updated removed unncessary changes
vrajdesai78 Nov 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Updated strings.xml
  • Loading branch information
@vrajdesai78
vrajdesai78 committed Oct 26, 2021
commit 9e580fd680192832851055845c08133879cba88e
24 changes: 12 additions & 12 deletions app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="nav_header_desc">Navigation header</string>
<string name="menu_home">Home</string>
<string name="menu_options">Options</string>
<string name="menu_my_downloads">My Downloads</string>
<string name="menu_help">Help</string>

<string name="exploration_activity_title">Exploration Player</string>
<string name="help_activity_title">Help</string>
<string name="menu_switch_profile">Switch Profile</string>
<string name="developer_options">Developer Options</string>
<string name="administrator_controls">Administrator Controls</string>
<string name="drawer_open_content_description">Navigation Menu Open</string>
<string name="drawer_close_content_description">Navigation Menu Close</string>
<string name="audio_play_description">Play audio</string>
<string name="audio_pause_description">Pause audio</string>
<string name="audio_language_select_dialog_okay_button">OK</string>
Expand Down Expand Up @@ -289,12 +281,20 @@
<string name="my_downloads">My Downloads</string>
<string name="tab_downloads">Downloads</string>
<string name="tab_updates">Updates (2)</string>
<!-- HomeActivityBackDialog -->
<!-- HomeActivity -->
<string name="home_activity_title">Home</string>
<string name="home_activity_back_dialog_message">Would you like to exit your profile?</string>
<string name="home_activity_back_dialog_cancel">Cancel</string>
<string name="home_activity_back_dialog_exit">Exit</string>
<!-- HomeActivity -->
<string name="home_activity_title">Home</string>
<string name="nav_header_desc">Navigation header</string>
<string name="menu_home">Home</string>
Copy link
Contributor

Choose a reason for hiding this comment

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

Remove this and other Home related strings and keep only one string home_activity_title and use it everywhere.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Can you please elaborate more. Will I have to remove all the strings which I have put inside HomeActivity and if yes then what else I need to do ?

Copy link
Contributor

Choose a reason for hiding this comment

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

No, you just need to remove all those strings whose value is equal to Home. For example you can keep home_activity_title and remove menu_home and wherever menu_home was getting used earlier you can use home_activity_title instead.
Similarly if you find any other string whose value is Home do the same steps for that too.

@vrajdesai78

<string name="menu_options">Options</string>
<string name="menu_my_downloads">My Downloads</string>
<string name="menu_help">Help</string>
<string name="menu_switch_profile">Switch Profile</string>
<string name="developer_options">Developer Options</string>
<string name="drawer_open_content_description">Navigation Menu Open</string>
<string name="drawer_close_content_description">Navigation Menu Close</string>
<!-- ProfileListActivity -->
<string name="profile_list_activity_title">Profiles</string>
<!-- ProfileEditActivity -->
Expand Down