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

Fix #2825: Added label for profile rename activity #2928

Closed
wants to merge 9 commits into from
Closed

Fix #2825: Added label for profile rename activity #2928

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
2b40d74
added label for profile rename activity
justdvnsh Mar 16, 2021
14ae620
Improved Code Formatting and Fixed the failing CI test
justdvnsh Mar 16, 2021
e1b4fff
changed the activity title string label and changed all instances of …
justdvnsh Mar 17, 2021
287c32f
changed the context to application context
justdvnsh Mar 17, 2021
69da742
fixed the failing CI test
justdvnsh Mar 17, 2021
a325d23
removed title from ProfileRenameActivityPresenter since it was not ne…
justdvnsh Mar 19, 2021
613d489
modified code formatting
justdvnsh Mar 19, 2021
0c9f893
added comment for readbility
justdvnsh Mar 21, 2021
30dd002
added comment for better redability of code
justdvnsh Mar 24, 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
1 change: 1 addition & 0 deletions app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@
android:theme="@style/OppiaThemeWithoutActionBar" />
<activity
android:name=".app.settings.profile.ProfileRenameActivity"
android:label="@string/profile_rename_activity_title"
android:theme="@style/OppiaThemeWithoutActionBar" />
<activity
rt4914 marked this conversation as resolved.
Show resolved Hide resolved
android:name=".app.settings.profile.ProfileResetPinActivity"
Expand Down
1 change: 0 additions & 1 deletion app/src/main/java/org/oppia/android/app/settings/profile/ProfileRenameActivityPresenter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ class ProfileRenameActivityPresenter @Inject constructor(
}

fun handleOnCreate() {
activity.title = activity.getString(R.string.profile_rename_title)
activity.supportActionBar?.setDisplayHomeAsUpEnabled(true)
activity.supportActionBar?.setHomeAsUpIndicator(R.drawable.ic_arrow_back_white_24dp)

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout-land/profile_rename_activity.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
android:minHeight="?attr/actionBarSize"
app:navigationContentDescription="@string/navigate_up"
app:navigationIcon="?attr/homeAsUpIndicator"
app:title="@string/profile_rename_title"
app:title="@string/profile_rename_activity_title"
app:titleTextAppearance="@style/ToolbarTextAppearance"
app:titleTextColor="@color/white" />
</com.google.android.material.appbar.AppBarLayout>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/profile_rename_activity.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
android:minHeight="?attr/actionBarSize"
app:navigationContentDescription="@string/navigate_up"
app:navigationIcon="?attr/homeAsUpIndicator"
app:title="@string/profile_rename_title"
app:title="@string/profile_rename_activity_title"
app:titleTextAppearance="@style/ToolbarTextAppearance"
app:titleTextColor="@color/white" />
</com.google.android.material.appbar.AppBarLayout>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@
<string name="profile_picture_edit_alert_dialog_view_profile_picture">View Profile Picture</string>
<string name="profile_picture_edit_alert_dialog_choose_from_library">Choose From Library</string>
<!-- ProfileRenameActivity -->
<string name="profile_rename_title">Rename Profile</string>
<string name="profile_rename_activity_title">Rename Profile</string>
<string name="profile_rename_label">New Name</string>
<string name="profile_rename_save">save</string>
<!-- ProfileResetPinActivity -->
Expand Down
Loading