Fix/UI

meokgu-skku · Jun 1, 2024 · 596c8d8 · 596c8d8
1 parent 076a63b
commit 596c8d8
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 17 deletions.
diff --git a/src/components/StoreCompo.js b/src/components/StoreCompo.js
@@ -44,7 +44,7 @@ export default function StoreCompo(props) {
 
   const scrollViewRef = useRef();
 
-  const {storeData, index, addPadding} = props;
+  const {storeData, index, addPadding, fade} = props;
 
   console.log('storeData', storeData);
   return (
@@ -86,6 +86,18 @@ export default function StoreCompo(props) {
             uri: storeData.representativeImageUrl,
           }}
         />
+
+        {fade ? (
+          <View
+            style={{
+              position: 'absolute',
+              width: windowWidth / 3,
+              height: windowWidth / 3,
+              backgroundColor: 'rgba(0, 0, 0, 0.3)',
+              borderRadius: 10,
+            }}
+          />
+        ) : null}
         <View
           style={{
             flex: 1,

diff --git a/src/components/TodayPick.js b/src/components/TodayPick.js
@@ -86,7 +86,12 @@ export default function TodayPick(props) {
         ref={scrollViewRef}>
         {todaysPick.map((pickData, index) => {
           return (
-            <StoreCompo storeData={pickData} index={index} addPadding={10} />
+            <StoreCompo
+              storeData={pickData}
+              index={index}
+              addPadding={10}
+              fade={true}
+            />
           );
         })}
       </ScrollView>

diff --git a/src/screens/detail/ReviewWriteScreen.js b/src/screens/detail/ReviewWriteScreen.js
@@ -255,7 +255,8 @@ const styles = StyleSheet.create({
   },
   storeName: {
     fontSize: 22,
-    fontWeight: 'bold',
+    // fontWeight: 'bold',
+    fontFamily: 'NIXGONFONTS M 2.0',
     color: COLOR_TEXT_BLACK,
     maxWidth: (windowWidth * 3) / 5,
   },
@@ -266,9 +267,9 @@ const styles = StyleSheet.create({
     flexDirection: 'row',
     alignItems: 'center',
     justifyContent: 'center',
-    backgroundColor: COLOR_GRAY,
-    borderColor: COLOR_PRIMARY,
-    borderWidth: 1,
+    backgroundColor: COLOR_LIGHTGRAY,
+    // borderColor: COLOR_PRIMARY,
+    // borderWidth: 1,
     padding: 12,
     borderRadius: 8,
     marginTop: 6,
@@ -315,6 +316,7 @@ const styles = StyleSheet.create({
     borderWidth: 1,
     borderRadius: 8,
     padding: 12,
+    fontFamily: 'NanumSquareRoundB',
     // width: '92%',
     // marginHorizontal: 16,
     height: 160,
@@ -353,7 +355,8 @@ const styles = StyleSheet.create({
   },
   submitButtonText: {
     color: COLOR_WHITE,
+    fontFamily: 'NanumSquareRoundEB',
     fontSize: 18,
-    fontWeight: '600',
+    // fontWeight: '600',
   },
 });
diff --git a/src/screens/mypage/MypageScreen.js b/src/screens/mypage/MypageScreen.js
@@ -163,18 +163,16 @@ export default function MyPageScreen() {
       <ScrollView contentContainerStyle={styles.entire}>
         {profileImageUrl != '' ? (
           <Image
-            style={[styles.myPageItem, styles.myPageItemLayout]}
+            style={[styles.myPageItem]}
             resizeMode="cover"
-            source={
-              profileImageUrl
-                ? {uri: profileImageUrl}
-                : require('../../assets/images/logo.png')
-            }
+            source={{uri: profileImageUrl}}
           />
         ) : (
-          <View style={[styles.myPageItem, styles.myPageItemLayout]}>
-            <SvgXml xml={svgXml.icon.prodileDefault} width="100" height="100" />
-          </View>
+          <Image
+            style={[styles.myPageItemLayout]}
+            resizeMode="cover"
+            source={require('../../assets/images/logo.png')}
+          />
         )}
         <TouchableOpacity
           style={styles.text6Position}
@@ -228,11 +226,16 @@ const styles = StyleSheet.create({
   myPageItem: {
     width: 100,
     height: 100,
+    marginTop: 20,
+    marginBottom: 10,
+    borderRadius: 50,
   },
   myPageItemLayout: {
+    width: 100,
+    height: 100,
     marginTop: 20,
     marginBottom: 10,
-    borderRadius: 50,
+    borderRadius: 15,
   },
   text6: {
     fontSize: 20,