From 7e3cd7dc43c0c6b611c3225cfa441dcb18989d77 Mon Sep 17 00:00:00 2001
From: FongMi <b8892778@gmail.com>
Date: Thu, 29 Sep 2022 23:10:37 +0800
Subject: [PATCH] Update ui

---
 .../fongmi/android/tv/ui/custom/dialog/ConfigDialog.java    | 4 ++--
 app/src/leanback/res/layout/activity_push.xml               | 2 +-
 app/src/leanback/res/layout/dialog_config.xml               | 6 +++---
 app/src/leanback/res/values-zh-rCN/strings.xml              | 2 +-
 app/src/leanback/res/values-zh-rTW/strings.xml              | 2 +-
 app/src/leanback/res/values/strings.xml                     | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/custom/dialog/ConfigDialog.java b/app/src/leanback/java/com/fongmi/android/tv/ui/custom/dialog/ConfigDialog.java
index 4ca2f98d0..8a5b20431 100644
--- a/app/src/leanback/java/com/fongmi/android/tv/ui/custom/dialog/ConfigDialog.java
+++ b/app/src/leanback/java/com/fongmi/android/tv/ui/custom/dialog/ConfigDialog.java
@@ -45,7 +45,7 @@ public class ConfigDialog implements DialogInterface.OnDismissListener {
 
     private void initDialog() {
         WindowManager.LayoutParams params = dialog.getWindow().getAttributes();
-        params.width = (int) (ResUtil.getScreenWidthPx() * 0.6f);
+        params.width = (int) (ResUtil.getScreenWidthPx() * 0.55f);
         dialog.getWindow().setAttributes(params);
         dialog.getWindow().setDimAmount(0);
         dialog.setOnDismissListener(this);
@@ -56,7 +56,7 @@ public class ConfigDialog implements DialogInterface.OnDismissListener {
         String address = Server.get().getAddress(false);
         binding.text.setText(Prefers.getUrl());
         binding.text.setSelection(binding.text.getText().length());
-        binding.code.setImageBitmap(QRCode.getBitmap(address, 200, 0));
+        binding.code.setImageBitmap(QRCode.getBitmap(address, 170, 0));
         binding.info.setText(ResUtil.getString(R.string.push_info, address).replace("，", "\n"));
     }
 
diff --git a/app/src/leanback/res/layout/activity_push.xml b/app/src/leanback/res/layout/activity_push.xml
index 0d7c7d8f6..166ec7cdc 100644
--- a/app/src/leanback/res/layout/activity_push.xml
+++ b/app/src/leanback/res/layout/activity_push.xml
@@ -19,7 +19,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="24dp"
         android:gravity="center"
-        android:lineSpacingExtra="4dp"
+        android:lineSpacingExtra="8dp"
         android:shadowColor="@color/black"
         android:shadowDx="2"
         android:shadowDy="2"
diff --git a/app/src/leanback/res/layout/dialog_config.xml b/app/src/leanback/res/layout/dialog_config.xml
index e577d1037..9a38380a9 100644
--- a/app/src/leanback/res/layout/dialog_config.xml
+++ b/app/src/leanback/res/layout/dialog_config.xml
@@ -7,8 +7,8 @@
 
     <ImageView
         android:id="@+id/code"
-        android:layout_width="200dp"
-        android:layout_height="200dp"
+        android:layout_width="170dp"
+        android:layout_height="170dp"
         android:scaleType="fitXY" />
 
     <TextView
@@ -30,7 +30,7 @@
         android:layout_height="wrap_content"
         android:layout_above="@+id/bottom"
         android:layout_alignStart="@+id/info"
-        android:layout_marginBottom="16dp"
+        android:layout_marginBottom="10dp"
         android:hint="@string/dialog_config_hint"
         android:imeOptions="actionDone"
         android:importantForAutofill="no"
diff --git a/app/src/leanback/res/values-zh-rCN/strings.xml b/app/src/leanback/res/values-zh-rCN/strings.xml
index f7f6f67eb..caf698d34 100644
--- a/app/src/leanback/res/values-zh-rCN/strings.xml
+++ b/app/src/leanback/res/values-zh-rCN/strings.xml
@@ -19,6 +19,6 @@
     <string name="collect_result">“<xliff:g name="name">%s</xliff:g>”的搜索结果</string>
 
     <!-- Push -->
-    <string name="push_info">手机或电脑连接同一个局域网，扫描 QR Code 或浏览器输入地址\n<xliff:g name="name">%s</xliff:g></string>
+    <string name="push_info">请用手机扫描二维码，或于浏览器中访问地址\n<xliff:g name="name">%s</xliff:g></string>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/leanback/res/values-zh-rTW/strings.xml b/app/src/leanback/res/values-zh-rTW/strings.xml
index 065c5cba5..f7f400236 100644
--- a/app/src/leanback/res/values-zh-rTW/strings.xml
+++ b/app/src/leanback/res/values-zh-rTW/strings.xml
@@ -19,6 +19,6 @@
     <string name="collect_result">「<xliff:g name="name">%s</xliff:g>」的搜尋結果</string>
 
     <!-- Push -->
-    <string name="push_info">手機或電腦連接同一個區域網路，掃描 QR Code 或瀏覽器輸入網址\n<xliff:g name="name">%s</xliff:g></string>
+    <string name="push_info">請用手機掃描 QR Code，或於瀏覽器中輸入網址\n<xliff:g name="name">%s</xliff:g></string>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/leanback/res/values/strings.xml b/app/src/leanback/res/values/strings.xml
index 8950bbe4d..b9c1e6f30 100644
--- a/app/src/leanback/res/values/strings.xml
+++ b/app/src/leanback/res/values/strings.xml
@@ -19,6 +19,6 @@
     <string name="collect_result">Search results for <xliff:g name="name">%s</xliff:g></string>
 
     <!-- Push -->
-    <string name="push_info">Connect phone or pc to LAN and scan QR Code or enter the URL in browser\n<xliff:g name="name">%s</xliff:g></string>
+    <string name="push_info">Scan QR Code or enter the URL in browser\n<xliff:g name="name">%s</xliff:g></string>
 
 </resources>
\ No newline at end of file