Forráskód Böngészése

调整显示效果

Frankensteinly 1 éve
szülő
commit
d90eea3d7f

+ 10 - 8
app/src/main/res/layout/activity_presentation.xml

@@ -124,30 +124,32 @@
             <TextView
                 android:layout_width="@dimen/selectable_input_width"
                 android:layout_height="wrap_content"
-                android:layout_margin="20px"
+                android:layout_marginLeft="20px"
                 android:text="@string/start_time"
-                android:textColor="@color/main_color" />
+                android:textColor="@color/main_color"
+                android:textSize="@dimen/common_text_size" />
 
             <TextView
                 android:id="@+id/tv_start_time"
                 android:layout_width="400px"
                 android:layout_height="wrap_content"
-                android:layout_margin="20px"
-                android:background="@drawable/selectable_input_text_bg" />
+                android:background="@drawable/selectable_input_text_bg"
+                android:textSize="@dimen/common_text_size" />
 
             <TextView
                 android:layout_width="@dimen/selectable_input_width"
                 android:layout_height="wrap_content"
-                android:layout_margin="20px"
+                android:layout_marginLeft="100px"
                 android:text="@string/end_time"
-                android:textColor="@color/main_color" />
+                android:textColor="@color/main_color"
+                android:textSize="@dimen/common_text_size" />
 
             <TextView
                 android:id="@+id/tv_end_time"
                 android:layout_width="400px"
                 android:layout_height="wrap_content"
-                android:layout_margin="20px"
-                android:background="@drawable/selectable_input_text_bg" />
+                android:background="@drawable/selectable_input_text_bg"
+                android:textSize="@dimen/common_text_size" />
         </LinearLayout>
 
         <Button

+ 7 - 3
app/src/main/res/layout/layout_selectable_input.xml

@@ -10,20 +10,24 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/selectable_input_prefix"
-        android:textColor="@color/selectable_input_prefix" />
+        android:textColor="@color/selectable_input_prefix"
+        android:textSize="@dimen/common_text_size" />
 
     <TextView
         android:id="@+id/tv_name"
         android:layout_width="@dimen/selectable_input_width"
         android:layout_height="wrap_content"
-        android:textColor="@color/main_color" />
+        android:textColor="@color/main_color"
+        android:textSize="@dimen/common_text_size" />
 
     <EditText
         android:id="@+id/et"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@drawable/selectable_input_spinner_bg"
-        android:textColor="@color/black" />
+        android:padding="@dimen/selectable_input_edit_padding"
+        android:textColor="@color/black"
+        android:textSize="@dimen/common_text_size" />
 
     <!--    <Spinner-->
     <!--        android:id="@+id/spinner"-->

+ 2 - 1
app/src/main/res/values/dimens.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="common_text_size">20sp</dimen>
+    <dimen name="common_text_size">15sp</dimen>
     <dimen name="common_radius">3px</dimen>
 
     <dimen name="title_bar_height">150px</dimen>
@@ -18,6 +18,7 @@
     <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="rv_item_margin">2px</dimen>
 </resources>