UI修改

maning0303 · Aug 29, 2019 · 79cb747 · 79cb747
1 parent 4e4c0e6
commit 79cb747
Show file tree

Hide file tree

Showing 14 changed files with 16 additions and 18 deletions.
diff --git a/app/src/main/res/drawable-xxhdpi/icon_custom_photo.png b/app/src/main/res/drawable-xxhdpi/icon_custom_photo.png
diff --git a/libraryzxing/src/main/java/com/google/zxing/client/android/ViewfinderView.java b/libraryzxing/src/main/java/com/google/zxing/client/android/ViewfinderView.java
@@ -82,7 +82,7 @@ public ViewfinderView(Context context, AttributeSet attrs) {
         hintMsg = resources.getString(R.string.mn_scan_hint_text);
         //文字
         paintText.setColor(Color.WHITE);
-        paintText.setTextSize(CommonUtils.sp2px(context, 14));
+        paintText.setTextSize(CommonUtils.dip2px(context, 14));
         paintText.setTextAlign(Paint.Align.CENTER);
         //四角
         paintLine.setColor(laserColor);

diff --git a/libraryzxing/src/main/res/drawable-xhdpi/mn_icon_scan_close.png b/libraryzxing/src/main/res/drawable-xhdpi/mn_icon_scan_close.png
diff --git a/libraryzxing/src/main/res/drawable-xhdpi/mn_icon_scan_flash_light_off.png b/libraryzxing/src/main/res/drawable-xhdpi/mn_icon_scan_flash_light_off.png
diff --git a/libraryzxing/src/main/res/drawable-xhdpi/mn_icon_scan_flash_light_on.png b/libraryzxing/src/main/res/drawable-xhdpi/mn_icon_scan_flash_light_on.png
diff --git a/libraryzxing/src/main/res/drawable-xxhdpi/mn_icon_scan_close.png b/libraryzxing/src/main/res/drawable-xxhdpi/mn_icon_scan_close.png
diff --git a/libraryzxing/src/main/res/drawable-xxhdpi/mn_icon_scan_flash_light_off.png b/libraryzxing/src/main/res/drawable-xxhdpi/mn_icon_scan_flash_light_off.png
diff --git a/libraryzxing/src/main/res/drawable-xxhdpi/mn_icon_scan_flash_light_on.png b/libraryzxing/src/main/res/drawable-xxhdpi/mn_icon_scan_flash_light_on.png
diff --git a/libraryzxing/src/main/res/drawable-xxhdpi/mn_icon_scan_photo.png b/libraryzxing/src/main/res/drawable-xxhdpi/mn_icon_scan_photo.png
diff --git a/...res/drawable-xhdpi/mn_scan_icon_thumb.png → ...es/drawable-xxhdpi/mn_scan_icon_thumb.png b/...res/drawable-xhdpi/mn_scan_icon_thumb.png → ...es/drawable-xxhdpi/mn_scan_icon_thumb.png
diff --git a/...s/drawable-xhdpi/mn_scan_icon_zoom_in.png → .../drawable-xxhdpi/mn_scan_icon_zoom_in.png b/...s/drawable-xhdpi/mn_scan_icon_zoom_in.png → .../drawable-xxhdpi/mn_scan_icon_zoom_in.png
diff --git a/.../drawable-xhdpi/mn_scan_icon_zoom_out.png → ...drawable-xxhdpi/mn_scan_icon_zoom_out.png b/.../drawable-xhdpi/mn_scan_icon_zoom_out.png → ...drawable-xxhdpi/mn_scan_icon_zoom_out.png
diff --git a/libraryzxing/src/main/res/drawable/mn_scan_zoom_bg.xml b/libraryzxing/src/main/res/drawable/mn_scan_zoom_bg.xml
@@ -3,7 +3,7 @@
     android:shape="rectangle">
 
     <!-- 填充的颜色 -->
-    <solid android:color="#89000000" />
+    <solid android:color="#66000000" />
 
     <corners android:radius="20dp" />
 

diff --git a/libraryzxing/src/main/res/layout/mn_scan_capture.xml b/libraryzxing/src/main/res/layout/mn_scan_capture.xml
@@ -47,9 +47,8 @@
 
             <ImageView
                 android:id="@+id/iv_scan_light"
-                android:layout_width="wrap_content"
-                android:layout_height="46dp"
-                android:scaleType="fitCenter"
+                android:layout_width="24dp"
+                android:layout_height="24dp"
                 android:src="@drawable/mn_icon_scan_flash_light_off" />
 
             <TextView
@@ -59,7 +58,7 @@
                 android:layout_marginTop="6dp"
                 android:text="打开手电筒"
                 android:textColor="#FFFFFF"
-                android:textSize="12sp" />
+                android:textSize="12dp" />
 
         </LinearLayout>
         <!--关闭-->
@@ -72,8 +71,8 @@
             android:paddingRight="16dp">
 
             <ImageView
-                android:layout_width="24dp"
-                android:layout_height="24dp"
+                android:layout_width="26dp"
+                android:layout_height="26dp"
                 android:scaleType="centerInside"
                 android:src="@drawable/mn_icon_scan_close" />
 
@@ -88,12 +87,11 @@
             android:paddingLeft="16dp"
             android:paddingRight="20dp">
 
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="相册"
-                android:textColor="#FFFFFF"
-                android:textSize="16sp" />
+            <ImageView
+                android:layout_width="26dp"
+                android:layout_height="26dp"
+                android:scaleType="centerInside"
+                android:src="@drawable/mn_icon_scan_photo" />
 
         </LinearLayout>
     </RelativeLayout>
@@ -121,8 +119,8 @@
             android:layout_centerHorizontal="true"
             android:background="@drawable/mn_scan_zoom_bg"
             android:gravity="center"
-            android:paddingLeft="6dp"
-            android:paddingRight="6dp"
+            android:paddingLeft="4dp"
+            android:paddingRight="4dp"
             android:visibility="gone"
             tools:visibility="visible">
 
@@ -169,8 +167,8 @@
             android:background="@drawable/mn_scan_zoom_bg"
             android:gravity="center"
             android:orientation="vertical"
-            android:paddingTop="6dp"
-            android:paddingBottom="6dp"
+            android:paddingTop="4dp"
+            android:paddingBottom="4dp"
             android:visibility="gone"
             tools:visibility="visible">