优化英文状态下的显示

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

@@ -44,7 +44,8 @@
             <TextView
                 android:id="@+id/btn_cancel"
                 style="@style/CommonBtnBlue"
-                android:layout_width="80dp"
+                android:layout_width="wrap_content"
+                android:minWidth="80dp"
                 android:layout_height="25dp"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:backgroundTint="#99FF0000"

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

@@ -136,18 +136,21 @@
                         style="@style/CommonTextView"
                         android:layout_width="0dp"
                         android:layout_weight="1"
+                        android:paddingVertical="@dimen/common_spacing_small"
                         android:text="@string/effect" />
 
                     <TextView
                         style="@style/CommonTextView"
                         android:layout_width="0dp"
                         android:layout_weight="1"
+                        android:paddingVertical="@dimen/common_spacing_small"
                         android:text="@string/switch_status" />
 
                     <TextView
                         style="@style/CommonTextView"
                         android:layout_width="0dp"
                         android:layout_weight="1"
+                        android:paddingVertical="@dimen/common_spacing_small"
                         android:text="@string/lock_status" />
                 </LinearLayout>
 
@@ -182,18 +185,21 @@
                         style="@style/CommonTextView"
                         android:layout_width="0dp"
                         android:layout_weight="1"
+                        android:paddingVertical="@dimen/common_spacing_small"
                         android:text="@string/ready_to_colock" />
 
                     <TextView
                         style="@style/CommonTextView"
                         android:layout_width="0dp"
                         android:layout_weight="1"
+                        android:paddingVertical="@dimen/common_spacing_small"
                         android:text="@string/colocked" />
 
                     <TextView
                         style="@style/CommonTextView"
                         android:layout_width="0dp"
                         android:layout_weight="1"
+                        android:paddingVertical="@dimen/common_spacing_small"
                         android:text="@string/unlocked" />
                 </LinearLayout>
 

app/src/main/res/values-en/strings.xml

@@ -114,9 +114,9 @@
     <string name="switch_product">Changeover</string>
     <string name="clean">Cleaning</string>
     <string name="back">Back</string>
-    <string name="start_the_job">Start Permit</string>
-    <string name="finish_the_job">Finish Permit</string>
-    <string name="cancel_the_job">Cancel Permit</string>
+    <string name="start_the_job">Start</string>
+    <string name="finish_the_job">Finish</string>
+    <string name="cancel_the_job">Cancel</string>
     <string name="action_confirm">Action Confirmation</string>
     <string name="executed">Executed</string>
     <string name="not_executed">Pending Execution</string>
@@ -156,7 +156,7 @@
     <string name="unlocked">Unlocked</string>
     <string name="locked">Locked</string>
     <string name="go_locking">Go to Lock</string>
-    <string name="go_unlocking">Go to Unlock</string>
+    <string name="go_unlocking">Unlock</string>
     <string name="please_select_machinery">Please select process</string>
     <string name="please_select_sop_type">Please select SOP type</string>
     <string name="confirm">Confirm</string>