refactor(更新)

- 新建sop作业和修改sop作业的对齐问题处理

app/src/main/res/layout-land/fragment_create_sop_job.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android">
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -28,8 +29,8 @@
                 android:layout_weight="1"
                 android:text="@string/create_sop_job_title"
                 android:textColor="@color/black"
-                android:textStyle="bold"
-                android:textSize="@dimen/normal_text_size_25" />
+                android:textSize="@dimen/normal_text_size_25"
+                android:textStyle="bold" />
 
             <TextView
                 android:id="@+id/back"
@@ -89,105 +90,102 @@
                         android:layout_height="@dimen/divider_line_space"
                         android:background="@color/black" />
 
-                    <LinearLayout
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
-                        android:orientation="vertical">
+                        android:paddingHorizontal="@dimen/dialog_content_normal_padding_horizontal"
+                        android:paddingBottom="@dimen/common_spacing">
 
-                        <LinearLayout
-                            android:layout_width="match_parent"
+                        <TextView
+                            android:id="@+id/sop_workstation_tv"
+                            android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginTop="@dimen/common_spacing"
-                            android:gravity="center_vertical"
-                            android:orientation="horizontal"
-                            android:paddingHorizontal="@dimen/dialog_content_normal_padding_horizontal">
-
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:text="@string/sop_workstation"
-                                android:textColor="@color/black"
-                                android:textSize="@dimen/common_text_size" />
+                            android:text="@string/sop_workstation"
+                            android:textColor="@color/black"
+                            android:textSize="@dimen/common_text_size"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent" />
 
-                            <TextView
-                                android:id="@+id/workstation_tv"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:layout_marginLeft="@dimen/common_spacing"
-                                android:background="@drawable/bg_common_input"
-                                android:drawableRight="@mipmap/icon_drop_down"
-                                android:hint="@string/please_select_sop_workstation"
-                                android:maxLines="1"
-                                android:paddingHorizontal="@dimen/common_spacing"
-                                android:paddingVertical="2dp"
-                                android:singleLine="true"
-                                android:textColor="@color/black"
-                                android:textSize="@dimen/common_text_size" />
-                        </LinearLayout>
+                        <TextView
+                            android:id="@+id/workstation_tv"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="@dimen/common_spacing"
+                            android:background="@drawable/bg_common_input"
+                            android:drawableRight="@mipmap/icon_drop_down"
+                            android:hint="@string/please_select_sop_workstation"
+                            android:maxLines="1"
+                            android:paddingHorizontal="@dimen/common_spacing"
+                            android:paddingVertical="2dp"
+                            android:singleLine="true"
+                            android:textColor="@color/black"
+                            android:textSize="@dimen/common_text_size"
+                            app:layout_constraintBottom_toBottomOf="@+id/sop_workstation_tv"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toEndOf="@+id/sop_workstation_tv"
+                            app:layout_constraintTop_toTopOf="@+id/sop_workstation_tv" />
 
-                        <LinearLayout
-                            android:layout_width="match_parent"
+                        <TextView
+                            android:id="@+id/sop_title"
+                            android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_marginLeft="36dp"
                             android:layout_marginTop="@dimen/common_spacing"
-                            android:gravity="center_vertical"
-                            android:orientation="horizontal"
-                            android:paddingHorizontal="@dimen/dialog_content_normal_padding_horizontal">
-
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:text="@string/create_sop_job_sop"
-                                android:textColor="@color/black"
-                                android:textSize="@dimen/common_text_size" />
+                            android:text="@string/create_sop_job_sop"
+                            android:textColor="@color/black"
+                            android:textSize="@dimen/common_text_size"
+                            app:layout_constraintEnd_toEndOf="@+id/sop_workstation_tv"
+                            app:layout_constraintTop_toBottomOf="@+id/sop_workstation_tv" />
 
-                            <TextView
-                                android:id="@+id/sop_tv"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:layout_marginLeft="@dimen/common_spacing"
-                                android:background="@drawable/bg_common_input"
-                                android:drawableRight="@mipmap/icon_drop_down"
-                                android:hint="@string/please_select_sop"
-                                android:maxLines="1"
-                                android:paddingHorizontal="@dimen/common_spacing"
-                                android:paddingVertical="2dp"
-                                android:singleLine="true"
-                                android:textColor="@color/black"
-                                android:textSize="@dimen/common_text_size" />
-                        </LinearLayout>
+                        <TextView
+                            android:id="@+id/sop_tv"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="@dimen/common_spacing"
+                            android:background="@drawable/bg_common_input"
+                            android:drawableRight="@mipmap/icon_drop_down"
+                            android:hint="@string/please_select_sop"
+                            android:maxLines="1"
+                            android:paddingHorizontal="@dimen/common_spacing"
+                            android:paddingVertical="2dp"
+                            android:singleLine="true"
+                            android:textColor="@color/black"
+                            android:textSize="@dimen/common_text_size"
+                            app:layout_constraintBottom_toBottomOf="@+id/sop_title"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toEndOf="@+id/sop_title"
+                            app:layout_constraintTop_toTopOf="@+id/sop_title" />
 
-                        <LinearLayout
-                            android:layout_width="match_parent"
+                        <TextView
+                            android:id="@+id/job_name_tv"
+                            android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginTop="@dimen/common_spacing"
-                            android:layout_marginBottom="@dimen/common_spacing"
-                            android:gravity="center_vertical"
-                            android:orientation="horizontal"
-                            android:paddingHorizontal="@dimen/dialog_content_normal_padding_horizontal">
-
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:text="@string/job_name"
-                                android:textColor="@color/black"
-                                android:textSize="@dimen/common_text_size" />
+                            android:text="@string/job_name"
+                            android:textColor="@color/black"
+                            android:textSize="@dimen/common_text_size"
+                            app:layout_constraintEnd_toEndOf="@+id/sop_title"
+                            app:layout_constraintTop_toBottomOf="@+id/sop_title" />
 
-                            <EditText
-                                android:id="@+id/job_name_et"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:layout_marginLeft="@dimen/common_spacing"
-                                android:background="@drawable/bg_common_input"
-                                android:hint="@string/please_input_job_name"
-                                android:maxLines="1"
-                                android:paddingHorizontal="@dimen/common_spacing"
-                                android:paddingVertical="2dp"
-                                android:singleLine="true"
-                                android:textColor="@color/black"
-                                android:textSize="@dimen/common_text_size" />
-                        </LinearLayout>
-                    </LinearLayout>
+                        <EditText
+                            android:id="@+id/job_name_et"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="@dimen/common_spacing"
+                            android:background="@drawable/bg_common_input"
+                            android:hint="@string/please_input_job_name"
+                            android:maxLines="1"
+                            android:paddingHorizontal="@dimen/common_spacing"
+                            android:paddingVertical="2dp"
+                            android:singleLine="true"
+                            android:textColor="@color/black"
+                            android:textSize="@dimen/common_text_size"
+                            app:layout_constraintBottom_toBottomOf="@+id/job_name_tv"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toEndOf="@+id/job_name_tv"
+                            app:layout_constraintTop_toTopOf="@+id/job_name_tv" />
+                    </androidx.constraintlayout.widget.ConstraintLayout>
                 </LinearLayout>
 
                 <LinearLayout
@@ -239,8 +237,8 @@
                             android:id="@+id/workflow_rv"
                             android:layout_width="match_parent"
                             android:layout_height="match_parent"
-                            android:scrollbars="horizontal"
-                            android:paddingHorizontal="@dimen/common_spacing" />
+                            android:paddingHorizontal="@dimen/common_spacing"
+                            android:scrollbars="horizontal" />
 
                         <TextView
                             android:id="@+id/select_workflow_tip"

app/src/main/res/layout-land/fragment_edit_sop_job.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android">
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -90,24 +91,27 @@
                         android:background="@color/black" />
 
 
-                    <LinearLayout
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="@dimen/common_spacing"
-                        android:gravity="center_vertical"
-                        android:orientation="horizontal"
-                        android:paddingHorizontal="@dimen/dialog_content_normal_padding_horizontal">
+                        android:layout_height="match_parent"
+                        android:paddingHorizontal="@dimen/dialog_content_normal_padding_horizontal"
+                        android:paddingBottom="@dimen/common_spacing">
 
                         <TextView
+                            android:id="@+id/sop_workstation_tv"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
+                            android:layout_marginTop="@dimen/common_spacing"
                             android:text="@string/sop_workstation"
                             android:textColor="@color/black"
-                            android:textSize="@dimen/common_text_size" />
+                            android:textSize="@dimen/common_text_size"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent" />
 
                         <TextView
                             android:id="@+id/workstation_tv"
-                            android:layout_width="match_parent"
+                            android:layout_width="0dp"
                             android:layout_height="wrap_content"
                             android:layout_marginLeft="@dimen/common_spacing"
                             android:background="@drawable/bg_common_input"
@@ -118,28 +122,26 @@
                             android:paddingVertical="2dp"
                             android:singleLine="true"
                             android:textColor="@color/black"
-                            android:textSize="@dimen/common_text_size" />
-                    </LinearLayout>
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginLeft="36dp"
-                        android:layout_marginTop="@dimen/common_spacing"
-                        android:gravity="center_vertical"
-                        android:orientation="horizontal"
-                        android:paddingHorizontal="@dimen/dialog_content_normal_padding_horizontal">
+                            android:textSize="@dimen/common_text_size"
+                            app:layout_constraintBottom_toBottomOf="@+id/sop_workstation_tv"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toEndOf="@+id/sop_workstation_tv"
+                            app:layout_constraintTop_toTopOf="@+id/sop_workstation_tv" />
 
                         <TextView
+                            android:id="@+id/sop_title"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
+                            android:layout_marginTop="@dimen/common_spacing"
                             android:text="@string/create_sop_job_sop"
                             android:textColor="@color/black"
-                            android:textSize="@dimen/common_text_size" />
+                            android:textSize="@dimen/common_text_size"
+                            app:layout_constraintEnd_toEndOf="@+id/sop_workstation_tv"
+                            app:layout_constraintTop_toBottomOf="@+id/sop_workstation_tv" />
 
                         <TextView
                             android:id="@+id/sop_tv"
-                            android:layout_width="match_parent"
+                            android:layout_width="0dp"
                             android:layout_height="wrap_content"
                             android:layout_marginLeft="@dimen/common_spacing"
                             android:background="@drawable/bg_common_input"
@@ -150,28 +152,26 @@
                             android:paddingVertical="2dp"
                             android:singleLine="true"
                             android:textColor="@color/black"
-                            android:textSize="@dimen/common_text_size" />
-                    </LinearLayout>
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="@dimen/common_spacing"
-                        android:layout_marginBottom="@dimen/common_spacing"
-                        android:gravity="center_vertical"
-                        android:orientation="horizontal"
-                        android:paddingHorizontal="@dimen/dialog_content_normal_padding_horizontal">
+                            android:textSize="@dimen/common_text_size"
+                            app:layout_constraintBottom_toBottomOf="@+id/sop_title"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toEndOf="@+id/sop_title"
+                            app:layout_constraintTop_toTopOf="@+id/sop_title" />
 
                         <TextView
+                            android:id="@+id/job_name_tv"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
+                            android:layout_marginTop="@dimen/common_spacing"
                             android:text="@string/job_name"
                             android:textColor="@color/black"
-                            android:textSize="@dimen/common_text_size" />
+                            android:textSize="@dimen/common_text_size"
+                            app:layout_constraintEnd_toEndOf="@+id/sop_title"
+                            app:layout_constraintTop_toBottomOf="@+id/sop_title" />
 
                         <EditText
                             android:id="@+id/job_name_et"
-                            android:layout_width="match_parent"
+                            android:layout_width="0dp"
                             android:layout_height="wrap_content"
                             android:layout_marginLeft="@dimen/common_spacing"
                             android:background="@drawable/bg_common_input"
@@ -181,8 +181,12 @@
                             android:paddingVertical="2dp"
                             android:singleLine="true"
                             android:textColor="@color/black"
-                            android:textSize="@dimen/common_text_size" />
-                    </LinearLayout>
+                            android:textSize="@dimen/common_text_size"
+                            app:layout_constraintBottom_toBottomOf="@+id/job_name_tv"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toEndOf="@+id/job_name_tv"
+                            app:layout_constraintTop_toTopOf="@+id/job_name_tv" />
+                    </androidx.constraintlayout.widget.ConstraintLayout>
                 </LinearLayout>
 
                 <LinearLayout

app/src/main/res/layout/fragment_create_sop_job.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android">
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -28,8 +29,8 @@
                 android:layout_weight="1"
                 android:text="@string/create_sop_job_title"
                 android:textColor="@color/black"
-                android:textStyle="bold"
-                android:textSize="@dimen/normal_text_size_25" />
+                android:textSize="@dimen/normal_text_size_25"
+                android:textStyle="bold" />
 
             <TextView
                 android:id="@+id/back"
@@ -68,7 +69,6 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:layout_weight="1"
                 android:text="@string/base_info_title"
                 android:textColor="@color/black"
                 android:textSize="@dimen/normal_text_size_18" />
@@ -78,25 +78,26 @@
                 android:layout_height="@dimen/divider_line_space"
                 android:background="@color/black" />
 
-
-            <LinearLayout
+            <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/common_spacing_2x"
-                android:gravity="center_vertical"
-                android:orientation="horizontal"
-                android:paddingHorizontal="@dimen/dialog_content_normal_padding_horizontal">
+                android:layout_height="match_parent"
+                android:paddingHorizontal="@dimen/dialog_content_normal_padding_horizontal"
+                android:paddingBottom="@dimen/common_spacing_2x">
 
                 <TextView
+                    android:id="@+id/sop_workstation_tv"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/common_spacing_2x"
                     android:text="@string/sop_workstation"
                     android:textColor="@color/black"
-                    android:textSize="@dimen/common_text_size" />
+                    android:textSize="@dimen/common_text_size"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
 
                 <TextView
                     android:id="@+id/workstation_tv"
-                    android:layout_width="match_parent"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="@dimen/common_spacing"
                     android:background="@drawable/bg_common_input"
@@ -107,28 +108,26 @@
                     android:paddingVertical="2dp"
                     android:singleLine="true"
                     android:textColor="@color/black"
-                    android:textSize="@dimen/common_text_size" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="36dp"
-                android:layout_marginTop="@dimen/common_spacing_2x"
-                android:gravity="center_vertical"
-                android:orientation="horizontal"
-                android:paddingHorizontal="@dimen/dialog_content_normal_padding_horizontal">
+                    android:textSize="@dimen/common_text_size"
+                    app:layout_constraintBottom_toBottomOf="@+id/sop_workstation_tv"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toEndOf="@+id/sop_workstation_tv"
+                    app:layout_constraintTop_toTopOf="@+id/sop_workstation_tv" />
 
                 <TextView
+                    android:id="@+id/sop_title"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/common_spacing_2x"
                     android:text="@string/create_sop_job_sop"
                     android:textColor="@color/black"
-                    android:textSize="@dimen/common_text_size" />
+                    android:textSize="@dimen/common_text_size"
+                    app:layout_constraintEnd_toEndOf="@+id/sop_workstation_tv"
+                    app:layout_constraintTop_toBottomOf="@+id/sop_workstation_tv" />
 
                 <TextView
                     android:id="@+id/sop_tv"
-                    android:layout_width="match_parent"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="@dimen/common_spacing"
                     android:background="@drawable/bg_common_input"
@@ -139,28 +138,26 @@
                     android:paddingVertical="2dp"
                     android:singleLine="true"
                     android:textColor="@color/black"
-                    android:textSize="@dimen/common_text_size" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/common_spacing_2x"
-                android:layout_marginBottom="@dimen/common_spacing_2x"
-                android:gravity="center_vertical"
-                android:orientation="horizontal"
-                android:paddingHorizontal="@dimen/dialog_content_normal_padding_horizontal">
+                    android:textSize="@dimen/common_text_size"
+                    app:layout_constraintBottom_toBottomOf="@+id/sop_title"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toEndOf="@+id/sop_title"
+                    app:layout_constraintTop_toTopOf="@+id/sop_title" />
 
                 <TextView
+                    android:id="@+id/job_name_tv"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/common_spacing_2x"
                     android:text="@string/job_name"
                     android:textColor="@color/black"
-                    android:textSize="@dimen/common_text_size" />
+                    android:textSize="@dimen/common_text_size"
+                    app:layout_constraintEnd_toEndOf="@+id/sop_title"
+                    app:layout_constraintTop_toBottomOf="@+id/sop_title" />
 
                 <EditText
                     android:id="@+id/job_name_et"
-                    android:layout_width="match_parent"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="@dimen/common_spacing"
                     android:background="@drawable/bg_common_input"
@@ -170,8 +167,13 @@
                     android:paddingVertical="2dp"
                     android:singleLine="true"
                     android:textColor="@color/black"
-                    android:textSize="@dimen/common_text_size" />
-            </LinearLayout>
+                    android:textSize="@dimen/common_text_size"
+                    app:layout_constraintBottom_toBottomOf="@+id/job_name_tv"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toEndOf="@+id/job_name_tv"
+                    app:layout_constraintTop_toTopOf="@+id/job_name_tv" />
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
         </LinearLayout>
 
         <LinearLayout
@@ -179,6 +181,7 @@
             android:layout_height="0dp"
             android:layout_weight="1"
             android:orientation="vertical">
+
             <LinearLayout
                 android:id="@+id/workflow_mode_layout"
                 android:layout_width="match_parent"
@@ -231,8 +234,8 @@
                         android:id="@+id/workflow_rv"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
-                        android:scrollbars="horizontal"
-                        android:paddingHorizontal="@dimen/common_spacing" />
+                        android:paddingHorizontal="@dimen/common_spacing"
+                        android:scrollbars="horizontal" />
 
                     <TextView
                         android:id="@+id/select_workflow_tip"
@@ -247,13 +250,14 @@
                         android:textSize="@dimen/normal_text_size_18" />
                 </FrameLayout>
             </LinearLayout>
+
             <LinearLayout
                 android:id="@+id/point_info_layout"
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
                 android:layout_marginHorizontal="@dimen/common_spacing_2x"
-                android:layout_weight="1"
                 android:layout_marginVertical="@dimen/common_spacing"
+                android:layout_weight="1"
                 android:background="@drawable/home_card_bg"
                 android:gravity="center_vertical"
                 android:orientation="vertical">
@@ -316,8 +320,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
                 android:layout_marginHorizontal="@dimen/common_spacing_2x"
-                android:layout_weight="1"
                 android:layout_marginVertical="@dimen/common_spacing"
+                android:layout_weight="1"
                 android:background="@drawable/home_card_bg"
                 android:gravity="center_vertical"
                 android:orientation="vertical">

app/src/main/res/layout/fragment_edit_sop_job.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android">
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -79,24 +80,27 @@
                 android:background="@color/black" />
 
 
-            <LinearLayout
+
+            <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/common_spacing_2x"
-                android:gravity="center_vertical"
-                android:orientation="horizontal"
-                android:paddingHorizontal="@dimen/dialog_content_normal_padding_horizontal">
+                android:layout_height="match_parent"
+                android:paddingHorizontal="@dimen/dialog_content_normal_padding_horizontal"
+                android:paddingBottom="@dimen/common_spacing_2x">
 
                 <TextView
+                    android:id="@+id/sop_workstation_tv"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/common_spacing_2x"
                     android:text="@string/sop_workstation"
                     android:textColor="@color/black"
-                    android:textSize="@dimen/common_text_size" />
+                    android:textSize="@dimen/common_text_size"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
 
                 <TextView
                     android:id="@+id/workstation_tv"
-                    android:layout_width="match_parent"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="@dimen/common_spacing"
                     android:background="@drawable/bg_common_input"
@@ -107,28 +111,26 @@
                     android:paddingVertical="2dp"
                     android:singleLine="true"
                     android:textColor="@color/black"
-                    android:textSize="@dimen/common_text_size" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="36dp"
-                android:layout_marginTop="@dimen/common_spacing_2x"
-                android:gravity="center_vertical"
-                android:orientation="horizontal"
-                android:paddingHorizontal="@dimen/dialog_content_normal_padding_horizontal">
+                    android:textSize="@dimen/common_text_size"
+                    app:layout_constraintBottom_toBottomOf="@+id/sop_workstation_tv"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toEndOf="@+id/sop_workstation_tv"
+                    app:layout_constraintTop_toTopOf="@+id/sop_workstation_tv" />
 
                 <TextView
+                    android:id="@+id/sop_title"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/common_spacing_2x"
                     android:text="@string/create_sop_job_sop"
                     android:textColor="@color/black"
-                    android:textSize="@dimen/common_text_size" />
+                    android:textSize="@dimen/common_text_size"
+                    app:layout_constraintEnd_toEndOf="@+id/sop_workstation_tv"
+                    app:layout_constraintTop_toBottomOf="@+id/sop_workstation_tv" />
 
                 <TextView
                     android:id="@+id/sop_tv"
-                    android:layout_width="match_parent"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="@dimen/common_spacing"
                     android:background="@drawable/bg_common_input"
@@ -139,28 +141,26 @@
                     android:paddingVertical="2dp"
                     android:singleLine="true"
                     android:textColor="@color/black"
-                    android:textSize="@dimen/common_text_size" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/common_spacing_2x"
-                android:layout_marginBottom="@dimen/common_spacing_2x"
-                android:gravity="center_vertical"
-                android:orientation="horizontal"
-                android:paddingHorizontal="@dimen/dialog_content_normal_padding_horizontal">
+                    android:textSize="@dimen/common_text_size"
+                    app:layout_constraintBottom_toBottomOf="@+id/sop_title"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toEndOf="@+id/sop_title"
+                    app:layout_constraintTop_toTopOf="@+id/sop_title" />
 
                 <TextView
+                    android:id="@+id/job_name_tv"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/common_spacing_2x"
                     android:text="@string/job_name"
                     android:textColor="@color/black"
-                    android:textSize="@dimen/common_text_size" />
+                    android:textSize="@dimen/common_text_size"
+                    app:layout_constraintEnd_toEndOf="@+id/sop_title"
+                    app:layout_constraintTop_toBottomOf="@+id/sop_title" />
 
                 <EditText
                     android:id="@+id/job_name_et"
-                    android:layout_width="match_parent"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="@dimen/common_spacing"
                     android:background="@drawable/bg_common_input"
@@ -170,8 +170,12 @@
                     android:paddingVertical="2dp"
                     android:singleLine="true"
                     android:textColor="@color/black"
-                    android:textSize="@dimen/common_text_size" />
-            </LinearLayout>
+                    android:textSize="@dimen/common_text_size"
+                    app:layout_constraintBottom_toBottomOf="@+id/job_name_tv"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toEndOf="@+id/job_name_tv"
+                    app:layout_constraintTop_toTopOf="@+id/job_name_tv" />
+            </androidx.constraintlayout.widget.ConstraintLayout>
         </LinearLayout>
 
         <LinearLayout