# HG changeset patch # User Dennis Concepción Martín <66180929+denniscm190@users.noreply.github.com> # Date 1616873175 -3600 # Node ID 62d278295bb78631cfdc443dbf93baab6a05039c # Parent e7c3d68d8e2216fbfd97c70361295eb8856cc0bc Sign Up View implemented diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear.xcodeproj/project.pbxproj --- a/LazyBear.xcodeproj/project.pbxproj Sat Mar 27 00:46:17 2021 +0100 +++ b/LazyBear.xcodeproj/project.pbxproj Sat Mar 27 20:26:15 2021 +0100 @@ -7,14 +7,15 @@ objects = { /* Begin PBXBuildFile section */ + 950C36E3260FB6180081CF53 /* HapticsManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 950C36E2260FB6180081CF53 /* HapticsManager.swift */; }; + 950C36E8260FBB550081CF53 /* UserSettings+CoreDataClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 950C36E6260FBB550081CF53 /* UserSettings+CoreDataClass.swift */; }; + 950C36E9260FBB550081CF53 /* UserSettings+CoreDataProperties.swift in Sources */ = {isa = PBXBuildFile; fileRef = 950C36E7260FBB550081CF53 /* UserSettings+CoreDataProperties.swift */; }; + 950C36EF260FBBEB0081CF53 /* HomeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 950C36EE260FBBEB0081CF53 /* HomeView.swift */; }; 95201A2F260C9CAF007D5300 /* SignUpView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95201A2E260C9CAF007D5300 /* SignUpView.swift */; }; 954D7EA7260BBA6600A13C50 /* WatchlistCompany+CoreDataClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 954D7EA5260BBA6600A13C50 /* WatchlistCompany+CoreDataClass.swift */; }; 954D7EA8260BBA6600A13C50 /* WatchlistCompany+CoreDataProperties.swift in Sources */ = {isa = PBXBuildFile; fileRef = 954D7EA6260BBA6600A13C50 /* WatchlistCompany+CoreDataProperties.swift */; }; - 954D7EAC260BBB2400A13C50 /* HomeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 954D7EAB260BBB2400A13C50 /* HomeView.swift */; }; - 954D7EB1260BBBEA00A13C50 /* UserHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 954D7EB0260BBBEA00A13C50 /* UserHelper.swift */; }; 954D7EC2260BE70C00A13C50 /* SwiftlySearch in Frameworks */ = {isa = PBXBuildFile; productRef = 954D7EC1260BE70C00A13C50 /* SwiftlySearch */; }; - 954D7EC6260BE84100A13C50 /* WatchlistPreviewHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 954D7EC5260BE84100A13C50 /* WatchlistPreviewHelper.swift */; }; - 95531C79260CBECC00F0916A /* EnvironmentSignUp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95531C78260CBECC00F0916A /* EnvironmentSignUp.swift */; }; + 95531C79260CBECC00F0916A /* FirstAvatar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95531C78260CBECC00F0916A /* FirstAvatar.swift */; }; 95672B8F25DDA54700DCBE4A /* LazyBearApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95672B8E25DDA54700DCBE4A /* LazyBearApp.swift */; }; 95672B9325DDA54700DCBE4A /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 95672B9225DDA54700DCBE4A /* Assets.xcassets */; }; 95672B9625DDA54700DCBE4A /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 95672B9525DDA54700DCBE4A /* Preview Assets.xcassets */; }; @@ -26,20 +27,19 @@ 95BF36AC260E954F00B29E41 /* Avatar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95BF36AB260E954F00B29E41 /* Avatar.swift */; }; 95BF36AF260E9D4100B29E41 /* AvatarCreator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95BF36AE260E9D4100B29E41 /* AvatarCreator.swift */; }; 95E512D32607B42200C283E0 /* WelcomeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95E512D22607B42200C283E0 /* WelcomeView.swift */; }; - 95F1E091260CBD0B0076AE63 /* UserSettings+CoreDataClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95F1E08F260CBD0B0076AE63 /* UserSettings+CoreDataClass.swift */; }; - 95F1E092260CBD0B0076AE63 /* UserSettings+CoreDataProperties.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95F1E090260CBD0B0076AE63 /* UserSettings+CoreDataProperties.swift */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ 950BA46B25E944F500D065EF /* Production.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Production.xcconfig; sourceTree = ""; }; 950BA46C25E944FC00D065EF /* Sandbox.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Sandbox.xcconfig; sourceTree = ""; }; + 950C36E2260FB6180081CF53 /* HapticsManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HapticsManager.swift; sourceTree = ""; }; + 950C36E6260FBB550081CF53 /* UserSettings+CoreDataClass.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UserSettings+CoreDataClass.swift"; sourceTree = ""; }; + 950C36E7260FBB550081CF53 /* UserSettings+CoreDataProperties.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UserSettings+CoreDataProperties.swift"; sourceTree = ""; }; + 950C36EE260FBBEB0081CF53 /* HomeView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeView.swift; sourceTree = ""; }; 95201A2E260C9CAF007D5300 /* SignUpView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SignUpView.swift; sourceTree = ""; }; 954D7EA5260BBA6600A13C50 /* WatchlistCompany+CoreDataClass.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "WatchlistCompany+CoreDataClass.swift"; sourceTree = ""; }; 954D7EA6260BBA6600A13C50 /* WatchlistCompany+CoreDataProperties.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "WatchlistCompany+CoreDataProperties.swift"; sourceTree = ""; }; - 954D7EAB260BBB2400A13C50 /* HomeView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeView.swift; sourceTree = ""; }; - 954D7EB0260BBBEA00A13C50 /* UserHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserHelper.swift; sourceTree = ""; }; - 954D7EC5260BE84100A13C50 /* WatchlistPreviewHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WatchlistPreviewHelper.swift; sourceTree = ""; }; - 95531C78260CBECC00F0916A /* EnvironmentSignUp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EnvironmentSignUp.swift; sourceTree = ""; }; + 95531C78260CBECC00F0916A /* FirstAvatar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FirstAvatar.swift; sourceTree = ""; }; 95672B8B25DDA54700DCBE4A /* LazyBear.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = LazyBear.app; sourceTree = BUILT_PRODUCTS_DIR; }; 95672B8E25DDA54700DCBE4A /* LazyBearApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LazyBearApp.swift; sourceTree = ""; }; 95672B9225DDA54700DCBE4A /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; @@ -54,8 +54,6 @@ 95BF36AB260E954F00B29E41 /* Avatar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Avatar.swift; sourceTree = ""; }; 95BF36AE260E9D4100B29E41 /* AvatarCreator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AvatarCreator.swift; sourceTree = ""; }; 95E512D22607B42200C283E0 /* WelcomeView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WelcomeView.swift; sourceTree = ""; }; - 95F1E08F260CBD0B0076AE63 /* UserSettings+CoreDataClass.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UserSettings+CoreDataClass.swift"; sourceTree = ""; }; - 95F1E090260CBD0B0076AE63 /* UserSettings+CoreDataProperties.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UserSettings+CoreDataProperties.swift"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -81,7 +79,7 @@ 95201A40260CB50A007D5300 /* Helpers */ = { isa = PBXGroup; children = ( - 95531C78260CBECC00F0916A /* EnvironmentSignUp.swift */, + 95531C78260CBECC00F0916A /* FirstAvatar.swift */, 95BF36AB260E954F00B29E41 /* Avatar.swift */, 95BF36AE260E9D4100B29E41 /* AvatarCreator.swift */, ); @@ -91,8 +89,8 @@ 954D7E9D260BBA5200A13C50 /* Models */ = { isa = PBXGroup; children = ( - 95F1E08F260CBD0B0076AE63 /* UserSettings+CoreDataClass.swift */, - 95F1E090260CBD0B0076AE63 /* UserSettings+CoreDataProperties.swift */, + 950C36E6260FBB550081CF53 /* UserSettings+CoreDataClass.swift */, + 950C36E7260FBB550081CF53 /* UserSettings+CoreDataProperties.swift */, 954D7EA5260BBA6600A13C50 /* WatchlistCompany+CoreDataClass.swift */, 954D7EA6260BBA6600A13C50 /* WatchlistCompany+CoreDataProperties.swift */, ); @@ -102,7 +100,7 @@ 954D7EAA260BBB0E00A13C50 /* Home */ = { isa = PBXGroup; children = ( - 954D7EAB260BBB2400A13C50 /* HomeView.swift */, + 950C36EE260FBBEB0081CF53 /* HomeView.swift */, 954D7EAF260BBBD500A13C50 /* Helpers */, ); path = Home; @@ -111,8 +109,6 @@ 954D7EAF260BBBD500A13C50 /* Helpers */ = { isa = PBXGroup; children = ( - 954D7EB0260BBBEA00A13C50 /* UserHelper.swift */, - 954D7EC5260BE84100A13C50 /* WatchlistPreviewHelper.swift */, ); path = Helpers; sourceTree = ""; @@ -146,6 +142,7 @@ 95672B8E25DDA54700DCBE4A /* LazyBearApp.swift */, 95AD4A2C26078C1400498079 /* ContentView.swift */, 95672B9725DDA54700DCBE4A /* Persistence.swift */, + 950C36E2260FB6180081CF53 /* HapticsManager.swift */, 95B1874925DDAC4D0068A364 /* Views */, 954D7E9D260BBA5200A13C50 /* Models */, 95201A36260CAD36007D5300 /* Tests */, @@ -265,22 +262,21 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 954D7EAC260BBB2400A13C50 /* HomeView.swift in Sources */, + 950C36E3260FB6180081CF53 /* HapticsManager.swift in Sources */, + 950C36E8260FBB550081CF53 /* UserSettings+CoreDataClass.swift in Sources */, 95201A2F260C9CAF007D5300 /* SignUpView.swift in Sources */, 95672B9825DDA54700DCBE4A /* Persistence.swift in Sources */, + 950C36E9260FBB550081CF53 /* UserSettings+CoreDataProperties.swift in Sources */, 954D7EA8260BBA6600A13C50 /* WatchlistCompany+CoreDataProperties.swift in Sources */, - 95F1E091260CBD0B0076AE63 /* UserSettings+CoreDataClass.swift in Sources */, - 95F1E092260CBD0B0076AE63 /* UserSettings+CoreDataProperties.swift in Sources */, 95BF36AC260E954F00B29E41 /* Avatar.swift in Sources */, 95E512D32607B42200C283E0 /* WelcomeView.swift in Sources */, - 954D7EB1260BBBEA00A13C50 /* UserHelper.swift in Sources */, - 954D7EC6260BE84100A13C50 /* WatchlistPreviewHelper.swift in Sources */, 95BF36AF260E9D4100B29E41 /* AvatarCreator.swift in Sources */, 95AD4A38260794A800498079 /* WhatsNewView.swift in Sources */, 95672B8F25DDA54700DCBE4A /* LazyBearApp.swift in Sources */, 954D7EA7260BBA6600A13C50 /* WatchlistCompany+CoreDataClass.swift in Sources */, 95672B9B25DDA54800DCBE4A /* LazyBear.xcdatamodeld in Sources */, - 95531C79260CBECC00F0916A /* EnvironmentSignUp.swift in Sources */, + 950C36EF260FBBEB0081CF53 /* HomeView.swift in Sources */, + 95531C79260CBECC00F0916A /* FirstAvatar.swift in Sources */, 95AD4A2D26078C1400498079 /* ContentView.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear.xcodeproj/project.xcworkspace/xcuserdata/dennis.xcuserdatad/UserInterfaceState.xcuserstate Binary file LazyBear.xcodeproj/project.xcworkspace/xcuserdata/dennis.xcuserdatad/UserInterfaceState.xcuserstate has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Colors/custom1.colorset/Contents.json --- a/LazyBear/Assets.xcassets/Avatars/Colors/custom1.colorset/Contents.json Sat Mar 27 00:46:17 2021 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,38 +0,0 @@ -{ - "colors" : [ - { - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "1.000", - "blue" : "0xFF", - "green" : "0x6D", - "red" : "0x45" - } - }, - "idiom" : "universal" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "dark" - } - ], - "color" : { - "color-space" : "display-p3", - "components" : { - "alpha" : "1.000", - "blue" : "0.615", - "green" : "0.264", - "red" : "0.190" - } - }, - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Colors/custom2.colorset/Contents.json --- a/LazyBear/Assets.xcassets/Avatars/Colors/custom2.colorset/Contents.json Sat Mar 27 00:46:17 2021 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,38 +0,0 @@ -{ - "colors" : [ - { - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "1.000", - "blue" : "0xFF", - "green" : "0x45", - "red" : "0x5A" - } - }, - "idiom" : "universal" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "dark" - } - ], - "color" : { - "color-space" : "display-p3", - "components" : { - "alpha" : "1.000", - "blue" : "0.517", - "green" : "0.146", - "red" : "0.181" - } - }, - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Colors/custom3.colorset/Contents.json --- a/LazyBear/Assets.xcassets/Avatars/Colors/custom3.colorset/Contents.json Sat Mar 27 00:46:17 2021 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,38 +0,0 @@ -{ - "colors" : [ - { - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "1.000", - "blue" : "0x58", - "green" : "0xBB", - "red" : "0x6D" - } - }, - "idiom" : "universal" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "dark" - } - ], - "color" : { - "color-space" : "display-p3", - "components" : { - "alpha" : "1.000", - "blue" : "0.232", - "green" : "0.428", - "red" : "0.293" - } - }, - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Colors/custom4.colorset/Contents.json --- a/LazyBear/Assets.xcassets/Avatars/Colors/custom4.colorset/Contents.json Sat Mar 27 00:46:17 2021 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,38 +0,0 @@ -{ - "colors" : [ - { - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "1.000", - "blue" : "0x81", - "green" : "0x5D", - "red" : "0xF5" - } - }, - "idiom" : "universal" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "dark" - } - ], - "color" : { - "color-space" : "display-p3", - "components" : { - "alpha" : "1.000", - "blue" : "0.318", - "green" : "0.249", - "red" : "0.558" - } - }, - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Colors/custom5.colorset/Contents.json --- a/LazyBear/Assets.xcassets/Avatars/Colors/custom5.colorset/Contents.json Sat Mar 27 00:46:17 2021 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,38 +0,0 @@ -{ - "colors" : [ - { - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "1.000", - "blue" : "0xCA", - "green" : "0x55", - "red" : "0x75" - } - }, - "idiom" : "universal" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "dark" - } - ], - "color" : { - "color-space" : "display-p3", - "components" : { - "alpha" : "1.000", - "blue" : "0.551", - "green" : "0.242", - "red" : "0.314" - } - }, - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Colors/custom6.colorset/Contents.json --- a/LazyBear/Assets.xcassets/Avatars/Colors/custom6.colorset/Contents.json Sat Mar 27 00:46:17 2021 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,38 +0,0 @@ -{ - "colors" : [ - { - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "1.000", - "blue" : "0x53", - "green" : "0x45", - "red" : "0xE2" - } - }, - "idiom" : "universal" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "dark" - } - ], - "color" : { - "color-space" : "display-p3", - "components" : { - "alpha" : "1.000", - "blue" : "0.235", - "green" : "0.221", - "red" : "0.575" - } - }, - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Colors/custom7.colorset/Contents.json --- a/LazyBear/Assets.xcassets/Avatars/Colors/custom7.colorset/Contents.json Sat Mar 27 00:46:17 2021 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,38 +0,0 @@ -{ - "colors" : [ - { - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "1.000", - "blue" : "0xC7", - "green" : "0xD7", - "red" : "0x54" - } - }, - "idiom" : "universal" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "dark" - } - ], - "color" : { - "color-space" : "display-p3", - "components" : { - "alpha" : "1.000", - "blue" : "0.469", - "green" : "0.500", - "red" : "0.286" - } - }, - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Colors/custom8.colorset/Contents.json --- a/LazyBear/Assets.xcassets/Avatars/Colors/custom8.colorset/Contents.json Sat Mar 27 00:46:17 2021 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,38 +0,0 @@ -{ - "colors" : [ - { - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "1.000", - "blue" : "0x3A", - "green" : "0xB6", - "red" : "0xF3" - } - }, - "idiom" : "universal" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "dark" - } - ], - "color" : { - "color-space" : "display-p3", - "components" : { - "alpha" : "1.000", - "blue" : "0.209", - "green" : "0.468", - "red" : "0.589" - } - }, - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Colors/customColor1.colorset/Contents.json --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/LazyBear/Assets.xcassets/Avatars/Colors/customColor1.colorset/Contents.json Sat Mar 27 20:26:15 2021 +0100 @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0xFF", + "green" : "0x6D", + "red" : "0x45" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "display-p3", + "components" : { + "alpha" : "1.000", + "blue" : "0.615", + "green" : "0.264", + "red" : "0.190" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Colors/customColor2.colorset/Contents.json --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/LazyBear/Assets.xcassets/Avatars/Colors/customColor2.colorset/Contents.json Sat Mar 27 20:26:15 2021 +0100 @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0xFF", + "green" : "0x45", + "red" : "0x5A" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "display-p3", + "components" : { + "alpha" : "1.000", + "blue" : "0.517", + "green" : "0.146", + "red" : "0.181" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Colors/customColor3.colorset/Contents.json --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/LazyBear/Assets.xcassets/Avatars/Colors/customColor3.colorset/Contents.json Sat Mar 27 20:26:15 2021 +0100 @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0x58", + "green" : "0xBB", + "red" : "0x6D" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "display-p3", + "components" : { + "alpha" : "1.000", + "blue" : "0.232", + "green" : "0.428", + "red" : "0.293" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Colors/customColor4.colorset/Contents.json --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/LazyBear/Assets.xcassets/Avatars/Colors/customColor4.colorset/Contents.json Sat Mar 27 20:26:15 2021 +0100 @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0x3A", + "green" : "0xB6", + "red" : "0xF3" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "display-p3", + "components" : { + "alpha" : "1.000", + "blue" : "0.209", + "green" : "0.468", + "red" : "0.589" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Colors/customColor5.colorset/Contents.json --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/LazyBear/Assets.xcassets/Avatars/Colors/customColor5.colorset/Contents.json Sat Mar 27 20:26:15 2021 +0100 @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0xC7", + "green" : "0xD7", + "red" : "0x54" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "display-p3", + "components" : { + "alpha" : "1.000", + "blue" : "0.469", + "green" : "0.500", + "red" : "0.286" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Colors/customColor6.colorset/Contents.json --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/LazyBear/Assets.xcassets/Avatars/Colors/customColor6.colorset/Contents.json Sat Mar 27 20:26:15 2021 +0100 @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0x53", + "green" : "0x45", + "red" : "0xE2" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "display-p3", + "components" : { + "alpha" : "1.000", + "blue" : "0.235", + "green" : "0.221", + "red" : "0.575" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Colors/customColor7.colorset/Contents.json --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/LazyBear/Assets.xcassets/Avatars/Colors/customColor7.colorset/Contents.json Sat Mar 27 20:26:15 2021 +0100 @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0xCA", + "green" : "0x55", + "red" : "0x75" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "display-p3", + "components" : { + "alpha" : "1.000", + "blue" : "0.551", + "green" : "0.242", + "red" : "0.314" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Colors/customColor8.colorset/Contents.json --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/LazyBear/Assets.xcassets/Avatars/Colors/customColor8.colorset/Contents.json Sat Mar 27 20:26:15 2021 +0100 @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0x81", + "green" : "0x5D", + "red" : "0xF5" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "display-p3", + "components" : { + "alpha" : "1.000", + "blue" : "0.318", + "green" : "0.249", + "red" : "0.558" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/Head.imageset/Contents.json --- a/LazyBear/Assets.xcassets/Avatars/Components/Head.imageset/Contents.json Sat Mar 27 00:46:17 2021 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "filename" : "Head.png", - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "Head@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "Head@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/Head.imageset/Head.png Binary file LazyBear/Assets.xcassets/Avatars/Components/Head.imageset/Head.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/Head.imageset/Head@2x.png Binary file LazyBear/Assets.xcassets/Avatars/Components/Head.imageset/Head@2x.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/Head.imageset/Head@3x.png Binary file LazyBear/Assets.xcassets/Avatars/Components/Head.imageset/Head@3x.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/body1.imageset/BodyCheckered.png Binary file LazyBear/Assets.xcassets/Avatars/Components/body1.imageset/BodyCheckered.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/body1.imageset/BodyCheckered@2x.png Binary file LazyBear/Assets.xcassets/Avatars/Components/body1.imageset/BodyCheckered@2x.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/body1.imageset/BodyCheckered@3x.png Binary file LazyBear/Assets.xcassets/Avatars/Components/body1.imageset/BodyCheckered@3x.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/body1.imageset/Contents.json --- a/LazyBear/Assets.xcassets/Avatars/Components/body1.imageset/Contents.json Sat Mar 27 00:46:17 2021 +0100 +++ b/LazyBear/Assets.xcassets/Avatars/Components/body1.imageset/Contents.json Sat Mar 27 20:26:15 2021 +0100 @@ -1,17 +1,15 @@ { "images" : [ { - "filename" : "BodyCheckered.png", + "filename" : "body1.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "BodyCheckered@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "BodyCheckered@3x.png", "idiom" : "universal", "scale" : "3x" } diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/body1.imageset/body1.png Binary file LazyBear/Assets.xcassets/Avatars/Components/body1.imageset/body1.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/body2.imageset/BodyRounded.png Binary file LazyBear/Assets.xcassets/Avatars/Components/body2.imageset/BodyRounded.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/body2.imageset/BodyRounded@2x.png Binary file LazyBear/Assets.xcassets/Avatars/Components/body2.imageset/BodyRounded@2x.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/body2.imageset/BodyRounded@3x.png Binary file LazyBear/Assets.xcassets/Avatars/Components/body2.imageset/BodyRounded@3x.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/body2.imageset/Contents.json --- a/LazyBear/Assets.xcassets/Avatars/Components/body2.imageset/Contents.json Sat Mar 27 00:46:17 2021 +0100 +++ b/LazyBear/Assets.xcassets/Avatars/Components/body2.imageset/Contents.json Sat Mar 27 20:26:15 2021 +0100 @@ -1,17 +1,15 @@ { "images" : [ { - "filename" : "BodyRounded.png", + "filename" : "body2.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "BodyRounded@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "BodyRounded@3x.png", "idiom" : "universal", "scale" : "3x" } diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/body2.imageset/body2.png Binary file LazyBear/Assets.xcassets/Avatars/Components/body2.imageset/body2.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/body3.imageset/BodySmall.png Binary file LazyBear/Assets.xcassets/Avatars/Components/body3.imageset/BodySmall.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/body3.imageset/BodySmall@2x.png Binary file LazyBear/Assets.xcassets/Avatars/Components/body3.imageset/BodySmall@2x.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/body3.imageset/BodySmall@3x.png Binary file LazyBear/Assets.xcassets/Avatars/Components/body3.imageset/BodySmall@3x.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/body3.imageset/Contents.json --- a/LazyBear/Assets.xcassets/Avatars/Components/body3.imageset/Contents.json Sat Mar 27 00:46:17 2021 +0100 +++ b/LazyBear/Assets.xcassets/Avatars/Components/body3.imageset/Contents.json Sat Mar 27 20:26:15 2021 +0100 @@ -1,17 +1,15 @@ { "images" : [ { - "filename" : "BodySmall.png", + "filename" : "body3.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "BodySmall@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "BodySmall@3x.png", "idiom" : "universal", "scale" : "3x" } diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/body3.imageset/body3.png Binary file LazyBear/Assets.xcassets/Avatars/Components/body3.imageset/body3.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/body4.imageset/BodySquared.png Binary file LazyBear/Assets.xcassets/Avatars/Components/body4.imageset/BodySquared.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/body4.imageset/BodySquared@2x.png Binary file LazyBear/Assets.xcassets/Avatars/Components/body4.imageset/BodySquared@2x.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/body4.imageset/BodySquared@3x.png Binary file LazyBear/Assets.xcassets/Avatars/Components/body4.imageset/BodySquared@3x.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/body4.imageset/Contents.json --- a/LazyBear/Assets.xcassets/Avatars/Components/body4.imageset/Contents.json Sat Mar 27 00:46:17 2021 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "filename" : "BodySquared.png", - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "BodySquared@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "BodySquared@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/eyes1.imageset/Contents.json --- a/LazyBear/Assets.xcassets/Avatars/Components/eyes1.imageset/Contents.json Sat Mar 27 00:46:17 2021 +0100 +++ b/LazyBear/Assets.xcassets/Avatars/Components/eyes1.imageset/Contents.json Sat Mar 27 20:26:15 2021 +0100 @@ -1,17 +1,15 @@ { "images" : [ { - "filename" : "EyesGlasses.png", + "filename" : "eyes1.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "EyesGlasses@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "EyesGlasses@3x.png", "idiom" : "universal", "scale" : "3x" } diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/eyes1.imageset/EyesGlasses.png Binary file LazyBear/Assets.xcassets/Avatars/Components/eyes1.imageset/EyesGlasses.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/eyes1.imageset/EyesGlasses@2x.png Binary file LazyBear/Assets.xcassets/Avatars/Components/eyes1.imageset/EyesGlasses@2x.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/eyes1.imageset/EyesGlasses@3x.png Binary file LazyBear/Assets.xcassets/Avatars/Components/eyes1.imageset/EyesGlasses@3x.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/eyes1.imageset/eyes1.png Binary file LazyBear/Assets.xcassets/Avatars/Components/eyes1.imageset/eyes1.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/eyes2.imageset/Contents.json --- a/LazyBear/Assets.xcassets/Avatars/Components/eyes2.imageset/Contents.json Sat Mar 27 00:46:17 2021 +0100 +++ b/LazyBear/Assets.xcassets/Avatars/Components/eyes2.imageset/Contents.json Sat Mar 27 20:26:15 2021 +0100 @@ -1,17 +1,15 @@ { "images" : [ { - "filename" : "EyesHappy.png", + "filename" : "eyes2.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "EyesHappy@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "EyesHappy@3x.png", "idiom" : "universal", "scale" : "3x" } diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/eyes2.imageset/EyesHappy.png Binary file LazyBear/Assets.xcassets/Avatars/Components/eyes2.imageset/EyesHappy.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/eyes2.imageset/EyesHappy@2x.png Binary file LazyBear/Assets.xcassets/Avatars/Components/eyes2.imageset/EyesHappy@2x.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/eyes2.imageset/EyesHappy@3x.png Binary file LazyBear/Assets.xcassets/Avatars/Components/eyes2.imageset/EyesHappy@3x.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/eyes2.imageset/eyes2.png Binary file LazyBear/Assets.xcassets/Avatars/Components/eyes2.imageset/eyes2.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/eyes3.imageset/Contents.json --- a/LazyBear/Assets.xcassets/Avatars/Components/eyes3.imageset/Contents.json Sat Mar 27 00:46:17 2021 +0100 +++ b/LazyBear/Assets.xcassets/Avatars/Components/eyes3.imageset/Contents.json Sat Mar 27 20:26:15 2021 +0100 @@ -1,17 +1,15 @@ { "images" : [ { - "filename" : "EyesOpen.png", + "filename" : "eyes3.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "EyesOpen@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "EyesOpen@3x.png", "idiom" : "universal", "scale" : "3x" } diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/eyes3.imageset/EyesOpen.png Binary file LazyBear/Assets.xcassets/Avatars/Components/eyes3.imageset/EyesOpen.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/eyes3.imageset/EyesOpen@2x.png Binary file LazyBear/Assets.xcassets/Avatars/Components/eyes3.imageset/EyesOpen@2x.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/eyes3.imageset/EyesOpen@3x.png Binary file LazyBear/Assets.xcassets/Avatars/Components/eyes3.imageset/EyesOpen@3x.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/eyes3.imageset/eyes3.png Binary file LazyBear/Assets.xcassets/Avatars/Components/eyes3.imageset/eyes3.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/eyes4.imageset/Contents.json --- a/LazyBear/Assets.xcassets/Avatars/Components/eyes4.imageset/Contents.json Sat Mar 27 00:46:17 2021 +0100 +++ b/LazyBear/Assets.xcassets/Avatars/Components/eyes4.imageset/Contents.json Sat Mar 27 20:26:15 2021 +0100 @@ -1,17 +1,15 @@ { "images" : [ { - "filename" : "EyesSleep.png", + "filename" : "eyes4.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "EyesSleep@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "EyesSleep@3x.png", "idiom" : "universal", "scale" : "3x" } diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/eyes4.imageset/EyesSleep.png Binary file LazyBear/Assets.xcassets/Avatars/Components/eyes4.imageset/EyesSleep.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/eyes4.imageset/EyesSleep@2x.png Binary file LazyBear/Assets.xcassets/Avatars/Components/eyes4.imageset/EyesSleep@2x.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/eyes4.imageset/EyesSleep@3x.png Binary file LazyBear/Assets.xcassets/Avatars/Components/eyes4.imageset/EyesSleep@3x.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/eyes4.imageset/eyes4.png Binary file LazyBear/Assets.xcassets/Avatars/Components/eyes4.imageset/eyes4.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/eyes5.imageset/Contents.json --- a/LazyBear/Assets.xcassets/Avatars/Components/eyes5.imageset/Contents.json Sat Mar 27 00:46:17 2021 +0100 +++ b/LazyBear/Assets.xcassets/Avatars/Components/eyes5.imageset/Contents.json Sat Mar 27 20:26:15 2021 +0100 @@ -1,17 +1,15 @@ { "images" : [ { - "filename" : "EyesSunglasses.png", + "filename" : "eyes5.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "EyesSunglasses@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "EyesSunglasses@3x.png", "idiom" : "universal", "scale" : "3x" } diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/eyes5.imageset/EyesSunglasses.png Binary file LazyBear/Assets.xcassets/Avatars/Components/eyes5.imageset/EyesSunglasses.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/eyes5.imageset/EyesSunglasses@2x.png Binary file LazyBear/Assets.xcassets/Avatars/Components/eyes5.imageset/EyesSunglasses@2x.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/eyes5.imageset/EyesSunglasses@3x.png Binary file LazyBear/Assets.xcassets/Avatars/Components/eyes5.imageset/EyesSunglasses@3x.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/eyes5.imageset/eyes5.png Binary file LazyBear/Assets.xcassets/Avatars/Components/eyes5.imageset/eyes5.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/eyes6.imageset/Contents.json --- a/LazyBear/Assets.xcassets/Avatars/Components/eyes6.imageset/Contents.json Sat Mar 27 00:46:17 2021 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "filename" : "EyesWink.png", - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "EyesWink@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "EyesWink@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/eyes6.imageset/EyesWink.png Binary file LazyBear/Assets.xcassets/Avatars/Components/eyes6.imageset/EyesWink.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/eyes6.imageset/EyesWink@2x.png Binary file LazyBear/Assets.xcassets/Avatars/Components/eyes6.imageset/EyesWink@2x.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/eyes6.imageset/EyesWink@3x.png Binary file LazyBear/Assets.xcassets/Avatars/Components/eyes6.imageset/EyesWink@3x.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/facialHair1.imageset/Contents.json --- a/LazyBear/Assets.xcassets/Avatars/Components/facialHair1.imageset/Contents.json Sat Mar 27 00:46:17 2021 +0100 +++ b/LazyBear/Assets.xcassets/Avatars/Components/facialHair1.imageset/Contents.json Sat Mar 27 20:26:15 2021 +0100 @@ -1,17 +1,15 @@ { "images" : [ { - "filename" : "FacialHairBeardMustache.png", + "filename" : "facialHair1.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "FacialHairBeardMustache@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "FacialHairBeardMustache@3x.png", "idiom" : "universal", "scale" : "3x" } diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/facialHair1.imageset/FacialHairBeardMustache.png Binary file LazyBear/Assets.xcassets/Avatars/Components/facialHair1.imageset/FacialHairBeardMustache.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/facialHair1.imageset/FacialHairBeardMustache@2x.png Binary file LazyBear/Assets.xcassets/Avatars/Components/facialHair1.imageset/FacialHairBeardMustache@2x.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/facialHair1.imageset/FacialHairBeardMustache@3x.png Binary file LazyBear/Assets.xcassets/Avatars/Components/facialHair1.imageset/FacialHairBeardMustache@3x.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/facialHair1.imageset/facialHair1.png Binary file LazyBear/Assets.xcassets/Avatars/Components/facialHair1.imageset/facialHair1.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/facialHair2.imageset/Contents.json --- a/LazyBear/Assets.xcassets/Avatars/Components/facialHair2.imageset/Contents.json Sat Mar 27 00:46:17 2021 +0100 +++ b/LazyBear/Assets.xcassets/Avatars/Components/facialHair2.imageset/Contents.json Sat Mar 27 20:26:15 2021 +0100 @@ -1,17 +1,15 @@ { "images" : [ { - "filename" : "FacialHairGoatee.png", + "filename" : "facialHair2.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "FacialHairGoatee@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "FacialHairGoatee@3x.png", "idiom" : "universal", "scale" : "3x" } diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/facialHair2.imageset/FacialHairGoatee.png Binary file LazyBear/Assets.xcassets/Avatars/Components/facialHair2.imageset/FacialHairGoatee.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/facialHair2.imageset/FacialHairGoatee@2x.png Binary file LazyBear/Assets.xcassets/Avatars/Components/facialHair2.imageset/FacialHairGoatee@2x.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/facialHair2.imageset/FacialHairGoatee@3x.png Binary file LazyBear/Assets.xcassets/Avatars/Components/facialHair2.imageset/FacialHairGoatee@3x.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/facialHair2.imageset/facialHair2.png Binary file LazyBear/Assets.xcassets/Avatars/Components/facialHair2.imageset/facialHair2.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/facialHair3.imageset/Contents.json --- a/LazyBear/Assets.xcassets/Avatars/Components/facialHair3.imageset/Contents.json Sat Mar 27 00:46:17 2021 +0100 +++ b/LazyBear/Assets.xcassets/Avatars/Components/facialHair3.imageset/Contents.json Sat Mar 27 20:26:15 2021 +0100 @@ -1,17 +1,15 @@ { "images" : [ { - "filename" : "FacialHairPyramid.png", + "filename" : "facialHair3.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "FacialHairPyramid@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "FacialHairPyramid@3x.png", "idiom" : "universal", "scale" : "3x" } diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/facialHair3.imageset/FacialHairPyramid.png Binary file LazyBear/Assets.xcassets/Avatars/Components/facialHair3.imageset/FacialHairPyramid.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/facialHair3.imageset/FacialHairPyramid@2x.png Binary file LazyBear/Assets.xcassets/Avatars/Components/facialHair3.imageset/FacialHairPyramid@2x.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/facialHair3.imageset/FacialHairPyramid@3x.png Binary file LazyBear/Assets.xcassets/Avatars/Components/facialHair3.imageset/FacialHairPyramid@3x.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/facialHair3.imageset/facialHair3.png Binary file LazyBear/Assets.xcassets/Avatars/Components/facialHair3.imageset/facialHair3.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/facialHair4.imageset/Contents.json --- a/LazyBear/Assets.xcassets/Avatars/Components/facialHair4.imageset/Contents.json Sat Mar 27 00:46:17 2021 +0100 +++ b/LazyBear/Assets.xcassets/Avatars/Components/facialHair4.imageset/Contents.json Sat Mar 27 20:26:15 2021 +0100 @@ -1,17 +1,15 @@ { "images" : [ { - "filename" : "FacialHairShadow.png", + "filename" : "facialHair4.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "FacialHairShadow@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "FacialHairShadow@3x.png", "idiom" : "universal", "scale" : "3x" } diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/facialHair4.imageset/FacialHairShadow.png Binary file LazyBear/Assets.xcassets/Avatars/Components/facialHair4.imageset/FacialHairShadow.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/facialHair4.imageset/FacialHairShadow@2x.png Binary file LazyBear/Assets.xcassets/Avatars/Components/facialHair4.imageset/FacialHairShadow@2x.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/facialHair4.imageset/FacialHairShadow@3x.png Binary file LazyBear/Assets.xcassets/Avatars/Components/facialHair4.imageset/FacialHairShadow@3x.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/facialHair4.imageset/facialHair4.png Binary file LazyBear/Assets.xcassets/Avatars/Components/facialHair4.imageset/facialHair4.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/facialHair5.imageset/Contents.json --- a/LazyBear/Assets.xcassets/Avatars/Components/facialHair5.imageset/Contents.json Sat Mar 27 00:46:17 2021 +0100 +++ b/LazyBear/Assets.xcassets/Avatars/Components/facialHair5.imageset/Contents.json Sat Mar 27 20:26:15 2021 +0100 @@ -1,17 +1,15 @@ { "images" : [ { - "filename" : "FacialHairSoulPatch.png", + "filename" : "facialHair5.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "FacialHairSoulPatch@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "FacialHairSoulPatch@3x.png", "idiom" : "universal", "scale" : "3x" } diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/facialHair5.imageset/FacialHairSoulPatch.png Binary file LazyBear/Assets.xcassets/Avatars/Components/facialHair5.imageset/FacialHairSoulPatch.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/facialHair5.imageset/FacialHairSoulPatch@2x.png Binary file LazyBear/Assets.xcassets/Avatars/Components/facialHair5.imageset/FacialHairSoulPatch@2x.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/facialHair5.imageset/FacialHairSoulPatch@3x.png Binary file LazyBear/Assets.xcassets/Avatars/Components/facialHair5.imageset/FacialHairSoulPatch@3x.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/facialHair5.imageset/facialHair5.png Binary file LazyBear/Assets.xcassets/Avatars/Components/facialHair5.imageset/facialHair5.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/facialHair6.imageset/Contents.json --- a/LazyBear/Assets.xcassets/Avatars/Components/facialHair6.imageset/Contents.json Sat Mar 27 00:46:17 2021 +0100 +++ b/LazyBear/Assets.xcassets/Avatars/Components/facialHair6.imageset/Contents.json Sat Mar 27 20:26:15 2021 +0100 @@ -1,17 +1,15 @@ { "images" : [ { - "filename" : "FacialHairWalrus.png", + "filename" : "facialHair6.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "FacialHairWalrus@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "FacialHairWalrus@3x.png", "idiom" : "universal", "scale" : "3x" } diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/facialHair6.imageset/FacialHairWalrus.png Binary file LazyBear/Assets.xcassets/Avatars/Components/facialHair6.imageset/FacialHairWalrus.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/facialHair6.imageset/FacialHairWalrus@2x.png Binary file LazyBear/Assets.xcassets/Avatars/Components/facialHair6.imageset/FacialHairWalrus@2x.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/facialHair6.imageset/FacialHairWalrus@3x.png Binary file LazyBear/Assets.xcassets/Avatars/Components/facialHair6.imageset/FacialHairWalrus@3x.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/facialHair6.imageset/facialHair6.png Binary file LazyBear/Assets.xcassets/Avatars/Components/facialHair6.imageset/facialHair6.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/hair1.imageset/Contents.json --- a/LazyBear/Assets.xcassets/Avatars/Components/hair1.imageset/Contents.json Sat Mar 27 00:46:17 2021 +0100 +++ b/LazyBear/Assets.xcassets/Avatars/Components/hair1.imageset/Contents.json Sat Mar 27 20:26:15 2021 +0100 @@ -1,17 +1,15 @@ { "images" : [ { - "filename" : "HairBald.png", + "filename" : "hair1.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "HairBald@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "HairBald@3x.png", "idiom" : "universal", "scale" : "3x" } diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/hair1.imageset/HairBald.png Binary file LazyBear/Assets.xcassets/Avatars/Components/hair1.imageset/HairBald.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/hair1.imageset/HairBald@2x.png Binary file LazyBear/Assets.xcassets/Avatars/Components/hair1.imageset/HairBald@2x.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/hair1.imageset/HairBald@3x.png Binary file LazyBear/Assets.xcassets/Avatars/Components/hair1.imageset/HairBald@3x.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/hair1.imageset/hair1.png Binary file LazyBear/Assets.xcassets/Avatars/Components/hair1.imageset/hair1.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/hair10.imageset/Contents.json --- a/LazyBear/Assets.xcassets/Avatars/Components/hair10.imageset/Contents.json Sat Mar 27 00:46:17 2021 +0100 +++ b/LazyBear/Assets.xcassets/Avatars/Components/hair10.imageset/Contents.json Sat Mar 27 20:26:15 2021 +0100 @@ -1,17 +1,15 @@ { "images" : [ { - "filename" : "HairCurlyBun.png", + "filename" : "hair10.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "HairCurlyBun@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "HairCurlyBun@3x.png", "idiom" : "universal", "scale" : "3x" } diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/hair10.imageset/HairCurlyBun.png Binary file LazyBear/Assets.xcassets/Avatars/Components/hair10.imageset/HairCurlyBun.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/hair10.imageset/HairCurlyBun@2x.png Binary file LazyBear/Assets.xcassets/Avatars/Components/hair10.imageset/HairCurlyBun@2x.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/hair10.imageset/HairCurlyBun@3x.png Binary file LazyBear/Assets.xcassets/Avatars/Components/hair10.imageset/HairCurlyBun@3x.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/hair10.imageset/hair10.png Binary file LazyBear/Assets.xcassets/Avatars/Components/hair10.imageset/hair10.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/hair11.imageset/Contents.json --- a/LazyBear/Assets.xcassets/Avatars/Components/hair11.imageset/Contents.json Sat Mar 27 00:46:17 2021 +0100 +++ b/LazyBear/Assets.xcassets/Avatars/Components/hair11.imageset/Contents.json Sat Mar 27 20:26:15 2021 +0100 @@ -1,17 +1,15 @@ { "images" : [ { - "filename" : "HairCurlyHighTop.png", + "filename" : "hair11.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "HairCurlyHighTop@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "HairCurlyHighTop@3x.png", "idiom" : "universal", "scale" : "3x" } diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/hair11.imageset/HairCurlyHighTop.png Binary file LazyBear/Assets.xcassets/Avatars/Components/hair11.imageset/HairCurlyHighTop.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/hair11.imageset/HairCurlyHighTop@2x.png Binary file LazyBear/Assets.xcassets/Avatars/Components/hair11.imageset/HairCurlyHighTop@2x.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/hair11.imageset/HairCurlyHighTop@3x.png Binary file LazyBear/Assets.xcassets/Avatars/Components/hair11.imageset/HairCurlyHighTop@3x.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/hair11.imageset/hair11.png Binary file LazyBear/Assets.xcassets/Avatars/Components/hair11.imageset/hair11.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/hair12.imageset/Contents.json --- a/LazyBear/Assets.xcassets/Avatars/Components/hair12.imageset/Contents.json Sat Mar 27 00:46:17 2021 +0100 +++ b/LazyBear/Assets.xcassets/Avatars/Components/hair12.imageset/Contents.json Sat Mar 27 20:26:15 2021 +0100 @@ -1,17 +1,15 @@ { "images" : [ { - "filename" : "HairExtraLong.png", + "filename" : "hair12.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "HairExtraLong@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "HairExtraLong@3x.png", "idiom" : "universal", "scale" : "3x" } diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/hair12.imageset/HairExtraLong.png Binary file LazyBear/Assets.xcassets/Avatars/Components/hair12.imageset/HairExtraLong.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/hair12.imageset/HairExtraLong@2x.png Binary file LazyBear/Assets.xcassets/Avatars/Components/hair12.imageset/HairExtraLong@2x.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/hair12.imageset/HairExtraLong@3x.png Binary file LazyBear/Assets.xcassets/Avatars/Components/hair12.imageset/HairExtraLong@3x.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/hair12.imageset/hair12.png Binary file LazyBear/Assets.xcassets/Avatars/Components/hair12.imageset/hair12.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/hair13.imageset/Contents.json --- a/LazyBear/Assets.xcassets/Avatars/Components/hair13.imageset/Contents.json Sat Mar 27 00:46:17 2021 +0100 +++ b/LazyBear/Assets.xcassets/Avatars/Components/hair13.imageset/Contents.json Sat Mar 27 20:26:15 2021 +0100 @@ -1,17 +1,15 @@ { "images" : [ { - "filename" : "HairFade.png", + "filename" : "hair13.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "HairFade@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "HairFade@3x.png", "idiom" : "universal", "scale" : "3x" } diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/hair13.imageset/HairFade.png Binary file LazyBear/Assets.xcassets/Avatars/Components/hair13.imageset/HairFade.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/hair13.imageset/HairFade@2x.png Binary file LazyBear/Assets.xcassets/Avatars/Components/hair13.imageset/HairFade@2x.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/hair13.imageset/HairFade@3x.png Binary file LazyBear/Assets.xcassets/Avatars/Components/hair13.imageset/HairFade@3x.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/hair13.imageset/hair13.png Binary file LazyBear/Assets.xcassets/Avatars/Components/hair13.imageset/hair13.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/hair14.imageset/Contents.json --- a/LazyBear/Assets.xcassets/Avatars/Components/hair14.imageset/Contents.json Sat Mar 27 00:46:17 2021 +0100 +++ b/LazyBear/Assets.xcassets/Avatars/Components/hair14.imageset/Contents.json Sat Mar 27 20:26:15 2021 +0100 @@ -1,17 +1,15 @@ { "images" : [ { - "filename" : "HairLong.png", + "filename" : "hair14.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "HairLong@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "HairLong@3x.png", "idiom" : "universal", "scale" : "3x" } diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/hair14.imageset/HairLong.png Binary file LazyBear/Assets.xcassets/Avatars/Components/hair14.imageset/HairLong.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/hair14.imageset/HairLong@2x.png Binary file LazyBear/Assets.xcassets/Avatars/Components/hair14.imageset/HairLong@2x.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/hair14.imageset/HairLong@3x.png Binary file LazyBear/Assets.xcassets/Avatars/Components/hair14.imageset/HairLong@3x.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/hair14.imageset/hair14.png Binary file LazyBear/Assets.xcassets/Avatars/Components/hair14.imageset/hair14.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/hair15.imageset/Contents.json --- a/LazyBear/Assets.xcassets/Avatars/Components/hair15.imageset/Contents.json Sat Mar 27 00:46:17 2021 +0100 +++ b/LazyBear/Assets.xcassets/Avatars/Components/hair15.imageset/Contents.json Sat Mar 27 20:26:15 2021 +0100 @@ -1,17 +1,15 @@ { "images" : [ { - "filename" : "HairMohawk.png", + "filename" : "hair15.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "HairMohawk@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "HairMohawk@3x.png", "idiom" : "universal", "scale" : "3x" } diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/hair15.imageset/HairMohawk.png Binary file LazyBear/Assets.xcassets/Avatars/Components/hair15.imageset/HairMohawk.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/hair15.imageset/HairMohawk@2x.png Binary file LazyBear/Assets.xcassets/Avatars/Components/hair15.imageset/HairMohawk@2x.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/hair15.imageset/HairMohawk@3x.png Binary file LazyBear/Assets.xcassets/Avatars/Components/hair15.imageset/HairMohawk@3x.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/hair15.imageset/hair15.png Binary file LazyBear/Assets.xcassets/Avatars/Components/hair15.imageset/hair15.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/hair16.imageset/Contents.json --- a/LazyBear/Assets.xcassets/Avatars/Components/hair16.imageset/Contents.json Sat Mar 27 00:46:17 2021 +0100 +++ b/LazyBear/Assets.xcassets/Avatars/Components/hair16.imageset/Contents.json Sat Mar 27 20:26:15 2021 +0100 @@ -1,17 +1,15 @@ { "images" : [ { - "filename" : "HairPigtails.png", + "filename" : "hair16.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "HairPigtails@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "HairPigtails@3x.png", "idiom" : "universal", "scale" : "3x" } diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/hair16.imageset/HairPigtails.png Binary file LazyBear/Assets.xcassets/Avatars/Components/hair16.imageset/HairPigtails.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/hair16.imageset/HairPigtails@2x.png Binary file LazyBear/Assets.xcassets/Avatars/Components/hair16.imageset/HairPigtails@2x.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/hair16.imageset/HairPigtails@3x.png Binary file LazyBear/Assets.xcassets/Avatars/Components/hair16.imageset/HairPigtails@3x.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/hair16.imageset/hair16.png Binary file LazyBear/Assets.xcassets/Avatars/Components/hair16.imageset/hair16.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/hair17.imageset/Contents.json --- a/LazyBear/Assets.xcassets/Avatars/Components/hair17.imageset/Contents.json Sat Mar 27 00:46:17 2021 +0100 +++ b/LazyBear/Assets.xcassets/Avatars/Components/hair17.imageset/Contents.json Sat Mar 27 20:26:15 2021 +0100 @@ -1,17 +1,15 @@ { "images" : [ { - "filename" : "HairShortCombover.png", + "filename" : "hair17.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "HairShortCombover@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "HairShortCombover@3x.png", "idiom" : "universal", "scale" : "3x" } diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/hair17.imageset/HairShortCombover.png Binary file LazyBear/Assets.xcassets/Avatars/Components/hair17.imageset/HairShortCombover.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/hair17.imageset/HairShortCombover@2x.png Binary file LazyBear/Assets.xcassets/Avatars/Components/hair17.imageset/HairShortCombover@2x.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/hair17.imageset/HairShortCombover@3x.png Binary file LazyBear/Assets.xcassets/Avatars/Components/hair17.imageset/HairShortCombover@3x.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/hair17.imageset/hair17.png Binary file LazyBear/Assets.xcassets/Avatars/Components/hair17.imageset/hair17.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/hair18.imageset/Contents.json --- a/LazyBear/Assets.xcassets/Avatars/Components/hair18.imageset/Contents.json Sat Mar 27 00:46:17 2021 +0100 +++ b/LazyBear/Assets.xcassets/Avatars/Components/hair18.imageset/Contents.json Sat Mar 27 20:26:15 2021 +0100 @@ -1,17 +1,15 @@ { "images" : [ { - "filename" : "HairShortComboverChops.png", + "filename" : "hair18.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "HairShortComboverChops@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "HairShortComboverChops@3x.png", "idiom" : "universal", "scale" : "3x" } diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/hair18.imageset/HairShortComboverChops.png Binary file LazyBear/Assets.xcassets/Avatars/Components/hair18.imageset/HairShortComboverChops.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/hair18.imageset/HairShortComboverChops@2x.png Binary file LazyBear/Assets.xcassets/Avatars/Components/hair18.imageset/HairShortComboverChops@2x.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/hair18.imageset/HairShortComboverChops@3x.png Binary file LazyBear/Assets.xcassets/Avatars/Components/hair18.imageset/HairShortComboverChops@3x.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/hair18.imageset/hair18.png Binary file LazyBear/Assets.xcassets/Avatars/Components/hair18.imageset/hair18.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/hair19.imageset/Contents.json --- a/LazyBear/Assets.xcassets/Avatars/Components/hair19.imageset/Contents.json Sat Mar 27 00:46:17 2021 +0100 +++ b/LazyBear/Assets.xcassets/Avatars/Components/hair19.imageset/Contents.json Sat Mar 27 20:26:15 2021 +0100 @@ -1,17 +1,15 @@ { "images" : [ { - "filename" : "HairSideShave.png", + "filename" : "hair19.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "HairSideShave@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "HairSideShave@3x.png", "idiom" : "universal", "scale" : "3x" } diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/hair19.imageset/HairSideShave.png Binary file LazyBear/Assets.xcassets/Avatars/Components/hair19.imageset/HairSideShave.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/hair19.imageset/HairSideShave@2x.png Binary file LazyBear/Assets.xcassets/Avatars/Components/hair19.imageset/HairSideShave@2x.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/hair19.imageset/HairSideShave@3x.png Binary file LazyBear/Assets.xcassets/Avatars/Components/hair19.imageset/HairSideShave@3x.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/hair19.imageset/hair19.png Binary file LazyBear/Assets.xcassets/Avatars/Components/hair19.imageset/hair19.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/hair2.imageset/Contents.json --- a/LazyBear/Assets.xcassets/Avatars/Components/hair2.imageset/Contents.json Sat Mar 27 00:46:17 2021 +0100 +++ b/LazyBear/Assets.xcassets/Avatars/Components/hair2.imageset/Contents.json Sat Mar 27 20:26:15 2021 +0100 @@ -1,17 +1,15 @@ { "images" : [ { - "filename" : "HairBalding.png", + "filename" : "hair2.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "HairBalding@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "HairBalding@3x.png", "idiom" : "universal", "scale" : "3x" } diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/hair2.imageset/HairBalding.png Binary file LazyBear/Assets.xcassets/Avatars/Components/hair2.imageset/HairBalding.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/hair2.imageset/HairBalding@2x.png Binary file LazyBear/Assets.xcassets/Avatars/Components/hair2.imageset/HairBalding@2x.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/hair2.imageset/HairBalding@3x.png Binary file LazyBear/Assets.xcassets/Avatars/Components/hair2.imageset/HairBalding@3x.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/hair2.imageset/hair2.png Binary file LazyBear/Assets.xcassets/Avatars/Components/hair2.imageset/hair2.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/hair20.imageset/Contents.json --- a/LazyBear/Assets.xcassets/Avatars/Components/hair20.imageset/Contents.json Sat Mar 27 00:46:17 2021 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "filename" : "HairStraightBun.png", - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "HairStraightBun@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "HairStraightBun@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/hair20.imageset/HairStraightBun.png Binary file LazyBear/Assets.xcassets/Avatars/Components/hair20.imageset/HairStraightBun.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/hair20.imageset/HairStraightBun@2x.png Binary file LazyBear/Assets.xcassets/Avatars/Components/hair20.imageset/HairStraightBun@2x.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/hair20.imageset/HairStraightBun@3x.png Binary file LazyBear/Assets.xcassets/Avatars/Components/hair20.imageset/HairStraightBun@3x.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/hair3.imageset/Contents.json --- a/LazyBear/Assets.xcassets/Avatars/Components/hair3.imageset/Contents.json Sat Mar 27 00:46:17 2021 +0100 +++ b/LazyBear/Assets.xcassets/Avatars/Components/hair3.imageset/Contents.json Sat Mar 27 20:26:15 2021 +0100 @@ -1,17 +1,15 @@ { "images" : [ { - "filename" : "HairBeanie.png", + "filename" : "hair3.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "HairBeanie@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "HairBeanie@3x.png", "idiom" : "universal", "scale" : "3x" } diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/hair3.imageset/HairBeanie.png Binary file LazyBear/Assets.xcassets/Avatars/Components/hair3.imageset/HairBeanie.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/hair3.imageset/HairBeanie@2x.png Binary file LazyBear/Assets.xcassets/Avatars/Components/hair3.imageset/HairBeanie@2x.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/hair3.imageset/HairBeanie@3x.png Binary file LazyBear/Assets.xcassets/Avatars/Components/hair3.imageset/HairBeanie@3x.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/hair3.imageset/hair3.png Binary file LazyBear/Assets.xcassets/Avatars/Components/hair3.imageset/hair3.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/hair4.imageset/Contents.json --- a/LazyBear/Assets.xcassets/Avatars/Components/hair4.imageset/Contents.json Sat Mar 27 00:46:17 2021 +0100 +++ b/LazyBear/Assets.xcassets/Avatars/Components/hair4.imageset/Contents.json Sat Mar 27 20:26:15 2021 +0100 @@ -1,17 +1,15 @@ { "images" : [ { - "filename" : "HairBobBangs.png", + "filename" : "hair4.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "HairBobBangs@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "HairBobBangs@3x.png", "idiom" : "universal", "scale" : "3x" } diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/hair4.imageset/HairBobBangs.png Binary file LazyBear/Assets.xcassets/Avatars/Components/hair4.imageset/HairBobBangs.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/hair4.imageset/HairBobBangs@2x.png Binary file LazyBear/Assets.xcassets/Avatars/Components/hair4.imageset/HairBobBangs@2x.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/hair4.imageset/HairBobBangs@3x.png Binary file LazyBear/Assets.xcassets/Avatars/Components/hair4.imageset/HairBobBangs@3x.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/hair4.imageset/hair4.png Binary file LazyBear/Assets.xcassets/Avatars/Components/hair4.imageset/hair4.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/hair5.imageset/Contents.json --- a/LazyBear/Assets.xcassets/Avatars/Components/hair5.imageset/Contents.json Sat Mar 27 00:46:17 2021 +0100 +++ b/LazyBear/Assets.xcassets/Avatars/Components/hair5.imageset/Contents.json Sat Mar 27 20:26:15 2021 +0100 @@ -1,17 +1,15 @@ { "images" : [ { - "filename" : "HairBobCut.png", + "filename" : "hair5.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "HairBobCut@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "HairBobCut@3x.png", "idiom" : "universal", "scale" : "3x" } diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/hair5.imageset/HairBobCut.png Binary file LazyBear/Assets.xcassets/Avatars/Components/hair5.imageset/HairBobCut.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/hair5.imageset/HairBobCut@2x.png Binary file LazyBear/Assets.xcassets/Avatars/Components/hair5.imageset/HairBobCut@2x.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/hair5.imageset/HairBobCut@3x.png Binary file LazyBear/Assets.xcassets/Avatars/Components/hair5.imageset/HairBobCut@3x.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/hair5.imageset/hair5.png Binary file LazyBear/Assets.xcassets/Avatars/Components/hair5.imageset/hair5.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/hair6.imageset/Contents.json --- a/LazyBear/Assets.xcassets/Avatars/Components/hair6.imageset/Contents.json Sat Mar 27 00:46:17 2021 +0100 +++ b/LazyBear/Assets.xcassets/Avatars/Components/hair6.imageset/Contents.json Sat Mar 27 20:26:15 2021 +0100 @@ -1,17 +1,15 @@ { "images" : [ { - "filename" : "HairBunUndercut.png", + "filename" : "hair6.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "HairBunUndercut@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "HairBunUndercut@3x.png", "idiom" : "universal", "scale" : "3x" } diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/hair6.imageset/HairBunUndercut.png Binary file LazyBear/Assets.xcassets/Avatars/Components/hair6.imageset/HairBunUndercut.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/hair6.imageset/HairBunUndercut@2x.png Binary file LazyBear/Assets.xcassets/Avatars/Components/hair6.imageset/HairBunUndercut@2x.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/hair6.imageset/HairBunUndercut@3x.png Binary file LazyBear/Assets.xcassets/Avatars/Components/hair6.imageset/HairBunUndercut@3x.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/hair6.imageset/hair6.png Binary file LazyBear/Assets.xcassets/Avatars/Components/hair6.imageset/hair6.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/hair7.imageset/Contents.json --- a/LazyBear/Assets.xcassets/Avatars/Components/hair7.imageset/Contents.json Sat Mar 27 00:46:17 2021 +0100 +++ b/LazyBear/Assets.xcassets/Avatars/Components/hair7.imageset/Contents.json Sat Mar 27 20:26:15 2021 +0100 @@ -1,17 +1,15 @@ { "images" : [ { - "filename" : "HairBuzzcut.png", + "filename" : "hair7.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "HairBuzzcut@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "HairBuzzcut@3x.png", "idiom" : "universal", "scale" : "3x" } diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/hair7.imageset/HairBuzzcut.png Binary file LazyBear/Assets.xcassets/Avatars/Components/hair7.imageset/HairBuzzcut.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/hair7.imageset/HairBuzzcut@2x.png Binary file LazyBear/Assets.xcassets/Avatars/Components/hair7.imageset/HairBuzzcut@2x.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/hair7.imageset/HairBuzzcut@3x.png Binary file LazyBear/Assets.xcassets/Avatars/Components/hair7.imageset/HairBuzzcut@3x.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/hair7.imageset/hair7.png Binary file LazyBear/Assets.xcassets/Avatars/Components/hair7.imageset/hair7.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/hair8.imageset/Contents.json --- a/LazyBear/Assets.xcassets/Avatars/Components/hair8.imageset/Contents.json Sat Mar 27 00:46:17 2021 +0100 +++ b/LazyBear/Assets.xcassets/Avatars/Components/hair8.imageset/Contents.json Sat Mar 27 20:26:15 2021 +0100 @@ -1,17 +1,15 @@ { "images" : [ { - "filename" : "HairCap.png", + "filename" : "hair8.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "HairCap@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "HairCap@3x.png", "idiom" : "universal", "scale" : "3x" } diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/hair8.imageset/HairCap.png Binary file LazyBear/Assets.xcassets/Avatars/Components/hair8.imageset/HairCap.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/hair8.imageset/HairCap@2x.png Binary file LazyBear/Assets.xcassets/Avatars/Components/hair8.imageset/HairCap@2x.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/hair8.imageset/HairCap@3x.png Binary file LazyBear/Assets.xcassets/Avatars/Components/hair8.imageset/HairCap@3x.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/hair8.imageset/hair8.png Binary file LazyBear/Assets.xcassets/Avatars/Components/hair8.imageset/hair8.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/hair9.imageset/Contents.json --- a/LazyBear/Assets.xcassets/Avatars/Components/hair9.imageset/Contents.json Sat Mar 27 00:46:17 2021 +0100 +++ b/LazyBear/Assets.xcassets/Avatars/Components/hair9.imageset/Contents.json Sat Mar 27 20:26:15 2021 +0100 @@ -1,17 +1,15 @@ { "images" : [ { - "filename" : "HairCurly.png", + "filename" : "hair9.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "HairCurly@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "HairCurly@3x.png", "idiom" : "universal", "scale" : "3x" } diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/hair9.imageset/HairCurly.png Binary file LazyBear/Assets.xcassets/Avatars/Components/hair9.imageset/HairCurly.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/hair9.imageset/HairCurly@2x.png Binary file LazyBear/Assets.xcassets/Avatars/Components/hair9.imageset/HairCurly@2x.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/hair9.imageset/HairCurly@3x.png Binary file LazyBear/Assets.xcassets/Avatars/Components/hair9.imageset/HairCurly@3x.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/hair9.imageset/hair9.png Binary file LazyBear/Assets.xcassets/Avatars/Components/hair9.imageset/hair9.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/head.imageset/Contents.json --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/LazyBear/Assets.xcassets/Avatars/Components/head.imageset/Contents.json Sat Mar 27 20:26:15 2021 +0100 @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "head.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/head.imageset/head.png Binary file LazyBear/Assets.xcassets/Avatars/Components/head.imageset/head.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/mouth1.imageset/Contents.json --- a/LazyBear/Assets.xcassets/Avatars/Components/mouth1.imageset/Contents.json Sat Mar 27 00:46:17 2021 +0100 +++ b/LazyBear/Assets.xcassets/Avatars/Components/mouth1.imageset/Contents.json Sat Mar 27 20:26:15 2021 +0100 @@ -1,17 +1,15 @@ { "images" : [ { - "filename" : "MouthFrown.png", + "filename" : "mouth1.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "MouthFrown@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "MouthFrown@3x.png", "idiom" : "universal", "scale" : "3x" } diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/mouth1.imageset/MouthFrown.png Binary file LazyBear/Assets.xcassets/Avatars/Components/mouth1.imageset/MouthFrown.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/mouth1.imageset/MouthFrown@2x.png Binary file LazyBear/Assets.xcassets/Avatars/Components/mouth1.imageset/MouthFrown@2x.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/mouth1.imageset/MouthFrown@3x.png Binary file LazyBear/Assets.xcassets/Avatars/Components/mouth1.imageset/MouthFrown@3x.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/mouth1.imageset/mouth1.png Binary file LazyBear/Assets.xcassets/Avatars/Components/mouth1.imageset/mouth1.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/mouth2.imageset/Contents.json --- a/LazyBear/Assets.xcassets/Avatars/Components/mouth2.imageset/Contents.json Sat Mar 27 00:46:17 2021 +0100 +++ b/LazyBear/Assets.xcassets/Avatars/Components/mouth2.imageset/Contents.json Sat Mar 27 20:26:15 2021 +0100 @@ -1,17 +1,15 @@ { "images" : [ { - "filename" : "MouthLips.png", + "filename" : "mouth2.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "MouthLips@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "MouthLips@3x.png", "idiom" : "universal", "scale" : "3x" } diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/mouth2.imageset/MouthLips.png Binary file LazyBear/Assets.xcassets/Avatars/Components/mouth2.imageset/MouthLips.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/mouth2.imageset/MouthLips@2x.png Binary file LazyBear/Assets.xcassets/Avatars/Components/mouth2.imageset/MouthLips@2x.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/mouth2.imageset/MouthLips@3x.png Binary file LazyBear/Assets.xcassets/Avatars/Components/mouth2.imageset/MouthLips@3x.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/mouth2.imageset/mouth2.png Binary file LazyBear/Assets.xcassets/Avatars/Components/mouth2.imageset/mouth2.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/mouth3.imageset/Contents.json --- a/LazyBear/Assets.xcassets/Avatars/Components/mouth3.imageset/Contents.json Sat Mar 27 00:46:17 2021 +0100 +++ b/LazyBear/Assets.xcassets/Avatars/Components/mouth3.imageset/Contents.json Sat Mar 27 20:26:15 2021 +0100 @@ -1,17 +1,15 @@ { "images" : [ { - "filename" : "MouthPacifier.png", + "filename" : "mouth3.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "MouthPacifier@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "MouthPacifier@3x.png", "idiom" : "universal", "scale" : "3x" } diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/mouth3.imageset/MouthPacifier.png Binary file LazyBear/Assets.xcassets/Avatars/Components/mouth3.imageset/MouthPacifier.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/mouth3.imageset/MouthPacifier@2x.png Binary file LazyBear/Assets.xcassets/Avatars/Components/mouth3.imageset/MouthPacifier@2x.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/mouth3.imageset/MouthPacifier@3x.png Binary file LazyBear/Assets.xcassets/Avatars/Components/mouth3.imageset/MouthPacifier@3x.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/mouth3.imageset/mouth3.png Binary file LazyBear/Assets.xcassets/Avatars/Components/mouth3.imageset/mouth3.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/mouth4.imageset/Contents.json --- a/LazyBear/Assets.xcassets/Avatars/Components/mouth4.imageset/Contents.json Sat Mar 27 00:46:17 2021 +0100 +++ b/LazyBear/Assets.xcassets/Avatars/Components/mouth4.imageset/Contents.json Sat Mar 27 20:26:15 2021 +0100 @@ -1,17 +1,15 @@ { "images" : [ { - "filename" : "MouthSmile.png", + "filename" : "mouth4.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "MouthSmile@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "MouthSmile@3x.png", "idiom" : "universal", "scale" : "3x" } diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/mouth4.imageset/MouthSmile.png Binary file LazyBear/Assets.xcassets/Avatars/Components/mouth4.imageset/MouthSmile.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/mouth4.imageset/MouthSmile@2x.png Binary file LazyBear/Assets.xcassets/Avatars/Components/mouth4.imageset/MouthSmile@2x.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/mouth4.imageset/MouthSmile@3x.png Binary file LazyBear/Assets.xcassets/Avatars/Components/mouth4.imageset/MouthSmile@3x.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/mouth4.imageset/mouth4.png Binary file LazyBear/Assets.xcassets/Avatars/Components/mouth4.imageset/mouth4.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/mouth5.imageset/Contents.json --- a/LazyBear/Assets.xcassets/Avatars/Components/mouth5.imageset/Contents.json Sat Mar 27 00:46:17 2021 +0100 +++ b/LazyBear/Assets.xcassets/Avatars/Components/mouth5.imageset/Contents.json Sat Mar 27 20:26:15 2021 +0100 @@ -1,17 +1,15 @@ { "images" : [ { - "filename" : "MouthSmirk.png", + "filename" : "mouth5.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "MouthSmirk@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "MouthSmirk@3x.png", "idiom" : "universal", "scale" : "3x" } diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/mouth5.imageset/MouthSmirk.png Binary file LazyBear/Assets.xcassets/Avatars/Components/mouth5.imageset/MouthSmirk.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/mouth5.imageset/MouthSmirk@2x.png Binary file LazyBear/Assets.xcassets/Avatars/Components/mouth5.imageset/MouthSmirk@2x.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/mouth5.imageset/MouthSmirk@3x.png Binary file LazyBear/Assets.xcassets/Avatars/Components/mouth5.imageset/MouthSmirk@3x.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/mouth5.imageset/mouth5.png Binary file LazyBear/Assets.xcassets/Avatars/Components/mouth5.imageset/mouth5.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/mouth6.imageset/Contents.json --- a/LazyBear/Assets.xcassets/Avatars/Components/mouth6.imageset/Contents.json Sat Mar 27 00:46:17 2021 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "filename" : "MouthSurprise.png", - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "MouthSurprise@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "MouthSurprise@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/mouth6.imageset/MouthSurprise.png Binary file LazyBear/Assets.xcassets/Avatars/Components/mouth6.imageset/MouthSurprise.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/mouth6.imageset/MouthSurprise@2x.png Binary file LazyBear/Assets.xcassets/Avatars/Components/mouth6.imageset/MouthSurprise@2x.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/mouth6.imageset/MouthSurprise@3x.png Binary file LazyBear/Assets.xcassets/Avatars/Components/mouth6.imageset/MouthSurprise@3x.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/nose1.imageset/Contents.json --- a/LazyBear/Assets.xcassets/Avatars/Components/nose1.imageset/Contents.json Sat Mar 27 00:46:17 2021 +0100 +++ b/LazyBear/Assets.xcassets/Avatars/Components/nose1.imageset/Contents.json Sat Mar 27 20:26:15 2021 +0100 @@ -1,17 +1,15 @@ { "images" : [ { - "filename" : "NoseMediumRound.png", + "filename" : "nose1.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "NoseMediumRound@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "NoseMediumRound@3x.png", "idiom" : "universal", "scale" : "3x" } diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/nose1.imageset/NoseMediumRound.png Binary file LazyBear/Assets.xcassets/Avatars/Components/nose1.imageset/NoseMediumRound.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/nose1.imageset/NoseMediumRound@2x.png Binary file LazyBear/Assets.xcassets/Avatars/Components/nose1.imageset/NoseMediumRound@2x.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/nose1.imageset/NoseMediumRound@3x.png Binary file LazyBear/Assets.xcassets/Avatars/Components/nose1.imageset/NoseMediumRound@3x.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/nose1.imageset/nose1.png Binary file LazyBear/Assets.xcassets/Avatars/Components/nose1.imageset/nose1.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/nose2.imageset/Contents.json --- a/LazyBear/Assets.xcassets/Avatars/Components/nose2.imageset/Contents.json Sat Mar 27 00:46:17 2021 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "filename" : "NoseSmallRound.png", - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "NoseSmallRound@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "NoseSmallRound@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/nose2.imageset/NoseSmallRound.png Binary file LazyBear/Assets.xcassets/Avatars/Components/nose2.imageset/NoseSmallRound.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/nose2.imageset/NoseSmallRound@2x.png Binary file LazyBear/Assets.xcassets/Avatars/Components/nose2.imageset/NoseSmallRound@2x.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Assets.xcassets/Avatars/Components/nose2.imageset/NoseSmallRound@3x.png Binary file LazyBear/Assets.xcassets/Avatars/Components/nose2.imageset/NoseSmallRound@3x.png has changed diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/HapticsManager.swift --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/LazyBear/HapticsManager.swift Sat Mar 27 20:26:15 2021 +0100 @@ -0,0 +1,55 @@ +// +// HapticsManager.swift +// LazyBear +// +// Created by Dennis Concepción Martín on 27/3/21. +// + +import SwiftUI +import CoreHaptics + +class HapticsManager: ObservableObject { + @Published var engine: CHHapticEngine? + + func prepareHaptics() { + guard CHHapticEngine.capabilitiesForHardware().supportsHaptics else { return } + + do { + self.engine = try CHHapticEngine() + try engine?.start() + } catch { + print("There was an error creating the engine: \(error.localizedDescription)") + } + } + + func simpleSuccess() { + let generator = UINotificationFeedbackGenerator() + generator.notificationOccurred(.success) + } + + func complexSuccess() { + // make sure that the device supports haptics + guard CHHapticEngine.capabilitiesForHardware().supportsHaptics else { return } + var events = [CHHapticEvent]() + + // create one intense, sharp tap + let intensity = CHHapticEventParameter(parameterID: .hapticIntensity, value: 2) + let sharpness = CHHapticEventParameter(parameterID: .hapticSharpness, value: 1) + let event = CHHapticEvent(eventType: .hapticTransient, parameters: [intensity, sharpness], relativeTime: 0) + events.append(event) + + // convert those events into a pattern and play it immediately + do { + let pattern = try CHHapticPattern(events: events, parameters: []) + let player = try engine?.makePlayer(with: pattern) + try player?.start(atTime: 0) + } catch { + print("Failed to play pattern: \(error.localizedDescription).") + } + } + + func simpleError() { + let generator = UINotificationFeedbackGenerator() + generator.notificationOccurred(.error) + } +} diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/LazyBear.xcdatamodeld/LazyBear.xcdatamodel/contents --- a/LazyBear/LazyBear.xcdatamodeld/LazyBear.xcdatamodel/contents Sat Mar 27 00:46:17 2021 +0100 +++ b/LazyBear/LazyBear.xcdatamodeld/LazyBear.xcdatamodel/contents Sat Mar 27 20:26:15 2021 +0100 @@ -4,7 +4,16 @@ - + + + + + + + + + + @@ -14,7 +23,7 @@ - + \ No newline at end of file diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/LazyBearApp.swift --- a/LazyBear/LazyBearApp.swift Sat Mar 27 00:46:17 2021 +0100 +++ b/LazyBear/LazyBearApp.swift Sat Mar 27 20:26:15 2021 +0100 @@ -10,16 +10,19 @@ @main struct LazyBearApp: App { let persistenceController = PersistenceController.shared // Core Data init + @ObservedObject var hapticsManager = HapticsManager() var body: some Scene { WindowGroup { if isAppAlreadyLaunchedOnce() { ContentView() .environment(\.managedObjectContext, persistenceController.container.viewContext) + .environmentObject(hapticsManager) } else { WelcomeView() .environment(\.managedObjectContext, persistenceController.container.viewContext) + .environmentObject(hapticsManager) } } } diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Models/UserSettings+CoreDataClass.swift --- a/LazyBear/Models/UserSettings+CoreDataClass.swift Sat Mar 27 00:46:17 2021 +0100 +++ b/LazyBear/Models/UserSettings+CoreDataClass.swift Sat Mar 27 20:26:15 2021 +0100 @@ -2,7 +2,7 @@ // UserSettings+CoreDataClass.swift // LazyBear // -// Created by Dennis Concepción Martín on 25/3/21. +// Created by Dennis Concepción Martín on 27/3/21. // // diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Models/UserSettings+CoreDataProperties.swift --- a/LazyBear/Models/UserSettings+CoreDataProperties.swift Sat Mar 27 00:46:17 2021 +0100 +++ b/LazyBear/Models/UserSettings+CoreDataProperties.swift Sat Mar 27 20:26:15 2021 +0100 @@ -2,7 +2,7 @@ // UserSettings+CoreDataProperties.swift // LazyBear // -// Created by Dennis Concepción Martín on 25/3/21. +// Created by Dennis Concepción Martín on 27/3/21. // // @@ -17,7 +17,16 @@ } @NSManaged public var username: String - @NSManaged public var avatar: String + @NSManaged public var body: String + @NSManaged public var bodyColor: String + @NSManaged public var eyes: String + @NSManaged public var facialHair: String + @NSManaged public var hair: String + @NSManaged public var hairColor: String + @NSManaged public var mouth: String + @NSManaged public var nose: String + @NSManaged public var skinTone: String + @NSManaged public var background: String } diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Persistence.swift --- a/LazyBear/Persistence.swift Sat Mar 27 00:46:17 2021 +0100 +++ b/LazyBear/Persistence.swift Sat Mar 27 20:26:15 2021 +0100 @@ -18,7 +18,6 @@ entity.attribute = 1 let userSettings = UserSettings(context: viewContext) - userSettings.avatar = "random4" userSettings.username = "Dennis" } diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Views/Home/Helpers/UserHelper.swift --- a/LazyBear/Views/Home/Helpers/UserHelper.swift Sat Mar 27 00:46:17 2021 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,53 +0,0 @@ -// -// UserHelper.swift -// LazyBear -// -// Created by Dennis Concepción Martín on 24/3/21. -// - -import SwiftUI - -struct UserHelper: View { - @FetchRequest(entity: UserSettings.entity(), sortDescriptors: []) var userSettings: FetchedResults - - var body: some View { - GeometryReader { geo in - HStack { - UserImage() - .frame(height: geo.size.height * 0.15) - .padding(.horizontal) - - VStack(alignment: .leading) { - let name = userSettings.first!.username - Text("Hello, \(name)") - .font(.title) - .fontWeight(.semibold) - - Text("How is the market doing today?") - .opacity(0.5) - } - } - } - } -} - -struct UserImage: View { - @FetchRequest(entity: UserSettings.entity(), sortDescriptors: []) var userSettings: FetchedResults - - var body: some View { - let avatar = userSettings.first!.avatar - Image(avatar) - .resizable() - .aspectRatio(1.0, contentMode: .fit) - .cornerRadius(20) - .shadow(color: Color.black.opacity(0.2), radius: 10) - .padding(5) - - } -} - -struct UserHelper_Previews: PreviewProvider { - static var previews: some View { - UserHelper() - } -} diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Views/Home/Helpers/WatchlistPreviewHelper.swift --- a/LazyBear/Views/Home/Helpers/WatchlistPreviewHelper.swift Sat Mar 27 00:46:17 2021 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,20 +0,0 @@ -// -// WatchlistPreviewHelper.swift -// LazyBear -// -// Created by Dennis Concepción Martín on 24/3/21. -// - -import SwiftUI - -struct WatchlistPreviewHelper: View { - var body: some View { - RoundedRectangle(cornerRadius: 20) - } -} - -struct WatchlistPreviewHelper_Previews: PreviewProvider { - static var previews: some View { - WatchlistPreviewHelper() - } -} diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Views/Home/HomeView.swift --- a/LazyBear/Views/Home/HomeView.swift Sat Mar 27 00:46:17 2021 +0100 +++ b/LazyBear/Views/Home/HomeView.swift Sat Mar 27 20:26:15 2021 +0100 @@ -2,23 +2,14 @@ // HomeView.swift // LazyBear // -// Created by Dennis Concepción Martín on 24/3/21. +// Created by Dennis Concepción Martín on 27/3/21. // import SwiftUI struct HomeView: View { - @State private var searchText = "" - var body: some View { - NavigationView { - GeometryReader { geo in - VStack { - UserHelper() - .padding(.top) - } - } - } + Text(/*@START_MENU_TOKEN@*/"Hello, World!"/*@END_MENU_TOKEN@*/) } } diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Views/Onboarding/Helpers/Avatar.swift --- a/LazyBear/Views/Onboarding/Helpers/Avatar.swift Sat Mar 27 00:46:17 2021 +0100 +++ b/LazyBear/Views/Onboarding/Helpers/Avatar.swift Sat Mar 27 20:26:15 2021 +0100 @@ -8,48 +8,51 @@ import SwiftUI struct Avatar: View { - var scaleMultipler: CGFloat - var backgroundHeight: CGFloat - @EnvironmentObject var environmentSignUp: EnvironmentSignUp + @EnvironmentObject var firstAvatar: FirstAvatar var body: some View { - environmentSignUp.background - .clipShape(Circle()) - .frame(maxWidth: backgroundHeight + 50, maxHeight: backgroundHeight) - .overlay( - Image("Head") - .scaleEffect(scaleMultipler) - .colorMultiply(environmentSignUp.skinTone) - ) - .overlay( - ZStack { - Image(environmentSignUp.hair) - .scaleEffect(scaleMultipler) - .offset(y: -5*scaleMultipler) - .colorMultiply(environmentSignUp.hairColor) - - Image(environmentSignUp.nose) - .scaleEffect(scaleMultipler) - - Image(environmentSignUp.eyes) - .scaleEffect(scaleMultipler) - .offset(y: -5*scaleMultipler) - - Image(environmentSignUp.mouth) - .scaleEffect(scaleMultipler) - .offset(y: 5*scaleMultipler) - - Image(environmentSignUp.body) - .scaleEffect(scaleMultipler) - .offset(y: 19*scaleMultipler) - .colorMultiply(environmentSignUp.bodyColor) - } - ) + VStack { + Image("head") + .componentModifier() + .overlay( + ZStack { + Image(firstAvatar.body) + .componentModifier() + .colorMultiply(Color(firstAvatar.bodyColor)) + + Image(firstAvatar.hair) + .componentModifier() + .colorMultiply(Color(firstAvatar.hairColor)) + + Image(firstAvatar.eyes) + .componentModifier() + + Image(firstAvatar.nose) + .componentModifier() + + Image(firstAvatar.mouth) + .componentModifier() + } + ) + } + .padding() + .background( + Circle() + .foregroundColor(Color(firstAvatar.background)) + ) + } +} +extension Image { + func componentModifier() -> some View { + self + .resizable() + .aspectRatio(contentMode: .fit) } } struct Avatar_Previews: PreviewProvider { static var previews: some View { - Avatar(scaleMultipler: 2, backgroundHeight: 100) + Avatar() + .environmentObject(FirstAvatar()) } } diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Views/Onboarding/Helpers/AvatarCreator.swift --- a/LazyBear/Views/Onboarding/Helpers/AvatarCreator.swift Sat Mar 27 00:46:17 2021 +0100 +++ b/LazyBear/Views/Onboarding/Helpers/AvatarCreator.swift Sat Mar 27 20:26:15 2021 +0100 @@ -8,20 +8,21 @@ import SwiftUI enum AvatarComponent { - case hair, eyes, nose, mouth, body + case hair, eyes, mouth, body } struct AvatarCreator: View { - var components = ["Hair", "Eyes", "Nose", "Mouth", "Body"] + var components = ["Hair", "Eyes", "Mouth", "Body"] @State private var selectedComponent = "Hair" + @Environment(\.presentationMode) var avatarGeneratorPresentation var body: some View { NavigationView { VStack { - Avatar(scaleMultipler: 2, backgroundHeight: 200) + Avatar() .padding(.top) - Picker("Please choose a color", selection: $selectedComponent) { + Picker("Select a component", selection: $selectedComponent) { ForEach(components, id: \.self) { Text($0) } @@ -31,23 +32,17 @@ Divider() ScrollView { -// if selectedComponent == "Hair" { showAvatar(component: .hair) } -// if selectedComponent == "Eyes" { showAvatar(component: .eyes) } -// if selectedComponent == "Nose" { showAvatar(component: .nose) } -// if selectedComponent == "Mouth" { showAvatar(component: .mouth) } -// if selectedComponent == "Body" { showAvatar(component: .body) } + if selectedComponent == "Hair" { showAvatar(component: .hair) } + if selectedComponent == "Eyes" { showAvatar(component: .eyes) } + if selectedComponent == "Mouth" { showAvatar(component: .mouth) } + if selectedComponent == "Body" { showAvatar(component: .body) } } } .navigationTitle("Create your avatar") .navigationBarTitleDisplayMode(.inline) .toolbar { - ToolbarItem(placement: .navigationBarLeading) { - Button(action: { }) { - Text("Cancel") - } - } ToolbarItem(placement: .navigationBarTrailing) { - Button(action: { }) { + Button(action: { avatarGeneratorPresentation.wrappedValue.dismiss() }) { Text("Done") } } @@ -55,45 +50,227 @@ } } -// private func showAvatar(component: AvatarComponent) -> AnyView { -// switch component { -// case .hair: -// return AnyView(HairView()) -// case .eyes: -// return AnyView(EyesView()) -// case .nose: -// return AnyView(NoseView()) -// case .mouth: -// return AnyView(MouthView()) -// case .body: -// return AnyView(BodyView()) -// } -// } + private func showAvatar(component: AvatarComponent) -> AnyView { + switch component { + case .hair: + return AnyView(ComponentView(component: .hair)) + case .eyes: + return AnyView(ComponentView(component: .eyes)) + case .mouth: + return AnyView(ComponentView(component: .mouth)) + case .body: + return AnyView(ComponentView(component: .body)) + } + } } struct AvatarCreator_Previews: PreviewProvider { static var previews: some View { AvatarCreator() - .environmentObject(EnvironmentSignUp()) + .environmentObject(FirstAvatar()) } } struct ComponentView: View { - var showColors: Bool - var numberOfColors: Int? - var numberOfItems: Int + @EnvironmentObject var firstAvatar: FirstAvatar + @EnvironmentObject var hapticsManager: HapticsManager + var component: AvatarComponent + let columns = [GridItem(.flexible()), GridItem(.flexible()), GridItem(.flexible())] var body: some View { - ScrollView(.horizontal, showsIndicators: false) { - HStack(spacing: 20) { - ForEach((1..<8)) { index in - Circle() - .frame(width: 50, height: 50) - .foregroundColor(Color("hairColor\(index)")) - + let (componentName, maxColors, maxComponents) = getComponentInfo() + VStack { + // COLOR SELECTOR + if maxColors != nil { + ScrollView(.horizontal, showsIndicators: false) { + VStack { + HStack(spacing: 20) { + ForEach((1.. (String, Int?, Int) { + switch component { + case .body: + let componentName = "body" + let maxColors = 8 + let maxComponents = 4 + return (componentName, maxColors, maxComponents) + case .eyes: + let componentName = "eyes" + let maxComponents = 6 + return (componentName, nil, maxComponents) + case .hair: + let componentName = "hair" + let maxColors = 8 + let maxComponents = 20 + return (componentName, maxColors, maxComponents) + case .mouth: + let componentName = "mouth" + let maxComponents = 6 + return (componentName, nil, maxComponents) + } + } + + private func assignSelection(componentName: String, index: Int, isColor: Bool) { + switch component { + case .body: + if isColor { + let colorName = "customColor\(index)" + self.firstAvatar.bodyColor = colorName + } + else { + self.firstAvatar.body = "\(componentName)\(index)" + } + case .eyes: + self.firstAvatar.eyes = "\(componentName)\(index)" + case .hair: + if isColor { + self.firstAvatar.hairColor = "\(componentName)\(index)" + } else { + self.firstAvatar.hair = "\(componentName)\(index)" + } + case .mouth: + self.firstAvatar.mouth = "\(componentName)\(index)" } } } + +struct ColorItem: View { + @EnvironmentObject var firstAvatar: FirstAvatar + var component: AvatarComponent + var componentName: String + var index: Int + + var body: some View { + let componentColor = "\(componentName)Color\(index)" + Circle() + .frame(width: 50, height: 50) + .foregroundColor(component == .body ? Color("customColor\(index)"): Color(componentColor)) + .padding(5) + .background(firstAvatar.hairColor == componentColor ? + Circle() + .stroke(lineWidth: 3) + .foregroundColor(.gray) + : + nil + ) + .padding(.vertical) + } +} + +struct ComponentItem: View { + @EnvironmentObject var firstAvatar: FirstAvatar + var component: AvatarComponent + var componentName: String + var index: Int + + var body: some View { + PreviewAvatar(stringComponent: "\(componentName)\(index)", component: component) + .frame(height: 100) + .background(checkItemSelected(componentName: "\(componentName)\(index)") ? + RoundedRectangle(cornerRadius: 20) + .stroke(lineWidth: 3) + .foregroundColor(.gray) + : + nil + ) + .padding(.vertical) + } + + private func checkItemSelected(componentName: String) -> Bool { + if component == .body { + if firstAvatar.body == componentName { return true } + } + else if component == .eyes { + if firstAvatar.eyes == componentName { return true } + } + else if component == .hair { + if firstAvatar.hair == componentName { return true } + } + else if component == .mouth { + if firstAvatar.mouth == componentName { return true } + } + return false + } +} + + +struct PreviewAvatar: View { + @EnvironmentObject var firstAvatar: FirstAvatar + var stringComponent: String + var component: AvatarComponent + + var body: some View { + Image("head") + .componentModifier() + .overlay( + ZStack { + if component == .body { + Image(stringComponent) + .componentModifier() + .colorMultiply(Color(firstAvatar.bodyColor)) + } else { + Image(firstAvatar.body) + .componentModifier() + .colorMultiply(Color(firstAvatar.bodyColor)) + } + + if component == .hair { + Image(stringComponent) + .componentModifier() + .colorMultiply(Color(firstAvatar.hairColor)) + } else { + Image(firstAvatar.hair) + .componentModifier() + .colorMultiply(Color(firstAvatar.hairColor)) + } + + if component == .eyes { + Image(stringComponent) + .componentModifier() + } else { + Image(firstAvatar.eyes) + .componentModifier() + } + + Image(firstAvatar.nose) + .componentModifier() + + if component == .mouth { + Image(stringComponent) + .componentModifier() + } else { + Image(firstAvatar.mouth) + .componentModifier() + } + } + ) + } +} diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Views/Onboarding/Helpers/EnvironmentSignUp.swift --- a/LazyBear/Views/Onboarding/Helpers/EnvironmentSignUp.swift Sat Mar 27 00:46:17 2021 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,23 +0,0 @@ -// -// EnvironmentSignUp.swift -// LazyBear -// -// Created by Dennis Concepción Martín on 25/3/21. -// - -import SwiftUI - -class EnvironmentSignUp: ObservableObject { - @Published var hideAvatarSelector = false - @Published var username = "" - @Published var body = "body1" - @Published var bodyColor = Color("custom2") - @Published var eyes = "eyes3" - @Published var facialHair = "facialHair4" - @Published var hair = "hair13" - @Published var hairColor = Color("hairColor1") - @Published var mouth = "mouth4" - @Published var nose = "nose2" - @Published var skinTone = Color("skinTone2") - @Published var background = Color("custom7") -} diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Views/Onboarding/Helpers/FirstAvatar.swift --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/LazyBear/Views/Onboarding/Helpers/FirstAvatar.swift Sat Mar 27 20:26:15 2021 +0100 @@ -0,0 +1,22 @@ +// +// EnvironmentSignUp.swift +// LazyBear +// +// Created by Dennis Concepción Martín on 25/3/21. +// + +import SwiftUI + +class FirstAvatar: ObservableObject { + @Published var username = "" + @Published var body = "body1" + @Published var bodyColor = "customColor3" + @Published var eyes = "eyes2" + @Published var facialHair = "facialHair3" + @Published var hair = "hair2" + @Published var hairColor = "hairColor1" + @Published var mouth = "mouth1" + @Published var nose = "nose1" + @Published var skinTone = "skinTone1" + @Published var background = "default" +} diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Views/Onboarding/SignUpView.swift --- a/LazyBear/Views/Onboarding/SignUpView.swift Sat Mar 27 00:46:17 2021 +0100 +++ b/LazyBear/Views/Onboarding/SignUpView.swift Sat Mar 27 20:26:15 2021 +0100 @@ -9,8 +9,9 @@ struct SignUpView: View { @Environment(\.managedObjectContext) private var moc - @EnvironmentObject var environmentSignUp: EnvironmentSignUp - @State private var showingAvatars = false + @EnvironmentObject var firstAvatar: FirstAvatar + @EnvironmentObject var hapticsManager: HapticsManager + @State private var showingAvatarGenerator = false @State private var usernameIsEmptyAlert = false @State private var showContentView = false @@ -18,52 +19,69 @@ if showContentView { ContentView() } else { - GeometryReader { geo in - NavigationView { - VStack(alignment: .leading) { - Text("Let us cutomise your experience.") - .padding(.bottom) - .opacity(0.6) - - ProfileAvatar(scaleMultipler: 2, backgroundHeight: 200, showingAvatars: $showingAvatars) - .padding(.bottom) - - UserNameTextfield(username: $environmentSignUp.username) - .padding(.bottom) - + NavigationView { + VStack(alignment: .leading) { + ProfileAvatar(showingAvatarGenerator: $showingAvatarGenerator) + .padding(.bottom) + + UserNameTextfield(username: $firstAvatar.username) + .padding(.bottom) + + Spacer() + Button(action: {checkAndSave()}) { + NextButton(text: "Continue") + } + HStack { Spacer() - Button(action: {checkAndSave()}) { - NextButton(text: "Continue") + Text("We do not sell your data to third parties.") + .opacity(0.6) + Spacer() + } + .font(.caption) + .padding(.bottom, 30) + } + .padding() + .navigationTitle("Sign Up") + .navigationBarTitleDisplayMode(.inline) + .toolbar { + ToolbarItem(placement: .navigationBarTrailing) { + Button(action: { self.showingAvatarGenerator = true; self.hapticsManager.simpleSuccess() }) { + Text("Edit avatar") } - HStack { - Spacer() - Text("We do not sell your data to third parties.") - .opacity(0.6) - Spacer() - } - .font(.caption) - .padding(.bottom, 30) } - .padding() - .navigationTitle("Sign Up") } } .alert(isPresented: $usernameIsEmptyAlert) { Alert(title: Text("Select a username"), message: Text("Need ideas? Try Stockmaster, or Financial lover"), dismissButton: .default(Text("Got it!"))) } - .sheet(isPresented: $showingAvatars) { + .sheet(isPresented: $showingAvatarGenerator) { AvatarCreator() + .environmentObject(firstAvatar) + .environmentObject(hapticsManager) } + .onAppear { self.hapticsManager.simpleSuccess() } } } private func checkAndSave() { - if environmentSignUp.username.isEmpty { + if firstAvatar.username.isEmpty { self.usernameIsEmptyAlert = true + hapticsManager.simpleError() } else { - // Save settings to CLOUDKIT and show ContentView + // Save settings to CLOUDKIT let userSettings = UserSettings(context: moc) - userSettings.username = environmentSignUp.username + userSettings.username = firstAvatar.username + userSettings.body = firstAvatar.body + userSettings.bodyColor = firstAvatar.bodyColor + userSettings.eyes = firstAvatar.eyes + userSettings.facialHair = firstAvatar.facialHair + userSettings.mouth = firstAvatar.mouth + userSettings.nose = firstAvatar.nose + userSettings.skinTone = firstAvatar.skinTone + userSettings.background = firstAvatar.background + // Save AppIsAlreadyLaunched + let defaults = UserDefaults.standard + defaults.setValue(true, forKey: "IsAppAlreadyLaunchedOnce") do { try moc.save() print("User saved") @@ -78,34 +96,23 @@ struct SignUpView_Previews: PreviewProvider { static var previews: some View { SignUpView() - .environmentObject(EnvironmentSignUp()) + .environmentObject(FirstAvatar()) } } struct ProfileAvatar: View { - var scaleMultipler: CGFloat - var backgroundHeight: CGFloat - @Binding var showingAvatars: Bool - @EnvironmentObject var environmentSignUp: EnvironmentSignUp + @Binding var showingAvatarGenerator: Bool + @EnvironmentObject var firstAvatar: FirstAvatar + @EnvironmentObject var hapticsManager: HapticsManager var body: some View { HStack { Spacer() ZStack(alignment: .topTrailing) { - Avatar(scaleMultipler: 2, backgroundHeight: 200) - .shadow(color: Color.gray.opacity(0.2), radius: 10) - if !environmentSignUp.hideAvatarSelector { - Button(action: { self.showingAvatars = true }) { - Image(systemName: "photo") - .foregroundColor(.white) - .padding() - .background( - Circle() - .foregroundColor(Color("default")) - .shadow(color: Color.gray.opacity(0.2), radius: 10) - ) - .padding() - } + Button(action: { self.showingAvatarGenerator = true; self.hapticsManager.simpleSuccess()}) { + Avatar() + .shadow(color: Color.gray.opacity(0.2), radius: 10) + } } @@ -114,28 +121,22 @@ } } + struct UserNameTextfield: View { - @EnvironmentObject var environmentSignUp: EnvironmentSignUp + @EnvironmentObject var firstAvatar: FirstAvatar @Binding var username: String var body: some View { VStack(alignment: .leading) { Text("Choose your username") - .font(.callout) - TextField("Username", text: $username) { isEditing in - if isEditing { // If it's true - environmentSignUp.hideAvatarSelector = isEditing - } else { - DispatchQueue.main.asyncAfter(deadline: .now() + 0.3) { - environmentSignUp.hideAvatarSelector = isEditing - } - } - } - .padding(10) - .background( - RoundedRectangle(cornerRadius: 10) - .foregroundColor(Color(.systemGray6)) - ) + .font(.headline) + + TextField("Username", text: $username) + .padding(10) + .background( + RoundedRectangle(cornerRadius: 10) + .foregroundColor(Color(.systemGray6)) + ) } } } diff -r e7c3d68d8e22 -r 62d278295bb7 LazyBear/Views/Onboarding/WelcomeView.swift --- a/LazyBear/Views/Onboarding/WelcomeView.swift Sat Mar 27 00:46:17 2021 +0100 +++ b/LazyBear/Views/Onboarding/WelcomeView.swift Sat Mar 27 20:26:15 2021 +0100 @@ -8,8 +8,9 @@ import SwiftUI struct WelcomeView: View { + @EnvironmentObject var hapticsManager: HapticsManager @FetchRequest(entity: UserSettings.entity(), sortDescriptors: []) var userSettings: FetchedResults - @ObservedObject var environmentSignUp = EnvironmentSignUp() + @ObservedObject var environmentSignUp = FirstAvatar() @State private var showingNextView = false @State private var showingProgressView = false @@ -19,7 +20,7 @@ SignUpView() .environmentObject(environmentSignUp) } else { - SignUpView() + ContentView() .environmentObject(environmentSignUp) } @@ -66,6 +67,7 @@ DispatchQueue.main.asyncAfter(deadline: .now() + 1) { self.showingProgressView = true } + self.hapticsManager.prepareHaptics() } } }