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

[Kan 136-2] Fix/signup UI #47

Merged
merged 6 commits into from
Jun 1, 2024
Merged

[Kan 136-2] Fix/signup UI #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
51d9df4
Fix/
sjsjmine129 Jun 1, 2024
076a63b
Fix/reviewWrite
sjsjmine129 Jun 1, 2024
596c8d8
Fix/UI
sjsjmine129 Jun 1, 2024
24aa827
Fix/color
sjsjmine129 Jun 1, 2024
f006780
Merge branch 'main' into KAN-136-2
sjsjmine129 Jun 1, 2024
737866f
Merge branch 'main' into KAN-136-2
sjsjmine129 Jun 1, 2024
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
2 changes: 1 addition & 1 deletion src/assets/svg.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/components/HeaderWhite.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ export default function HeaderWhite(props) {
) : null}
<Text
style={{
color: COLOR_TEXT70GRAY,
color: COLOR_PRIMARY,
fontSize: 16,
fontWeight: 'bold',
textAlign: 'center',
Expand Down
28 changes: 20 additions & 8 deletions src/components/LongPrimaryButton.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,32 +4,44 @@ import {COLOR_WHITE, COLOR_PRIMARY, COLOR_DISABLE_GRAY} from '../assets/color';
import AnimatedButton from './AnimationButton';

export default function LongPrimaryButton(props) {
const { text, action, disable } = props;
const {text, action, disable} = props;

return (
<AnimatedButton
onPress={action}
style={[styles.buttonTest, disable && styles.buttonDisabled]}
disabled={disable}>
<Text style={[styles.buttonText, disable && styles.textDisabled]}>{text}</Text>
onPress={() => {
if (disable) return;
action();
}}
style={[
styles.buttonTest,
disable
? {backgroundColor: COLOR_PRIMARY}
: {backgroundColor: COLOR_PRIMARY},
]}
// disabled={disable}
>
<Text style={[styles.buttonText, disable && styles.textDisabled]}>
{text}
</Text>
</AnimatedButton>
);
}

const styles = StyleSheet.create({
buttonTest: {
backgroundColor: COLOR_PRIMARY,
// backgroundColor: COLOR_PRIMARY,
padding: 16,
borderRadius: 5,
borderRadius: 10,
justifyContent: 'center',
alignItems: 'center',
width: '90%',
},
buttonText: {
fontSize: 14,
color: COLOR_WHITE,
fontWeight: 'normal',
// fontWeight: 'normal',
alignSelf: 'center',
fontFamily: 'NanumSquareRoundEB',
},
textDisabled: {
color: COLOR_WHITE,
Expand Down
8 changes: 5 additions & 3 deletions src/screens/signup/CheckEmailScreen.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import {
COLOR_WHITE,
COLOR_BACKGROUND,
COLOR_GRAY,
COLOR_HOME_BACKGROUND,
COLOR_PRIMARY,
COLOR_TEXT70GRAY,
COLOR_SECONDARY,
Expand Down Expand Up @@ -167,11 +168,12 @@ const styles = StyleSheet.create({
justifyContent: 'center',
},
samllText: {
color: COLOR_TEXT70GRAY,
color: COLOR_PRIMARY,
fontSize: 14,
textAlign: 'center',
paddingVertical: 4,
fontWeight: 'bold',
// fontWeight: 'bold',
fontFamily: 'NanumSquareRoundB',
marginBottom: 8,
},
textinputBox: {
Expand All @@ -180,7 +182,7 @@ const styles = StyleSheet.create({
borderWidth: 1,
borderRadius: 5,
paddingHorizontal: 15,
backgroundColor: '#F8F8F8',
backgroundColor: COLOR_HOME_BACKGROUND,
fontSize: 16,
width: '100%',
},
Expand Down
3 changes: 2 additions & 1 deletion src/screens/signup/CheckEmailScreen2.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import {
import {
COLOR_WHITE,
COLOR_BACKGROUND,
COLOR_HOME_BACKGROUND,
COLOR_GRAY,
COLOR_PRIMARY,
COLOR_TEXT70GRAY,
Expand Down Expand Up @@ -164,7 +165,7 @@ const styles = StyleSheet.create({
borderWidth: 1,
borderRadius: 5,
paddingHorizontal: 15,
backgroundColor: '#F8F8F8',
backgroundColor: COLOR_HOME_BACKGROUND,
fontSize: 16,
width: '100%',
},
Expand Down
8 changes: 5 additions & 3 deletions src/screens/signup/FindPasswordScreen.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import {
} from 'react-native';
import {
COLOR_WHITE,
COLOR_HOME_BACKGROUND,
COLOR_BACKGROUND,
COLOR_GRAY,
COLOR_PRIMARY,
Expand Down Expand Up @@ -126,11 +127,12 @@ const styles = StyleSheet.create({
justifyContent: 'center',
},
samllText: {
color: COLOR_TEXT70GRAY,
color: COLOR_PRIMARY,
fontSize: 14,
textAlign: 'center',
paddingVertical: 4,
fontWeight: 'bold',
// fontWeight: 'bold',
fontFamily: 'NanumSquareRoundB',
marginBottom: 8,
},
textinputBox: {
Expand All @@ -139,7 +141,7 @@ const styles = StyleSheet.create({
borderWidth: 1,
borderRadius: 5,
paddingHorizontal: 15,
backgroundColor: '#F8F8F8',
backgroundColor: COLOR_HOME_BACKGROUND,
fontSize: 16,
width: '100%',
},
Expand Down
22 changes: 13 additions & 9 deletions src/screens/signup/LoginScreen.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ import {
COLOR_PRIMARY,
COLOR_TEXT70GRAY,
COLOR_SECONDARY,
COLOR_LIGHTGRAY,
COLOR_HOME_BACKGROUND,
} from '../../assets/color';
import AnimatedButton from '../../components/AnimationButton';
import {useNavigation} from '@react-navigation/native';
Expand Down Expand Up @@ -128,7 +130,7 @@ export default function LoginScreen() {
}}
value={email}
style={styles.textinputBox}
placeholder=''
placeholder=""
/>
</View>
<View style={{height: 20}} />
Expand Down Expand Up @@ -165,10 +167,10 @@ export default function LoginScreen() {
</View>

<View style={{height: 40}} />
<LongPrimaryButton
text="로그인하기"
action={login}
disable={disable}
<LongPrimaryButton
text="로그인하기"
action={login}
disable={disable}
/>
<View
style={{
Expand Down Expand Up @@ -228,17 +230,19 @@ const styles = StyleSheet.create({
justifyContent: 'center',
},
samllText: {
color: COLOR_TEXT70GRAY,
color: COLOR_PRIMARY,
fontSize: 14,
textAlign: 'center',
paddingVertical: 4,
fontWeight: 'bold',
// fontWeight: 'bold',
fontFamily: 'NanumSquareRoundB',
marginBottom: 8,
},
samllTextColor: {
color: COLOR_SECONDARY,
fontSize: 12,
fontWeight: 'normal',
// fontWeight: 'normal',
fontFamily: 'NanumSquareRoundB',
textAlign: 'center',
paddingVertical: 4,
},
Expand All @@ -248,7 +252,7 @@ const styles = StyleSheet.create({
borderWidth: 1,
borderRadius: 5,
paddingHorizontal: 15,
backgroundColor: '#F8F8F8',
backgroundColor: COLOR_HOME_BACKGROUND,
fontSize: 16,
width: '100%',
},
Expand Down
5 changes: 3 additions & 2 deletions src/screens/signup/ProfileSetScreen.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import {
} from 'react-native';
import {
COLOR_WHITE,
COLOR_HOME_BACKGROUND,
COLOR_BACKGROUND,
COLOR_GRAY,
COLOR_PRIMARY,
Expand Down Expand Up @@ -226,7 +227,7 @@ const styles = StyleSheet.create({
justifyContent: 'center',
},
samllText: {
color: COLOR_TEXT70GRAY,
color: COLOR_PRIMARY,
fontSize: 14,
textAlign: 'center',
paddingVertical: 4,
Expand All @@ -239,7 +240,7 @@ const styles = StyleSheet.create({
borderWidth: 1,
borderRadius: 5,
paddingHorizontal: 15,
backgroundColor: '#F8F8F8',
backgroundColor: COLOR_HOME_BACKGROUND,
fontSize: 16,
width: '100%',
},
Expand Down
8 changes: 5 additions & 3 deletions src/screens/signup/ResetPasswordScreen.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import {
import {
COLOR_WHITE,
COLOR_BACKGROUND,
COLOR_HOME_BACKGROUND,
COLOR_GRAY,
COLOR_PRIMARY,
COLOR_TEXT70GRAY,
Expand Down Expand Up @@ -208,11 +209,12 @@ const styles = StyleSheet.create({
justifyContent: 'center',
},
samllText: {
color: COLOR_TEXT70GRAY,
color: COLOR_PRIMARY,
fontSize: 14,
textAlign: 'center',
paddingVertical: 4,
fontWeight: 'bold',
// fontWeight: 'bold',
fontFamily: 'NanumSquareRoundB',
marginBottom: 8,
},
textinputBox: {
Expand All @@ -221,7 +223,7 @@ const styles = StyleSheet.create({
borderWidth: 1,
borderRadius: 5,
paddingHorizontal: 15,
backgroundColor: '#F8F8F8',
backgroundColor: COLOR_HOME_BACKGROUND,
fontSize: 16,
width: '100%',
},
Expand Down
22 changes: 16 additions & 6 deletions src/screens/signup/SignupScreen.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import {
COLOR_WHITE,
COLOR_BACKGROUND,
COLOR_GRAY,
COLOR_HOME_BACKGROUND,
COLOR_PRIMARY,
COLOR_TEXT70GRAY,
COLOR_SECONDARY,
Expand Down Expand Up @@ -229,7 +230,7 @@ export default function SignupScreen() {
</View>
</View>

<View style={{height: 20}} />
<View style={{height: 50}} />
<LongPrimaryButton
text={
password === passwordCheck
Expand All @@ -246,10 +247,10 @@ export default function SignupScreen() {
marginTop: 12,
padding: 4,
}}>
<Text style={styles.samllText}>
<Text style={styles.samllText2}>
{'가입하시면 이용약관 및 개인정보 보호정책에'}
</Text>
<Text style={[styles.samllText, {marginTop: -5}]}>
<Text style={[styles.samllText2, {marginTop: -5}]}>
{'자동으로 동의하게 됩니다.'}
</Text>
</View>
Expand Down Expand Up @@ -280,20 +281,29 @@ const styles = StyleSheet.create({
justifyContent: 'center',
},
samllText: {
color: COLOR_TEXT70GRAY,
color: COLOR_PRIMARY,
fontSize: 14,
textAlign: 'center',
paddingVertical: 4,
fontWeight: 'bold',
// fontWeight: 'bold',
fontFamily: 'NanumSquareRoundB',
marginBottom: 8,
},
samllText2: {
color: COLOR_TEXT70GRAY,
fontSize: 14,
textAlign: 'center',
marginBottom: 8,
// fontWeight: 'bold',
fontFamily: 'NanumSquareRoundB',
},
textinputBox: {
height: 50,
borderColor: '#F8F8F8',
borderWidth: 1,
borderRadius: 5,
paddingHorizontal: 15,
backgroundColor: '#F8F8F8',
backgroundColor: COLOR_HOME_BACKGROUND,
fontSize: 16,
width: '100%',
},
Expand Down
Loading