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

Fixes #2785 & Fixes part of #2743: A11y activity label added #2783

Closed
wants to merge 8 commits into from
Closed

Fixes #2785 & Fixes part of #2743: A11y activity label added #2783

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d9ceb1e
A11y activity label added
Feb 25, 2021
7d56f41
Nit fix
Feb 25, 2021
91e8f4e
Nit renaming changes
Feb 25, 2021
4c253d0
Used ActivityScenerioRule
Feb 25, 2021
020760e
Nit fix
Feb 25, 2021
8bdd90d
Optimised test cases
Feb 25, 2021
9d77057
Proof for config change test case
Feb 26, 2021
d9fd298
Proof that pre-setup works in tests
Feb 26, 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
4 changes: 3 additions & 1 deletion app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,11 @@
<meta-data android:name="expiration_date" android:value="2020-09-01" />
<activity
android:name=".app.administratorcontrols.AdministratorControlsActivity"
android:label="@string/administrator_controls_activity_title"
android:theme="@style/OppiaThemeWithoutActionBar" />
<activity
android:name=".app.administratorcontrols.appversion.AppVersionActivity"
android:label="@string/app_version_activity_title"
android:theme="@style/OppiaThemeWithoutActionBar" />
<activity
android:name=".app.completedstorylist.CompletedStoryListActivity"
Expand Down Expand Up @@ -84,7 +86,7 @@
android:windowSoftInputMode="adjustResize" />
<activity
android:name=".app.profile.ProfileChooserActivity"
android:label="@string/profile_chooser_activity_label"
android:label="@string/profile_chooser_activity_title"
Copy link
Member

Choose a reason for hiding this comment

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

Similar to earlier PR: here & elsewhere, should these be synced to each activity's title?

android:theme="@style/OppiaThemeWithoutActionBar" />
<activity
android:name=".app.profileprogress.ProfilePictureActivity"
Expand Down
1 change: 0 additions & 1 deletion ...rc/main/java/org/oppia/android/app/administratorcontrols/AdministratorControlsActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ class AdministratorControlsActivity :
PROFILE_LIST_FRAGMENT
}
administratorControlsActivityPresenter.handleOnCreate(extraControlsTitle, lastLoadedFragment)
title = getString(R.string.administrator_controls)
}

override fun onCreateOptionsMenu(menu: Menu?): Boolean {
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/layout-land/app_version_activity.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".administratorcontrols.appversion.AppVersionActivity">
tools:context=".app.administratorcontrols.appversion.AppVersionActivity">

<com.google.android.material.appbar.AppBarLayout
android:id="@+id/app_version_app_bar_layout"
Expand All @@ -23,7 +23,7 @@
app:navigationContentDescription="@string/navigate_up"
app:navigationIcon="?attr/homeAsUpIndicator"
app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
app:title="@string/administrator_controls_app_version"
app:title="@string/app_version_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/app_version_activity.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
app:navigationContentDescription="@string/navigate_up"
app:navigationIcon="?attr/homeAsUpIndicator"
app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
app:title="@string/administrator_controls_app_version"
app:title="@string/app_version_activity_title"
app:titleTextAppearance="@style/ToolbarTextAppearance"
app:titleTextColor="@color/white" />
</com.google.android.material.appbar.AppBarLayout>
Expand Down
4 changes: 3 additions & 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 @@ -8,6 +8,7 @@
<string name="menu_help">Help</string>
<string name="menu_switch_profile">Switch Profile</string>
<string name="administrator_controls">Administrator Controls</string>
<string name="administrator_controls_activity_title">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="welcome_text">Welcome to Oppia!</string>
Expand Down Expand Up @@ -187,7 +188,7 @@
</plurals>
<string name="bar_separator">\u0020|\u0020</string>
<!-- ProfileChooserFragment -->
<string name="profile_chooser_activity_label">Profile selection page</string>
<string name="profile_chooser_activity_title">Profile selection page</string>
<string name="profile_chooser_admin">Administrator</string>
<string name="profile_chooser_select">Select your profile</string>
<string name="profile_chooser_add">Add Profile</string>
Expand Down Expand Up @@ -329,6 +330,7 @@
<string name="log_out_dialog_okay_button">Ok</string>
<string name="log_out_dialog_message">Are you sure you want to log out of your profile?</string>
<!-- AppVersionFragment -->
<string name="app_version_activity_title">App Version</string>
<string name="app_version_name">App Version %s</string>
<string name="app_last_update_date">The last update was installed on %s. Use the above version number to send feedback about bugs.</string>
<!-- OptionsActivity -->
Expand Down
Loading