更换图标

app/src/main/AndroidManifest.xml

@@ -116,7 +116,7 @@
 
         <service
             android:name=".service.QuickStartService"
-            android:icon="@android:drawable/btn_star"
+            android:icon="@drawable/qr"
             android:label="@string/app_name"
             android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
             <intent-filter>

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

@@ -8,7 +8,7 @@
     <TextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="10dp"
+        android:layout_marginTop="10dp"
         android:text="@string/scan_result"
         android:textSize="20sp" />
 
@@ -16,15 +16,19 @@
         android:id="@+id/et_result"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginLeft="10dp"
+        android:layout_marginRight="10dp"
         android:layout_marginBottom="10dp"
         android:autofillHints="@string/app_name"
-        android:inputType="text"
         android:minLines="5" />
 
     <Button
         android:id="@+id/btn_url"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginLeft="10dp"
+        android:layout_marginRight="10dp"
+        android:layout_marginBottom="10dp"
         android:text="@string/qrcode_open"
         android:visibility="gone" />
 

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

@@ -23,8 +23,7 @@
 	 
 	 <string name="qrcode_notice">The QR code pattern is placed in the framing frame for automatic scanning.</string>
 	 <string name="openorclose_light">Turn lights on or off</string>
-	 <string name="qrcode_empty"></string>
-	 
+
 	 <string name="qrcode_open">Open with a browser</string>
 	 
 	 <string name="paramete_error">The parameters are correct, please rescan</string>

app/src/main/res/values/colors.xml

@@ -12,7 +12,7 @@
     <color name="viewfinder_laser">#ffcc0000</color> <!-- Android standard ICS color -->
     <color name="viewfinder_mask">#60000000</color>
     <color name="viewfinder_frame">#ff88ae00</color>
-<!--    basetheme-->
+    <!--    basetheme-->
     <color name="colorPrimary">#6200EE</color>
     <color name="colorPrimaryDark">#3700B3</color>
     <color name="colorAccent">#03DAC5</color>

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

@@ -4,30 +4,29 @@
     <string name="app_name">QRCode</string>
     <string name="action_settings">Settings</string>
     <string name="hello_world">Hello world!</string>
-    
-	<string name="camera_open_notice">您已经开启了灯光！</string>
-	<string name="camera_close_notice">您已经关闭了灯光！</string>
-    
-	<string name="camera_problem">抱歉，您相机出现问题。您可能需要重启设备。</string>
-	<string name="framwork_problem">二维码扫描暂时出现问题。请检查摄像头权限。</string>
-	<string name="msg_share_subject_line">这是我所扫描条码的内容</string>
-	<string name="msg_default_mms_subject">Hi</string>
-	<string name="msg_intent_failed">抱歉，无法打开所需软件。 条码内容可能无效。</string>
-	 <string name="button_ok">确定</string>
-	 <string name="result_uri">网址路径</string>
-	 
-	 <string name="button_1">浏览器打开</string>
-	 <string name="button_2">内容</string>
-	 <string name="button_3">其它标题</string>
-	 <string name="result_title_default">网址路径</string>
-	 
-	 <string name="qrcode_notice">将二维码图案放在取景框内，即可自动扫描。</string>
-	 <string name="openorclose_light">打开或关闭灯光</string>
-	 <string name="qrcode_empty"></string>
-	 
-	 <string name="qrcode_open">用浏览器打开</string>
-	 
-	 <string name="paramete_error">参数正确，请重新扫描</string>
-	 <string name="scan_result">扫描结果为：</string>
-	 <string name="auto_copy">已自动复制到剪切板</string>
+
+    <string name="camera_open_notice">您已经开启了灯光！</string>
+    <string name="camera_close_notice">您已经关闭了灯光！</string>
+
+    <string name="camera_problem">抱歉，您相机出现问题。您可能需要重启设备。</string>
+    <string name="framwork_problem">二维码扫描暂时出现问题。请检查摄像头权限。</string>
+    <string name="msg_share_subject_line">这是我所扫描条码的内容</string>
+    <string name="msg_default_mms_subject">Hi</string>
+    <string name="msg_intent_failed">抱歉，无法打开所需软件。 条码内容可能无效。</string>
+    <string name="button_ok">确定</string>
+    <string name="result_uri">网址路径</string>
+
+    <string name="button_1">浏览器打开</string>
+    <string name="button_2">内容</string>
+    <string name="button_3">其它标题</string>
+    <string name="result_title_default">网址路径</string>
+
+    <string name="qrcode_notice">将二维码图案放在取景框内，即可自动扫描。</string>
+    <string name="openorclose_light">打开或关闭灯光</string>
+
+    <string name="qrcode_open">用浏览器打开</string>
+
+    <string name="paramete_error">参数正确，请重新扫描</string>
+    <string name="scan_result">扫描结果为：</string>
+    <string name="auto_copy">已自动复制到剪切板</string>
 </resources>