From fc175aa9e83243989548aa43ddc72fa9692480b1 Mon Sep 17 00:00:00 2001
From: kdeschuy <kenny.deschuyteneer@gmail.com>
Date: Fri, 28 Jul 2017 18:45:44 +0200
Subject: [PATCH] Purrty layouts

---
 .idea/modules.xml                             |  2 +-
 app/build.gradle                              |  1 +
 .../mathsaey/stoofnogaan/ui/MainActivity.java |  8 +-
 .../{button.xml => button_primary.xml}        |  0
 .../main/res/drawable/button_secondary.xml    | 31 +++++++
 app/src/main/res/layout/activity_main.xml     | 89 ++++++++++++-------
 app/src/main/res/values/strings.xml           |  2 +-
 7 files changed, 95 insertions(+), 38 deletions(-)
 rename app/src/main/res/drawable/{button.xml => button_primary.xml} (100%)
 create mode 100644 app/src/main/res/drawable/button_secondary.xml

diff --git a/.idea/modules.xml b/.idea/modules.xml
index 48bfe44..2124db2 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,8 +2,8 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/Stoofnogaan.iml" filepath="$PROJECT_DIR$/Stoofnogaan.iml" />
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
+      <module fileurl="file://$PROJECT_DIR$/stoofnogaan.iml" filepath="$PROJECT_DIR$/stoofnogaan.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index aa8f431..3c5e426 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -25,5 +25,6 @@ dependencies {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
     compile 'com.android.support.constraint:constraint-layout:1.0.2'
+    compile 'com.google.android:flexbox:0.3.0'
     testCompile 'junit:junit:4.12'
 }
diff --git a/app/src/main/java/be/mathsaey/stoofnogaan/ui/MainActivity.java b/app/src/main/java/be/mathsaey/stoofnogaan/ui/MainActivity.java
index 7c3637a..f49dbae 100644
--- a/app/src/main/java/be/mathsaey/stoofnogaan/ui/MainActivity.java
+++ b/app/src/main/java/be/mathsaey/stoofnogaan/ui/MainActivity.java
@@ -24,9 +24,13 @@ public class MainActivity extends Activity {
         taskView = findViewById(R.id.tasks);
         loadTasks();
 
-        Button button = (Button) findViewById(R.id.addButton);
         Typeface custom_font = Typeface.createFromAsset(getAssets(), "fonts/Oswald-SemiBold.ttf");
-        button.setTypeface(custom_font);
+
+        Button addButton = (Button) findViewById(R.id.addButton);
+        addButton.setTypeface(custom_font);
+
+        Button resetButton = (Button) findViewById(R.id.resetButton);
+        resetButton.setTypeface(custom_font);
     }
 
     @Override
diff --git a/app/src/main/res/drawable/button.xml b/app/src/main/res/drawable/button_primary.xml
similarity index 100%
rename from app/src/main/res/drawable/button.xml
rename to app/src/main/res/drawable/button_primary.xml
diff --git a/app/src/main/res/drawable/button_secondary.xml b/app/src/main/res/drawable/button_secondary.xml
new file mode 100644
index 0000000..2afd09c
--- /dev/null
+++ b/app/src/main/res/drawable/button_secondary.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle" >
+
+    <item>
+        <shape>
+            <!-- set the shadow color here -->
+            <stroke
+                android:width="2dp"
+                android:color="@color/colorDropShadow" />
+
+            <padding
+                android:bottom="2dp"
+                android:left="0dp"
+                android:right="0dp"
+                android:top="0dp" />
+
+            <corners android:radius="3dp" />
+        </shape>
+    </item>
+
+    <!-- Background -->
+
+    <item>
+        <shape>
+            <solid android:color="@color/colorWhite" />
+            <corners android:radius="3dp" />
+        </shape>
+    </item>
+
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 0bcc858..27ac6c6 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,60 +1,81 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+<com.google.android.flexbox.FlexboxLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical"
     android:background="@color/colorLight"
-    android:padding="20dp"
+    android:paddingLeft="16dp"
+    android:paddingRight="16dp"
+    app:flexDirection="column"
+    app:justifyContent="space_around"
+    app:alignItems="center"
     tools:context="ui.MainActivity">
 
-    <ImageButton
-        android:id="@+id/settings_button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:background="@null"
-        android:layout_gravity="end"
-        android:src="@android:drawable/ic_menu_manage" />
-
-    <RelativeLayout
+    <!-- Header -->
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
-        android:layout_marginBottom="16dp">
+        android:paddingTop="8dp"
+        android:paddingBottom="8dp">
 
-    </RelativeLayout>
+        <ImageButton
+            android:id="@+id/settings_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@null"
+            android:src="@android:drawable/ic_menu_manage">
+        </ImageButton>
 
-    <RelativeLayout
+    </LinearLayout>
+
+    <!-- TaskView -->
+    <LinearLayout
+        android:id="@+id/tasks"
         android:layout_width="match_parent"
-        android:layout_height="475dp"
+        android:layout_height="wrap_content"
         android:background="@drawable/drop_shadow"
-        android:paddingBottom="32dp"
-        android:orientation="vertical">
+        android:orientation="vertical"
+        android:padding="16dp"
+        app:layout_flexGrow="1">
+    </LinearLayout>
 
-        <LinearLayout
-            android:id="@+id/tasks"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical"
-            android:padding="16dp"
-            android:layout_above="@+id/addButton">
-        </LinearLayout>
+    <!-- Buttons at bottom -->
+    <com.google.android.flexbox.FlexboxLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingTop="8dp"
+        android:paddingBottom="8dp"
+        app:justifyContent="space_around">
+
+        <Button
+            android:id="@+id/resetButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:layout_flexBasisPercent="45%"
+            android:paddingLeft="16dp"
+            android:paddingRight="16dp"
+            android:background="@drawable/button_secondary"
+            android:onClick="onResetTaskButtonClick"
+            android:text="@string/task_reset"
+            android:textColor="#7c7656">
+        </Button>
 
         <Button
             android:id="@+id/addButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            app:layout_flexBasisPercent="45%"
+            android:paddingLeft="16dp"
+            android:paddingRight="16dp"
+            android:background="@drawable/button_primary"
             android:onClick="onNewTaskButtonClick"
             android:text="@string/task_new"
-            android:background="@drawable/button"
-            android:layout_alignParentBottom="true"
-            android:textColor="#7c7656"
-            android:paddingLeft="52dp"
-            android:paddingRight="52dp"
-            android:layout_centerHorizontal="true">
+            android:textColor="#7c7656">
         </Button>
 
-    </RelativeLayout>
+    </com.google.android.flexbox.FlexboxLayout>
 
-</LinearLayout>
+</com.google.android.flexbox.FlexboxLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 15297b2..859db73 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -2,7 +2,7 @@
     <string name="app_name">Stoof nog aan?</string>
     <string name="task_new">Nieuwe Stoof</string>
     <string name="task_hint">Lege Stoof</string>
-
+    <string name="task_reset">Weg Stoof</string>
 
     <string name="settings_text">Stoof Instellen</string>
     <string name="taken_text">Nieuwe Stoof</string>