Browse Source

统一尺寸单位为dp,防止影响AutoSize屏幕适配

Frankensteinly 1 năm trước cách đây
mục cha
commit
5ecd9baff2

+ 15 - 15
app/src/main/res/layout/activity_home.xml

@@ -31,7 +31,7 @@
             android:id="@+id/ll_time"
             android:layout_width="0dp"
             android:layout_height="0dp"
-            android:layout_margin="10px"
+            android:layout_margin="3dp"
             android:background="@color/colorPrimary"
             android:orientation="vertical"
             app:layout_constraintBottom_toTopOf="@id/ll_sop"
@@ -52,11 +52,11 @@
             android:id="@+id/ll_sop"
             android:layout_width="0dp"
             android:layout_height="0dp"
-            android:layout_margin="10px"
+            android:layout_margin="3dp"
             android:background="@color/colorPrimary"
             android:orientation="vertical"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintLeft_toLeftOf="@id/ll_time"
+            app:layout_constraintLeft_toLeftOf="@id/barrier"
             app:layout_constraintRight_toRightOf="parent"
             app:layout_constraintTop_toBottomOf="@id/ll_time">
 
@@ -80,17 +80,17 @@
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:orientation="horizontal"
+            android:visibility="gone"
             app:layout_constraintHorizontal_weight="1"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toLeftOf="@id/barrier"
-            app:layout_constraintTop_toTopOf="parent"
-            android:visibility="gone">
+            app:layout_constraintTop_toTopOf="parent">
 
             <LinearLayout
                 android:id="@+id/ll_module_left"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout_margin="10px"
+                android:layout_margin="3dp"
                 android:layout_weight="1"
                 android:background="@color/colorPrimary"
                 android:orientation="vertical">
@@ -101,7 +101,7 @@
                 android:id="@+id/ll_module_right"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout_margin="10px"
+                android:layout_margin="3dp"
                 android:layout_weight="1"
                 android:background="@color/colorPrimary"
                 android:orientation="vertical">
@@ -123,36 +123,36 @@
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
+                android:layout_margin="3dp"
                 android:layout_weight="1"
-                android:background="@color/colorPrimary"
-                android:layout_margin="10px">
+                android:background="@color/colorPrimary">
 
             </androidx.constraintlayout.widget.ConstraintLayout>
 
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
+                android:layout_margin="3dp"
                 android:layout_weight="1"
-                android:background="@color/colorPrimary"
-                android:layout_margin="10px">
+                android:background="@color/colorPrimary">
 
             </androidx.constraintlayout.widget.ConstraintLayout>
 
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
+                android:layout_margin="3dp"
                 android:layout_weight="1"
-                android:background="@color/colorPrimary"
-                android:layout_margin="10px">
+                android:background="@color/colorPrimary">
 
             </androidx.constraintlayout.widget.ConstraintLayout>
 
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
+                android:layout_margin="3dp"
                 android:layout_weight="1"
-                android:background="@color/colorPrimary"
-                android:layout_margin="10px">
+                android:background="@color/colorPrimary">
 
             </androidx.constraintlayout.widget.ConstraintLayout>
         </LinearLayout>

+ 12 - 12
app/src/main/res/layout/activity_presentation.xml

@@ -7,8 +7,8 @@
     android:layout_height="match_parent"
     android:orientation="vertical"
     android:overScrollMode="never"
-    android:paddingHorizontal="100px"
-    android:paddingTop="20px"
+    android:paddingHorizontal="33dp"
+    android:paddingTop="7dp"
     android:scrollbars="none"
     tools:context=".presentation.PresentationActivity">
 
@@ -30,7 +30,7 @@
             android:id="@+id/si_workshop"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="20px"
+            android:layout_marginTop="7dp"
             app:edittext_hint="@string/presentation_hint_workshop"
             app:enabled="false"
             app:mode="input"
@@ -40,7 +40,7 @@
             android:id="@+id/si_line"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="20px"
+            android:layout_marginTop="7dp"
             app:edittext_hint="@string/presentation_hint_line"
             app:enabled="false"
             app:mode="input"
@@ -50,7 +50,7 @@
             android:id="@+id/si_ticket_name"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="20px"
+            android:layout_marginTop="7dp"
             app:edittext_hint="@string/presentation_hint_name"
             app:mode="input"
             app:name="@string/presentation_ticket_name" />
@@ -59,7 +59,7 @@
             android:id="@+id/si_ticket_number"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="20px"
+            android:layout_marginTop="7dp"
             app:edittext_hint="@string/presentation_hint_number"
             app:enabled="false"
             app:mode="input"
@@ -69,7 +69,7 @@
             android:id="@+id/si_ticket_type"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="20px"
+            android:layout_marginTop="7dp"
             app:edittext_hint="@string/presentation_hint_type"
             app:enabled="false"
             app:mode="input"
@@ -79,7 +79,7 @@
             android:id="@+id/si_segregation_point"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="20px"
+            android:layout_marginTop="7dp"
             app:edittext_hint="@string/presentation_hint_point"
             app:enabled="false"
             app:mode="input"
@@ -89,7 +89,7 @@
             android:id="@+id/si_person_lock"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="20px"
+            android:layout_marginTop="7dp"
             app:edittext_hint="@string/presentation_hint_locker"
             app:mode="select"
             app:name="@string/presentation_person_lock"
@@ -98,7 +98,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="20px"
+            android:layout_marginTop="7dp"
             android:orientation="horizontal">
 
             <TextView
@@ -118,7 +118,7 @@
             android:id="@+id/si_person_safety"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="20px"
+            android:layout_marginTop="7dp"
             app:edittext_hint="@string/presentation_hint_safety"
             app:mode="select"
             app:name="@string/presentation_person_safety" />
@@ -126,7 +126,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="20px"
+            android:layout_marginTop="7dp"
             android:orientation="horizontal">
 
             <TextView

+ 2 - 2
app/src/main/res/layout/common_dialog_loading_progress.xml

@@ -6,8 +6,8 @@
     android:layout_height="wrap_content"
     android:gravity="center_horizontal"
     android:orientation="vertical"
-    android:paddingHorizontal="60px"
-    android:paddingVertical="10px"
+    android:paddingHorizontal="20dp"
+    android:paddingVertical="3dp"
     tools:background="@android:color/darker_gray">
 
     <TextView

+ 14 - 14
app/src/main/res/values/dimens.xml

@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <dimen name="common_text_size">15sp</dimen>
-    <dimen name="common_radius">3px</dimen>
+    <dimen name="common_radius">1dp</dimen>
 
-    <dimen name="title_bar_height">150px</dimen>
-    <dimen name="title_bar_padding">20px</dimen>
+    <dimen name="title_bar_height">50dp</dimen>
+    <dimen name="title_bar_padding">7dp</dimen>
     <dimen name="title_bar_title_text_size">20sp</dimen>
     <dimen name="title_bar_sub_title_text_size">10sp</dimen>
-    <dimen name="title_bar_back_size">50px</dimen>
+    <dimen name="title_bar_back_size">17dp</dimen>
     
-    <dimen name="home_navi_height">600px</dimen>
-    <dimen name="home_navi_width">400px</dimen>
+    <dimen name="home_navi_height">200dp</dimen>
+    <dimen name="home_navi_width">133dp</dimen>
 
-    <dimen name="selectable_input_width">250px</dimen>
-    <dimen name="selectable_input_radius">6px</dimen>
-    <dimen name="selectable_input_stroke">2px</dimen>
-    <dimen name="selectable_input_min_height">70px</dimen>
-    <dimen name="selectable_input_spinner_arrow_size">30px</dimen>
-    <dimen name="selectable_input_spinner_arrow_margin">10px</dimen>
-    <dimen name="selectable_input_edit_padding">10px</dimen>
+    <dimen name="selectable_input_width">83dp</dimen>
+    <dimen name="selectable_input_radius">2dp</dimen>
+    <dimen name="selectable_input_stroke">1dp</dimen>
+    <dimen name="selectable_input_min_height">23dp</dimen>
+    <dimen name="selectable_input_spinner_arrow_size">10dp</dimen>
+    <dimen name="selectable_input_spinner_arrow_margin">3dp</dimen>
+    <dimen name="selectable_input_edit_padding">3dp</dimen>
 
-    <dimen name="rv_item_margin">2px</dimen>
+    <dimen name="rv_item_margin">1dp</dimen>
 </resources>