From 02cf95b83d8d18dfa9eec7cf15920feacde9bb35 Mon Sep 17 00:00:00 2001
From: qiji4215 <qiji4215@navinfo.com>
Date: Thu, 1 Jun 2023 10:18:00 +0800
Subject: [PATCH] merge code
---
app/src/main/res/layout/activity_login.xml | 2 ++
app/src/main/res/values-w1024dp/dimens.xml | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index a756f978..c09460d9 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -117,6 +117,8 @@
tools:ignore="TouchTargetSizeCheck" />
</com.google.android.material.textfield.TextInputLayout>
+
+
<TextView
android:id="@+id/tv_login_forget_passwd"
android:layout_width="match_parent"
diff --git a/app/src/main/res/values-w1024dp/dimens.xml b/app/src/main/res/values-w1024dp/dimens.xml
index f7a9ffb0..2ea8fafc 100644
--- a/app/src/main/res/values-w1024dp/dimens.xml
+++ b/app/src/main/res/values-w1024dp/dimens.xml
@@ -1,5 +1,5 @@
<resources>
- <dimen name="fab_margin">200dp</dimen>
+ <dimen name="fab_margin">48dp</dimen>
<dimen name="top_right_drawer_btns_wh" comment="地图主页右上角抽屉按钮的大小">54dp</dimen>
<dimen name="top_right_drawer_wh" comment="地图主页右上角抽屉的把手按钮的大小">42dp</dimen>
<dimen name="top_right_drawer_btns_mr" comment="地图主页右上角抽屉按钮距离右侧间距">44dp</dimen>