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 #4030 : Updated colors in admin_controls_*.xml files #4168

Merged
merged 58 commits into from
Feb 9, 2022
Merged

Fix part of #4030 : Updated colors in admin_controls_*.xml files #4168

merged 58 commits into from
Feb 9, 2022

Conversation

ayush0402
Copy link
Contributor

Explanation

Fixes part of #4030
Updated sub heading background and view divider colors in admin_controls_*.xml files to updated convention for colors.

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).

For UI-specific PRs only

If your PR includes UI-related changes, then:

  • Add screenshots for portrait/landscape for both a tablet & phone of the before & after UI changes
  • For the screenshots above, include both English and pseudo-localized (RTL) screenshots (see RTL guide)
  • Add a video showing the full UX flow with a screen reader enabled (see accessibility guide)
  • Add a screenshot demonstrating that you ran affected Espresso tests locally & that they're passing

@ayush0402
updated till line 10
73da027
@ayush0402
line 16
c6f6b03
@ayush0402
updated till line 42
b3d5bd7
@ayush0402
...
06f2fdb
@ayush0402
done
a495c8d
@ayush0402
fixed unresolved reference for highlighterDeveloperOptionsNavMenuItem
2915545
@ayush0402
highlightedNavMenuItem
fc039f3
@ayush0402
renamed colors.xml to color_defs.xml
a2e68a7
@ayush0402
added basic colors
66355e1
@ayush0402
resolving merge conflict
66d1751
@ayush0402
Merge branch 'develop' of github.com:oppia/oppia-android into dark_mo…
92b0b9f 
…de_files
@ayush0402
resolved merge conflict
fe2c933
@ayush0402
working on add profile activity
0796aa0
@ayush0402
using style/TextInputLayout to change boxBackground
2fcea15
@ayush0402
updated color for edit text cursor
3eabd8a
@ayush0402
added color under toolbar and removing generic colors from component_…
9949e58 
…color.xml
@ayush0402
fixed namings of new colors in color_defs.xml
85118b8
@ayush0402
renamed oppia_heading_text_color
280410e
@ayush0402
fixing color naming in component_colors.xml and color_palette.xml
5f0e075
@ayush0402
fixing naming in component_colors.xml and color_palette.xml
a95744f
@ayush0402
fixing naming in component_colors.xml and color_palette.xml
f3b9b6f
@ayush0402
fixed namings in component_colors.xml and color_palette.xml
7aacfb7
@ayush0402
Merge branch 'develop' of github.com:oppia/oppia-android into dark_mo…
4e2f555 
…de_files

� Conflicts:
�	app/src/main/res/layout/add_profile_activity.xml
@ayush0402
resolved merge conflict
f3adc08
@ayush0402
admin_auth_activity
933a4aa
@ayush0402
working on admin_pin_activity
cb87241
@ayush0402
fixed color for TextInputLayout
3d6089b
@ayush0402
changed administrator_controls
1402637
@ayush0402
changed statusBar color
4c4bccf
@ayush0402
fixed action bar color in OppiaTheme
0be1418
@ayush0402
made requested changes
b31d4ab
@ayush0402
replaced label_text_color with more specific component colors
f304083
@ayush0402
restructuring component_colors restricting colors to their activities…
3c5b9df 
…/views
@ayush0402
renamed colors in component_colors.xml
bb69e62
@ayush0402
fixed toolbar and statusbar colors in component_colors.xml
eb86a1b
@ayush0402
renamed newly added colors in color_defs
85a1ee8
@ayush0402
introduced colors_migrating.xml
fbce432
@ayush0402
shifted accessible grey to colors_migrating.xml
4efa794
@ayush0402
reverted last commit
48d2b0d
@ayush0402
Merge branch 'develop' of github.com:oppia/oppia-android into dark_mo…
08ca2b8 
…de_files
@ayush0402
Added comment for colors_migrating.xml
804c9b4
@ayush0402
added myself as CODEOWNER of colors_migrating.xml
7fabf1d
@ayush0402
requested nit changes
2a128c8
@ayush0402
renamed admin_highlighted in admin_controls
a350849
@ayush0402
added shared_ prefix to name of shared component_colors
da3248e
@ayush0402
renamed component_colors
ca02c76
@ayush0402
nit changes
9a37b45
@ayush0402
Merge branch 'develop' of github.com:oppia/oppia-android into dark_mo…
90fd881 
…de_files
@ayush0402
nit changes
d42862f
@ayush0402
used color_defs for color_palette instead of colors_migrating
40ab0c1
@ayush0402
added TODO in colors_migrating.xml
507276f
@ayush0402
removed direct references to color_defs from component_colors.xml for…
2f35817 
… static colors
@ayush0402
Merge branch 'develop' of github.com:oppia/oppia-android into dark_mo…
7935be2 
…de_files
@ayush0402
updated colors in admin_controls_*.xml files
be479a9
@ayush0402
Copy link
Contributor Author

@rt4914 please merge these updates in continuation of #4032. Thanks.

rt4914
rt4914 approved these changes Feb 9, 2022
View reviewed changes
Copy link
Contributor

@rt4914 rt4914 left a comment

Choose a reason for hiding this comment

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

LGTM, thanks.

@rt4914 rt4914 merged commit d8644b0 into oppia:develop Feb 9, 2022
@ayush0402 ayush0402 deleted the dark_mode_files branch February 10, 2022 14:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rt4914 rt4914 rt4914 approved these changes

Assignees

@rt4914 rt4914

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@ayush0402 @rt4914