Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Profile fix #22

Merged
merged 4 commits into from
Aug 22, 2021
Merged

Profile fix #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b7a3473
lint fix
lani009 Aug 22, 2021
4813f44
fix profile height
lani009 Aug 22, 2021
d14a9f5
Merge remote-tracking branch 'origin/lint_fix' into profileFix
lani009 Aug 22, 2021
7b3b389
css fix: profile image align center
lani009 Aug 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file removed App/FollowApp/asset/img/.img
View file
Open in desktop
Empty file.
0 ...llowApp/src/screens/MyCloset/Image/12.png → App/FollowApp/asset/img/MyCloset/profile.png
View file
Open in desktop
File renamed without changes
8 changes: 6 additions & 2 deletions App/FollowApp/src/context/MySelectionContext.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
},
},
});

Expand Down
91 changes: 48 additions & 43 deletions App/FollowApp/src/screens/MyCloset/MyClosetScreen.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,76 +1,67 @@
import React from 'react';
import {StyleSheet, View, Image, Text, TouchableOpacity} from 'react-native';
import styled from 'styled-components';

function MyClosetScreen({navigation}) {
return (
<View>
<View style={styles.upbox} />
<View style={styles.upBox} />

<Image
source={require('./Image/12.png')}
style={styles.container}
/>
<ProfileContainer>
<ProfileImage
source={require('./../../../asset/img/MyCloset/profile.png')}
/>
</ProfileContainer>

<Text
style={{
marginTop: 60,
textAlign: 'center',
fontWeight: 'bold',
fontSize: 20,
color: 'black',
}}>
주돌이
</Text>
<Text style={styles.nameText}>주돌이</Text>

<Text
style={{
marginTop: 10,
textAlign: 'center',
fontWeight: 'normal',
fontSize: 15,
color: 'black',
}}>
jkworldchampion@gamil.com
</Text>
<Text style={styles.emailText}>jkworldchampion@gamil.com</Text>
<View
style={{flexDirection: 'row', justifyContent: 'space-evenly'}}>
<TouchableOpacity
style={styles.BoxButton}
style={styles.boxButton}
onPress={() => navigation.navigate('MyClothes')}>
<Text style={styles.Boxtext}>MyCloth</Text>
<Text style={styles.boxText}>MyCloth</Text>
</TouchableOpacity>
<TouchableOpacity
style={styles.BoxButton}
style={styles.boxButton}
onPress={() => navigation.navigate('MyLook')}>
<Text style={styles.Boxtext}>MyLook</Text>
<Text style={styles.boxText}>MyLook</Text>
</TouchableOpacity>
</View>
<View
style={{flexDirection: 'row', justifyContent: 'space-evenly'}}>
<TouchableOpacity
style={styles.BoxButton}
style={styles.boxButton}
onPress={() => navigation.navigate('MyAvatar')}>
<Text style={styles.Boxtext}>MyAvatar</Text>
<Text style={styles.boxText}>MyAvatar</Text>
</TouchableOpacity>
<TouchableOpacity
style={styles.BoxButton}
style={styles.boxButton}
onPress={() => navigation.navigate('TryOn')}>
<Text style={styles.Boxtext}>TryOn</Text>
<Text style={styles.boxText}>TryOn</Text>
</TouchableOpacity>
</View>
</View>
);
}

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: 100,
marginLeft: 140,
},
BoxButton: {
boxButton: {
justifyContent: 'flex-start',
backgroundColor: 'black',
padding: 0,
Expand All @@ -79,17 +70,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;