add due date editing capabilitiy

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>

5 files changed, 55 insertions, 14 deletions

diff --git a/app/src/main/res/drawable/ic_activity_light_grey.xml b/app/src/main/res/drawable/ic_activity_light_grey.xml
new file mode 100644
index 000000000..c40d9d080
--- /dev/null
+++ b/app/src/main/res/drawable/ic_activity_light_grey.xml
@@ -0,0 +1,6 @@
+<vector android:alpha="0.5" android:height="72dp"
+    android:viewportHeight="32" android:viewportWidth="32"
+    android:width="72dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF969696"
+        android:pathData="M16,1.9492 L6,18.8102H17L16,30.0508 26,13.1898H15Z"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_edit.xml b/app/src/main/res/layout/activity_edit.xml
index 37948821e..0a1afb66a 100644
--- a/app/src/main/res/layout/activity_edit.xml
+++ b/app/src/main/res/layout/activity_edit.xml
@@ -4,8 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:padding="16dp">
+    android:orientation="vertical">
 
     <EditText
         android:id="@+id/title"
@@ -13,6 +12,8 @@
         android:layout_height="wrap_content"
         android:hint="@string/label_title"
         android:importantForAutofill="no"
+        android:layout_marginLeft="16dp"
+        android:layout_marginRight="16dp"
         android:inputType="textPersonName" />
 
     <TextView
@@ -20,8 +21,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="16dp"
-        android:layout_marginLeft="3dp"
-        android:layout_marginRight="3dp"
+        android:layout_marginLeft="19dp"
+        android:layout_marginRight="19dp"
         tools:text="Modified: 12 days ago Created: 12 days ago"/>
 
     <android.support.design.widget.TabLayout
diff --git a/app/src/main/res/layout/fragment_card_edit_tab_activity.xml b/app/src/main/res/layout/fragment_card_edit_tab_activity.xml
index 7db769592..c0974eaa9 100644
--- a/app/src/main/res/layout/fragment_card_edit_tab_activity.xml
+++ b/app/src/main/res/layout/fragment_card_edit_tab_activity.xml
@@ -9,7 +9,7 @@
 
     <ImageView
         android:id="@+id/empty_list_icon"
-        app:srcCompat="@drawable/ic_folder_grey600_24dp"
+        app:srcCompat="@drawable/ic_activity_light_grey"
         android:layout_width="72dp"
         android:layout_height="72dp"
         android:contentDescription="@null" />
@@ -24,7 +24,7 @@
         android:maxLines="2"
         android:paddingTop="16dp"
         android:paddingBottom="16dp"
-        android:text="Activity"
+        android:text="@string/activity"
         android:textSize="26sp" />
 
     <TextView
diff --git a/app/src/main/res/layout/fragment_card_edit_tab_details.xml b/app/src/main/res/layout/fragment_card_edit_tab_details.xml
index 703fe352e..10bb11adf 100644
--- a/app/src/main/res/layout/fragment_card_edit_tab_details.xml
+++ b/app/src/main/res/layout/fragment_card_edit_tab_details.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:layout_marginTop="16dp"
+    android:padding="16dp"
     android:orientation="vertical">
 
     <LinearLayout
@@ -69,12 +70,42 @@
             app:srcCompat="@drawable/calendar_blank_grey600_24dp" />
 
         <EditText
-            android:id="@+id/dueDate"
-            android:layout_width="match_parent"
+            android:id="@+id/dueDateDate"
+            android:layout_width="116dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:drawablePadding="4dp"
+            android:enabled="true"
+            android:focusable="false"
+            android:hint="@string/hint_due_date_date"
+            android:maxLines="1"
+            android:padding="4dp"
+            android:textAlignment="center"
+            tools:text="01/07/2020" />
+
+        <EditText
+            android:id="@+id/dueDateTime"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:ems="10"
-            android:importantForAutofill="no"
-            android:inputType="datetime" />
+            android:layout_marginTop="8dp"
+            android:drawablePadding="4dp"
+            android:enabled="true"
+            android:focusable="false"
+            android:hint="@string/hint_due_date_time"
+            android:maxLines="1"
+            android:minLines="0"
+            android:padding="4dp"
+            android:textAlignment="center"
+            tools:text="11:45" />
+
+        <ImageView
+            android:id="@+id/clearDueDate"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:paddingLeft="4dp"
+            android:paddingTop="6dp"
+            android:paddingRight="4dp"
+            app:srcCompat="@drawable/ic_close_circle_grey600" />
     </LinearLayout>
 
     <LinearLayout
@@ -102,4 +133,4 @@
             android:scrollbars="vertical" />
     </LinearLayout>
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8a20d4ce6..0dd8038c4 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -53,6 +53,9 @@
     <string name="label_labels">Labels</string>
     <string name="label_description">Description</string>
     <string name="simple_people">People</string>
-
+    <string name="hint_due_date_date">Click to set</string>
+    <string name="hint_due_date_time" translatable="false">00:00</string>
     <string name="modified_created_time">Modified: %1$s Created: %2$s</string>
+
+    <string name="activity">Activity</string>
 </resources>