card items and objectives now readable in light mode
This commit is contained in:
parent
b66c4da112
commit
7f29093bd6
6 changed files with 10 additions and 4 deletions
|
@ -28,6 +28,7 @@
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="16dp"
|
android:layout_marginTop="16dp"
|
||||||
android:layout_marginBottom="10dp"
|
android:layout_marginBottom="10dp"
|
||||||
|
android:background="?attr/objectivesBackgroundColor"
|
||||||
android:orientation="vertical"
|
android:orientation="vertical"
|
||||||
app:layout_constraintTop_toBottomOf="@+id/exam_options"
|
app:layout_constraintTop_toBottomOf="@+id/exam_options"
|
||||||
tools:layout_editor_absoluteX="3dp" />
|
tools:layout_editor_absoluteX="3dp" />
|
||||||
|
|
|
@ -8,8 +8,9 @@
|
||||||
android:layout_marginLeft="16dp"
|
android:layout_marginLeft="16dp"
|
||||||
android:layout_marginTop="16dp"
|
android:layout_marginTop="16dp"
|
||||||
android:layout_marginRight="16dp"
|
android:layout_marginRight="16dp"
|
||||||
app:cardBackgroundColor="?attr/cardItemBackgroundColor"
|
app:cardBackgroundColor="?attr/objectivescardItemBackgroundColor"
|
||||||
app:cardCornerRadius="2dp"
|
app:cardCornerRadius="2dp"
|
||||||
|
app:cardElevation="8dp"
|
||||||
app:cardUseCompatPadding="true"
|
app:cardUseCompatPadding="true"
|
||||||
app:contentPadding="16dp">
|
app:contentPadding="16dp">
|
||||||
|
|
||||||
|
|
|
@ -71,6 +71,7 @@
|
||||||
<!-- Pump -->
|
<!-- Pump -->
|
||||||
<item name="pumpStatusBackground">@color/pumpStatusBackground</item>
|
<item name="pumpStatusBackground">@color/pumpStatusBackground</item>
|
||||||
<!-- Objectives -->
|
<!-- Objectives -->
|
||||||
|
<item name="objectivescardItemBackgroundColor">?attr/cardItemBackgroundColor</item>
|
||||||
<item name="objectivesBackgroundColor">@color/objectivesBackground</item>
|
<item name="objectivesBackgroundColor">@color/objectivesBackground</item>
|
||||||
<item name="objectivesDisabledTextColor">@color/colorObjectivesDisabledText</item>
|
<item name="objectivesDisabledTextColor">@color/colorObjectivesDisabledText</item>
|
||||||
<!---Import List -->
|
<!---Import List -->
|
||||||
|
|
|
@ -44,6 +44,7 @@
|
||||||
<!-- Pump -->
|
<!-- Pump -->
|
||||||
<attr name="pumpStatusBackground" format="reference|color" />
|
<attr name="pumpStatusBackground" format="reference|color" />
|
||||||
<!-- Objectives -->
|
<!-- Objectives -->
|
||||||
|
<attr name="objectivescardItemBackgroundColor" format="reference|color" />
|
||||||
<attr name="objectivesBackgroundColor" format="reference|color" />
|
<attr name="objectivesBackgroundColor" format="reference|color" />
|
||||||
<attr name="objectivesDisabledTextColor" format="reference|color" />
|
<attr name="objectivesDisabledTextColor" format="reference|color" />
|
||||||
<!---Import List -->
|
<!---Import List -->
|
||||||
|
|
|
@ -226,7 +226,7 @@
|
||||||
<!-- Gray colors -->
|
<!-- Gray colors -->
|
||||||
<color name="darkgray">#323232</color>
|
<color name="darkgray">#323232</color>
|
||||||
<color name="darkgrayVariant">#424242</color>
|
<color name="darkgrayVariant">#424242</color>
|
||||||
<color name="objectivesBackground">#3C3C3C</color>
|
<color name="objectivesBackground">#8C8C8C</color>
|
||||||
<color name="plastic_grey">#666666</color>
|
<color name="plastic_grey">#666666</color>
|
||||||
<color name="byodagray">#777777</color>
|
<color name="byodagray">#777777</color>
|
||||||
<color name="sphere_plastic_grey">#8c8c8c</color>
|
<color name="sphere_plastic_grey">#8c8c8c</color>
|
||||||
|
@ -309,6 +309,7 @@
|
||||||
<color name="aaps_theme_light_onBackground">#1C1B1F</color>
|
<color name="aaps_theme_light_onBackground">#1C1B1F</color>
|
||||||
<color name="aaps_theme_light_surface">#FAF9F8</color>
|
<color name="aaps_theme_light_surface">#FAF9F8</color>
|
||||||
<color name="aaps_theme_light_onSurface">#1C1B1F</color>
|
<color name="aaps_theme_light_onSurface">#1C1B1F</color>
|
||||||
<color name="aaps_theme_light_surfaceVariant">#E7E0EC</color>
|
<color name="aaps_theme_light_surfaceVariant">#E2E0DF</color>
|
||||||
|
|
||||||
|
|
||||||
</resources>
|
</resources>
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
<item name="colorOnError">@color/aaps_theme_light_onError</item>
|
<item name="colorOnError">@color/aaps_theme_light_onError</item>
|
||||||
<item name="android:colorBackground">@color/aaps_theme_light_background</item>
|
<item name="android:colorBackground">@color/aaps_theme_light_background</item>
|
||||||
<item name="colorOnBackground">@color/aaps_theme_light_onBackground</item>
|
<item name="colorOnBackground">@color/aaps_theme_light_onBackground</item>
|
||||||
<item name="colorSurface">@color/aaps_theme_light_surface</item>
|
<item name="colorSurface">@color/aaps_theme_light_surfaceVariant</item>
|
||||||
<item name="colorOnSurface">@color/aaps_theme_light_onSurface</item>
|
<item name="colorOnSurface">@color/aaps_theme_light_onSurface</item>
|
||||||
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
|
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
|
||||||
<item name="colorAccent">@color/aaps_theme_light_secondary</item>
|
<item name="colorAccent">@color/aaps_theme_light_secondary</item>
|
||||||
|
@ -79,6 +79,7 @@
|
||||||
<!-- Pump -->
|
<!-- Pump -->
|
||||||
<item name="pumpStatusBackground">@color/pumpStatusBackground</item>
|
<item name="pumpStatusBackground">@color/pumpStatusBackground</item>
|
||||||
<!-- Objectives -->
|
<!-- Objectives -->
|
||||||
|
<item name="objectivescardItemBackgroundColor">@color/midgray</item>
|
||||||
<item name="objectivesBackgroundColor">@color/objectivesBackground</item>
|
<item name="objectivesBackgroundColor">@color/objectivesBackground</item>
|
||||||
<item name="objectivesDisabledTextColor">@color/colorObjectivesDisabledText</item>
|
<item name="objectivesDisabledTextColor">@color/colorObjectivesDisabledText</item>
|
||||||
<!---Import List -->
|
<!---Import List -->
|
||||||
|
|
Loading…
Reference in a new issue