Skip to content

Commit

Permalink
v1.2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
robertying committed Apr 9, 2019
1 parent 9bde313 commit 69f46b5
Show file tree
Hide file tree
Showing 8 changed files with 138 additions and 386 deletions.
2 changes: 1 addition & 1 deletion android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ android {
renderscriptTargetApi 23
renderscriptSupportModeEnabled true
versionCode Integer.parseInt(VERSION_CODE)
versionName "1.1.1"
versionName "1.2.0"
}
signingConfigs {
if (CI) {
Expand Down
2 changes: 1 addition & 1 deletion android/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ org.gradle.jvmargs=-Xmx2g -XX\:MaxMetaspaceSize\=512m -XX\:+HeapDumpOnOutOfMemor
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true

VERSION_CODE=12
VERSION_CODE=13
213 changes: 28 additions & 185 deletions ios/learnX.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

20 changes: 3 additions & 17 deletions ios/learnX.xcodeproj/xcshareddata/xcschemes/learnX.xcscheme
Original file line number Diff line number Diff line change
Expand Up @@ -34,20 +34,6 @@
ReferencedContainer = "container:learnX.xcodeproj">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "NO"
buildForArchiving = "NO"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "00E356ED1AD99517003FC87E"
BuildableName = "learnXTests.xctest"
BlueprintName = "learnXTests"
ReferencedContainer = "container:learnX.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
Expand All @@ -60,9 +46,9 @@
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "00E356ED1AD99517003FC87E"
BuildableName = "learnXTests.xctest"
BlueprintName = "learnXTests"
BlueprintIdentifier = "D49F64A3225CA6A900FA9B23"
BuildableName = "learnXUITests.xctest"
BlueprintName = "learnXUITests"
ReferencedContainer = "container:learnX.xcodeproj">
</BuildableReference>
</TestableReference>
Expand Down
8 changes: 7 additions & 1 deletion ios/learnX/AppDelegate.m
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@
#import <UMReactNativeAdapter/UMNativeModulesProxy.h>
#import <UMReactNativeAdapter/UMModuleRegistryAdapter.h>

#import <Fabric/Fabric.h>
#import <Answers/Answers.h>

@implementation AppDelegate

- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
Expand All @@ -22,12 +25,15 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
RCTBridge *bridge = [[RCTBridge alloc] initWithDelegate:self launchOptions:launchOptions];
RCTRootView *rootView = [[RCTRootView alloc] initWithBridge:bridge moduleName:@"learnX" initialProperties:nil];
rootView.backgroundColor = [[UIColor alloc] initWithRed:1.0f green:1.0f blue:1.0f alpha:1];

self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
UIViewController *rootViewController = [UIViewController new];
rootViewController.view = rootView;
self.window.rootViewController = rootViewController;
[self.window makeKeyAndVisible];

[Fabric with:@[[Answers class]]];

return YES;
}

Expand Down
187 changes: 98 additions & 89 deletions ios/learnX/Info.plist
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<dict>
<key>Fabric</key>
<dict>
<key>APIKey</key>
Expand All @@ -16,92 +16,101 @@
</dict>
</array>
</dict>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleDisplayName</key>
<string>learnX</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>$(PRODUCT_NAME)</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.1.1</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>12</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>NSAppTransportSecurity</key>
<dict>
<key>NSAllowsArbitraryLoads</key>
<true/>
<key>NSExceptionDomains</key>
<dict>
<key>localhost</key>
<dict>
<key>NSExceptionAllowsInsecureHTTPLoads</key>
<true/>
</dict>
</dict>
</dict>
<key>NSCalendarsUsageDescription</key>
<string>Allow learnX to access your calendar</string>
<key>NSCameraUsageDescription</key>
<string>Allow learnX to use the camera</string>
<key>NSContactsUsageDescription</key>
<string>Allow learnX experiences to access your contacts</string>
<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
<string>Allow learnX to use your location</string>
<key>NSLocationAlwaysUsageDescription</key>
<string>Allow learnX to use your location</string>
<key>NSLocationWhenInUseUsageDescription</key>
<string>Allow learnX to use your location</string>
<key>NSMicrophoneUsageDescription</key>
<string>Allow learnX to access your microphone</string>
<key>NSMotionUsageDescription</key>
<string>Allow learnX to access your device's accelerometer</string>
<key>NSPhotoLibraryAddUsageDescription</key>
<string>Give learnX periences permission to save photos</string>
<key>NSPhotoLibraryUsageDescription</key>
<string>Give learnX periences permission to access your photos</string>
<key>NSRemindersUsageDescription</key>
<string>Allow learnX to access your reminders</string>
<key>UIAppFonts</key>
<array>
<string>AntDesign.ttf</string>
<string>FontAwesome.ttf</string>
<string>Ionicons.ttf</string>
<string>MaterialCommunityIcons.ttf</string>
<string>MaterialIcons.ttf</string>
<string>Entypo.ttf</string>
<string>EvilIcons.ttf</string>
<string>Feather.ttf</string>
<string>FontAwesome5_Brands.ttf</string>
<string>FontAwesome5_Regular.ttf</string>
<string>FontAwesome5_Solid.ttf</string>
<string>Foundation.ttf</string>
<string>Octicons.ttf</string>
<string>SimpleLineIcons.ttf</string>
<string>Zocial.ttf</string>
</array>
<key>UILaunchStoryboardName</key>
<string>LaunchScreen</string>
<key>UIRequiredDeviceCapabilities</key>
<array>
<string>armv7</string>
</array>
<key>UISupportedInterfaceOrientations</key>
<array>
<string>UIInterfaceOrientationPortrait</string>
</array>
<key>UIViewControllerBasedStatusBarAppearance</key>
<false/>
</dict>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleDisplayName</key>
<string>learnX</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>$(PRODUCT_NAME)</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.2.0</string>
<key>CFBundleSignature</key>
<string></string>
<key>CFBundleVersion</key>
<string>13</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>NSAppTransportSecurity</key>
<dict>
<key>NSAllowsArbitraryLoads</key>
<true/>
<key>NSExceptionDomains</key>
<dict>
<key>localhost</key>
<dict>
<key>NSExceptionAllowsInsecureHTTPLoads</key>
<true/>
</dict>
</dict>
</dict>
<key>NSCalendarsUsageDescription</key>
<string>Allow learnX to access your calendar</string>
<key>NSCameraUsageDescription</key>
<string>Allow learnX to use the camera</string>
<key>NSContactsUsageDescription</key>
<string>Allow learnX experiences to access your contacts</string>
<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
<string>Allow learnX to use your location</string>
<key>NSLocationAlwaysUsageDescription</key>
<string>Allow learnX to use your location</string>
<key>NSLocationWhenInUseUsageDescription</key>
<string>Allow learnX to use your location</string>
<key>NSMicrophoneUsageDescription</key>
<string>Allow learnX to access your microphone</string>
<key>NSMotionUsageDescription</key>
<string>Allow learnX to access your device's accelerometer</string>
<key>NSPhotoLibraryAddUsageDescription</key>
<string>Give learnX periences permission to save photos</string>
<key>NSPhotoLibraryUsageDescription</key>
<string>Give learnX periences permission to access your photos</string>
<key>NSRemindersUsageDescription</key>
<string>Allow learnX to access your reminders</string>
<key>UIAppFonts</key>
<array>
<string>AntDesign.ttf</string>
<string>FontAwesome.ttf</string>
<string>Ionicons.ttf</string>
<string>MaterialCommunityIcons.ttf</string>
<string>MaterialIcons.ttf</string>
<string>Entypo.ttf</string>
<string>EvilIcons.ttf</string>
<string>Feather.ttf</string>
<string>FontAwesome5_Brands.ttf</string>
<string>FontAwesome5_Regular.ttf</string>
<string>FontAwesome5_Solid.ttf</string>
<string>Foundation.ttf</string>
<string>Octicons.ttf</string>
<string>SimpleLineIcons.ttf</string>
<string>Zocial.ttf</string>
</array>
<key>UILaunchStoryboardName</key>
<string>LaunchScreen</string>
<key>UIRequiredDeviceCapabilities</key>
<array>
<string>armv7</string>
</array>
<key>UIStatusBarHidden~ipad</key>
<true/>
<key>UISupportedInterfaceOrientations</key>
<array>
<string>UIInterfaceOrientationPortrait</string>
</array>
<key>UISupportedInterfaceOrientations~ipad</key>
<array>
<string>UIInterfaceOrientationPortrait</string>
<string>UIInterfaceOrientationLandscapeLeft</string>
<string>UIInterfaceOrientationLandscapeRight</string>
<string>UIInterfaceOrientationPortraitUpsideDown</string>
</array>
<key>UIViewControllerBasedStatusBarAppearance</key>
<false/>
</dict>
</plist>
24 changes: 0 additions & 24 deletions ios/learnXTests/Info.plist

This file was deleted.

68 changes: 0 additions & 68 deletions ios/learnXTests/learnXTests.m

This file was deleted.

0 comments on commit 69f46b5

Please sign in to comment.