From edba21a2404824c12fb388174549a66c7b8f984a Mon Sep 17 00:00:00 2001 From: aerain Date: Mon, 26 Aug 2019 02:09:30 +0900 Subject: [PATCH] Staging (#24) (#25) (#26) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 테스트 * 두번 테스트 * 로그인 수정 및 강의계획서 추가 (#23) * 테스트 * 두번 테스트 * 교수계획서 백단 추가 * 홈화면그림자 * 그림자재수정 * 콘솔 제거 * 그림자 추가 * 강의 계획 추가 * 콘솔 제거 * 그림자 * 일부수정 --- components/drawer/home/card/BusTime.js | 22 +- .../drawer/jnuservice/dreamy/DreamyHome.js | 4 +- .../drawer/jnuservice/dreamy/LecturePlan.js | 39 ++- .../jnuservice/dreamy/LecturePlanDetail.js | 242 +++++++++++++++++- .../drawer/jnuservice/dreamy/LecturePost.js | 13 +- .../drawer/jnuservice/dreamy/TimeTable.js | 2 - .../dreamy/components/DreamyCard.js | 7 +- components/drawer/library/BookDetail.js | 4 +- .../drawer/library/LibrarySearchDetail.js | 4 +- components/drawer/library/LibrarySeat.js | 37 ++- .../navigations/MainBottomTabNavigation.js | 2 +- components/styles/busStyle.js | 22 +- components/styles/haksaStyle.js | 6 +- components/styles/jedaeroCSS.js | 1 - service/jedaeroService.js | 102 +++++++- tool/elevationShadow.js | 14 + tool/jedaero/lib/dreamy.js | 25 +- 17 files changed, 450 insertions(+), 96 deletions(-) create mode 100644 tool/elevationShadow.js diff --git a/components/drawer/home/card/BusTime.js b/components/drawer/home/card/BusTime.js index d00ef99..c83e8ac 100644 --- a/components/drawer/home/card/BusTime.js +++ b/components/drawer/home/card/BusTime.js @@ -1,5 +1,5 @@ import React, { useState, useEffect } from 'react' -import { View, Text, StyleSheet } from 'react-native' +import { View, Text, StyleSheet, Platform } from 'react-native' import Picker from 'react-native-picker-select'; import BusTb from '../../../../jsons/busschedule.json'; import BusA from '../../../../tool/busA'; @@ -58,21 +58,29 @@ const BusTime = () => { const pickerSelectStyles = StyleSheet.create({ inputIOS: { - fontSize: 16, - paddingVertical: 12, + fontSize: 14, + paddingVertical: 4, paddingHorizontal: 10, color: '#ffffff', paddingRight: 24, // to ensure the text is never behind the icon }, inputAndroid: { - fontSize: 16, - paddingHorizontal: 10, - paddingVertical: 8, + fontSize: 14, + paddingHorizontal: 12, color: '#ffffff', paddingRight: 24, // to ensure the text is never behind the icon }, + inputAndroidContainer: { + height: null, + }, + // headlessAndroidPicker: { + // height: null, + // }, + headlessAndroidContainer: { + height: '100%' + }, iconContainer: { - top: 10, + top: Platform.select({ios: 0, android: 10}) }, }); diff --git a/components/drawer/jnuservice/dreamy/DreamyHome.js b/components/drawer/jnuservice/dreamy/DreamyHome.js index f8d857e..bd6fa20 100644 --- a/components/drawer/jnuservice/dreamy/DreamyHome.js +++ b/components/drawer/jnuservice/dreamy/DreamyHome.js @@ -74,7 +74,7 @@ const DreamyHome = ({navigation, isFocused}) => { afterLogin(() => navigation.navigate("Credit"))}> 전체 성적을 조회하실 수 있습니다. - {/* {isLogin && */} + {isLogin && { renderItem={MenuItem} contentContainerStyle={styles.totalMenuContainer} /> - {/* } */} + } ) } diff --git a/components/drawer/jnuservice/dreamy/LecturePlan.js b/components/drawer/jnuservice/dreamy/LecturePlan.js index a6d3780..975d023 100644 --- a/components/drawer/jnuservice/dreamy/LecturePlan.js +++ b/components/drawer/jnuservice/dreamy/LecturePlan.js @@ -6,6 +6,7 @@ import colorPalette from '../../../styles/colorPalette'; import Picker from 'react-native-picker-select'; import semesterData from '../../../../jsons/semesterMap'; import Icon from 'react-native-vector-icons/Ionicons'; +import elevationShadowStyle from '../../../../tool/elevationShadow'; const LecturePlan = ({navigation}) => { const date = new Date(); @@ -13,7 +14,7 @@ const LecturePlan = ({navigation}) => { const [semester, setSemester] = useState([21, 10, 10, 10, 10, 10, 11, 20, 20, 20, 20, 20][date.getMonth()]); const [classCode, setClassCode] = useState(''); const [professorName, setProfessorName] = useState(''); - const [lectureName, setLectureName] = useState('보안시스템개론'); + const [lectureName, setLectureName] = useState(''); const [data, setData] = useState([]); const [isLoading, setLoading] = useState(false); @@ -27,10 +28,6 @@ const LecturePlan = ({navigation}) => { await setLoading(false); } - useEffect(() => { - getData() - } ,[]); - const LectureItem = ({item: {classCode, credit, professorName, takeName, lectureCode, lectureName, time}}) => ( navigation.navigate("LecturePlanDetail", { year, semester, classCode, lectureCode })}> @@ -74,27 +71,28 @@ const LecturePlan = ({navigation}) => { Icon={() => ()} /> - { - isLoading ? ( - - - - ) : ( - - setClassCode(classCode)} labelStyle={styles.label} containerStyle={styles.searchContainer} inputStyle={styles.searchInput}/> - setProfessorName(professorName)} labelStyle={styles.label} containerStyle={styles.searchContainer} inputStyle={styles.searchInput}/> - setLectureName(lectureName)} labelStyle={styles.label} containerStyle={styles.searchContainer} inputStyle={styles.searchInput}/> -