diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index 6ac406df..00000000 Binary files a/.DS_Store and /dev/null differ diff --git a/Zeepy/.DS_Store b/Zeepy/.DS_Store deleted file mode 100644 index 7668f770..00000000 Binary files a/Zeepy/.DS_Store and /dev/null differ diff --git a/Zeepy/Zeepy.xcworkspace/xcuserdata/hansol.xcuserdatad/UserInterfaceState.xcuserstate b/Zeepy/Zeepy.xcworkspace/xcuserdata/hansol.xcuserdatad/UserInterfaceState.xcuserstate index 3ad74f77..7c86aa39 100644 Binary files a/Zeepy/Zeepy.xcworkspace/xcuserdata/hansol.xcuserdatad/UserInterfaceState.xcuserstate and b/Zeepy/Zeepy.xcworkspace/xcuserdata/hansol.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/Zeepy/Zeepy.xcworkspace/xcuserdata/hansol.xcuserdatad/xcschemes/xcschememanagement.plist b/Zeepy/Zeepy.xcworkspace/xcuserdata/hansol.xcuserdatad/xcschemes/xcschememanagement.plist index e12d78c6..2096130f 100644 --- a/Zeepy/Zeepy.xcworkspace/xcuserdata/hansol.xcuserdatad/xcschemes/xcschememanagement.plist +++ b/Zeepy/Zeepy.xcworkspace/xcuserdata/hansol.xcuserdatad/xcschemes/xcschememanagement.plist @@ -4,929 +4,71 @@ SchemeUserState - Rx (Playground) 1.xcscheme - - isShown - - orderHint - 4 - - Rx (Playground) 10.xcscheme - - isShown - - orderHint - 6 - - Rx (Playground) 11.xcscheme - - isShown - - orderHint - 20 - - Rx (Playground) 12.xcscheme - - isShown - - orderHint - 23 - - Rx (Playground) 13.xcscheme - - isShown - - orderHint - 25 - - Rx (Playground) 14.xcscheme - - isShown - - orderHint - 26 - - Rx (Playground) 15.xcscheme - - isShown - - orderHint - 30 - - Rx (Playground) 16.xcscheme - - isShown - - orderHint - 31 - - Rx (Playground) 17.xcscheme - - isShown - - orderHint - 32 - - Rx (Playground) 18.xcscheme - - isShown - - orderHint - 39 - - Rx (Playground) 19.xcscheme - - isShown - - orderHint - 40 - - Rx (Playground) 2.xcscheme - - isShown - - orderHint - 5 - - Rx (Playground) 20.xcscheme - - isShown - - orderHint - 41 - - Rx (Playground) 21.xcscheme - - isShown - - orderHint - 45 - - Rx (Playground) 22.xcscheme - - isShown - - orderHint - 46 - - Rx (Playground) 23.xcscheme - - isShown - - orderHint - 47 - - Rx (Playground) 24.xcscheme - - isShown - - orderHint - 48 - - Rx (Playground) 25.xcscheme - - isShown - - orderHint - 49 - - Rx (Playground) 26.xcscheme - - isShown - - orderHint - 50 - - Rx (Playground) 27.xcscheme - - isShown - - orderHint - 54 - - Rx (Playground) 28.xcscheme - - isShown - - orderHint - 55 - - Rx (Playground) 29.xcscheme - - isShown - - orderHint - 56 - - Rx (Playground) 3.xcscheme - - isShown - - orderHint - 7 - - Rx (Playground) 30.xcscheme - - isShown - - orderHint - 63 - - Rx (Playground) 31.xcscheme - - isShown - - orderHint - 64 - - Rx (Playground) 32.xcscheme - - isShown - - orderHint - 65 - - Rx (Playground) 33.xcscheme - - isShown - - orderHint - 69 - - Rx (Playground) 34.xcscheme - - isShown - - orderHint - 70 - - Rx (Playground) 35.xcscheme - - isShown - - orderHint - 71 - - Rx (Playground) 36.xcscheme - - isShown - - orderHint - 72 - - Rx (Playground) 37.xcscheme - - isShown - - orderHint - 73 - - Rx (Playground) 38.xcscheme - - isShown - - orderHint - 74 - - Rx (Playground) 39.xcscheme - - isShown - - orderHint - 81 - - Rx (Playground) 4.xcscheme - - isShown - - orderHint - 8 - - Rx (Playground) 40.xcscheme - - isShown - - orderHint - 82 - - Rx (Playground) 41.xcscheme - - isShown - - orderHint - 83 - - Rx (Playground) 42.xcscheme - - isShown - - orderHint - 87 - - Rx (Playground) 43.xcscheme - - isShown - - orderHint - 88 - - Rx (Playground) 44.xcscheme - - isShown - - orderHint - 89 - - Rx (Playground) 45.xcscheme - - isShown - - orderHint - 93 - - Rx (Playground) 46.xcscheme - - isShown - - orderHint - 94 - - Rx (Playground) 47.xcscheme - - isShown - - orderHint - 95 - - Rx (Playground) 48.xcscheme - - isShown - - orderHint - 99 - - Rx (Playground) 49.xcscheme - - isShown - - orderHint - 100 - - Rx (Playground) 5.xcscheme - - isShown - - orderHint - 9 - - Rx (Playground) 50.xcscheme - - isShown - - orderHint - 101 - - Rx (Playground) 51.xcscheme - - isShown - - orderHint - 105 - - Rx (Playground) 52.xcscheme - - isShown - - orderHint - 106 - - Rx (Playground) 53.xcscheme - - isShown - - orderHint - 107 - - Rx (Playground) 54.xcscheme - - isShown - - orderHint - 139 - - Rx (Playground) 55.xcscheme - - isShown - - orderHint - 140 - - Rx (Playground) 56.xcscheme - - isShown - - orderHint - 141 - - Rx (Playground) 57.xcscheme - - isShown - - orderHint - 145 - - Rx (Playground) 58.xcscheme - - isShown - - orderHint - 146 - - Rx (Playground) 59.xcscheme - - isShown - - orderHint - 147 - - Rx (Playground) 6.xcscheme - - isShown - - orderHint - 13 - - Rx (Playground) 60.xcscheme - - isShown - - orderHint - 148 - - Rx (Playground) 61.xcscheme - - isShown - - orderHint - 149 - - Rx (Playground) 62.xcscheme - - isShown - - orderHint - 150 - - Rx (Playground) 63.xcscheme - - isShown - - orderHint - 156 - - Rx (Playground) 64.xcscheme - - isShown - - orderHint - 157 - - Rx (Playground) 65.xcscheme - - isShown - - orderHint - 158 - - Rx (Playground) 7.xcscheme - - isShown - - orderHint - 14 - - Rx (Playground) 8.xcscheme - - isShown - - orderHint - 15 - - Rx (Playground) 9.xcscheme - - isShown - - orderHint - 19 - - Rx (Playground).xcscheme - - isShown - - orderHint - 3 - - SnapKitPlayground (Playground) 1.xcscheme - - isShown - - orderHint - 10 - - SnapKitPlayground (Playground) 10.xcscheme - - isShown - - orderHint - 7 - - SnapKitPlayground (Playground) 11.xcscheme - - isShown - - orderHint - 8 - - SnapKitPlayground (Playground) 12.xcscheme - - isShown - - orderHint - 12 - - SnapKitPlayground (Playground) 13.xcscheme - - isShown - - orderHint - 13 - - SnapKitPlayground (Playground) 14.xcscheme - - isShown - - orderHint - 14 - - SnapKitPlayground (Playground) 15.xcscheme - - isShown - - orderHint - 15 - - SnapKitPlayground (Playground) 16.xcscheme - - isShown - - orderHint - 16 - - SnapKitPlayground (Playground) 17.xcscheme - - isShown - - orderHint - 17 - - SnapKitPlayground (Playground) 18.xcscheme - - isShown - - orderHint - 18 - - SnapKitPlayground (Playground) 19.xcscheme - - isShown - - orderHint - 19 - - SnapKitPlayground (Playground) 2.xcscheme - - isShown - - orderHint - 11 - - SnapKitPlayground (Playground) 20.xcscheme - - isShown - - orderHint - 20 - - SnapKitPlayground (Playground) 21.xcscheme - - isShown - - orderHint - 21 - - SnapKitPlayground (Playground) 22.xcscheme - - isShown - - orderHint - 22 - - SnapKitPlayground (Playground) 23.xcscheme - - isShown - - orderHint - 23 - - SnapKitPlayground (Playground) 24.xcscheme - - isShown - - orderHint - 24 - - SnapKitPlayground (Playground) 25.xcscheme - - isShown - - orderHint - 25 - - SnapKitPlayground (Playground) 26.xcscheme - - isShown - - orderHint - 26 - - SnapKitPlayground (Playground) 27.xcscheme - - isShown - - orderHint - 27 - - SnapKitPlayground (Playground) 28.xcscheme - - isShown - - orderHint - 28 - - SnapKitPlayground (Playground) 29.xcscheme - - isShown - - orderHint - 29 - - SnapKitPlayground (Playground) 3.xcscheme - - isShown - - orderHint - 0 - - SnapKitPlayground (Playground) 30.xcscheme - - isShown - - orderHint - 30 - - SnapKitPlayground (Playground) 31.xcscheme - - isShown - - orderHint - 31 - - SnapKitPlayground (Playground) 32.xcscheme - - isShown - - orderHint - 32 - - SnapKitPlayground (Playground) 33.xcscheme - - isShown - - orderHint - 33 - - SnapKitPlayground (Playground) 34.xcscheme - - isShown - - orderHint - 34 - - SnapKitPlayground (Playground) 35.xcscheme - - isShown - - orderHint - 35 - - SnapKitPlayground (Playground) 36.xcscheme - - isShown - - orderHint - 36 - - SnapKitPlayground (Playground) 37.xcscheme - - isShown - - orderHint - 37 - - SnapKitPlayground (Playground) 38.xcscheme - - isShown - - orderHint - 38 - - SnapKitPlayground (Playground) 39.xcscheme - - isShown - - orderHint - 39 - - SnapKitPlayground (Playground) 4.xcscheme + SnapKitPlayground (Playground) 1.xcscheme - isShown - orderHint 1 - SnapKitPlayground (Playground) 40.xcscheme - - isShown - - orderHint - 40 - - SnapKitPlayground (Playground) 41.xcscheme - - isShown - - orderHint - 41 - - SnapKitPlayground (Playground) 42.xcscheme - - isShown - - orderHint - 42 - - SnapKitPlayground (Playground) 43.xcscheme - - isShown - - orderHint - 43 - - SnapKitPlayground (Playground) 44.xcscheme - - isShown - - orderHint - 44 - - SnapKitPlayground (Playground) 45.xcscheme + SnapKitPlayground (Playground) 10.xcscheme isShown orderHint 45 - SnapKitPlayground (Playground) 46.xcscheme + SnapKitPlayground (Playground) 11.xcscheme isShown orderHint 46 - SnapKitPlayground (Playground) 47.xcscheme - - isShown - - orderHint - 47 - - SnapKitPlayground (Playground) 48.xcscheme - - isShown - - orderHint - 50 - - SnapKitPlayground (Playground) 49.xcscheme - - isShown - - orderHint - 51 - - SnapKitPlayground (Playground) 5.xcscheme + SnapKitPlayground (Playground) 2.xcscheme - isShown - orderHint 2 - SnapKitPlayground (Playground) 50.xcscheme - - isShown - - orderHint - 52 - - SnapKitPlayground (Playground) 51.xcscheme - - isShown - - orderHint - 102 - - SnapKitPlayground (Playground) 52.xcscheme - - isShown - - orderHint - 103 - - SnapKitPlayground (Playground) 53.xcscheme - - isShown - - orderHint - 104 - - SnapKitPlayground (Playground) 54.xcscheme - - isShown - - orderHint - 136 - - SnapKitPlayground (Playground) 55.xcscheme - - isShown - - orderHint - 137 - - SnapKitPlayground (Playground) 56.xcscheme - - isShown - - orderHint - 138 - - SnapKitPlayground (Playground) 57.xcscheme - - isShown - - orderHint - 142 - - SnapKitPlayground (Playground) 58.xcscheme - - isShown - - orderHint - 143 - - SnapKitPlayground (Playground) 59.xcscheme - - isShown - - orderHint - 144 - - SnapKitPlayground (Playground) 6.xcscheme + SnapKitPlayground (Playground) 3.xcscheme - isShown - orderHint 3 - SnapKitPlayground (Playground) 60.xcscheme - - isShown - - orderHint - 151 - - SnapKitPlayground (Playground) 61.xcscheme - - isShown - - orderHint - 152 - - SnapKitPlayground (Playground) 62.xcscheme - - isShown - - orderHint - 153 - - SnapKitPlayground (Playground) 63.xcscheme + SnapKitPlayground (Playground) 4.xcscheme - isShown - orderHint - 159 + 4 - SnapKitPlayground (Playground) 64.xcscheme + SnapKitPlayground (Playground) 5.xcscheme - isShown - orderHint - 160 + 5 - SnapKitPlayground (Playground) 65.xcscheme + SnapKitPlayground (Playground) 6.xcscheme - isShown - orderHint - 161 + 8 SnapKitPlayground (Playground) 7.xcscheme - isShown - orderHint - 4 + 9 SnapKitPlayground (Playground) 8.xcscheme - isShown - orderHint - 5 + 10 SnapKitPlayground (Playground) 9.xcscheme isShown orderHint - 6 + 44 SnapKitPlayground (Playground).xcscheme - isShown - orderHint - 9 + 0 diff --git a/Zeepy/Zeepy/.DS_Store b/Zeepy/Zeepy/.DS_Store index f03a006b..1ca9211b 100644 Binary files a/Zeepy/Zeepy/.DS_Store and b/Zeepy/Zeepy/.DS_Store differ diff --git a/Zeepy/Zeepy/Scene/.DS_Store b/Zeepy/Zeepy/Scene/.DS_Store index fdda4c24..d250432d 100644 Binary files a/Zeepy/Zeepy/Scene/.DS_Store and b/Zeepy/Zeepy/Scene/.DS_Store differ diff --git a/Zeepy/Zeepy/Scene/Community/.DS_Store b/Zeepy/Zeepy/Scene/Community/.DS_Store index 2c64d847..96bb49d3 100644 Binary files a/Zeepy/Zeepy/Scene/Community/.DS_Store and b/Zeepy/Zeepy/Scene/Community/.DS_Store differ diff --git a/Zeepy/Zeepy/Scene/MyPage/.DS_Store b/Zeepy/Zeepy/Scene/MyPage/.DS_Store index ae4db1f9..1c344816 100644 Binary files a/Zeepy/Zeepy/Scene/MyPage/.DS_Store and b/Zeepy/Zeepy/Scene/MyPage/.DS_Store differ diff --git a/Zeepy/Zeepy/Scene/MyPage/View/ViewController/MypageViewController.swift b/Zeepy/Zeepy/Scene/MyPage/View/ViewController/MypageViewController.swift index 3c2d6890..9733d979 100644 --- a/Zeepy/Zeepy/Scene/MyPage/View/ViewController/MypageViewController.swift +++ b/Zeepy/Zeepy/Scene/MyPage/View/ViewController/MypageViewController.swift @@ -281,6 +281,8 @@ extension MypageViewController { private func setupNavigation() { self.navigationController?.navigationBar.isHidden = true navigationView.setUp(title: "마이페이지") + navigationView.backBtn.isHidden = true + navigationView.backBtn.isEnabled = false } func reloadTableView() { diff --git a/Zeepy/Zeepy/Scene/Search/.DS_Store b/Zeepy/Zeepy/Scene/Search/.DS_Store index d6214024..167b9636 100644 Binary files a/Zeepy/Zeepy/Scene/Search/.DS_Store and b/Zeepy/Zeepy/Scene/Search/.DS_Store differ diff --git a/Zeepy/Zeepy/Scene/Search/View/.DS_Store b/Zeepy/Zeepy/Scene/Search/View/.DS_Store index bcbc083d..1cd8dc97 100644 Binary files a/Zeepy/Zeepy/Scene/Search/View/.DS_Store and b/Zeepy/Zeepy/Scene/Search/View/.DS_Store differ diff --git a/Zeepy/Zeepy/Supports/Info.plist b/Zeepy/Zeepy/Supports/Info.plist index 40f70fb5..58e75950 100644 --- a/Zeepy/Zeepy/Supports/Info.plist +++ b/Zeepy/Zeepy/Supports/Info.plist @@ -40,7 +40,7 @@ CFBundleVersion - 1543 + 1544 ITSAppUsesNonExemptEncryption KAKAO_APP_KEY