isoron/loop
1
1
Fork 0
mirror of https://github.com/iSoron/uhabits.git synced 2025-12-06 17:18:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

Use different colors for YES_AUTO and NO; increase contrast slightly

Browse Source
This commit is contained in:
Alinson S. Xavier
2021-03-13 18:10:35 -06:00
parent a95da72e19
commit ee462715de
38 changed files with 93 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
uhabits-android/src/main/res/values/attrs.xml
View File

@@ -26,13 +26,12 @@
<attr name="useHabitColorAsPrimary" format="boolean"/>
<attr name="aboutScreenColor" format="reference"/>
<attr name="highContrastTextColor" format="reference"/>
<attr name="mediumContrastTextColor" format="reference"/>
<attr name="lowContrastTextColor" format="reference"/>
<attr name="highContrastReverseTextColor" format="reference"/>
<attr name="mediumContrastReverseTextColor" format="reference"/>
<attr name="lowContrastReverseTextColor" format="reference"/>
<attr name="contrast0" format="reference"/>
<attr name="contrast20" format="reference"/>
<attr name="contrast40" format="reference"/>
<attr name="contrast60" format="reference"/>
<attr name="contrast80" format="reference"/>
<attr name="contrast100" format="reference"/>
<attr name="iconAdd" format="reference"/>
<attr name="iconArchive" format="reference"/>

1
uhabits-android/src/main/res/values/material_colors.xml
View File

@@ -285,6 +285,7 @@
<color name="grey_100">#F5F5F5</color>
<color name="grey_200">#EEEEEE</color>
<color name="grey_300">#E0E0E0</color>
<color name="grey_350">#D8D8D8</color>
<color name="grey_400">#BDBDBD</color>
<color name="grey_500">#9E9E9E</color>
<color name="grey_600">#757575</color>

54
uhabits-android/src/main/res/values/styles.xml
View File

@@ -25,7 +25,7 @@
<item name="android:alertDialogTheme">@style/Theme.AppCompat.Light.Dialog</item>
<item name="android:dialogTheme">@style/Theme.AppCompat.Light.Dialog</item>
<item name="android:forceDarkAllowed" tools:targetApi="q">false</item>
<item name="android:itemBackground">?attr/highContrastReverseTextColor</item>
<item name="android:itemBackground">?attr/contrast0</item>
<item name="android:navigationBarColor">?attr/colorPrimary</item>
<item name="android:textColor">@color/grey_800</item>
<item name="cardBackground">@drawable/card_light_background</item>
@@ -35,8 +35,6 @@
<item name="colorPrimaryDark">#303030</item>
<item name="dialogIconChangeColor">@drawable/ic_action_color_light</item>
<item name="headerBackgroundColor">@color/grey_200</item>
<item name="highContrastReverseTextColor">@color/white</item>
<item name="highContrastTextColor">@color/grey_800</item>
<item name="highlightedBackgroundColor">@color/grey_100</item>
<item name="iconAdd">@drawable/ic_action_add_dark</item>
<item name="iconArchive">@drawable/ic_action_archive_dark</item>
@@ -45,10 +43,12 @@
<item name="iconEdit">@drawable/ic_action_edit_dark</item>
<item name="iconFilter">@drawable/ic_action_filter_dark</item>
<item name="iconUnarchive">@drawable/ic_action_unarchive_dark</item>
<item name="lowContrastReverseTextColor">@color/grey_700</item>
<item name="lowContrastTextColor">@color/grey_300</item>
<item name="mediumContrastReverseTextColor">@color/grey_500</item>
<item name="mediumContrastTextColor">@color/grey_500</item>
<item name="contrast0">@color/white</item>
<item name="contrast20">@color/grey_300</item>
<item name="contrast40">@color/grey_350</item>
<item name="contrast60">@color/grey_500</item>
<item name="contrast80">@color/grey_700</item>
<item name="contrast100">@color/grey_800</item>
<item name="palette">@array/lightPalette</item>
<item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
<item name="scrollableRecyclerViewStyle">@style/ScrollableRecyclerViewStyle</item>
@@ -75,8 +75,6 @@
<item name="colorPrimaryDark">@color/black</item>
<item name="dialogIconChangeColor">@drawable/ic_action_color_dark</item>
<item name="headerBackgroundColor">@color/grey_900</item>
<item name="highContrastReverseTextColor">@color/grey_900</item>
<item name="highContrastTextColor">@color/grey_100</item>
<item name="highlightedBackgroundColor">@color/grey_800</item>
<item name="iconAdd">@drawable/ic_action_add_dark</item>
<item name="iconArchive">@drawable/ic_action_archive_dark</item>
@@ -84,10 +82,12 @@
<item name="iconEdit">@drawable/ic_action_edit_dark</item>
<item name="iconFilter">@drawable/ic_action_filter_dark</item>
<item name="iconUnarchive">@drawable/ic_action_unarchive_dark</item>
<item name="lowContrastReverseTextColor">@color/grey_300</item>
<item name="lowContrastTextColor">@color/grey_800</item>
<item name="mediumContrastReverseTextColor">@color/grey_750</item>
<item name="mediumContrastTextColor">@color/grey_500</item>
<item name="contrast0">@color/grey_900</item>
<item name="contrast20">@color/grey_800</item>
<item name="contrast40">@color/grey_750</item>
<item name="contrast60">@color/grey_500</item>
<item name="contrast80">@color/grey_300</item>
<item name="contrast100">@color/grey_100</item>
<item name="palette">@array/darkPalette</item>
<item name="popupMenuBackground">@color/black</item>
<item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
@@ -112,13 +112,12 @@
<item name="colorPrimary">@color/black</item>
<item name="colorPrimaryDark">@color/black</item>
<item name="headerBackgroundColor">@color/black</item>
<item name="highContrastReverseTextColor">@color/black</item>
<item name="highContrastTextColor">@color/grey_200</item>
<item name="highlightedBackgroundColor">@color/black</item>
<item name="lowContrastReverseTextColor">@color/grey_700</item>
<item name="lowContrastTextColor">@color/grey_900</item>
<item name="mediumContrastReverseTextColor">@color/grey_900</item>
<item name="mediumContrastTextColor">@color/grey_700</item>
<item name="contrast0">@color/black</item>
<item name="contrast20">@color/grey_900</item>
<item name="contrast60">@color/grey_700</item>
<item name="contrast80">@color/grey_700</item>
<item name="contrast100">@color/grey_200</item>
<item name="selectedBackground">@drawable/selected_box_amoled</item>
<item name="textColorAlertDialogListItem">@color/grey_100</item>
<item name="windowBackgroundColor">@color/black</item>
@@ -126,12 +125,11 @@
<style name="WidgetTheme" parent="AppBaseThemeDark">
<item name="cardBgColor">@color/grey_850</item>
<item name="highContrastReverseTextColor">@color/white</item>
<item name="highContrastTextColor">@color/white</item>
<item name="lowContrastReverseTextColor">@color/grey_800</item>
<item name="lowContrastTextColor">@color/white_a0</item>
<item name="mediumContrastReverseTextColor">@color/grey_500</item>
<item name="mediumContrastTextColor">@color/white_aa</item>
<item name="contrast0">@color/white</item>
<item name="contrast20">@color/white_a0</item>
<item name="contrast60">@color/white_aa</item>
<item name="contrast80">@color/grey_800</item>
<item name="contrast100">@color/white</item>
<item name="palette">@array/transparentWidgetPalette</item>
<item name="widgetShadowAlpha">0</item>
</style>
@@ -141,7 +139,7 @@
</style>
<style name="SmallSpinner">
<item name="android:textColor">?mediumContrastTextColor</item>
<item name="android:textColor">?attr/contrast60</item>
<item name="android:textSize">@dimen/smallTextSize</item>
</style>
@@ -263,7 +261,7 @@
<item name="android:layout_marginStart">8dp</item>
<item name="android:layout_marginTop">-15dp</item>
<item name="android:layout_marginBottom">-4dp</item>
<item name="android:background">?attr/highContrastReverseTextColor</item>
<item name="android:background">?attr/contrast0</item>
<item name="android:paddingStart">8dp</item>
<item name="android:paddingEnd">8dp</item>
<item name="android:textSize">@dimen/smallerTextSize</item>
@@ -315,6 +313,6 @@
<style name="FormDivider">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">1dp</item>
<item name="android:background">?attr/lowContrastTextColor</item>
<item name="android:background">?attr/contrast20</item>
</style>
</resources>

4
uhabits-android/src/main/res/values/styles_dialog.xml
View File

@@ -22,7 +22,7 @@
<style name="dialogFormText">
<item name="android:textSize">@dimen/regularTextSize</item>
<item name="android:textColor">?highContrastTextColor</item>
<item name="android:textColor">?attr/contrast100</item>
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
</style>
@@ -33,7 +33,7 @@
<item name="android:minWidth">90dp</item>
<item name="android:gravity">left</item>
<item name="android:paddingLeft">6dp</item>
<item name="android:textColor">?mediumContrastTextColor</item>
<item name="android:textColor">?attr/contrast60</item>
</style>
<style name="dialogFormRow">