From 69e3057e10a58e6f7582d72a88c96ec2b9656735 Mon Sep 17 00:00:00 2001 From: John Lyon-Smith Date: Tue, 6 Mar 2018 13:56:04 -0800 Subject: [PATCH] Fixing yes/no dialog. Fix AppDelegate for navigation --- mobile/index.js | 3 +- .../ios/DeightonAR.xcodeproj/project.pbxproj | 158 +++++++++++++++++- .../contents.xcworkspacedata | 7 + .../UserInterfaceState.xcuserstate | Bin 0 -> 20919 bytes .../xcschemes/xcschememanagement.plist | 19 +++ mobile/ios/DeightonAR/AppDelegate.m | 9 + website/src/App.js | 2 +- website/src/Home/Home.js | 11 +- website/src/Modal/YesNoMessageModal.js | 2 +- website/src/Users/Users.js | 4 + 10 files changed, 208 insertions(+), 7 deletions(-) create mode 100644 mobile/ios/DeightonAR.xcodeproj/project.xcworkspace/contents.xcworkspacedata create mode 100644 mobile/ios/DeightonAR.xcodeproj/project.xcworkspace/xcuserdata/john.xcuserdatad/UserInterfaceState.xcuserstate create mode 100644 mobile/ios/DeightonAR.xcodeproj/xcuserdata/john.xcuserdatad/xcschemes/xcschememanagement.plist diff --git a/mobile/index.js b/mobile/index.js index 483e6f7..54309b9 100644 --- a/mobile/index.js +++ b/mobile/index.js @@ -1,3 +1,4 @@ -import { AppRegistry } from 'react-native'; +import App from './src/App' import App from './App'; +import { AppRegistry } from 'react-native' AppRegistry.registerComponent('DeightonAR', () => App); diff --git a/mobile/ios/DeightonAR.xcodeproj/project.pbxproj b/mobile/ios/DeightonAR.xcodeproj/project.pbxproj index 351a043..0204a12 100644 --- a/mobile/ios/DeightonAR.xcodeproj/project.pbxproj +++ b/mobile/ios/DeightonAR.xcodeproj/project.pbxproj @@ -34,6 +34,7 @@ 2D02E4C81E0B4AEC006451C7 /* libRCTWebSocket-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3DAD3E991DF850E9000B6D8A /* libRCTWebSocket-tvOS.a */; }; 2D16E6881FA4F8E400B85C8A /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2D16E6891FA4F8E400B85C8A /* libReact.a */; }; 2DCD954D1E0B4F2C00145EB5 /* DeightonARTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* DeightonARTests.m */; }; + 5222222F204EF106001F223F /* libReactNativeNavigation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5222222E204EF0C6001F223F /* libReactNativeNavigation.a */; }; 5E9157361DD0AC6A00FF2AA8 /* libRCTAnimation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5E9157331DD0AC6500FF2AA8 /* libRCTAnimation.a */; }; 832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; }; ADBDB9381DFEBF1600ED6528 /* libRCTBlob.a in Frameworks */ = {isa = PBXBuildFile; fileRef = ADBDB9271DFEBF0700ED6528 /* libRCTBlob.a */; }; @@ -222,6 +223,69 @@ remoteGlobalIDString = 3D3CD9181DE5FBD800167DC4; remoteInfo = "jschelpers-tvOS"; }; + 5222221C204EF0C6001F223F /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = EBF21BDC1FC498900052F4D5; + remoteInfo = jsinspector; + }; + 5222221E204EF0C6001F223F /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = EBF21BFA1FC4989A0052F4D5; + remoteInfo = "jsinspector-tvOS"; + }; + 52222220204EF0C6001F223F /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 139D7ECE1E25DB7D00323FB7; + remoteInfo = "third-party"; + }; + 52222222204EF0C6001F223F /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 3D383D3C1EBD27B6005632C8; + remoteInfo = "third-party-tvOS"; + }; + 52222224204EF0C6001F223F /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 139D7E881E25C6D100323FB7; + remoteInfo = "double-conversion"; + }; + 52222226204EF0C6001F223F /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 3D383D621EBD27B9005632C8; + remoteInfo = "double-conversion-tvOS"; + }; + 52222228204EF0C6001F223F /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 9936F3131F5F2E4B0010BF04; + remoteInfo = privatedata; + }; + 5222222A204EF0C6001F223F /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 9936F32F1F5F2E5B0010BF04; + remoteInfo = "privatedata-tvOS"; + }; + 5222222D204EF0C6001F223F /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 522221F4204EF0C6001F223F /* ReactNativeNavigation.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = D8AFADBD1BEE6F3F00A4592D; + remoteInfo = ReactNativeNavigation; + }; 5E9157321DD0AC6500FF2AA8 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 5E91572D1DD0AC6500FF2AA8 /* RCTAnimation.xcodeproj */; @@ -282,6 +346,7 @@ 2D02E47B1E0B4A5D006451C7 /* DeightonAR-tvOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "DeightonAR-tvOS.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 2D02E4901E0B4A5D006451C7 /* DeightonAR-tvOSTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "DeightonAR-tvOSTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; 2D16E6891FA4F8E400B85C8A /* libReact.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libReact.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 522221F4204EF0C6001F223F /* ReactNativeNavigation.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = ReactNativeNavigation.xcodeproj; path = "../node_modules/react-native-navigation/ios/ReactNativeNavigation.xcodeproj"; sourceTree = ""; }; 5E91572D1DD0AC6500FF2AA8 /* RCTAnimation.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTAnimation.xcodeproj; path = "../node_modules/react-native/Libraries/NativeAnimation/RCTAnimation.xcodeproj"; sourceTree = ""; }; 78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTLinking.xcodeproj; path = "../node_modules/react-native/Libraries/LinkingIOS/RCTLinking.xcodeproj"; sourceTree = ""; }; 832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = "../node_modules/react-native/Libraries/Text/RCTText.xcodeproj"; sourceTree = ""; }; @@ -301,6 +366,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 5222222F204EF106001F223F /* libReactNativeNavigation.a in Frameworks */, ADBDB9381DFEBF1600ED6528 /* libRCTBlob.a in Frameworks */, 5E9157361DD0AC6A00FF2AA8 /* libRCTAnimation.a in Frameworks */, 146834051AC3E58100842450 /* libReact.a in Frameworks */, @@ -439,13 +505,21 @@ isa = PBXGroup; children = ( 146834041AC3E56700842450 /* libReact.a */, + 3DAD3EA31DF850E9000B6D8A /* libReact.a */, 3DAD3EA51DF850E9000B6D8A /* libyoga.a */, 3DAD3EA71DF850E9000B6D8A /* libyoga.a */, 3DAD3EA91DF850E9000B6D8A /* libcxxreact.a */, 3DAD3EAB1DF850E9000B6D8A /* libcxxreact.a */, 3DAD3EAD1DF850E9000B6D8A /* libjschelpers.a */, 3DAD3EAF1DF850E9000B6D8A /* libjschelpers.a */, - 3DAD3EA31DF850E9000B6D8A /* libReact-tvOS.a */, + 5222221D204EF0C6001F223F /* libjsinspector.a */, + 5222221F204EF0C6001F223F /* libjsinspector-tvOS.a */, + 52222221204EF0C6001F223F /* libthird-party.a */, + 52222223204EF0C6001F223F /* libthird-party.a */, + 52222225204EF0C6001F223F /* libdouble-conversion.a */, + 52222227204EF0C6001F223F /* libdouble-conversion.a */, + 52222229204EF0C6001F223F /* libprivatedata.a */, + 5222222B204EF0C6001F223F /* libprivatedata-tvOS.a */, ); name = Products; sourceTree = ""; @@ -458,6 +532,14 @@ name = Frameworks; sourceTree = ""; }; + 522221F5204EF0C6001F223F /* Products */ = { + isa = PBXGroup; + children = ( + 5222222E204EF0C6001F223F /* libReactNativeNavigation.a */, + ); + name = Products; + sourceTree = ""; + }; 5E91572E1DD0AC6500FF2AA8 /* Products */ = { isa = PBXGroup; children = ( @@ -479,6 +561,7 @@ 832341AE1AAA6A7D00B99B32 /* Libraries */ = { isa = PBXGroup; children = ( + 522221F4204EF0C6001F223F /* ReactNativeNavigation.xcodeproj */, 5E91572D1DD0AC6500FF2AA8 /* RCTAnimation.xcodeproj */, 146833FF1AC3E56700842450 /* React.xcodeproj */, 00C302A71ABCB8CE00DB3ED1 /* RCTActionSheet.xcodeproj */, @@ -697,6 +780,10 @@ ProductGroup = 146834001AC3E56700842450 /* Products */; ProjectRef = 146833FF1AC3E56700842450 /* React.xcodeproj */; }, + { + ProductGroup = 522221F5204EF0C6001F223F /* Products */; + ProjectRef = 522221F4204EF0C6001F223F /* ReactNativeNavigation.xcodeproj */; + }, ); projectRoot = ""; targets = ( @@ -828,10 +915,10 @@ remoteRef = 3DAD3E981DF850E9000B6D8A /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 3DAD3EA31DF850E9000B6D8A /* libReact-tvOS.a */ = { + 3DAD3EA31DF850E9000B6D8A /* libReact.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; - path = "libReact-tvOS.a"; + path = libReact.a; remoteRef = 3DAD3EA21DF850E9000B6D8A /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -877,6 +964,69 @@ remoteRef = 3DAD3EAE1DF850E9000B6D8A /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; + 5222221D204EF0C6001F223F /* libjsinspector.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libjsinspector.a; + remoteRef = 5222221C204EF0C6001F223F /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 5222221F204EF0C6001F223F /* libjsinspector-tvOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libjsinspector-tvOS.a"; + remoteRef = 5222221E204EF0C6001F223F /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 52222221204EF0C6001F223F /* libthird-party.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libthird-party.a"; + remoteRef = 52222220204EF0C6001F223F /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 52222223204EF0C6001F223F /* libthird-party.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libthird-party.a"; + remoteRef = 52222222204EF0C6001F223F /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 52222225204EF0C6001F223F /* libdouble-conversion.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libdouble-conversion.a"; + remoteRef = 52222224204EF0C6001F223F /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 52222227204EF0C6001F223F /* libdouble-conversion.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libdouble-conversion.a"; + remoteRef = 52222226204EF0C6001F223F /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 52222229204EF0C6001F223F /* libprivatedata.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libprivatedata.a; + remoteRef = 52222228204EF0C6001F223F /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 5222222B204EF0C6001F223F /* libprivatedata-tvOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libprivatedata-tvOS.a"; + remoteRef = 5222222A204EF0C6001F223F /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 5222222E204EF0C6001F223F /* libReactNativeNavigation.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libReactNativeNavigation.a; + remoteRef = 5222222D204EF0C6001F223F /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; 5E9157331DD0AC6500FF2AA8 /* libRCTAnimation.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; @@ -1242,6 +1392,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; + HEADER_SEARCH_PATHS = "$(SRCROOT)/../node_modules/react-native-navigation/ios"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; @@ -1277,6 +1428,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; + HEADER_SEARCH_PATHS = "$(SRCROOT)/../node_modules/react-native-navigation/ios"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; diff --git a/mobile/ios/DeightonAR.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/mobile/ios/DeightonAR.xcodeproj/project.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..919434a --- /dev/null +++ b/mobile/ios/DeightonAR.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/mobile/ios/DeightonAR.xcodeproj/project.xcworkspace/xcuserdata/john.xcuserdatad/UserInterfaceState.xcuserstate b/mobile/ios/DeightonAR.xcodeproj/project.xcworkspace/xcuserdata/john.xcuserdatad/UserInterfaceState.xcuserstate new file mode 100644 index 0000000000000000000000000000000000000000..8cef5262e6d14775c742fcadd5cde63360ce58bf GIT binary patch literal 20919 zcmd_ScVLs%_dkB`^E^%4q-~N8D5DVCvPx4rk~B$Yno-IqrHf5T+q4ZGDM<>HlBJ{lE0#pZO`9d)Ck9i@|OWp3B#XsffV$`09u(QZe5 zFv9azZI$B+P$Eh~Dx^jll#H|}6B$qz8iaDua8!gUQ5CYI zNvImtpjuRi9B3|j7(IgKp-0hUXg*qi7NSLHDO!$Jpy$yl)P!C}8_+9g3wjg1g?6F+ z=mYd2I)FYxAESflI68s8M5oYc^c^~n{)aB1tLRsB8{I*Fp})~xj4+2oaTxA|JL7QN z1$V_gaTM;0V{jZ!z==2stFa!ZV-p^PbMRO^4v)tZa0#A>t+*7I;c8riYjHiEjGfqp z8}W2J124jh@l$vSUW%W_&){WvIbMOE#n0iD_<8&SUX3^5&G;3(1#iVW@h}7@BJ&gTGxH~No4LdM#r(~3tRL&oO4%^B8{3PGWMkL?Y%H6|YS}E-$PQz3*-`9h zb_`p}ma*mRbantW}xbJ_Xq0(LR`6uXjro_&FRk!@z*WZz=9vD?`l z>`rzU`!>6q{ha-RJ;WYnkFZDCW9)JE8}>#f2{(}|=O%Fuu92J0&EOv4=5dd5 zi@0aGm$;X?4csf-YuxMHHtuciUGDv&=(>iQnxn`ciID^aASntSnOhK7ZEJLmf!{4V zp*Xs%#_Do4qd*iy7{WFq8Ilu@yhYMVWT81G^GJuY+Es5YvzZ)a4Yjs9cZn=o7jM$) z5;Q8MDJe;VmqWZm2toKs``T zq#!;-M0|-K@h4&;ApsK#sCnbga@k@mWB$5aJ0X=0aZ>=7lZ!3d3!koOF(JA?R8LdO9D7G2tQ3{ch;AWJD(n$y@rHo1* zRpuzS#qmFr@|+H;0}C4JDQR&Xd+b=JM5Yv4f*cI7-&Z%!R%vxLxC$H%&N7=3M(~ni zL}nD*giIu~30X*I5_1&gfD8^sL(ot(j7niCFlj9OcG_xy=~HY3kxnG6L^i6zUSrb_ z95}GZ1#BHS$x&4|u!UgPz#;a!N|)PFSKz2{PqjL21Iump$|}fETAc%H9i`B8pxxmb zXllte1WiO%REo+_IkJ(SL_t&}ix`Q8SSkAj zCVCk!Fg(v`n__n~xLPJBWE$yKERhZ9uuwu#iIA7oV6Q39s{-!1TJmN69#A{Z#jnXw zkjpq1m__##yKQQTEcO9ay@V86ot3s0`D&r#L3FpLqrm2dO;g!Q$%DH03bI#ZhdRpm zT?W(a^8jjEx^GWRiL6Vzxpy4XyGZq@5yh@YlaUj-kQ+6iDQGI1MtYG*5=Ej(Z_Z;>1YO;iDseM=pjUqhx8`{NGws3IFdjTNfKSG@PwqS_+*PVIl-XO##_``@$rUa zb(YQmMe*?_Q$m)-l8|Lm>(mM6_;^hg{5O`!6zxcCzdROujoaoNVry*c*m!@(Een3% z;+pKPvKj}dlU$Hi7xa=C7vI*A`TmZ)#B1&^>Qns>Bo>r89W^z1RExq0UXDJFoPJ3x+kgt)(?KlO5Epqt5DVT#Xi^C8%&*Zb4g~w~wdMGeRGE-kfLA zbKYL5QF;Nr)P!Cn0}0Hk>ri`LwIU0Yu(MGy((bNO47Ha!txmhmC6LgJR>LSQ1b`T< zM$KpqDulfYAG`ysMeBqCycrwOCLyDEMtrOyewH_XD|(Hps8@-)3B67+J4^a>(k{wr4v~(bh*)W;H?d zpTLkM=#ys3doM+wqC@vlbQmZ)N-}_=Op=xtmAPm|yAHlWCnvOWlo}#f&9Bhcs1P(X z|FJ~Y`5%PFJLWg&Tgt{W#MFe&5;J9EWV zNj51thAyKY&=uhPkLV{f4E-|N#alxVxY2GqYy`Kpwtj4Ri#q~}o8*u|B#caqGVJX; z?NUHks+YRo&`lJ(8eK!z(G4<~3?V~Tqg&{A^amM6a>;NKGqOef7JHTHKNH`oxW=@Z zmw!`D{H!pBSz(6ck&+ggun!JEv1_pi`(i)rkHuI*Mv#0`Knh6_DPD^MaS)dBU%_M~ z8B50VUlS;2ql~aot@WS}6uhcX0QL1Yr@K*M1Rtl;LH7!f5eB5T))z@%=l!EkpRK}L}=#Bc;j zumbnOk)y#saJijeVaVtbS$`}@iz3hJu5!(sSunbw&^)YUklA1|=a&?i4f)1FC3%Lz zK?VHoz|puj_))FmUBGv=8nXNFMqc>r9jiYbq5C}}6cw0Tx*ul96DS>kb~fQyGOmrv z_y^JU0HS8jY4 zHeXcO(Q&P+14PLR?rxc*23GpMYSc}%IBLp4*g*X6D|YcVl0QnsIVvh#HgM^C{cEin zdmY_K_t){NvN&5^d7Mxy^8cvC)7<-CDhX4goyj;aH_LG)3U05{G<;?^_vhLpg+;|EKZo&;@N)w(+rhHH;zv;MdOQoy#t&hFJ$MeDiytP9WICBaW|CQCHhGAU^>`kN#E;?m zcmZCBA4ieI1J-H|nM)ofkC1tgP8$s?2fk^6X~-D6%Uolx6l`cGA=?CwbeS#3HPQ}; z2^;mFL)#a4^>&FYSjaZen;$ovfEt{zLM@p>Cl+h1y#`#hu=X8LWmZE^Hzl%rMl?F= z%A9Znge_;UuX5DcT=v=qIL|no2?=qDekHQ>@+t0eo;>9}74%7FlP1AvOjKHu)k#WK zk||zkP$eWPlM|ARiOI=El|dI@JWZ=9(Wr{;d9?E}!mot*ShbhKFXC0Lo41KP*0!tH z;B|EIU&d?6e6pY!ug4q6Lh?8){#1LpyQ;W~KOseB&KH(BD)Y%fe9GJLtN2YYocJ~T zI(~yZNfwdCtMOZS8{STyB3sB-y4B)g`8%F+TTaAarVAQsYr%~ZB%{DqNl&-1F5&kz z8D3A_NGR%bUs0jmU1Jlp?mKAb%Xkld7w^UI;eBKYd6v9Dn#kH#XAFOUKc@74h!5b8 z$Wrn&d1f{K1Runol4WE$SwZRTbKeLZ$jfuu!G5}7@dx~S#Vl)Cb%Cwk>ZI!oX6fH+ z3uExMGb+)xmD0JSDr+e?>bwqy^=8D3C4 zW_)FxbISBtEw@?zVo5+?5FFB57%QCM;ap&FgMlw?fU6$3#ZnM4mcw~GqDN1KxL0IUbZ;o3H$X6M zg{8(?>7vIS8yE$9JqQ65Qau=z*+<}z{4p6^YWb2b6XFUixdnx`X>Mf}=-eaXe*HlZ zy9%SUwQomyIPs_C#>T5wE8_+V*J7&^5|ilF7-+)Iu!n%SLP}*(PLa!6X=`oFAJ1q3 zCA3|x!rQ=Nvr?7k_0-x`kqSLh8u>nt1dH{lO(}5c)`?P+Zs^jSk;z{wWf|d0DU@E+ zbb~hD4(U~u!`XIDfn!5!X<=i%t*r#yAJLJ)Lxv7}&@D`dGi3A7+}5iYXpuMK-jhmR zey;bJ0_BB8|8P7l9GVNoBS*oJ>t4P$kIsESF4P`7u0;}>$L1cNP%_afE-fp!Rlsl~ zspSAVsj35&3|fu<0K!s0uSmh1Kv@IaQPuJi#Ajy3BV)WGLB_&;QO{#l_DSOEn(W%b z+=3hvoLzH_M(CHfF*1L+PwH{RA+DbcSuLANUWJgn%35Dv!+>MvqbW zo`zUOXSmjlLsDy*tKN{8Hh?}m&)p$ZiM`!AwO!WyPl@0AqlN6%r`=M9728pEo~ti^~|=_*_`$=MK+u@ z71>s>5{ksQM0$>)4koSg|Mp*PO#`Ky{_6?f0j}zTA@Dm6=zqA}YNBZ^q+c(ynhRRe zKTNR~=R!IYAttikos|#i!H_O(s4g-mglL<}!|fbU#QpSJ`stIswnvPweiTLP*1S?9Wa|KCK^v5SLnRGns{a zuANN+*oPotR`DoCj%8K-_g(O*X9${rGgPcjwVQ;j@pa zt|pg`n+fS1kEYK{OxcE80_E z!^;`)M0Cg5kWc3hbM&>?>WXNeR4$0sY0ic;@XB{LD#li1gUDDZ{49eQ**TpNO)dRvmmhp@s|MYP5zEU1%-$wxDh5p~QhIpk@uUqx}dy!7Xe{ zJKBc>zG*Ak?`wB>J!hUa6`E? zE}kFF2{js#lFv`&^SqQvSGrnma&u zbxZ3uZt^28?%L3=zJA%0BXTCJh1voYiaE{_d)XI@uKvra3G3T_g_RxFZFqaR;3cK} zKDhus`yBB(2tvytG45!PgpziwynOcl&*vA z(cGK4XijYWtMNa^uZiCre=Yt@TaEZH<9~`j9^V8dSJL*hd{DoXT5Si$v2ox?5zbz3jJ_0Lm{fw`hIuN=@RqcK=GWml(QY z|Ba&d{dCj_!s_t5E+{G}A;>oXigKzbcReC$F8XE%R-^zo-l;Kr-6&8P#a^_PYuP!p;;% z5_E!hOfO$~32E0u4WJY1pv6?6gGNQ@Zm$DfqUcaZ*!Pq+2Oi6>;RAL8*8?KbIiQ(_ zBL!!GsB~sanrf?5_@cT>(B4XjR%b%Y+60kn&|~dq0KE(Rq8jbN)VJRmHj!S`S7a9T z<@@GmCo+i!i7ZGVN}&0ofug~X*3nvS@Ug+(Afuzc(Me;13bmYP(1n&#sPM?-FIHw4C9R1}3_x(~pe{=z>8U@x`3A0K@DPS|r-~$Xtg=jQH z1Iu7FYk^}^A(Z3+q{l)Cfjk3&jh7%Cu>p`BuS2k4H+m0n9S7k?{y5+{&Vv2A0$7fl z=r+c1@f(Ok0KL%@_r?PNwV?&Xh8Zrs^6_XuYELT54mbd4g|qCB>>r$n3*i);5>{~# zAP>s8$=q!2aqc;8J>U!Wb4R&z+*R&xpFp4PJ_CI8J~=+4d@6mW`polL=Cju4EuRlS zLtpT@DH4e~!TKb_x{Vf163q}jE_y+nJOE#eQvr^VMK5=o>)CmA8JONeBJl5>(j z0)hi#0*nFU0vZCI3|JSiH{fKzwZOo@K7pBmV*=fQPX=xXd_V9^;O{{pL2*GjLFGXY z1+5I)7IY-&XQ{umx6~k=Ae}BpZ{nmd-~y z-wN**o*8ZnUl6`E{CN1ET@+o+U8=i0)n$8^Z@O|_W4ey$I<@PIT|emhW4F+5Dc#Dt zE$H@ox39Z1-DA4vcc0OHb@xxZ--zfDksVPV@odEV5kL0m)FZRUq#jTA*wf>3&yb$! zJ?%Z8?)h%d9~5Bi8P4Zl@B069y;DN!XR}TVhON zS>npXV@ZKYmZXQ0b|n3(8lbYNUQ~Uh4p9$NKdRoR{!5dracZ_`E+YCK^X_0Bxw5GJP>5BA; z>8sMuX7tLiW;ADfml>5=p1C&jqM^TGl3}yq=dAcFXVzO;w~Tt@EaP4iYsxk)Fnw+g zHW!(nGoP_US}HA@ELXGD*)y{D4)Pf^WYANCzRZcpDa+ZAb9Hd?;8}zB4+$7jFyy%* z-wll!>KwXj7&C0}u%*LJ=l0I6%iTU44bK_Aboe)Uee)*gy*)xSB5%aX5#Q%04M zP!Lj3Qn0b$W?@$0qQX-}{fZij_7zKu#}#iVzBSS`a>>ZEqXv$eHR|B#uA}XvcZ~5J zQ#@wvm>XlwW1ks&VVrv0ym2SS_Z>fN{KpfzPNI^5c9 zy-}J|`h4ltGGp2DvMc48db zvLD$rFKC`~-j|Q2Jo?gO+++5~KA)d7|JnI}FDPH|$-?-B%NE{wyzKE$o=A9N#S?d* zta$SCMVdt~E*34WTYTcFjHlKwkuRCPF9^Ya*iE5o_qZ8iJ}u^tX7=RWr|-2QRiPx7Ch|GD4KZ~l_`%coaIUA^$D z^Vhq-J$|jrwRP83*Z1AXyK&}b?akY_7X04j_w|2h|2XjH$UiUMo_fdk&WgYK|F!Gy zA%CB~TYL8|iGZsgmwS9`$j}70nyXz6xo{aolTbQ!T8HbN=EmF(pP|N#nQ(Q(-~BYt zpchZGAL8$XS})tmg?r0p0#{FPS9EVaAF%`!1^~!f@TrIAK3wQ@INSuoZI2uPbWtr{ z$yo5{ssQma4bY~K0@8FL_#n@N2eK9Xk2fi10lf{-gm=LU`5c`D59Bg5 z|B&JyfE>-lS%4KC0-?4M5Kk)t|6?p5MoR!KIum@4x8OGYQ^0y20-Wbbd>U|`XYqM_ z0bj(I8DFLs6UFofET@`D2j3%?8Oe+T)TV=(%FJYzFv|d`xrKR++0T5;9Ab_F7V~@N z8u%Y!Y&hGU?ZGMlcR7HKXEkg(n+do}6Pv@12z@8?-O&A^M?z18eiQm#=r5tah29P0 z!UDpiVWDCD!(zh>VFh3p#|j=BgN5HP{|^7c#*>$Ypz2))-LsnbF0?9aSB>0*~n9fMTgfsljH^og*ctqn@&rdu?HuL;p zx-s1aR@j=EZZxtiD|D2@#hlfx(CXvW3d1nj4~316N-H0RVR}LE8$hCLYuE+Wzc0j} zXkHW3kGxL7LI9XyXp~&2D107>cCMlkb6S>&E;i##WFlp7kL(3SFv(0hECKkjI!4c= zFsV!$*+#aL9b_ljMc!V^WZ=h8B$LJ%857wJ!9gi`o4iBz(6~-NU|cIkRe(#DaOnpx;@)RcB8>*-w@TkAN`9)f>v3Y@Yz zC$zTZp`sA>Yfn;#swG;L*_4_gH5R2x4H3UAwaK8=nv7blN@F%^H5xv&!VJTI z4VU`_+!IpCGXB?)O1Q6|5G?7^Q_-vMfLLXcO07*zOE(CS6kwcErPAmWYPBLES))=U zBxsTpN+2j+p-fPz6p3mL+*+#=k`=|kPkloC_zppPP+#q5*}`~Pv`M8(N=Q!9DihR6 zFv0i)lTv3k=#=qhV}eSjGiGI}0PGb8ZM_hMHbx$m%H+Xe;q>ym`oSpWkWh%M1T=T* z3=$9m(TT3zQz%if&)TRVWq9sua zL0C2*$tq z2te>MD$G(yx5!-2j%DqM;cGxJ2T;KPeV8#rnW)mLVqvXSvtku9=;Fid;EX(L7GO(g zF+X1_1hm{c`-J3Kbo!cPm}+|}nl*hWfjWI64GhsCxi?j-vYjx4;a$WQtt4)5%~p$Ma3gWjT|#} z+;|$m0W;8!TOeS3bQvIjAlgEKpfGGsfW}kh-~^-|RLh~DOVE);IXNa+&>Yt=s~rI1 zG?Zj_y4=tR!a#sz11K|(nWb?+C~oalSSS}1^D23m)m6>Msf00G)k%&?7&hBk&yNEX zHh!V_rt6eYcVAc`W zkG%Zv!sRvSBbc!$b_0{o6u_NG5mOAl$tY$tGlslN_LBF=KJq@vC6zs|b zri7WuSea5tmjj$gNHFhunMQ%F)OdAdGaG@3CDRj}=oR)!*471fboQ)7DtFPjbW0f}OIQAbq zhH$dIvaUnF<0!zit*w_%fdqg9QUH&DlA_JL%&TXd)TUElEaM^{du{p@!03T*H;sHk zK5cUVW-t#u2y)8I;UT97Nm^9q<9_@ydb^*;EO=mxC-@eh(H8ZqI<$C-0Tl6Skh!JI z)8q?sh#X!G?&T6@1vvsAzoTm-0O#UhKJ=ABD<|V}T&@NRiIjUGk*!5u#P?YL;F>;)oAYYQN$Vu`wfx`^>22N(o zX8ahl1%OS#klqCFrpK5~N4TORvxnUe8eP63i3i39nS{r;a)ct^H;@ z9S!vYxSDyN*}sZ>%lo5f4f7!n>4wS75YXDx{v;=WA&F0>=7;wnKjytj@9KQY9HpM) zXUylIhYrCS9U>dwahW#{0aE}iaALx0l$BR?`z~bFwh+4H*T6W8x}puP*0R>6lR|IarK1hJb34bJ z2gn`s9l6}Z{Ez%VUu4m$JetU5aJ8>`iTMF`EpwS%X=1LBA4$yp=pw46QS2J#D)TGz z8*`2PM1Cf}kgGI<|AGwRD<-d9Fh9`CJJ8waZKAT^4)kWEt`sNoy%!eOQrz zHhsW~Cd6xIdC~Z+mp{i_d*{W5kejUtH@LF@zkTCJWOhOEcRmQn>FgxVH&g z2u+GTn5AtvDqz$~v|0#i7eF6(>}D(r52BjcaqM^x7J0C5Ge8p}fl4XeQ{7rQ)S|bj z4QkP5z`@qi9AF=4Bl>)(T@CN#Y^(zeI0Ppu*(%n~PGYOs8n%|L^I(4u7JIP7g9AJ` z(1U|K7zmenuzUkdWHRVmfX=fG>=bq?JB`jM7{~$yy$7dxaGnQ`@ZiyuOc^D_YZ?WE zOA&~IHRRFjuvhEKtT@IXm)`PoJ zZl+LC>EB^gs@!Y^-~-iF^2t^Yo_}}{*0C-Rg66GOhx}}tqt@njHu8#|eF@%9u&X?{ zTkAamyPAd9JnPss?91R+u4C7;8`zB=+}(pCJh+Dk_w-o@f8ZUSPk+QqUycHT2@lC$z0E zeW}9NsD<6tmQ6h+@bsn)ukf~QEA!xF503X>od*vj<4a@%`6nUNOYInR>K}*ud=_w1R~gL?Da8iLl*JGkl#Hx(Sws@4DXAv zx7gnW-?42g2sbKx?L4d9+06by?+mGL^N)2}#$#!8C$UKdVYyGIVd+S*n?9^ zNeAZ$E}ar%6bD&I&9&GYp zvjSNcq_+X1!RPAKp$gwSRo4O!HT-iGFX1{a1}rZ8My>zqN`qH|^iek^mw!joxzbi=Z)kZp&b!jn+(Jos zz0*#gjtJznEArq{f;@PP2is0?i@B#@j3wMs?r9ijA-5bSaw~AcDA;Q?s7MW5E?6_SkLp7jc=|8Zg%S31AHe&!|InnF`;hkj zU#i}J^Lv>4nERxNciZ>~X%{$*41mAYqemJ1UwEN^-9^o&vIf9Anc2bYQ26UEd2p@R?aiUPD- zHdhHkuo*@@#ogp?`EWk|J`zAd1^a~hbn*%J$@iJ#v&d(O&(l83eV+AM>9gMFRiE8H zdwll#>=Q+Z`T%lGFUkb;TCQj;;Gt?nb)tHaQ{)y+5ls_4Dw;1^D0)J)Nc5CwspuKe za?t_6NGSjv^^ort-!FZy`5`~KUx;6rUuVBAe%<^c03p>2Fj6W%ji1&}@0aSA?w9G8 z41SkUr1|$R|1*8OI1ylw&0n4>K;JJY316~Z+ z6tE*;SHSLoJ%H`n7qCCzaKO=k;{jg+&g)dbHv!)U`ULh0928gwNUt{ncL%-)Xs-_f z4+I_x{5tS-kYA7-(4R3uNkOSW=|SUzDuV1m)j_pEQ-Y=itqEEiv_9xHz=FLS^li}h zQjxT~w7)b)IzXzF>ZNJY3~83sB(+Ejq(#z^($Uf#(hsD^q$i|bNxzn!mY$KGm3}Av zReDW&LwZa4hxE4eFX>$wmi3cm%W7p$$+pW*%Q?9S@MGcfuJZ2kUh*h;Z+Tz2Ql2U| z%PsOj@*(mM2EzLB!uVzv6dGyGGuhf*pTrdKL*%fj$ z>#}19njm?YAk1dQX zjxCF|#a71JW2<9pV;!-RW0%Fg9eY73Rfa1S%Kpj$N|iE2nW-#L7AeQTk*h*krJSUk zs+_KzseDN3QO;F9u3V&iO1V_|yz&L*OUm`iSCm_ouPNV9?p1!K{6cwHc~p5^`K9ut z@_XeaKb%BGpLM7}YpcgX%HW4%I=`Ikik3p^jIltB0s_)p_ay zb&-0cdZOBLhtwYRT=gUB$JI}&7ps@3pH{!1-l%>}{f7E2^>+0h^LOW=4)1Inl)=QYc=aN8#S8&C-ZM3$Jwx2de8>@}e znzeTA3hj37$J!IxliE|-GupG-@3hx-SjXu^I)9x+7pM!@_14Ad;&q8Sl}@9}&>3__ zomrQy%h3(i73oTJlXbIo9^G8sJl$iu1-j+B6}o42D|K(^_Uhi(eW3eD_lfRP-AUbP z-5K3E-Fe*w-EX=Zx?8$Gb$4`s>m~Xiy-XjX57T$n_tq!sll3}%iat}Hr8ns<`U!fX ze?q@lzeN9xe!2cxeY1Xpev^KS{x$s@`n~!C`j7Po^`GgF=}+jt(toW#t-qlEP5+1f zw*D{u-4s!ZUy3*-Fh!aYp3*xdHYF}4J|!_lmy(*2o?=KbrWB`?q|~HLPI0G9O_`Z8 zJB6goNm-S$FXfAr?@}(LTuQl;@^i|sDc4hOrTm%lSE?*EI5jM_b845=ZmB&|d!Hg^f z>D|(Mr1wgXPVbxEKYc*DGJRlrYWkq`vh=CxOVeLVe<%H9`uFKK(tl6Co&I+Q&fqe9 zGsGEPGP-5-$WUZNW<+Q7$>^66lQANrK4V$Nu8gypKAFl)eP%|cA=8wZlQ|@FSmyA| z37M|Ud6~~-uFu?`c_8zX%+E3pWganbhCoB8p|hc@A;Qqp5Nk*_q!}^{Sq8Hq+mL5) z7~F=XhE;}U!y3an!<&ZfhMk7ph69FUh7*R9hEs6?Z`Tm^-b3IS(meZ%=#tkx2)S)e;cupHHwUWM!B(@v5zs`IK)_J9BCY59B-Ux zv>U69wZ?j*)95xXF>W;;FLzWF>N)yZhF)7j_DKA zLDQ$E&rPRHXG~{J=S|<6E}4Ec-8B7Sx?}p=ECIx5sJW9l+}zU~X^uAcHTO3snN!U< z<~(!0xzJo}9&es#E;ZZCmF7nC9P?81dhH|DeE@5~p>mn_&Kw#Y3JmQ2e~ORi;v zrO-0cQe$ygoR$X5G|P0$T+0H>6PCr6rIu$b&6YKmb(W2m?UtREw=H`t2Q8ml4q1*` z&RDKkezIJ({FW`r4$78ghh&Fk_sH&*9i81LdtmnH> + + + + SchemeUserState + + DeightonAR-tvOS.xcscheme_^#shared#^_ + + orderHint + 1 + + DeightonAR.xcscheme_^#shared#^_ + + orderHint + 0 + + + + diff --git a/mobile/ios/DeightonAR/AppDelegate.m b/mobile/ios/DeightonAR/AppDelegate.m index 42cab74..8d36879 100644 --- a/mobile/ios/DeightonAR/AppDelegate.m +++ b/mobile/ios/DeightonAR/AppDelegate.m @@ -12,6 +12,8 @@ #import #import +#import "RCCManager.h" + @implementation AppDelegate - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions @@ -20,6 +22,11 @@ jsCodeLocation = [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index" fallbackResource:nil]; + self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds]; + self.window.backgroundColor = [UIColor whiteColor]; + [[RCCManager sharedInstance] initBridgeWithBundleURL:jsCodeLocation launchOptions:launchOptions]; + + /* RCTRootView *rootView = [[RCTRootView alloc] initWithBundleURL:jsCodeLocation moduleName:@"DeightonAR" initialProperties:nil @@ -31,6 +38,8 @@ rootViewController.view = rootView; self.window.rootViewController = rootViewController; [self.window makeKeyAndVisible]; + */ + return YES; } diff --git a/website/src/App.js b/website/src/App.js index 735c8cb..d3efa89 100644 --- a/website/src/App.js +++ b/website/src/App.js @@ -98,7 +98,7 @@ export class App extends Component { - + ()} /> diff --git a/website/src/Home/Home.js b/website/src/Home/Home.js index 66e5608..d2f21f5 100644 --- a/website/src/Home/Home.js +++ b/website/src/Home/Home.js @@ -4,7 +4,16 @@ import { Row, Column, PanelButton } from 'ui' export class Home extends Component { static propTypes = { - history: PropTypes.object + history: PropTypes.object, + onChangeTitle: PropTypes.func.isRequired, + } + + componentDidMount() { + this.props.onChangeTitle('Home') + } + + componentDidUnmount() { + this.props.onChangeTitle('') } render() { diff --git a/website/src/Modal/YesNoMessageModal.js b/website/src/Modal/YesNoMessageModal.js index cb8ac02..8683e33 100644 --- a/website/src/Modal/YesNoMessageModal.js +++ b/website/src/Modal/YesNoMessageModal.js @@ -52,7 +52,7 @@ export class YesNoMessageModal extends React.Component { -