From 79e0d1b14f141336460bfba2e25850c57d1ed59d Mon Sep 17 00:00:00 2001 From: Korbs Date: Fri, 9 Jun 2023 03:00:28 -0400 Subject: [PATCH] update --- App.js | 55 ++++++++++++------------------ app.json | 4 ++- assets/splash.png | Bin eas.json | 22 +++++------- options/TabOptions.js | 76 +++++++++++++++++++++--------------------- package.json | 7 ++-- 6 files changed, 74 insertions(+), 90 deletions(-) mode change 100644 => 100755 assets/splash.png diff --git a/App.js b/App.js index 0ccccfe..213e02c 100755 --- a/App.js +++ b/App.js @@ -1,11 +1,11 @@ // Import Stuff /// React Native import * as React from 'react' -import { useState } from "react"; +import { useState } from "react" import { Alert, AsyncStorage, Text, TextInput, UseState, View } from 'react-native' import { SafeAreaView } from 'react-native-safe-area-context' import { WebView } from 'react-native-webview' -import Modal from "react-native-modal"; +import Modal from "react-native-modal" /// React Native Navigation import { NavigationContainer } from '@react-navigation/native' @@ -26,35 +26,10 @@ const Tab = createMaterialTopTabNavigator() let InstanceURL = 'https://design.penpot.app/' -_storeData = async () => { - try { - await AsyncStorage.setItem( - 'I like to save it.', - ); - } catch (error) { - // Error saving data - } -}; - -_retrieveData = async () => { - try { - const value = await AsyncStorage.getItem('TASKS'); - if (value !== null) { - // We have data!! - console.log(value); - } - } catch (error) { - // Error retrieving data - } -}; - // App export default function App() { - const [isModalVisible, setModalVisible] = useState(false); - - const ToggleSettingModal = () => { - setModalVisible(!isModalVisible); - }; + const [isModalVisible, setModalVisible] = useState(false) + const ToggleSettingModal = () => {setModalVisible(!isModalVisible)} const [tabs, setTabs] = React.useState([ { @@ -64,7 +39,7 @@ export default function App() { ]) const addNewTab = () => { setTabs(tabs => [ - ...tabs, + tabs, { name : "" + (parseInt(tabs.pop().name.replace("", "")) + 1), component : TabScreen, @@ -73,15 +48,30 @@ export default function App() { } const remove = (route) => {setTabs(tabs => tabs.filter(tab => tab.name !== route.name))} + function Loading() { + return ( + + Loading + + ) + } + function TabScreen({route}) { return ( Alert.alert("Something went wrong", "The page you are trying to load has either crashed or there is no connection. Please check your Instance setting to make sure the URL is correct.", [{text: 'OK'}])} + onError={(syntheticEvent) => {const { nativeEvent } = syntheticEvent}} + renderError={() => Alert.alert("Something went wrong", "The page you are trying to load has either crashed or there is no connection. Please check your Instance setting to make sure the URL is correct.", [{text: 'OK'}])} + renderLoading={() => } + startInLoadingState={true} source={{ uri: InstanceURL }} javaScriptEnabled={true} javaScriptEnabledAndroid={true} scalesPageToFit={false} + bounces={false} + pullToRefreshEnabled={false} + contentMode={'desktop'} + androidLayerType={'software'} allowsBackForwardNavigationGestures style={{backgroundColor: '#202020'}} /> @@ -130,7 +120,7 @@ export default function App() { SetInstance(e.target.value)} + onChange={(e) => SetInstance(e.target.value)} placeholder="https://design.penpot.app/" aria-label="InstanceURL" /> @@ -140,7 +130,6 @@ export default function App() { - ) } diff --git a/app.json b/app.json index 24610b5..8026cde 100755 --- a/app.json +++ b/app.json @@ -5,7 +5,6 @@ "owner": "sudovanilla", "version": "0.0.1", "icon": "./assets/icon.png", - "githubUrl": "https://sudovanilla.com/code/Korbs/Penpot-App/", "userInterfaceStyle": "automatic", "scheme": "penpot", "orientation": "landscape", @@ -44,6 +43,9 @@ "eas": { "projectId": "9f3d77d2-68f6-463f-909f-cb600ef6eeac" } + }, + "updates": { + "url": "https://u.expo.dev/9f3d77d2-68f6-463f-909f-cb600ef6eeac" } } } diff --git a/assets/splash.png b/assets/splash.png old mode 100644 new mode 100755 diff --git a/eas.json b/eas.json index 27bd8f7..39879eb 100755 --- a/eas.json +++ b/eas.json @@ -1,26 +1,20 @@ { "cli": { - "version": ">= 3.13.2" + "version": ">= 3.13.2", + "promptToConfigurePushNotifications": false }, "build": { - "development-simulator": { - "extends": "production", - "developmentClient": true, - "distribution": "internal", - "ios": { - "simulator": true - } - }, - "development": { - "developmentClient": true, - "distribution": "internal" - }, "preview": { "distribution": "internal" }, "production": {} }, "submit": { - "production": {} + "production": { + "ios": { + "appleId": "ks@korbsstudio.com", + "appleTeamId": "F2M4QF2K4L" + } + } } } diff --git a/options/TabOptions.js b/options/TabOptions.js index ba3e94d..4defcad 100755 --- a/options/TabOptions.js +++ b/options/TabOptions.js @@ -1,42 +1,42 @@ import * as React from 'react' import {StyleSheet} from 'react-native' export default screenOptions = { - lazy: true, - swipeEnabled: false, - tabBarGap: 10, - activeTintColor: "#FFF", - inactiveTintColor: "gray", - tabBarIndicatorStyle: { - backgroundColor: '#202020', - height: 40, - top: 4, - margin: 0, - borderRadius: 10, - marginLeft: 6 - }, - tabBarStyle:{ - backgroundColor:'#303236', - width: "auto", - height: 48, - paddingLeft: 6 - }, - labelStyle: { - fontSize: 10, - margin: 0, - padding: 0, - }, - tabBarItemStyle:{ - alignSelf: 'stretch', - color: 'white', - backgroundColor: 'rgba(0, 0, 0, 0)', - textAlign: 'left', - paddingHorizontal: 0, - position: 'relative', - width: 160, - }, - tabBarLabelStyle: { - fontSize: 10, - color: 'white', - textAlign: 'left' - } + lazy: true, + swipeEnabled: false, + tabBarGap: 10, + activeTintColor: "#FFF", + inactiveTintColor: "gray", + tabBarIndicatorStyle: { + backgroundColor: '#202020', + height: 40, + top: 4, + margin: 0, + borderRadius: 10, + marginLeft: 6 + }, + tabBarStyle:{ + backgroundColor:'#303236', + width: "auto", + height: 48, + paddingLeft: 6 + }, + labelStyle: { + fontSize: 10, + margin: 0, + padding: 0, + }, + tabBarItemStyle:{ + alignSelf: 'stretch', + color: 'white', + backgroundColor: 'rgba(0, 0, 0, 0)', + textAlign: 'left', + paddingHorizontal: 0, + position: 'relative', + width: 160, + }, + tabBarLabelStyle: { + fontSize: 10, + color: 'white', + textAlign: 'left' + } } \ No newline at end of file diff --git a/package.json b/package.json index 0cde7a9..af3080a 100755 --- a/package.json +++ b/package.json @@ -9,19 +9,18 @@ "dependencies": { "@react-navigation/material-top-tabs": "^6.6.2", "@react-navigation/native": "^6.1.6", - "expo": "~48.0.18", - "expo-dev-client": "~2.2.1", + "expo": "~48.0.0", "expo-splash-screen": "~0.18.2", "expo-status-bar": "~1.4.4", "expo-system-ui": "~2.2.1", + "expo-updates": "~0.16.4", "react": "18.2.0", "react-native": "0.71.8", "react-native-modal": "^13.0.1", - "react-native-pager-view": "^6.2.0", "react-native-safe-area-context": "4.5.0", "react-native-screens": "~3.20.0", "react-native-tab-view": "^3.5.1", - "react-native-webview": "^12.2.0" + "react-native-webview": "11.26.0" }, "devDependencies": { "@babel/core": "^7.20.0"