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 part of #3602: Add label for all non-test activities for Profile Edit Activity #4783

Closed
wants to merge 33 commits into from
Closed
Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
783b29b
added label to profile edit activity
deonwaju Dec 8, 2022
3832b7d
added label to profile edit activity
deonwaju Dec 9, 2022
ac21080
added label to profile edit activity
deonwaju Dec 9, 2022
7efd9bb
added label to profile edit activity
deonwaju Dec 9, 2022
5e2f6b6
Merge branch 'develop' into add-label-to-profile-edit-activity
deonwaju Dec 9, 2022
40d5aca
added changes from review
deonwaju Dec 9, 2022
f9a06dd
Merge remote-tracking branch 'origin/add-label-to-profile-edit-activi…
deonwaju Dec 9, 2022
06acd7c
removed model/build.gradle from being tracked
deonwaju Dec 10, 2022
3918851
removed .gitignore from being tracked
deonwaju Dec 10, 2022
f24589c
added back .gitignore and model/build.gradle files i untracked, after…
deonwaju Dec 10, 2022
b7ea5e5
removed strings in other languages except english, added test like in…
deonwaju Dec 13, 2022
6a9f3fa
removed strings in other languages except english, added test like in…
deonwaju Dec 13, 2022
433c4e6
Fixes #4712: Ensure CoordinatorLayout Behaviors are not renamed/remov…
BenHenning Nov 17, 2022
0483a72
Localisation updates from https://translatewiki.net. (#4733)
translatewiki Nov 17, 2022
7634f1e
Fix #4645: "Continue Studying" texts keeps showing even when there is…
JishnuGoyal Nov 17, 2022
e7d5fcb
Fix #4709: Revert "Fix #2581: Marquee auto restart issue (#4392)" (#4…
BenHenning Nov 18, 2022
ff10c4f
Update version codes to prepare for RC02 of Beta MR2 (#4745)
BenHenning Nov 18, 2022
b1e1bcc
Fix #4746: Update app to target SDK 31 (#4747)
BenHenning Nov 19, 2022
b5f3ab3
Fix #4445: Add scaling animation for Continue button (#4568)
JishnuGoyal Nov 19, 2022
62fb0e3
Localisation updates from https://translatewiki.net. (#4753)
translatewiki Nov 21, 2022
3896d85
Fix #2546: Rename OngoingStory to PromotedStory (#4704)
adhiamboperes Nov 21, 2022
fa39d88
fixed merge conflict
deonwaju Jan 9, 2023
d54fe33
Fix #4750: Fixes SDK 31 support (#4752)
BenHenning Nov 23, 2022
1b9bb14
Fix #4756: Add support for logging an invested engagement event (#4757)
BenHenning Nov 23, 2022
5d789ee
Fix #4764: Spotlight overlays have some UI issues (#4763)
JishnuGoyal Nov 27, 2022
6f8757a
Localisation updates from https://translatewiki.net. (#4761)
translatewiki Nov 29, 2022
df1cf78
Fixed Hints & Solution and Concept Card Dark Mode (#4779)
MohitGupta121 Dec 6, 2022
cbb4606
Fix #4775: SpotlightFragmentTest is very flaky (#4780)
JishnuGoyal Dec 9, 2022
27801bc
removed model/build.gradle from being tracked
deonwaju Dec 10, 2022
99905f4
removed .gitignore from being tracked
deonwaju Dec 10, 2022
db2f602
added back .gitignore and model/build.gradle files i untracked, after…
deonwaju Dec 10, 2022
83cf1e5
removed strings in other languages except english, added test like in…
deonwaju Dec 13, 2022
1c96913
Merge branch 'add-label-to-profile-edit-activity' of https://github.c…
deonwaju Jan 9, 2023
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ domain/build
model/build
testing/build
utility/build
model/build.gradle
rt4914 marked this conversation as resolved.
Show resolved Hide resolved
.DS_Store
/build
/captures
Expand Down
1 change: 1 addition & 0 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,7 @@
android:theme="@style/OppiaThemeWithoutActionBar" />
<activity
android:name=".app.settings.profile.ProfileEditActivity"
android:label="@string/profile_edit_activity_title"
android:theme="@style/OppiaThemeWithoutActionBar" />
<activity
android:name=".app.settings.profile.ProfileListActivity"
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values-ar/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -523,4 +523,5 @@
<string name="profile_edit_fragment_test_activity_label">نشاط اختبار جزء تحرير ملف التعريف</string>
<string name="administrator_controls_fragment_test_activity_label">يتحكم المسؤول في نشاط اختبار التجزئة</string>
<string name="revision_navigation_cards_header">أكمل دراستك</string>
<string name="profile_edit_activity_title">"تحرير ملف التعريف"</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 string. It will get added by other team. We(developers) only add strings for english language.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Done @rt4914

</resources>
2 changes: 2 additions & 0 deletions app/src/main/res/values-pt-rBR/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -488,4 +488,6 @@
<string name="faq_answer_9">&lt;p&gt;Se você não consegue encontrar sua pergunta ou gostaria de relatar um problema, entre em contato conosco em [email protected].&lt;/p&gt;</string>
<string name="profile_edit_fragment_test_activity_label">Atividade de Teste de Fragmento de Edição de Perfil</string>
<string name="administrator_controls_fragment_test_activity_label">Controle Administrativo da Atividade de Teste de Fragmento</string>
<string name="select_a_topic_to_start">Selecione um Tópico para começar</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 string. It will get added by other team. We(developers) only add strings for english language.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Done @rt4914

Copy link
Contributor

Choose a reason for hiding this comment

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

Please remove this string too select_a_topic_to_start

<string name="profile_edit_activity_title">"Editar perfil"</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 string. It will get added by other team. We(developers) only add strings for english language.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Done @rt4914

</resources>
1 change: 1 addition & 0 deletions app/src/main/res/values-sw/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -442,4 +442,5 @@
<string name="faq_answer_6" fuzzy="true">&lt;p&gt;Ikiwa Kicheza Ugunduzi hakipakii&lt;/p&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;Angalia kama programu imesasishwa:&lt;/p&gt;&lt;p&gt; &lt;ol&gt; &lt;li &gt; Nenda kwenye Hifadhi ya Michezo na uhakikishe kuwa programu imesasishwa hadi toleo lake jipya zaidi &lt;/li&gt; &lt;/ol&gt; &lt;/p&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;Angalia muunganisho wako wa mtandao:&lt;/p &gt;&lt;p&gt; &lt;li&gt; Ikiwa muunganisho wako wa mtandao ni wa polepole, jaribu kuunganisha tena kwenye mtandao wako wa Wi-Fi au unganisha kwenye mtandao tofauti. &lt;/li&gt; &lt;/p&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;Uliza Msimamizi aangalie kifaa chake na muunganisho wa mtandao:&lt;/p&gt;&lt;p&gt; &lt;li&gt; Pata Msimamizi kusuluhisha kwa kutumia hatua hapo juu &lt;/li&gt; &lt;/p&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;Tujulishe ikiwa bado una matatizo ya upakiaji:&lt;/p&gt;&lt;p&gt; &lt;li&gt; Ripoti tatizo kwa kuwasiliana nasi kwa [email protected]. &lt;/li&gt; &lt;/p&gt;</string>
<string name="faq_answer_7" fuzzy="true">&lt;p&gt;Ikiwa sauti yako haichezi&lt;/p&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;Angalia ili kuona kama programu imesasishwa:&lt;/p&gt;&lt;p&gt; &lt;li&gt; Nenda kwenye Hifadhi ya Michezo na uhakikishe kuwa programu imesasishwa hadi toleo lake jipya zaidi &lt;/li&gt; &lt;/p&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;Angalia muunganisho wako wa mtandao:&lt;/p&gt;&lt;p&gt; &lt;li&gt; Iwapo muunganisho wako wa mtandao ni wa polepole, jaribu kuunganisha tena kwenye mtandao wako wa Wi-Fi au unganisha kwenye mtandao tofauti. Mtandao wa polepole unaweza kusababisha sauti kupakia kwa njia isiyo ya kawaida, na kuifanya iwe vigumu kucheza. &lt;/li&gt; &lt;/p&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;Uliza Msimamizi aangalie kifaa chake na muunganisho wa mtandao:&lt;/p&gt;&lt;p&gt; &lt;li&gt; Wasiliana na Msimamizi ili asuluhishe kwa kutumia hatua hapo juu&lt;/li&gt; &lt;/p&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;Tujulishe ikiwa bado una matatizo ya upakiaji:&lt;/p&gt;&lt;p&gt; &lt;li&gt; Ripoti tatizo kwa kuwasiliana nasi kwa [email protected]. &lt;/li&gt;&lt;/p&gt;</string>
<string name="faq_answer_9">&lt;p&gt;Ikiwa huwezi kupata swali lako au ungependa kuripoti hitilafu, wasiliana nasi kwa [email protected].&lt;/p&gt;</string>
<string name="profile_edit_activity_title">"Hariri Wasifu"</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 string. It will get added by other team. We(developers) only add strings for english language.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Done @rt4914

</resources>
1 change: 1 addition & 0 deletions app/src/main/res/values/strings.xml
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -583,5 +583,6 @@
<string name="profile_edit_fragment_test_activity_label">Profile Edit Fragment Test Activity</string>
<string name="administrator_controls_fragment_test_activity_label">Administrator Controls Fragment Test Activity</string>
<string name="revision_navigation_cards_header">Continue Studying</string>
<string name="profile_edit_activity_title">Profile Edit</string>
<string name="state_fragment_hint_bar_forced_announcement_text">Go to the bottom of the screen for a hint.</string>
</resources>