From 625020f17d652ba132ac1ed26037047df7991ae5 Mon Sep 17 00:00:00 2001 From: Roland Osborne Date: Tue, 6 Sep 2022 14:38:53 -0700 Subject: [PATCH] preparing mobile app --- app/mobile/.editorconfig | 3 - app/mobile/.eslintrc.js | 4 - app/mobile/.flowconfig | 65 - app/mobile/.gitattributes | 4 +- app/mobile/.gitignore | 19 +- app/mobile/.prettierrc.js | 7 - app/mobile/.watchmanconfig | 1 - app/mobile/App.js | 62 +- app/mobile/__tests__/App-test.js | 14 - app/mobile/android/.gitignore | 21 + app/mobile/android/app/{_BUCK => BUCK} | 4 +- app/mobile/android/app/build.gradle | 193 +- app/mobile/android/app/proguard-rules.pro | 4 + .../android/app/src/debug/AndroidManifest.xml | 8 +- .../{ws => databag}/ReactNativeFlipper.java | 7 +- .../android/app/src/main/AndroidManifest.xml | 51 +- .../main/java/com/databag/MainActivity.java | 83 + .../java/com/databag/MainApplication.java | 106 + .../MainApplicationReactNativeHost.java | 117 + .../components/MainComponentsRegistry.java | 36 + ...ApplicationTurboModuleManagerDelegate.java | 48 + .../src/main/java/com/ws/MainActivity.java | 15 - .../src/main/java/com/ws/MainApplication.java | 80 - .../android/app/src/main/jni/Android.mk | 48 + .../jni/MainApplicationModuleProvider.cpp | 24 + .../main/jni/MainApplicationModuleProvider.h | 16 + ...nApplicationTurboModuleManagerDelegate.cpp | 45 + ...ainApplicationTurboModuleManagerDelegate.h | 38 + .../src/main/jni/MainComponentsRegistry.cpp | 61 + .../app/src/main/jni/MainComponentsRegistry.h | 32 + .../android/app/src/main/jni/OnLoad.cpp | 11 + .../res/drawable/rn_edit_text_material.xml | 36 + .../src/main/res/drawable/splashscreen.xml | 4 + .../main/res/drawable/splashscreen_image.png | Bin 0 -> 9306 bytes .../app/src/main/res/values/colors.xml | 4 + .../app/src/main/res/values/strings.xml | 2 +- .../app/src/main/res/values/styles.xml | 19 +- app/mobile/android/build.gradle | 39 +- app/mobile/android/gradle.properties | 31 +- .../android/gradle/wrapper/gradle-wrapper.jar | Bin 59203 -> 59536 bytes .../gradle/wrapper/gradle-wrapper.properties | 2 +- app/mobile/android/gradlew | 269 +- app/mobile/android/gradlew.bat | 178 +- app/mobile/android/settings.gradle | 18 +- app/mobile/app.json | 13 +- app/mobile/babel.config.js | 7 +- app/mobile/index.js | 11 +- app/mobile/ios/.gitignore | 30 + app/mobile/ios/.xcode.env | 11 + .../ios/Databag.xcodeproj/project.pbxproj | 477 + .../xcshareddata/xcschemes/Databag.xcscheme} | 26 +- app/mobile/ios/Databag/AppDelegate.h | 9 + app/mobile/ios/Databag/AppDelegate.mm | 166 + .../AppIcon.appiconset/Contents.json | 2 +- .../Images.xcassets/Contents.json | 2 +- .../SplashScreen.imageset/Contents.json | 21 + .../SplashScreen.imageset/splashscreen.png | Bin 0 -> 9306 bytes .../Contents.json | 21 + .../background.png | Bin 0 -> 80 bytes app/mobile/ios/{ws => Databag}/Info.plist | 18 +- .../ios/Databag/SplashScreen.storyboard | 91 + app/mobile/ios/Databag/Supporting/Expo.plist | 10 + app/mobile/ios/{ws => Databag}/main.m | 1 + app/mobile/ios/Podfile | 49 +- app/mobile/ios/Podfile.lock | 526 - app/mobile/ios/Podfile.properties.json | 3 + app/mobile/ios/ws.xcodeproj/project.pbxproj | 689 - .../ws.xcworkspace/contents.xcworkspacedata | 10 - app/mobile/ios/ws/AppDelegate.h | 8 - app/mobile/ios/ws/AppDelegate.m | 62 - app/mobile/ios/ws/LaunchScreen.storyboard | 47 - app/mobile/ios/wsTests/Info.plist | 24 - app/mobile/ios/wsTests/wsTests.m | 65 - app/mobile/metro.config.js | 19 +- app/mobile/package-lock.json | 23844 ---------------- app/mobile/package.json | 37 +- app/mobile/yarn.lock | 6700 +++++ 77 files changed, 8937 insertions(+), 25891 deletions(-) delete mode 100644 app/mobile/.editorconfig delete mode 100644 app/mobile/.eslintrc.js delete mode 100644 app/mobile/.flowconfig delete mode 100644 app/mobile/.prettierrc.js delete mode 100644 app/mobile/.watchmanconfig delete mode 100644 app/mobile/__tests__/App-test.js create mode 100644 app/mobile/android/.gitignore rename app/mobile/android/app/{_BUCK => BUCK} (95%) rename app/mobile/android/app/src/debug/java/com/{ws => databag}/ReactNativeFlipper.java (99%) create mode 100644 app/mobile/android/app/src/main/java/com/databag/MainActivity.java create mode 100644 app/mobile/android/app/src/main/java/com/databag/MainApplication.java create mode 100644 app/mobile/android/app/src/main/java/com/databag/newarchitecture/MainApplicationReactNativeHost.java create mode 100644 app/mobile/android/app/src/main/java/com/databag/newarchitecture/components/MainComponentsRegistry.java create mode 100644 app/mobile/android/app/src/main/java/com/databag/newarchitecture/modules/MainApplicationTurboModuleManagerDelegate.java delete mode 100644 app/mobile/android/app/src/main/java/com/ws/MainActivity.java delete mode 100644 app/mobile/android/app/src/main/java/com/ws/MainApplication.java create mode 100644 app/mobile/android/app/src/main/jni/Android.mk create mode 100644 app/mobile/android/app/src/main/jni/MainApplicationModuleProvider.cpp create mode 100644 app/mobile/android/app/src/main/jni/MainApplicationModuleProvider.h create mode 100644 app/mobile/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.cpp create mode 100644 app/mobile/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.h create mode 100644 app/mobile/android/app/src/main/jni/MainComponentsRegistry.cpp create mode 100644 app/mobile/android/app/src/main/jni/MainComponentsRegistry.h create mode 100644 app/mobile/android/app/src/main/jni/OnLoad.cpp create mode 100644 app/mobile/android/app/src/main/res/drawable/rn_edit_text_material.xml create mode 100644 app/mobile/android/app/src/main/res/drawable/splashscreen.xml create mode 100644 app/mobile/android/app/src/main/res/drawable/splashscreen_image.png create mode 100644 app/mobile/android/app/src/main/res/values/colors.xml create mode 100644 app/mobile/ios/.gitignore create mode 100644 app/mobile/ios/.xcode.env create mode 100644 app/mobile/ios/Databag.xcodeproj/project.pbxproj rename app/mobile/ios/{ws.xcodeproj/xcshareddata/xcschemes/ws.xcscheme => Databag.xcodeproj/xcshareddata/xcschemes/Databag.xcscheme} (80%) create mode 100644 app/mobile/ios/Databag/AppDelegate.h create mode 100644 app/mobile/ios/Databag/AppDelegate.mm rename app/mobile/ios/{ws => Databag}/Images.xcassets/AppIcon.appiconset/Contents.json (96%) rename app/mobile/ios/{ws => Databag}/Images.xcassets/Contents.json (63%) create mode 100644 app/mobile/ios/Databag/Images.xcassets/SplashScreen.imageset/Contents.json create mode 100644 app/mobile/ios/Databag/Images.xcassets/SplashScreen.imageset/splashscreen.png create mode 100644 app/mobile/ios/Databag/Images.xcassets/SplashScreenBackground.imageset/Contents.json create mode 100644 app/mobile/ios/Databag/Images.xcassets/SplashScreenBackground.imageset/background.png rename app/mobile/ios/{ws => Databag}/Info.plist (84%) create mode 100644 app/mobile/ios/Databag/SplashScreen.storyboard create mode 100644 app/mobile/ios/Databag/Supporting/Expo.plist rename app/mobile/ios/{ws => Databag}/main.m (99%) delete mode 100644 app/mobile/ios/Podfile.lock create mode 100644 app/mobile/ios/Podfile.properties.json delete mode 100644 app/mobile/ios/ws.xcodeproj/project.pbxproj delete mode 100644 app/mobile/ios/ws.xcworkspace/contents.xcworkspacedata delete mode 100644 app/mobile/ios/ws/AppDelegate.h delete mode 100644 app/mobile/ios/ws/AppDelegate.m delete mode 100644 app/mobile/ios/ws/LaunchScreen.storyboard delete mode 100644 app/mobile/ios/wsTests/Info.plist delete mode 100644 app/mobile/ios/wsTests/wsTests.m delete mode 100644 app/mobile/package-lock.json create mode 100644 app/mobile/yarn.lock diff --git a/app/mobile/.editorconfig b/app/mobile/.editorconfig deleted file mode 100644 index 7c286132..00000000 --- a/app/mobile/.editorconfig +++ /dev/null @@ -1,3 +0,0 @@ -# Windows files -[*.bat] -end_of_line = crlf diff --git a/app/mobile/.eslintrc.js b/app/mobile/.eslintrc.js deleted file mode 100644 index 40c6dcd0..00000000 --- a/app/mobile/.eslintrc.js +++ /dev/null @@ -1,4 +0,0 @@ -module.exports = { - root: true, - extends: '@react-native-community', -}; diff --git a/app/mobile/.flowconfig b/app/mobile/.flowconfig deleted file mode 100644 index 4320b707..00000000 --- a/app/mobile/.flowconfig +++ /dev/null @@ -1,65 +0,0 @@ -[ignore] -; We fork some components by platform -.*/*[.]android.js - -; Ignore "BUCK" generated dirs -/\.buckd/ - -; Ignore polyfills -node_modules/react-native/Libraries/polyfills/.* - -; Flow doesn't support platforms -.*/Libraries/Utilities/LoadingView.js - -[untyped] -.*/node_modules/@react-native-community/cli/.*/.* - -[include] - -[libs] -node_modules/react-native/interface.js -node_modules/react-native/flow/ - -[options] -emoji=true - -exact_by_default=true - -format.bracket_spacing=false - -module.file_ext=.js -module.file_ext=.json -module.file_ext=.ios.js - -munge_underscores=true - -module.name_mapper='^react-native/\(.*\)$' -> '/node_modules/react-native/\1' -module.name_mapper='^@?[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\|pdf\)$' -> '/node_modules/react-native/Libraries/Image/RelativeImageStub' - -suppress_type=$FlowIssue -suppress_type=$FlowFixMe -suppress_type=$FlowFixMeProps -suppress_type=$FlowFixMeState - -[lints] -sketchy-null-number=warn -sketchy-null-mixed=warn -sketchy-number=warn -untyped-type-import=warn -nonstrict-import=warn -deprecated-type=warn -unsafe-getters-setters=warn -unnecessary-invariant=warn -signature-verification-failure=warn - -[strict] -deprecated-type -nonstrict-import -sketchy-null -unclear-type -unsafe-getters-setters -untyped-import -untyped-type-import - -[version] -^0.158.0 diff --git a/app/mobile/.gitattributes b/app/mobile/.gitattributes index 45a3dcb2..d42ff183 100644 --- a/app/mobile/.gitattributes +++ b/app/mobile/.gitattributes @@ -1,3 +1 @@ -# Windows files should use crlf line endings -# https://help.github.com/articles/dealing-with-line-endings/ -*.bat text eol=crlf +*.pbxproj -text diff --git a/app/mobile/.gitignore b/app/mobile/.gitignore index cc53454e..c8eb0f9a 100644 --- a/app/mobile/.gitignore +++ b/app/mobile/.gitignore @@ -20,6 +20,7 @@ DerivedData *.hmap *.ipa *.xcuserstate +project.xcworkspace # Android/IntelliJ # @@ -42,19 +43,13 @@ buck-out/ *.keystore !debug.keystore -# fastlane -# -# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the -# screenshots whenever they are needed. -# For more information about the recommended setup visit: -# https://docs.fastlane.tools/best-practices/source-control/ - -*/fastlane/report.xml -*/fastlane/Preview.html -*/fastlane/screenshots - -# Bundle artifact +# Bundle artifacts *.jsbundle # CocoaPods /ios/Pods/ + +# Expo +.expo/ +web-build/ +dist/ diff --git a/app/mobile/.prettierrc.js b/app/mobile/.prettierrc.js deleted file mode 100644 index 84196d95..00000000 --- a/app/mobile/.prettierrc.js +++ /dev/null @@ -1,7 +0,0 @@ -module.exports = { - bracketSpacing: false, - jsxBracketSameLine: true, - singleQuote: true, - trailingComma: 'all', - arrowParens: 'avoid', -}; diff --git a/app/mobile/.watchmanconfig b/app/mobile/.watchmanconfig deleted file mode 100644 index 9e26dfee..00000000 --- a/app/mobile/.watchmanconfig +++ /dev/null @@ -1 +0,0 @@ -{} \ No newline at end of file diff --git a/app/mobile/App.js b/app/mobile/App.js index edda80df..181f3cee 100644 --- a/app/mobile/App.js +++ b/app/mobile/App.js @@ -1,51 +1,21 @@ -/** - * Sample React Native App - * https://github.com/facebook/react-native - * - * @format - * @flow strict-local - */ - +import { StatusBar } from 'expo-status-bar'; import React from 'react'; -import type {Node} from 'react'; -import { - SafeAreaView, - ScrollView, - StatusBar, - StyleSheet, - Text, - useColorScheme, - View, - Button, -} from 'react-native'; - -const App: () => Node = () => { - - const test = () => { - console.log("PRESSED: 7000"); - var ws = new WebSocket('ws://192.168.13.233:7000/status'); - ws.onerror = (e) => { - console.log("error: ", e); - } - ws.onmessage = (e) => { - console.log("message: ", e); - } - ws.onclose = (e) => { - console.log("close: ", e); - } - ws.onopen = (e) => { - console.log("connected"); - ws.send('something'); - } - } +import { StyleSheet, Text, View } from 'react-native'; +export default function App() { return ( - - -