#573 projects - Enhance UI

5 files changed, 150 insertions, 158 deletions

diff --git a/app/src/main/res/layout/dialog_project_resources.xml b/app/src/main/res/layout/dialog_project_resources.xml
index 44d90f075..8edf7b366 100644
--- a/app/src/main/res/layout/dialog_project_resources.xml
+++ b/app/src/main/res/layout/dialog_project_resources.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout 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="wrap_content"
-    android:orientation="vertical"
-    android:padding="@dimen/spacer_2x">
+    android:layout_height="wrap_content">
 
     <TextView
         android:id="@+id/projectName"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/spacer_3x"
+        android:layout_marginStart="@dimen/spacer_4x"
+        android:layout_marginTop="@dimen/spacer_2x"
         android:layout_marginEnd="0dp"
-        android:paddingStart="@dimen/spacer_2x"
+        android:layout_marginBottom="@dimen/spacer_1x"
+        android:paddingStart="@dimen/icon_size_details"
         android:paddingEnd="0dp"
         android:textAppearance="?attr/textAppearanceBody1"
         tools:text="@tools:sample/lorem" />
@@ -22,6 +22,7 @@
         android:id="@+id/recycler_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_below="@id/projectName"
         app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
         tools:listitem="@layout/item_project_resource" />
-</LinearLayout>
\ No newline at end of file
+</RelativeLayout>
\ No newline at end of file
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 0cee7271c..6597593d4 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,185 +1,177 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView 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="wrap_content"
     android:fillViewport="true">
 
-    <LinearLayout xmlns:tools="http://schemas.android.com/tools"
+    <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:padding="@dimen/spacer_2x">
+        android:layout_height="wrap_content">
 
         <LinearLayout
+            android:id="@+id/details"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/spacer_2x"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:layout_width="@dimen/icon_size_details"
-                android:layout_height="match_parent"
-                android:layout_marginEnd="@dimen/spacer_2x"
-                android:contentDescription="@null"
-                app:srcCompat="@drawable/ic_label_grey600_24dp" />
+            android:orientation="vertical"
+            android:padding="@dimen/spacer_2x">
 
-            <it.niedermann.nextcloud.deck.ui.view.ToggleAutoCompleteTextView
-                android:id="@+id/labels"
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:completionThreshold="1"
-                android:hint="@string/label_labels"
-                android:inputType="text" />
-        </LinearLayout>
-
-        <com.google.android.material.chip.ChipGroup
-            android:id="@+id/labelsGroup"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="40dp"
-            android:animateLayoutChanges="true" />
-
-        <LinearLayout
-            android:id="@+id/colorPicker"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/spacer_2x">
-
-
-            <ImageView
-                android:layout_width="@dimen/icon_size_details"
-                android:layout_height="match_parent"
-                android:layout_marginEnd="@dimen/spacer_2x"
-                android:contentDescription="@null"
-                app:srcCompat="@drawable/calendar_blank_grey600_24dp" />
-
-            <EditText
-                android:id="@+id/dueDateDate"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="2"
-                android:enabled="true"
-                android:focusable="false"
-                android:hint="@string/hint_due_date_date"
-                android:importantForAutofill="no"
-                android:inputType="date"
-                android:maxLines="1"
-                tools:text="01/07/2020" />
-
-            <EditText
-                android:id="@+id/dueDateTime"
-                android:layout_width="wrap_content"
+                android:layout_marginTop="@dimen/spacer_2x"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:layout_width="@dimen/icon_size_details"
+                    android:layout_height="match_parent"
+                    android:layout_marginEnd="@dimen/spacer_2x"
+                    android:contentDescription="@null"
+                    app:srcCompat="@drawable/ic_label_grey600_24dp" />
+
+                <it.niedermann.nextcloud.deck.ui.view.ToggleAutoCompleteTextView
+                    android:id="@+id/labels"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:completionThreshold="1"
+                    android:hint="@string/label_labels"
+                    android:inputType="text" />
+            </LinearLayout>
+
+            <com.google.android.material.chip.ChipGroup
+                android:id="@+id/labelsGroup"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:layout_weight="1"
-                android:enabled="true"
-                android:focusable="false"
-                android:hint="@string/hint_due_date_time"
-                android:importantForAutofill="no"
-                android:inputType="datetime"
-                android:maxLines="1"
-                android:minLines="0"
-                android:textAlignment="center"
-                tools:text="11:45" />
-
-            <ImageView
-                android:id="@+id/clearDueDate"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:contentDescription="@string/label_clear_due_date"
-                android:paddingStart="@dimen/spacer_1x"
-                android:paddingEnd="@dimen/spacer_1x"
-                app:srcCompat="@drawable/ic_close_circle_grey600" />
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/spacer_2x"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:layout_width="@dimen/icon_size_details"
-                android:layout_height="match_parent"
-                android:layout_marginEnd="@dimen/spacer_2x"
-                android:contentDescription="@null"
-                app:srcCompat="@drawable/ic_person_grey600_24dp" />
+                android:layout_marginStart="40dp"
+                android:animateLayoutChanges="true" />
 
-            <it.niedermann.nextcloud.deck.ui.view.ToggleAutoCompleteTextView
-                android:id="@+id/people"
+            <LinearLayout
+                android:id="@+id/colorPicker"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:completionThreshold="1"
-                android:hint="@string/hint_assign_people"
-                android:inputType="text" />
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/peopleList"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="40dp"
-            android:orientation="horizontal" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/spacer_2x"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:layout_width="@dimen/icon_size_details"
+                android:layout_marginTop="@dimen/spacer_2x">
+
+
+                <ImageView
+                    android:layout_width="@dimen/icon_size_details"
+                    android:layout_height="match_parent"
+                    android:layout_marginEnd="@dimen/spacer_2x"
+                    android:contentDescription="@null"
+                    app:srcCompat="@drawable/calendar_blank_grey600_24dp" />
+
+                <EditText
+                    android:id="@+id/dueDateDate"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="2"
+                    android:enabled="true"
+                    android:focusable="false"
+                    android:hint="@string/hint_due_date_date"
+                    android:importantForAutofill="no"
+                    android:inputType="date"
+                    android:maxLines="1"
+                    tools:text="01/07/2020" />
+
+                <EditText
+                    android:id="@+id/dueDateTime"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
+                    android:layout_weight="1"
+                    android:enabled="true"
+                    android:focusable="false"
+                    android:hint="@string/hint_due_date_time"
+                    android:importantForAutofill="no"
+                    android:inputType="datetime"
+                    android:maxLines="1"
+                    android:minLines="0"
+                    android:textAlignment="center"
+                    tools:text="11:45" />
+
+                <ImageView
+                    android:id="@+id/clearDueDate"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:contentDescription="@string/label_clear_due_date"
+                    android:paddingStart="@dimen/spacer_1x"
+                    android:paddingEnd="@dimen/spacer_1x"
+                    app:srcCompat="@drawable/ic_close_circle_grey600" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="10dp"
-                android:layout_marginEnd="@dimen/spacer_2x"
-                android:contentDescription="@null"
-                app:srcCompat="@drawable/ic_format_align_left_black_24dp" />
-
-            <com.yydcdut.markdown.MarkdownEditText
-                android:id="@+id/description"
+                android:layout_marginTop="@dimen/spacer_2x"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:layout_width="@dimen/icon_size_details"
+                    android:layout_height="match_parent"
+                    android:layout_marginEnd="@dimen/spacer_2x"
+                    android:contentDescription="@null"
+                    app:srcCompat="@drawable/ic_person_grey600_24dp" />
+
+                <it.niedermann.nextcloud.deck.ui.view.ToggleAutoCompleteTextView
+                    android:id="@+id/people"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:completionThreshold="1"
+                    android:hint="@string/hint_assign_people"
+                    android:inputType="text" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/peopleList"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:gravity="top"
-                android:hint="@string/label_description"
-                android:importantForAutofill="no"
-                android:inputType="textMultiLine|textCapSentences"
-                android:scrollbars="vertical" />
-        </LinearLayout>
+                android:layout_marginStart="40dp"
+                android:orientation="horizontal" />
 
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <androidx.fragment.app.FragmentContainerView
-                android:id="@+id/commentsFragment"
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/spacer_2x" />
-
-        </RelativeLayout>
+                android:layout_marginTop="@dimen/spacer_2x"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:layout_width="@dimen/icon_size_details"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="10dp"
+                    android:layout_marginEnd="@dimen/spacer_2x"
+                    android:contentDescription="@null"
+                    app:srcCompat="@drawable/ic_format_align_left_black_24dp" />
+
+                <com.yydcdut.markdown.MarkdownEditText
+                    android:id="@+id/description"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="top"
+                    android:hint="@string/label_description"
+                    android:importantForAutofill="no"
+                    android:inputType="textMultiLine|textCapSentences"
+                    android:scrollbars="vertical" />
+            </LinearLayout>
+        </LinearLayout>
 
         <TextView
             android:id="@+id/projectsTitle"
             style="?attr/textAppearanceOverline"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_below="@id/details"
             android:layout_marginStart="@dimen/icon_size_details"
             android:layout_marginTop="@dimen/spacer_2x"
-            android:paddingStart="@dimen/spacer_2x"
+            android:paddingStart="@dimen/spacer_4x"
             android:paddingEnd="@null"
             android:text="@string/projects_title" />
 
-        <androidx.core.widget.NestedScrollView
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/projects"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/projects"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-                tools:listitem="@layout/item_project" />
-        </androidx.core.widget.NestedScrollView>
-    </LinearLayout>
+            android:layout_height="wrap_content"
+            android:layout_below="@id/projectsTitle"
+            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+            tools:listitem="@layout/item_project" />
+    </RelativeLayout>
 </ScrollView>
diff --git a/app/src/main/res/layout/item_project.xml b/app/src/main/res/layout/item_project.xml
index 8af890abb..47ecf732d 100644
--- a/app/src/main/res/layout/item_project.xml
+++ b/app/src/main/res/layout/item_project.xml
@@ -7,8 +7,7 @@
     android:background="?attr/selectableItemBackground"
     android:gravity="center_vertical"
     android:orientation="horizontal"
-    android:paddingTop="@dimen/spacer_2x"
-    android:paddingBottom="@dimen/spacer_2x">
+    android:padding="@dimen/spacer_2x">
 
     <androidx.appcompat.widget.AppCompatImageView
         android:layout_width="@dimen/icon_size_details"
diff --git a/app/src/main/res/layout/item_project_resource.xml b/app/src/main/res/layout/item_project_resource.xml
index f82affabe..3efea7581 100644
--- a/app/src/main/res/layout/item_project_resource.xml
+++ b/app/src/main/res/layout/item_project_resource.xml
@@ -7,8 +7,7 @@
     android:background="?attr/selectableItemBackground"
     android:gravity="center_vertical"
     android:orientation="horizontal"
-    android:paddingTop="@dimen/spacer_2x"
-    android:paddingBottom="@dimen/spacer_2x">
+    android:padding="@dimen/spacer_2x">
 
     <androidx.appcompat.widget.AppCompatImageView
         android:layout_width="@dimen/icon_size_details"
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 54bff5fee..c4ac870e6 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -3,6 +3,7 @@
     <dimen name="spacer_1x">8dp</dimen>
     <dimen name="spacer_2x">16dp</dimen>
     <dimen name="spacer_3x">24dp</dimen>
+    <dimen name="spacer_4x">32dp</dimen>
 
     <dimen name="compact_label_height">6dp</dimen>