Skip to content

Thumbprint DayNight Theme #46

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

Open
isles1217 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Thumbprint DayNight Theme #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion thumbprint/src/main/res/color/button_caution_background_selector.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/tp_white" />
<item android:color="?attr/colorSurface" />
</selector>
4 changes: 2 additions & 2 deletions thumbprint/src/main/res/color/button_caution_border_color_selector.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/tp_gray_300" android:state_enabled="false" />
<item android:color="@color/primaryBorderColor" android:state_enabled="false" />
<item android:color="@color/tp_red" android:state_focused="true" />
<item android:color="@color/tp_red" android:state_pressed="true" />
<item android:color="@color/tp_gray" />
<item android:color="@color/primaryBorderColor" />
</selector>
2 changes: 1 addition & 1 deletion thumbprint/src/main/res/color/button_caution_text_color_selector_deprecated.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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/tp_gray_300" android:state_enabled="false" />
<item android:color="@color/primaryBorderColor" android:state_enabled="false" />
<item android:color="@color/tp_red_500" android:state_focused="true" />
<item android:color="@color/tp_red_500" android:state_pressed="true" />
<item android:color="@color/tp_red" />
Expand Down
2 changes: 1 addition & 1 deletion thumbprint/src/main/res/color/button_clear_text_color_selector.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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/tp_gray_300" android:state_enabled="false" />
<item android:color="@color/primaryBorderColor" android:state_enabled="false" />
<item android:color="@color/tp_blue_500" android:state_focused="true" />
<item android:color="@color/tp_blue_500" android:state_pressed="true" />
<item android:color="@color/tp_blue" />
Expand Down
2 changes: 1 addition & 1 deletion thumbprint/src/main/res/color/button_primary_text_color_selector.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/tp_white" />
<item android:color="?attr/colorOnSurface" />
</selector>
2 changes: 1 addition & 1 deletion thumbprint/src/main/res/color/button_secondary_background_selector.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/tp_white" />
<item android:color="?attr/colorSecondary" />
</selector>
4 changes: 2 additions & 2 deletions thumbprint/src/main/res/color/button_secondary_border_color_selector.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/tp_gray_300" android:state_enabled="false" />
<item android:color="@color/inactiveColor" android:state_enabled="false" />
<item android:color="@color/tp_blue" android:state_focused="true" />
<item android:color="@color/tp_blue" android:state_pressed="true" />
<item android:color="@color/tp_gray" />
<item android:color="@color/primaryBorderColor" />
</selector>
8 changes: 4 additions & 4 deletions thumbprint/src/main/res/color/button_secondary_border_color_selector_deprecated.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/tp_gray" android:state_enabled="false" />
<item android:color="@color/tp_black_300" android:state_focused="true" />
<item android:color="@color/tp_black_300" android:state_pressed="true" />
<item android:color="@color/tp_gray" />
<item android:color="?attr/colorSecondary" android:state_enabled="false" />
<item android:color="@color/primaryTextColor" android:state_focused="true" />
<item android:color="@color/primaryTextColor" android:state_pressed="true" />
<item android:color="?attr/colorSecondary" />
</selector>
8 changes: 4 additions & 4 deletions thumbprint/src/main/res/color/button_secondary_text_color_selector_deprecated.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/tp_gray" android:state_enabled="false" />
<item android:color="@color/tp_black_300" android:state_focused="true" />
<item android:color="@color/tp_black_300" android:state_pressed="true" />
<item android:color="@color/tp_black_300" />
<item android:color="@color/inactiveColor" android:state_enabled="false" />
<item android:color="@color/primaryTextColor" android:state_focused="true" />
<item android:color="@color/primaryTextColor" android:state_pressed="true" />
<item android:color="@color/primaryTextColor" />
</selector>
2 changes: 1 addition & 1 deletion thumbprint/src/main/res/color/button_solid_background_selector.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/tp_white" />
<item android:color="?attr/colorSurface" />
</selector>
8 changes: 4 additions & 4 deletions thumbprint/src/main/res/color/button_solid_background_selector_deprecated.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/tp_gray_300" android:state_enabled="false" />
<item android:color="@color/tp_gray_200" android:state_pressed="true" />
<item android:color="@color/tp_gray_200" android:state_focused="true" />
<item android:color="@color/tp_white" />
<item android:color="@color/primaryBorderColor" android:state_enabled="false" />
<item android:color="?attr/colorSecondary" android:state_pressed="true" />
<item android:color="?attr/colorSecondary" android:state_focused="true" />
<item android:color="?attr/colorSurface" />
</selector>
8 changes: 4 additions & 4 deletions thumbprint/src/main/res/color/button_solid_border_color_selector.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/tp_white" android:state_enabled="false" />
<item android:color="@color/tp_black" android:state_focused="true" />
<item android:color="@color/tp_black" android:state_pressed="true" />
<item android:color="@color/tp_white" />
<item android:color="?attr/colorSurface" android:state_enabled="false" />
<item android:color="?attr/colorOnSurface" android:state_focused="true" />
<item android:color="?attr/colorOnSurface" android:state_pressed="true" />
<item android:color="?attr/colorSurface" />
</selector>
8 changes: 4 additions & 4 deletions thumbprint/src/main/res/color/button_solid_text_color_selector.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/tp_gray" android:state_enabled="false" />
<item android:color="@color/tp_black" android:state_focused="true" />
<item android:color="@color/tp_black" android:state_pressed="true" />
<item android:color="@color/tp_black" />
<item android:color="?attr/colorSecondary" android:state_enabled="false" />
<item android:color="?attr/colorOnSurface" android:state_focused="true" />
<item android:color="?attr/colorOnSurface" android:state_pressed="true" />
<item android:color="?attr/colorOnSurface" />
</selector>
8 changes: 4 additions & 4 deletions thumbprint/src/main/res/color/button_solid_text_color_selector_deprecated.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/tp_black_300" android:state_enabled="false" />
<item android:color="@color/tp_black" android:state_focused="true" />
<item android:color="@color/tp_black" android:state_pressed="true" />
<item android:color="@color/tp_black" />
<item android:color="?attr/colorSecondaryVariant" android:state_enabled="false" />
<item android:color="?attr/colorOnSurface" android:state_focused="true" />
<item android:color="?attr/colorOnSurface" android:state_pressed="true" />
<item android:color="?attr/colorOnSurface" />
</selector>
2 changes: 1 addition & 1 deletion thumbprint/src/main/res/color/button_tertiary_background_selector.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/tp_white" />
<item android:color="?attr/colorOnSurface" />
</selector>
6 changes: 3 additions & 3 deletions thumbprint/src/main/res/color/button_tertiary_border_color_selector.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/tp_gray_300" android:state_enabled="false" />
<item android:color="@color/tp_black" android:state_focused="true" />
<item android:color="@color/tp_black" android:state_pressed="true" />
<item android:color="@color/tp_gray" />
<item android:color="?attr/colorOnSurface" android:state_focused="true" />
<item android:color="?attr/colorOnSurface" android:state_pressed="true" />
<item android:color="?attr/colorSecondary" />
</selector>
8 changes: 4 additions & 4 deletions thumbprint/src/main/res/color/button_tertiary_text_color_selector.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/tp_gray" android:state_enabled="false" />
<item android:color="@color/tp_black_300" android:state_focused="true" />
<item android:color="@color/tp_black_300" android:state_pressed="true" />
<item android:color="@color/tp_black_300" />
<item android:color="?attr/colorSecondary" android:state_enabled="false" />
<item android:color="@color/primaryTextColor" android:state_focused="true" />
<item android:color="@color/primaryTextColor" android:state_pressed="true" />
<item android:color="@color/primaryTextColor" />
</selector>
8 changes: 4 additions & 4 deletions thumbprint/src/main/res/color/button_tertiary_text_color_selector_deprecated.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/tp_gray_300" android:state_enabled="false" />
<item android:color="@color/tp_black" android:state_focused="true" />
<item android:color="@color/tp_black" android:state_pressed="true" />
<item android:color="@color/tp_black_300" />
<item android:color="?attr/colorSecondaryVariant" android:state_enabled="false" />
<item android:color="?attr/colorOnSurface" android:state_focused="true" />
<item android:color="?attr/colorOnSurface" android:state_pressed="true" />
<item android:color="@color/primaryTextColor" />
</selector>
2 changes: 1 addition & 1 deletion thumbprint/src/main/res/color/link_style_label_text_color_selector.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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/tp_black" android:state_enabled="false" />
<item android:color="?attr/colorOnSurface" android:state_enabled="false" />
<item android:color="@color/tp_blue" />
</selector>
2 changes: 1 addition & 1 deletion thumbprint/src/main/res/drawable-anydpi/avatar_online_badge.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@

<stroke
android:width="1dp"
android:color="@color/tp_white" />
android:color="?attr/colorSurface" />
</shape>
2 changes: 1 addition & 1 deletion thumbprint/src/main/res/drawable-anydpi/button_primary_background.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/tp_gray_300">
android:color="@color/primaryBorderColor">
<item>
<shape>
<solid android:color="@color/button_primary_background_selector" />
Expand Down
91 changes: 91 additions & 0 deletions thumbprint/src/main/res/values-night/colors.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- tpx semantic namespace -->
<color name="primarySurfaceColor">@color/tp_black_300</color>
<color name="secondarySurfaceColor">@color/tp_black</color>
<color name="headingTextColor">@color/tp_white</color>
<color name="primaryTextColor">@color/tp_white</color>
<color name="primaryBorderColor">@color/tp_gray_300</color>
<color name="inactiveColor">@color/tp_gray</color>
<color name="primaryIconTintColor">@color/tp_white</color>

<!-- TODO(itorres) Clean these up to match Figma designs! -->
<color name="blue_100">#005a7a</color>
<color name="blue_200">#007fad</color>
<color name="blue_300">#79d2f2</color>
<color name="blue">#009fd9</color>
<color name="blue_500">#b3ebff</color>
<color name="blue_600">#eaf6fa</color>
<color name="indigo_100">#383c80</color>
<color name="indigo_200">#4f54b3</color>
<color name="indigo_300">#5968e2</color>
<color name="indigo">#96c2ff</color>
<color name="indigo_500">#cce1ff</color>
<color name="indigo_600">#e8f1fd</color>
<color name="purple_100">#502095</color>
<color name="purple_200">#8a5ed6</color>
<color name="purple_300">#a97ff0</color>
<color name="purple">#d3baff</color>
<color name="purple_500">#dfccff</color>
<color name="purple_600">#f5efff</color>
<color name="green_100">#0f6648</color>
<color name="green_200">#109e78</color>
<color name="green_300">#73e4a2</color>
<color name="green">#2db783</color>
<color name="green_500">#c6f7da</color>
<color name="green_600">#e1fdf3</color>
<color name="yellow_100">#8a5500</color>
<color name="yellow_200">#d48300</color>
<color name="yellow_300">#febe14</color>
<color name="yellow">#ffdd80</color>
<color name="yellow_500">#ffebb3</color>
<color name="yellow_600">#fdf7e7</color>
<color name="red_100">#76012c</color>
<color name="red_200">#cc3553</color>
<color name="red_300">#ff5a5f</color>
<color name="red">#ffb0b0</color>
<color name="red_500">#ffd9d9</color>
<color name="red_600">#ffeff0</color>
<color name="black_300">#E1E1E1</color>
<color name="black">#fafafa</color>
<color name="gray_200">#1E1E1E</color>
<color name="gray_300">#606162</color>
<color name="gray">#A0A1A2</color>

<color name="tp_blue_100">#005a7a</color>
<color name="tp_blue_200">#007fad</color>
<color name="tp_blue_300">#79d2f2</color>
<color name="tp_blue">#009fd9</color>
<color name="tp_blue_500">#b3ebff</color>
<color name="tp_blue_600">#eaf6fa</color>
<color name="tp_indigo_100">#383c80</color>
<color name="tp_indigo_200">#4f54b3</color>
<color name="tp_indigo_300">#5968e2</color>
<color name="tp_indigo">#96c2ff</color>
<color name="tp_indigo_500">#cce1ff</color>
<color name="tp_indigo_600">#e8f1fd</color>
<color name="tp_purple_100">#502095</color>
<color name="tp_purple_200">#8a5ed6</color>
<color name="tp_purple_300">#a97ff0</color>
<color name="tp_purple">#d3baff</color>
<color name="tp_purple_500">#dfccff</color>
<color name="tp_purple_600">#f5efff</color>
<color name="tp_green_100">#0f6648</color>
<color name="tp_green_200">#109e78</color>
<color name="tp_green_300">#2db783</color>
<color name="tp_green">#73e4a2</color>
<color name="tp_green_500">#c6f7da</color>
<color name="tp_green_600">#e1fdf3</color>
<color name="tp_yellow_100">#8a5500</color>
<color name="tp_yellow_200">#d48300</color>
<color name="tp_yellow_300">#febe14</color>
<color name="tp_yellow">#ffdd80</color>
<color name="tp_yellow_500">#ffebb3</color>
<color name="tp_yellow_600">#fdf7e7</color>
<color name="tp_red_100">#76012c</color>
<color name="tp_red_200">#cc3553</color>
<color name="tp_red_300">#ff5a5f</color>
<color name="tp_red">#ffb0b0</color>
<color name="tp_red_500">#ffd9d9</color>
<color name="tp_red_600">#ffeff0</color>
</resources>
14 changes: 14 additions & 0 deletions thumbprint/src/main/res/values-night/styles.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="ThumbprintDayNightTheme" parent="Theme.MaterialComponents.DayNight.NoActionBar.Bridge">
<item name="colorPrimary">@color/tp_blue</item>
<item name="colorAccent">@color/tp_blue</item>
<item name="colorPrimaryDark">@color/tp_black</item>
<item name="colorSurface">@color/tp_black</item>
<item name="colorOnSurface">@color/tp_white</item>
<item name="colorSecondary">@color/tp_black_300</item>
<item name="colorSecondaryVariant">@color/tp_black_300</item>
<item name="colorOnSecondary">@color/tp_white</item>
<item name="snackbarStyle">@style/ThumbprintToast</item>
</style>
</resources>
52 changes: 52 additions & 0 deletions thumbprint/src/main/res/values/colors.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- tpx semantic namespace -->
<color name="primarySurfaceColor">@color/tp_white</color>
<color name="secondarySurfaceColor">@color/tp_gray_200</color>
<color name="headingTextColor">@color/tp_black</color>
<color name="primaryTextColor">@color/tp_black_300</color>
<color name="primaryBorderColor">@color/tp_gray_300</color>
<color name="inactiveColor">@color/tp_gray</color>
<color name="primaryIconTintColor">@color/tp_black</color>

<color name="transparent">#00FFFFFF</color>
<color name="blue_100">#eaf6fa</color>
<color name="blue_200">#b3ebff</color>
Expand Down Expand Up @@ -43,4 +52,47 @@
<color name="gray_300">#e9eced</color>
<color name="gray">#d3d4d5</color>
<color name="white">#ffffff</color>

<color name="tp_black">#2f3033</color>
<color name="tp_black_300">#676d73</color>
<color name="tp_blue">#009fd9</color>
<color name="tp_blue_100">#eaf6fa</color>
<color name="tp_blue_200">#b3ebff</color>
<color name="tp_blue_300">#79d2f2</color>
<color name="tp_blue_500">#007fad</color>
<color name="tp_blue_600">#005a7a</color>
<color name="tp_gray">#d3d4d5</color>
<color name="tp_gray_200">#fafafa</color>
<color name="tp_gray_300">#e9eced</color>
<color name="tp_green">#2db783</color>
<color name="tp_green_100">#e1fdf3</color>
<color name="tp_green_200">#c6f7da</color>
<color name="tp_green_300">#73e4a2</color>
<color name="tp_green_500">#109e78</color>
<color name="tp_green_600">#0f6648</color>
<color name="tp_indigo">#5968e2</color>
<color name="tp_indigo_100">#e8f1fd</color>
<color name="tp_indigo_200">#cce1ff</color>
<color name="tp_indigo_300">#96c2ff</color>
<color name="tp_indigo_500">#4f54b3</color>
<color name="tp_indigo_600">#383c80</color>
<color name="tp_purple">#a97ff0</color>
<color name="tp_purple_100">#f5efff</color>
<color name="tp_purple_200">#dfccff</color>
<color name="tp_purple_300">#d3baff</color>
<color name="tp_purple_500">#8a5ed6</color>
<color name="tp_purple_600">#502095</color>
<color name="tp_red">#ff5a5f</color>
<color name="tp_red_100">#ffeff0</color>
<color name="tp_red_200">#ffd9d9</color>
<color name="tp_red_300">#ffb0b0</color>
<color name="tp_red_500">#cc3553</color>
<color name="tp_red_600">#76012c</color>
<color name="tp_white">#ffffff</color>
<color name="tp_yellow">#febe14</color>
<color name="tp_yellow_100">#fdf7e7</color>
<color name="tp_yellow_200">#ffebb3</color>
<color name="tp_yellow_300">#ffdd80</color>
<color name="tp_yellow_500">#d48300</color>
<color name="tp_yellow_600">#8a5500</color>
</resources>
6 changes: 3 additions & 3 deletions thumbprint/src/main/res/values/edit_text_styles.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
<item name="android:paddingTop">@dimen/spacing_smaller</item>
<item name="android:paddingBottom">@dimen/spacing_smaller</item>
<item name="android:textAppearance">@style/Thumbprint.Body1Regular</item>
<item name="android:colorAccent">@color/tp_blue</item>
<item name="android:textColor">@color/tp_black</item>
<item name="android:textColorHint">@color/tp_black_300</item>
<item name="android:colorAccent">?attr/colorAccent</item>
<item name="android:textColor">?attr/colorOnSurface</item>
<item name="android:textColorHint">@color/primaryTextColor</item>
<item name="android:textColorHighlight">@color/tp_blue_300</item>
<item name="android:background">@drawable/edit_text_border_default</item>
</style>
Expand Down
Loading