Skip to content

Commit

Permalink
Merge pull request #3 from hello-nyxo/feature/new-sleep-ui
Browse files Browse the repository at this point in the history 
feat: New Sleep UI
  • Loading branch information
@plahteenlahti
plahteenlahti committed Sep 1, 2020
2 parents 698fd35 + 60831ac commit fc53547
Show file tree
Hide file tree
Showing 149 changed files with 3,747 additions and 3,465 deletions.
23 changes: 16 additions & 7 deletions assets/svgs.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -655,13 +655,14 @@ export const icons = {
),
bedWindow: (
<G>
<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" />
<Rect x="19.75" y="5" width="4" height="3" rx="0.5" ry="0.5" />
<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" />
<Rect x="14.25" y="5" width="4" height="3" rx="0.5" ry="0.5" />
<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" />
<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" />
<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" />
<Path d="M23.25,23.25v-3a1.5,1.5,0,0,0-1.5-1.5H.75v4.5" />
<Path d="M0.75 21.75L23.25 21.75" />
<Path d="M0.75 15.75H21.75V18.75H0.75z" />
<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" />
<Path d="M0.75 16.5L0.75 9.75" />
<Path d="M14.25 0.75H23.25V9.75H14.25z" />
<Path d="M18.75 0.75L18.75 9.75" />
<Path d="M14.25 5.25L23.25 5.25" />
</G>
),
tag: (
Expand Down Expand Up @@ -789,6 +790,14 @@ export const icons = {
<G>
<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" />
</G>
),
doubleBedAdd: (
<G>
<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" />
<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" />
<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" />
<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" />
</G>
)
}

Expand Down
4 changes: 3 additions & 1 deletion babel.config.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,9 @@ module.exports = {
],
alias: {
'@actions': './src/actions/',
'@reducers': './src/store/Reducers'
'@reducers': './src/store/Reducers',
'@selectors': './src/store/Selectors',
'@components': './src/components'
}
}
]
Expand Down
36 changes: 8 additions & 28 deletions ios/Nyxo.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
5B090C42235912AC00FD7E9B /* Domine-Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 5B090C40235912AC00FD7E9B /* Domine-Bold.ttf */; };
5B090C43235912AC00FD7E9B /* Domine-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 5B090C41235912AC00FD7E9B /* Domine-Regular.ttf */; };
5B20692D224E434B00257043 /* StoreKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5B20692C224E434B00257043 /* StoreKit.framework */; };
5B2D63A824FC1942002E853B /* AppCenter-Config.plist in Resources */ = {isa = PBXBuildFile; fileRef = 5B2D63A724FC1941002E853B /* AppCenter-Config.plist */; };
5B33130921DFB5B800698A4A /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 5B33130121DFB5B800698A4A /* AppDelegate.m */; };
5B33130A21DFB5B800698A4A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 5B33130221DFB5B800698A4A /* main.m */; };
5B40961F242BAE0000169B4C /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 5B40961E242BAE0000169B4C /* GoogleService-Info.plist */; };
Expand All @@ -35,10 +36,6 @@
5BD58BA722D71D7600D1CD2D /* Montserrat-Light.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 5BD58B9522D71D7600D1CD2D /* Montserrat-Light.ttf */; };
5BD58BA822D71D7600D1CD2D /* Montserrat-Thin.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 5BD58B9622D71D7600D1CD2D /* Montserrat-Thin.ttf */; };
5BD58BA922D71D7600D1CD2D /* Montserrat-Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 5BD58B9722D71D7600D1CD2D /* Montserrat-Bold.ttf */; };
8A51C39624F5334200DF3C83 /* AppCenter-Config.plist in Resources */ = {isa = PBXBuildFile; fileRef = 8A51C39524F5334200DF3C83 /* AppCenter-Config.plist */; };
8A51C43B24F554C100DF3C83 /* Intercom.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8A51C43824F552B400DF3C83 /* Intercom.framework */; };
8A51C43C24F554C100DF3C83 /* Intercom.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 8A51C43824F552B400DF3C83 /* Intercom.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
B95CBA9C2099AEB300243A25 /* HealthKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B95CBA9B2099AEB300243A25 /* HealthKit.framework */; };
C6BF152484FF448FA7435F49 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BAC1FA2BBE14987AE9C5E6D /* libz.tbd */; };
E1DF9C1DF40E9169E37562FD /* libPods-Nyxo.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E89B28DB570F1784E077C6A0 /* libPods-Nyxo.a */; };
ED297163215061F000B7C4FE /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ED297162215061F000B7C4FE /* JavaScriptCore.framework */; };
Expand Down Expand Up @@ -69,17 +66,6 @@
/* End PBXContainerItemProxy section */

/* Begin PBXCopyFilesBuildPhase section */
5B54765A2233C6650027A9A0 /* Embed Frameworks */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = "";
dstSubfolderSpec = 10;
files = (
8A51C43C24F554C100DF3C83 /* Intercom.framework in Embed Frameworks */,
);
name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0;
};
5B6E854A21406B9A0013E7B5 /* Embed Watch Content */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
Expand All @@ -106,6 +92,7 @@
5B20692C224E434B00257043 /* StoreKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = StoreKit.framework; path = System/Library/Frameworks/StoreKit.framework; sourceTree = SDKROOT; };
5B2069A4224FB24200257043 /* Lato-Regular.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "Lato-Regular.ttf"; path = "../assets/fonts/Lato-Regular.ttf"; sourceTree = "<group>"; };
5B2B308921EF5C82007E2982 /* assets */ = {isa = PBXFileReference; lastKnownFileType = folder; path = assets; sourceTree = "<group>"; };
5B2D63A724FC1941002E853B /* AppCenter-Config.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "AppCenter-Config.plist"; path = "Nyxo/AppCenter-Config.plist"; sourceTree = "<group>"; };
5B3312FB21DFB5B700698A4A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = Nyxo/Images.xcassets; sourceTree = "<group>"; };
5B3312FE21DFB5B800698A4A /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = LaunchScreen.old.xib; sourceTree = "<group>"; };
5B33130021DFB5B800698A4A /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = LaunchScreen.xib; sourceTree = "<group>"; };
Expand Down Expand Up @@ -210,8 +197,6 @@
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>"; };
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>"; };
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>"; };
8A51C39524F5334200DF3C83 /* AppCenter-Config.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "AppCenter-Config.plist"; sourceTree = "<group>"; };
8A51C43824F552B400DF3C83 /* Intercom.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Intercom.framework; sourceTree = "<group>"; };
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>"; };
B959F1EA20BD3D8E00AC734C /* Dosis-Bold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "Dosis-Bold.ttf"; path = "../assets/fonts/Dosis-Bold.ttf"; sourceTree = "<group>"; };
B959F21820BD455C00AC734C /* fa-regular-400.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "fa-regular-400.ttf"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -241,10 +226,8 @@
files = (
ED297163215061F000B7C4FE /* JavaScriptCore.framework in Frameworks */,
5B20692D224E434B00257043 /* StoreKit.framework in Frameworks */,
B95CBA9C2099AEB300243A25 /* HealthKit.framework in Frameworks */,
C6BF152484FF448FA7435F49 /* libz.tbd in Frameworks */,
E1DF9C1DF40E9169E37562FD /* libPods-Nyxo.a in Frameworks */,
8A51C43B24F554C100DF3C83 /* Intercom.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -494,8 +477,7 @@
83CBB9F61A601CBA00E9B192 = {
isa = PBXGroup;
children = (
8A51C43824F552B400DF3C83 /* Intercom.framework */,
8A51C39524F5334200DF3C83 /* AppCenter-Config.plist */,
5B2D63A724FC1941002E853B /* AppCenter-Config.plist */,
5B5220FA24F29CA50039E226 /* rnuc.xcconfig */,
5B40961E242BAE0000169B4C /* GoogleService-Info.plist */,
5BA9115A22E1E2070098700A /* Shared */,
Expand Down Expand Up @@ -633,10 +615,9 @@
13B07F8E1A680F5B00A75B9A /* Resources */,
00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */,
5B6E854A21406B9A0013E7B5 /* Embed Watch Content */,
5B54765A2233C6650027A9A0 /* Embed Frameworks */,
6C3BA05A2308A4078CE786D2 /* [CP] Copy Pods Resources */,
DED22F96C89D448186375252 /* Upload Debug Symbols to Sentry */,
8A51C43A24F553DC00DF3C83 /* ShellScript */,
8A51C43A24F553DC00DF3C83 /* Strip frameworks */,
);
buildRules = (
);
Expand Down Expand Up @@ -755,7 +736,7 @@
5B40961F242BAE0000169B4C /* GoogleService-Info.plist in Resources */,
5BD58BA222D71D7600D1CD2D /* Montserrat-BoldItalic.ttf in Resources */,
5BD58BA322D71D7600D1CD2D /* Montserrat-SemiBold.ttf in Resources */,
8A51C39624F5334200DF3C83 /* AppCenter-Config.plist in Resources */,
5B2D63A824FC1942002E853B /* AppCenter-Config.plist in Resources */,
5BD58BA422D71D7600D1CD2D /* Montserrat-BlackItalic.ttf in Resources */,
5BD58BA522D71D7600D1CD2D /* Montserrat-ExtraLight.ttf in Resources */,
5BD58BA622D71D7600D1CD2D /* Montserrat-ExtraBold.ttf in Resources */,
Expand Down Expand Up @@ -821,7 +802,7 @@
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Nyxo/Pods-Nyxo-resources.sh\"\n";
showEnvVarsInLog = 0;
};
8A51C43A24F553DC00DF3C83 /* ShellScript */ = {
8A51C43A24F553DC00DF3C83 /* Strip frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
Expand All @@ -830,13 +811,14 @@
);
inputPaths = (
);
name = "Strip frameworks";
outputFileListPaths = (
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "bash \"${BUILT_PRODUCTS_DIR}/${FRAMEWORKS_FOLDER_PATH}/Intercom.framework/strip-frameworks.sh\"\n";
shellScript = "\"${PROJECT_DIR}/../node_modules/react-native-purchases/ios/strip-frameworks.sh\"\n";
};
BF842D7B9E4CC79A1B9C718D /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
Expand Down Expand Up @@ -1040,7 +1022,6 @@
"$(inherited)",
"$(PROJECT_DIR)",
"$(PROJECT_DIR)/../node_modules/react-native-background-fetch/ios/**",
"$(PROJECT_DIR)/intercom-ios-master",
);
HEADER_SEARCH_PATHS = (
"$(SRCROOT)/../node_modules/react-native/React",
Expand Down Expand Up @@ -1088,7 +1069,6 @@
"$(inherited)",
"$(PROJECT_DIR)",
"$(PROJECT_DIR)/../node_modules/react-native-background-fetch/ios/**",
"$(PROJECT_DIR)/intercom-ios-master",
);
HEADER_SEARCH_PATHS = (
"$(SRCROOT)/../node_modules/react-native/React",
Expand Down
1 change: 1 addition & 0 deletions ios/Podfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ end
platform :ios, '10.0'
target 'Nyxo' do

pod 'Intercom'
pod 'AppAuth', '>= 1.2.0'
use_unimodules!(exclude: ['expo-face-detector'])
use_native_modules!
Expand Down
Loading

0 comments on commit fc53547

Please sign in to comment.