improve styling and visibility for import list items

This commit is contained in:
osodebailar 2022-04-04 13:29:45 +02:00
parent 5cae3bb8be
commit 6ee1a096f2
5 changed files with 26 additions and 23 deletions

View file

@ -1,14 +1,21 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android" <com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:card_view="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/careportal_cardview" android:id="@+id/careportal_cardview"
style="@style/Widget.MaterialComponents.CardView"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_marginStart="4dp"
card_view:cardElevation="0dp" android:layout_marginEnd="4dp"
card_view:cardBackgroundColor="?attr/cardItemBackgroundColor"> android:layout_marginTop="4dp"
app:strokeColor="?attr/strokeColor"
app:strokeWidth="2dp"
app:cardCornerRadius="3dp"
app:contentPadding="2dp"
app:cardElevation="2dp"
app:cardUseCompatPadding="false"
android:layout_gravity="center">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@ -30,7 +37,7 @@
android:layout_marginTop="4dp" android:layout_marginTop="4dp"
android:layout_marginEnd="6dp" android:layout_marginEnd="6dp"
android:layout_marginBottom="1dp" android:layout_marginBottom="1dp"
card_view:srcCompat="@drawable/ic_meta_format" app:srcCompat="@drawable/ic_meta_format"
app:tint="?attr/importListFileNameColor" /> app:tint="?attr/importListFileNameColor" />
<TextView <TextView
@ -91,7 +98,7 @@
android:layout_marginTop="1dp" android:layout_marginTop="1dp"
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
android:layout_marginBottom="1dp" android:layout_marginBottom="1dp"
card_view:srcCompat="@drawable/ic_meta_name" app:srcCompat="@drawable/ic_meta_name"
app:tint="?attr/importListAdditionalInfoColor" /> app:tint="?attr/importListAdditionalInfoColor" />
<TextView <TextView
@ -123,7 +130,7 @@
android:layout_marginTop="1dp" android:layout_marginTop="1dp"
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
android:layout_marginBottom="1dp" android:layout_marginBottom="1dp"
card_view:srcCompat="@drawable/ic_meta_date" app:srcCompat="@drawable/ic_meta_date"
app:tint="?attr/importListAdditionalInfoColor" /> app:tint="?attr/importListAdditionalInfoColor" />
<TextView <TextView
@ -156,16 +163,6 @@
</LinearLayout> </LinearLayout>
<View
android:layout_width="fill_parent"
android:layout_height="2dip"
android:layout_marginStart="5dp"
android:layout_marginTop="7dp"
android:layout_marginEnd="5dp"
android:layout_marginBottom="3dp"
android:background="?android:attr/dividerHorizontal" />
</LinearLayout> </LinearLayout>
</androidx.cardview.widget.CardView> </com.google.android.material.card.MaterialCardView>

View file

@ -223,6 +223,8 @@
<item name="bgiColor">@color/bgi</item> <item name="bgiColor">@color/bgi</item>
<item name="ratioColor">@color/ratio</item> <item name="ratioColor">@color/ratio</item>
<item name="activityColor">@color/activity</item> <item name="activityColor">@color/activity</item>
<!-- CardView specific colors -->
<item name="strokeColor">@color/plastic_grey</item>
</style> </style>
<style name="Theme.MaterialComponents.DayNight.DarkActionBar" parent="Theme.MaterialComponents.DayNight.Bridge"/> <style name="Theme.MaterialComponents.DayNight.DarkActionBar" parent="Theme.MaterialComponents.DayNight.Bridge"/>

View file

@ -203,4 +203,6 @@
<attr name="bgiColor" format="reference|color" /> <attr name="bgiColor" format="reference|color" />
<attr name="ratioColor" format="reference|color" /> <attr name="ratioColor" format="reference|color" />
<attr name="activityColor" format="reference|color" /> <attr name="activityColor" format="reference|color" />
<!-- CardView specific colors -->
<attr name="strokeColor" format="reference|color" />
</resources> </resources>

View file

@ -36,7 +36,7 @@
<color name="tabSelectedText">@color/black_alpha_90</color> <color name="tabSelectedText">@color/black_alpha_90</color>
<!-- Buttons--> <!-- Buttons-->
<color name="buttonBackground">@color/midlightgray</color> <color name="buttonBackground">#B2B2B2</color>
<color name="buttonText">#000000</color> <color name="buttonText">#000000</color>
<color name="okButtonText">@color/colorAccent</color> <color name="okButtonText">@color/colorAccent</color>
<color name="okButtonSelected">#33969696</color> <color name="okButtonSelected">#33969696</color>
@ -146,12 +146,12 @@
<color name="transparent">#00000000</color> <color name="transparent">#00000000</color>
<!-- Maintenance --> <!-- Maintenance -->
<color name="metadataOk">#77dd77</color> <color name="metadataOk">#66BB6A</color>
<color name="metadataTextWarning">#FF8C00</color> <color name="metadataTextWarning">#FF8C00</color>
<color name="metadataTextError">#FF5555</color> <color name="metadataTextError">#FF5555</color>
<!-- Import/Export --> <!-- Import/Export -->
<color name="importListAdditionalInfo">#757575</color> <color name="importListAdditionalInfo">#666666</color>
<color name="importListFileName">#000000</color> <color name="importListFileName">#000000</color>
<color name="ribbonWarning">#f4d700</color> <color name="ribbonWarning">#f4d700</color>
@ -190,7 +190,7 @@
<color name="cardObjectiveText">#779ECB</color> <color name="cardObjectiveText">#779ECB</color>
<color name="colorAcceptTempButton">#E19701</color> <color name="colorAcceptTempButton">#E19701</color>
<color name="colorTreatmentButton">#42A5F5</color> <color name="colorTreatmentButton">#429BF5</color>
<color name="colorInsulinButton">#67dfe8</color> <color name="colorInsulinButton">#67dfe8</color>
<color name="colorCarbsButton">#E19701</color> <color name="colorCarbsButton">#E19701</color>
<color name="colorCalibrationButton">#e93057</color> <color name="colorCalibrationButton">#e93057</color>

View file

@ -231,6 +231,8 @@
<item name="bgiColor">@color/bgi</item> <item name="bgiColor">@color/bgi</item>
<item name="ratioColor">@color/ratio</item> <item name="ratioColor">@color/ratio</item>
<item name="activityColor">@color/activity</item> <item name="activityColor">@color/activity</item>
<!-- CardView specific colors -->
<item name="strokeColor">@color/plastic_grey</item>
</style> </style>
<style name="Theme.MaterialComponents.DayNight.DarkActionBar" parent="Theme.MaterialComponents.DayNight.Bridge"/> <style name="Theme.MaterialComponents.DayNight.DarkActionBar" parent="Theme.MaterialComponents.DayNight.Bridge"/>