-
Notifications
You must be signed in to change notification settings - Fork 0
centerButton 구성 작업 완료 #1
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
ornwoo96
wants to merge
56
commits into
develop
Choose a base branch
from
feat/home
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 40 commits
Commits
Show all changes
56 commits
Select commit
Hold shift + click to select a range
512a138
feat(...) : 한국어 설정
ornwoo96 4107380
test
ornwoo96 a4d2bb1
test2
ornwoo96 6c698cf
Q&A
ornwoo96 65cf705
test2
ornwoo96 ad718e9
test3
ornwoo96 3d979ce
feat/tableView
ornwoo96 f032771
feat/memo1
ornwoo96 1c03d41
feat/memo2
ornwoo96 f053e1f
feat/memo2
ornwoo96 8859f51
feat/memo3
ornwoo96 bf722fa
feat/Menu1
ornwoo96 b510af3
feat/Menu2
ornwoo96 3d8b90d
feat/tabbar
ornwoo96 54c8b60
feat/tabbar
ornwoo96 6797c8d
feat/tabbar
ornwoo96 c1d23cc
feat : navigationbar
ornwoo96 a39b9f5
refactor : tabbar
ornwoo96 03fa074
feat : tabBarCenterButton
ornwoo96 b7c4875
refacor : tabbarController
ornwoo96 fe997e3
refacor : tabbarController2
ornwoo96 3bed5d1
refacor : tabBarController3
ornwoo96 a375493
feat : tabBarPosition
ornwoo96 8b21899
feat : tabBarAnimation
ornwoo96 fa043df
feat : tabBarAnimation2
ornwoo96 9765894
feat : tabBarAnimation3
ornwoo96 870e6d0
feat : tabBarAnimation4
ornwoo96 4e746b4
feat : tabBarisUserInteractionEnabled
ornwoo96 de195ca
feat : add isUserInteraction
ornwoo96 41ef822
feat : isUserInteractionEnabled
ornwoo96 358a1b6
feat : tabBarAnimation
ornwoo96 960209d
feat : tabBarAnimation4?
ornwoo96 e787392
feat : tabBarAnimation6
ornwoo96 6321363
feat : tabBarAnimation7
ornwoo96 93baaae
refecter : tabBarAnimation7
ornwoo96 7494bd6
feat : collectionView1
ornwoo96 55d68e8
feat : UISegmentedControl
ornwoo96 372f721
feat : UISegmentedControl
ornwoo96 c11e032
feat : UISegmentedControl2
ornwoo96 f349dbd
feat : UISegmentedControl3
ornwoo96 f4da4cc
refactor : coredate 정리
ornwoo96 c73d649
feat : HomeView_viperpattern
ornwoo96 4bbc389
Refactor : tabView에centerButton 이슈 해결완료
ornwoo96 8c516a8
feat : CustomSegmentedControl작업중
ornwoo96 be894eb
feat : CustomSegmentedControl 작업중2
ornwoo96 e0fde24
feat : CustomSegmetedControl3
ornwoo96 fb60e19
Refactor : CustomSegmentedControl3
ornwoo96 d38a43c
Refactor : CustomSegmentedControl3
ornwoo96 8c300e4
Refactor : homeView reset
ornwoo96 30078fe
Refactor : homeView segmentedControl buttonTagNumber추가
ornwoo96 02b748f
feat : HomeView Sticky Header 미완
ornwoo96 b0b0b49
feat : HomeView Sticky Header 미완2
ornwoo96 bb636b9
feat : HomeView Header에 randomImageView 추가
ornwoo96 1c69327
feat : HomeView의 tableView 2개 헤더 추가
ornwoo96 83cc499
feat : 쁘띠이미지 30개 추가
ornwoo96 6107a3c
feat : cell 안에 이미지 넣기 완료
ornwoo96 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Binary file not shown.
Binary file not shown.
Large diffs are not rendered by default.
Oops, something went wrong.
80 changes: 80 additions & 0 deletions
80
DogPicture/DogPicture.xcodeproj/xcshareddata/xcschemes/DogPicture.xcscheme
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,80 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <Scheme | ||
| LastUpgradeVersion = "1250" | ||
| version = "1.3"> | ||
| <BuildAction | ||
| parallelizeBuildables = "YES" | ||
| buildImplicitDependencies = "YES"> | ||
| <BuildActionEntries> | ||
| <BuildActionEntry | ||
| buildForTesting = "YES" | ||
| buildForRunning = "YES" | ||
| buildForProfiling = "YES" | ||
| buildForArchiving = "YES" | ||
| buildForAnalyzing = "YES"> | ||
| <BuildableReference | ||
| BuildableIdentifier = "primary" | ||
| BlueprintIdentifier = "0BF238312660C2EE007E48AC" | ||
| BuildableName = "DogPicture.app" | ||
| BlueprintName = "DogPicture" | ||
| ReferencedContainer = "container:DogPicture.xcodeproj"> | ||
| </BuildableReference> | ||
| </BuildActionEntry> | ||
| </BuildActionEntries> | ||
| </BuildAction> | ||
| <TestAction | ||
| buildConfiguration = "Debug" | ||
| selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" | ||
| selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" | ||
| shouldUseLaunchSchemeArgsEnv = "YES"> | ||
| <Testables> | ||
| </Testables> | ||
| </TestAction> | ||
| <LaunchAction | ||
| buildConfiguration = "Debug" | ||
| selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" | ||
| selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" | ||
| language = "ko" | ||
| region = "KR" | ||
| launchStyle = "0" | ||
| useCustomWorkingDirectory = "NO" | ||
| ignoresPersistentStateOnLaunch = "NO" | ||
| debugDocumentVersioning = "YES" | ||
| debugServiceExtension = "internal" | ||
| allowLocationSimulation = "YES"> | ||
| <BuildableProductRunnable | ||
| runnableDebuggingMode = "0"> | ||
| <BuildableReference | ||
| BuildableIdentifier = "primary" | ||
| BlueprintIdentifier = "0BF238312660C2EE007E48AC" | ||
| BuildableName = "DogPicture.app" | ||
| BlueprintName = "DogPicture" | ||
| ReferencedContainer = "container:DogPicture.xcodeproj"> | ||
| </BuildableReference> | ||
| </BuildableProductRunnable> | ||
| </LaunchAction> | ||
| <ProfileAction | ||
| buildConfiguration = "Release" | ||
| shouldUseLaunchSchemeArgsEnv = "YES" | ||
| savedToolIdentifier = "" | ||
| useCustomWorkingDirectory = "NO" | ||
| debugDocumentVersioning = "YES"> | ||
| <BuildableProductRunnable | ||
| runnableDebuggingMode = "0"> | ||
| <BuildableReference | ||
| BuildableIdentifier = "primary" | ||
| BlueprintIdentifier = "0BF238312660C2EE007E48AC" | ||
| BuildableName = "DogPicture.app" | ||
| BlueprintName = "DogPicture" | ||
| ReferencedContainer = "container:DogPicture.xcodeproj"> | ||
| </BuildableReference> | ||
| </BuildableProductRunnable> | ||
| </ProfileAction> | ||
| <AnalyzeAction | ||
| buildConfiguration = "Debug"> | ||
| </AnalyzeAction> | ||
| <ArchiveAction | ||
| buildConfiguration = "Release" | ||
| revealArchiveInOrganizer = "YES"> | ||
| </ArchiveAction> | ||
| </Scheme> |
10 changes: 10 additions & 0 deletions
10
DogPicture/DogPicture.xcworkspace/contents.xcworkspacedata
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
8 changes: 8 additions & 0 deletions
8
DogPicture/DogPicture.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> | ||
| <plist version="1.0"> | ||
| <dict> | ||
| <key>IDEDidComputeMac32BitWarning</key> | ||
| <true/> | ||
| </dict> | ||
| </plist> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
21 changes: 21 additions & 0 deletions
21
DogPicture/DogPicture/Assets.xcassets/chu2.imageset/Contents.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| { | ||
| "images" : [ | ||
| { | ||
| "filename" : "chu2.jpeg", | ||
| "idiom" : "universal", | ||
| "scale" : "1x" | ||
| }, | ||
| { | ||
| "idiom" : "universal", | ||
| "scale" : "2x" | ||
| }, | ||
| { | ||
| "idiom" : "universal", | ||
| "scale" : "3x" | ||
| } | ||
| ], | ||
| "info" : { | ||
| "author" : "xcode", | ||
| "version" : 1 | ||
| } | ||
| } |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 21 additions & 0 deletions
21
DogPicture/DogPicture/Assets.xcassets/chu3.imageset/Contents.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| { | ||
| "images" : [ | ||
| { | ||
| "filename" : "chu3.jpeg", | ||
| "idiom" : "universal", | ||
| "scale" : "1x" | ||
| }, | ||
| { | ||
| "idiom" : "universal", | ||
| "scale" : "2x" | ||
| }, | ||
| { | ||
| "idiom" : "universal", | ||
| "scale" : "3x" | ||
| } | ||
| ], | ||
| "info" : { | ||
| "author" : "xcode", | ||
| "version" : 1 | ||
| } | ||
| } |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 21 additions & 0 deletions
21
DogPicture/DogPicture/Assets.xcassets/chu4.imageset/Contents.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| { | ||
| "images" : [ | ||
| { | ||
| "filename" : "chu4.jpeg", | ||
| "idiom" : "universal", | ||
| "scale" : "1x" | ||
| }, | ||
| { | ||
| "idiom" : "universal", | ||
| "scale" : "2x" | ||
| }, | ||
| { | ||
| "idiom" : "universal", | ||
| "scale" : "3x" | ||
| } | ||
| ], | ||
| "info" : { | ||
| "author" : "xcode", | ||
| "version" : 1 | ||
| } | ||
| } |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 21 additions & 0 deletions
21
DogPicture/DogPicture/Assets.xcassets/chu5.imageset/Contents.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| { | ||
| "images" : [ | ||
| { | ||
| "filename" : "chu5.jpeg", | ||
| "idiom" : "universal", | ||
| "scale" : "1x" | ||
| }, | ||
| { | ||
| "idiom" : "universal", | ||
| "scale" : "2x" | ||
| }, | ||
| { | ||
| "idiom" : "universal", | ||
| "scale" : "3x" | ||
| } | ||
| ], | ||
| "info" : { | ||
| "author" : "xcode", | ||
| "version" : 1 | ||
| } | ||
| } |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 21 additions & 0 deletions
21
DogPicture/DogPicture/Assets.xcassets/plusButton.imageset/Contents.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| { | ||
| "images" : [ | ||
| { | ||
| "filename" : "plusButton.png", | ||
| "idiom" : "universal", | ||
| "scale" : "1x" | ||
| }, | ||
| { | ||
| "idiom" : "universal", | ||
| "scale" : "2x" | ||
| }, | ||
| { | ||
| "idiom" : "universal", | ||
| "scale" : "3x" | ||
| } | ||
| ], | ||
| "info" : { | ||
| "author" : "xcode", | ||
| "version" : 1 | ||
| } | ||
| } |
Binary file added
BIN
+1.39 KB
DogPicture/DogPicture/Assets.xcassets/plusButton.imageset/plusButton.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 16 additions & 0 deletions
16
DogPicture/DogPicture/Camera/CameraView/CameraInteracter.swift
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| // | ||
| // HomeInteracter.swift | ||
| // DogPicture | ||
| // | ||
| // Created by 김동우 on 2021/06/25. | ||
| // | ||
|
|
||
| import UIKit | ||
|
|
||
| class CameraInteracter: CameraInteracterInputProtocol { | ||
| weak var presenter: CameraInteracterOutputProtocol? | ||
| } | ||
|
|
||
| extension CameraInteracter: CameraInteracterOutputProtocol { | ||
|
|
||
| } |
26 changes: 26 additions & 0 deletions
26
DogPicture/DogPicture/Camera/CameraView/CameraPresenter.swift
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| // | ||
| // CameraPresenter.swift | ||
| // DogPicture | ||
| // | ||
| // Created by 김동우 on 2021/06/25. | ||
| // | ||
|
|
||
| import UIKit | ||
|
|
||
| class CameraPresenter: CameraPresenterProtocol { | ||
| func showCamera() { | ||
| print("x") | ||
| } | ||
|
|
||
| weak var view: CameraViewProtocol? | ||
| var interacter: CameraInteracterInputProtocol? | ||
| var router: CameraRouterProtocol? | ||
|
|
||
|
|
||
|
|
||
|
|
||
| } | ||
|
|
||
| extension CameraPresenter: CameraInteracterOutputProtocol { | ||
|
|
||
| } | ||
36 changes: 36 additions & 0 deletions
36
DogPicture/DogPicture/Camera/CameraView/CameraProtocol.swift
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| // | ||
| // CameraProtocol.swift | ||
| // DogPicture | ||
| // | ||
| // Created by 김동우 on 2021/06/25. | ||
| // | ||
|
|
||
| import UIKit | ||
|
|
||
| protocol CameraViewProtocol: AnyObject { | ||
| var presenter: CameraPresenterProtocol? { get set } | ||
|
|
||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 줄바꿈 전체적으로 한번 정리 해야할 거 같아요 |
||
| } | ||
|
|
||
| protocol CameraRouterProtocol: AnyObject { | ||
| static func createCameraModule() -> UIViewController | ||
|
|
||
| } | ||
|
|
||
| protocol CameraPresenterProtocol: AnyObject { | ||
| var view: CameraViewProtocol? { get set } | ||
| var interacter: CameraInteracterInputProtocol? { get set } | ||
| var router: CameraRouterProtocol? { get set } | ||
|
|
||
| func showCamera() | ||
|
|
||
| } | ||
|
|
||
| protocol CameraInteracterInputProtocol: AnyObject { | ||
| var presenter: CameraInteracterOutputProtocol? { get set } | ||
|
|
||
| } | ||
|
|
||
| protocol CameraInteracterOutputProtocol: AnyObject { | ||
|
|
||
| } | ||
31 changes: 31 additions & 0 deletions
31
DogPicture/DogPicture/Camera/CameraView/CameraRouter.swift
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| // | ||
| // CameraRouter.swift | ||
| // DogPicture | ||
| // | ||
| // Created by 김동우 on 2021/06/25. | ||
| // | ||
|
|
||
| import UIKit | ||
|
|
||
| class CameraRouter: CameraRouterProtocol { | ||
| static func createCameraModule() -> UIViewController { | ||
| if let view: CameraViewProtocol = CameraViewController() as? CameraViewProtocol { | ||
| let presenter: CameraPresenterProtocol & CameraInteracterOutputProtocol = CameraPresenter() | ||
| let interacter: CameraInteracterInputProtocol = CameraInteracter() | ||
| let router: CameraRouterProtocol = CameraRouter() | ||
|
|
||
| presenter.view = view | ||
| view.presenter = presenter | ||
| presenter.router = router | ||
| presenter.interacter = interacter | ||
| interacter.presenter = presenter | ||
|
|
||
| if let cameraView = view as? UIViewController { | ||
| return cameraView | ||
| } | ||
| } | ||
| return UIViewController() | ||
| } | ||
|
|
||
|
|
||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
필요하지 않은 줄바꿈인 것 같습니다