Skip to content
Open
Show file tree
Hide file tree
Changes from 40 commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
512a138
feat(...) : 한국어 설정
ornwoo96 May 28, 2021
4107380
test
ornwoo96 Jun 22, 2021
a4d2bb1
test2
ornwoo96 Jun 23, 2021
6c698cf
Q&A
ornwoo96 Jun 24, 2021
65cf705
test2
ornwoo96 Jun 24, 2021
ad718e9
test3
ornwoo96 Jun 25, 2021
3d979ce
feat/tableView
ornwoo96 Jun 25, 2021
f032771
feat/memo1
ornwoo96 Jun 26, 2021
1c03d41
feat/memo2
ornwoo96 Jun 28, 2021
f053e1f
feat/memo2
ornwoo96 Jun 29, 2021
8859f51
feat/memo3
ornwoo96 Jun 29, 2021
bf722fa
feat/Menu1
ornwoo96 Jul 13, 2021
b510af3
feat/Menu2
ornwoo96 Jul 14, 2021
3d8b90d
feat/tabbar
ornwoo96 Jul 20, 2021
54c8b60
feat/tabbar
ornwoo96 Jul 21, 2021
6797c8d
feat/tabbar
ornwoo96 Jul 21, 2021
c1d23cc
feat : navigationbar
ornwoo96 Jul 24, 2021
a39b9f5
refactor : tabbar
ornwoo96 Jul 25, 2021
03fa074
feat : tabBarCenterButton
ornwoo96 Jul 25, 2021
b7c4875
refacor : tabbarController
ornwoo96 Jul 25, 2021
fe997e3
refacor : tabbarController2
ornwoo96 Jul 27, 2021
3bed5d1
refacor : tabBarController3
ornwoo96 Jul 29, 2021
a375493
feat : tabBarPosition
ornwoo96 Jul 30, 2021
8b21899
feat : tabBarAnimation
ornwoo96 Aug 3, 2021
fa043df
feat : tabBarAnimation2
ornwoo96 Aug 4, 2021
9765894
feat : tabBarAnimation3
ornwoo96 Aug 5, 2021
870e6d0
feat : tabBarAnimation4
ornwoo96 Aug 6, 2021
4e746b4
feat : tabBarisUserInteractionEnabled
ornwoo96 Aug 7, 2021
de195ca
feat : add isUserInteraction
ornwoo96 Aug 8, 2021
41ef822
feat : isUserInteractionEnabled
ornwoo96 Aug 9, 2021
358a1b6
feat : tabBarAnimation
ornwoo96 Aug 9, 2021
960209d
feat : tabBarAnimation4?
ornwoo96 Aug 12, 2021
e787392
feat : tabBarAnimation6
ornwoo96 Aug 13, 2021
6321363
feat : tabBarAnimation7
ornwoo96 Aug 13, 2021
93baaae
refecter : tabBarAnimation7
ornwoo96 Aug 14, 2021
7494bd6
feat : collectionView1
ornwoo96 Aug 15, 2021
55d68e8
feat : UISegmentedControl
ornwoo96 Aug 16, 2021
372f721
feat : UISegmentedControl
ornwoo96 Aug 18, 2021
c11e032
feat : UISegmentedControl2
ornwoo96 Aug 19, 2021
f349dbd
feat : UISegmentedControl3
ornwoo96 Aug 22, 2021
f4da4cc
refactor : coredate 정리
ornwoo96 Aug 22, 2021
c73d649
feat : HomeView_viperpattern
ornwoo96 Aug 23, 2021
4bbc389
Refactor : tabView에centerButton 이슈 해결완료
ornwoo96 Aug 24, 2021
8c516a8
feat : CustomSegmentedControl작업중
ornwoo96 Aug 25, 2021
be894eb
feat : CustomSegmentedControl 작업중2
ornwoo96 Aug 31, 2021
e0fde24
feat : CustomSegmetedControl3
ornwoo96 Aug 31, 2021
fb60e19
Refactor : CustomSegmentedControl3
ornwoo96 Aug 31, 2021
d38a43c
Refactor : CustomSegmentedControl3
ornwoo96 Sep 1, 2021
8c300e4
Refactor : homeView reset
ornwoo96 Sep 1, 2021
30078fe
Refactor : homeView segmentedControl buttonTagNumber추가
ornwoo96 Sep 1, 2021
02b748f
feat : HomeView Sticky Header 미완
ornwoo96 Sep 3, 2021
b0b0b49
feat : HomeView Sticky Header 미완2
ornwoo96 Sep 4, 2021
bb636b9
feat : HomeView Header에 randomImageView 추가
ornwoo96 Sep 5, 2021
1c69327
feat : HomeView의 tableView 2개 헤더 추가
ornwoo96 Sep 7, 2021
83cc499
feat : 쁘띠이미지 30개 추가
ornwoo96 Sep 8, 2021
6107a3c
feat : cell 안에 이미지 넣기 완료
ornwoo96 Sep 8, 2021
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
Binary file added .DS_Store
Binary file not shown.
Binary file added DogPicture/.DS_Store
Binary file not shown.
278 changes: 261 additions & 17 deletions DogPicture/DogPicture.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

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 DogPicture/DogPicture.xcworkspace/contents.xcworkspacedata

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

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>
11 changes: 8 additions & 3 deletions DogPicture/DogPicture/AppDelegate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,18 @@

import UIKit
import CoreData

@main
class AppDelegate: UIResponder, UIApplicationDelegate {


var window: UIWindow?

func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
// Override point for customization after application launch.
let tabVC = TabViewController()
tabVC.view.backgroundColor = UIColor.white
window = UIWindow(frame: UIScreen.main.bounds)
window?.rootViewController = tabVC
window?.makeKeyAndVisible()
return true
}

Expand All @@ -33,7 +37,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
}

// MARK: - Core Data stack



lazy var persistentContainer: NSPersistentContainer = {
/*
The persistent container for the application. This implementation
Expand Down
21 changes: 21 additions & 0 deletions DogPicture/DogPicture/Assets.xcassets/chu2.imageset/Contents.json
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 DogPicture/DogPicture/Assets.xcassets/chu3.imageset/Contents.json
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 DogPicture/DogPicture/Assets.xcassets/chu4.imageset/Contents.json
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 DogPicture/DogPicture/Assets.xcassets/chu5.imageset/Contents.json
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.
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
}
}
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 DogPicture/DogPicture/Camera/CameraView/CameraInteracter.swift
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 DogPicture/DogPicture/Camera/CameraView/CameraPresenter.swift
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?




Comment on lines +18 to +21

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change

필요하지 않은 줄바꿈인 것 같습니다

}

extension CameraPresenter: CameraInteracterOutputProtocol {

}
36 changes: 36 additions & 0 deletions DogPicture/DogPicture/Camera/CameraView/CameraProtocol.swift
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 }

Choose a reason for hiding this comment

The 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 DogPicture/DogPicture/Camera/CameraView/CameraRouter.swift
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()
}


}
Loading