Skip to content

Commit c99b0a7

Browse files
aerainaerain
committed
디자인 수정
1 parent f1300ea commit c99b0a7

File tree

9 files changed

+71
-54
lines changed

9 files changed

+71
-54
lines changed

‎android/app/.classpath

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
3+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11/"/>
44
<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
55
<classpathentry kind="output" path="bin/default"/>
66
</classpath>

‎components/drawer/jnuservice/dreamy/LectureBoard.js

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import React, {useState, useEffect} from 'react'
22
import { View, TouchableOpacity, Text, FlatList, StyleSheet, ActivityIndicator, ScrollView, TextInput} from 'react-native';
33
import { getLectureBoardData } from '../../../../service/jedaeroService';
44
import colorPalette from '../../../styles/colorPalette';
5-
import { normalize } from 'react-native-elements';
5+
import { normalize, Input } from 'react-native-elements';
66
import Picker from 'react-native-picker-select';
77
import Icon from 'react-native-vector-icons/Ionicons';
88
import semesterData from '../../../../jsons/semesterMap';
@@ -59,25 +59,30 @@ const LectureBoard = ({navigation}) => {
5959
) : (
6060
<ScrollView>
6161
<View style={styles.header}>
62-
<TextInput
63-
style={styles.yearInput}
62+
<Text style={{fontSize: 14}}>수강학기</Text>
63+
<Input
6464
value={year}
6565
onChangeText={year => setYear(year)}
6666
maxLength={4}
67+
inputStyle={{fontSize: 14, textAlign: 'center', minHeight: undefined}}
68+
inputContainerStyle={{borderBottomWidth: 0.5, borderBottomColor: colorPalette.mainColor, width: 56, backgroundColor: colorPalette.cardBackgroundColor}}
69+
containerStyle={{width: undefined}}
6770
underlineColorAndroid={colorPalette.mainColor}
6871
/>
72+
<Text>년</Text>
6973
<Picker
7074
placeholder={{}}
7175
items={semesterData}
7276
value={semester}
7377
onValueChange={item => setSemester(item)}
7478
style={pickerSelectStyles}
75-
useNativeAndroidPickerStyle={false}
79+
useNativeAndroidPickerStyle={true}
7680
Icon={() => (<Icon name="md-arrow-dropdown" size={24} color={colorPalette.mainColor} style={{marginRight: 5}} />)}
7781
/>
78-
<Icon.Button name="ios-search" backgroundColor={colorPalette.mainColor} size={24} style={styles.submitButton}onPress={() => getLectureBoard()}>조회</Icon.Button>
82+
<TouchableOpacity style={{backgroundColor: colorPalette.mainColor, paddingVertical: 8, paddingHorizontal: 16, borderRadius: 4,}} onPress={() => getLectureBoard()}>
83+
<Text style={{fontSize: 14, color: colorPalette.cardBackgroundColor, fontWeight: 'bold'}}>조회</Text>
84+
</TouchableOpacity>
7985
</View>
80-
8186
<FlatList
8287
data={lectureBoard.lectures}
8388
keyExtractor={item => item.classCode}
@@ -97,9 +102,12 @@ LectureBoard.navigationOptions = {
97102

98103
const styles = StyleSheet.create({
99104
header: {
105+
paddingHorizontal: 16,
100106
flexDirection: 'row',
101107
justifyContent: 'flex-end',
102-
paddingHorizontal: 16,
108+
alignItems: 'center',
109+
borderBottomColor: colorPalette.cardBorderColor,
110+
borderBottomWidth: 0.5,
103111
},
104112
yearInput: {
105113
fontSize: normalize(14),
@@ -148,14 +156,14 @@ const styles = StyleSheet.create({
148156

149157
const pickerSelectStyles = StyleSheet.create({
150158
inputIOS: {
151-
fontSize: 16,
159+
fontSize: 14,
152160
paddingVertical: 12,
153161
paddingHorizontal: 10,
154162
color: colorPalette.mainColor,
155163
paddingRight: 24, // to ensure the text is never behind the icon
156164
},
157165
inputAndroid: {
158-
fontSize: 16,
166+
fontSize: 14,
159167
paddingHorizontal: 10,
160168
paddingVertical: 8,
161169
color: colorPalette.mainColor,

‎components/drawer/jnuservice/dreamy/LecturePlan.js

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,24 +45,25 @@ const LecturePlan = ({navigation}) => {
4545
<Text style={styles.lectureClassCode}>{classCode}</Text>
4646
<View style={styles.lectureContent}>
4747
<Text style={styles.lectureName}>{lectureName}</Text>
48-
<Text style={styles.lectureProfessor}>{professorName} {!/폐강/.exec(professorName) && "교수님"}</Text>
48+
<Text style={styles.lectureProfessor}>{professorName}{!/폐강/.exec(professorName) && " 교수님"}</Text>
4949
</View>
5050
</TouchableOpacity>
5151
)
5252

5353
return (
5454
<Fragment>
5555
<View style={styles.header}>
56-
<Text>년도 및 학기</Text>
56+
<Text style={{fontSize: 14}}>수강학기</Text>
5757
<Input
5858
value={year}
5959
onChangeText={year => setYear(year)}
6060
maxLength={4}
61-
inputStyle={{fontSize: 16, textAlign: 'right'}}
62-
inputContainerStyle={{borderBottomWidth: 0}}
63-
containerStyle={{flexBasis: 64}}
61+
inputStyle={{fontSize: 14, textAlign: 'center', minHeight: undefined}}
62+
inputContainerStyle={{borderBottomWidth: 0.5, borderBottomColor: colorPalette.mainColor, width: 56, backgroundColor: colorPalette.cardBackgroundColor}}
63+
containerStyle={{width: undefined}}
6464
underlineColorAndroid={colorPalette.mainColor}
6565
/>
66+
<Text>년</Text>
6667
<Picker
6768
placeholder={{}}
6869
items={semesterData}
@@ -105,7 +106,7 @@ LecturePlan.navigationOptions = {
105106

106107
const styles = StyleSheet.create({
107108
header: {
108-
marginHorizontal: 16,
109+
paddingHorizontal: 16,
109110
flexDirection: 'row',
110111
justifyContent: 'flex-end',
111112
alignItems: 'center',
@@ -175,14 +176,14 @@ const styles = StyleSheet.create({
175176

176177
const pickerSelectStyles = StyleSheet.create({
177178
inputIOS: {
178-
fontSize: 16,
179+
fontSize: 14,
179180
paddingVertical: 12,
180181
paddingHorizontal: 10,
181182
color: colorPalette.mainColor,
182183
paddingRight: 24, // to ensure the text is never behind the icon
183184
},
184185
inputAndroid: {
185-
fontSize: 16,
186+
fontSize: 14,
186187
paddingHorizontal: 10,
187188
paddingVertical: 8,
188189
color: colorPalette.mainColor,

‎components/info/Login.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ const Login = ({navigation}) => {
3232
Alert.alert("아이디나 비밀번호를 확인해주세요.");
3333
await toggleSubmit(false);
3434
} else {
35-
const baseInfo = await getBaseInfo(account);
35+
const baseInfo = await getBaseInfo(account, password);
36+
if(!!await Keychain.getGenericPassword()) await Keychain.resetGenericPassword();
3637
await Keychain.setGenericPassword(account, JSON.stringify({password, ...baseInfo}));
3738
Alert.alert("로그인되었습니다.");
3839
await toggleSubmit(false);

‎components/navigations/stackNavigations/DreamyStackNavigation.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,6 @@ const DreamyStackNavigation = createStackNavigator({
4646
LecturePlanDetail: {
4747
screen: LecturePlanDetail
4848
}
49-
}, {...stackNavigationConfig, initialRouteName: "LecturePlan"})
49+
}, {...stackNavigationConfig, initialRouteName: "DreamyHome"})
5050

5151
export default DreamyStackNavigation

0 commit comments

Comments
 (0)