caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Merge pull request #1577 from osodebailar/fix/objectives_carditems_background

Browse source 
card items and objectives now readable in light mode
This commit is contained in:
Milos Kozak 2022-04-06 21:28:18 +02:00 committed by GitHub
parent e9599fc992 7f29093bd6
commit 742bcd4d58
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/res/layout/objectives_exam_fragment.xml
View file

@ -28,6 +28,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_marginBottom="10dp"
android:background="?attr/objectivesBackgroundColor"
android:orientation="vertical"
app:layout_constraintTop_toBottomOf="@+id/exam_options"
tools:layout_editor_absoluteX="3dp" />

3
app/src/main/res/layout/objectives_item.xml
View file

@ -8,8 +8,9 @@
android:layout_marginLeft="16dp"
android:layout_marginTop="16dp"
android:layout_marginRight="16dp"
app:cardBackgroundColor="?attr/cardItemBackgroundColor"
app:cardBackgroundColor="?attr/objectivescardItemBackgroundColor"
app:cardCornerRadius="2dp"
app:cardElevation="8dp"
app:cardUseCompatPadding="true"
app:contentPadding="16dp">

1
core/src/main/res/values-night/styles.xml
View file

@ -71,6 +71,7 @@
<!-- Pump -->
<item name="pumpStatusBackground">@color/pumpStatusBackground</item>
<!-- Objectives -->
<item name="objectivescardItemBackgroundColor">?attr/cardItemBackgroundColor</item>
<item name="objectivesBackgroundColor">@color/objectivesBackground</item>
<item name="objectivesDisabledTextColor">@color/colorObjectivesDisabledText</item>
<!---Import List -->

1
core/src/main/res/values/attrs.xml
View file

@ -44,6 +44,7 @@
<!-- Pump -->
<attr name="pumpStatusBackground" format="reference|color" />
<!-- Objectives -->
<attr name="objectivescardItemBackgroundColor" format="reference|color" />
<attr name="objectivesBackgroundColor" format="reference|color" />
<attr name="objectivesDisabledTextColor" format="reference|color" />
<!---Import List -->

5
core/src/main/res/values/colors.xml
View file

@ -226,7 +226,7 @@
<!-- Gray colors -->
<color name="darkgray">#323232</color>
<color name="darkgrayVariant">#424242</color>
<color name="objectivesBackground">#3C3C3C</color>
<color name="objectivesBackground">#8C8C8C</color>
<color name="plastic_grey">#666666</color>
<color name="byodagray">#777777</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_surface">#FAF9F8</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>

3
core/src/main/res/values/styles.xml
View file

@ -11,7 +11,7 @@
<item name="colorOnError">@color/aaps_theme_light_onError</item>
<item name="android:colorBackground">@color/aaps_theme_light_background</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="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorAccent">@color/aaps_theme_light_secondary</item>
@ -79,6 +79,7 @@
<!-- Pump -->
<item name="pumpStatusBackground">@color/pumpStatusBackground</item>
<!-- Objectives -->
<item name="objectivescardItemBackgroundColor">@color/midgray</item>
<item name="objectivesBackgroundColor">@color/objectivesBackground</item>
<item name="objectivesDisabledTextColor">@color/colorObjectivesDisabledText</item>
<!---Import List -->