diff --git a/.DS_Store b/.DS_Store index 62cf7e0..5515be0 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/Better-me-iOS.xcodeproj/project.pbxproj b/Better-me-iOS.xcodeproj/project.pbxproj index fcd6f5a..5629aa3 100644 --- a/Better-me-iOS.xcodeproj/project.pbxproj +++ b/Better-me-iOS.xcodeproj/project.pbxproj @@ -12,6 +12,34 @@ 280F5E5C2983B25F000A30B3 /* MyPageCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 280F5E572983B25F000A30B3 /* MyPageCell.swift */; }; 280F5E5D2983B25F000A30B3 /* ProfileEditController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 280F5E582983B25F000A30B3 /* ProfileEditController.swift */; }; 280F5E5E2983B25F000A30B3 /* PWEditController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 280F5E592983B25F000A30B3 /* PWEditController.swift */; }; + 3B7049EC298FCE5E0054096A /* PersonModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3B7049EA298FCE5E0054096A /* PersonModel.swift */; }; + 3B7049ED298FCE5E0054096A /* Person.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3B7049EB298FCE5E0054096A /* Person.swift */; }; + 3BA12292298A94EA000E38A8 /* SwiftUIView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BA12291298A94EA000E38A8 /* SwiftUIView.swift */; }; + 3BA122E3298AA5E9000E38A8 /* SocialViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BA122E2298AA5E9000E38A8 /* SocialViewController.swift */; }; + 3BE30E58299535A9004B3F23 /* Request_FriendModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BE30E40299535A7004B3F23 /* Request_FriendModel.swift */; }; + 3BE30E59299535A9004B3F23 /* Request_Friend.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BE30E41299535A8004B3F23 /* Request_Friend.swift */; }; + 3BE30E5A299535A9004B3F23 /* RequestStatus.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BE30E42299535A8004B3F23 /* RequestStatus.swift */; }; + 3BE30E5B299535A9004B3F23 /* SearchEmailModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BE30E43299535A8004B3F23 /* SearchEmailModel.swift */; }; + 3BE30E5C299535A9004B3F23 /* HabitAgree.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BE30E44299535A8004B3F23 /* HabitAgree.swift */; }; + 3BE30E5D299535A9004B3F23 /* SearchName.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BE30E45299535A8004B3F23 /* SearchName.swift */; }; + 3BE30E5E299535A9004B3F23 /* AgreeModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BE30E46299535A8004B3F23 /* AgreeModel.swift */; }; + 3BE30E5F299535A9004B3F23 /* SearchNameModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BE30E47299535A8004B3F23 /* SearchNameModel.swift */; }; + 3BE30E60299535A9004B3F23 /* Agree.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BE30E48299535A8004B3F23 /* Agree.swift */; }; + 3BE30E61299535A9004B3F23 /* SearchEmail.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BE30E49299535A8004B3F23 /* SearchEmail.swift */; }; + 3BE30E62299535A9004B3F23 /* RequestStatusModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BE30E4A299535A8004B3F23 /* RequestStatusModel.swift */; }; + 3BE30E63299535A9004B3F23 /* Request_Friend_Post.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BE30E4B299535A8004B3F23 /* Request_Friend_Post.swift */; }; + 3BE30E64299535A9004B3F23 /* FriendDelete.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BE30E4C299535A8004B3F23 /* FriendDelete.swift */; }; + 3BE30E65299535A9004B3F23 /* FriendDeleteModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BE30E4D299535A8004B3F23 /* FriendDeleteModel.swift */; }; + 3BE30E66299535A9004B3F23 /* HabitDisagreeModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BE30E4E299535A8004B3F23 /* HabitDisagreeModel.swift */; }; + 3BE30E67299535A9004B3F23 /* InviteHabit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BE30E4F299535A8004B3F23 /* InviteHabit.swift */; }; + 3BE30E68299535A9004B3F23 /* HabitAgreeModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BE30E50299535A8004B3F23 /* HabitAgreeModel.swift */; }; + 3BE30E69299535A9004B3F23 /* InviteHabitPost.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BE30E51299535A8004B3F23 /* InviteHabitPost.swift */; }; + 3BE30E6A299535A9004B3F23 /* NewPersonModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BE30E52299535A8004B3F23 /* NewPersonModel.swift */; }; + 3BE30E6B299535A9004B3F23 /* InviteHabitPostModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BE30E53299535A8004B3F23 /* InviteHabitPostModel.swift */; }; + 3BE30E6C299535A9004B3F23 /* InviteHabitModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BE30E54299535A8004B3F23 /* InviteHabitModel.swift */; }; + 3BE30E6D299535A9004B3F23 /* HabitDisagree.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BE30E55299535A9004B3F23 /* HabitDisagree.swift */; }; + 3BE30E6E299535A9004B3F23 /* NewPerson.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BE30E56299535A9004B3F23 /* NewPerson.swift */; }; + 3BE30E6F299535A9004B3F23 /* Request_Friend_PostModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BE30E57299535A9004B3F23 /* Request_Friend_PostModel.swift */; }; BE26CD08297805A900E97A05 /* AlertViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE26CD07297805A900E97A05 /* AlertViewController.swift */; }; BE532E742975A41800DDA6EA /* BadHabitDetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE532E732975A41800DDA6EA /* BadHabitDetailViewController.swift */; }; BE5F4EC2296D8F640064A93C /* RemoveBadHabitViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE5F4EC1296D8F640064A93C /* RemoveBadHabitViewController.swift */; }; @@ -39,6 +67,34 @@ 280F5E572983B25F000A30B3 /* MyPageCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MyPageCell.swift; sourceTree = ""; }; 280F5E582983B25F000A30B3 /* ProfileEditController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ProfileEditController.swift; sourceTree = ""; }; 280F5E592983B25F000A30B3 /* PWEditController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PWEditController.swift; sourceTree = ""; }; + 3B7049EA298FCE5E0054096A /* PersonModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PersonModel.swift; sourceTree = ""; }; + 3B7049EB298FCE5E0054096A /* Person.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Person.swift; sourceTree = ""; }; + 3BA12291298A94EA000E38A8 /* SwiftUIView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwiftUIView.swift; sourceTree = ""; }; + 3BA122E2298AA5E9000E38A8 /* SocialViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SocialViewController.swift; sourceTree = ""; }; + 3BE30E40299535A7004B3F23 /* Request_FriendModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Request_FriendModel.swift; sourceTree = ""; }; + 3BE30E41299535A8004B3F23 /* Request_Friend.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Request_Friend.swift; sourceTree = ""; }; + 3BE30E42299535A8004B3F23 /* RequestStatus.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RequestStatus.swift; sourceTree = ""; }; + 3BE30E43299535A8004B3F23 /* SearchEmailModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SearchEmailModel.swift; sourceTree = ""; }; + 3BE30E44299535A8004B3F23 /* HabitAgree.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HabitAgree.swift; sourceTree = ""; }; + 3BE30E45299535A8004B3F23 /* SearchName.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SearchName.swift; sourceTree = ""; }; + 3BE30E46299535A8004B3F23 /* AgreeModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AgreeModel.swift; sourceTree = ""; }; + 3BE30E47299535A8004B3F23 /* SearchNameModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SearchNameModel.swift; sourceTree = ""; }; + 3BE30E48299535A8004B3F23 /* Agree.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Agree.swift; sourceTree = ""; }; + 3BE30E49299535A8004B3F23 /* SearchEmail.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SearchEmail.swift; sourceTree = ""; }; + 3BE30E4A299535A8004B3F23 /* RequestStatusModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RequestStatusModel.swift; sourceTree = ""; }; + 3BE30E4B299535A8004B3F23 /* Request_Friend_Post.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Request_Friend_Post.swift; sourceTree = ""; }; + 3BE30E4C299535A8004B3F23 /* FriendDelete.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FriendDelete.swift; sourceTree = ""; }; + 3BE30E4D299535A8004B3F23 /* FriendDeleteModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FriendDeleteModel.swift; sourceTree = ""; }; + 3BE30E4E299535A8004B3F23 /* HabitDisagreeModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HabitDisagreeModel.swift; sourceTree = ""; }; + 3BE30E4F299535A8004B3F23 /* InviteHabit.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = InviteHabit.swift; sourceTree = ""; }; + 3BE30E50299535A8004B3F23 /* HabitAgreeModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HabitAgreeModel.swift; sourceTree = ""; }; + 3BE30E51299535A8004B3F23 /* InviteHabitPost.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = InviteHabitPost.swift; sourceTree = ""; }; + 3BE30E52299535A8004B3F23 /* NewPersonModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NewPersonModel.swift; sourceTree = ""; }; + 3BE30E53299535A8004B3F23 /* InviteHabitPostModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = InviteHabitPostModel.swift; sourceTree = ""; }; + 3BE30E54299535A8004B3F23 /* InviteHabitModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = InviteHabitModel.swift; sourceTree = ""; }; + 3BE30E55299535A9004B3F23 /* HabitDisagree.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HabitDisagree.swift; sourceTree = ""; }; + 3BE30E56299535A9004B3F23 /* NewPerson.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NewPerson.swift; sourceTree = ""; }; + 3BE30E57299535A9004B3F23 /* Request_Friend_PostModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Request_Friend_PostModel.swift; sourceTree = ""; }; BE26CD07297805A900E97A05 /* AlertViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AlertViewController.swift; sourceTree = ""; }; BE532E732975A41800DDA6EA /* BadHabitDetailViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BadHabitDetailViewController.swift; sourceTree = ""; }; BE5F4EC1296D8F640064A93C /* RemoveBadHabitViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RemoveBadHabitViewController.swift; sourceTree = ""; }; @@ -85,6 +141,49 @@ path = MyPage; sourceTree = ""; }; + 3B9BDDF3298FC2EA00CC0C45 /* Data */ = { + isa = PBXGroup; + children = ( + 3B7049EB298FCE5E0054096A /* Person.swift */, + 3B7049EA298FCE5E0054096A /* PersonModel.swift */, + 3BE30E48299535A8004B3F23 /* Agree.swift */, + 3BE30E46299535A8004B3F23 /* AgreeModel.swift */, + 3BE30E4C299535A8004B3F23 /* FriendDelete.swift */, + 3BE30E4D299535A8004B3F23 /* FriendDeleteModel.swift */, + 3BE30E44299535A8004B3F23 /* HabitAgree.swift */, + 3BE30E50299535A8004B3F23 /* HabitAgreeModel.swift */, + 3BE30E55299535A9004B3F23 /* HabitDisagree.swift */, + 3BE30E4E299535A8004B3F23 /* HabitDisagreeModel.swift */, + 3BE30E4F299535A8004B3F23 /* InviteHabit.swift */, + 3BE30E54299535A8004B3F23 /* InviteHabitModel.swift */, + 3BE30E51299535A8004B3F23 /* InviteHabitPost.swift */, + 3BE30E53299535A8004B3F23 /* InviteHabitPostModel.swift */, + 3BE30E56299535A9004B3F23 /* NewPerson.swift */, + 3BE30E52299535A8004B3F23 /* NewPersonModel.swift */, + 3BE30E4B299535A8004B3F23 /* Request_Friend_Post.swift */, + 3BE30E57299535A9004B3F23 /* Request_Friend_PostModel.swift */, + 3BE30E41299535A8004B3F23 /* Request_Friend.swift */, + 3BE30E40299535A7004B3F23 /* Request_FriendModel.swift */, + 3BE30E42299535A8004B3F23 /* RequestStatus.swift */, + 3BE30E4A299535A8004B3F23 /* RequestStatusModel.swift */, + 3BE30E49299535A8004B3F23 /* SearchEmail.swift */, + 3BE30E43299535A8004B3F23 /* SearchEmailModel.swift */, + 3BE30E45299535A8004B3F23 /* SearchName.swift */, + 3BE30E47299535A8004B3F23 /* SearchNameModel.swift */, + ); + path = Data; + sourceTree = ""; + }; + 3BA12278298A9340000E38A8 /* Social */ = { + isa = PBXGroup; + children = ( + 3B9BDDF3298FC2EA00CC0C45 /* Data */, + 3BA122E2298AA5E9000E38A8 /* SocialViewController.swift */, + 3BA12291298A94EA000E38A8 /* SwiftUIView.swift */, + ); + path = Social; + sourceTree = ""; + }; BECC4B2C296C3AB60037807F = { isa = PBXGroup; children = ( @@ -124,6 +223,7 @@ BEF940BD2972827900D0F1FD /* Habit.swift */, BEF940C1297561FB00D0F1FD /* BadHabitCell.swift */, BE26CD07297805A900E97A05 /* AlertViewController.swift */, + 3BA12278298A9340000E38A8 /* Social */, 280F5E542983B23A000A30B3 /* MyPage */, ); path = "Better-me-iOS"; @@ -145,6 +245,8 @@ dependencies = ( ); name = "Better-me-iOS"; + packageProductDependencies = ( + ); productName = "Better-me-iOS"; productReference = BECC4B35296C3AB60037807F /* Better-me-iOS.app */; productType = "com.apple.product-type.application"; @@ -173,6 +275,8 @@ Base, ); mainGroup = BECC4B2C296C3AB60037807F; + packageReferences = ( + ); productRefGroup = BECC4B36296C3AB60037807F /* Products */; projectDirPath = ""; projectRoot = ""; @@ -200,26 +304,54 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + 3BE30E64299535A9004B3F23 /* FriendDelete.swift in Sources */, + 3BE30E5E299535A9004B3F23 /* AgreeModel.swift in Sources */, + 3BE30E65299535A9004B3F23 /* FriendDeleteModel.swift in Sources */, + 3BE30E6D299535A9004B3F23 /* HabitDisagree.swift in Sources */, + 3BE30E67299535A9004B3F23 /* InviteHabit.swift in Sources */, BE5F4EC6296E7CC90064A93C /* SearchFriendViewController.swift in Sources */, 280F5E5E2983B25F000A30B3 /* PWEditController.swift in Sources */, + 3BA12292298A94EA000E38A8 /* SwiftUIView.swift in Sources */, + 3BE30E5D299535A9004B3F23 /* SearchName.swift in Sources */, + 3BE30E62299535A9004B3F23 /* RequestStatusModel.swift in Sources */, 280F5E5B2983B25F000A30B3 /* MyPageViewController.swift in Sources */, + 3BE30E6E299535A9004B3F23 /* NewPerson.swift in Sources */, 280F5E5C2983B25F000A30B3 /* MyPageCell.swift in Sources */, BEF940C029753F8500D0F1FD /* GoodHabitDetailViewController.swift in Sources */, + 3BE30E59299535A9004B3F23 /* Request_Friend.swift in Sources */, + 3BE30E6B299535A9004B3F23 /* InviteHabitPostModel.swift in Sources */, + 3BE30E5C299535A9004B3F23 /* HabitAgree.swift in Sources */, BECC4B4D296C3E1F0037807F /* AddGoodHabitViewController.swift in Sources */, 280F5E5D2983B25F000A30B3 /* ProfileEditController.swift in Sources */, BECC4B3D296C3AB60037807F /* HomeViewController.swift in Sources */, + 3BE30E66299535A9004B3F23 /* HabitDisagreeModel.swift in Sources */, BE26CD08297805A900E97A05 /* AlertViewController.swift in Sources */, + 3BE30E68299535A9004B3F23 /* HabitAgreeModel.swift in Sources */, + 3BE30E60299535A9004B3F23 /* Agree.swift in Sources */, BECC4B39296C3AB60037807F /* AppDelegate.swift in Sources */, 280F5E5A2983B25F000A30B3 /* HeaderView.swift in Sources */, + 3B7049ED298FCE5E0054096A /* Person.swift in Sources */, + 3BE30E6F299535A9004B3F23 /* Request_Friend_PostModel.swift in Sources */, BEF940BC29727FC600D0F1FD /* GoodHabitCell.swift in Sources */, + 3BE30E69299535A9004B3F23 /* InviteHabitPost.swift in Sources */, + 3BA122E3298AA5E9000E38A8 /* SocialViewController.swift in Sources */, BE6AF7F0296ED4EF00C236F8 /* FriendCell.swift in Sources */, + 3BE30E6C299535A9004B3F23 /* InviteHabitModel.swift in Sources */, + 3BE30E5F299535A9004B3F23 /* SearchNameModel.swift in Sources */, + 3B7049EC298FCE5E0054096A /* PersonModel.swift in Sources */, BEF940BE2972827900D0F1FD /* Habit.swift in Sources */, + 3BE30E63299535A9004B3F23 /* Request_Friend_Post.swift in Sources */, BE5F4EC2296D8F640064A93C /* RemoveBadHabitViewController.swift in Sources */, BECC4B3B296C3AB60037807F /* SceneDelegate.swift in Sources */, BEF940C2297561FB00D0F1FD /* BadHabitCell.swift in Sources */, + 3BE30E58299535A9004B3F23 /* Request_FriendModel.swift in Sources */, + 3BE30E5A299535A9004B3F23 /* RequestStatus.swift in Sources */, BE6AF7F2296ED62400C236F8 /* Friend.swift in Sources */, BE5F4EC4296D9E090064A93C /* Quote.swift in Sources */, + 3BE30E61299535A9004B3F23 /* SearchEmail.swift in Sources */, BE532E742975A41800DDA6EA /* BadHabitDetailViewController.swift in Sources */, + 3BE30E6A299535A9004B3F23 /* NewPersonModel.swift in Sources */, + 3BE30E5B299535A9004B3F23 /* SearchEmailModel.swift in Sources */, BECC4B62296C6B010037807F /* EmojiTextField.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/Better-me-iOS.xcodeproj/xcuserdata/abc.xcuserdatad/xcschemes/xcschememanagement.plist b/Better-me-iOS.xcodeproj/xcuserdata/abc.xcuserdatad/xcschemes/xcschememanagement.plist index 314f52e..7ffd81c 100644 --- a/Better-me-iOS.xcodeproj/xcuserdata/abc.xcuserdatad/xcschemes/xcschememanagement.plist +++ b/Better-me-iOS.xcodeproj/xcuserdata/abc.xcuserdatad/xcschemes/xcschememanagement.plist @@ -7,7 +7,7 @@ Better-me-iOS.xcscheme_^#shared#^_ orderHint - 0 + 2 diff --git a/Better-me-iOS.xcworkspace/contents.xcworkspacedata b/Better-me-iOS.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..0a22d81 --- /dev/null +++ b/Better-me-iOS.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,10 @@ + + + + + + + diff --git a/Better-me-iOS.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Better-me-iOS.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/Better-me-iOS.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/Better-me-iOS/.DS_Store b/Better-me-iOS/.DS_Store index 3e6ed11..01da1c6 100644 Binary files a/Better-me-iOS/.DS_Store and b/Better-me-iOS/.DS_Store differ diff --git a/Better-me-iOS/Assets.xcassets/.DS_Store b/Better-me-iOS/Assets.xcassets/.DS_Store new file mode 100644 index 0000000..532bd4e Binary files /dev/null and b/Better-me-iOS/Assets.xcassets/.DS_Store differ diff --git a/Better-me-iOS/Assets.xcassets/BetterMe.imageset/Contents.json b/Better-me-iOS/Assets.xcassets/BetterMe.imageset/Contents.json new file mode 100644 index 0000000..2548403 --- /dev/null +++ b/Better-me-iOS/Assets.xcassets/BetterMe.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "image 6.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Better-me-iOS/Assets.xcassets/BetterMe.imageset/image 6.png b/Better-me-iOS/Assets.xcassets/BetterMe.imageset/image 6.png new file mode 100644 index 0000000..af8e9c4 Binary files /dev/null and b/Better-me-iOS/Assets.xcassets/BetterMe.imageset/image 6.png differ diff --git a/Better-me-iOS/Assets.xcassets/Group 44.imageset/Contents.json b/Better-me-iOS/Assets.xcassets/Group 44.imageset/Contents.json new file mode 100644 index 0000000..1d0dfcc --- /dev/null +++ b/Better-me-iOS/Assets.xcassets/Group 44.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "Group 44.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Better-me-iOS/Assets.xcassets/Group 44.imageset/Group 44.png b/Better-me-iOS/Assets.xcassets/Group 44.imageset/Group 44.png new file mode 100644 index 0000000..4be4b5b Binary files /dev/null and b/Better-me-iOS/Assets.xcassets/Group 44.imageset/Group 44.png differ diff --git a/Better-me-iOS/Assets.xcassets/Group 65.imageset/Contents.json b/Better-me-iOS/Assets.xcassets/Group 65.imageset/Contents.json new file mode 100644 index 0000000..95cd3ab --- /dev/null +++ b/Better-me-iOS/Assets.xcassets/Group 65.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "Group 65.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Better-me-iOS/Assets.xcassets/Group 65.imageset/Group 65.png b/Better-me-iOS/Assets.xcassets/Group 65.imageset/Group 65.png new file mode 100644 index 0000000..3774964 Binary files /dev/null and b/Better-me-iOS/Assets.xcassets/Group 65.imageset/Group 65.png differ diff --git a/Better-me-iOS/Assets.xcassets/Magnifier.imageset/Contents.json b/Better-me-iOS/Assets.xcassets/Magnifier.imageset/Contents.json new file mode 100644 index 0000000..15595a6 --- /dev/null +++ b/Better-me-iOS/Assets.xcassets/Magnifier.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "Magnifier.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Better-me-iOS/Assets.xcassets/Magnifier.imageset/Magnifier.png b/Better-me-iOS/Assets.xcassets/Magnifier.imageset/Magnifier.png new file mode 100644 index 0000000..0b20326 Binary files /dev/null and b/Better-me-iOS/Assets.xcassets/Magnifier.imageset/Magnifier.png differ diff --git a/Better-me-iOS/Assets.xcassets/so-trash.imageset/Contents.json b/Better-me-iOS/Assets.xcassets/so-trash.imageset/Contents.json new file mode 100644 index 0000000..ff2ea14 --- /dev/null +++ b/Better-me-iOS/Assets.xcassets/so-trash.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "so-trash.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Better-me-iOS/Assets.xcassets/so-trash.imageset/so-trash.png b/Better-me-iOS/Assets.xcassets/so-trash.imageset/so-trash.png new file mode 100644 index 0000000..9cb7bb4 Binary files /dev/null and b/Better-me-iOS/Assets.xcassets/so-trash.imageset/so-trash.png differ diff --git a/Better-me-iOS/Base.lproj/Main.storyboard b/Better-me-iOS/Base.lproj/Main.storyboard index 320236f..b1ed38b 100644 --- a/Better-me-iOS/Base.lproj/Main.storyboard +++ b/Better-me-iOS/Base.lproj/Main.storyboard @@ -474,7 +474,7 @@ - + @@ -840,28 +840,43 @@ - + - + - - + + + + + + + + + + + + + + + + + - + @@ -1052,7 +1067,7 @@ - + @@ -1147,7 +1162,7 @@ - +