Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
765344e
[feat] seongwon/ 디테일 페이지 뷰만 구현
tjddnjs549 Aug 15, 2023
a253207
게이지 수정 필요
Alpaca38 Aug 16, 2023
3746d16
Merge pull request #3 from tjddnjs549/profile
Alpaca38 Aug 16, 2023
5edb2a1
[feat] seongwon/ 3번페이지 뷰만 구성
tjddnjs549 Aug 16, 2023
9b46404
Merge branch 'dev' into feat/3,5pages
tjddnjs549 Aug 16, 2023
2a8a3b3
Merge pull request #4 from tjddnjs549/feat/3,5pages
tjddnjs549 Aug 16, 2023
a599fb0
Merge remote-tracking branch 'refs/remotes/origin/dev'
Dongju3079 Aug 16, 2023
b8e6922
중간병합
Dongju3079 Aug 16, 2023
74fe2b5
Merge pull request #5 from tjddnjs549/feat/coredata
Dongju3079 Aug 16, 2023
cfc7723
게이지 기능 구현 (데이터 받아오는 부분 추가해야 함)
Alpaca38 Aug 16, 2023
25a967c
Merge pull request #6 from tjddnjs549/profile
Alpaca38 Aug 16, 2023
2cf4c5a
플러팅 버튼 생성
Ummhub Aug 16, 2023
5590b7b
Merge branch 'dev' of https://github.com/tjddnjs549/AppleSnack into f…
Ummhub Aug 16, 2023
0b1a756
NotificationCenter 추가, TestViewController(임시) 추가
Alpaca38 Aug 16, 2023
5ef37dd
[feat] : 5번 페이지(생성 페이지) 뷰 구현 및 로직 구현 (로직은 아직 남음)
tjddnjs549 Aug 16, 2023
0d394d5
viewDidLoad에 초기화면?을 위해 updateProgressView() 추가
Alpaca38 Aug 16, 2023
297b184
[feat]: seongwon/ 3,5번 페이지, 로직 구현
tjddnjs549 Aug 16, 2023
ac96ae5
[feat]: seongwon/ 5번페이지 수정
tjddnjs549 Aug 16, 2023
9bbb7c2
클래스 버튼 제작중
Ummhub Aug 17, 2023
5fd080a
[feat]: seongwon/ 3번 페이지, info 수정
tjddnjs549 Aug 17, 2023
b78eeaf
Merge branch 'dev' into profile
Alpaca38 Aug 17, 2023
f764b20
Merge pull request #7 from tjddnjs549/profile
Alpaca38 Aug 17, 2023
9b549da
Merge branch 'dev' into feat/3,5pages
tjddnjs549 Aug 17, 2023
db25a81
Merge pull request #9 from tjddnjs549/feat/3,5pages
tjddnjs549 Aug 17, 2023
1289bbf
[feat]: seongwon/ 5번 페이지 수정
tjddnjs549 Aug 17, 2023
4338e00
Merge branch 'feat/3,5pages' of https://github.com/tjddnjs549/AppleSnack
tjddnjs549 Aug 17, 2023
d7910e3
[feat]: seongwon/ TestViewController 삭제
tjddnjs549 Aug 17, 2023
9e1e66b
[feat]: seongwon/ 수정
tjddnjs549 Aug 17, 2023
6a69d5f
Auto Layout 적용
Alpaca38 Aug 17, 2023
9da0eeb
Auto Layout 수정 (currentValueLabel)
Alpaca38 Aug 17, 2023
c42f3e1
Auto Layout 수정
Alpaca38 Aug 17, 2023
515c0ef
coredata 적용(email core data 필요)
Alpaca38 Aug 18, 2023
0fe07bb
CollectionView Cell 구현
Ummhub Aug 18, 2023
0547a55
[feat]: seongwon/ 3번 페이지 수정
tjddnjs549 Aug 18, 2023
feb127a
Merge pull request #10 from tjddnjs549/feat/3,5pages
tjddnjs549 Aug 18, 2023
06e2037
Merge branch 'dev' into profile
Alpaca38 Aug 18, 2023
bad4388
Merge pull request #11 from tjddnjs549/profile
Alpaca38 Aug 18, 2023
f36dbf7
정음_커밋
Ummhub Aug 18, 2023
3c1b377
Merge pull request #12 from tjddnjs549/CollectionView
Ummhub Aug 18, 2023
73b7268
CollectionView Cell Label 크기에 맞게 설정되도록 함
Ummhub Aug 19, 2023
67324f2
CollectionView Cell 순서대로 삭제
Ummhub Aug 19, 2023
1fdcd95
delete에서 오류발생
Ummhub Aug 19, 2023
d848955
Revert "CollectionView Cell 순서대로 삭제"
Ummhub Aug 19, 2023
2022c7f
collectionview cell 생성기능, 삭제기능 부족
Ummhub Aug 19, 2023
fbfacf5
collectionview cell 삭제기능 구현 필요
Ummhub Aug 19, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 35 additions & 3 deletions AppleSnack.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@
520F91FE2A8A407E005C8897 /* MySnack+CoreDataProperties.swift in Sources */ = {isa = PBXBuildFile; fileRef = 520F91FA2A8A407E005C8897 /* MySnack+CoreDataProperties.swift */; };
520F92022A8A42A7005C8897 /* SnackCore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 520F92012A8A42A7005C8897 /* SnackCore.swift */; };
520F92042A8A42B3005C8897 /* ProfileCore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 520F92032A8A42B3005C8897 /* ProfileCore.swift */; };
632D14132A8CA26E0008BB97 /* WriteViewStoryboard.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 632D14122A8CA26E0008BB97 /* WriteViewStoryboard.storyboard */; };
632D14152A8CA46C0008BB97 /* WriteViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 632D14142A8CA46C0008BB97 /* WriteViewController.swift */; };
63441B942A8A367D0017994F /* DetailViewStoryboard.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 63441B932A8A367D0017994F /* DetailViewStoryboard.storyboard */; };
63441B962A8A3C2C0017994F /* DetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63441B952A8A3C2C0017994F /* DetailViewController.swift */; };
634976302A8A13D500A071CA /* .gitignore in Resources */ = {isa = PBXBuildFile; fileRef = 6349762F2A8A13D500A071CA /* .gitignore */; };
63523EC52A8A0EE7002C677A /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63523EC42A8A0EE7002C677A /* AppDelegate.swift */; };
63523EC72A8A0EE7002C677A /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63523EC62A8A0EE7002C677A /* SceneDelegate.swift */; };
Expand All @@ -21,6 +25,10 @@
63523ECF2A8A0EE7002C677A /* AppleSnack.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 63523ECD2A8A0EE7002C677A /* AppleSnack.xcdatamodeld */; };
63523ED12A8A0EE8002C677A /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 63523ED02A8A0EE8002C677A /* Assets.xcassets */; };
63523ED42A8A0EE8002C677A /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 63523ED22A8A0EE8002C677A /* LaunchScreen.storyboard */; };
D14C85712A8BC79600A9216D /* Help.swift in Sources */ = {isa = PBXBuildFile; fileRef = D14C85702A8BC79600A9216D /* Help.swift */; };
D1AB9A402A8A3D9A00EB4C56 /* ProfileViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D1AB9A3F2A8A3D9A00EB4C56 /* ProfileViewController.swift */; };
D1AB9A422A8A3EAC00EB4C56 /* ProfileView.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = D1AB9A412A8A3EAC00EB4C56 /* ProfileView.storyboard */; };
E50EA25E2A8DF1EA00F8FA13 /* MainCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E50EA25D2A8DF1EA00F8FA13 /* MainCollectionViewCell.swift */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
Expand All @@ -30,6 +38,10 @@
520F91FA2A8A407E005C8897 /* MySnack+CoreDataProperties.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "MySnack+CoreDataProperties.swift"; sourceTree = "<group>"; };
520F92012A8A42A7005C8897 /* SnackCore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SnackCore.swift; sourceTree = "<group>"; };
520F92032A8A42B3005C8897 /* ProfileCore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileCore.swift; sourceTree = "<group>"; };
632D14122A8CA26E0008BB97 /* WriteViewStoryboard.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = WriteViewStoryboard.storyboard; sourceTree = "<group>"; };
632D14142A8CA46C0008BB97 /* WriteViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WriteViewController.swift; sourceTree = "<group>"; };
63441B932A8A367D0017994F /* DetailViewStoryboard.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = DetailViewStoryboard.storyboard; sourceTree = "<group>"; };
63441B952A8A3C2C0017994F /* DetailViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DetailViewController.swift; sourceTree = "<group>"; };
6349762F2A8A13D500A071CA /* .gitignore */ = {isa = PBXFileReference; lastKnownFileType = text; path = .gitignore; sourceTree = "<group>"; };
63523EC12A8A0EE7002C677A /* AppleSnack.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = AppleSnack.app; sourceTree = BUILT_PRODUCTS_DIR; };
63523EC42A8A0EE7002C677A /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
Expand All @@ -40,6 +52,10 @@
63523ED02A8A0EE8002C677A /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
63523ED32A8A0EE8002C677A /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
63523ED52A8A0EE8002C677A /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
D14C85702A8BC79600A9216D /* Help.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Help.swift; sourceTree = "<group>"; };
D1AB9A3F2A8A3D9A00EB4C56 /* ProfileViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileViewController.swift; sourceTree = "<group>"; };
D1AB9A412A8A3EAC00EB4C56 /* ProfileView.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = ProfileView.storyboard; sourceTree = "<group>"; };
E50EA25D2A8DF1EA00F8FA13 /* MainCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainCollectionViewCell.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -93,12 +109,20 @@
63523EC32A8A0EE7002C677A /* AppleSnack */ = {
isa = PBXGroup;
children = (
520F92002A8A4288005C8897 /* Model(profile) */,
520F91FF2A8A408A005C8897 /* Model(snack) */,
63523EC42A8A0EE7002C677A /* AppDelegate.swift */,
63523EC62A8A0EE7002C677A /* SceneDelegate.swift */,
63523EC82A8A0EE7002C677A /* ViewController.swift */,
520F92002A8A4288005C8897 /* Model(profile) */,
520F91FF2A8A408A005C8897 /* Model(snack) */,
63523ECA2A8A0EE7002C677A /* Main.storyboard */,
E50EA25D2A8DF1EA00F8FA13 /* MainCollectionViewCell.swift */,
63441B932A8A367D0017994F /* DetailViewStoryboard.storyboard */,
632D14122A8CA26E0008BB97 /* WriteViewStoryboard.storyboard */,
D1AB9A412A8A3EAC00EB4C56 /* ProfileView.storyboard */,
632D14142A8CA46C0008BB97 /* WriteViewController.swift */,
63523EC82A8A0EE7002C677A /* ViewController.swift */,
63441B952A8A3C2C0017994F /* DetailViewController.swift */,
D1AB9A3F2A8A3D9A00EB4C56 /* ProfileViewController.swift */,
D14C85702A8BC79600A9216D /* Help.swift */,
63523ED02A8A0EE8002C677A /* Assets.xcassets */,
63523ED22A8A0EE8002C677A /* LaunchScreen.storyboard */,
63523ED52A8A0EE8002C677A /* Info.plist */,
Expand Down Expand Up @@ -167,7 +191,10 @@
files = (
634976302A8A13D500A071CA /* .gitignore in Resources */,
63523ED42A8A0EE8002C677A /* LaunchScreen.storyboard in Resources */,
63441B942A8A367D0017994F /* DetailViewStoryboard.storyboard in Resources */,
632D14132A8CA26E0008BB97 /* WriteViewStoryboard.storyboard in Resources */,
63523ED12A8A0EE8002C677A /* Assets.xcassets in Resources */,
D1AB9A422A8A3EAC00EB4C56 /* ProfileView.storyboard in Resources */,
63523ECC2A8A0EE7002C677A /* Main.storyboard in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand All @@ -180,8 +207,13 @@
buildActionMask = 2147483647;
files = (
520F91FE2A8A407E005C8897 /* MySnack+CoreDataProperties.swift in Sources */,
63441B962A8A3C2C0017994F /* DetailViewController.swift in Sources */,
D1AB9A402A8A3D9A00EB4C56 /* ProfileViewController.swift in Sources */,
E50EA25E2A8DF1EA00F8FA13 /* MainCollectionViewCell.swift in Sources */,
63523EC92A8A0EE7002C677A /* ViewController.swift in Sources */,
520F92022A8A42A7005C8897 /* SnackCore.swift in Sources */,
D14C85712A8BC79600A9216D /* Help.swift in Sources */,
632D14152A8CA46C0008BB97 /* WriteViewController.swift in Sources */,
63523ECF2A8A0EE7002C677A /* AppleSnack.xcdatamodeld in Sources */,
63523EC52A8A0EE7002C677A /* AppDelegate.swift in Sources */,
63523EC72A8A0EE7002C677A /* SceneDelegate.swift in Sources */,
Expand Down
Binary file not shown.
21 changes: 21 additions & 0 deletions AppleSnack/Assets.xcassets/cat.imageset/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"filename" : "cat.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Binary file added AppleSnack/Assets.xcassets/cat.imageset/cat.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading