Skip to content

Commit fc53547

Browse files
plahteenlahtiplahteenlahti
authored
Merge pull request #3 from hello-nyxo/feature/new-sleep-ui
feat: New Sleep UI
2 parents 698fd35 + 60831ac commit fc53547

File tree

149 files changed

+3747
-3465
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

149 files changed

+3747
-3465
lines changed

‎assets/svgs.tsx

+16-7
Original file line numberDiff line numberDiff line change
@@ -655,13 +655,14 @@ export const icons = {
655655
),
656656
bedWindow: (
657657
<G>
658-
<Path d="M22.75,18.4V17a2,2,0,0,0-2-2h-10a.5.5,0,0,1-.5-.5V14a2.1,2.1,0,0,0-1.9-2.1l-2.512-.251A2.358,2.358,0,0,0,3.25,14v.5a.5.5,0,0,1-1,0v-4a1,1,0,0,0-2,0v12a1,1,0,0,0,2,0V22a.5.5,0,0,1,.5-.5h18a.5.5,0,0,1,.5.5v.5a1,1,0,0,0,2,0v-3a.962.962,0,0,0-.333-.724A.5.5,0,0,1,22.75,18.4Zm-2-.4a.5.5,0,0,1-.5.5H2.75a.5.5,0,0,1-.5-.5v-.5a.5.5,0,0,1,.5-.5h17.5a.5.5,0,0,1,.5.5Z" />
659-
<Rect x="19.75" y="5" width="4" height="3" rx="0.5" ry="0.5" />
660-
<Path d="M22.75.5h-2.5a.5.5,0,0,0-.5.5V3a.5.5,0,0,0,.5.5h3a.5.5,0,0,0,.5-.5V1.5A1,1,0,0,0,22.75.5Z" />
661-
<Rect x="14.25" y="5" width="4" height="3" rx="0.5" ry="0.5" />
662-
<Path d="M23.25,9.5h-3a.5.5,0,0,0-.5.5v2a.5.5,0,0,0,.5.5h2.5a1,1,0,0,0,1-1V10A.5.5,0,0,0,23.25,9.5Z" />
663-
<Path d="M14.75,3.5h3a.5.5,0,0,0,.5-.5V1a.5.5,0,0,0-.5-.5h-2.5a1,1,0,0,0-1,1V3A.5.5,0,0,0,14.75,3.5Z" />
664-
<Path d="M15.25,12.5h2.5a.5.5,0,0,0,.5-.5V10a.5.5,0,0,0-.5-.5h-3a.5.5,0,0,0-.5.5v1.5A1,1,0,0,0,15.25,12.5Z" />
658+
<Path d="M23.25,23.25v-3a1.5,1.5,0,0,0-1.5-1.5H.75v4.5" />
659+
<Path d="M0.75 21.75L23.25 21.75" />
660+
<Path d="M0.75 15.75H21.75V18.75H0.75z" />
661+
<Path d="M5.25,12.75h-3a1.5,1.5,0,0,0-1.5,1.5v1.5h6v-1.5A1.5,1.5,0,0,0,5.25,12.75Z" />
662+
<Path d="M0.75 16.5L0.75 9.75" />
663+
<Path d="M14.25 0.75H23.25V9.75H14.25z" />
664+
<Path d="M18.75 0.75L18.75 9.75" />
665+
<Path d="M14.25 5.25L23.25 5.25" />
665666
</G>
666667
),
667668
tag: (
@@ -789,6 +790,14 @@ export const icons = {
789790
<G>
790791
<Path d="M21.5,3H18.75a.25.25,0,0,1-.25-.25V1a1,1,0,0,0-2,0v4.75a.75.75,0,0,1-.75.75h0a.75.75,0,0,1-.75-.75V3.5a.5.5,0,0,0-.5-.5H8.25A.25.25,0,0,1,8,2.751V1A1,1,0,1,0,6,1v4.75a.75.75,0,0,1-.75.75h0a.75.75,0,0,1-.75-.75V3.5A.5.5,0,0,0,4,3H2.5a2,2,0,0,0-2,2V22a2,2,0,0,0,2,2h19a2,2,0,0,0,2-2V5A2,2,0,0,0,21.5,3ZM21,22H3a.5.5,0,0,1-.5-.5V9.5A.5.5,0,0,1,3,9H21a.5.5,0,0,1,.5.5v12A.5.5,0,0,1,21,22Z" />
791792
</G>
793+
),
794+
doubleBedAdd: (
795+
<G>
796+
<Path d="M.9,15.5H9.248a.5.5,0,0,0,.477-.352A8.023,8.023,0,0,1,17.375,9.5a7.925,7.925,0,0,1,4.883,1.669.5.5,0,0,0,.8-.486l-.7-3.773a.5.5,0,0,0-.49-.41H2.385a.5.5,0,0,0-.49.41l-1.49,8a.56.56,0,0,0,.11.41A.527.527,0,0,0,.9,15.5Z" />
797+
<Path d="M9.375,17.5c0-.159,0-.316.013-.472a.5.5,0,0,0-.5-.528H.625a.5.5,0,0,0-.5.5v3.25a2.253,2.253,0,0,0,2.25,2.25.248.248,0,0,1,.25.25v.5a.75.75,0,0,0,1.5,0V23a.5.5,0,0,1,.5-.5h5.547a.5.5,0,0,0,.424-.766A7.911,7.911,0,0,1,9.375,17.5Z" />
798+
<Path d="M2.625,5.5H4.2A.5.5,0,0,0,4.7,5.082l.36-2.165A.5.5,0,0,1,5.549,2.5h4.576a.5.5,0,0,1,.5.5V5a.5.5,0,0,0,.5.5h2a.5.5,0,0,0,.5-.5V3a.5.5,0,0,1,.5-.5H18.7a.5.5,0,0,1,.494.417l.36,2.165a.5.5,0,0,0,.494.418h1.576a.5.5,0,0,0,.5-.5V2.25A2.253,2.253,0,0,0,19.875,0H4.375a2.253,2.253,0,0,0-2.25,2.25V5A.5.5,0,0,0,2.625,5.5Z" />
799+
<Path d="M17.375,11a6.5,6.5,0,1,0,6.5,6.5A6.508,6.508,0,0,0,17.375,11Zm2.5,7.5h-1a.5.5,0,0,0-.5.5v1a1,1,0,0,1-2,0V19a.5.5,0,0,0-.5-.5h-1a1,1,0,0,1,0-2h1a.5.5,0,0,0,.5-.5V15a1,1,0,0,1,2,0v1a.5.5,0,0,0,.5.5h1a1,1,0,0,1,0,2Z" />
800+
</G>
792801
)
793802
}
794803

‎babel.config.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,9 @@ module.exports = {
2525
],
2626
alias: {
2727
'@actions': './src/actions/',
28-
'@reducers': './src/store/Reducers'
28+
'@reducers': './src/store/Reducers',
29+
'@selectors': './src/store/Selectors',
30+
'@components': './src/components'
2931
}
3032
}
3133
]

‎ios/Nyxo.xcodeproj/project.pbxproj

+8-28
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
5B090C42235912AC00FD7E9B /* Domine-Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 5B090C40235912AC00FD7E9B /* Domine-Bold.ttf */; };
1111
5B090C43235912AC00FD7E9B /* Domine-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 5B090C41235912AC00FD7E9B /* Domine-Regular.ttf */; };
1212
5B20692D224E434B00257043 /* StoreKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5B20692C224E434B00257043 /* StoreKit.framework */; };
13+
5B2D63A824FC1942002E853B /* AppCenter-Config.plist in Resources */ = {isa = PBXBuildFile; fileRef = 5B2D63A724FC1941002E853B /* AppCenter-Config.plist */; };
1314
5B33130921DFB5B800698A4A /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 5B33130121DFB5B800698A4A /* AppDelegate.m */; };
1415
5B33130A21DFB5B800698A4A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 5B33130221DFB5B800698A4A /* main.m */; };
1516
5B40961F242BAE0000169B4C /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 5B40961E242BAE0000169B4C /* GoogleService-Info.plist */; };
@@ -35,10 +36,6 @@
3536
5BD58BA722D71D7600D1CD2D /* Montserrat-Light.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 5BD58B9522D71D7600D1CD2D /* Montserrat-Light.ttf */; };
3637
5BD58BA822D71D7600D1CD2D /* Montserrat-Thin.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 5BD58B9622D71D7600D1CD2D /* Montserrat-Thin.ttf */; };
3738
5BD58BA922D71D7600D1CD2D /* Montserrat-Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 5BD58B9722D71D7600D1CD2D /* Montserrat-Bold.ttf */; };
38-
8A51C39624F5334200DF3C83 /* AppCenter-Config.plist in Resources */ = {isa = PBXBuildFile; fileRef = 8A51C39524F5334200DF3C83 /* AppCenter-Config.plist */; };
39-
8A51C43B24F554C100DF3C83 /* Intercom.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8A51C43824F552B400DF3C83 /* Intercom.framework */; };
40-
8A51C43C24F554C100DF3C83 /* Intercom.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 8A51C43824F552B400DF3C83 /* Intercom.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
41-
B95CBA9C2099AEB300243A25 /* HealthKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B95CBA9B2099AEB300243A25 /* HealthKit.framework */; };
4239
C6BF152484FF448FA7435F49 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BAC1FA2BBE14987AE9C5E6D /* libz.tbd */; };
4340
E1DF9C1DF40E9169E37562FD /* libPods-Nyxo.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E89B28DB570F1784E077C6A0 /* libPods-Nyxo.a */; };
4441
ED297163215061F000B7C4FE /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ED297162215061F000B7C4FE /* JavaScriptCore.framework */; };
@@ -69,17 +66,6 @@
6966
/* End PBXContainerItemProxy section */
7067

7168
/* Begin PBXCopyFilesBuildPhase section */
72-
5B54765A2233C6650027A9A0 /* Embed Frameworks */ = {
73-
isa = PBXCopyFilesBuildPhase;
74-
buildActionMask = 2147483647;
75-
dstPath = "";
76-
dstSubfolderSpec = 10;
77-
files = (
78-
8A51C43C24F554C100DF3C83 /* Intercom.framework in Embed Frameworks */,
79-
);
80-
name = "Embed Frameworks";
81-
runOnlyForDeploymentPostprocessing = 0;
82-
};
8369
5B6E854A21406B9A0013E7B5 /* Embed Watch Content */ = {
8470
isa = PBXCopyFilesBuildPhase;
8571
buildActionMask = 2147483647;
@@ -106,6 +92,7 @@
10692
5B20692C224E434B00257043 /* StoreKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = StoreKit.framework; path = System/Library/Frameworks/StoreKit.framework; sourceTree = SDKROOT; };
10793
5B2069A4224FB24200257043 /* Lato-Regular.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "Lato-Regular.ttf"; path = "../assets/fonts/Lato-Regular.ttf"; sourceTree = "<group>"; };
10894
5B2B308921EF5C82007E2982 /* assets */ = {isa = PBXFileReference; lastKnownFileType = folder; path = assets; sourceTree = "<group>"; };
95+
5B2D63A724FC1941002E853B /* AppCenter-Config.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "AppCenter-Config.plist"; path = "Nyxo/AppCenter-Config.plist"; sourceTree = "<group>"; };
10996
5B3312FB21DFB5B700698A4A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = Nyxo/Images.xcassets; sourceTree = "<group>"; };
11097
5B3312FE21DFB5B800698A4A /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = LaunchScreen.old.xib; sourceTree = "<group>"; };
11198
5B33130021DFB5B800698A4A /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = LaunchScreen.xib; sourceTree = "<group>"; };
@@ -210,8 +197,6 @@
210197
6CF46B6888304B68952AC827 /* Dosis-Medium.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Dosis-Medium.ttf"; path = "../assets/fonts/Dosis-Medium.ttf"; sourceTree = "<group>"; };
211198
796FDDB5089B4D6FBFF9AF7D /* FontAwesome5_Pro_Brands.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = FontAwesome5_Pro_Brands.ttf; path = ../assets/fonts/FontAwesome5_Pro_Brands.ttf; sourceTree = "<group>"; };
212199
8299F6F8C97B11A56957F31C /* Pods-Nyxo.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Nyxo.debug.xcconfig"; path = "Target Support Files/Pods-Nyxo/Pods-Nyxo.debug.xcconfig"; sourceTree = "<group>"; };
213-
8A51C39524F5334200DF3C83 /* AppCenter-Config.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "AppCenter-Config.plist"; sourceTree = "<group>"; };
214-
8A51C43824F552B400DF3C83 /* Intercom.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Intercom.framework; sourceTree = "<group>"; };
215200
9F67C385EC2C483E6892E5F9 /* Pods-Nyxo Dev.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Nyxo Dev.debug.xcconfig"; path = "Target Support Files/Pods-Nyxo Dev/Pods-Nyxo Dev.debug.xcconfig"; sourceTree = "<group>"; };
216201
B959F1EA20BD3D8E00AC734C /* Dosis-Bold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "Dosis-Bold.ttf"; path = "../assets/fonts/Dosis-Bold.ttf"; sourceTree = "<group>"; };
217202
B959F21820BD455C00AC734C /* fa-regular-400.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "fa-regular-400.ttf"; sourceTree = "<group>"; };
@@ -241,10 +226,8 @@
241226
files = (
242227
ED297163215061F000B7C4FE /* JavaScriptCore.framework in Frameworks */,
243228
5B20692D224E434B00257043 /* StoreKit.framework in Frameworks */,
244-
B95CBA9C2099AEB300243A25 /* HealthKit.framework in Frameworks */,
245229
C6BF152484FF448FA7435F49 /* libz.tbd in Frameworks */,
246230
E1DF9C1DF40E9169E37562FD /* libPods-Nyxo.a in Frameworks */,
247-
8A51C43B24F554C100DF3C83 /* Intercom.framework in Frameworks */,
248231
);
249232
runOnlyForDeploymentPostprocessing = 0;
250233
};
@@ -494,8 +477,7 @@
494477
83CBB9F61A601CBA00E9B192 = {
495478
isa = PBXGroup;
496479
children = (
497-
8A51C43824F552B400DF3C83 /* Intercom.framework */,
498-
8A51C39524F5334200DF3C83 /* AppCenter-Config.plist */,
480+
5B2D63A724FC1941002E853B /* AppCenter-Config.plist */,
499481
5B5220FA24F29CA50039E226 /* rnuc.xcconfig */,
500482
5B40961E242BAE0000169B4C /* GoogleService-Info.plist */,
501483
5BA9115A22E1E2070098700A /* Shared */,
@@ -633,10 +615,9 @@
633615
13B07F8E1A680F5B00A75B9A /* Resources */,
634616
00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */,
635617
5B6E854A21406B9A0013E7B5 /* Embed Watch Content */,
636-
5B54765A2233C6650027A9A0 /* Embed Frameworks */,
637618
6C3BA05A2308A4078CE786D2 /* [CP] Copy Pods Resources */,
638619
DED22F96C89D448186375252 /* Upload Debug Symbols to Sentry */,
639-
8A51C43A24F553DC00DF3C83 /* ShellScript */,
620+
8A51C43A24F553DC00DF3C83 /* Strip frameworks */,
640621
);
641622
buildRules = (
642623
);
@@ -755,7 +736,7 @@
755736
5B40961F242BAE0000169B4C /* GoogleService-Info.plist in Resources */,
756737
5BD58BA222D71D7600D1CD2D /* Montserrat-BoldItalic.ttf in Resources */,
757738
5BD58BA322D71D7600D1CD2D /* Montserrat-SemiBold.ttf in Resources */,
758-
8A51C39624F5334200DF3C83 /* AppCenter-Config.plist in Resources */,
739+
5B2D63A824FC1942002E853B /* AppCenter-Config.plist in Resources */,
759740
5BD58BA422D71D7600D1CD2D /* Montserrat-BlackItalic.ttf in Resources */,
760741
5BD58BA522D71D7600D1CD2D /* Montserrat-ExtraLight.ttf in Resources */,
761742
5BD58BA622D71D7600D1CD2D /* Montserrat-ExtraBold.ttf in Resources */,
@@ -821,7 +802,7 @@
821802
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Nyxo/Pods-Nyxo-resources.sh\"\n";
822803
showEnvVarsInLog = 0;
823804
};
824-
8A51C43A24F553DC00DF3C83 /* ShellScript */ = {
805+
8A51C43A24F553DC00DF3C83 /* Strip frameworks */ = {
825806
isa = PBXShellScriptBuildPhase;
826807
buildActionMask = 2147483647;
827808
files = (
@@ -830,13 +811,14 @@
830811
);
831812
inputPaths = (
832813
);
814+
name = "Strip frameworks";
833815
outputFileListPaths = (
834816
);
835817
outputPaths = (
836818
);
837819
runOnlyForDeploymentPostprocessing = 0;
838820
shellPath = /bin/sh;
839-
shellScript = "bash \"${BUILT_PRODUCTS_DIR}/${FRAMEWORKS_FOLDER_PATH}/Intercom.framework/strip-frameworks.sh\"\n";
821+
shellScript = "\"${PROJECT_DIR}/../node_modules/react-native-purchases/ios/strip-frameworks.sh\"\n";
840822
};
841823
BF842D7B9E4CC79A1B9C718D /* [CP] Check Pods Manifest.lock */ = {
842824
isa = PBXShellScriptBuildPhase;
@@ -1040,7 +1022,6 @@
10401022
"$(inherited)",
10411023
"$(PROJECT_DIR)",
10421024
"$(PROJECT_DIR)/../node_modules/react-native-background-fetch/ios/**",
1043-
"$(PROJECT_DIR)/intercom-ios-master",
10441025
);
10451026
HEADER_SEARCH_PATHS = (
10461027
"$(SRCROOT)/../node_modules/react-native/React",
@@ -1088,7 +1069,6 @@
10881069
"$(inherited)",
10891070
"$(PROJECT_DIR)",
10901071
"$(PROJECT_DIR)/../node_modules/react-native-background-fetch/ios/**",
1091-
"$(PROJECT_DIR)/intercom-ios-master",
10921072
);
10931073
HEADER_SEARCH_PATHS = (
10941074
"$(SRCROOT)/../node_modules/react-native/React",

‎ios/Podfile

+1
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ end
7777
platform :ios, '10.0'
7878
target 'Nyxo' do
7979

80+
pod 'Intercom'
8081
pod 'AppAuth', '>= 1.2.0'
8182
use_unimodules!(exclude: ['expo-face-detector'])
8283
use_native_modules!

0 commit comments

Comments
 (0)