Skip to content

Commit

Permalink
Change Theme & Color throughout the App
Browse files Browse the repository at this point in the history
- LEARNER-8024
- Update color scheme throughout the app according to the new color paragon
- Replace worldmap image on sign-in
- Generate new Screenshots for screenshot test cases
  • Loading branch information
farhan-arshad-dev committed Dec 7, 2020
1 parent fa03a8e commit 3afc0d6
Show file tree
Hide file tree
Showing 177 changed files with 622 additions and 664 deletions.
2 changes: 1 addition & 1 deletion OpenEdXMobile/AndroidManifest.xml
Expand Up @@ -375,7 +375,7 @@
<!-- Set color used with incoming notification messages. -->
<meta-data
android:name="com.google.firebase.messaging.default_notification_color"
android:resource="@color/edx_brand_primary_accent" />
android:resource="@color/accentAColor" />
<meta-data
android:name="firebase_performance_logcat_enabled"
android:value="true" />
Expand Down
4 changes: 2 additions & 2 deletions OpenEdXMobile/res/color/dialog_button_selector.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="true" android:color="@color/edx_brand_primary_accent" />
<item android:state_enabled="false" android:color="@color/edx_brand_gray_accent" />
<item android:state_enabled="true" android:color="@color/primaryBaseColor" />
<item android:state_enabled="false" android:color="@color/primaryXLightColor" />
</selector>
4 changes: 2 additions & 2 deletions OpenEdXMobile/res/color/disableable_button_text.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="true" android:color="@color/edx_brand_primary_base" />
<item android:color="@color/edx_brand_gray_accent" />
<item android:state_enabled="true" android:color="@color/primaryBaseColor" />
<item android:color="@color/primaryBaseColor_30" />
</selector>
2 changes: 1 addition & 1 deletion OpenEdXMobile/res/color/edx_brand_button_text.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="true" android:color="@color/white" />
<item android:color="@color/edx_brand_gray_back" />
<item android:color="@color/neutralDark" />
</selector>
4 changes: 2 additions & 2 deletions OpenEdXMobile/res/color/edx_input_text_selector.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_checked="true" android:color="@color/black" />
<item android:state_enabled="false" android:color="@color/edx_brand_gray_accent" />
<item android:color="@color/edx_brand_gray_base" />
<item android:state_enabled="false" android:color="@color/primaryXLightColor" />
<item android:color="@color/primaryBaseColor" />
</selector>
Expand Up @@ -2,6 +2,6 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_checked="true" android:state_enabled="false" android:color="@color/black" />
<item android:state_checked="true" android:color="@color/white" />
<item android:state_enabled="false" android:color="@color/edx_brand_gray_accent" />
<item android:color="@color/edx_brand_gray_base" />
<item android:state_enabled="false" android:color="@color/primaryXLightColor" />
<item android:color="@color/primaryBaseColor" />
</selector>
2 changes: 1 addition & 1 deletion OpenEdXMobile/res/color/switch_text_color.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/edx_brand_gray_accent" android:state_enabled="false" />
<item android:color="@color/primaryXLightColor" android:state_enabled="false" />
<item android:color="@color/black" />
</selector>
6 changes: 3 additions & 3 deletions OpenEdXMobile/res/color/tab_selector.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/toolbar_controls_color" android:state_selected="true" />
<item android:color="@color/toolbar_controls_color" android:state_pressed="true" />
<item android:color="@color/edx_brand_gray_accent" />
<item android:color="@color/primaryDarkColor" android:state_selected="true" />
<item android:color="@color/primaryBaseColor" android:state_pressed="true" />
<item android:color="@color/neutralXDark" />
</selector>
Binary file not shown.
Binary file removed OpenEdXMobile/res/drawable-mdpi/check.png
Binary file not shown.
Binary file not shown.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Expand Up @@ -3,7 +3,6 @@
android:color="@color/white">
<item android:id="@android:id/mask">
<shape android:shape="rectangle">
<corners android:radius="@dimen/edx_box_radius" />
<solid android:color="@color/transparent_white_26" />
</shape>
</item>
Expand Down
Binary file removed OpenEdXMobile/res/drawable-xhdpi/check.png
Binary file not shown.
Binary file not shown.
Binary file not shown.
3 changes: 2 additions & 1 deletion OpenEdXMobile/res/drawable/activated_item_selector.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@color/last_accessed_row_blue" android:state_activated="true" />
<item android:drawable="@color/neutralBase" android:state_activated="true" />
<item android:drawable="@color/white" />
</selector>
9 changes: 0 additions & 9 deletions OpenEdXMobile/res/drawable/blue_border_white_roundedbg.xml

This file was deleted.

Expand Up @@ -15,7 +15,7 @@
<clip>
<shape>
<corners android:radius="0dip" />
<solid android:color="@color/edx_success_accent" />
<solid android:color="@color/successLight" />
</shape>
</clip>
</item>
Expand Down
Expand Up @@ -32,8 +32,8 @@

<gradient
android:angle="0"
android:endColor="@color/edx_error_accent"
android:startColor="@color/edx_error_accent"
android:endColor="@color/errorLight"
android:startColor="@color/errorLight"
/>
</shape>
</clip>
Expand Down
Expand Up @@ -32,8 +32,8 @@

<gradient
android:angle="0"
android:endColor="@color/edx_success_accent"
android:startColor="@color/edx_success_accent"
android:endColor="@color/successBase"
android:startColor="@color/successBase"
/>
</shape>
</clip>
Expand Down
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" >

<solid android:color="@color/edx_brand_gray_x_back" />
<solid android:color="@color/neutralLight" />

<corners
android:bottomLeftRadius="@dimen/edx_box_radius"
Expand Down
10 changes: 4 additions & 6 deletions OpenEdXMobile/res/drawable/edx_brand_button.xml
@@ -1,18 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<selector>
<item android:state_enabled="false">
<shape android:shape="rectangle">
<solid android:color="@color/edx_brand_primary_back" />
<corners android:radius="@dimen/edx_box_radius" />
<stroke android:color="@color/edx_brand_action_color" android:width="@dimen/edx_hairline" />
<solid android:color="@color/accentAColor" />
<stroke android:color="@color/secondaryBaseColor" android:width="@dimen/edx_hairline" />
</shape>
</item>
<item>
<shape android:shape="rectangle">
<solid android:color="@color/edx_brand_action_color" />
<corners android:radius="@dimen/edx_box_radius" />
<solid android:color="@color/secondaryBaseColor" />
</shape>
</item>
</selector>
Expand Down
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval">
<solid android:color="@color/edx_brand_primary_accent" />
<solid android:color="@color/infoBase" />
</shape>
5 changes: 2 additions & 3 deletions OpenEdXMobile/res/drawable/edx_brand_single_state_button.xml
@@ -1,11 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<selector>
<item>
<shape android:shape="rectangle">
<solid android:color="@color/edx_brand_primary_base" />
<corners android:radius="@dimen/edx_box_radius" />
<solid android:color="@color/secondaryBaseColor" />
</shape>
</item>
</selector>
Expand Down
2 changes: 1 addition & 1 deletion OpenEdXMobile/res/drawable/edx_divider.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<size android:height="@dimen/edx_hairline" />
<solid android:color="@color/edx_brand_gray_back" />
<solid android:color="@color/neutralDark" />
</shape>
4 changes: 2 additions & 2 deletions OpenEdXMobile/res/drawable/edx_enroll_button.xml
Expand Up @@ -2,13 +2,13 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="false">
<shape android:shape="rectangle">
<solid android:color="@color/edx_brand_gray_back" />
<solid android:color="@color/neutralDark" />
<corners android:radius="@dimen/edx_box_radius" />
</shape>
</item>
<item>
<shape android:shape="rectangle">
<solid android:color="@color/edx_success_accent" />
<solid android:color="@color/successLight" />
<corners android:radius="@dimen/edx_box_radius" />
</shape>
</item>
Expand Down
4 changes: 2 additions & 2 deletions OpenEdXMobile/res/drawable/edx_enroll_button_text_color.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="false" android:color="@color/edx_brand_gray_accent" />
<item android:state_enabled="true" android:color="@color/edx_white" />
<item android:state_enabled="false" android:color="@color/primaryXLightColor" />
<item android:state_enabled="true" android:color="@color/neutralWhite" />
</selector>
4 changes: 2 additions & 2 deletions OpenEdXMobile/res/drawable/edx_footer_button.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="false" android:drawable="@color/edx_brand_gray_accent" />
<item android:drawable="@color/edx_brand_action_color" />
<item android:state_enabled="false" android:drawable="@color/errorXLight" />
<item android:drawable="@color/secondaryBaseColor" />
</selector>
3 changes: 1 addition & 2 deletions OpenEdXMobile/res/drawable/edx_input_background.xml
Expand Up @@ -4,6 +4,5 @@
<solid android:color="@color/white" />
<stroke
android:width="@dimen/edx_hairline"
android:color="@color/edx_brand_gray_back" />
<corners android:radius="@dimen/edx_box_radius" />
android:color="@color/neutralDark" />
</shape>
Expand Up @@ -2,9 +2,8 @@
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape android:shape="rectangle">
<stroke android:color="@color/edx_brand_action_color" android:width="1dp" />
<stroke android:color="@color/neutralDark" android:width="1dp" />
<solid android:color="@android:color/transparent" />
<corners android:radius="@dimen/edx_box_radius" />
</shape>
</item>
<item android:drawable="@drawable/selectable_rounded_box_overlay" />
Expand Down
3 changes: 1 addition & 2 deletions OpenEdXMobile/res/drawable/edx_primary_bordered_button.xml
Expand Up @@ -2,9 +2,8 @@
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape android:shape="rectangle">
<stroke android:color="@color/edx_brand_primary_base" android:width="1dp" />
<stroke android:color="@color/neutralDark" android:width="1dp" />
<solid android:color="@android:color/transparent" />
<corners android:radius="@dimen/edx_box_radius" />
</shape>
</item>
<item android:drawable="@drawable/selectable_rounded_box_overlay" />
Expand Down
23 changes: 23 additions & 0 deletions OpenEdXMobile/res/drawable/edx_primary_button.xml
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<selector>
<item android:state_enabled="false">
<shape android:shape="rectangle">
<solid android:color="@color/primaryLightColor" />
<corners android:radius="@dimen/edx_box_radius" />
<stroke
android:width="@dimen/edx_hairline"
android:color="@color/primaryBaseColor" />
</shape>
</item>
<item>
<shape android:shape="rectangle">
<corners android:radius="@dimen/edx_box_radius" />
<solid android:color="@color/primaryBaseColor" />
</shape>
</item>
</selector>
</item>
<item android:drawable="@drawable/light_selectable_rounded_box_overlay" />
</layer-list>

This file was deleted.

Expand Up @@ -2,26 +2,26 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_checked="true" android:state_enabled="false" android:state_focused="true">
<shape android:shape="rectangle">
<solid android:color="@color/edx_brand_gray_back" />
<solid android:color="@color/neutralDark" />
<stroke android:width="@dimen/edx_line" android:color="@color/black" />
</shape>
</item>
<item android:state_checked="true" android:state_enabled="false">
<shape android:shape="rectangle">
<solid android:color="@color/edx_brand_gray_back" />
<stroke android:width="@dimen/edx_hairline" android:color="@color/edx_brand_gray_back" />
<solid android:color="@color/neutralDark" />
<stroke android:width="@dimen/edx_hairline" android:color="@color/neutralDark" />
</shape>
</item>
<item android:state_checked="true" android:state_focused="true">
<shape android:shape="rectangle">
<solid android:color="@color/edx_brand_primary_base" />
<solid android:color="@color/primaryBaseColor" />
<stroke android:width="@dimen/edx_line" android:color="@color/black" />
</shape>
</item>
<item android:state_checked="true">
<shape android:shape="rectangle">
<solid android:color="@color/edx_brand_primary_base" />
<stroke android:width="@dimen/edx_hairline" android:color="@color/edx_brand_primary_base" />
<solid android:color="@color/primaryBaseColor" />
<stroke android:width="@dimen/edx_hairline" android:color="@color/primaryBaseColor" />
</shape>
</item>
<item android:state_focused="true">
Expand All @@ -33,7 +33,7 @@
<item>
<shape android:shape="rectangle">
<solid android:color="@color/white" />
<stroke android:width="@dimen/edx_hairline" android:color="@color/edx_brand_gray_back" />
<stroke android:width="@dimen/edx_hairline" android:color="@color/neutralDark" />
</shape>
</item>
</selector>

0 comments on commit 3afc0d6

Please sign in to comment.