-
Notifications
You must be signed in to change notification settings - Fork 2
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
Feat [#29] 나의 챌린지 뷰 Footer Button 완성 #32
Merged
Merged
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
35616a0
[Fix/#19] 코드리뷰 반영
Zoe0929 ef9d471
[Add/#29] Challenge - Assets 추가
Zoe0929 efa4ffe
[Feat/#29] FooterView 구현
Zoe0929 0d3ce27
[Feat/#29] FooterView 연결
Zoe0929 622ffdc
[Feat/#29] FooterView ID 등록
Zoe0929 3b24205
[Chore/#29] 자잘한 코드 수정
Zoe0929 907a3ee
[Feat/#29] layout issue 해결
Zoe0929 9b21796
[Feat/#29] Challenge - Header Layout 해결
Zoe0929 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
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
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
23 changes: 23 additions & 0 deletions
23
HMH_iOS/HMH_iOS/Global/Resources/Assets.xcassets/Minus_XL.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,23 @@ | ||
| { | ||
| "images" : [ | ||
| { | ||
| "filename" : "Minus_XL.png", | ||
| "idiom" : "universal", | ||
| "scale" : "1x" | ||
| }, | ||
| { | ||
| "filename" : "[email protected]", | ||
| "idiom" : "universal", | ||
| "scale" : "2x" | ||
| }, | ||
| { | ||
| "filename" : "[email protected]", | ||
| "idiom" : "universal", | ||
| "scale" : "3x" | ||
| } | ||
| ], | ||
| "info" : { | ||
| "author" : "xcode", | ||
| "version" : 1 | ||
| } | ||
| } |
Binary file added
BIN
+240 Bytes
HMH_iOS/HMH_iOS/Global/Resources/Assets.xcassets/Minus_XL.imageset/Minus_XL.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+324 Bytes
HMH_iOS/HMH_iOS/Global/Resources/Assets.xcassets/Minus_XL.imageset/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+480 Bytes
HMH_iOS/HMH_iOS/Global/Resources/Assets.xcassets/Minus_XL.imageset/[email protected]
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
57 changes: 57 additions & 0 deletions
57
.../HMH_iOS/Presentation/Challenge/Cells/HeaderFooterView/AppAddCollectionReusableView.swift
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,57 @@ | ||
| // | ||
| // AppAddCollectionReusableView.swift | ||
| // HMH_iOS | ||
| // | ||
| // Created by 지희의 MAC on 1/8/24. | ||
| // | ||
|
|
||
| import UIKit | ||
| import SwiftUI | ||
|
|
||
| import SnapKit | ||
| import Then | ||
|
|
||
| class AppAddCollectionReusableView: UICollectionReusableView { | ||
|
|
||
| static let identifier = "AppAddCollectionReusableView" | ||
| var hostingController: UIHostingController<AppAddButtonView>? | ||
|
|
||
| private lazy var contentViewController : UIHostingController<some View> = { | ||
| let model = BlockingApplicationModel.shared | ||
| let hostingController = UIHostingController( | ||
| rootView: AppAddButtonView() | ||
| .environmentObject(model) | ||
| ) | ||
| return hostingController | ||
| }() | ||
|
|
||
|
|
||
| override init(frame: CGRect) { | ||
| super.init(frame: frame) | ||
| setUI() | ||
| configureView() | ||
| } | ||
|
|
||
| required init?(coder: NSCoder) { | ||
| fatalError("init(coder:) has not been implemented") | ||
| } | ||
| private func setUI(){ | ||
| setHierarchy() | ||
| setConstraints() | ||
| } | ||
|
|
||
| private func setHierarchy() { | ||
| self.addSubviews(contentViewController.view) | ||
| } | ||
|
|
||
| private func setConstraints() { | ||
| contentViewController.view.snp.makeConstraints { | ||
| $0.verticalEdges.equalToSuperview() | ||
| $0.horizontalEdges.equalToSuperview().inset(20) | ||
| } | ||
| } | ||
|
|
||
| private func configureView() { | ||
| contentViewController.view.backgroundColor = .clear | ||
| } | ||
| } | ||
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
32 changes: 32 additions & 0 deletions
32
HMH_iOS/HMH_iOS/Presentation/Challenge/SwiftUIView/AppAddButtonView.swift
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,32 @@ | ||
| // | ||
| // AppAddButtonView.swift | ||
| // HMH_iOS | ||
| // | ||
| // Created by 지희의 MAC on 1/8/24. | ||
| // | ||
|
|
||
| import SwiftUI | ||
|
|
||
| struct AppAddButtonView: View { | ||
|
|
||
| @EnvironmentObject var model: BlockingApplicationModel | ||
| @State var isPresented = false | ||
|
|
||
| var body: some View { | ||
| ZStack { | ||
| Color(uiColor: .clear) | ||
| RoundedRectangle(cornerRadius: 6) | ||
| .fill(Color(uiColor: .gray8)) | ||
| Button(action: { isPresented.toggle() }) { | ||
| Image(uiImage: ImageLiterals.Challenge.icPlus) | ||
| } | ||
| .frame(width: 335, height: 68) | ||
| .familyActivityPicker(isPresented: $isPresented, selection: $model.newSelection) | ||
| } | ||
| .background(Color(.clear)) | ||
| } | ||
| } | ||
|
|
||
| #Preview { | ||
| AppAddButtonView() | ||
| } |
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
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.
p5. 혹시 adjusted 에러가 발생 할 까요?