Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tutorial Screen -Design #137

Merged
merged 28 commits into from
Mar 15, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
c25be17
dummy implementation of first tut page
ulfgebhardt Mar 5, 2018
03cf0ee
added HelveticaNeue-Light Font
ulfgebhardt Mar 5, 2018
55d70ee
correct Font
ulfgebhardt Mar 5, 2018
1f19689
corrected Button Color
ulfgebhardt Mar 5, 2018
2f0e93f
removed HelveticaNeue, fixed ios padding, fixed font
ulfgebhardt Mar 5, 2018
5517148
fadeout static
ulfgebhardt Mar 5, 2018
5c9850c
gradient test
ulfgebhardt Mar 5, 2018
7b91492
fix gradient configuration
ManAnRuck Mar 5, 2018
0c7fb40
gradient fix
ulfgebhardt Mar 5, 2018
e07a78b
tutorial screen final
ulfgebhardt Mar 6, 2018
46a61e5
Merge branch 'master' into sprint#6/gradient
ulfgebhardt Mar 6, 2018
ec99d10
fix ios xcode settings
ManAnRuck Mar 6, 2018
1c79d2e
- fix style names
ManAnRuck Mar 6, 2018
c4e529c
add only portrai mode for inscructions
ManAnRuck Mar 6, 2018
95e11a3
fix gradiance for ios
ManAnRuck Mar 6, 2018
81fb967
replace white bottom box
ManAnRuck Mar 6, 2018
d3a4b89
try 2 fix travis without sudo #1 - disable cache
ulfgebhardt Mar 6, 2018
1569bf1
try 2 fix travis without sudo #2
ulfgebhardt Mar 6, 2018
55105cf
reenabled caching for yarn (android)
ulfgebhardt Mar 6, 2018
f806814
Merge branch 'master' into sprint#6/gradient
ulfgebhardt Mar 6, 2018
56adf48
Update .travis.yml
ulfgebhardt Mar 6, 2018
9793de2
Merge branch 'master' into sprint#6/gradient
ulfgebhardt Mar 6, 2018
32adee6
Merge branch 'master' into sprint#6/gradient
ulfgebhardt Mar 9, 2018
2f333dc
removed transparent pictures, use opacity attribute instead
ulfgebhardt Mar 13, 2018
1504fe2
updated all images, orientation portrait on menu -> tutorial, correct…
ulfgebhardt Mar 13, 2018
e804d26
background white for right picture, wrapper for center image & circle…
ulfgebhardt Mar 14, 2018
9f6148e
convert math to flexbox :D
ManAnRuck Mar 15, 2018
af98842
- fix iPhone X header padding
ManAnRuck Mar 15, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
matrix:
include:
# test
# test
- os: linux
language: node_js
node_js:
Expand All @@ -17,16 +17,14 @@ matrix:
script:
- yarn test

# android test
# android test
- if: type IN (pull_request)
os: linux
language: android
jdk: oraclejdk8

cache:
yarn: true
directories:
- node_modules

before_install:
- echo y | android update sdk --no-ui --filter build-tools-26.0.1,build-tools-26.0.2,android-26,extra-android-m2repository
Expand Down Expand Up @@ -83,7 +81,7 @@ matrix:
- cd ios
- bundle exec fastlane ios test

# android deploy Alpha
# android deploy Alpha
- if: branch =~ ^master AND NOT type =~ ^pull_request
os: linux
language: android
Expand All @@ -109,13 +107,13 @@ matrix:
components:
- tools
- platform-tools
# android 23
# android 23
- build-tools-23.0.1
- build-tools-25.0.1
- build-tools-26.0.1
- build-tools-26.0.2
- android-23
# extra
# extra
- extra-android-m2repository
- extra-google-google_play_services
- extra-google-m2repository
Expand Down
1 change: 1 addition & 0 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,7 @@ dependencies {
compile "com.android.support:appcompat-v7:23.0.1"
compile "com.facebook.react:react-native:+"
compile project(':react-native-navigation')
compile project(':react-native-linear-gradient')
}

// Run this once to be able to run the application with BUCK
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
import java.util.Arrays;
import java.util.List;

import com.BV.LinearGradient.LinearGradientPackage;

public class MainApplication extends NavigationApplication {

private final ReactNativeHost mReactNativeHost = new ReactNativeHost(this) {
Expand All @@ -29,7 +31,8 @@ protected List<ReactPackage> getPackages() {
return Arrays.<ReactPackage>asList(new MainReactPackage(),
new RNDeviceInfo(),
new ReactNativeConfigPackage(),
new VectorIconsPackage());
new VectorIconsPackage(),
new LinearGradientPackage());
}

@Override
Expand Down Expand Up @@ -62,7 +65,8 @@ protected List<ReactPackage> getPackages() {
// eg. new VectorIconsPackage()
new RNDeviceInfo(),
new ReactNativeConfigPackage(),
new VectorIconsPackage()
new VectorIconsPackage(),
new LinearGradientPackage()
);
}

Expand Down
11 changes: 6 additions & 5 deletions android/settings.gradle
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
rootProject.name = 'democracyclient'
include ':react-native-vector-icons'
project(':react-native-vector-icons').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-vector-icons/android')
include ':react-native-navigation'
project(':react-native-navigation').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-navigation/android/app')
include ':react-native-linear-gradient'
project(':react-native-linear-gradient').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-linear-gradient/android')
include ':react-native-device-info'
project(':react-native-device-info').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-device-info/android')
include ':react-native-config'
project(':react-native-config').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-config/android')
include ':react-native-vector-icons'
project(':react-native-vector-icons').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-vector-icons/android')

include ':app'

include ':react-native-navigation'
project(':react-native-navigation').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-navigation/android/app/')
Binary file added assets/tutorial/icon.analysiere.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/tutorial/icon.analysiere@2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/tutorial/icon.analysiere@3x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/tutorial/icon.beobachte.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/tutorial/icon.beobachte@2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/tutorial/icon.beobachte@3x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/tutorial/icon.diskutiere.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/tutorial/icon.diskutiere@2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/tutorial/icon.diskutiere@3x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/tutorial/icon.informiere.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/tutorial/icon.informiere@2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/tutorial/icon.informiere@3x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/tutorial/icon.logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/tutorial/icon.logo@2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/tutorial/icon.logo@3x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/tutorial/icon.stimme.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/tutorial/icon.stimme@2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/tutorial/icon.stimme@3x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/tutorial/icon.touch.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/tutorial/icon.touch@2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/tutorial/icon.touch@3x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/tutorial/screen.analyse.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/tutorial/screen.analyse@2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/tutorial/screen.analyse@3x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/tutorial/screen.detail.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/tutorial/screen.detail@2x.png
Binary file added assets/tutorial/screen.detail@3x.png
Binary file added assets/tutorial/screen.forum.png
Binary file added assets/tutorial/screen.forum@2x.png
Binary file added assets/tutorial/screen.forum@3x.png
Binary file added assets/tutorial/screen.list.png
Binary file added assets/tutorial/screen.list@2x.png
Binary file added assets/tutorial/screen.list@3x.png
Binary file added assets/tutorial/screen.vote.png
Binary file added assets/tutorial/screen.vote@2x.png
Binary file added assets/tutorial/screen.vote@3x.png
5 changes: 4 additions & 1 deletion index.js
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,10 @@ class App {
navBarHidden: true
}
},
animationType: "fade"
animationType: "fade",
appStyle: {
orientation: "portrait"
}
});
}
};
Expand Down
59 changes: 59 additions & 0 deletions ios/democracyclient.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
2DCD954D1E0B4F2C00145EB5 /* democracyclientTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* democracyclientTests.m */; };
3A19523E434F4E52B98E0F7D /* MaterialIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 8F9A22D8C210442B92209F31 /* MaterialIcons.ttf */; };
5716EA5275274560903EEA9C /* Foundation.ttf in Resources */ = {isa = PBXBuildFile; fileRef = C90ED33945EE46ED93CE4270 /* Foundation.ttf */; };
5B3A3653AC514347891E19D1 /* libBVLinearGradient.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9E60EEBD31A544D8B801D6D1 /* libBVLinearGradient.a */; };
5D5FAC8BCE4640DD919C0C9F /* FontAwesome.ttf in Resources */ = {isa = PBXBuildFile; fileRef = B606CDA763364008B1925002 /* FontAwesome.ttf */; };
5E9157361DD0AC6A00FF2AA8 /* libRCTAnimation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5E9157331DD0AC6500FF2AA8 /* libRCTAnimation.a */; };
7F937BA07FF747BA8AFDC450 /* SimpleLineIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 4405FC48A78C474EA507571D /* SimpleLineIcons.ttf */; };
Expand Down Expand Up @@ -363,6 +364,20 @@
remoteGlobalIDString = EB2648DF1C7BE17A00B8F155;
remoteInfo = ReactNativeConfig;
};
C3A76DBE204EE9A2008D1C29 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = D248333CC3664928A505C5AB /* BVLinearGradient.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 134814201AA4EA6300B7C361;
remoteInfo = BVLinearGradient;
};
C3A76DC0204EE9A2008D1C29 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = D248333CC3664928A505C5AB /* BVLinearGradient.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 64AA15081EF7F30100718508;
remoteInfo = "BVLinearGradient-tvOS";
};
C3EBC73F204547DB0040ED81 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 3E46D3BDC3654F5FAB77111C /* RNVectorIcons.xcodeproj */;
Expand Down Expand Up @@ -419,6 +434,7 @@
832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = "../node_modules/react-native/Libraries/Text/RCTText.xcodeproj"; sourceTree = "<group>"; };
8F9A22D8C210442B92209F31 /* MaterialIcons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = MaterialIcons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/MaterialIcons.ttf"; sourceTree = "<group>"; };
9BFE3F2879F84086BF621EEB /* Octicons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Octicons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Octicons.ttf"; sourceTree = "<group>"; };
9E60EEBD31A544D8B801D6D1 /* libBVLinearGradient.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libBVLinearGradient.a; sourceTree = "<group>"; };
ADB1777930654CFFB3852474 /* Zocial.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Zocial.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Zocial.ttf"; sourceTree = "<group>"; };
ADBDB91F1DFEBF0600ED6528 /* RCTBlob.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTBlob.xcodeproj; path = "../node_modules/react-native/Libraries/Blob/RCTBlob.xcodeproj"; sourceTree = "<group>"; };
B2D6DF01BA014AF1A090AC45 /* libRNDeviceInfo.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNDeviceInfo.a; sourceTree = "<group>"; };
Expand All @@ -439,6 +455,7 @@
C90ED33945EE46ED93CE4270 /* Foundation.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Foundation.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Foundation.ttf"; sourceTree = "<group>"; };
CF1A551E9AD54473AE890083 /* RNDeviceInfo.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNDeviceInfo.xcodeproj; path = "../node_modules/react-native-device-info/RNDeviceInfo.xcodeproj"; sourceTree = "<group>"; };
D146E1606C054E768BAFE9F5 /* Feather.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Feather.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Feather.ttf"; sourceTree = "<group>"; };
D248333CC3664928A505C5AB /* BVLinearGradient.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = BVLinearGradient.xcodeproj; path = "../node_modules/react-native-linear-gradient/BVLinearGradient.xcodeproj"; sourceTree = "<group>"; };
D879F3E7359A4C6C82AE7CFC /* libRNVectorIcons.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNVectorIcons.a; sourceTree = "<group>"; };
E08B1CA484314178A9A5F917 /* Ionicons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Ionicons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Ionicons.ttf"; sourceTree = "<group>"; };
E4CF3D41D8A04C95A7AAC65D /* EvilIcons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = EvilIcons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/EvilIcons.ttf"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -474,6 +491,7 @@
139FDEF61B0652A700C62182 /* libRCTWebSocket.a in Frameworks */,
BFBF28EFC41F43D1BD244700 /* libReactNativeConfig.a in Frameworks */,
ADFA4473E79A4134B0A72B42 /* libRNDeviceInfo.a in Frameworks */,
5B3A3653AC514347891E19D1 /* libBVLinearGradient.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -681,6 +699,7 @@
03885401ECF640B08F42ACDE /* ReactNativeConfig.xcodeproj */,
3E46D3BDC3654F5FAB77111C /* RNVectorIcons.xcodeproj */,
CF1A551E9AD54473AE890083 /* RNDeviceInfo.xcodeproj */,
D248333CC3664928A505C5AB /* BVLinearGradient.xcodeproj */,
);
name = Libraries;
sourceTree = "<group>";
Expand Down Expand Up @@ -765,13 +784,23 @@
path = "../node_modules/react-native-vector-icons/Fonts";
sourceTree = "<group>";
};
C3A76DBA204EE9A2008D1C29 /* Products */ = {
isa = PBXGroup;
children = (
C3A76DBF204EE9A2008D1C29 /* libBVLinearGradient.a */,
C3A76DC1204EE9A2008D1C29 /* libBVLinearGradient.a */,
);
name = Products;
sourceTree = "<group>";
};
C3DD6C9C2019F87A009C3EB8 /* Recovered References */ = {
isa = PBXGroup;
children = (
D879F3E7359A4C6C82AE7CFC /* libRNVectorIcons.a */,
BE21168EDFFA4F90B10BEC29 /* libReactNativeConfig.a */,
B2D6DF01BA014AF1A090AC45 /* libRNDeviceInfo.a */,
77CD98C5685F4A6FB80A4A47 /* libRNDeviceInfo-tvOS.a */,
9E60EEBD31A544D8B801D6D1 /* libBVLinearGradient.a */,
);
name = "Recovered References";
sourceTree = "<group>";
Expand Down Expand Up @@ -911,6 +940,10 @@
productRefGroup = 83CBBA001A601CBA00E9B192 /* Products */;
projectDirPath = "";
projectReferences = (
{
ProductGroup = C3A76DBA204EE9A2008D1C29 /* Products */;
ProjectRef = D248333CC3664928A505C5AB /* BVLinearGradient.xcodeproj */;
},
{
ProductGroup = 00C302A81ABCB8CE00DB3ED1 /* Products */;
ProjectRef = 00C302A71ABCB8CE00DB3ED1 /* RCTActionSheet.xcodeproj */;
Expand Down Expand Up @@ -1260,6 +1293,20 @@
remoteRef = C35A58552032E3E80068C84F /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
C3A76DBF204EE9A2008D1C29 /* libBVLinearGradient.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = libBVLinearGradient.a;
remoteRef = C3A76DBE204EE9A2008D1C29 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
C3A76DC1204EE9A2008D1C29 /* libBVLinearGradient.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = libBVLinearGradient.a;
remoteRef = C3A76DC0204EE9A2008D1C29 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
C3EBC740204547DB0040ED81 /* libRNVectorIcons.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
Expand Down Expand Up @@ -1446,6 +1493,7 @@
"$(SRCROOT)/../node_modules/react-native-config/ios/ReactNativeConfig",
"$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager",
"$(SRCROOT)/../node_modules/react-native-device-info/RNDeviceInfo",
"$(SRCROOT)..\node_modules\neact-native-linear-gradientBVLinearGradient",
);
INFOPLIST_FILE = democracyclientTests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
Expand All @@ -1456,6 +1504,7 @@
"\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
);
OTHER_LDFLAGS = (
"-ObjC",
Expand All @@ -1478,6 +1527,7 @@
"$(SRCROOT)/../node_modules/react-native-config/ios/ReactNativeConfig",
"$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager",
"$(SRCROOT)/../node_modules/react-native-device-info/RNDeviceInfo",
"$(SRCROOT)..\node_modules\neact-native-linear-gradientBVLinearGradient",
);
INFOPLIST_FILE = democracyclientTests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
Expand All @@ -1488,6 +1538,7 @@
"\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
);
OTHER_LDFLAGS = (
"-ObjC",
Expand All @@ -1514,6 +1565,7 @@
"$(SRCROOT)/../node_modules/react-native-config/ios/ReactNativeConfig",
"$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager",
"$(SRCROOT)/../node_modules/react-native-device-info/RNDeviceInfo",
"$(SRCROOT)..\node_modules\neact-native-linear-gradientBVLinearGradient",
);
INFOPLIST_FILE = democracyclient/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
Expand Down Expand Up @@ -1546,6 +1598,7 @@
"$(SRCROOT)/../node_modules/react-native-config/ios/ReactNativeConfig",
"$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager",
"$(SRCROOT)/../node_modules/react-native-device-info/RNDeviceInfo",
"$(SRCROOT)..\node_modules\neact-native-linear-gradientBVLinearGradient",
);
INFOPLIST_FILE = democracyclient/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
Expand Down Expand Up @@ -1581,6 +1634,7 @@
"$(SRCROOT)/../node_modules/react-native-config/ios/ReactNativeConfig",
"$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager",
"$(SRCROOT)/../node_modules/react-native-device-info/RNDeviceInfo",
"$(SRCROOT)..\node_modules\neact-native-linear-gradientBVLinearGradient",
);
INFOPLIST_FILE = "democracyclient-tvOS/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
Expand All @@ -1590,6 +1644,7 @@
"\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
);
OTHER_LDFLAGS = (
"-ObjC",
Expand Down Expand Up @@ -1621,6 +1676,7 @@
"$(SRCROOT)/../node_modules/react-native-config/ios/ReactNativeConfig",
"$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager",
"$(SRCROOT)/../node_modules/react-native-device-info/RNDeviceInfo",
"$(SRCROOT)..\node_modules\neact-native-linear-gradientBVLinearGradient",
);
INFOPLIST_FILE = "democracyclient-tvOS/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
Expand All @@ -1630,6 +1686,7 @@
"\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
);
OTHER_LDFLAGS = (
"-ObjC",
Expand Down Expand Up @@ -1662,6 +1719,7 @@
"\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
);
PRODUCT_BUNDLE_IDENTIFIER = "com.facebook.REACT.democracyclient-tvOSTests";
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down Expand Up @@ -1690,6 +1748,7 @@
"\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
);
PRODUCT_BUNDLE_IDENTIFIER = "com.facebook.REACT.democracyclient-tvOSTests";
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down
2 changes: 1 addition & 1 deletion ios/democracyclient/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
</dict>
</dict>
<key>NSLocationWhenInUseUsageDescription</key>
<string></string>
<string/>
<key>UIAppFonts</key>
<array>
<string>Ionicons.ttf</string>
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
"react-native": "0.53.3",
"react-native-config": "^0.11.5",
"react-native-device-info": "^0.17.1",
"react-native-linear-gradient": "^2.4.0",
"react-native-navigation": "^1.1.389",
"react-native-swiper": "^1.5.13",
"react-native-vector-icons": "^4.5.0",
Expand Down
Loading