Skip to content
This repository has been archived by the owner on Jan 19, 2024. It is now read-only.

Commit

Permalink
Updated to latest RN version
Browse files Browse the repository at this point in the history
  • Loading branch information
Michael Hoffmann committed Mar 21, 2019
1 parent 989d41f commit 8f1911d
Show file tree
Hide file tree
Showing 23 changed files with 12,409 additions and 6,391 deletions.
4 changes: 2 additions & 2 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"presets": ["react-native"]
}
"presets": ["module:metro-react-native-babel-preset"]
}
1 change: 1 addition & 0 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,7 @@ android {
}

dependencies {
implementation project(':react-native-gesture-handler')
compile project(':react-native-admob')
compile project(':react-native-i18n')
compile project(':react-native-tts')
Expand Down
Binary file added android/app/src/main/assets/fonts/AntDesign.ttf
Binary file not shown.
Binary file modified android/app/src/main/assets/fonts/EvilIcons.ttf
Binary file not shown.
Binary file modified android/app/src/main/assets/fonts/Feather.ttf
Binary file not shown.
Binary file modified android/app/src/main/assets/fonts/FontAwesome5_Brands.ttf
Binary file not shown.
Binary file modified android/app/src/main/assets/fonts/FontAwesome5_Regular.ttf
Binary file not shown.
Binary file modified android/app/src/main/assets/fonts/FontAwesome5_Solid.ttf
Binary file not shown.
Binary file modified android/app/src/main/assets/fonts/Ionicons.ttf
Binary file not shown.
Binary file modified android/app/src/main/assets/fonts/MaterialCommunityIcons.ttf
Binary file not shown.
Binary file modified android/app/src/main/assets/fonts/Octicons.ttf
Binary file not shown.
Empty file.
2 changes: 2 additions & 0 deletions android/settings.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
rootProject.name = 'parentssoundboard'
include ':react-native-gesture-handler'
project(':react-native-gesture-handler').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-gesture-handler/android')
include ':react-native-admob'
project(':react-native-admob').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-admob/android')
include ':react-native-i18n'
Expand Down
10 changes: 6 additions & 4 deletions app/App.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import { createStackNavigator } from 'react-navigation';
import { createAppContainer, createStackNavigator } from 'react-navigation';
import { createStore } from 'redux';
import { Provider } from 'react-redux';
import styled from 'styled-components';
Expand All @@ -18,7 +18,7 @@ const StyledView = styled.View`

const store = createStore(reducer);

const Stack = createStackNavigator(
const AppNavigator = createStackNavigator(
{
Start: { screen: StartScreen },
Settings: { screen: SettingsScreen },
Expand All @@ -28,7 +28,7 @@ const Stack = createStackNavigator(
{
headerMode: 'screen',
headerLayoutPreset: 'left',
navigationOptions: {
defaultNavigationOptions: {
headerTintColor: 'black',
headerStyle: {
backgroundColor: COLORS.MOKKAPPS_RED
Expand All @@ -38,6 +38,8 @@ const Stack = createStackNavigator(
}
);

const AppContainer = createAppContainer(AppNavigator);

class App extends React.Component {
constructor() {
super();
Expand All @@ -60,7 +62,7 @@ class App extends React.Component {
return (
<Provider store={store}>
<StyledView>
<Stack />
<AppContainer />
</StyledView>
</Provider>
);
Expand Down
4 changes: 2 additions & 2 deletions app/components/SettingsButton.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ export default ({ title, onPress, testID }) => (
testID={testID}
small
raised
backgroundColor={COLORS.LIGHT_GRAY}
buttonStyle={{ backgroundColor: COLORS.LIGHT_GRAY }}
color="black"
containerViewStyle={{ marginTop: 10 }}
containerStyle={{ marginTop: 10 }}
title={title}
onPress={() => onPress()}
/>
Expand Down
11 changes: 1 addition & 10 deletions ios/Podfile
Original file line number Diff line number Diff line change
@@ -1,19 +1,10 @@
# Uncomment the next line to define a global platform for your project
# platform :ios, '9.0'
platform :ios, '12.0'

target 'parentssoundboard' do
# Uncomment the next line if you're using Swift or would like to use dynamic frameworks
use_frameworks!

# Pods for parentssoundboard
pod 'Google-Mobile-Ads-SDK'

end

target 'parentssoundboard-tvOS' do
# Uncomment the next line if you're using Swift or would like to use dynamic frameworks
# use_frameworks!

# Pods for parentssoundboard-tvOS

end
4 changes: 2 additions & 2 deletions ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ SPEC REPOS:
SPEC CHECKSUMS:
Google-Mobile-Ads-SDK: 2aca87e46e860f1e1fc0fdc1201dd9caa4be9ba6

PODFILE CHECKSUM: f698192f5566f5c2de7d65a8473556dd764fbbb3
PODFILE CHECKSUM: 1463c8ced1f80a4f3b2afe70a15017f53081d23e

COCOAPODS: 1.5.3
COCOAPODS: 1.6.0
241 changes: 132 additions & 109 deletions ios/parentssoundboard.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0820"
LastUpgradeVersion = "1010"
version = "1.3">
<BuildAction
parallelizeBuildables = "NO"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0620"
LastUpgradeVersion = "1010"
version = "1.3">
<BuildAction
parallelizeBuildables = "NO"
Expand Down
1 change: 1 addition & 0 deletions ios/parentssoundboard/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@
<string>Octicons.ttf</string>
<string>SimpleLineIcons.ttf</string>
<string>Zocial.ttf</string>
<string>AntDesign.ttf</string>
</array>
<key>UILaunchStoryboardName</key>
<string>LaunchScreen</string>
Expand Down
Loading

0 comments on commit 8f1911d

Please sign in to comment.