From 7ef0dd1868b6011bc33de832cd834b9ac9b4773b Mon Sep 17 00:00:00 2001 From: henrydays Date: Fri, 22 Feb 2019 23:38:34 +0000 Subject: [PATCH] website --- .../app/src/main/assets/fonts/Ionicons.ttf | Bin 112472 -> 112484 bytes App/android/build.gradle | 2 +- App/android/gradle.properties | 2 +- App/app/App.js | 83 +- App/app/Router.js | 17 +- App/app/assets/styles.js | 2 +- App/app/screens/Calendar.js | 148 +- App/app/screens/Home.js | 26 +- App/app/screens/calendarDetail.js | 183 + App/app/screens/choosePath.js | 52 +- App/app/store/actions/api.js | 50 +- App/app/store/reducers/api.js | 24 +- App/app/store/store.js | 22 +- App/index.js | 18 +- App/ios/app-tvOS/Info.plist | 0 App/ios/app-tvOSTests/Info.plist | 0 .../project.pbxproj | 570 +- .../xcshareddata/xcschemes/app-tvOS.xcscheme | 36 +- .../xcshareddata/xcschemes/app.xcscheme | 36 +- App/ios/app/AppDelegate.h | 0 App/ios/app/AppDelegate.m | 0 App/ios/app/Base.lproj/LaunchScreen.xib | 13 +- .../AppIcon.appiconset/logo-1024.png | Bin 47551 -> 0 bytes .../AppIcon.appiconset/logo-20@2x.png | Bin 2439 -> 0 bytes .../AppIcon.appiconset/logo-20@3x.png | Bin 3131 -> 0 bytes .../AppIcon.appiconset/logo-29@2x-1.png | Bin 3041 -> 0 bytes .../AppIcon.appiconset/logo-29@3x-1.png | Bin 3770 -> 0 bytes .../AppIcon.appiconset/logo-40@2x.png | Bin 3541 -> 0 bytes .../AppIcon.appiconset/logo-40@3x.png | Bin 4555 -> 0 bytes .../AppIcon.appiconset/logo-60@2x.png | Bin 4555 -> 0 bytes .../AppIcon.appiconset/logo-60@3x.png | Bin 6153 -> 0 bytes App/ios/app/Images.xcassets/Contents.json | 0 App/ios/app/Info.plist | 35 +- App/ios/app/main.m | 0 App/ios/appTests/Info.plist | 0 App/ios/appTests/appTests.m | 0 App/package-lock.json | 88 +- App/package.json | 5 + App/yarn.lock | 7228 +++++++++++++++++ tickets.zip | Bin 0 -> 1885407 bytes .../main.scssc | Bin 0 -> 209201 bytes website/bootstrap-grid.css | 756 ++ website/error-page.html | 80 + website/fonts/icomoon.eot | Bin 0 -> 2384 bytes website/fonts/icomoon.svg | 17 + website/fonts/icomoon.ttf | Bin 0 -> 2220 bytes website/fonts/icomoon.woff | Bin 0 -> 2296 bytes website/group-ticket.html | 348 + website/imgs/app-image.png | Bin 0 -> 438489 bytes website/imgs/coimbra-image.jpg | Bin 0 -> 482237 bytes website/imgs/cubes-image.png | Bin 0 -> 11988 bytes website/imgs/cubes2-image.png | Bin 0 -> 32818 bytes website/imgs/iphone-image.png | Bin 0 -> 377423 bytes website/imgs/logo-enei.png | Bin 0 -> 8144 bytes website/imgs/logo-enei_old.png | Bin 0 -> 85948 bytes website/imgs/nav-background.png | Bin 0 -> 1101 bytes website/imgs/nav-background_old.png | Bin 0 -> 975 bytes website/imgs/share-image.jpg | Bin 0 -> 431490 bytes website/js/scripts.js | 129 + website/main.css | 790 ++ website/main.css.map | 7 + website/main.scss | 935 +++ website/novoLogo.png | Bin 0 -> 8350 bytes website/safari-pinned-tab.svg | 277 + website/selection.json | 1 + website/single-ticket.html | 148 + website/site.webmanifest | 19 + 67 files changed, 11639 insertions(+), 508 deletions(-) create mode 100644 App/app/screens/calendarDetail.js mode change 100755 => 100644 App/ios/app-tvOS/Info.plist mode change 100755 => 100644 App/ios/app-tvOSTests/Info.plist rename App/ios/{enei2019.xcodeproj => app.xcodeproj}/project.pbxproj (80%) mode change 100755 => 100644 rename App/ios/{enei2019.xcodeproj => app.xcodeproj}/xcshareddata/xcschemes/app-tvOS.xcscheme (79%) mode change 100755 => 100644 rename App/ios/{enei2019.xcodeproj => app.xcodeproj}/xcshareddata/xcschemes/app.xcscheme (81%) mode change 100755 => 100644 mode change 100755 => 100644 App/ios/app/AppDelegate.h mode change 100755 => 100644 App/ios/app/AppDelegate.m mode change 100755 => 100644 App/ios/app/Base.lproj/LaunchScreen.xib delete mode 100644 App/ios/app/Images.xcassets/AppIcon.appiconset/logo-1024.png delete mode 100644 App/ios/app/Images.xcassets/AppIcon.appiconset/logo-20@2x.png delete mode 100644 App/ios/app/Images.xcassets/AppIcon.appiconset/logo-20@3x.png delete mode 100644 App/ios/app/Images.xcassets/AppIcon.appiconset/logo-29@2x-1.png delete mode 100644 App/ios/app/Images.xcassets/AppIcon.appiconset/logo-29@3x-1.png delete mode 100644 App/ios/app/Images.xcassets/AppIcon.appiconset/logo-40@2x.png delete mode 100644 App/ios/app/Images.xcassets/AppIcon.appiconset/logo-40@3x.png delete mode 100644 App/ios/app/Images.xcassets/AppIcon.appiconset/logo-60@2x.png delete mode 100644 App/ios/app/Images.xcassets/AppIcon.appiconset/logo-60@3x.png mode change 100755 => 100644 App/ios/app/Images.xcassets/Contents.json mode change 100755 => 100644 App/ios/app/Info.plist mode change 100755 => 100644 App/ios/app/main.m mode change 100755 => 100644 App/ios/appTests/Info.plist mode change 100755 => 100644 App/ios/appTests/appTests.m create mode 100644 App/yarn.lock create mode 100644 tickets.zip create mode 100644 website/.sass-cache/8986710c95fdbb78137adbe00a9597c2eb663328/main.scssc create mode 100755 website/bootstrap-grid.css create mode 100644 website/error-page.html create mode 100755 website/fonts/icomoon.eot create mode 100755 website/fonts/icomoon.svg create mode 100755 website/fonts/icomoon.ttf create mode 100755 website/fonts/icomoon.woff create mode 100644 website/group-ticket.html create mode 100755 website/imgs/app-image.png create mode 100755 website/imgs/coimbra-image.jpg create mode 100755 website/imgs/cubes-image.png create mode 100755 website/imgs/cubes2-image.png create mode 100755 website/imgs/iphone-image.png create mode 100755 website/imgs/logo-enei.png create mode 100755 website/imgs/logo-enei_old.png create mode 100755 website/imgs/nav-background.png create mode 100755 website/imgs/nav-background_old.png create mode 100755 website/imgs/share-image.jpg create mode 100755 website/js/scripts.js create mode 100755 website/main.css create mode 100755 website/main.css.map create mode 100755 website/main.scss create mode 100644 website/novoLogo.png create mode 100755 website/safari-pinned-tab.svg create mode 100755 website/selection.json create mode 100644 website/single-ticket.html create mode 100755 website/site.webmanifest diff --git a/App/android/app/src/main/assets/fonts/Ionicons.ttf b/App/android/app/src/main/assets/fonts/Ionicons.ttf index 67bd84202ad5b2e307d3b6fac1731c2a5d963e0b..f343a94386892716385187fd10427d247649e108 100644 GIT binary patch delta 450 zcmY+Ay-Nc@5XIkIlJi6~3Kjv0EJQ&i0h308qLRQ7Fp7{A3W6NQF9?@##^M^k3Ka__ zAe`n3v9>pbh2kHeHbTJ0!a|$FMzM6%Z7gQzH*a>{u-ov|7f%g=0JLHYK1}O+escF} zqYkQPs-dy)IJdOrqP_GLuYLldB4|6mvS<`Ko(J};mF)QS?V$%cy#bWoa%rtHn>aWJ zxvxOi%&#$;M1& delta 448 zcmY+Aze_?<6vw~EA1@=yhCsuF3$`R$Dkc&_>L3OMLJl=ViSMP+^F2`;B&cj?CkxC@eE4BOL z6{r)b+ZUZd-m>J>>h`z4-UI9^sFuzv8QFSs@>H)ZN6*ZSEzsoyV3;cE<;r^C^cvKD z0~~7uV{V?G+i-7MBVQOXa68~7>6#I*`k8k4Ov8LYl*ca<#*r0lz!(k$8<9k#&x{L9+{i2%W-wxcC0<``YAte2 zhT#E23^Fn(aEhbENru|IZIR6y_OO_oDX@4cBdbcax!)#dv)7{3d=OrQcm&{sA7LP& xYn6mv$|)=`>thRSN!NC=x>n}s4|+r1fX^T9>vub!ZOS<&o;~g)U+3TLegIiIQ*{6U diff --git a/App/android/build.gradle b/App/android/build.gradle index a1e80854..f2d56da7 100755 --- a/App/android/build.gradle +++ b/App/android/build.gradle @@ -3,7 +3,7 @@ buildscript { ext { buildToolsVersion = "27.0.3" - minSdkVersion = 16 + minSdkVersion = 21 compileSdkVersion = 27 targetSdkVersion = 26 supportLibVersion = "27.1.1" diff --git a/App/android/gradle.properties b/App/android/gradle.properties index 7e7af5c3..8429033d 100755 --- a/App/android/gradle.properties +++ b/App/android/gradle.properties @@ -22,4 +22,4 @@ android.enableAapt2=false MYAPP_RELEASE_STORE_FILE=my-release-key.keystore MYAPP_RELEASE_KEY_ALIAS=my-key-alias MYAPP_RELEASE_STORE_PASSWORD=aspire98H -MYAPP_RELEASE_KEY_PASSWORD=encontroINFORMATICA2019 \ No newline at end of file +MYAPP_RELEASE_KEY_PASSWORD=aspire98H \ No newline at end of file diff --git a/App/app/App.js b/App/app/App.js index 01de920a..44157fe4 100755 --- a/App/app/App.js +++ b/App/app/App.js @@ -15,7 +15,8 @@ import { LinearGradient, TouchableOpacity, TextInput, - + NetInfo, + Animated } from 'react-native'; @@ -25,7 +26,7 @@ import {connect} from 'react-redux'; import QRCodeScanner from 'react-native-qrcode-scanner'; import {UtilStyles} from './assets/styles' -import * as Actions from './store/actions'; //Import your actions +import * as Actions from './store/actions'; import {RkButton, RkTheme, RkText, RkTextInput} from 'react-native-ui-kitten'; @@ -40,7 +41,9 @@ const SCREEN_WIDTH = Dimensions.get("window").width; import Swiper from 'react-native-swiper'; - +function handleConnectivityChange() { + console.log("asdasd"); + } class App extends Component { _activate=()=>{ @@ -93,7 +96,15 @@ class App extends Component { checkValue=(e)=>{ console.log("check"+e) } + _handleConnectionChange = (isConnected) => { + this.props.connectionState(true); + }; + + componentDidMount() { + + NetInfo.isConnected.addEventListener('connectionChange', this.handleConnectivityChange); + this.setState({isModalVisible: false}) //verifica se o utilizador tem token guardado this.props.checkUser(); @@ -102,6 +113,10 @@ class App extends Component { } + componentWillUnmount() { + NetInfo.isConnected.removeEventListener('connectionChange', this.handleConnectivityChange); + } + _keyboardDidShow () { //alert('Keyboard Shown'); // this.setState({push:0}) @@ -120,7 +135,7 @@ class App extends Component { this.props.closeLoginQRScan(); this.setState({username:e.data}) - console.log("tentativa de login"); + console.log("QR code lido"); @@ -128,24 +143,25 @@ class App extends Component { render() { - if (this.props.onHold && !this.props.logged) { + if (!this.props.logged) { return ( - CARREGANDO {this.props.onHold} - + + ) } + else { - //console.log('token... '+ this.props.logged) + // console.log('token... '+ this.props.logged) //se existir token - if (this.props.logged) { + if (this.props.logged ) { return ( @@ -153,41 +169,8 @@ class App extends Component { ) } return ( - } - activeDot={} - - > + - - - - - - - - - - - - - - @@ -239,8 +222,7 @@ class App extends Component { - - + - - Manual de utilização - - - + + ); } @@ -349,7 +328,7 @@ const styles = { }, scanQR:{ - fontFamily: 'Open Sans', + //flexDirection: 'row', paddingTop:5, backgroundColor:10, @@ -383,7 +362,7 @@ const styles = { input: { - fontFamily: 'Open Sans', + flex: 1, paddingRight: 10, diff --git a/App/app/Router.js b/App/app/Router.js index 4834fd35..351b8b7f 100755 --- a/App/app/Router.js +++ b/App/app/Router.js @@ -32,6 +32,7 @@ import IconFA from "react-native-vector-icons/FontAwesome5" import Profile from "./screens/Profile"; import editCalendar from './screens/editCalendar'; import choosePath from './screens/choosePath'; +import calendarDetail from './screens/calendarDetail'; const AppStack = createBottomTabNavigator( @@ -63,7 +64,7 @@ const AppStack = createBottomTabNavigator( navigationOptions: { tabBarIcon: ({tintColor}) => ( - + ), }, }, @@ -85,7 +86,7 @@ const AppStack = createBottomTabNavigator( navigationOptions: { tabBarIcon: ({tintColor}) => ( - + ) }, }, @@ -97,8 +98,8 @@ const AppStack = createBottomTabNavigator( initialRouteName: 'Home', tabBarOptions: { - showLabel: false, // hide labels - activeTintColor: '#858683', // active icon color + showLabel: true, // hide labels + activeTintColor: '#CC1A17', // active icon color inactiveTintColor: '#d8d6c9', // inactive icon color style: { backgroundColor: '#fff' // TabBar background @@ -117,8 +118,11 @@ const Stack = createStackNavigator({ return { headerTitle: `${navigation.state.routes[index].routeName}`, headerRight: ( - navigation.navigate('Profile')}> + navigation.navigate('Profile')}> + + editar + ) } @@ -157,6 +161,9 @@ const Stack = createStackNavigator({ }, choosePath:{ screen: choosePath + }, + calendarDetail:{ + screen:calendarDetail } diff --git a/App/app/assets/styles.js b/App/app/assets/styles.js index d63c1334..189e334f 100755 --- a/App/app/assets/styles.js +++ b/App/app/assets/styles.js @@ -14,7 +14,7 @@ export const UtilStyles = StyleSheet.create({ flex: 1, justifyContent: 'center', alignItems: 'center', - backgroundColor: '#F5FCFF', + backgroundColor: 'white', }, titleText: { fontSize: 20, diff --git a/App/app/screens/Calendar.js b/App/app/screens/Calendar.js index c3798b67..bb216504 100644 --- a/App/app/screens/Calendar.js +++ b/App/app/screens/Calendar.js @@ -39,7 +39,7 @@ const FourthRoute = () => ( class Calendar extends React.Component { - + state = { index: 0, routes: [ @@ -58,11 +58,16 @@ class Calendar extends React.Component { console.log(this.props.events); } + _openDetails=()=>{ + + console.log("los"); + } renderDetail = ({item, index}) => { + const {navigate} = this.props.navigation; // return ( - + navigate('calendarDetail', { info: item })} > @@ -82,6 +87,7 @@ class Calendar extends React.Component { + ); } @@ -133,7 +139,6 @@ class Calendar extends React.Component { super() - const archeryImgSource = require('../assets/img/archery.png'); const badmintonImgSource = require('../assets/img/badminton.png'); const lunchImgSource = require('../assets/img/lunch.png'); @@ -158,11 +163,57 @@ class Calendar extends React.Component { const FirstRoute = () => ( + + + index.toString()} + + + /> + + + + + ) + const SecondRoute = () => ( - - ( - - - - - index.toString()} - - - /> - - - - - ) + return ( - + + + + WEB DEVELOPMENT + + + ); } } @@ -282,13 +299,24 @@ const styles = StyleSheet.create({ tabBar: { flexDirection: 'row', paddingTop:0, + marginTop:0, + backgroundColor:'white', + borderWidth: 1, + borderRadius: 2, + borderColor: '#ddd', + borderBottomWidth: 0, + shadowColor: '#000', + shadowOffset: { width: 0, height: 2 }, + shadowOpacity: 0.8, + shadowRadius: 2, + elevation: 2, - backgroundColor:'white' + }, tabItem: { flex: 1, alignItems: 'center', - padding: 16, + padding: 10, }, details: { backgroundColor: "#FFFFFF", @@ -316,8 +344,14 @@ const styles = StyleSheet.create({ event: { borderRadius: 5, backgroundColor: "#FFFFFF", - marginLeft:-25 + marginLeft:-25, + shadowColor: "#000", + shadowOffset: { width: 0, height: 2,}, + shadowOpacity: 0.25, + shadowRadius: 1, + elevation: 2, + marginRight:2 }, diff --git a/App/app/screens/Home.js b/App/app/screens/Home.js index 7906516e..ce16bc7a 100755 --- a/App/app/screens/Home.js +++ b/App/app/screens/Home.js @@ -10,7 +10,8 @@ import { Dimensions, StyleSheet, Image, - ImageBackground + ImageBackground, + NetInfo } from 'react-native'; import {Shadow} from 'react-native-shadow' @@ -38,17 +39,6 @@ import {Card, Divider} from 'react-native-elements' import RNMaterialShadows from 'react-native-material-shadows'; -const shadowOpt = { - width:100, - height:100, - color:"#000", - border:2, - radius:3, - opacity:0.2, - x:0, - y:3, - style:{marginVertical:5} -} class Home extends Component { @@ -73,9 +63,11 @@ class Home extends Component { user: {Name: ''} }; } - + handleConnectivityChange = () => { + console.log("asdasdasdasdasd"); + } componentDidMount() { - + NetInfo.isConnected.addEventListener('connectionChange', this.handleConnectivityChange); this.props.hold(); //this.props.logoutUser(); @@ -92,6 +84,9 @@ class Home extends Component { } + componentWillUnmount() { + NetInfo.isConnected.removeEventListener('connectionChange', this.handleConnectivityChange); + } bClick() { @@ -142,9 +137,6 @@ _update=()=>{ // marginTop:150, backgroundColor: 'rgba(255,255,255,1)' , - shadowOffset:{ width: 10, height: 10, }, -shadowColor: 'black', -shadowOpacity: 1.0 } }> diff --git a/App/app/screens/calendarDetail.js b/App/app/screens/calendarDetail.js new file mode 100644 index 00000000..3c97714c --- /dev/null +++ b/App/app/screens/calendarDetail.js @@ -0,0 +1,183 @@ +import * as React from 'react'; +import { + View, + StyleSheet, + Dimensions, + Image, + ScrollView, + Text, + Button, + TouchableOpacity + } from 'react-native'; + +import {TabView, TabBar, SceneMap} from 'react-native-tab-view'; +import { + RkButton, RkCard, RkText, + RkTheme +} from 'react-native-ui-kitten'; +import Timeline from 'react-native-timeline-feed' + +import * as Progress from 'react-native-progress'; + + +import {connect} from 'react-redux'; + +import {bindActionCreators} from 'redux'; + +import * as Actions from '../store/actions'; //Import your actionss +import Swiper from 'react-native-swiper'; + +const SCREEN_HEIGHT = Dimensions.get("window").height; +const SCREEN_WIDTH = Dimensions.get("window").width; +import FitImage from 'react-native-fit-image'; + + +const formatObj = (obj) => { + + let a = {}; + + a.push({}) + + return a + +}; + + + +class calendarDetail extends React.Component { + + state = { + + }; + + componentDidMount() { + + this.props.getEvents(this.props.user); + console.log('didMount'); + console.log(this.props.events); + } + + + + _update = () => { + this.setState({user: this.props.user}); + console.log(this.props.events); + } + + + constructor(props) { + + super(props) + + + + this.data = [ + + + + ] + } + + render() { + const { navigation } = this.props; + const info = navigation.getParam('info', 'error'); + console.log(info); + return ( + + {info.name}, {info.description} + + ) + } + +} + +const styles = StyleSheet.create({ + + carreerPathContainer:{ + backgroundColor:'#CC1A17', + height:50, + flex:1, + alignItems:'center', + justifyContent:'center', + paddingTop:15, + }, + carreerPathText:{ + + height:50, + color:'white', + fontWeight:'bold', + fontSize:20, + + }, + companyHeader:{ + backgroundColor:'#dddddd', + // height:150, + borderRadius:5, + margin:10, + padding:10 + + + }, + companyTitle:{ + paddingBottom:5, + fontWeight:'bold', + color:'#777777', + fontSize:17, + + // padding:20 + }, + companyLogo: { + + borderRadius: 20, + + }, + + wrapper: { + + }, + company:{ + flex:1, + flexDirection:'row', + // backgroundColor:'red', + color:'black' + }, + + companyLogoContainer:{ + flex:1, + justifyContent: 'center', + width:'60%', + // backgroundColor:'white', + margin:20, + + + }, + aboutCompany:{ + width:SCREEN_WIDTH, + flex:1, + justifyContent: 'center', + alignItems: 'center', + } + + +}); + + + +function mapStateToProps(state, props) { + + return { + + token: state.apiReducer.token, + user: state.apiReducer.user, + logged: state.apiReducer.logged, + events: state.apiReducer.events + + } +} + +function mapDispatchToProps(dispatch) { + + return bindActionCreators(Actions, dispatch); +} + +export default connect(mapStateToProps, mapDispatchToProps)(calendarDetail); \ No newline at end of file diff --git a/App/app/screens/choosePath.js b/App/app/screens/choosePath.js index f60dd1c7..4649b315 100644 --- a/App/app/screens/choosePath.js +++ b/App/app/screens/choosePath.js @@ -31,6 +31,8 @@ const SCREEN_HEIGHT = Dimensions.get("window").height; const SCREEN_WIDTH = Dimensions.get("window").width; import FitImage from 'react-native-fit-image'; +import { Dropdown } from 'react-native-material-dropdown'; + const formatObj = (obj) => { @@ -79,41 +81,25 @@ class choosePath extends React.Component { } render() { + let data = [{ + value: 'Desenvolvimento Web', + }, { + value: 'Inteligencia artificial', + }, { + value: 'Redes e segurança', + }]; + return ( - - - - - - Web development - - - - - - - - - Blip: Game On - Based in Porto, Blip is a software engineering company with a difference. Founded in 2009, we already have 300 Blippers. And we’re still growing. - We’re in the API Billionaire’s Club alongside Twitter, Facebook and Google. The code we write is used by over five million people across the world. The websites, mobile apps and retail systems we create keep us three steps ahead of the competition, from Europe to Australia. - - - - - - - - - asd - - - - - + + + - ) - } + ); + } } diff --git a/App/app/store/actions/api.js b/App/app/store/actions/api.js index f9c82f83..4b399f9c 100644 --- a/App/app/store/actions/api.js +++ b/App/app/store/actions/api.js @@ -1,9 +1,20 @@ import { AsyncStorage } from 'react-native'; +const axios = require('axios'); + +import { NetInfo } from 'react-native'; import { DATA_AVAILABLE, API_LOGIN, CHECK_USER, LOGOUT_USER, USER_INFO, HOLD, GET_EVENTS } from "./actionTypes" //Import the actions types constant we defined in our actions import moment from 'moment' + +export const connectionState = (status) => { + console.log(status); + return { type: 'CHANGE_CONNECTION_STATUS', isConnected: status }; + }; + + + export function getEvents(user){ return (dispatch)=>{ let events = []; @@ -68,6 +79,7 @@ const saveToken = async token => { obj.expirationDateToken = await AsyncStorage.getItem('expirationDateToken') || 'none'; obj.refreshToken = await AsyncStorage.getItem('refreshToken') || 'none'; + } catch (error) { // Error retrieving data @@ -160,7 +172,7 @@ export function login(user, pass){ } var obj={ access_token:parsed.access_token, - expirationDateToken:Math.round(new Date().getTime()/1000) + parsed.expires_in, + expirationDateToken:Math.round(new Date().getTime()/1000) + 3598, refreshToken:parsed.refresh_token, valid:true }; @@ -240,13 +252,15 @@ export function getUserInfo(token){ .then(function(res) { - + console.log(res); let obj = JSON.parse(res._bodyText); dispatch({ type: USER_INFO, user: obj,onHold:false, logged:true }); }).catch(function(res){ - dispatch({ type: USER_INFO, user: '',onHold:false, logged:true }); + + console.log("erro") + // dispatch({ type: USER_INFO,onHold:false}); }) @@ -288,7 +302,7 @@ export function checkUser(){ a.valid=false; - console.log('check user deu falso') + console.log('token não existe em memória') dispatch({type: CHECK_USER,token:a,logged:false, onHold:false}); @@ -297,25 +311,23 @@ export function checkUser(){ a.valid=true; - - console.log('Existe Token em memória' ) + console.log('Existe Token em memória :'+ a.refreshToken ) //se expirar if(Math.round(new Date().getTime()/1000) >= a.expirationDateToken){ refresh=a.refreshToken - // a.valid=false; - + //chamar funçao para renovar console.log("expirou") var details = { - 'grant_type': 'refresh_token', 'refresh_token':refresh }; + var formBody = []; for (var property in details) { @@ -330,8 +342,6 @@ export function checkUser(){ formBody = formBody.join("&"); - - fetch('http://enei2019.uingress.com/internal/api/token', { method: 'POST', @@ -345,16 +355,18 @@ export function checkUser(){ }).then(res=>res.json()).then(parsed=>{ - console.log(parsed); if(parsed.error=='invalid_grant'){ + console.log(formBody); - dispatch({type: CHECK_USER, token:'', logged:false, onHold:false}); + dispatch({type: CHECK_USER, token:'', logged:false, onHold:false}); + }else{ + var obj={ access_token:parsed.access_token, - expirationDateToken:Math.round(new Date().getTime()/1000) + parsed.expires_in, + expirationDateToken:Math.round(new Date().getTime()/1000) + 3598, refreshToken:parsed.refresh_token, valid:true @@ -363,7 +375,7 @@ export function checkUser(){ // deleteToken(); saveToken(obj).then(a=>{ - console.log("saved" ) + console.log("Token guardado" ) console.log(obj) dispatch({type: CHECK_USER, token:obj, logged:true, onHold:false}); @@ -372,7 +384,7 @@ export function checkUser(){ }).catch(a=>{ - console.log("Putasss") + console.log("erro na api") dispatch({type: CHECK_USER, token:'', logged:false, onHold:false}); }) @@ -384,7 +396,7 @@ export function checkUser(){ //fazer validação da data e renovar o token - dispatch({type: CHECK_USER, token:a, logged:true, onHold:false}); + dispatch({type: CHECK_USER, token:a, logged:true, onHold:false, user:{Name:'Henrique'}}); } } @@ -392,8 +404,8 @@ export function checkUser(){ }).catch(a=>{ - console.log('erros'); - dispatch({type: CHECK_USER,token:false, logged:false}); + console.log('erro a ler o token'+ a); + dispatch({type: CHECK_USER,token:false, logged:false, user:''}); }) diff --git a/App/app/store/reducers/api.js b/App/app/store/reducers/api.js index cb61002e..302d3586 100644 --- a/App/app/store/reducers/api.js +++ b/App/app/store/reducers/api.js @@ -1,11 +1,24 @@ import { DATA_AVAILABLE, API_LOGIN, CHECK_USER, LOGOUT_USER, USER_INFO, HOLD, GET_EVENTS } from "../actions/actionTypes" //Import the actions types constant we defined in our actions - +import { REHYDRATE } from 'redux-persist'; -let apiState= { token:{valid:false}, tokenData:'error', logged:false, onHold:true, user:{}, events:[], failedAttempt:false} +let apiState= { isConnected:false, token:{valid:false}, tokenData:'error', logged:false, onHold:true,user:{}, events:[], failedAttempt:false} const apiReducer = (state = apiState, action) => { switch(action.type){ + case REHYDRATE: + console.log( action.payload) + return { + // ...state, + // logged:false, + //onHold:true, + + user: action.payload.apiReducer.user + }; + case 'CHANGE_CONNECTION_STATUS': + return Object.assign({}, state, { + isConnected: action.isConnected, + }); case HOLD: @@ -14,13 +27,13 @@ const apiReducer = (state = apiState, action) => { case API_LOGIN: - state=Object.assign({},state, { logged:action.logged, token:action.token, failedAttempt: action.failedAttempt}); + state=Object.assign({},state, { logged:action.logged, token:action.token, failedAttempt: action.failedAttempt, user:user}); return state; case CHECK_USER: - state=Object.assign({},state, { token:action.token, logged:action.logged, onHold:action.onHold}); + state=Object.assign({},state, { token:action.token,logged:action.logged, onHold:action.onHold}); return state; @@ -41,7 +54,8 @@ const apiReducer = (state = apiState, action) => { state=Object.assign({},state, { events: action.events}); return state; - + + default: return state; diff --git a/App/app/store/store.js b/App/app/store/store.js index 6bfd112a..db036a27 100644 --- a/App/app/store/store.js +++ b/App/app/store/store.js @@ -1,7 +1,25 @@ -import { createStore, applyMiddleware } from 'redux'; +import { createStore, applyMiddleware , compose} from 'redux'; import thunk from 'redux-thunk'; import reducers from './reducers/index'; //Import the reducer + +import {persistStore, persistReducer} from 'redux-persist' + +import {AsyncStorage} from 'react-native' + +const persistConfig={ + + key:'root' , + storage: AsyncStorage, + + + + +} + +const persistedReduzer= persistReducer(persistConfig, reducers); // Connect our store to the reducers -export default createStore(reducers, applyMiddleware(thunk)); +export const store = createStore(persistedReduzer, applyMiddleware(thunk)); + +export const persistor=persistStore(store); \ No newline at end of file diff --git a/App/index.js b/App/index.js index 1d960e57..357192b5 100755 --- a/App/index.js +++ b/App/index.js @@ -1,18 +1,30 @@ /** @format */ import React from 'react'; -import {AppRegistry} from 'react-native'; +import {AppRegistry, View,Text} from 'react-native'; import {Provider} from 'react-redux'; import {name as appName} from './app.json'; -import store from './app/store/store'; //Import the store +import {PersistGate} from 'redux-persist/integration/react' import App from './app/App' //Import the component file + +import {store, persistor} from "./app/store/store"; + +rendeLoading=()=>{ + + loading........ + +} const RNRedux = () => ( - + + + + + ); diff --git a/App/ios/app-tvOS/Info.plist b/App/ios/app-tvOS/Info.plist old mode 100755 new mode 100644 diff --git a/App/ios/app-tvOSTests/Info.plist b/App/ios/app-tvOSTests/Info.plist old mode 100755 new mode 100644 diff --git a/App/ios/enei2019.xcodeproj/project.pbxproj b/App/ios/app.xcodeproj/project.pbxproj old mode 100755 new mode 100644 similarity index 80% rename from App/ios/enei2019.xcodeproj/project.pbxproj rename to App/ios/app.xcodeproj/project.pbxproj index e21ca109..d65e5cfa --- a/App/ios/enei2019.xcodeproj/project.pbxproj +++ b/App/ios/app.xcodeproj/project.pbxproj @@ -5,6 +5,7 @@ }; objectVersion = 46; objects = { + /* Begin PBXBuildFile section */ 00C302E51ABCBA2D00DB3ED1 /* libRCTActionSheet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302AC1ABCB8CE00DB3ED1 /* libRCTActionSheet.a */; }; 00C302E71ABCBA2D00DB3ED1 /* libRCTGeolocation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302BA1ABCB90400DB3ED1 /* libRCTGeolocation.a */; }; @@ -35,28 +36,29 @@ 2D16E6881FA4F8E400B85C8A /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2D16E6891FA4F8E400B85C8A /* libReact.a */; }; 2DCD954D1E0B4F2C00145EB5 /* appTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* appTests.m */; }; 2DF0FFEE2056DD460020B375 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3DAD3EA31DF850E9000B6D8A /* libReact.a */; }; - 43A080C42246430685BC7859 /* Ionicons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = A55A26724384416FAF74A98D /* Ionicons.ttf */; }; + 514DB1DF2E3B452F9EF272E3 /* libRNVectorIcons-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 95B0A42B6CD8441E904E6EB9 /* libRNVectorIcons-tvOS.a */; }; + 69E1B84AE0DF486CB1B1D226 /* libBVLinearGradient.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C00CE8A4E3B747F9816B91CF /* libBVLinearGradient.a */; }; 832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; }; ADBDB9381DFEBF1600ED6528 /* libRCTBlob.a in Frameworks */ = {isa = PBXBuildFile; fileRef = ADBDB9271DFEBF0700ED6528 /* libRCTBlob.a */; }; - BE2BDF992200F95B0001B8A8 /* libRNCamera.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BE2BDF982200F9490001B8A8 /* libRNCamera.a */; }; - BE2BDF9A2200F96A0001B8A8 /* libRNGestureHandler.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BE2BDF922200F93B0001B8A8 /* libRNGestureHandler.a */; }; - BE2BDFA12200F9880001B8A8 /* libReactNativePermissions.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BE2BDFA02200F9830001B8A8 /* libReactNativePermissions.a */; }; - BE2BDFE2220101420001B8A8 /* libRNVectorIcons.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BE2BDFDF2201012E0001B8A8 /* libRNVectorIcons.a */; }; - BEA7C1C022034BC800B47CD7 /* MaterialIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = BEA7C1B122034BC800B47CD7 /* MaterialIcons.ttf */; }; - BEA7C1C122034BC800B47CD7 /* FontAwesome.ttf in Resources */ = {isa = PBXBuildFile; fileRef = BEA7C1B222034BC800B47CD7 /* FontAwesome.ttf */; }; - BEA7C1C322034BC800B47CD7 /* FontAwesome5_Brands.ttf in Resources */ = {isa = PBXBuildFile; fileRef = BEA7C1B422034BC800B47CD7 /* FontAwesome5_Brands.ttf */; }; - BEA7C1C422034BC800B47CD7 /* SimpleLineIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = BEA7C1B522034BC800B47CD7 /* SimpleLineIcons.ttf */; }; - BEA7C1C522034BC800B47CD7 /* Entypo.ttf in Resources */ = {isa = PBXBuildFile; fileRef = BEA7C1B622034BC800B47CD7 /* Entypo.ttf */; }; - BEA7C1C622034BC800B47CD7 /* MaterialCommunityIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = BEA7C1B722034BC800B47CD7 /* MaterialCommunityIcons.ttf */; }; - BEA7C1C722034BC800B47CD7 /* Zocial.ttf in Resources */ = {isa = PBXBuildFile; fileRef = BEA7C1B822034BC800B47CD7 /* Zocial.ttf */; }; - BEA7C1C822034BC800B47CD7 /* Feather.ttf in Resources */ = {isa = PBXBuildFile; fileRef = BEA7C1B922034BC800B47CD7 /* Feather.ttf */; }; - BEA7C1C922034BC800B47CD7 /* FontAwesome5_Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = BEA7C1BA22034BC800B47CD7 /* FontAwesome5_Regular.ttf */; }; - BEA7C1CA22034BC800B47CD7 /* FontAwesome5_Solid.ttf in Resources */ = {isa = PBXBuildFile; fileRef = BEA7C1BB22034BC800B47CD7 /* FontAwesome5_Solid.ttf */; }; - BEA7C1CB22034BC800B47CD7 /* AntDesign.ttf in Resources */ = {isa = PBXBuildFile; fileRef = BEA7C1BC22034BC800B47CD7 /* AntDesign.ttf */; }; - BEA7C1CC22034BC800B47CD7 /* Foundation.ttf in Resources */ = {isa = PBXBuildFile; fileRef = BEA7C1BD22034BC800B47CD7 /* Foundation.ttf */; }; - BEA7C1CD22034BC800B47CD7 /* EvilIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = BEA7C1BE22034BC800B47CD7 /* EvilIcons.ttf */; }; - BEA7C1CE22034BC800B47CD7 /* Octicons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = BEA7C1BF22034BC800B47CD7 /* Octicons.ttf */; }; - 7BB898A137474B3ABEF9425B /* libBVLinearGradient.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A757D24430CF4419B7ABDE21 /* libBVLinearGradient.a */; }; + BE104176D74E47E9A369B15A /* libRNVectorIcons.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EB0A5A258CBE4EEFAD3C358E /* libRNVectorIcons.a */; }; + BE302B6D221B7875005626CF /* libRNCamera.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BE302B6C221B7860005626CF /* libRNCamera.a */; }; + BE302B74221B7ACE005626CF /* libRNGestureHandler.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BE302B73221B7AC8005626CF /* libRNGestureHandler.a */; }; + BE5EAB78221B7D5400E92E5B /* MaterialIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = BE5EAB69221B7D5300E92E5B /* MaterialIcons.ttf */; }; + BE5EAB79221B7D5400E92E5B /* Entypo.ttf in Resources */ = {isa = PBXBuildFile; fileRef = BE5EAB6A221B7D5300E92E5B /* Entypo.ttf */; }; + BE5EAB7A221B7D5400E92E5B /* FontAwesome.ttf in Resources */ = {isa = PBXBuildFile; fileRef = BE5EAB6B221B7D5300E92E5B /* FontAwesome.ttf */; }; + BE5EAB7B221B7D5400E92E5B /* SimpleLineIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = BE5EAB6C221B7D5300E92E5B /* SimpleLineIcons.ttf */; }; + BE5EAB7C221B7D5400E92E5B /* EvilIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = BE5EAB6D221B7D5300E92E5B /* EvilIcons.ttf */; }; + BE5EAB7D221B7D5400E92E5B /* FontAwesome5_Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = BE5EAB6E221B7D5300E92E5B /* FontAwesome5_Regular.ttf */; }; + BE5EAB7E221B7D5400E92E5B /* Foundation.ttf in Resources */ = {isa = PBXBuildFile; fileRef = BE5EAB6F221B7D5300E92E5B /* Foundation.ttf */; }; + BE5EAB7F221B7D5400E92E5B /* Feather.ttf in Resources */ = {isa = PBXBuildFile; fileRef = BE5EAB70221B7D5300E92E5B /* Feather.ttf */; }; + BE5EAB80221B7D5400E92E5B /* FontAwesome5_Solid.ttf in Resources */ = {isa = PBXBuildFile; fileRef = BE5EAB71221B7D5400E92E5B /* FontAwesome5_Solid.ttf */; }; + BE5EAB81221B7D5400E92E5B /* AntDesign.ttf in Resources */ = {isa = PBXBuildFile; fileRef = BE5EAB72221B7D5400E92E5B /* AntDesign.ttf */; }; + BE5EAB82221B7D5400E92E5B /* MaterialCommunityIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = BE5EAB73221B7D5400E92E5B /* MaterialCommunityIcons.ttf */; }; + BE5EAB84221B7D5400E92E5B /* FontAwesome5_Brands.ttf in Resources */ = {isa = PBXBuildFile; fileRef = BE5EAB75221B7D5400E92E5B /* FontAwesome5_Brands.ttf */; }; + BE5EAB85221B7D5400E92E5B /* Octicons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = BE5EAB76221B7D5400E92E5B /* Octicons.ttf */; }; + BE5EAB86221B7D5400E92E5B /* Zocial.ttf in Resources */ = {isa = PBXBuildFile; fileRef = BE5EAB77221B7D5400E92E5B /* Zocial.ttf */; }; + BE5EAC3A221B83CF00E92E5B /* Ionicons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = BE302B75221B7C3B005626CF /* Ionicons.ttf */; }; + BE5EAC41221B889900E92E5B /* libReactNativePermissions.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BE5EAC40221B888C00E92E5B /* libReactNativePermissions.a */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -333,41 +335,55 @@ remoteGlobalIDString = 358F4ED71D1E81A9004DF814; remoteInfo = RCTBlob; }; - BE2BDF912200F93B0001B8A8 /* PBXContainerItemProxy */ = { + BE302B6B221B7860005626CF /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = BE2BDF682200F93B0001B8A8 /* RNGestureHandler.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 134814201AA4EA6300B7C361; - remoteInfo = RNGestureHandler; - }; - BE2BDF972200F9490001B8A8 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = BE2BDF932200F9490001B8A8 /* RNCamera.xcodeproj */; + containerPortal = BE302B67221B7860005626CF /* RNCamera.xcodeproj */; proxyType = 2; remoteGlobalIDString = 4107012F1ACB723B00C6AA39; remoteInfo = RNCamera; }; - BE2BDF9F2200F9830001B8A8 /* PBXContainerItemProxy */ = { + BE302B72221B7AC8005626CF /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = BE2BDF9B2200F9830001B8A8 /* ReactNativePermissions.xcodeproj */; + containerPortal = BE302B6E221B7AC7005626CF /* RNGestureHandler.xcodeproj */; proxyType = 2; - remoteGlobalIDString = 9D23B34F1C767B80008B4819; - remoteInfo = ReactNativePermissions; + remoteGlobalIDString = 134814201AA4EA6300B7C361; + remoteInfo = RNGestureHandler; }; - BE2BDFDE2201012E0001B8A8 /* PBXContainerItemProxy */ = { + BE5EABF6221B834400E92E5B /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = BE2BDFD92201012E0001B8A8 /* RNVectorIcons.xcodeproj */; + containerPortal = 664970B9D10A41A18B44727F /* RNVectorIcons.xcodeproj */; proxyType = 2; remoteGlobalIDString = 5DBEB1501B18CEA900B34395; remoteInfo = RNVectorIcons; }; - BE2BDFE02201012E0001B8A8 /* PBXContainerItemProxy */ = { + BE5EABF8221B834400E92E5B /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = BE2BDFD92201012E0001B8A8 /* RNVectorIcons.xcodeproj */; + containerPortal = 664970B9D10A41A18B44727F /* RNVectorIcons.xcodeproj */; proxyType = 2; remoteGlobalIDString = A39873CE1EA65EE60051E01A; remoteInfo = "RNVectorIcons-tvOS"; }; + BE5EAC36221B835A00E92E5B /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1908F5E093844AC5A143E888 /* BVLinearGradient.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 134814201AA4EA6300B7C361; + remoteInfo = BVLinearGradient; + }; + BE5EAC38221B835A00E92E5B /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1908F5E093844AC5A143E888 /* BVLinearGradient.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 64AA15081EF7F30100718508; + remoteInfo = "BVLinearGradient-tvOS"; + }; + BE5EAC3F221B888C00E92E5B /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = BE5EAC3B221B888C00E92E5B /* ReactNativePermissions.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 9D23B34F1C767B80008B4819; + remoteInfo = ReactNativePermissions; + }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ @@ -377,12 +393,12 @@ 00C302BB1ABCB91800DB3ED1 /* RCTImage.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTImage.xcodeproj; path = "../node_modules/react-native/Libraries/Image/RCTImage.xcodeproj"; sourceTree = ""; }; 00C302D31ABCB9D200DB3ED1 /* RCTNetwork.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTNetwork.xcodeproj; path = "../node_modules/react-native/Libraries/Network/RCTNetwork.xcodeproj"; sourceTree = ""; }; 00C302DF1ABCB9EE00DB3ED1 /* RCTVibration.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTVibration.xcodeproj; path = "../node_modules/react-native/Libraries/Vibration/RCTVibration.xcodeproj"; sourceTree = ""; }; - 00E356EE1AD99517003FC87E /* Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Tests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + 00E356EE1AD99517003FC87E /* appTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = appTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 00E356F11AD99517003FC87E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 00E356F21AD99517003FC87E /* appTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = appTests.m; sourceTree = ""; }; 139105B61AF99BAD00B5F7CC /* RCTSettings.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTSettings.xcodeproj; path = "../node_modules/react-native/Libraries/Settings/RCTSettings.xcodeproj"; sourceTree = ""; }; 139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTWebSocket.xcodeproj; path = "../node_modules/react-native/Libraries/WebSocket/RCTWebSocket.xcodeproj"; sourceTree = ""; }; - 13B07F961A680F5B00A75B9A /* enei2019.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = enei2019.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 13B07F961A680F5B00A75B9A /* app.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = app.app; sourceTree = BUILT_PRODUCTS_DIR; }; 13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = app/AppDelegate.h; sourceTree = ""; }; 13B07FB01A68108700A75B9A /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AppDelegate.m; path = app/AppDelegate.m; sourceTree = ""; }; 13B07FB21A68108700A75B9A /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/LaunchScreen.xib; sourceTree = ""; }; @@ -390,35 +406,36 @@ 13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = app/Info.plist; sourceTree = ""; }; 13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = app/main.m; sourceTree = ""; }; 146833FF1AC3E56700842450 /* React.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = React.xcodeproj; path = "../node_modules/react-native/React/React.xcodeproj"; sourceTree = ""; }; - 2D02E47B1E0B4A5D006451C7 /* enei2019-tvOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "enei2019-tvOS.app"; sourceTree = BUILT_PRODUCTS_DIR; }; - 2D02E4901E0B4A5D006451C7 /* enei2019-tvOSTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "enei2019-tvOSTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; + 1908F5E093844AC5A143E888 /* BVLinearGradient.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = BVLinearGradient.xcodeproj; path = "../node_modules/react-native-linear-gradient/BVLinearGradient.xcodeproj"; sourceTree = ""; }; + 2D02E47B1E0B4A5D006451C7 /* app-tvOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "app-tvOS.app"; sourceTree = BUILT_PRODUCTS_DIR; }; + 2D02E4901E0B4A5D006451C7 /* app-tvOSTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "app-tvOSTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; 2D16E6891FA4F8E400B85C8A /* libReact.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libReact.a; sourceTree = BUILT_PRODUCTS_DIR; }; 5E91572D1DD0AC6500FF2AA8 /* RCTAnimation.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTAnimation.xcodeproj; path = "../node_modules/react-native/Libraries/NativeAnimation/RCTAnimation.xcodeproj"; sourceTree = ""; }; + 664970B9D10A41A18B44727F /* RNVectorIcons.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNVectorIcons.xcodeproj; path = "../node_modules/react-native-vector-icons/RNVectorIcons.xcodeproj"; sourceTree = ""; }; 78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTLinking.xcodeproj; path = "../node_modules/react-native/Libraries/LinkingIOS/RCTLinking.xcodeproj"; sourceTree = ""; }; 832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = "../node_modules/react-native/Libraries/Text/RCTText.xcodeproj"; sourceTree = ""; }; - A55A26724384416FAF74A98D /* Ionicons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Ionicons.ttf; path = "../node_modules/react-native-ionicons/fonts/Ionicons.ttf"; sourceTree = ""; }; + 95B0A42B6CD8441E904E6EB9 /* libRNVectorIcons-tvOS.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = "libRNVectorIcons-tvOS.a"; sourceTree = ""; }; ADBDB91F1DFEBF0600ED6528 /* RCTBlob.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTBlob.xcodeproj; path = "../node_modules/react-native/Libraries/Blob/RCTBlob.xcodeproj"; sourceTree = ""; }; - BE2BDF682200F93B0001B8A8 /* RNGestureHandler.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RNGestureHandler.xcodeproj; path = "../node_modules/react-native-gesture-handler/ios/RNGestureHandler.xcodeproj"; sourceTree = ""; }; - BE2BDF932200F9490001B8A8 /* RNCamera.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RNCamera.xcodeproj; path = "../node_modules/react-native-camera/ios/RNCamera.xcodeproj"; sourceTree = ""; }; - BE2BDF9B2200F9830001B8A8 /* ReactNativePermissions.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = ReactNativePermissions.xcodeproj; path = "../node_modules/react-native-permissions/ios/ReactNativePermissions.xcodeproj"; sourceTree = ""; }; - BE2BDFD92201012E0001B8A8 /* RNVectorIcons.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RNVectorIcons.xcodeproj; path = "../node_modules/react-native-vector-icons/RNVectorIcons.xcodeproj"; sourceTree = ""; }; - BEA7C1B122034BC800B47CD7 /* MaterialIcons.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = MaterialIcons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/MaterialIcons.ttf"; sourceTree = ""; }; - BEA7C1B222034BC800B47CD7 /* FontAwesome.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = FontAwesome.ttf; path = "../node_modules/react-native-vector-icons/Fonts/FontAwesome.ttf"; sourceTree = ""; }; - BEA7C1B322034BC800B47CD7 /* Ionicons.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = Ionicons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Ionicons.ttf"; sourceTree = ""; }; - BEA7C1B422034BC800B47CD7 /* FontAwesome5_Brands.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = FontAwesome5_Brands.ttf; path = "../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Brands.ttf"; sourceTree = ""; }; - BEA7C1B522034BC800B47CD7 /* SimpleLineIcons.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = SimpleLineIcons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/SimpleLineIcons.ttf"; sourceTree = ""; }; - BEA7C1B622034BC800B47CD7 /* Entypo.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = Entypo.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Entypo.ttf"; sourceTree = ""; }; - BEA7C1B722034BC800B47CD7 /* MaterialCommunityIcons.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = MaterialCommunityIcons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/MaterialCommunityIcons.ttf"; sourceTree = ""; }; - BEA7C1B822034BC800B47CD7 /* Zocial.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = Zocial.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Zocial.ttf"; sourceTree = ""; }; - BEA7C1B922034BC800B47CD7 /* Feather.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = Feather.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Feather.ttf"; sourceTree = ""; }; - BEA7C1BA22034BC800B47CD7 /* FontAwesome5_Regular.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = FontAwesome5_Regular.ttf; path = "../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Regular.ttf"; sourceTree = ""; }; - BEA7C1BB22034BC800B47CD7 /* FontAwesome5_Solid.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = FontAwesome5_Solid.ttf; path = "../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Solid.ttf"; sourceTree = ""; }; - BEA7C1BC22034BC800B47CD7 /* AntDesign.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = AntDesign.ttf; path = "../node_modules/react-native-vector-icons/Fonts/AntDesign.ttf"; sourceTree = ""; }; - BEA7C1BD22034BC800B47CD7 /* Foundation.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = Foundation.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Foundation.ttf"; sourceTree = ""; }; - BEA7C1BE22034BC800B47CD7 /* EvilIcons.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = EvilIcons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/EvilIcons.ttf"; sourceTree = ""; }; - BEA7C1BF22034BC800B47CD7 /* Octicons.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = Octicons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Octicons.ttf"; sourceTree = ""; }; - B5DCFEB358F745A89DBBDC7B /* BVLinearGradient.xcodeproj */ = {isa = PBXFileReference; name = "BVLinearGradient.xcodeproj"; path = "../node_modules/react-native-linear-gradient/BVLinearGradient.xcodeproj"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = wrapper.pb-project; explicitFileType = undefined; includeInIndex = 0; }; - A757D24430CF4419B7ABDE21 /* libBVLinearGradient.a */ = {isa = PBXFileReference; name = "libBVLinearGradient.a"; path = "libBVLinearGradient.a"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = archive.ar; explicitFileType = undefined; includeInIndex = 0; }; + BE302B67221B7860005626CF /* RNCamera.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RNCamera.xcodeproj; path = "../node_modules/react-native-camera/ios/RNCamera.xcodeproj"; sourceTree = ""; }; + BE302B6E221B7AC7005626CF /* RNGestureHandler.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RNGestureHandler.xcodeproj; path = "../node_modules/react-native-gesture-handler/ios/RNGestureHandler.xcodeproj"; sourceTree = ""; }; + BE302B75221B7C3B005626CF /* Ionicons.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = Ionicons.ttf; path = "../node_modules/react-native-ionicons/fonts/Ionicons.ttf"; sourceTree = ""; }; + BE5EAB69221B7D5300E92E5B /* MaterialIcons.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = MaterialIcons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/MaterialIcons.ttf"; sourceTree = ""; }; + BE5EAB6A221B7D5300E92E5B /* Entypo.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = Entypo.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Entypo.ttf"; sourceTree = ""; }; + BE5EAB6B221B7D5300E92E5B /* FontAwesome.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = FontAwesome.ttf; path = "../node_modules/react-native-vector-icons/Fonts/FontAwesome.ttf"; sourceTree = ""; }; + BE5EAB6C221B7D5300E92E5B /* SimpleLineIcons.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = SimpleLineIcons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/SimpleLineIcons.ttf"; sourceTree = ""; }; + BE5EAB6D221B7D5300E92E5B /* EvilIcons.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = EvilIcons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/EvilIcons.ttf"; sourceTree = ""; }; + BE5EAB6E221B7D5300E92E5B /* FontAwesome5_Regular.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = FontAwesome5_Regular.ttf; path = "../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Regular.ttf"; sourceTree = ""; }; + BE5EAB6F221B7D5300E92E5B /* Foundation.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = Foundation.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Foundation.ttf"; sourceTree = ""; }; + BE5EAB70221B7D5300E92E5B /* Feather.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = Feather.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Feather.ttf"; sourceTree = ""; }; + BE5EAB71221B7D5400E92E5B /* FontAwesome5_Solid.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = FontAwesome5_Solid.ttf; path = "../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Solid.ttf"; sourceTree = ""; }; + BE5EAB72221B7D5400E92E5B /* AntDesign.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = AntDesign.ttf; path = "../node_modules/react-native-vector-icons/Fonts/AntDesign.ttf"; sourceTree = ""; }; + BE5EAB73221B7D5400E92E5B /* MaterialCommunityIcons.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = MaterialCommunityIcons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/MaterialCommunityIcons.ttf"; sourceTree = ""; }; + BE5EAB75221B7D5400E92E5B /* FontAwesome5_Brands.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = FontAwesome5_Brands.ttf; path = "../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Brands.ttf"; sourceTree = ""; }; + BE5EAB76221B7D5400E92E5B /* Octicons.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = Octicons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Octicons.ttf"; sourceTree = ""; }; + BE5EAB77221B7D5400E92E5B /* Zocial.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = Zocial.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Zocial.ttf"; sourceTree = ""; }; + BE5EAC3B221B888C00E92E5B /* ReactNativePermissions.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = ReactNativePermissions.xcodeproj; path = "../node_modules/react-native-permissions/ios/ReactNativePermissions.xcodeproj"; sourceTree = ""; }; + C00CE8A4E3B747F9816B91CF /* libBVLinearGradient.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libBVLinearGradient.a; sourceTree = ""; }; + EB0A5A258CBE4EEFAD3C358E /* libRNVectorIcons.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNVectorIcons.a; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -434,10 +451,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - BE2BDFE2220101420001B8A8 /* libRNVectorIcons.a in Frameworks */, - BE2BDFA12200F9880001B8A8 /* libReactNativePermissions.a in Frameworks */, - BE2BDF9A2200F96A0001B8A8 /* libRNGestureHandler.a in Frameworks */, - BE2BDF992200F95B0001B8A8 /* libRNCamera.a in Frameworks */, + BE302B74221B7ACE005626CF /* libRNGestureHandler.a in Frameworks */, + BE302B6D221B7875005626CF /* libRNCamera.a in Frameworks */, ADBDB9381DFEBF1600ED6528 /* libRCTBlob.a in Frameworks */, 11D1A2F320CAFA9E000508D9 /* libRCTAnimation.a in Frameworks */, 146834051AC3E58100842450 /* libReact.a in Frameworks */, @@ -447,10 +462,12 @@ 133E29F31AD74F7200F7D852 /* libRCTLinking.a in Frameworks */, 00C302E91ABCBA2D00DB3ED1 /* libRCTNetwork.a in Frameworks */, 139105C61AF99C1200B5F7CC /* libRCTSettings.a in Frameworks */, + BE5EAC41221B889900E92E5B /* libReactNativePermissions.a in Frameworks */, 832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */, 00C302EA1ABCBA2D00DB3ED1 /* libRCTVibration.a in Frameworks */, 139FDEF61B0652A700C62182 /* libRCTWebSocket.a in Frameworks */, - 7BB898A137474B3ABEF9425B /* libBVLinearGradient.a in Frameworks */, + BE104176D74E47E9A369B15A /* libRNVectorIcons.a in Frameworks */, + 69E1B84AE0DF486CB1B1D226 /* libBVLinearGradient.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -466,6 +483,7 @@ 2D02E4C61E0B4AEC006451C7 /* libRCTSettings-tvOS.a in Frameworks */, 2D02E4C71E0B4AEC006451C7 /* libRCTText-tvOS.a in Frameworks */, 2D02E4C81E0B4AEC006451C7 /* libRCTWebSocket-tvOS.a in Frameworks */, + 514DB1DF2E3B452F9EF272E3 /* libRNVectorIcons-tvOS.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -613,29 +631,6 @@ name = Products; sourceTree = ""; }; - 624432DF59944E72B6023C91 /* Resources */ = { - isa = PBXGroup; - children = ( - BEA7C1BC22034BC800B47CD7 /* AntDesign.ttf */, - BEA7C1B622034BC800B47CD7 /* Entypo.ttf */, - BEA7C1BE22034BC800B47CD7 /* EvilIcons.ttf */, - BEA7C1B922034BC800B47CD7 /* Feather.ttf */, - BEA7C1B222034BC800B47CD7 /* FontAwesome.ttf */, - BEA7C1B422034BC800B47CD7 /* FontAwesome5_Brands.ttf */, - BEA7C1BA22034BC800B47CD7 /* FontAwesome5_Regular.ttf */, - BEA7C1BB22034BC800B47CD7 /* FontAwesome5_Solid.ttf */, - BEA7C1BD22034BC800B47CD7 /* Foundation.ttf */, - BEA7C1B322034BC800B47CD7 /* Ionicons.ttf */, - BEA7C1B722034BC800B47CD7 /* MaterialCommunityIcons.ttf */, - BEA7C1B122034BC800B47CD7 /* MaterialIcons.ttf */, - BEA7C1BF22034BC800B47CD7 /* Octicons.ttf */, - BEA7C1B522034BC800B47CD7 /* SimpleLineIcons.ttf */, - BEA7C1B822034BC800B47CD7 /* Zocial.ttf */, - A55A26724384416FAF74A98D /* Ionicons.ttf */, - ); - name = Resources; - sourceTree = ""; - }; 78C398B11ACF4ADC00677621 /* Products */ = { isa = PBXGroup; children = ( @@ -648,10 +643,9 @@ 832341AE1AAA6A7D00B99B32 /* Libraries */ = { isa = PBXGroup; children = ( - BE2BDFD92201012E0001B8A8 /* RNVectorIcons.xcodeproj */, - BE2BDF9B2200F9830001B8A8 /* ReactNativePermissions.xcodeproj */, - BE2BDF932200F9490001B8A8 /* RNCamera.xcodeproj */, - BE2BDF682200F93B0001B8A8 /* RNGestureHandler.xcodeproj */, + BE5EAC3B221B888C00E92E5B /* ReactNativePermissions.xcodeproj */, + BE302B6E221B7AC7005626CF /* RNGestureHandler.xcodeproj */, + BE302B67221B7860005626CF /* RNCamera.xcodeproj */, 5E91572D1DD0AC6500FF2AA8 /* RCTAnimation.xcodeproj */, 146833FF1AC3E56700842450 /* React.xcodeproj */, 00C302A71ABCB8CE00DB3ED1 /* RCTActionSheet.xcodeproj */, @@ -664,7 +658,8 @@ 832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */, 00C302DF1ABCB9EE00DB3ED1 /* RCTVibration.xcodeproj */, 139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */, - B5DCFEB358F745A89DBBDC7B /* BVLinearGradient.xcodeproj */, + 664970B9D10A41A18B44727F /* RNVectorIcons.xcodeproj */, + 1908F5E093844AC5A143E888 /* BVLinearGradient.xcodeproj */, ); name = Libraries; sourceTree = ""; @@ -681,12 +676,13 @@ 83CBB9F61A601CBA00E9B192 = { isa = PBXGroup; children = ( + BE5EAB41221B7D2A00E92E5B /* Resources */, 13B07FAE1A68108700A75B9A /* app */, 832341AE1AAA6A7D00B99B32 /* Libraries */, 00E356EF1AD99517003FC87E /* appTests */, 83CBBA001A601CBA00E9B192 /* Products */, 2D16E6871FA4F8E400B85C8A /* Frameworks */, - 624432DF59944E72B6023C91 /* Resources */, + BE5EABCA221B834300E92E5B /* Recovered References */, ); indentWidth = 2; sourceTree = ""; @@ -696,10 +692,10 @@ 83CBBA001A601CBA00E9B192 /* Products */ = { isa = PBXGroup; children = ( - 13B07F961A680F5B00A75B9A /* enei2019.app */, - 00E356EE1AD99517003FC87E /* Tests.xctest */, - 2D02E47B1E0B4A5D006451C7 /* enei2019-tvOS.app */, - 2D02E4901E0B4A5D006451C7 /* enei2019-tvOSTests.xctest */, + 13B07F961A680F5B00A75B9A /* app.app */, + 00E356EE1AD99517003FC87E /* appTests.xctest */, + 2D02E47B1E0B4A5D006451C7 /* app-tvOS.app */, + 2D02E4901E0B4A5D006451C7 /* app-tvOSTests.xctest */, ); name = Products; sourceTree = ""; @@ -713,35 +709,76 @@ name = Products; sourceTree = ""; }; - BE2BDF692200F93B0001B8A8 /* Products */ = { + BE302B68221B7860005626CF /* Products */ = { isa = PBXGroup; children = ( - BE2BDF922200F93B0001B8A8 /* libRNGestureHandler.a */, + BE302B6C221B7860005626CF /* libRNCamera.a */, ); name = Products; sourceTree = ""; }; - BE2BDF942200F9490001B8A8 /* Products */ = { + BE302B6F221B7AC7005626CF /* Products */ = { isa = PBXGroup; children = ( - BE2BDF982200F9490001B8A8 /* libRNCamera.a */, + BE302B73221B7AC8005626CF /* libRNGestureHandler.a */, ); name = Products; sourceTree = ""; }; - BE2BDF9C2200F9830001B8A8 /* Products */ = { + BE5EAB41221B7D2A00E92E5B /* Resources */ = { isa = PBXGroup; children = ( - BE2BDFA02200F9830001B8A8 /* libReactNativePermissions.a */, + BE5EAB72221B7D5400E92E5B /* AntDesign.ttf */, + BE5EAB6A221B7D5300E92E5B /* Entypo.ttf */, + BE5EAB6D221B7D5300E92E5B /* EvilIcons.ttf */, + BE5EAB70221B7D5300E92E5B /* Feather.ttf */, + BE5EAB6B221B7D5300E92E5B /* FontAwesome.ttf */, + BE5EAB75221B7D5400E92E5B /* FontAwesome5_Brands.ttf */, + BE5EAB6E221B7D5300E92E5B /* FontAwesome5_Regular.ttf */, + BE5EAB71221B7D5400E92E5B /* FontAwesome5_Solid.ttf */, + BE5EAB6F221B7D5300E92E5B /* Foundation.ttf */, + BE5EAB73221B7D5400E92E5B /* MaterialCommunityIcons.ttf */, + BE5EAB69221B7D5300E92E5B /* MaterialIcons.ttf */, + BE5EAB76221B7D5400E92E5B /* Octicons.ttf */, + BE5EAB6C221B7D5300E92E5B /* SimpleLineIcons.ttf */, + BE5EAB77221B7D5400E92E5B /* Zocial.ttf */, + BE302B75221B7C3B005626CF /* Ionicons.ttf */, + ); + name = Resources; + sourceTree = ""; + }; + BE5EABCA221B834300E92E5B /* Recovered References */ = { + isa = PBXGroup; + children = ( + EB0A5A258CBE4EEFAD3C358E /* libRNVectorIcons.a */, + 95B0A42B6CD8441E904E6EB9 /* libRNVectorIcons-tvOS.a */, + C00CE8A4E3B747F9816B91CF /* libBVLinearGradient.a */, + ); + name = "Recovered References"; + sourceTree = ""; + }; + BE5EABF2221B834400E92E5B /* Products */ = { + isa = PBXGroup; + children = ( + BE5EABF7221B834400E92E5B /* libRNVectorIcons.a */, + BE5EABF9221B834400E92E5B /* libRNVectorIcons-tvOS.a */, ); name = Products; sourceTree = ""; }; - BE2BDFDA2201012E0001B8A8 /* Products */ = { + BE5EAC32221B835A00E92E5B /* Products */ = { isa = PBXGroup; children = ( - BE2BDFDF2201012E0001B8A8 /* libRNVectorIcons.a */, - BE2BDFE12201012E0001B8A8 /* libRNVectorIcons-tvOS.a */, + BE5EAC37221B835A00E92E5B /* libBVLinearGradient.a */, + BE5EAC39221B835A00E92E5B /* libBVLinearGradient.a */, + ); + name = Products; + sourceTree = ""; + }; + BE5EAC3C221B888C00E92E5B /* Products */ = { + isa = PBXGroup; + children = ( + BE5EAC40221B888C00E92E5B /* libReactNativePermissions.a */, ); name = Products; sourceTree = ""; @@ -749,27 +786,27 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - 00E356ED1AD99517003FC87E /* Tests */ = { + 00E356ED1AD99517003FC87E /* appTests */ = { isa = PBXNativeTarget; - buildConfigurationList = 00E357021AD99517003FC87E /* Build configuration list for PBXNativeTarget "Tests" */; + buildConfigurationList = 00E357021AD99517003FC87E /* Build configuration list for PBXNativeTarget "appTests" */; buildPhases = ( 00E356EA1AD99517003FC87E /* Sources */, - 00E356EB1AD99517003FC87E /* Frameworks */, 00E356EC1AD99517003FC87E /* Resources */, + 00E356EB1AD99517003FC87E /* Frameworks */, ); buildRules = ( ); dependencies = ( 00E356F51AD99517003FC87E /* PBXTargetDependency */, ); - name = Tests; + name = appTests; productName = appTests; - productReference = 00E356EE1AD99517003FC87E /* Tests.xctest */; + productReference = 00E356EE1AD99517003FC87E /* appTests.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; - 13B07F861A680F5B00A75B9A /* enei2019 */ = { + 13B07F861A680F5B00A75B9A /* app */ = { isa = PBXNativeTarget; - buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "enei2019" */; + buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "app" */; buildPhases = ( 13B07F871A680F5B00A75B9A /* Sources */, 13B07F8C1A680F5B00A75B9A /* Frameworks */, @@ -780,14 +817,14 @@ ); dependencies = ( ); - name = enei2019; + name = app; productName = "Hello World"; - productReference = 13B07F961A680F5B00A75B9A /* enei2019.app */; + productReference = 13B07F961A680F5B00A75B9A /* app.app */; productType = "com.apple.product-type.application"; }; - 2D02E47A1E0B4A5D006451C7 /* enei2019-tvOS */ = { + 2D02E47A1E0B4A5D006451C7 /* app-tvOS */ = { isa = PBXNativeTarget; - buildConfigurationList = 2D02E4BA1E0B4A5E006451C7 /* Build configuration list for PBXNativeTarget "enei2019-tvOS" */; + buildConfigurationList = 2D02E4BA1E0B4A5E006451C7 /* Build configuration list for PBXNativeTarget "app-tvOS" */; buildPhases = ( 2D02E4771E0B4A5D006451C7 /* Sources */, 2D02E4781E0B4A5D006451C7 /* Frameworks */, @@ -798,14 +835,14 @@ ); dependencies = ( ); - name = "enei2019-tvOS"; + name = "app-tvOS"; productName = "app-tvOS"; - productReference = 2D02E47B1E0B4A5D006451C7 /* enei2019-tvOS.app */; + productReference = 2D02E47B1E0B4A5D006451C7 /* app-tvOS.app */; productType = "com.apple.product-type.application"; }; - 2D02E48F1E0B4A5D006451C7 /* enei2019-tvOSTests */ = { + 2D02E48F1E0B4A5D006451C7 /* app-tvOSTests */ = { isa = PBXNativeTarget; - buildConfigurationList = 2D02E4BB1E0B4A5E006451C7 /* Build configuration list for PBXNativeTarget "enei2019-tvOSTests" */; + buildConfigurationList = 2D02E4BB1E0B4A5E006451C7 /* Build configuration list for PBXNativeTarget "app-tvOSTests" */; buildPhases = ( 2D02E48C1E0B4A5D006451C7 /* Sources */, 2D02E48D1E0B4A5D006451C7 /* Frameworks */, @@ -816,9 +853,9 @@ dependencies = ( 2D02E4921E0B4A5D006451C7 /* PBXTargetDependency */, ); - name = "enei2019-tvOSTests"; + name = "app-tvOSTests"; productName = "app-tvOSTests"; - productReference = 2D02E4901E0B4A5D006451C7 /* enei2019-tvOSTests.xctest */; + productReference = 2D02E4901E0B4A5D006451C7 /* app-tvOSTests.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; /* End PBXNativeTarget section */ @@ -832,7 +869,6 @@ TargetAttributes = { 00E356ED1AD99517003FC87E = { CreatedOnToolsVersion = 6.2; - DevelopmentTeam = HLA62A6826; TestTargetID = 13B07F861A680F5B00A75B9A; }; 13B07F861A680F5B00A75B9A = { @@ -849,7 +885,7 @@ }; }; }; - buildConfigurationList = 83CBB9FA1A601CBA00E9B192 /* Build configuration list for PBXProject "enei2019" */; + buildConfigurationList = 83CBB9FA1A601CBA00E9B192 /* Build configuration list for PBXProject "app" */; compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 0; @@ -861,6 +897,10 @@ productRefGroup = 83CBBA001A601CBA00E9B192 /* Products */; projectDirPath = ""; projectReferences = ( + { + ProductGroup = BE5EAC32221B835A00E92E5B /* Products */; + ProjectRef = 1908F5E093844AC5A143E888 /* BVLinearGradient.xcodeproj */; + }, { ProductGroup = 00C302A81ABCB8CE00DB3ED1 /* Products */; ProjectRef = 00C302A71ABCB8CE00DB3ED1 /* RCTActionSheet.xcodeproj */; @@ -910,28 +950,28 @@ ProjectRef = 146833FF1AC3E56700842450 /* React.xcodeproj */; }, { - ProductGroup = BE2BDF9C2200F9830001B8A8 /* Products */; - ProjectRef = BE2BDF9B2200F9830001B8A8 /* ReactNativePermissions.xcodeproj */; + ProductGroup = BE5EAC3C221B888C00E92E5B /* Products */; + ProjectRef = BE5EAC3B221B888C00E92E5B /* ReactNativePermissions.xcodeproj */; }, { - ProductGroup = BE2BDF942200F9490001B8A8 /* Products */; - ProjectRef = BE2BDF932200F9490001B8A8 /* RNCamera.xcodeproj */; + ProductGroup = BE302B68221B7860005626CF /* Products */; + ProjectRef = BE302B67221B7860005626CF /* RNCamera.xcodeproj */; }, { - ProductGroup = BE2BDF692200F93B0001B8A8 /* Products */; - ProjectRef = BE2BDF682200F93B0001B8A8 /* RNGestureHandler.xcodeproj */; + ProductGroup = BE302B6F221B7AC7005626CF /* Products */; + ProjectRef = BE302B6E221B7AC7005626CF /* RNGestureHandler.xcodeproj */; }, { - ProductGroup = BE2BDFDA2201012E0001B8A8 /* Products */; - ProjectRef = BE2BDFD92201012E0001B8A8 /* RNVectorIcons.xcodeproj */; + ProductGroup = BE5EABF2221B834400E92E5B /* Products */; + ProjectRef = 664970B9D10A41A18B44727F /* RNVectorIcons.xcodeproj */; }, ); projectRoot = ""; targets = ( - 13B07F861A680F5B00A75B9A /* enei2019 */, - 00E356ED1AD99517003FC87E /* Tests */, - 2D02E47A1E0B4A5D006451C7 /* enei2019-tvOS */, - 2D02E48F1E0B4A5D006451C7 /* enei2019-tvOSTests */, + 13B07F861A680F5B00A75B9A /* app */, + 00E356ED1AD99517003FC87E /* appTests */, + 2D02E47A1E0B4A5D006451C7 /* app-tvOS */, + 2D02E48F1E0B4A5D006451C7 /* app-tvOSTests */, ); }; /* End PBXProject section */ @@ -1196,39 +1236,53 @@ remoteRef = ADBDB9261DFEBF0700ED6528 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - BE2BDF922200F93B0001B8A8 /* libRNGestureHandler.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = libRNGestureHandler.a; - remoteRef = BE2BDF912200F93B0001B8A8 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - BE2BDF982200F9490001B8A8 /* libRNCamera.a */ = { + BE302B6C221B7860005626CF /* libRNCamera.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; path = libRNCamera.a; - remoteRef = BE2BDF972200F9490001B8A8 /* PBXContainerItemProxy */; + remoteRef = BE302B6B221B7860005626CF /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - BE2BDFA02200F9830001B8A8 /* libReactNativePermissions.a */ = { + BE302B73221B7AC8005626CF /* libRNGestureHandler.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; - path = libReactNativePermissions.a; - remoteRef = BE2BDF9F2200F9830001B8A8 /* PBXContainerItemProxy */; + path = libRNGestureHandler.a; + remoteRef = BE302B72221B7AC8005626CF /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - BE2BDFDF2201012E0001B8A8 /* libRNVectorIcons.a */ = { + BE5EABF7221B834400E92E5B /* libRNVectorIcons.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; path = libRNVectorIcons.a; - remoteRef = BE2BDFDE2201012E0001B8A8 /* PBXContainerItemProxy */; + remoteRef = BE5EABF6221B834400E92E5B /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - BE2BDFE12201012E0001B8A8 /* libRNVectorIcons-tvOS.a */ = { + BE5EABF9221B834400E92E5B /* libRNVectorIcons-tvOS.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; path = "libRNVectorIcons-tvOS.a"; - remoteRef = BE2BDFE02201012E0001B8A8 /* PBXContainerItemProxy */; + remoteRef = BE5EABF8221B834400E92E5B /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + BE5EAC37221B835A00E92E5B /* libBVLinearGradient.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libBVLinearGradient.a; + remoteRef = BE5EAC36221B835A00E92E5B /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + BE5EAC39221B835A00E92E5B /* libBVLinearGradient.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libBVLinearGradient.a; + remoteRef = BE5EAC38221B835A00E92E5B /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + BE5EAC40221B888C00E92E5B /* libReactNativePermissions.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libReactNativePermissions.a; + remoteRef = BE5EAC3F221B888C00E92E5B /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXReferenceProxy section */ @@ -1245,23 +1299,23 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - BEA7C1C022034BC800B47CD7 /* MaterialIcons.ttf in Resources */, - BEA7C1CC22034BC800B47CD7 /* Foundation.ttf in Resources */, - BEA7C1C122034BC800B47CD7 /* FontAwesome.ttf in Resources */, - BEA7C1C922034BC800B47CD7 /* FontAwesome5_Regular.ttf in Resources */, - BEA7C1C822034BC800B47CD7 /* Feather.ttf in Resources */, + BE5EAB81221B7D5400E92E5B /* AntDesign.ttf in Resources */, + BE5EAB78221B7D5400E92E5B /* MaterialIcons.ttf in Resources */, + BE5EAB7F221B7D5400E92E5B /* Feather.ttf in Resources */, + BE5EAB7E221B7D5400E92E5B /* Foundation.ttf in Resources */, + BE5EAB86221B7D5400E92E5B /* Zocial.ttf in Resources */, + BE5EAB85221B7D5400E92E5B /* Octicons.ttf in Resources */, 13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */, + BE5EAB79221B7D5400E92E5B /* Entypo.ttf in Resources */, + BE5EAC3A221B83CF00E92E5B /* Ionicons.ttf in Resources */, 13B07FBD1A68108700A75B9A /* LaunchScreen.xib in Resources */, - BEA7C1CA22034BC800B47CD7 /* FontAwesome5_Solid.ttf in Resources */, - BEA7C1C422034BC800B47CD7 /* SimpleLineIcons.ttf in Resources */, - BEA7C1CE22034BC800B47CD7 /* Octicons.ttf in Resources */, - BEA7C1CB22034BC800B47CD7 /* AntDesign.ttf in Resources */, - BEA7C1CD22034BC800B47CD7 /* EvilIcons.ttf in Resources */, - BEA7C1C722034BC800B47CD7 /* Zocial.ttf in Resources */, - BEA7C1C622034BC800B47CD7 /* MaterialCommunityIcons.ttf in Resources */, - BEA7C1C322034BC800B47CD7 /* FontAwesome5_Brands.ttf in Resources */, - BEA7C1C522034BC800B47CD7 /* Entypo.ttf in Resources */, - 43A080C42246430685BC7859 /* Ionicons.ttf in Resources */, + BE5EAB84221B7D5400E92E5B /* FontAwesome5_Brands.ttf in Resources */, + BE5EAB82221B7D5400E92E5B /* MaterialCommunityIcons.ttf in Resources */, + BE5EAB7C221B7D5400E92E5B /* EvilIcons.ttf in Resources */, + BE5EAB7D221B7D5400E92E5B /* FontAwesome5_Regular.ttf in Resources */, + BE5EAB80221B7D5400E92E5B /* FontAwesome5_Solid.ttf in Resources */, + BE5EAB7B221B7D5400E92E5B /* SimpleLineIcons.ttf in Resources */, + BE5EAB7A221B7D5400E92E5B /* FontAwesome.ttf in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1295,7 +1349,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "export NODE_BINARY=node\n../node_modules/react-native/scripts/react-native-xcode.sh"; + shellScript = "export NODE_BINARY=node\n../node_modules/react-native/scripts/react-native-xcode.sh\n"; }; 2D02E4CB1E0B4B27006451C7 /* Bundle React Native Code And Images */ = { isa = PBXShellScriptBuildPhase; @@ -1353,12 +1407,12 @@ /* Begin PBXTargetDependency section */ 00E356F51AD99517003FC87E /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 13B07F861A680F5B00A75B9A /* enei2019 */; + target = 13B07F861A680F5B00A75B9A /* app */; targetProxy = 00E356F41AD99517003FC87E /* PBXContainerItemProxy */; }; 2D02E4921E0B4A5D006451C7 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 2D02E47A1E0B4A5D006451C7 /* enei2019-tvOS */; + target = 2D02E47A1E0B4A5D006451C7 /* app-tvOS */; targetProxy = 2D02E4911E0B4A5D006451C7 /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ @@ -1380,30 +1434,31 @@ isa = XCBuildConfiguration; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; - DEVELOPMENT_TEAM = HLA62A6826; - ENABLE_BITCODE = NO; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", "$(inherited)", ); + HEADER_SEARCH_PATHS = ( + "$(inherited)", + "$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager", + "$(SRCROOT)/../node_modules/react-native-linear-gradient/BVLinearGradient", + ); INFOPLIST_FILE = appTests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "\"$(SRCROOT)/$(TARGET_NAME)\"", + "\"$(SRCROOT)/$(TARGET_NAME)\"", + "\"$(SRCROOT)/$(TARGET_NAME)\"", + ); OTHER_LDFLAGS = ( "-ObjC", "-lc++", ); PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/enei2019.enei2019/enei2019"; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "\"$(SRCROOT)/$(TARGET_NAME)\"", - ); - HEADER_SEARCH_PATHS = ( - "$(inherited)", - "$(SRCROOT)/../node_modules/react-native-linear-gradient/BVLinearGradient", - ); + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/app.app/app"; }; name = Debug; }; @@ -1412,26 +1467,27 @@ buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; COPY_PHASE_STRIP = NO; - DEVELOPMENT_TEAM = HLA62A6826; - ENABLE_BITCODE = NO; + HEADER_SEARCH_PATHS = ( + "$(inherited)", + "$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager", + "$(SRCROOT)/../node_modules/react-native-linear-gradient/BVLinearGradient", + ); INFOPLIST_FILE = appTests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "\"$(SRCROOT)/$(TARGET_NAME)\"", + "\"$(SRCROOT)/$(TARGET_NAME)\"", + "\"$(SRCROOT)/$(TARGET_NAME)\"", + ); OTHER_LDFLAGS = ( "-ObjC", "-lc++", ); PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/enei2019.enei2019/enei2019"; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "\"$(SRCROOT)/$(TARGET_NAME)\"", - ); - HEADER_SEARCH_PATHS = ( - "$(inherited)", - "$(SRCROOT)/../node_modules/react-native-linear-gradient/BVLinearGradient", - ); + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/app.app/app"; }; name = Release; }; @@ -1442,6 +1498,11 @@ CURRENT_PROJECT_VERSION = 1; DEAD_CODE_STRIPPING = NO; DEVELOPMENT_TEAM = HLA62A6826; + HEADER_SEARCH_PATHS = ( + "$(inherited)", + "$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager", + "$(SRCROOT)/../node_modules/react-native-linear-gradient/BVLinearGradient", + ); INFOPLIST_FILE = app/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; OTHER_LDFLAGS = ( @@ -1449,14 +1510,9 @@ "-ObjC", "-lc++", ); - PRODUCT_BUNDLE_IDENTIFIER = enei; - PRODUCT_MODULE_NAME = App; - PRODUCT_NAME = enei2019; + PRODUCT_BUNDLE_IDENTIFIER = enei.app; + PRODUCT_NAME = app; VERSIONING_SYSTEM = "apple-generic"; - HEADER_SEARCH_PATHS = ( - "$(inherited)", - "$(SRCROOT)/../node_modules/react-native-linear-gradient/BVLinearGradient", - ); }; name = Debug; }; @@ -1466,6 +1522,11 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = HLA62A6826; + HEADER_SEARCH_PATHS = ( + "$(inherited)", + "$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager", + "$(SRCROOT)/../node_modules/react-native-linear-gradient/BVLinearGradient", + ); INFOPLIST_FILE = app/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; OTHER_LDFLAGS = ( @@ -1473,14 +1534,9 @@ "-ObjC", "-lc++", ); - PRODUCT_BUNDLE_IDENTIFIER = enei; - PRODUCT_MODULE_NAME = App; - PRODUCT_NAME = enei2019; + PRODUCT_BUNDLE_IDENTIFIER = enei.app; + PRODUCT_NAME = app; VERSIONING_SYSTEM = "apple-generic"; - HEADER_SEARCH_PATHS = ( - "$(inherited)", - "$(SRCROOT)/../node_modules/react-native-linear-gradient/BVLinearGradient", - ); }; name = Release; }; @@ -1496,8 +1552,19 @@ DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_TESTABILITY = YES; GCC_NO_COMMON_BLOCKS = YES; + HEADER_SEARCH_PATHS = ( + "$(inherited)", + "$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager", + "$(SRCROOT)/../node_modules/react-native-linear-gradient/BVLinearGradient", + ); INFOPLIST_FILE = "app-tvOS/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "\"$(SRCROOT)/$(TARGET_NAME)\"", + "\"$(SRCROOT)/$(TARGET_NAME)\"", + "\"$(SRCROOT)/$(TARGET_NAME)\"", + ); OTHER_LDFLAGS = ( "-ObjC", "-lc++", @@ -1507,14 +1574,6 @@ SDKROOT = appletvos; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 9.2; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "\"$(SRCROOT)/$(TARGET_NAME)\"", - ); - HEADER_SEARCH_PATHS = ( - "$(inherited)", - "$(SRCROOT)/../node_modules/react-native-linear-gradient/BVLinearGradient", - ); }; name = Debug; }; @@ -1530,8 +1589,19 @@ COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; GCC_NO_COMMON_BLOCKS = YES; + HEADER_SEARCH_PATHS = ( + "$(inherited)", + "$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager", + "$(SRCROOT)/../node_modules/react-native-linear-gradient/BVLinearGradient", + ); INFOPLIST_FILE = "app-tvOS/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "\"$(SRCROOT)/$(TARGET_NAME)\"", + "\"$(SRCROOT)/$(TARGET_NAME)\"", + "\"$(SRCROOT)/$(TARGET_NAME)\"", + ); OTHER_LDFLAGS = ( "-ObjC", "-lc++", @@ -1541,14 +1611,6 @@ SDKROOT = appletvos; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 9.2; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "\"$(SRCROOT)/$(TARGET_NAME)\"", - ); - HEADER_SEARCH_PATHS = ( - "$(inherited)", - "$(SRCROOT)/../node_modules/react-native-linear-gradient/BVLinearGradient", - ); }; name = Release; }; @@ -1563,8 +1625,19 @@ DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_TESTABILITY = YES; GCC_NO_COMMON_BLOCKS = YES; + HEADER_SEARCH_PATHS = ( + "$(inherited)", + "$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager", + "$(SRCROOT)/../node_modules/react-native-linear-gradient/BVLinearGradient", + ); INFOPLIST_FILE = "app-tvOSTests/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "\"$(SRCROOT)/$(TARGET_NAME)\"", + "\"$(SRCROOT)/$(TARGET_NAME)\"", + "\"$(SRCROOT)/$(TARGET_NAME)\"", + ); OTHER_LDFLAGS = ( "-ObjC", "-lc++", @@ -1572,16 +1645,8 @@ PRODUCT_BUNDLE_IDENTIFIER = "com.facebook.REACT.app-tvOSTests"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = appletvos; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/enei2019-tvOS.enei2019/enei2019-tvOS"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/app-tvOS.app/app-tvOS"; TVOS_DEPLOYMENT_TARGET = 10.1; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "\"$(SRCROOT)/$(TARGET_NAME)\"", - ); - HEADER_SEARCH_PATHS = ( - "$(inherited)", - "$(SRCROOT)/../node_modules/react-native-linear-gradient/BVLinearGradient", - ); }; name = Debug; }; @@ -1596,8 +1661,19 @@ COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; GCC_NO_COMMON_BLOCKS = YES; + HEADER_SEARCH_PATHS = ( + "$(inherited)", + "$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager", + "$(SRCROOT)/../node_modules/react-native-linear-gradient/BVLinearGradient", + ); INFOPLIST_FILE = "app-tvOSTests/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "\"$(SRCROOT)/$(TARGET_NAME)\"", + "\"$(SRCROOT)/$(TARGET_NAME)\"", + "\"$(SRCROOT)/$(TARGET_NAME)\"", + ); OTHER_LDFLAGS = ( "-ObjC", "-lc++", @@ -1605,16 +1681,8 @@ PRODUCT_BUNDLE_IDENTIFIER = "com.facebook.REACT.app-tvOSTests"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = appletvos; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/enei2019-tvOS.enei2019/enei2019-tvOS"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/app-tvOS.app/app-tvOS"; TVOS_DEPLOYMENT_TARGET = 10.1; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "\"$(SRCROOT)/$(TARGET_NAME)\"", - ); - HEADER_SEARCH_PATHS = ( - "$(inherited)", - "$(SRCROOT)/../node_modules/react-native-linear-gradient/BVLinearGradient", - ); }; name = Release; }; @@ -1647,7 +1715,6 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; - ENABLE_BITCODE = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = gnu99; @@ -1701,7 +1768,6 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = YES; - ENABLE_BITCODE = NO; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_C_LANGUAGE_STANDARD = gnu99; @@ -1722,7 +1788,7 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 00E357021AD99517003FC87E /* Build configuration list for PBXNativeTarget "Tests" */ = { + 00E357021AD99517003FC87E /* Build configuration list for PBXNativeTarget "appTests" */ = { isa = XCConfigurationList; buildConfigurations = ( 00E356F61AD99517003FC87E /* Debug */, @@ -1731,7 +1797,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "enei2019" */ = { + 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "app" */ = { isa = XCConfigurationList; buildConfigurations = ( 13B07F941A680F5B00A75B9A /* Debug */, @@ -1740,7 +1806,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 2D02E4BA1E0B4A5E006451C7 /* Build configuration list for PBXNativeTarget "enei2019-tvOS" */ = { + 2D02E4BA1E0B4A5E006451C7 /* Build configuration list for PBXNativeTarget "app-tvOS" */ = { isa = XCConfigurationList; buildConfigurations = ( 2D02E4971E0B4A5E006451C7 /* Debug */, @@ -1749,7 +1815,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 2D02E4BB1E0B4A5E006451C7 /* Build configuration list for PBXNativeTarget "enei2019-tvOSTests" */ = { + 2D02E4BB1E0B4A5E006451C7 /* Build configuration list for PBXNativeTarget "app-tvOSTests" */ = { isa = XCConfigurationList; buildConfigurations = ( 2D02E4991E0B4A5E006451C7 /* Debug */, @@ -1758,7 +1824,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 83CBB9FA1A601CBA00E9B192 /* Build configuration list for PBXProject "enei2019" */ = { + 83CBB9FA1A601CBA00E9B192 /* Build configuration list for PBXProject "app" */ = { isa = XCConfigurationList; buildConfigurations = ( 83CBBA201A601CBA00E9B192 /* Debug */, diff --git a/App/ios/enei2019.xcodeproj/xcshareddata/xcschemes/app-tvOS.xcscheme b/App/ios/app.xcodeproj/xcshareddata/xcschemes/app-tvOS.xcscheme old mode 100755 new mode 100644 similarity index 79% rename from App/ios/enei2019.xcodeproj/xcshareddata/xcschemes/app-tvOS.xcscheme rename to App/ios/app.xcodeproj/xcshareddata/xcschemes/app-tvOS.xcscheme index b0f5fb56..685bd3d8 --- a/App/ios/enei2019.xcodeproj/xcshareddata/xcschemes/app-tvOS.xcscheme +++ b/App/ios/app.xcodeproj/xcshareddata/xcschemes/app-tvOS.xcscheme @@ -29,9 +29,9 @@ + BuildableName = "app-tvOS.app" + BlueprintName = "app-tvOS" + ReferencedContainer = "container:app.xcodeproj"> + BuildableName = "app-tvOSTests.xctest" + BlueprintName = "app-tvOSTests" + ReferencedContainer = "container:app.xcodeproj"> @@ -61,9 +61,9 @@ + BuildableName = "app-tvOSTests.xctest" + BlueprintName = "app-tvOSTests" + ReferencedContainer = "container:app.xcodeproj"> @@ -71,9 +71,9 @@ + BuildableName = "app-tvOS.app" + BlueprintName = "app-tvOS" + ReferencedContainer = "container:app.xcodeproj"> @@ -94,9 +94,9 @@ + BuildableName = "app-tvOS.app" + BlueprintName = "app-tvOS" + ReferencedContainer = "container:app.xcodeproj"> @@ -113,9 +113,9 @@ + BuildableName = "app-tvOS.app" + BlueprintName = "app-tvOS" + ReferencedContainer = "container:app.xcodeproj"> diff --git a/App/ios/enei2019.xcodeproj/xcshareddata/xcschemes/app.xcscheme b/App/ios/app.xcodeproj/xcshareddata/xcschemes/app.xcscheme old mode 100755 new mode 100644 similarity index 81% rename from App/ios/enei2019.xcodeproj/xcshareddata/xcschemes/app.xcscheme rename to App/ios/app.xcodeproj/xcshareddata/xcschemes/app.xcscheme index ce661d96..a7dc6e28 --- a/App/ios/enei2019.xcodeproj/xcshareddata/xcschemes/app.xcscheme +++ b/App/ios/app.xcodeproj/xcshareddata/xcschemes/app.xcscheme @@ -29,9 +29,9 @@ + BuildableName = "app.app" + BlueprintName = "app" + ReferencedContainer = "container:app.xcodeproj"> + BuildableName = "appTests.xctest" + BlueprintName = "appTests" + ReferencedContainer = "container:app.xcodeproj"> @@ -61,9 +61,9 @@ + BuildableName = "appTests.xctest" + BlueprintName = "appTests" + ReferencedContainer = "container:app.xcodeproj"> @@ -71,9 +71,9 @@ + BuildableName = "app.app" + BlueprintName = "app" + ReferencedContainer = "container:app.xcodeproj"> @@ -94,9 +94,9 @@ + BuildableName = "app.app" + BlueprintName = "app" + ReferencedContainer = "container:app.xcodeproj"> @@ -113,9 +113,9 @@ + BuildableName = "app.app" + BlueprintName = "app" + ReferencedContainer = "container:app.xcodeproj"> diff --git a/App/ios/app/AppDelegate.h b/App/ios/app/AppDelegate.h old mode 100755 new mode 100644 diff --git a/App/ios/app/AppDelegate.m b/App/ios/app/AppDelegate.m old mode 100755 new mode 100644 diff --git a/App/ios/app/Base.lproj/LaunchScreen.xib b/App/ios/app/Base.lproj/LaunchScreen.xib old mode 100755 new mode 100644 index 3db425d3..9cec2c70 --- a/App/ios/app/Base.lproj/LaunchScreen.xib +++ b/App/ios/app/Base.lproj/LaunchScreen.xib @@ -1,8 +1,9 @@ - - + + - - + + + @@ -17,14 +18,14 @@ -