Skip to content

Commit

Permalink
Merge pull request #94 from kanzitelli/rn-0.69
Browse files Browse the repository at this point in the history
RN 0.69 + Expo 0.46 🥳
  • Loading branch information
kanzitelli authored Aug 29, 2022
2 parents e554b12 + 608d791 commit 4e35433
Show file tree
Hide file tree
Showing 117 changed files with 7,373 additions and 6,938 deletions.
6 changes: 6 additions & 0 deletions .buckconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@

[android]
target = Google Inc.:Google APIs:23

[maven_repositories]
central = https://repo1.maven.org/maven2
1 change: 0 additions & 1 deletion .gitattributes

This file was deleted.

24 changes: 12 additions & 12 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
#
.DS_Store

# Own
#
.env
media/

# Xcode
#
build/
Expand All @@ -20,6 +25,7 @@ DerivedData
*.hmap
*.ipa
*.xcuserstate
ios/.xcode.env.local

# Android/IntelliJ
#
Expand All @@ -29,14 +35,6 @@ build/
local.properties
*.iml
*.hprof
google-services.json

# Own
#
.env
.cli-rn
media/
/ios/assets

# node.js
#
Expand All @@ -57,12 +55,14 @@ buck-out/
# For more information about the recommended setup visit:
# https://docs.fastlane.tools/best-practices/source-control/

*/fastlane/report.xml
*/fastlane/Preview.html
*/fastlane/screenshots
**/fastlane/report.xml
**/fastlane/Preview.html
**/fastlane/screenshots
**/fastlane/test_output

# Bundle artifact
*.jsbundle

# CocoaPods
# Ruby / CocoaPods
/ios/Pods/
/vendor/bundle/
6 changes: 3 additions & 3 deletions .prettierrc.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
module.exports = {
arrowParens: 'avoid',
bracketSameLine: true,
bracketSpacing: false,
singleQuote: true,
trailingComma: 'all',
printWidth: 120,
bracketSpacing: false,
arrowParens: 'avoid',
};
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.7.4
2.7.5
1 change: 1 addition & 0 deletions .watchmanconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{}
20 changes: 9 additions & 11 deletions App.tsx
Original file line number Diff line number Diff line change
@@ -1,17 +1,10 @@
import {LogBox} from 'react-native';
import {BottomTabs, Screen, Root} from 'rnn-screens';
import {Root, Screen, BottomTabs} from 'rnn-screens';

import {screens} from './src/screens';
import {initServices} from './src/services';
import {hydrateStores} from './src/stores';
import {configureDesignSystem} from './src/utils/designSystem';

LogBox.ignoreLogs([
'EventEmitter.removeListener',
'`new NativeEventEmitter()`',
'[react-native-gesture-handler] Seems like', // https://github.com/software-mansion/react-native-gesture-handler/issues/1831
]);

export const beforeStart = async (): PVoid => {
// 1. hydrate stores
await hydrateStores();
Expand All @@ -23,6 +16,11 @@ export const beforeStart = async (): PVoid => {
await initServices();
};

export const App = () => Root(Screen(screens.get('Main'))); // or Root(Stack(Component(screens.get('Main'))))
export const TabsApp = () =>
Root(BottomTabs([Screen(screens.get('Main')), Screen(screens.get('Example')), Screen(screens.get('Settings'))]));
export const App = () =>
Root(
BottomTabs([
Screen(screens.get('Main')),
Screen(screens.get('Playground')),
Screen(screens.get('Settings')),
]),
);
6 changes: 3 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
source 'https://rubygems.org'

# You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
ruby '2.7.4'
gem 'cocoapods', '~> 1.11', '>= 1.11.2'
ruby '2.7.5'

gem 'cocoapods', '~> 1.11', '>= 1.11.2'
96 changes: 0 additions & 96 deletions Gemfile.lock

This file was deleted.

Loading

0 comments on commit 4e35433

Please sign in to comment.