Skip to content

Commit 82462fa

Browse files
authored
Merge pull request #1836 from OneSignal/fg/fix-example
chore: update the example-project to use latest react-native setup
2 parents 1222510 + 38d0ace commit 82462fa

File tree

79 files changed

+15474
-2829
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+15474
-2829
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ coverage/
1010
# tsc
1111
#
1212
dist
13+
android/build
1314

1415
# OSX
1516
#

examples/RNOneSignalTS/.buckconfig

Lines changed: 0 additions & 6 deletions
This file was deleted.
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
BUNDLE_PATH: "vendor/bundle"
2+
BUNDLE_FORCE_RUBY_PLATFORM: 1
Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
module.exports = {
22
root: true,
3-
extends: '@react-native-community',
4-
parser: '@typescript-eslint/parser',
5-
plugins: ['@typescript-eslint'],
3+
extends: '@react-native',
64
};

examples/RNOneSignalTS/.gitattributes

Lines changed: 0 additions & 1 deletion
This file was deleted.

examples/RNOneSignalTS/.gitignore

Lines changed: 27 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ DerivedData
2020
*.hmap
2121
*.ipa
2222
*.xcuserstate
23+
**/.xcode.env.local
2324

2425
# Android/IntelliJ
2526
#
@@ -28,36 +29,47 @@ build/
2829
.gradle
2930
local.properties
3031
*.iml
31-
32-
# Visual Studio Code
33-
#
34-
.vscode/
32+
*.hprof
33+
.cxx/
34+
*.keystore
35+
!debug.keystore
36+
.kotlin/
3537

3638
# node.js
3739
#
3840
node_modules/
3941
npm-debug.log
4042
yarn-error.log
4143

42-
# BUCK
43-
buck-out/
44-
\.buckd/
45-
*.keystore
46-
!debug.keystore
47-
4844
# fastlane
4945
#
5046
# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
5147
# screenshots whenever they are needed.
5248
# For more information about the recommended setup visit:
5349
# https://docs.fastlane.tools/best-practices/source-control/
5450

55-
*/fastlane/report.xml
56-
*/fastlane/Preview.html
57-
*/fastlane/screenshots
51+
**/fastlane/report.xml
52+
**/fastlane/Preview.html
53+
**/fastlane/screenshots
54+
**/fastlane/test_output
5855

5956
# Bundle artifact
6057
*.jsbundle
6158

62-
# CocoaPods
63-
/ios/Pods/
59+
# Ruby / CocoaPods
60+
**/Pods/
61+
/vendor/bundle/
62+
63+
# Temporary files created by Metro to check the health of the file watcher
64+
.metro-health-check*
65+
66+
# testing
67+
/coverage
68+
69+
# Yarn
70+
.yarn/*
71+
!.yarn/patches
72+
!.yarn/plugins
73+
!.yarn/releases
74+
!.yarn/sdks
75+
!.yarn/versions
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
module.exports = {
2-
bracketSpacing: false,
3-
jsxBracketSameLine: true,
2+
arrowParens: 'avoid',
43
singleQuote: true,
54
trailingComma: 'all',
65
};

examples/RNOneSignalTS/App.tsx

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
/**
2+
* Sample React Native App
3+
* https://github.com/facebook/react-native
4+
*
5+
* @format
6+
*/
7+
8+
import { StatusBar, StyleSheet, useColorScheme, View } from 'react-native';
9+
import {
10+
SafeAreaProvider,
11+
useSafeAreaInsets,
12+
} from 'react-native-safe-area-context';
13+
import OSDemo from './OSDemo';
14+
15+
function App() {
16+
const isDarkMode = useColorScheme() === 'dark';
17+
18+
return (
19+
<SafeAreaProvider>
20+
<StatusBar barStyle={isDarkMode ? 'light-content' : 'dark-content'} />
21+
<AppContent />
22+
</SafeAreaProvider>
23+
);
24+
}
25+
26+
function AppContent() {
27+
const safeAreaInsets = useSafeAreaInsets();
28+
29+
return (
30+
<View style={styles.container}>
31+
<OSDemo name="OneSignal" />
32+
</View>
33+
);
34+
}
35+
36+
const styles = StyleSheet.create({
37+
container: {
38+
flex: 1,
39+
},
40+
});
41+
42+
export default App;

examples/RNOneSignalTS/Gemfile

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
source 'https://rubygems.org'
2+
3+
# You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
4+
ruby ">= 2.6.10"
5+
6+
# Exclude problematic versions of cocoapods and activesupport that causes build failures.
7+
gem 'cocoapods', '>= 1.13', '!= 1.15.0', '!= 1.15.1'
8+
gem 'activesupport', '>= 6.1.7.5', '!= 7.1.0'
9+
gem 'xcodeproj', '< 1.26.0'
10+
gem 'concurrent-ruby', '< 1.3.4'
11+
12+
# Ruby 3.4.0 has removed some libraries from the standard library.
13+
gem 'bigdecimal'
14+
gem 'logger'
15+
gem 'benchmark'
16+
gem 'mutex_m'
Lines changed: 24 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,24 @@
1-
import * as React from 'react';
21
import {
3-
View,
4-
StyleSheet,
5-
Platform,
62
KeyboardAvoidingView,
3+
StyleSheet,
4+
Text,
75
TextInput,
6+
TouchableOpacity,
87
} from 'react-native';
9-
import {Button} from '@react-native-material/core';
108

11-
const disabledColor = '#BEBEBE';
9+
// const disabledColor = '#BEBEBE';
1210

1311
export const renderButtonView = (name: string, callback: Function) => {
1412
return (
15-
<View key={name + '_parent'} style={styles.buttonContainer}>
16-
<Button
17-
key={name}
18-
title={name}
19-
onPress={() => {
20-
callback();
21-
}}
22-
/>
23-
</View>
13+
<TouchableOpacity
14+
key={name + '_parent'}
15+
style={styles.buttonContainer}
16+
onPress={() => {
17+
callback();
18+
}}
19+
>
20+
<Text style={styles.buttonText}>{name}</Text>
21+
</TouchableOpacity>
2422
);
2523
};
2624

@@ -59,11 +57,19 @@ export const renderFieldView = (
5957

6058
const styles = StyleSheet.create({
6159
buttonContainer: {
62-
flexDirection: 'column',
63-
overflow: 'hidden',
64-
borderRadius: 10,
60+
backgroundColor: '#007bff',
61+
borderRadius: 8,
6562
marginVertical: 10,
6663
marginHorizontal: 10,
64+
paddingVertical: 12,
65+
paddingHorizontal: 16,
66+
alignItems: 'center',
67+
justifyContent: 'center',
68+
},
69+
buttonText: {
70+
color: 'white',
71+
fontSize: 16,
72+
fontWeight: '600',
6773
},
6874
textInput: {
6975
marginHorizontal: 10,

0 commit comments

Comments
 (0)