status-im
/
status-react
mirror of https://github.com/status-im/status-react.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

debug and release mode on real iOS device

This commit is contained in:
Roman Volosovskyi 2016-11-09 12:40:17 +02:00
parent 4d75476be4
commit 692de70933
11 changed files with 59 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
ios/StatusIm.xcodeproj/project.pbxproj
View File

@ -46,6 +46,7 @@
8E55E6877F950B81C8D711C5 /* libPods-StatusIm.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 101A4045637A2ADF57D28EF5 /* libPods-StatusIm.a */; };
9E0B01A11DDC5DA7002B0359 /* SF-UI-Text-Light.otf in Resources */ = {isa = PBXBuildFile; fileRef = 9E0B01A01DDC5DA7002B0359 /* SF-UI-Text-Light.otf */; };
9E3AB6D01D87DB2B008846B4 /* libReact-Native-Webview-Bridge.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9E3AB6C61D87DA2B008846B4 /* libReact-Native-Webview-Bridge.a */; };
9E982B241DE3036A00EC0D84 /* libSplashScreen.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9E982B211DE3035800EC0D84 /* libSplashScreen.a */; };
9ED2F45E1D9D535A00B36508 /* SF-UI-Text-Regular.otf in Resources */ = {isa = PBXBuildFile; fileRef = 9ED2F45D1D9D52DD00B36508 /* SF-UI-Text-Regular.otf */; };
9ED2F45F1D9D535A00B36508 /* SF-UI-Text-Medium.otf in Resources */ = {isa = PBXBuildFile; fileRef = 9ED2F45C1D9D52C100B36508 /* SF-UI-Text-Medium.otf */; };
9ED2F4611D9D579900B36508 /* SF-UI-Text-Bold.otf in Resources */ = {isa = PBXBuildFile; fileRef = 9ED2F4601D9D577B00B36508 /* SF-UI-Text-Bold.otf */; };
@ -844,6 +845,14 @@
name = Products;
sourceTree = "<group>";
};
9E982AEA1DE3033C00EC0D84 /* Products */ = {
isa = PBXGroup;
children = (
9E982B211DE3035800EC0D84 /* libSplashScreen.a */,
);
name = Products;
sourceTree = "<group>";
};
A97BA941B2FB44B4B66EE6D3 /* Frameworks */ = {
isa = PBXGroup;
children = (
@ -950,9 +959,11 @@
TargetAttributes = {
00E356ED1AD99517003FC87E = {
CreatedOnToolsVersion = 6.2;
DevelopmentTeam = DTX7Z4U3YA;
TestTargetID = 13B07F861A680F5B00A75B9A;
};
13B07F861A680F5B00A75B9A = {
DevelopmentTeam = DTX7Z4U3YA;
ProvisioningStyle = Automatic;
};
};
@ -1410,7 +1421,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "export NODE_BINARY=node\n../node_modules/react-native/packager/react-native-xcode.sh";
shellScript = "export NODE_BINARY=\"node --max-old-space-size=4096\" \n../node_modules/react-native/packager/react-native-xcode.sh";
};
1986C962445001A2631E6AB0 /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
@ -1538,6 +1549,7 @@
baseConfigurationReference = 064351D2FD901F8B6C9AE2A5 /* Pods-StatusImTests.debug.xcconfig */;
buildSettings = {
BUNDLE_LOADER = "$(TEST_HOST)";
DEVELOPMENT_TEAM = DTX7Z4U3YA;
FRAMEWORK_SEARCH_PATHS = (
"$(SDKROOT)/Developer/Library/Frameworks",
"$(inherited)",
@ -1578,6 +1590,7 @@
buildSettings = {
BUNDLE_LOADER = "$(TEST_HOST)";
COPY_PHASE_STRIP = NO;
DEVELOPMENT_TEAM = DTX7Z4U3YA;
FRAMEWORK_SEARCH_PATHS = (
"$(SDKROOT)/Developer/Library/Frameworks",
"$(inherited)",
@ -1612,15 +1625,12 @@
isa = XCBuildConfiguration;
baseConfigurationReference = ACA66A8F16CD2FE21F38738B /* Pods-StatusIm.debug.xcconfig */;
buildSettings = {
ARCHS = (
"$(ARCHS_STANDARD)",
x86_64,
);
ARCHS = "$(ARCHS_STANDARD)";
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
DEAD_CODE_STRIPPING = NO;
DEVELOPMENT_TEAM = "";
DEVELOPMENT_TEAM = DTX7Z4U3YA;
FRAMEWORK_SEARCH_PATHS = (
"$(PROJECT_DIR)/../modules/react-native-status/ios/RCTStatus",
"$(inherited)",
@ -1656,7 +1666,7 @@
);
PRODUCT_BUNDLE_IDENTIFIER = im.status.ethereum;
PRODUCT_NAME = StatusIm;
VALID_ARCHS = "arm64 armv7 armv7s x86_64";
VALID_ARCHS = "arm64 armv7 armv7s";
};
name = Debug;
};
@ -1664,15 +1674,12 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 38A44830EC5708E89387F641 /* Pods-StatusIm.release.xcconfig */;
buildSettings = {
ARCHS = (
"$(ARCHS_STANDARD)",
x86_64,
);
ARCHS = "$(ARCHS_STANDARD)";
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
DEAD_CODE_STRIPPING = NO;
DEVELOPMENT_TEAM = "";
DEVELOPMENT_TEAM = DTX7Z4U3YA;
FRAMEWORK_SEARCH_PATHS = (
"$(PROJECT_DIR)/../modules/react-native-status/ios/RCTStatus",
"$(inherited)",
@ -1708,7 +1715,7 @@
);
PRODUCT_BUNDLE_IDENTIFIER = im.status.ethereum;
PRODUCT_NAME = StatusIm;
VALID_ARCHS = "arm64 armv7 armv7s x86_64";
VALID_ARCHS = "armv7 armv7s arm64";
};
name = Release;
};
@ -1731,6 +1738,8 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = NO;
DEVELOPMENT_TEAM = DTX7Z4U3YA;
ENABLE_BITCODE = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_DYNAMIC_NO_PIC = NO;
@ -1793,6 +1802,8 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = YES;
DEVELOPMENT_TEAM = DTX7Z4U3YA;
ENABLE_BITCODE = NO;
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
@ -1827,6 +1838,7 @@
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
VALIDATE_PRODUCT = YES;
VALID_ARCHS = "armv7 armv7s arm64";
};
name = Release;
};

3
modules/react-native-status/ios/RCTStatus/RCTStatus.m
View File

@ -189,6 +189,9 @@ RCT_EXPORT_METHOD(setSoftInputMode: (NSInteger) i) {
+ (void)signalEvent:(char *) signal
{
if(!signal){
return;
}
NSString *sig = [NSString stringWithUTF8String:signal];
#if DEBUG
NSLog(@"SignalEvent");

17
modules/react-native-status/ios/RCTStatus/RCTStatus.xcodeproj/project.pbxproj
View File

@ -213,16 +213,15 @@
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
VALIDATE_PRODUCT = YES;
VALID_ARCHS = "armv7 armv7s arm64";
"VALID_ARCHS[sdk=*]" = "armv7 armv7s arm64";
};
name = Release;
};
206C9F441D474E910063E3E6 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = (
"$(ARCHS_STANDARD)",
x86_64,
);
ARCHS = "$(ARCHS_STANDARD)";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
@ -242,17 +241,14 @@
);
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
VALID_ARCHS = "armv7 armv7s arm64 x86_64";
VALID_ARCHS = "armv7 armv7s arm64";
};
name = Debug;
};
206C9F451D474E910063E3E6 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = (
"$(ARCHS_STANDARD)",
x86_64,
);
ARCHS = "$(ARCHS_STANDARD)";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
@ -272,7 +268,8 @@
);
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
VALID_ARCHS = "armv7 armv7s arm64 x86_64";
VALID_ARCHS = "armv7 armv7s arm64";
"VALID_ARCHS[sdk=*]" = "armv7 armv7s arm64";
};
name = Release;
};

1
package.json
View File

@ -33,6 +33,7 @@
"querystring-es3": "^0.2.1",
"re-natal": "0.2.38",
"react": "^15.3.1",
"react-dom": "^15.3.1",
"react-native": "^0.38.0",
"react-native-action-button": "2.0.13",
"react-native-android-sms-listener": "github:adrian-tiberius/react-native-android-sms-listener#listener-bugfix",

12
src/status_im/accounts/handlers.cljs
View File

@ -21,7 +21,9 @@
[status-im.navigation.handlers :as nav]))
(defn save-account [{:keys [network]} [_ account]]
(defn save-account
[{:keys [network]}
[_ account]]
(accounts-store/save (assoc account :network network) true))
(register-handler
@ -60,8 +62,12 @@
#(account-created % password)))))
(defn save-account!
[{:keys [current-account-id accounts]} _]
(accounts-store/save (get accounts current-account-id) true))
[{:keys [current-account-id accounts network]} _]
(let [{acc-network :network :as account}
(get accounts current-account-id)
account' (assoc account :network (or acc-network network))]
(accounts-store/save (get accounts current-account-id) true)))
(defn send-account-update
[{:keys [current-account-id current-public-key web3 accounts]} _]

5
src/status_im/components/status.cljs
View File

@ -7,12 +7,13 @@
[taoensso.timbre :as log]
[cljs.core.async :refer [<! timeout]]
[status-im.utils.js-resources :as js-res]
[status-im.i18n :as i]))
[status-im.i18n :as i]
[status-im.utils.platform :as p]))
;; if StatusModule is not initialized better to store
;; calls and make them only when StatusModule is ready
;; this flag helps to handle this
(defonce module-initialized? (atom js/goog.DEBUG))
(defonce module-initialized? (atom (or p/ios? js/goog.DEBUG)))
;; array of calls to StatusModule
(defonce calls (atom []))

2
src/status_im/data_store/realm/schemas/base/v2/account.cljs
View File

@ -17,7 +17,7 @@
:last-updated {:type :int :default 0}
:signed-up? {:type :bool
:default false}
:network {:type :string}}})
:network :string}})
(defn migration [old-realm new-realm]
(log/debug "migrating account schema v2")

8
src/status_im/db.cljs
View File

@ -1,7 +1,8 @@
(ns status-im.db
(:require [status-im.components.react :refer [animated]]
[status-im.components.animation :as anim]
[status-im.constants :refer [console-chat-id]]))
[status-im.constants :refer [console-chat-id]]
[status-im.utils.platform :as p]))
;; initial state of app-db
(def app-db {:identity-password "replace-me-with-user-entered-password"
@ -45,8 +46,9 @@
:sync-state :done
:sync-listener nil
:status-module-initialized? js/goog.DEBUG
:edit-mode {}})
:status-module-initialized? (or p/ios? js/goog.DEBUG)
:edit-mode {}
:network :testnet})
(defn chat-staged-commands-path [chat-id]
[:chats chat-id :staged-commands])

2
src/status_im/handlers.cljs
View File

@ -51,7 +51,7 @@
(assoc :status-module-initialized? true)
true
(assoc :network network))))
(assoc :network (or network :testnet)))))
(register-handler :initialize-account-db
(fn [db _]

4
src/status_im/ios/core.cljs
View File

@ -65,8 +65,8 @@
(dispatch [:set :keyboard-height h])))))
(.addListener keyboard
"keyboardWillHide"
(when-not (= 0 @keyboard-height)
#(dispatch [:set :keyboard-height 0])))
#(when-not (= 0 @keyboard-height)
(dispatch [:set :keyboard-height 0])))
(.hide splash-screen))
:render
(fn []

3
src/status_im/qr_scanner/screen.cljs
View File

@ -35,7 +35,8 @@
(let [data (-> (.-data code)
(str/replace #"ethereum:" ""))]
(dispatch [:set-qr-code identifier data])))
:barCodeTypes [:qr]
;:barCodeTypes [:qr]
:captureAudio false
:style st/barcode-scanner}]
[view st/rectangle-container
[view st/rectangle