From b7a34738a6001b04ba16d5e21a23a2da37f568c5 Mon Sep 17 00:00:00 2001 From: Lani Jung Date: Mon, 23 Aug 2021 01:41:46 +0900 Subject: [PATCH 1/3] lint fix --- App/FollowApp/asset/img/.img | 0 .../12.png => asset/img/MyCloset/profile.png} | Bin .../src/context/MySelectionContext.js | 8 ++- .../src/screens/MyCloset/MyClosetScreen.js | 62 ++++++++---------- 4 files changed, 35 insertions(+), 35 deletions(-) delete mode 100644 App/FollowApp/asset/img/.img rename App/FollowApp/{src/screens/MyCloset/Image/12.png => asset/img/MyCloset/profile.png} (100%) diff --git a/App/FollowApp/asset/img/.img b/App/FollowApp/asset/img/.img deleted file mode 100644 index e69de29..0000000 diff --git a/App/FollowApp/src/screens/MyCloset/Image/12.png b/App/FollowApp/asset/img/MyCloset/profile.png similarity index 100% rename from App/FollowApp/src/screens/MyCloset/Image/12.png rename to App/FollowApp/asset/img/MyCloset/profile.png diff --git a/App/FollowApp/src/context/MySelectionContext.js b/App/FollowApp/src/context/MySelectionContext.js index bb06ddc..fbddd92 100644 --- a/App/FollowApp/src/context/MySelectionContext.js +++ b/App/FollowApp/src/context/MySelectionContext.js @@ -3,8 +3,12 @@ import React, {useState, createContext} from 'react'; const MySelectionContext = createContext({ state: {top: '', bottom: ''}, actions: { - setTop: () => {}, - setBottom: () => {}, + setTop: () => { + // this is intentional + }, + setBottom: () => { + // this is intentional + }, }, }); diff --git a/App/FollowApp/src/screens/MyCloset/MyClosetScreen.js b/App/FollowApp/src/screens/MyCloset/MyClosetScreen.js index 33f8ddb..6aebca0 100644 --- a/App/FollowApp/src/screens/MyCloset/MyClosetScreen.js +++ b/App/FollowApp/src/screens/MyCloset/MyClosetScreen.js @@ -4,58 +4,40 @@ import {StyleSheet, View, Image, Text, TouchableOpacity} from 'react-native'; function MyClosetScreen({navigation}) { return ( - + - - 주돌이 - + 주돌이 - - jkworldchampion@gamil.com - + jkworldchampion@gamil.com navigation.navigate('MyClothes')}> - MyCloth + MyCloth navigation.navigate('MyLook')}> - MyLook + MyLook navigation.navigate('MyAvatar')}> - MyAvatar + MyAvatar navigation.navigate('TryOn')}> - TryOn + TryOn @@ -70,7 +52,7 @@ const styles = StyleSheet.create({ marginTop: 100, marginLeft: 140, }, - BoxButton: { + boxButton: { justifyContent: 'flex-start', backgroundColor: 'black', padding: 0, @@ -79,17 +61,31 @@ const styles = StyleSheet.create({ width: 170, height: 150, }, - upbox: { + upBox: { width: '100%', height: '10%', backgroundColor: 'black', }, - Boxtext: { + boxText: { fontSize: 16.5, textAlign: 'center', marginTop: 60, color: 'white', }, + nameText: { + marginTop: 60, + textAlign: 'center', + fontWeight: 'bold', + fontSize: 20, + color: 'black', + }, + emailText: { + marginTop: 10, + textAlign: 'center', + fontWeight: 'normal', + fontSize: 15, + color: 'black', + }, }); export default MyClosetScreen; From 4813f44454d17deb5e6eaabc929ecd90cf99f43c Mon Sep 17 00:00:00 2001 From: Lani Jung Date: Mon, 23 Aug 2021 01:46:23 +0900 Subject: [PATCH 2/3] fix profile height --- App/FollowApp/src/screens/MyCloset/MyClosetScreen.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/App/FollowApp/src/screens/MyCloset/MyClosetScreen.js b/App/FollowApp/src/screens/MyCloset/MyClosetScreen.js index 33f8ddb..31c42be 100644 --- a/App/FollowApp/src/screens/MyCloset/MyClosetScreen.js +++ b/App/FollowApp/src/screens/MyCloset/MyClosetScreen.js @@ -67,7 +67,7 @@ const styles = StyleSheet.create({ width: 110, height: 110, position: 'absolute', - marginTop: 100, + marginTop: 0, marginLeft: 140, }, BoxButton: { From 7b3b389dfb5494b74f746192923c12b9740855ef Mon Sep 17 00:00:00 2001 From: Lani Jung Date: Mon, 23 Aug 2021 01:52:58 +0900 Subject: [PATCH 3/3] css fix: profile image align center --- .../src/screens/MyCloset/MyClosetScreen.js | 31 ++++++++++++------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/App/FollowApp/src/screens/MyCloset/MyClosetScreen.js b/App/FollowApp/src/screens/MyCloset/MyClosetScreen.js index d787589..237bae6 100644 --- a/App/FollowApp/src/screens/MyCloset/MyClosetScreen.js +++ b/App/FollowApp/src/screens/MyCloset/MyClosetScreen.js @@ -1,15 +1,17 @@ import React from 'react'; import {StyleSheet, View, Image, Text, TouchableOpacity} from 'react-native'; +import styled from 'styled-components'; function MyClosetScreen({navigation}) { return ( - + + + 주돌이 @@ -44,14 +46,21 @@ function MyClosetScreen({navigation}) { ); } +const ProfileContainer = styled.View` + top: 0; + left: 0; + right: 0; + bottom: 0; + align-items: center; + justify-content: center; +`; +const ProfileImage = styled.Image` + width: 110px; + height: 110px; + position: absolute; +`; + const styles = StyleSheet.create({ - container: { - width: 110, - height: 110, - position: 'absolute', - marginTop: 0, - marginLeft: 140, - }, boxButton: { justifyContent: 'flex-start', backgroundColor: 'black',