From 5a0fff8095cd5356f57c181b7e7b820e0f7efacf Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期四, 20 一月 2022 16:00:14 +0800
Subject: [PATCH] 将项目拆分为两个子项目，监管和督察
---
appDucha/src/main/res/layout/dc_fragment_task.xml | 284 ++++++++++++++++++++++++++++++--------------------------
1 files changed, 153 insertions(+), 131 deletions(-)
diff --git a/appDucha/src/main/res/layout/dc_fragment_task.xml b/appDucha/src/main/res/layout/dc_fragment_task.xml
index 57e5b82..da7c7b0 100644
--- a/appDucha/src/main/res/layout/dc_fragment_task.xml
+++ b/appDucha/src/main/res/layout/dc_fragment_task.xml
@@ -191,7 +191,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/card_view"
- app:layout_constraintBottom_toTopOf="@id/rl_add_task">
+ app:layout_constraintBottom_toTopOf="@id/ll_btns">
<LinearLayout
android:id="@+id/day_task"
@@ -276,154 +276,176 @@
</LinearLayout>
</android.support.constraint.ConstraintLayout>
- <android.support.constraint.ConstraintLayout
- android:id="@+id/rl_add_task"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_margin="20dp"
- android:paddingTop="@dimen/dimen8"
- android:paddingStart="@dimen/dimen16"
- android:paddingEnd="@dimen/dimen16"
- android:paddingBottom="@dimen/dimen16"
+ <LinearLayout
+ android:id="@+id/ll_btns"
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:orientation="horizontal"
+ android:layout_marginStart="20dp"
+ android:layout_marginEnd="20dp"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintEnd_toStartOf="@id/cl_add_subTask"
+ app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/task_progress_llcontainer"
app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintVertical_bias="1"
- android:background="@mipmap/ic_bg_blue">
+ app:layout_constraintHeight_percent="0.25"
+ android:baselineAligned="false"
+ android:gravity="center">
- <ImageView
- android:id="@+id/iv_add_task"
+ <android.support.constraint.ConstraintLayout
+ android:id="@+id/rl_add_task"
android:layout_width="0dp"
- android:layout_height="0dp"
- android:background="@mipmap/ic_top_task"
- app:layout_constraintDimensionRatio="w,1:1"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintTop_toTopOf="parent"/>
-
- <TextView
- android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="鎬讳换鍔＄鐞�"
- android:textColor="@color/white"
- android:textSize="12sp"
- android:textStyle="bold"
- app:layout_constraintTop_toBottomOf="@id/iv_add_task"
+ android:layout_weight="1"
+ android:visibility="visible"
+ android:padding="@dimen/dimen4"
+ android:layout_marginEnd="@dimen/dimen8"
+ android:foreground="?attr/selectableItemBackgroundBorderless"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintEnd_toEndOf="parent"/>
- </android.support.constraint.ConstraintLayout>
+ app:layout_constraintEnd_toStartOf="@id/cl_add_subTask"
+ app:layout_constraintTop_toBottomOf="@id/task_progress_llcontainer"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintVertical_bias="1"
+ android:background="@drawable/ic_bg_blue">
- <android.support.constraint.ConstraintLayout
- android:id="@+id/cl_add_subTask"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_marginEnd="20dp"
- android:paddingTop="@dimen/dimen8"
- android:paddingStart="@dimen/dimen16"
- android:paddingEnd="@dimen/dimen16"
- android:paddingBottom="@dimen/dimen16"
- app:layout_constraintTop_toTopOf="@id/rl_add_task"
- app:layout_constraintStart_toEndOf="@id/rl_add_task"
- app:layout_constraintEnd_toStartOf="@id/rl_add_scense"
- android:layout_centerHorizontal="true"
- android:background="@mipmap/ic_bg_green"
- android:orientation="vertical">
+ <ImageView
+ android:id="@+id/iv_add_task"
+ android:layout_width="wrap_content"
+ android:layout_height="0dp"
+ android:background="@mipmap/ic_top_task"
+ app:layout_constraintDimensionRatio="w,1:1"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintBottom_toTopOf="@id/txt_add_task"/>
- <ImageView
- android:id="@+id/iv_add_subTask"
+ <TextView
+ android:id="@+id/txt_add_task"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="鎬讳换鍔＄鐞�"
+ android:textColor="@color/white"
+ android:textSize="12sp"
+ android:textStyle="bold"
+ app:layout_constraintTop_toBottomOf="@id/iv_add_task"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"/>
+ </android.support.constraint.ConstraintLayout>
+
+ <android.support.constraint.ConstraintLayout
+ android:id="@+id/cl_add_subTask"
android:layout_width="0dp"
- android:layout_height="0dp"
- app:layout_constraintDimensionRatio="w,1:1"
- android:background="@mipmap/ic_new_subtask"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintTop_toTopOf="parent"/>
-
- <TextView
- android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="鍒跺畾浠诲姟"
- android:textColor="@color/white"
- android:textSize="12sp"
- android:textStyle="bold"
- app:layout_constraintTop_toBottomOf="@id/iv_add_subTask"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintEnd_toEndOf="parent"/>
- </android.support.constraint.ConstraintLayout>
+ android:layout_weight="1"
+ android:padding="@dimen/dimen4"
+ android:foreground="?attr/selectableItemBackgroundBorderless"
+ app:layout_constraintTop_toBottomOf="@id/task_progress_llcontainer"
+ app:layout_constraintStart_toEndOf="@id/rl_add_task"
+ app:layout_constraintEnd_toStartOf="@id/rl_add_scense"
+ app:layout_constraintBottom_toBottomOf="parent"
+ android:background="@drawable/ic_bg_green">
- <android.support.constraint.ConstraintLayout
- android:id="@+id/rl_add_scense"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:background="@mipmap/ic_bg_red"
- android:layout_marginEnd="20dp"
- android:paddingTop="@dimen/dimen8"
- android:paddingStart="@dimen/dimen16"
- android:paddingEnd="@dimen/dimen16"
- android:paddingBottom="@dimen/dimen16"
- app:layout_constraintStart_toEndOf="@id/cl_add_subTask"
- app:layout_constraintEnd_toStartOf="@id/rl_scense_map"
- app:layout_constraintTop_toTopOf="@id/rl_add_task">
+ <ImageView
+ android:id="@+id/iv_add_subTask"
+ android:layout_width="wrap_content"
+ android:layout_height="0dp"
+ app:layout_constraintDimensionRatio="h,1:1"
+ android:background="@mipmap/ic_new_subtask"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintBottom_toTopOf="@id/txt_add_subTask"/>
- <ImageView
- android:id="@+id/iv_task_check"
+ <TextView
+ android:id="@+id/txt_add_subTask"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="鍒跺畾浠诲姟"
+ android:textColor="@color/white"
+ android:textSize="12sp"
+ android:textStyle="bold"
+ app:layout_constraintTop_toBottomOf="@id/iv_add_subTask"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"/>
+ </android.support.constraint.ConstraintLayout>
+
+ <android.support.constraint.ConstraintLayout
+ android:id="@+id/rl_add_scense"
android:layout_width="0dp"
- android:layout_height="0dp"
- app:layout_constraintDimensionRatio="w,1:1"
- android:background="@mipmap/ic_new_scene"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintTop_toTopOf="parent"/>
-
- <TextView
- android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="鏂板鍦烘櫙"
- android:textColor="@color/white"
- android:textSize="12sp"
- android:textStyle="bold"
- app:layout_constraintTop_toBottomOf="@id/iv_task_check"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintEnd_toEndOf="parent"/>
- </android.support.constraint.ConstraintLayout>
+ android:background="@drawable/ic_bg_red"
+ android:visibility="visible"
+ android:layout_weight="1"
+ android:padding="@dimen/dimen4"
+ android:layout_marginStart="@dimen/dimen8"
+ android:foreground="?attr/selectableItemBackgroundBorderless"
+ app:layout_constraintStart_toEndOf="@id/cl_add_subTask"
+ app:layout_constraintEnd_toStartOf="@id/rl_scense_map"
+ app:layout_constraintTop_toTopOf="@id/cl_add_subTask">
- <android.support.constraint.ConstraintLayout
- android:id="@+id/rl_scense_map"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_marginEnd="20dp"
- android:paddingStart="@dimen/dimen16"
- android:paddingEnd="@dimen/dimen16"
- android:paddingBottom="@dimen/dimen16"
- app:layout_constraintTop_toTopOf="@id/rl_add_scense"
- app:layout_constraintStart_toEndOf="@id/rl_add_scense"
- app:layout_constraintEnd_toEndOf="parent"
- android:layout_centerHorizontal="true"
- android:background="@drawable/shape_green_task_follow"
- android:orientation="vertical"
- android:visibility="gone">
+ <ImageView
+ android:id="@+id/iv_task_check"
+ android:layout_width="wrap_content"
+ android:layout_height="0dp"
+ app:layout_constraintDimensionRatio="h,1:1"
+ android:background="@mipmap/ic_new_scene"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintBottom_toTopOf="@id/txt_task_check"/>
- <ImageView
- android:id="@+id/iv_task_follow"
+ <TextView
+ android:id="@+id/txt_task_check"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="鏂板鍦烘櫙"
+ android:textColor="@color/white"
+ android:textSize="12sp"
+ android:textStyle="bold"
+ app:layout_constraintTop_toBottomOf="@id/iv_task_check"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"/>
+ </android.support.constraint.ConstraintLayout>
+
+ <android.support.constraint.ConstraintLayout
+ android:id="@+id/rl_scense_map"
android:layout_width="0dp"
- android:layout_height="0dp"
- app:layout_constraintDimensionRatio="w,1:1"
- android:background="@drawable/icon_task_others_task"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintTop_toTopOf="parent"/>
-
- <TextView
- android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="鍦烘櫙鍦板浘"
- android:textColor="@color/white"
- android:textSize="13sp"
- android:textStyle="bold"
- app:layout_constraintTop_toBottomOf="@id/iv_task_follow"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintEnd_toEndOf="parent"/>
- </android.support.constraint.ConstraintLayout>
+ android:layout_weight="1"
+ android:paddingStart="@dimen/dimen16"
+ android:paddingEnd="@dimen/dimen16"
+ android:paddingBottom="@dimen/dimen16"
+ app:layout_constraintTop_toTopOf="@id/rl_add_scense"
+ app:layout_constraintStart_toEndOf="@id/rl_add_scense"
+ app:layout_constraintEnd_toEndOf="parent"
+ android:background="@drawable/shape_green_task_follow"
+ android:orientation="vertical"
+ android:visibility="gone">
+
+ <ImageView
+ android:id="@+id/iv_task_follow"
+ android:layout_width="0dp"
+ android:layout_height="0dp"
+ app:layout_constraintDimensionRatio="w,1:1"
+ android:background="@drawable/icon_task_others_task"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintTop_toTopOf="parent"/>
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="鍦烘櫙鍦板浘"
+ android:textColor="@color/white"
+ android:textSize="13sp"
+ android:textStyle="bold"
+ app:layout_constraintTop_toBottomOf="@id/iv_task_follow"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"/>
+ </android.support.constraint.ConstraintLayout>
+
+ </LinearLayout>
</android.support.constraint.ConstraintLayout>
--
Gitblit v1.9.3