From 034f3da5f302d1404297cf92b7b2c05463ff33ed Mon Sep 17 00:00:00 2001
From: Fynn Godau <fynngodau@mailbox.org>
Date: Tue, 2 Mar 2021 14:45:06 +0100
Subject: [PATCH] Support Android 5

---
 corona-warn-companion/build.gradle                            | 2 +-
 .../matchentries/MatchesRecyclerViewAdapter.java              | 4 ++--
 corona-warn-companion/src/main/res/drawable/frame.xml         | 2 +-
 .../src/main/res/layout/match_card_fragment.xml               | 4 ----
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/corona-warn-companion/build.gradle b/corona-warn-companion/build.gradle
index fabbadd..55185bd 100644
--- a/corona-warn-companion/build.gradle
+++ b/corona-warn-companion/build.gradle
@@ -53,7 +53,7 @@ android {
     buildToolsVersion '29.0.3'
 
     defaultConfig {
-        minSdkVersion 23
+        minSdkVersion 21
         targetSdkVersion 29
         versionName androidGitVersion.name()
         versionCode androidGitVersion.code()
diff --git a/corona-warn-companion/src/main/java/org/tosl/coronawarncompanion/matchentries/MatchesRecyclerViewAdapter.java b/corona-warn-companion/src/main/java/org/tosl/coronawarncompanion/matchentries/MatchesRecyclerViewAdapter.java
index 3868b4d..061d628 100644
--- a/corona-warn-companion/src/main/java/org/tosl/coronawarncompanion/matchentries/MatchesRecyclerViewAdapter.java
+++ b/corona-warn-companion/src/main/java/org/tosl/coronawarncompanion/matchentries/MatchesRecyclerViewAdapter.java
@@ -570,7 +570,7 @@ private void configureDetailsChart(LineChart chartView, List<Entry> dataPointsMi
         dataSetMin.setAxisDependency(YAxis.AxisDependency.LEFT);
         dataSetMin.setCircleColors(dotColorsMinAttenuation);
         dataSetMin.setDrawCircleHole(false);
-        dataSetMin.setCircleHoleColor(resolveColorAttr(android.R.attr.colorBackgroundFloating, context));
+        dataSetMin.setCircleHoleColor(resolveColorAttr(android.R.attr.colorForegroundInverse, context));
         //dataSetMin.enableDashedLine(0, 1, 0);
         dataSetMin.setColor(lineColor);
         dataSetMin.setDrawValues(false);
@@ -582,7 +582,7 @@ private void configureDetailsChart(LineChart chartView, List<Entry> dataPointsMi
         dataSetRest.setAxisDependency(YAxis.AxisDependency.LEFT);
         dataSetRest.setCircleColors(dotColors);
         dataSetRest.setDrawCircleHole(false);
-        dataSetRest.setCircleHoleColor(resolveColorAttr(android.R.attr.colorBackgroundFloating, context));
+        dataSetRest.setCircleHoleColor(resolveColorAttr(android.R.attr.colorForegroundInverse, context));
         dataSetRest.enableDashedLine(0, 1, 0);  // these parameters mean: do not show line
         dataSetRest.setDrawValues(false);
         dataSetRest.setHighlightEnabled(false);
diff --git a/corona-warn-companion/src/main/res/drawable/frame.xml b/corona-warn-companion/src/main/res/drawable/frame.xml
index 16acec8..878cfec 100644
--- a/corona-warn-companion/src/main/res/drawable/frame.xml
+++ b/corona-warn-companion/src/main/res/drawable/frame.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" >
-    <solid android:color="?android:attr/colorBackgroundFloating" />
+    <solid android:color="?android:attr/colorForegroundInverse" />
     <stroke android:width="1dip" android:color="?android:attr/colorPrimary"/>
 </shape>
diff --git a/corona-warn-companion/src/main/res/layout/match_card_fragment.xml b/corona-warn-companion/src/main/res/layout/match_card_fragment.xml
index 4e33c61..8ab677e 100644
--- a/corona-warn-companion/src/main/res/layout/match_card_fragment.xml
+++ b/corona-warn-companion/src/main/res/layout/match_card_fragment.xml
@@ -13,7 +13,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_margin="@dimen/text_margin"
-        android:background="?android:attr/colorBackgroundFloating"
         android:textAppearance="?attr/textAppearanceListItem"
         android:textColor="?android:attr/textColorPrimary"
         android:textSize="16sp"
@@ -37,7 +36,6 @@
         android:layout_width="match_parent"
         android:layout_height="250dp"
         android:layout_margin="@dimen/text_margin"
-        android:background="?android:attr/colorBackgroundFloating"
         android:textColor="?android:attr/textColorPrimary"
         app:layout_constraintBottom_toTopOf="@+id/map"
         app:layout_constraintEnd_toEndOf="parent"
@@ -50,7 +48,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_margin="@dimen/text_margin"
-        android:background="?android:attr/colorBackgroundFloating"
         android:textAppearance="?attr/textAppearanceListItem"
         android:textColor="?android:attr/textColorPrimary"
         android:textSize="16sp"
@@ -65,7 +62,6 @@
         android:layout_width="match_parent"
         android:layout_height="250dp"
         android:layout_margin="@dimen/text_margin"
-        android:background="?android:attr/colorBackgroundFloating"
         android:textColor="?android:attr/textColorPrimary"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"