diff --git a/FaceBookProfile/.DS_Store b/FaceBookProfile/.DS_Store index 79b4f77..d32da66 100644 Binary files a/FaceBookProfile/.DS_Store and b/FaceBookProfile/.DS_Store differ diff --git a/FaceBookProfile/FaceBookProfile.xcodeproj/project.pbxproj b/FaceBookProfile/FaceBookProfile.xcodeproj/project.pbxproj index 303e96b..d922cb5 100644 --- a/FaceBookProfile/FaceBookProfile.xcodeproj/project.pbxproj +++ b/FaceBookProfile/FaceBookProfile.xcodeproj/project.pbxproj @@ -7,6 +7,13 @@ objects = { /* Begin PBXBuildFile section */ + 659FC9492A1E497000A442E6 /* ProfileTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 659FC9472A1E497000A442E6 /* ProfileTableViewCell.swift */; }; + 659FC94A2A1E497000A442E6 /* ProfileTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 659FC9482A1E497000A442E6 /* ProfileTableViewCell.xib */; }; + 659FC94D2A1F2FAE00A442E6 /* MenuTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 659FC94B2A1F2FAE00A442E6 /* MenuTableViewCell.swift */; }; + 659FC94E2A1F2FAE00A442E6 /* MenuTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 659FC94C2A1F2FAE00A442E6 /* MenuTableViewCell.xib */; }; + 659FC9502A1F334E00A442E6 /* Model.swift in Sources */ = {isa = PBXBuildFile; fileRef = 659FC94F2A1F334E00A442E6 /* Model.swift */; }; + 659FC9552A1F449D00A442E6 /* LogOutTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 659FC9532A1F449D00A442E6 /* LogOutTableViewCell.swift */; }; + 659FC9562A1F449D00A442E6 /* LogOutTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 659FC9542A1F449D00A442E6 /* LogOutTableViewCell.xib */; }; 6E0AA32229FEA7BE00BD99C4 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E0AA32129FEA7BE00BD99C4 /* AppDelegate.swift */; }; 6E0AA32429FEA7BE00BD99C4 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E0AA32329FEA7BE00BD99C4 /* SceneDelegate.swift */; }; 6E0AA32629FEA7BE00BD99C4 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E0AA32529FEA7BE00BD99C4 /* ViewController.swift */; }; @@ -16,6 +23,13 @@ /* End PBXBuildFile section */ /* Begin PBXFileReference section */ + 659FC9472A1E497000A442E6 /* ProfileTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileTableViewCell.swift; sourceTree = ""; }; + 659FC9482A1E497000A442E6 /* ProfileTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ProfileTableViewCell.xib; sourceTree = ""; }; + 659FC94B2A1F2FAE00A442E6 /* MenuTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MenuTableViewCell.swift; sourceTree = ""; }; + 659FC94C2A1F2FAE00A442E6 /* MenuTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MenuTableViewCell.xib; sourceTree = ""; }; + 659FC94F2A1F334E00A442E6 /* Model.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Model.swift; sourceTree = ""; }; + 659FC9532A1F449D00A442E6 /* LogOutTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LogOutTableViewCell.swift; sourceTree = ""; }; + 659FC9542A1F449D00A442E6 /* LogOutTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = LogOutTableViewCell.xib; sourceTree = ""; }; 6E0AA31E29FEA7BE00BD99C4 /* FaceBookProfile.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = FaceBookProfile.app; sourceTree = BUILT_PRODUCTS_DIR; }; 6E0AA32129FEA7BE00BD99C4 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 6E0AA32329FEA7BE00BD99C4 /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = ""; }; @@ -63,6 +77,13 @@ 6E0AA32A29FEA7BF00BD99C4 /* Assets.xcassets */, 6E0AA32C29FEA7BF00BD99C4 /* LaunchScreen.storyboard */, 6E0AA32F29FEA7BF00BD99C4 /* Info.plist */, + 659FC9472A1E497000A442E6 /* ProfileTableViewCell.swift */, + 659FC9482A1E497000A442E6 /* ProfileTableViewCell.xib */, + 659FC94B2A1F2FAE00A442E6 /* MenuTableViewCell.swift */, + 659FC94C2A1F2FAE00A442E6 /* MenuTableViewCell.xib */, + 659FC94F2A1F334E00A442E6 /* Model.swift */, + 659FC9532A1F449D00A442E6 /* LogOutTableViewCell.swift */, + 659FC9542A1F449D00A442E6 /* LogOutTableViewCell.xib */, ); path = FaceBookProfile; sourceTree = ""; @@ -126,7 +147,10 @@ buildActionMask = 2147483647; files = ( 6E0AA32E29FEA7BF00BD99C4 /* LaunchScreen.storyboard in Resources */, + 659FC9562A1F449D00A442E6 /* LogOutTableViewCell.xib in Resources */, + 659FC94A2A1E497000A442E6 /* ProfileTableViewCell.xib in Resources */, 6E0AA32B29FEA7BF00BD99C4 /* Assets.xcassets in Resources */, + 659FC94E2A1F2FAE00A442E6 /* MenuTableViewCell.xib in Resources */, 6E0AA32929FEA7BE00BD99C4 /* Main.storyboard in Resources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -139,8 +163,12 @@ buildActionMask = 2147483647; files = ( 6E0AA32629FEA7BE00BD99C4 /* ViewController.swift in Sources */, + 659FC9552A1F449D00A442E6 /* LogOutTableViewCell.swift in Sources */, + 659FC9492A1E497000A442E6 /* ProfileTableViewCell.swift in Sources */, 6E0AA32229FEA7BE00BD99C4 /* AppDelegate.swift in Sources */, + 659FC9502A1F334E00A442E6 /* Model.swift in Sources */, 6E0AA32429FEA7BE00BD99C4 /* SceneDelegate.swift in Sources */, + 659FC94D2A1F2FAE00A442E6 /* MenuTableViewCell.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/FaceBookProfile/FaceBookProfile.xcodeproj/project.xcworkspace/xcuserdata/openbible.xcuserdatad/UserInterfaceState.xcuserstate b/FaceBookProfile/FaceBookProfile.xcodeproj/project.xcworkspace/xcuserdata/openbible.xcuserdatad/UserInterfaceState.xcuserstate new file mode 100644 index 0000000..53214d8 Binary files /dev/null and b/FaceBookProfile/FaceBookProfile.xcodeproj/project.xcworkspace/xcuserdata/openbible.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/FaceBookProfile/FaceBookProfile.xcodeproj/xcuserdata/openbible.xcuserdatad/xcschemes/xcschememanagement.plist b/FaceBookProfile/FaceBookProfile.xcodeproj/xcuserdata/openbible.xcuserdatad/xcschemes/xcschememanagement.plist new file mode 100644 index 0000000..a21a7c3 --- /dev/null +++ b/FaceBookProfile/FaceBookProfile.xcodeproj/xcuserdata/openbible.xcuserdatad/xcschemes/xcschememanagement.plist @@ -0,0 +1,14 @@ + + + + + SchemeUserState + + FaceBookProfile.xcscheme_^#shared#^_ + + orderHint + 0 + + + + diff --git a/FaceBookProfile/FaceBookProfile/Assets.xcassets/bayMax.imageset/Contents.json b/FaceBookProfile/FaceBookProfile/Assets.xcassets/bayMax.imageset/Contents.json new file mode 100644 index 0000000..d6a5971 --- /dev/null +++ b/FaceBookProfile/FaceBookProfile/Assets.xcassets/bayMax.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "images.jpeg", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/FaceBookProfile/FaceBookProfile/Assets.xcassets/bayMax.imageset/images.jpeg b/FaceBookProfile/FaceBookProfile/Assets.xcassets/bayMax.imageset/images.jpeg new file mode 100644 index 0000000..c3f9a46 Binary files /dev/null and b/FaceBookProfile/FaceBookProfile/Assets.xcassets/bayMax.imageset/images.jpeg differ diff --git a/FaceBookProfile/FaceBookProfile/Assets.xcassets/fb_education.imageset/Contents.json b/FaceBookProfile/FaceBookProfile/Assets.xcassets/fb_education.imageset/Contents.json new file mode 100644 index 0000000..309ac7d --- /dev/null +++ b/FaceBookProfile/FaceBookProfile/Assets.xcassets/fb_education.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "fb_glyphs_education_20_20x20_@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "fb_glyphs_education_20_20x20_@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/FaceBookProfile/FaceBookProfile/Assets.xcassets/fb_education.imageset/fb_glyphs_education_20_20x20_@2x.png b/FaceBookProfile/FaceBookProfile/Assets.xcassets/fb_education.imageset/fb_glyphs_education_20_20x20_@2x.png new file mode 100644 index 0000000..8f794cd Binary files /dev/null and b/FaceBookProfile/FaceBookProfile/Assets.xcassets/fb_education.imageset/fb_glyphs_education_20_20x20_@2x.png differ diff --git a/FaceBookProfile/FaceBookProfile/Assets.xcassets/fb_education.imageset/fb_glyphs_education_20_20x20_@3x.png b/FaceBookProfile/FaceBookProfile/Assets.xcassets/fb_education.imageset/fb_glyphs_education_20_20x20_@3x.png new file mode 100644 index 0000000..88e70d3 Binary files /dev/null and b/FaceBookProfile/FaceBookProfile/Assets.xcassets/fb_education.imageset/fb_glyphs_education_20_20x20_@3x.png differ diff --git a/FaceBookProfile/FaceBookProfile/Assets.xcassets/fb_events.imageset/Contents.json b/FaceBookProfile/FaceBookProfile/Assets.xcassets/fb_events.imageset/Contents.json new file mode 100644 index 0000000..b877c98 --- /dev/null +++ b/FaceBookProfile/FaceBookProfile/Assets.xcassets/fb_events.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "fb_glyphs_calendar_20_20x20_@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "fb_glyphs_calendar_20_20x20_@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/FaceBookProfile/FaceBookProfile/Assets.xcassets/fb_events.imageset/fb_glyphs_calendar_20_20x20_@2x.png b/FaceBookProfile/FaceBookProfile/Assets.xcassets/fb_events.imageset/fb_glyphs_calendar_20_20x20_@2x.png new file mode 100644 index 0000000..cf558c6 Binary files /dev/null and b/FaceBookProfile/FaceBookProfile/Assets.xcassets/fb_events.imageset/fb_glyphs_calendar_20_20x20_@2x.png differ diff --git a/FaceBookProfile/FaceBookProfile/Assets.xcassets/fb_events.imageset/fb_glyphs_calendar_20_20x20_@3x.png b/FaceBookProfile/FaceBookProfile/Assets.xcassets/fb_events.imageset/fb_glyphs_calendar_20_20x20_@3x.png new file mode 100644 index 0000000..8bdba01 Binary files /dev/null and b/FaceBookProfile/FaceBookProfile/Assets.xcassets/fb_events.imageset/fb_glyphs_calendar_20_20x20_@3x.png differ diff --git a/FaceBookProfile/FaceBookProfile/Assets.xcassets/fb_friends.imageset/Contents.json b/FaceBookProfile/FaceBookProfile/Assets.xcassets/fb_friends.imageset/Contents.json new file mode 100644 index 0000000..010cb12 --- /dev/null +++ b/FaceBookProfile/FaceBookProfile/Assets.xcassets/fb_friends.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "fb_glyphs_friend-friends_20_20x20_@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "fb_glyphs_friend-friends_20_20x20_@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/FaceBookProfile/FaceBookProfile/Assets.xcassets/fb_friends.imageset/fb_glyphs_friend-friends_20_20x20_@2x.png b/FaceBookProfile/FaceBookProfile/Assets.xcassets/fb_friends.imageset/fb_glyphs_friend-friends_20_20x20_@2x.png new file mode 100644 index 0000000..1198493 Binary files /dev/null and b/FaceBookProfile/FaceBookProfile/Assets.xcassets/fb_friends.imageset/fb_glyphs_friend-friends_20_20x20_@2x.png differ diff --git a/FaceBookProfile/FaceBookProfile/Assets.xcassets/fb_friends.imageset/fb_glyphs_friend-friends_20_20x20_@3x.png b/FaceBookProfile/FaceBookProfile/Assets.xcassets/fb_friends.imageset/fb_glyphs_friend-friends_20_20x20_@3x.png new file mode 100644 index 0000000..6c8e183 Binary files /dev/null and b/FaceBookProfile/FaceBookProfile/Assets.xcassets/fb_friends.imageset/fb_glyphs_friend-friends_20_20x20_@3x.png differ diff --git a/FaceBookProfile/FaceBookProfile/Assets.xcassets/fb_games.imageset/Contents.json b/FaceBookProfile/FaceBookProfile/Assets.xcassets/fb_games.imageset/Contents.json new file mode 100644 index 0000000..3367c12 --- /dev/null +++ b/FaceBookProfile/FaceBookProfile/Assets.xcassets/fb_games.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "fb_glyphs_games_20_20x20_@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "fb_glyphs_games_20_20x20_@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/FaceBookProfile/FaceBookProfile/Assets.xcassets/fb_games.imageset/fb_glyphs_games_20_20x20_@2x.png b/FaceBookProfile/FaceBookProfile/Assets.xcassets/fb_games.imageset/fb_glyphs_games_20_20x20_@2x.png new file mode 100644 index 0000000..5303142 Binary files /dev/null and b/FaceBookProfile/FaceBookProfile/Assets.xcassets/fb_games.imageset/fb_glyphs_games_20_20x20_@2x.png differ diff --git a/FaceBookProfile/FaceBookProfile/Assets.xcassets/fb_games.imageset/fb_glyphs_games_20_20x20_@3x.png b/FaceBookProfile/FaceBookProfile/Assets.xcassets/fb_games.imageset/fb_glyphs_games_20_20x20_@3x.png new file mode 100644 index 0000000..0c4a43c Binary files /dev/null and b/FaceBookProfile/FaceBookProfile/Assets.xcassets/fb_games.imageset/fb_glyphs_games_20_20x20_@3x.png differ diff --git a/FaceBookProfile/FaceBookProfile/Assets.xcassets/fb_groups.imageset/Contents.json b/FaceBookProfile/FaceBookProfile/Assets.xcassets/fb_groups.imageset/Contents.json new file mode 100644 index 0000000..41f3661 --- /dev/null +++ b/FaceBookProfile/FaceBookProfile/Assets.xcassets/fb_groups.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "fb_glyphs_app-groups_20_20x20_@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "fb_glyphs_app-groups_20_20x20_@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/FaceBookProfile/FaceBookProfile/Assets.xcassets/fb_groups.imageset/fb_glyphs_app-groups_20_20x20_@2x.png b/FaceBookProfile/FaceBookProfile/Assets.xcassets/fb_groups.imageset/fb_glyphs_app-groups_20_20x20_@2x.png new file mode 100644 index 0000000..11f88df Binary files /dev/null and b/FaceBookProfile/FaceBookProfile/Assets.xcassets/fb_groups.imageset/fb_glyphs_app-groups_20_20x20_@2x.png differ diff --git a/FaceBookProfile/FaceBookProfile/Assets.xcassets/fb_groups.imageset/fb_glyphs_app-groups_20_20x20_@3x.png b/FaceBookProfile/FaceBookProfile/Assets.xcassets/fb_groups.imageset/fb_glyphs_app-groups_20_20x20_@3x.png new file mode 100644 index 0000000..3a61c81 Binary files /dev/null and b/FaceBookProfile/FaceBookProfile/Assets.xcassets/fb_groups.imageset/fb_glyphs_app-groups_20_20x20_@3x.png differ diff --git a/FaceBookProfile/FaceBookProfile/Assets.xcassets/fb_help_and_support.imageset/Contents.json b/FaceBookProfile/FaceBookProfile/Assets.xcassets/fb_help_and_support.imageset/Contents.json new file mode 100644 index 0000000..d629857 --- /dev/null +++ b/FaceBookProfile/FaceBookProfile/Assets.xcassets/fb_help_and_support.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "fb_glyphs_question_20_20x20_@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "fb_glyphs_question_20_20x20_@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/FaceBookProfile/FaceBookProfile/Assets.xcassets/fb_help_and_support.imageset/fb_glyphs_question_20_20x20_@2x.png b/FaceBookProfile/FaceBookProfile/Assets.xcassets/fb_help_and_support.imageset/fb_glyphs_question_20_20x20_@2x.png new file mode 100644 index 0000000..1d26f15 Binary files /dev/null and b/FaceBookProfile/FaceBookProfile/Assets.xcassets/fb_help_and_support.imageset/fb_glyphs_question_20_20x20_@2x.png differ diff --git a/FaceBookProfile/FaceBookProfile/Assets.xcassets/fb_help_and_support.imageset/fb_glyphs_question_20_20x20_@3x.png b/FaceBookProfile/FaceBookProfile/Assets.xcassets/fb_help_and_support.imageset/fb_glyphs_question_20_20x20_@3x.png new file mode 100644 index 0000000..4b255da Binary files /dev/null and b/FaceBookProfile/FaceBookProfile/Assets.xcassets/fb_help_and_support.imageset/fb_glyphs_question_20_20x20_@3x.png differ diff --git a/FaceBookProfile/FaceBookProfile/Assets.xcassets/fb_placeholder.imageset/Contents.json b/FaceBookProfile/FaceBookProfile/Assets.xcassets/fb_placeholder.imageset/Contents.json new file mode 100644 index 0000000..2ae9303 --- /dev/null +++ b/FaceBookProfile/FaceBookProfile/Assets.xcassets/fb_placeholder.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "fb_placeholder@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "fb_placeholder@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/FaceBookProfile/FaceBookProfile/Assets.xcassets/fb_placeholder.imageset/fb_placeholder@2x.png b/FaceBookProfile/FaceBookProfile/Assets.xcassets/fb_placeholder.imageset/fb_placeholder@2x.png new file mode 100644 index 0000000..26e0f44 Binary files /dev/null and b/FaceBookProfile/FaceBookProfile/Assets.xcassets/fb_placeholder.imageset/fb_placeholder@2x.png differ diff --git a/FaceBookProfile/FaceBookProfile/Assets.xcassets/fb_placeholder.imageset/fb_placeholder@3x.png b/FaceBookProfile/FaceBookProfile/Assets.xcassets/fb_placeholder.imageset/fb_placeholder@3x.png new file mode 100644 index 0000000..2475325 Binary files /dev/null and b/FaceBookProfile/FaceBookProfile/Assets.xcassets/fb_placeholder.imageset/fb_placeholder@3x.png differ diff --git a/FaceBookProfile/FaceBookProfile/Assets.xcassets/fb_privacy_shortcuts.imageset/Contents.json b/FaceBookProfile/FaceBookProfile/Assets.xcassets/fb_privacy_shortcuts.imageset/Contents.json new file mode 100644 index 0000000..b9c6721 --- /dev/null +++ b/FaceBookProfile/FaceBookProfile/Assets.xcassets/fb_privacy_shortcuts.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "fb_glyphs_lock_20_20x20_@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "fb_glyphs_lock_20_20x20_@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/FaceBookProfile/FaceBookProfile/Assets.xcassets/fb_privacy_shortcuts.imageset/fb_glyphs_lock_20_20x20_@2x.png b/FaceBookProfile/FaceBookProfile/Assets.xcassets/fb_privacy_shortcuts.imageset/fb_glyphs_lock_20_20x20_@2x.png new file mode 100644 index 0000000..a4a4adc Binary files /dev/null and b/FaceBookProfile/FaceBookProfile/Assets.xcassets/fb_privacy_shortcuts.imageset/fb_glyphs_lock_20_20x20_@2x.png differ diff --git a/FaceBookProfile/FaceBookProfile/Assets.xcassets/fb_privacy_shortcuts.imageset/fb_glyphs_lock_20_20x20_@3x.png b/FaceBookProfile/FaceBookProfile/Assets.xcassets/fb_privacy_shortcuts.imageset/fb_glyphs_lock_20_20x20_@3x.png new file mode 100644 index 0000000..0df5642 Binary files /dev/null and b/FaceBookProfile/FaceBookProfile/Assets.xcassets/fb_privacy_shortcuts.imageset/fb_glyphs_lock_20_20x20_@3x.png differ diff --git a/FaceBookProfile/FaceBookProfile/Assets.xcassets/fb_settings.imageset/Contents.json b/FaceBookProfile/FaceBookProfile/Assets.xcassets/fb_settings.imageset/Contents.json new file mode 100644 index 0000000..64d82b6 --- /dev/null +++ b/FaceBookProfile/FaceBookProfile/Assets.xcassets/fb_settings.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "fb_glyphs_gear_20_20x20_@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "fb_glyphs_gear_20_20x20_@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/FaceBookProfile/FaceBookProfile/Assets.xcassets/fb_settings.imageset/fb_glyphs_gear_20_20x20_@2x.png b/FaceBookProfile/FaceBookProfile/Assets.xcassets/fb_settings.imageset/fb_glyphs_gear_20_20x20_@2x.png new file mode 100644 index 0000000..9bd6c8b Binary files /dev/null and b/FaceBookProfile/FaceBookProfile/Assets.xcassets/fb_settings.imageset/fb_glyphs_gear_20_20x20_@2x.png differ diff --git a/FaceBookProfile/FaceBookProfile/Assets.xcassets/fb_settings.imageset/fb_glyphs_gear_20_20x20_@3x.png b/FaceBookProfile/FaceBookProfile/Assets.xcassets/fb_settings.imageset/fb_glyphs_gear_20_20x20_@3x.png new file mode 100644 index 0000000..f306fe4 Binary files /dev/null and b/FaceBookProfile/FaceBookProfile/Assets.xcassets/fb_settings.imageset/fb_glyphs_gear_20_20x20_@3x.png differ diff --git a/FaceBookProfile/FaceBookProfile/Assets.xcassets/fb_town_hall.imageset/Contents.json b/FaceBookProfile/FaceBookProfile/Assets.xcassets/fb_town_hall.imageset/Contents.json new file mode 100644 index 0000000..1222186 --- /dev/null +++ b/FaceBookProfile/FaceBookProfile/Assets.xcassets/fb_town_hall.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "fb_glyphs_house_20_20x20_@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "fb_glyphs_house_20_20x20_@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/FaceBookProfile/FaceBookProfile/Assets.xcassets/fb_town_hall.imageset/fb_glyphs_house_20_20x20_@2x.png b/FaceBookProfile/FaceBookProfile/Assets.xcassets/fb_town_hall.imageset/fb_glyphs_house_20_20x20_@2x.png new file mode 100644 index 0000000..3ab1b17 Binary files /dev/null and b/FaceBookProfile/FaceBookProfile/Assets.xcassets/fb_town_hall.imageset/fb_glyphs_house_20_20x20_@2x.png differ diff --git a/FaceBookProfile/FaceBookProfile/Assets.xcassets/fb_town_hall.imageset/fb_glyphs_house_20_20x20_@3x.png b/FaceBookProfile/FaceBookProfile/Assets.xcassets/fb_town_hall.imageset/fb_glyphs_house_20_20x20_@3x.png new file mode 100644 index 0000000..b250464 Binary files /dev/null and b/FaceBookProfile/FaceBookProfile/Assets.xcassets/fb_town_hall.imageset/fb_glyphs_house_20_20x20_@3x.png differ diff --git a/FaceBookProfile/FaceBookProfile/Base.lproj/Main.storyboard b/FaceBookProfile/FaceBookProfile/Base.lproj/Main.storyboard index 25a7638..8042622 100644 --- a/FaceBookProfile/FaceBookProfile/Base.lproj/Main.storyboard +++ b/FaceBookProfile/FaceBookProfile/Base.lproj/Main.storyboard @@ -1,24 +1,67 @@ - + + - + + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/FaceBookProfile/FaceBookProfile/LogOutTableViewCell.swift b/FaceBookProfile/FaceBookProfile/LogOutTableViewCell.swift new file mode 100644 index 0000000..65880bf --- /dev/null +++ b/FaceBookProfile/FaceBookProfile/LogOutTableViewCell.swift @@ -0,0 +1,20 @@ +// +// LogOutTableViewCell.swift +// FaceBookProfile +// +// Created by 편성경 on 2023/05/25. +// + +import UIKit + +class LogOutTableViewCell: UITableViewCell { + + override func awakeFromNib() { + super.awakeFromNib() + } + + override func setSelected(_ selected: Bool, animated: Bool) { + super.setSelected(selected, animated: animated) + } + +} diff --git a/FaceBookProfile/FaceBookProfile/LogOutTableViewCell.xib b/FaceBookProfile/FaceBookProfile/LogOutTableViewCell.xib new file mode 100644 index 0000000..d8a2fae --- /dev/null +++ b/FaceBookProfile/FaceBookProfile/LogOutTableViewCell.xib @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/FaceBookProfile/FaceBookProfile/MenuTableViewCell.swift b/FaceBookProfile/FaceBookProfile/MenuTableViewCell.swift new file mode 100644 index 0000000..dff752d --- /dev/null +++ b/FaceBookProfile/FaceBookProfile/MenuTableViewCell.swift @@ -0,0 +1,25 @@ +// +// MenuTableViewCell.swift +// FaceBookProfile +// +// Created by 편성경 on 2023/05/25. +// + +import UIKit + +class MenuTableViewCell: UITableViewCell { + + @IBOutlet weak var menuImageView: UIImageView! + @IBOutlet weak var menuName: UILabel! + + @IBOutlet weak var rightLabel: UILabel! + + override func awakeFromNib() { + super.awakeFromNib() + } + + override func setSelected(_ selected: Bool, animated: Bool) { + super.setSelected(selected, animated: animated) + } + +} diff --git a/FaceBookProfile/FaceBookProfile/MenuTableViewCell.xib b/FaceBookProfile/FaceBookProfile/MenuTableViewCell.xib new file mode 100644 index 0000000..1bb76de --- /dev/null +++ b/FaceBookProfile/FaceBookProfile/MenuTableViewCell.xib @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/FaceBookProfile/FaceBookProfile/Model.swift b/FaceBookProfile/FaceBookProfile/Model.swift new file mode 100644 index 0000000..3563a85 --- /dev/null +++ b/FaceBookProfile/FaceBookProfile/Model.swift @@ -0,0 +1,14 @@ +// +// Model.swift +// FaceBookProfile +// +// Created by 편성경 on 2023/05/25. +// + +import Foundation + +struct Model { + var leftImageName: String? + var userName: String? + var menuName: String? +} diff --git a/FaceBookProfile/FaceBookProfile/ProfileTableViewCell.swift b/FaceBookProfile/FaceBookProfile/ProfileTableViewCell.swift new file mode 100644 index 0000000..18f9222 --- /dev/null +++ b/FaceBookProfile/FaceBookProfile/ProfileTableViewCell.swift @@ -0,0 +1,31 @@ +// +// ProfileTableViewCell.swift +// FaceBookProfile +// +// Created by 편성경 on 2023/05/24. +// + +import UIKit + +class ProfileTableViewCell: UITableViewCell { + + @IBOutlet weak var profileImageView: UIImageView! + @IBOutlet weak var userNameLabel: UILabel! + + override func awakeFromNib() { + super.awakeFromNib() + + setup() + } + + func setup() { + profileImageView.image = UIImage(named: "bayMax") + } + + override func setSelected(_ selected: Bool, animated: Bool) { + super.setSelected(selected, animated: animated) + + // Configure the view for the selected state + } + +} diff --git a/FaceBookProfile/FaceBookProfile/ProfileTableViewCell.xib b/FaceBookProfile/FaceBookProfile/ProfileTableViewCell.xib new file mode 100644 index 0000000..29c74b8 --- /dev/null +++ b/FaceBookProfile/FaceBookProfile/ProfileTableViewCell.xib @@ -0,0 +1,73 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/FaceBookProfile/FaceBookProfile/ViewController.swift b/FaceBookProfile/FaceBookProfile/ViewController.swift index 34b35ab..820f920 100644 --- a/FaceBookProfile/FaceBookProfile/ViewController.swift +++ b/FaceBookProfile/FaceBookProfile/ViewController.swift @@ -8,12 +8,142 @@ import UIKit class ViewController: UIViewController { + + @IBOutlet weak var tableView: UITableView! + + var model = [[Model]]() override func viewDidLoad() { super.viewDidLoad() - // Do any additional setup after loading the view. + + setupUI() + setupTableView() + + loadData() + + print(model.count) + } + + func setupUI() { + // NavigationBar Color 설정 + navigationController?.navigationBar.backgroundColor = UIColor(red: 0.361, green: 0.447, blue: 0.627, alpha: 1.000) + + // TableView 스크롤 시, NavigationBar 색상 변경 + navigationController?.navigationBar.barTintColor = UIColor(red: 0.361, green: 0.447, blue: 0.627, alpha: 1.000) + } + + func setupTableView() { + tableView.delegate = self + tableView.dataSource = self + + tableView.backgroundColor = UIColor(red: 0.937, green: 0.937, blue: 0.953, alpha: 1.000) + + // ProfileXib 등록 + let profileXib = UINib(nibName: "ProfileTableViewCell", bundle: nil) + tableView.register(profileXib, forCellReuseIdentifier: "ProfileTableViewCell") + + // MenuXib 등록 + let menuXib = UINib(nibName: "MenuTableViewCell", bundle: nil) + tableView.register(menuXib, forCellReuseIdentifier: "MenuTableViewCell") + + // LogOutXib 등록 + let logOutXib = UINib(nibName: "LogOutTableViewCell", bundle: nil) + tableView.register(logOutXib, forCellReuseIdentifier: "LogOutTableViewCell") + + } + + func loadData() { + // Section1 + model.append( + [Model(leftImageName: "bayMax", userName: "BayMax", menuName: nil)] + ) + + // Section2 + model.append( + [Model(leftImageName: "fb_friends", userName: nil, menuName: "Friends") + ,Model(leftImageName: "fb_events", userName: nil, menuName: "Events") + ,Model(leftImageName: "fb_groups", userName: nil, menuName: "Groups") + ,Model(leftImageName: "fb_education", userName: nil, menuName: "CMU") + ,Model(leftImageName: "fb_town_hall", userName: nil, menuName: "Town Hall") + ,Model(leftImageName: "fb_games", userName: nil, menuName: "Instant Games") + ,Model(leftImageName: nil, userName: nil, menuName: "See More...")] + ) + + // Section3 + model.append( + [Model(leftImageName: nil, userName: nil, menuName: "Add Favorites...")] + ) + + // Section4 + model.append( + [Model(leftImageName: "fb_settings", userName: nil, menuName: "Settings") + ,Model(leftImageName: "fb_privacy_shortcuts", userName: nil, menuName: "Privacy Shortcuts") + ,Model(leftImageName: "fb_help_and_support", userName: nil, menuName: "Help and Support")] + ) + + // Section5 + model.append( + [Model(leftImageName: "", userName: "", menuName: "Log Out")] + ) + } - } +extension ViewController: UITableViewDelegate, UITableViewDataSource { + + func numberOfSections(in tableView: UITableView) -> Int { + return model.count + } + + func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int { + return model[section].count + } + + func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { + + if indexPath.section == 0 { + // Section1 Profile + let cell = tableView.dequeueReusableCell(withIdentifier: "ProfileTableViewCell", for: indexPath) as! ProfileTableViewCell + cell.profileImageView.image = UIImage(named: model[indexPath.section][indexPath.row].leftImageName ?? "") + cell.userNameLabel.text = model[indexPath.section][indexPath.row].userName + return cell + } else if indexPath.section == model.count - 1 { + // Section5 LogOut + let cell = tableView.dequeueReusableCell(withIdentifier: "LogOutTableViewCell", for: indexPath) as! LogOutTableViewCell + return cell + } else { + // Section2 ~ Section4 + let cell = tableView.dequeueReusableCell(withIdentifier: "MenuTableViewCell", for: indexPath) as! MenuTableViewCell + cell.menuImageView.image = UIImage(named: model[indexPath.section][indexPath.row].leftImageName ?? "") + cell.menuName.text = model[indexPath.section][indexPath.row].menuName + + if cell.menuImageView.image == nil { + cell.rightLabel.text = "" + cell.menuName.textColor = UIColor(red: 0.361, green: 0.447, blue: 0.627, alpha: 1.000) + } + + return cell + } + + } + + func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat { + return 20 + } + + func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat { + if indexPath.section == 0 && indexPath.row == 0 { + return 60 + } + return 40 + } + + func tableView(_ tableView: UITableView, titleForHeaderInSection section: Int) -> String? { + if section == 2 { + return "FAVORITES" + } + return "" + } + +} diff --git a/FacebookMe_step1.gif b/FacebookMe_step1.gif new file mode 100644 index 0000000..78364a6 Binary files /dev/null and b/FacebookMe_step1.gif differ diff --git a/Project 03_Reference/.DS_Store b/Project 03_Reference/.DS_Store index 2147ba9..6da3ef9 100644 Binary files a/Project 03_Reference/.DS_Store and b/Project 03_Reference/.DS_Store differ diff --git a/Project 03_Reference/FacebookMe.xcodeproj/project.xcworkspace/xcuserdata/openbible.xcuserdatad/UserInterfaceState.xcuserstate b/Project 03_Reference/FacebookMe.xcodeproj/project.xcworkspace/xcuserdata/openbible.xcuserdatad/UserInterfaceState.xcuserstate new file mode 100644 index 0000000..ddfcf62 Binary files /dev/null and b/Project 03_Reference/FacebookMe.xcodeproj/project.xcworkspace/xcuserdata/openbible.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/Project 03_Reference/FacebookMe.xcodeproj/xcuserdata/openbible.xcuserdatad/xcschemes/xcschememanagement.plist b/Project 03_Reference/FacebookMe.xcodeproj/xcuserdata/openbible.xcuserdatad/xcschemes/xcschememanagement.plist new file mode 100644 index 0000000..efbe098 --- /dev/null +++ b/Project 03_Reference/FacebookMe.xcodeproj/xcuserdata/openbible.xcuserdatad/xcschemes/xcschememanagement.plist @@ -0,0 +1,14 @@ + + + + + SchemeUserState + + FacebookMe.xcscheme_^#shared#^_ + + orderHint + 0 + + + + diff --git a/Project 03_Reference/FacebookMe/Assets.xcassets/AppIcon.appiconset/Contents.json b/Project 03_Reference/FacebookMe/Assets.xcassets/AppIcon.appiconset/Contents.json index 1d060ed..9221b9b 100644 --- a/Project 03_Reference/FacebookMe/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/Project 03_Reference/FacebookMe/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -2,92 +2,97 @@ "images" : [ { "idiom" : "iphone", - "size" : "20x20", - "scale" : "2x" + "scale" : "2x", + "size" : "20x20" }, { "idiom" : "iphone", - "size" : "20x20", - "scale" : "3x" + "scale" : "3x", + "size" : "20x20" }, { "idiom" : "iphone", - "size" : "29x29", - "scale" : "2x" + "scale" : "2x", + "size" : "29x29" }, { "idiom" : "iphone", - "size" : "29x29", - "scale" : "3x" + "scale" : "3x", + "size" : "29x29" }, { "idiom" : "iphone", - "size" : "40x40", - "scale" : "2x" + "scale" : "2x", + "size" : "40x40" }, { "idiom" : "iphone", - "size" : "40x40", - "scale" : "3x" + "scale" : "3x", + "size" : "40x40" }, { "idiom" : "iphone", - "size" : "60x60", - "scale" : "2x" + "scale" : "2x", + "size" : "60x60" }, { "idiom" : "iphone", - "size" : "60x60", - "scale" : "3x" + "scale" : "3x", + "size" : "60x60" }, { "idiom" : "ipad", - "size" : "20x20", - "scale" : "1x" + "scale" : "1x", + "size" : "20x20" }, { "idiom" : "ipad", - "size" : "20x20", - "scale" : "2x" + "scale" : "2x", + "size" : "20x20" }, { "idiom" : "ipad", - "size" : "29x29", - "scale" : "1x" + "scale" : "1x", + "size" : "29x29" }, { "idiom" : "ipad", - "size" : "29x29", - "scale" : "2x" + "scale" : "2x", + "size" : "29x29" }, { "idiom" : "ipad", - "size" : "40x40", - "scale" : "1x" + "scale" : "1x", + "size" : "40x40" }, { "idiom" : "ipad", - "size" : "40x40", - "scale" : "2x" + "scale" : "2x", + "size" : "40x40" }, { "idiom" : "ipad", - "size" : "76x76", - "scale" : "1x" + "scale" : "1x", + "size" : "76x76" }, { "idiom" : "ipad", - "size" : "76x76", - "scale" : "2x" + "scale" : "2x", + "size" : "76x76" }, { "idiom" : "ipad", - "size" : "83.5x83.5", - "scale" : "2x" + "scale" : "2x", + "size" : "83.5x83.5" + }, + { + "idiom" : "ios-marketing", + "scale" : "1x", + "size" : "1024x1024" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/Project3.xcworkspace/xcuserdata/openbible.xcuserdatad/UserInterfaceState.xcuserstate b/Project3.xcworkspace/xcuserdata/openbible.xcuserdatad/UserInterfaceState.xcuserstate new file mode 100644 index 0000000..40685ef Binary files /dev/null and b/Project3.xcworkspace/xcuserdata/openbible.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/README.md b/README.md index e0b7392..f7a50c7 100644 --- a/README.md +++ b/README.md @@ -1,36 +1,17 @@ ## 프로젝트 3 : FacebookMe -간략한 설명 - -이 앱의 레퍼런스는 [soapyigu의 Swift-30-Projects](https://github.com/soapyigu/Swift-30-Projects)입니다. - -기본 기능을 모두 구현했다면, 디자인 및 추가 기능 구현은 자유롭게 해주세요. - -## 가이드 - -영상 가이드는 [코드스쿼드 pr연습](https://www.youtube.com/watch?v=lFinZfu3QO0)을 참조해주세요. - -1. 본인 이름으로 브랜치(ex: PAKA)를 생성한 후, 자신의 레포로 fork해주세요. - -2. fork 한 레포에서 기능 또는 화면 단위로 새 브랜치(ex: pr1)를 생성 후 작업 및 커밋합니다. - -3. 커밋했던 브랜치(pr1)에서 자신의 이름 브랜치(PAKA)로 PR을 올려주세요. - -4. 코드 리뷰를 받고 모든 수정사항을 반영한 후 `squash and merge` 옵션으로 자신의 브랜치에 merge해주세요. - -5. merge했던 브랜치(pr1)에서 fork한 레포의 main 브랜치로 checkout후 해당 브랜치(pr1)를 삭제합니다. - -6. 다음 명령어들을 순차적으로 실행합니다. - -``` - git remote add upstream https://github.com/Swift-Master/Project1-GoodAsOldPhones - - git fetch upstream `본인의 브랜치명(ex:PAKA)` - - git rebase upstream `upstream/본인의브랜치명(ex:PAKA)` -``` - -7. 2번으로 돌아가 새로운 작업을 반복합니다. - -## 실제 화면 -![시뮬레이터화면](./FacebookMe.gif) +### [20230524] +1. NavigationBar + - 상단 "Facebook"을 표시하는 NavigationBar 적용 + +### [20230525] +1. TableView & Xib + - TableView 내부에서 사용할 Cell의 모양대로 3종류의 Cell Xib 파일 생성 + (1. 최상단에 있는 UserProfileCell 2. 메뉴 로고 이미지와 메뉴명이 있는 MenuCell 3. 최하단 LogoutCell) +2. Model + - Model 구조체를 만들어서 각 메뉴 정보 삽입 +3. TableView Section + - 총 5개의 섹션에 따라 맞는 Xib 파일 적용 + +### 실행화면 +