From 4f5085fc858fa31f2af1773a7174ebccb3dc09c8 Mon Sep 17 00:00:00 2001
From: hch <16607480311@163.com>
Date: Tue, 17 Oct 2023 17:26:18 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A8=AD=E5=AE=9A=E5=85=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 OneToOne/src/main/AndroidManifest.xml         |  6 +-
 .../main/res/drawable/bg_dialog_tip_apply.xml |  4 +-
 .../main/res/drawable/setting_item_top.xml    |  9 +++
 .../src/main/res/layout/view_title_custom.xml | 56 +++++++++++++++++++
 4 files changed, 72 insertions(+), 3 deletions(-)
 create mode 100644 OneToOne/src/main/res/drawable/setting_item_top.xml
 create mode 100644 OneToOne/src/main/res/layout/view_title_custom.xml

diff --git a/OneToOne/src/main/AndroidManifest.xml b/OneToOne/src/main/AndroidManifest.xml
index 5a8ab0e96..5de36921a 100644
--- a/OneToOne/src/main/AndroidManifest.xml
+++ b/OneToOne/src/main/AndroidManifest.xml
@@ -148,12 +148,16 @@
             android:name=".activity.HomeSearchActivity"
             android:windowSoftInputMode="stateHidden|adjustResize" />
 
-
         <activity
             android:name=".activity.login.ChooseLabelActivity"
             android:label="选择标签"
             android:windowSoftInputMode="stateHidden|adjustResize" />
 
+        <activity
+            android:name=".activity.setting.SettingActivity"
+            android:label="設定"
+            android:windowSoftInputMode="stateHidden|adjustResize" />
+
         <provider
             android:name="androidx.core.content.FileProvider"
             android:authorities="com.shayu.onetoone.fileprovider"
diff --git a/OneToOne/src/main/res/drawable/bg_dialog_tip_apply.xml b/OneToOne/src/main/res/drawable/bg_dialog_tip_apply.xml
index 1ce07ca26..d6f18a840 100644
--- a/OneToOne/src/main/res/drawable/bg_dialog_tip_apply.xml
+++ b/OneToOne/src/main/res/drawable/bg_dialog_tip_apply.xml
@@ -2,8 +2,8 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:width="70dp" android:height="38dp">
         <shape android:shape="rectangle">
-            <gradient android:type="linear" android:useLevel="true" android:endColor="#ff907cdf" android:startColor="#ffd96ef1" android:angle="135" />
-            <corners android:topLeftRadius="19dp" android:topRightRadius="19dp" android:bottomLeftRadius="19dp" android:bottomRightRadius="19dp" />
+            <gradient android:angle="135" android:endColor="#ff907cdf" android:startColor="#ffd96ef1" android:type="linear" android:useLevel="true" />
+            <corners android:bottomLeftRadius="19dp" android:bottomRightRadius="19dp" android:topLeftRadius="19dp" android:topRightRadius="19dp" />
         </shape>
     </item>
 </selector>
\ No newline at end of file
diff --git a/OneToOne/src/main/res/drawable/setting_item_top.xml b/OneToOne/src/main/res/drawable/setting_item_top.xml
new file mode 100644
index 000000000..74e169897
--- /dev/null
+++ b/OneToOne/src/main/res/drawable/setting_item_top.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:width="70dp" android:height="38dp">
+        <shape android:shape="rectangle">
+            <gradient android:angle="135" android:endColor="@color/white" android:startColor="@color/white" android:type="linear" android:useLevel="true" />
+            <corners android:bottomLeftRadius="10dp" android:bottomRightRadius="10dp" android:topLeftRadius="10dp" android:topRightRadius="10dp" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/OneToOne/src/main/res/layout/view_title_custom.xml b/OneToOne/src/main/res/layout/view_title_custom.xml
new file mode 100644
index 000000000..3e60dec53
--- /dev/null
+++ b/OneToOne/src/main/res/layout/view_title_custom.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="75dp"
+    android:paddingTop="24dp">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <TextView
+            android:id="@+id/titleView"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_centerHorizontal="true"
+            android:gravity="center"
+            android:textColor="@color/textColor"
+            android:textSize="18sp"
+            android:textStyle="bold" />
+
+        <ImageView
+            android:id="@+id/btn_back"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:layout_centerVertical="true"
+            android:onClick="backClick"
+            android:padding="9dp"
+            android:src="@mipmap/icon_back"
+            app:tint="@color/textColor" />
+
+        <ImageView
+            android:id="@+id/img_more"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:layout_alignParentRight="true"
+            android:layout_centerVertical="true"
+            android:padding="9dp"
+            android:src="@mipmap/btn_more_black"
+            android:visibility="gone"
+            app:tint="@color/textColor" />
+
+
+        <ImageView
+            android:id="@+id/redPacketMain"
+            android:layout_width="20dp"
+            android:layout_height="match_parent"
+            android:layout_alignParentRight="true"
+            android:layout_marginRight="15dp"
+            android:visibility="invisible"
+            app:srcCompat="@mipmap/ic_red_packet_record"
+            tools:visibility="invisible" />
+
+    </RelativeLayout>
+</FrameLayout>