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.

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

UI : Better color for light mode #3612

Draft
wants to merge 1 commit into
base: dev
Choose a base branch
from
Draft
Changes from all commits
Commits
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
22 changes: 11 additions & 11 deletions core/ui/src/main/res/values/colors.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,24 +18,24 @@
<color name="secondaryColorDefault">#03dac6</color>
<color name="secondaryLightColorDefault">#e3e3e3</color>
<color name="secondaryDarkColorDefault">#848484</color>
<color name="primaryTextColorDefault">#ffffff</color>
<color name="primaryTextColorDefault">#000000</color>
<color name="secondaryTextColorDefault">#000000</color>
<color name="overviewPillColorDefault">#1c171c</color>
<color name="colorOnPrimaryDefault">#FFFFFF</color>

<color name="defaultBackground">#FFFFFF</color>
<color name="defaultBackground">#F8F1F6</color>
<color name="defaultTextColor">#000000</color>

<!---Android Dark ans Light Theme Base colors-->
<color name="background_dark">#262626</color>
<color name="background_light">#FFFFFF</color>
<color name="background_light">#F3F3F3</color>

<!-- Tabs-->
<color name="tabText">@color/black_alpha_90</color>
<color name="tabSelectedText">@color/black_alpha_90</color>

<!-- Buttons-->
<color name="buttonBackground">#BABABA</color>
<color name="buttonBackground">#F8F1F6</color>
<color name="buttonText">#000000</color>
<color name="okButtonText">@color/colorAccent</color>
<color name="okButtonSelected">#33969696</color>
Expand Down Expand Up @@ -64,7 +64,7 @@
<color name="errorAlertHeaderText">#FF000000</color>
<color name="helperProfile">#C803A9F4</color>
<color name="examinedProfile">#FFFF5555</color>
<color name="defaultText">#666666</color>
<color name="defaultText">#000000</color>

<!-- DatePicker-->
<color name="dateTimePickerBackground">@color/white</color>
Expand Down Expand Up @@ -99,7 +99,7 @@
<color name="blue">#0000FF</color>
<color name="sens">#008585</color>

<color name="ribbonDefault">#8C8C8C</color>
<color name="ribbonDefault">#5F5D5D</color>
<color name="daySelected">#D000FF00</color>
<color name="weekdayOutline">#1ea3e5</color>
<color name="weekendOutline">#1e88e5</color>
Expand Down Expand Up @@ -145,15 +145,15 @@

<color name="ribbonWarning">#f4d700</color>
<color name="ribbonCritical">#ff0400</color>
<color name="ribbonTextDefault">#FFFFFF</color>
<color name="ribbonTextDefault">#000000</color>
<color name="ribbonTextWarning">#303030</color>
<color name="tempTargetConfirmation">#6BD16B</color>

<color name="prediction">#ff00ff</color>
<color name="iobPred">#00d2d2</color>
<color name="bolus">#1ea3e5</color>
<color name="ratio">#000000</color>
<color name="activity">#d3f166</color>
<color name="activity">#F2A868</color>
<color name="bgi">#00EEEE</color>
<color name="devSlopePos">#FFFFFF00</color>
<color name="devSlopeNeg">#FFFF00FF</color>
Expand Down Expand Up @@ -296,7 +296,7 @@
colors can be used also if we change to material 3
!!! In the moment only tested in light theme !!! -->
<color name="aaps_theme_light_primary">#006493</color>
<color name="aaps_theme_light_onPrimary">#FFFFFF</color>
<color name="aaps_theme_light_onPrimary">#000000</color>
<color name="aaps_theme_light_primaryContainer">#C7E6FF</color>
<color name="aaps_theme_light_onPrimaryContainer">#001E30</color>
<color name="aaps_theme_light_secondary">#006A5F</color>
Expand All @@ -311,9 +311,9 @@
<color name="aaps_theme_light_errorContainer">#F9DEDC</color>
<color name="aaps_theme_light_onError">#FFFFFF</color>
<color name="aaps_theme_light_onErrorContainer">#410E0B</color>
<color name="aaps_theme_light_background">#FFFBFC</color>
<color name="aaps_theme_light_background">#FFFFFF</color>
<color name="aaps_theme_light_onBackground">#1D1B1E</color>
<color name="aaps_theme_light_surface">#FFFBFC</color>
<color name="aaps_theme_light_surface">#F6EFF6</color>
<color name="aaps_theme_light_onSurface">#1D1B1E</color>
<color name="aaps_theme_light_surfaceVariant">#E7E0EC</color>
<color name="aaps_theme_light_onSurfaceVariant">#49454F</color>
Expand Down