From 2ec057f25b6259e39b8f760c93fadf5e039ab869 Mon Sep 17 00:00:00 2001 From: kdeschuy Date: Fri, 28 Jul 2017 19:15:27 +0200 Subject: [PATCH] Purrty checkboxes also fuck android --- .../java/be/mathsaey/stoofnogaan/ui/TaskView.java | 3 +-- app/src/main/res/drawable/button_secondary.xml | 4 ++-- app/src/main/res/drawable/drop_shadow.xml | 4 ++-- app/src/main/res/layout/activity_main.xml | 2 +- app/src/main/res/values/colors.xml | 12 ++++++------ app/src/main/res/values/styles.xml | 2 +- 6 files changed, 13 insertions(+), 14 deletions(-) diff --git a/app/src/main/java/be/mathsaey/stoofnogaan/ui/TaskView.java b/app/src/main/java/be/mathsaey/stoofnogaan/ui/TaskView.java index ecf721f..71d00da 100644 --- a/app/src/main/java/be/mathsaey/stoofnogaan/ui/TaskView.java +++ b/app/src/main/java/be/mathsaey/stoofnogaan/ui/TaskView.java @@ -7,9 +7,7 @@ import android.widget.CheckBox; import android.widget.CompoundButton; import android.widget.EditText; import android.widget.LinearLayout; -import android.widget.Toast; -import be.mathsaey.stoofnogaan.R; import be.mathsaey.stoofnogaan.data.Task; public class TaskView extends LinearLayout { @@ -30,6 +28,7 @@ public class TaskView extends LinearLayout { checkBox = findViewById(R.id.checkBox); textView = findViewById(R.id.textView); + checkBox.setChecked(t.getStatus()); textView.setText(t.getText()); diff --git a/app/src/main/res/drawable/button_secondary.xml b/app/src/main/res/drawable/button_secondary.xml index 2afd09c..b5b2309 100644 --- a/app/src/main/res/drawable/button_secondary.xml +++ b/app/src/main/res/drawable/button_secondary.xml @@ -7,7 +7,7 @@ + android:color="@color/darklight" /> - + diff --git a/app/src/main/res/drawable/drop_shadow.xml b/app/src/main/res/drawable/drop_shadow.xml index 71aa36a..68d3404 100644 --- a/app/src/main/res/drawable/drop_shadow.xml +++ b/app/src/main/res/drawable/drop_shadow.xml @@ -7,7 +7,7 @@ + android:color="@color/darklight" /> - + diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 61ba936..64f7433 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -5,7 +5,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/colorLight" + android:background="@color/light" android:paddingLeft="16dp" android:paddingRight="16dp" app:flexDirection="column" diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 30ddab1..ace8faa 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -1,9 +1,9 @@ - #FFF - #FFF8E1 - #FF7F2A - #5FD3BC - #E6DDBF - #552200 + #FFF + #FFF8E1 + #FF7F2A + #5FD3BC + #E6DDBF + #552200 diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index a907cb6..6f8f0b2 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -1,7 +1,7 @@ -