From 65d6cc9db00405dac6bc60a459c7657a1f3cdeae Mon Sep 17 00:00:00 2001
From: yezian <jueweijue@gmail.com>
Date: Mon, 25 Mar 2024 14:21:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=BFMyModal=E7=BB=84=E4=BB=B6=E5=8F=AF?=
 =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E6=8C=89=E9=92=AE=E6=96=87=E6=A1=88?=
 =?UTF-8?q?=EF=BC=9B=E4=BF=AE=E6=94=B9=E8=8E=B7=E5=8F=96=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E6=96=87=E6=A1=88=EF=BC=9B=E7=AE=80=E5=8D=95?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BF=AE=E6=94=B9=E5=A4=B4=E5=83=8F=E6=97=B6?=
 =?UTF-8?q?=E5=85=B3=E9=97=AD=E6=9D=83=E9=99=90=E5=BC=B9=E7=AA=97=E4=BC=9A?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4=E6=97=A0=E6=B3=95=E7=AC=AC=E4=BA=8C=E6=AC=A1?=
 =?UTF-8?q?=E8=AF=B7=E6=B1=82=E6=9D=83=E9=99=90=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.json                                                 | 6 +++---
 components/MediaPickerModal/index.jsx                    | 2 ++
 components/MyModal/index.jsx                             | 8 +++++---
 screeens/EditUserProfile/SelectUserProfileItem/index.jsx | 2 +-
 tailwind.css                                             | 5 +++++
 tailwind.json                                            | 6 ++++++
 6 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/app.json b/app.json
index 6deb44c..fe141e7 100644
--- a/app.json
+++ b/app.json
@@ -46,14 +46,14 @@
       [
         "expo-camera",
         {
-          "cameraPermission": "允许铁粉空间使用您的相机"
+          "cameraPermission": "允许铁粉空间使用您的相机，以便拍摄或录制您需要的内容"
         }
       ],
       [
         "expo-media-library",
         {
-          "photosPermission": "允许铁粉空间访问您的相册",
-          "savePhotosPermission": "允许铁粉空间保存图片到相册",
+          "photosPermission": "允许铁粉空间访问您的相册，以便您选择合适的图片进行上传",
+          "savePhotosPermission": "允许铁粉空间保存图片到相册，以便您稍后在相册中继续查看",
           "isAccessMediaLocationEnabled": true
         }
       ],
diff --git a/components/MediaPickerModal/index.jsx b/components/MediaPickerModal/index.jsx
index 827a26a..e90b562 100644
--- a/components/MediaPickerModal/index.jsx
+++ b/components/MediaPickerModal/index.jsx
@@ -299,6 +299,7 @@ export default function MediaPickerModal({
         setVisible={setRequestModalVisible}
         title="权限申请"
         content="该功能需要开启存储权限，用于选择上传媒体文件"
+        confirmText="继续"
         cancel={() => {
           setRequestModalVisible(false);
         }}
@@ -312,6 +313,7 @@ export default function MediaPickerModal({
         setVisible={setOverlayVisible}
         title="您还未打开媒体权限"
         content="是否前往设置开启权限？"
+        confirmText="继续"
         cancel={() => {
           setOverlayVisible(false);
         }}
diff --git a/components/MyModal/index.jsx b/components/MyModal/index.jsx
index 58095cc..1b99a1e 100644
--- a/components/MyModal/index.jsx
+++ b/components/MyModal/index.jsx
@@ -8,6 +8,8 @@ export default function MyModal({
   title,
   content,
   confirm,
+  confirmText,
+  cancelText,
 }) {
   const tailwind = useTailwind();
   return (
@@ -24,7 +26,7 @@ export default function MyModal({
         }}
       >
         <View
-          style={tailwind("p-2 rounded-2xl bg-[#1E1C29] items-center w-3/4")}
+          style={tailwind("p-2 rounded-2xl bg-[#17161A] items-center w-3/4")}
         >
           <Text
             style={tailwind(
@@ -50,7 +52,7 @@ export default function MyModal({
                   "text-[#FFFFFF80] text-base font-medium text-center"
                 )}
               >
-                取消
+                {cancelText ? cancelText : "取消"}
               </Text>
             </TouchableOpacity>
             <TouchableOpacity
@@ -62,7 +64,7 @@ export default function MyModal({
               <Text
                 style={tailwind("text-white text-base font-medium text-center")}
               >
-                确认
+                {confirmText ? confirmText : "确认"}
               </Text>
             </TouchableOpacity>
           </View>
diff --git a/screeens/EditUserProfile/SelectUserProfileItem/index.jsx b/screeens/EditUserProfile/SelectUserProfileItem/index.jsx
index e19068d..cacea3a 100644
--- a/screeens/EditUserProfile/SelectUserProfileItem/index.jsx
+++ b/screeens/EditUserProfile/SelectUserProfileItem/index.jsx
@@ -135,7 +135,7 @@ export default function SelectUserProfileItem({ navigation, route }) {
         <View style={tailwind("flex-row justify-between items-center mt-2")}>
           <Text style={tailwind("text-base text-white font-medium")}>头像</Text>
           <TouchableOpacity
-            onPress={() => setMediaPickerModalVisible(true)}
+            onPress={() => setMediaPickerModalVisible(!mediaPickerModalVisible)}
             style={tailwind("flex-row items-center")}
           >
             <Image
diff --git a/tailwind.css b/tailwind.css
index c08e3e5..379219f 100644
--- a/tailwind.css
+++ b/tailwind.css
@@ -542,6 +542,11 @@
   background-color: rgb(19 18 31 / var(--tw-bg-opacity))
 }
 
+.bg-\[\#17161A\] {
+  --tw-bg-opacity: 1;
+  background-color: rgb(23 22 26 / var(--tw-bg-opacity))
+}
+
 .bg-\[\#1E1C29\] {
   --tw-bg-opacity: 1;
   background-color: rgb(30 28 41 / var(--tw-bg-opacity))
diff --git a/tailwind.json b/tailwind.json
index ccdd292..6e87332 100644
--- a/tailwind.json
+++ b/tailwind.json
@@ -724,6 +724,12 @@
 			"backgroundColor": "rgb(19 18 31 / var(--tw-bg-opacity))"
 		}
 	},
+	"bg-[#17161A]": {
+		"style": {
+			"--tw-bg-opacity": 1,
+			"backgroundColor": "rgb(23 22 26 / var(--tw-bg-opacity))"
+		}
+	},
 	"bg-[#1E1C29]": {
 		"style": {
 			"--tw-bg-opacity": 1,