Skip to content
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] #48 - MyZip, Reported&Liked Hankki List #50

Merged
merged 12 commits into from
Jul 12, 2024
Merged

Conversation

shimseohyun
Copy link
Contributor

@shimseohyun shimseohyun commented Jul 11, 2024

πŸ”₯ Pull requests

πŸ‘· μž‘μ—…ν•œ λ‚΄μš©

  • 쑱보 λ‚΄ 식당 리슀트의 λ·°μž…λ‹ˆλ‹€.
  • μ’‹μ•„μš”ν•œ, μ œλ³΄ν•œ 식당 리슀트 λ·°μž…λ‹ˆλ‹€.

🚨 μ°Έκ³  사항

  • 이미지 에셋은 ν™•μ • ν›„ μΆ”κ°€ν•˜κ² μŠ΅λ‹ˆλ‹€.
  • api 톡신 이후 ν•¨μˆ˜λ₯Ό μˆ˜μ •ν•˜κ² μŠ΅λ‹ˆλ‹€.

πŸ“Έ μŠ€ν¬λ¦°μƒ·

κ΅¬ν˜„ λ‚΄μš© SE 13 mini 15 pro
λ‚˜μ˜ 쑱보의 식당
μ’‹μ•„μš”, 제보 식당

πŸ–₯️ μ£Όμš” μ½”λ“œ μ„€λͺ…

  • navigation
    navigation 색 μ»€μŠ€ν…€μ„ μœ„ν•΄ type을 μˆ˜μ •ν–ˆμŠ΅λ‹ˆλ‹€. κΈ°λ³Έ white , 색깔 μ»€μŠ€ν…€μ„ ν•˜κ³ μ‹ΆμœΌμ‹œλ©΄ 색을 μ§€μ •ν•΄μ„œ μ„ μ–Έν•˜μ‹œλ©΄ λ©λ‹ˆλ‹€.
struct HankkiNavigationType {
    var hasBackButton: Bool     // backButton 쑴재 μ—¬λΆ€
    var hasRightButton: Bool    // rightButton 쑴재 μ—¬λΆ€

    var mainTitle: StringOrImageType        // mainTitle
    var rightButton: StringOrImageType      // rightButton
    var rightButtonAction: () -> Void   // rightButton의 μ•‘μ…˜
    var backgroundColor: UIColor = .hankkiWhite
}

enum StringOrImageType {
    case string(String)
    case image(UIImage)
    case stringAndImage(String, UIImage)
}

// μ΄λŸ°μ‹μœΌλ‘œ...
        type = HankkiNavigationType(
            hasBackButton: true,
            hasRightButton: false,
            mainTitle: .string("식당쑱보"),
            rightButton: .string(""),
            rightButtonAction: {},
            backgroundColor: .hankkiRed
        )
  • hankkiList
    ν•œλΌ 리슀트의 λ·°λ₯Ό 3가지 뷰컨에 λŒλ €μ”λ‹ˆλ‹€...
    myZip : λ‚˜μ˜ 쑱보에 μžˆλŠ” 식당 리슀트 (μ’‹μ•„μš”λ²„νŠΌ μ—†μŒ, 헀더 쑴재)
    reported : μ œλ³΄ν•œ μ‹λ‹Ήλ¦¬μŠ€νŠΈ (μ’‹μ•„μš” λ²„νŠΌ μ—†μŒ)
    lized : μ’‹μ•„μš”ν•œ μ‹λ‹Ήλ¦¬μŠ€νŠΈ (μ’‹μ•„μš”λ²„νŠΌ 있음)
enum HankkiListViewControllerType {
    case myZip
    case repoted
    case liked
}

βœ… Check List

  • Merge λŒ€μƒ λΈŒλžœμΉ˜κ°€ μ˜¬λ°”λ₯Έκ°€?
  • μ΅œμ’… μ½”λ“œκ°€ μ—λŸ¬ 없이 잘 λ™μž‘ν•˜λŠ”κ°€?
  • 전체 변경사항이 500쀄을 λ„˜μ§€ μ•ŠλŠ”κ°€?

πŸ“Ÿ κ΄€λ ¨ 이슈

@shimseohyun shimseohyun added 🍚 Feat μƒˆλ‘œμš΄ κΈ°λŠ₯ κ΅¬ν˜„ πŸ€ΉπŸ»β€β™€οΈ μ„œν˜„ μ„œν˜„ 곡주 μž‘μ—… labels Jul 11, 2024
@shimseohyun shimseohyun self-assigned this Jul 11, 2024
@shimseohyun shimseohyun changed the title [Feat] #48 MyZip, Reported - Liked Hankki List [Feat] #48 - MyZip, Reported&Liked Hankki List Jul 11, 2024
Copy link
Member

@mcrkgus mcrkgus left a comment

Choose a reason for hiding this comment

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

LGTM NICE PRINCESS μ‘°μ•„μš”

func setupDelegate() {
hankkiTableView.delegate = self
hankkiTableView.dataSource = self

Copy link
Member

Choose a reason for hiding this comment

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

p3
쀄 μ§€μ›Œμ£Όμ„Έμ–Œ

Comment on lines +180 to +186
func scrollViewDidScroll(_ scrollView: UIScrollView) {
if scrollView.contentOffset.y < 0 && self.type == .myZip {
scrollView.bounces = false
} else {
scrollView.bounces = true
}
}
Copy link
Member

Choose a reason for hiding this comment

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

p3
μ‘°μœΌμ„Έμš”

Copy link
Member

@EunsuSeo01 EunsuSeo01 left a comment

Choose a reason for hiding this comment

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

수고 λ§ŽμœΌμ…¨μŠ΅λ‹ˆλ‹€ 애기씨

Comment on lines +129 to +131
hankkiTableView.beginUpdates()
hankkiTableView.deleteRows(at: [indexPath], with: .automatic)
hankkiTableView.endUpdates()
Copy link
Member

Choose a reason for hiding this comment

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

LGTM

Comment on lines +174 to +190
func tableView(_ tableView: UITableView, trailingSwipeActionsConfigurationForRowAt indexPath: IndexPath) -> UISwipeActionsConfiguration? {
if self.type != .myZip {
return nil
}

let deleteAction = UIContextualAction(style: .destructive, title: "μ‚­μ œ") { (_, _, completionHandler) in
self.deleteItem(at: indexPath)
// TODO: -api 연동 μ œλŒ€λ‘œν•˜κΈ°
print(indexPath.item, "번째 셀을 μ‚­μ œν–ˆμ–΄μš”!!!!!!!!!!")
completionHandler(true)
}
deleteAction.backgroundColor = .hankkiRed

let configuration = UISwipeActionsConfiguration(actions: [deleteAction])
configuration.performsFirstActionWithFullSwipe = false
return configuration
}
Copy link
Member

Choose a reason for hiding this comment

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

LGTM 2

Comment on lines +24 to +25
var headrViewHeight: CGFloat {
switch self {
Copy link
Member

Choose a reason for hiding this comment

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

p3: headerViewHeight e λΉ μ‘Œλ‹€

@shimseohyun shimseohyun merged commit 40340c3 into develop Jul 12, 2024
@shimseohyun shimseohyun deleted the feat/#48 branch July 12, 2024 06:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🍚 Feat μƒˆλ‘œμš΄ κΈ°λŠ₯ κ΅¬ν˜„ πŸ€ΉπŸ»β€β™€οΈ μ„œν˜„ μ„œν˜„ 곡주 μž‘μ—…
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Feat] Liked, Reported View [Feat] Zip View
3 participants