-
Notifications
You must be signed in to change notification settings - Fork 0
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
DMVM-192(feat): navigation 구현 #22
Open
bokoo14
wants to merge
15
commits into
develop
Choose a base branch
from
feat/navigation
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 all commits
Commits
Show all changes
15 commits
Select commit
Hold shift + click to select a range
bf77c77
DMVM-192(feat): TabView 구성 및 탭 아이콘 등록
bokoo14 5bd47ed
DMVM-192(refactor): TabHeader 컴포넌트 리팩토링
bokoo14 12f6556
DMVM-192(refactor): TabHeader 컴포넌트 리팩토링
bokoo14 981cb55
DMVM-192(refactor): TabView 리팩토링
bokoo14 4a5110f
DMVM-192(feat): navigation VM 구현 및 SearchView 연결
bokoo14 a49ff44
DMVM-192(feat): notification 네비게이션 연결 및 UI 리팩토링
bokoo14 0d6a023
DMVM-192(chore): NotificationView 디테일 수정
bokoo14 9c5e2ee
DMVM-192(feat): Company뷰 네비게이션 구현 및 UI 수정
bokoo14 a8b5f24
DMVM-192(refactor): 예약 Header 리팩토링
bokoo14 7c55031
DMVM-192(refactor): 예약뷰 리팩토링
bokoo14 088601f
DMVM-192(feat): tuist로 URL 스킴 세팅 (딥링크)
bokoo14 b87141e
DMVM-192(chore): Preview Navigation 연결
bokoo14 407a20a
DMVM-192(refactor): NavigationViewModel 초기화 가독성 개선
bokoo14 46b5e1e
DMVM-192(refactor): TabHeaderComponent 초기화 메서드 수정
bokoo14 5d5a67a
DMVM-192(feat): 네비게이션 컨트롤러 인터렉티브 제스쳐 활성화
bokoo14 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
3 changes: 3 additions & 0 deletions
3
...ects/App/Resources/Images.xcassets/TabItem/ChatTabItem.imageset/ChatTabItem.svg
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
Mongle/Projects/App/Resources/Images.xcassets/TabItem/ChatTabItem.imageset/Contents.json
This file contains 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" : "ChatTabItem.svg", | ||
"idiom" : "universal", | ||
"scale" : "1x" | ||
}, | ||
{ | ||
"idiom" : "universal", | ||
"scale" : "2x" | ||
}, | ||
{ | ||
"idiom" : "universal", | ||
"scale" : "3x" | ||
} | ||
], | ||
"info" : { | ||
"author" : "xcode", | ||
"version" : 1 | ||
} | ||
} |
3 changes: 3 additions & 0 deletions
3
...es/Images.xcassets/TabItem/ChatTabItemSelected.imageset/ChatTabItemSelected.svg
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
...Projects/App/Resources/Images.xcassets/TabItem/ChatTabItemSelected.imageset/Contents.json
This file contains 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" : "ChatTabItemSelected.svg", | ||
"idiom" : "universal", | ||
"scale" : "1x" | ||
}, | ||
{ | ||
"idiom" : "universal", | ||
"scale" : "2x" | ||
}, | ||
{ | ||
"idiom" : "universal", | ||
"scale" : "3x" | ||
} | ||
], | ||
"info" : { | ||
"author" : "xcode", | ||
"version" : 1 | ||
} | ||
} |
6 changes: 6 additions & 0 deletions
6
Mongle/Projects/App/Resources/Images.xcassets/TabItem/Contents.json
This file contains 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,6 @@ | ||
{ | ||
"info" : { | ||
"author" : "xcode", | ||
"version" : 1 | ||
} | ||
} |
21 changes: 21 additions & 0 deletions
21
Mongle/Projects/App/Resources/Images.xcassets/TabItem/HomeTabItem.imageset/Contents.json
This file contains 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" : "HomeTabItem.svg", | ||
"idiom" : "universal", | ||
"scale" : "1x" | ||
}, | ||
{ | ||
"idiom" : "universal", | ||
"scale" : "2x" | ||
}, | ||
{ | ||
"idiom" : "universal", | ||
"scale" : "3x" | ||
} | ||
], | ||
"info" : { | ||
"author" : "xcode", | ||
"version" : 1 | ||
} | ||
} |
3 changes: 3 additions & 0 deletions
3
...ects/App/Resources/Images.xcassets/TabItem/HomeTabItem.imageset/HomeTabItem.svg
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
...Projects/App/Resources/Images.xcassets/TabItem/HomeTabItemSelected.imageset/Contents.json
This file contains 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" : "HomeTabItemSelected.svg", | ||
"idiom" : "universal", | ||
"scale" : "1x" | ||
}, | ||
{ | ||
"idiom" : "universal", | ||
"scale" : "2x" | ||
}, | ||
{ | ||
"idiom" : "universal", | ||
"scale" : "3x" | ||
} | ||
], | ||
"info" : { | ||
"author" : "xcode", | ||
"version" : 1 | ||
} | ||
} |
3 changes: 3 additions & 0 deletions
3
...es/Images.xcassets/TabItem/HomeTabItemSelected.imageset/HomeTabItemSelected.svg
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
Mongle/Projects/App/Resources/Images.xcassets/TabItem/MyTabItem.imageset/Contents.json
This file contains 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" : "MyTabItem.svg", | ||
"idiom" : "universal", | ||
"scale" : "1x" | ||
}, | ||
{ | ||
"idiom" : "universal", | ||
"scale" : "2x" | ||
}, | ||
{ | ||
"idiom" : "universal", | ||
"scale" : "3x" | ||
} | ||
], | ||
"info" : { | ||
"author" : "xcode", | ||
"version" : 1 | ||
} | ||
} |
4 changes: 4 additions & 0 deletions
4
...Projects/App/Resources/Images.xcassets/TabItem/MyTabItem.imageset/MyTabItem.svg
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
...e/Projects/App/Resources/Images.xcassets/TabItem/MyTabItemSelected.imageset/Contents.json
This file contains 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" : "MyTabItemSelected.svg", | ||
"idiom" : "universal", | ||
"scale" : "1x" | ||
}, | ||
{ | ||
"idiom" : "universal", | ||
"scale" : "2x" | ||
}, | ||
{ | ||
"idiom" : "universal", | ||
"scale" : "3x" | ||
} | ||
], | ||
"info" : { | ||
"author" : "xcode", | ||
"version" : 1 | ||
} | ||
} |
4 changes: 4 additions & 0 deletions
4
...ources/Images.xcassets/TabItem/MyTabItemSelected.imageset/MyTabItemSelected.svg
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
.../Projects/App/Resources/Images.xcassets/TabItem/ReservationTabItem.imageset/Contents.json
This file contains 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" : "ReservationTabItem.svg", | ||
"idiom" : "universal", | ||
"scale" : "1x" | ||
}, | ||
{ | ||
"idiom" : "universal", | ||
"scale" : "2x" | ||
}, | ||
{ | ||
"idiom" : "universal", | ||
"scale" : "3x" | ||
} | ||
], | ||
"info" : { | ||
"author" : "xcode", | ||
"version" : 1 | ||
} | ||
} |
3 changes: 3 additions & 0 deletions
3
...rces/Images.xcassets/TabItem/ReservationTabItem.imageset/ReservationTabItem.svg
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
...s/App/Resources/Images.xcassets/TabItem/ReservationTabItemSelected.imageset/Contents.json
This file contains 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" : "ReservationTabItemSelected.svg", | ||
"idiom" : "universal", | ||
"scale" : "1x" | ||
}, | ||
{ | ||
"idiom" : "universal", | ||
"scale" : "2x" | ||
}, | ||
{ | ||
"idiom" : "universal", | ||
"scale" : "3x" | ||
} | ||
], | ||
"info" : { | ||
"author" : "xcode", | ||
"version" : 1 | ||
} | ||
} |
3 changes: 3 additions & 0 deletions
3
...sets/TabItem/ReservationTabItemSelected.imageset/ReservationTabItemSelected.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains 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
This file contains 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,60 @@ | ||
// | ||
// TabItem.swift | ||
// Core | ||
// | ||
// Created by Bokyung on 11/24/24. | ||
// Copyright © 2024 Mongle. All rights reserved. | ||
// | ||
|
||
import CalendarFeature | ||
import ChatFeature | ||
import HomeFeature | ||
import ProfileFeature | ||
import SwiftUI | ||
|
||
enum TabItem: Int, CaseIterable { | ||
case home | ||
case calendar | ||
case chat | ||
case profile | ||
|
||
var view: some View { | ||
switch self { | ||
case .home: | ||
return AnyView(HomeView()) | ||
case .calendar: | ||
return AnyView(CalendarView()) | ||
case .chat: | ||
return AnyView(ChatView()) | ||
case .profile: | ||
return AnyView(ProfileView()) | ||
} | ||
} | ||
|
||
var title: String { | ||
switch self { | ||
case .home: return "홈" | ||
case .calendar: return "예약내역" | ||
case .chat: return "채팅" | ||
case .profile: return "마이" | ||
} | ||
} | ||
|
||
var defaultImage: String { | ||
switch self { | ||
case .home: return "HomeTabItem" | ||
case .calendar: return "ReservationTabItem" | ||
case .chat: return "ChatTabItem" | ||
case .profile: return "MyTabItem" | ||
} | ||
} | ||
|
||
var selectedImage: String { | ||
switch self { | ||
case .home: return "HomeTabItemSelected" | ||
case .calendar: return "ReservationTabItemSelected" | ||
case .chat: return "ChatTabItemSelected" | ||
case .profile: return "MyTabItemSelected" | ||
} | ||
} | ||
} |
This file contains 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 @@ | ||
// | ||
// Screen.swift | ||
// Core | ||
// | ||
// Created by Bokyung on 11/19/24. | ||
// Copyright © 2024 Mongle. All rights reserved. | ||
// | ||
|
||
import Foundation | ||
|
||
public enum Screen: String { | ||
case home | ||
case searchCompany | ||
case notification | ||
case storeDetail | ||
} |
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.
이건 개인의 생각에 따라 다를 것 같은데 가독성을 봤을 때 긴 modifier를 맨 밑으로 가면 어떨까요?
저희가 modifier 규칙을 정하면 좋을 것 같아요!