Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support Android 5 #121

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Support Android 5 #121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion corona-warn-companion/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ android {
buildToolsVersion '29.0.3'

defaultConfig {
minSdkVersion 23
minSdkVersion 21
targetSdkVersion 29
versionName androidGitVersion.name()
versionCode androidGitVersion.code()
Expand Down
4 changes: 2 additions & 2 deletions ...n/src/main/java/org/tosl/coronawarncompanion/matchentries/MatchesRecyclerViewAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion corona-warn-companion/src/main/res/drawable/frame.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
4 changes: 0 additions & 4 deletions corona-warn-companion/src/main/res/layout/match_card_fragment.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand All @@ -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"
Expand All @@ -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"
Expand Down