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] 홈 뷰 구현 #6

Merged
merged 24 commits into from
Jul 12, 2023
Merged

[feat] 홈 뷰 구현 #6

merged 24 commits into from
Jul 12, 2023

Conversation

Dan2dani
Copy link
Member

@Dan2dani Dan2dani commented Jul 7, 2023

Related issue 🛠

Work Description ✏️

  • 시작 activity를 MainActivity로 수정
  • 홈 뷰 디자인
  • chip style 수정 (중복 칩을 발견해서 네이밍 등을 수정함)
  • dimen 추가
  • best Bakery 아이템 디자인
  • best Bakery 에서 두 번째 chip은 필수가 아니기 때문에 이에 대한 처리를 해줌
  • best Review 아이템 디자인
  • 북마크 상태에 따른 구현
  • 더미 데이터를 추가해 홈 뷰를 구현함

Screenshot 📸

device-2023-07-07-144532.mp4

| ||

Uncompleted Tasks 😅

  • 리뷰(숫자), 숫자 색을 point_1으로 구현하기

To Reviewers 📢

chip을 적용해야 하는 분들은 chip style 적용법을 익혀주시고, chip이 동적으로 추가 될 가능성이 있다면 chipGroup을 사용해야합니다! 전 처음에 chipGroup을 사용했다가 코드가 너무 지저분 해지는거 같기도 하고, 1~2개만 한줄로 화면에 띄어지는게 확정이기 때문에 chip component를 2개를 사용해서 구현했습니다!

또한 현재 북마크에는 3가지의 상태(내가 북마크함, 내가 북마크하진 않았지만 다른 사람들이 북마크함, 나도 안했고 다른 사람도 안함, 즉 북마크 인원이 0명) 가 존재하는데요, 해당 사항을 처리한 것도 한 번 봐보면 좋을거 같습니다!

dimen 값을 이 pr에서 구현하게 되었는데, 해당 pr 머지하게 되면 이후 수정 부탁드립니다! (+ 버튼 style은 지현이 pr에서 수정될 예정) guiedline을 활용해서 디자인한 부분이 많습니다! 해당 뷰도 확인해주세요!

Copy link
Collaborator

@jihyunniiii jihyunniiii left a comment

Choose a reason for hiding this comment

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

수고하셨습니다!!!!

bakeryId = 3,
bakeryName = "건대 비건빵아아아아아아",
firstNearStation = "양정역",
secondNearStation = "하암역",
Copy link
Collaborator

Choose a reason for hiding this comment

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

하암 ㅋ.ㅋ

Comment on lines 3 to 9
<dimen name="spacing4">4dp</dimen>
<dimen name="spacing10">10dp</dimen>
<dimen name="spacing12">12dp</dimen>
<dimen name="spacing14">14dp</dimen>
<dimen name="spacing16">16dp</dimen>
<dimen name="spacing17">17dp</dimen>
<dimen name="spacing24">24dp</dimen>
Copy link
Collaborator

Choose a reason for hiding this comment

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

dimen 확인 완료했습니다!

Comment on lines +89 to +102
android:src="@{bakery.isBooked == true? @drawable/ic_bookmark_selected:@drawable/ic_bookmark_unselected}"
tools:src="@drawable/ic_bookmark_unselected" />

<TextView
android:id="@+id/tv_bookmark_count"
visibility="@{bakery.bookmarkCount == 0}"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="3dp"
android:text="@{@string/home_bookmark_count(bakery.bookmarkCount)}"
android:textAppearance="@style/TextAppearance.CaptionB1"
android:textColor="@{bakery.isBooked == true ? @color/point_1 : @color/gray_300}"
tools:text="5명" />
Copy link
Collaborator

Choose a reason for hiding this comment

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

진짜,,, 짱이네요

# Conflicts:
#	app/src/main/java/com/sopt/geonppang/presentation/MainActivity.kt
#	app/src/main/res/layout/activity_main.xml
# Conflicts:
#	app/src/main/java/com/sopt/geonppang/presentation/MainActivity.kt
#	app/src/main/java/com/sopt/geonppang/util/binding/BindingAdapter.kt
#	app/src/main/res/values/dimen.xml
#	app/src/main/res/values/strings.xml
#	app/src/main/res/values/themes.xml
Copy link
Member

@jooyyoo jooyyoo left a comment

Choose a reason for hiding this comment

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

수고해써용 많은 걸 쇽삭 해 갑니다

<string name="home_best_bakery_title2">BEST 건빵집</string>
<string name="home_search_hint">궁금한 건빵집을 입력해주세요!</string>
<string name="home_best_review_title2">BEST 리뷰</string>
<string name="home_caption">건빵은 건강한 빵집의 위치와 성분 정보를 제공하여 소비자의 선택을 돕는 용도의 서비스입니다. 건빵의 모든 정보는 제조사에서 제공한 정보입니다. 이는 소비자의 구매를 돕기 위한 참고 사항이며, 제공 정보의 오류에 대한 책임을 지지 않습니다.</string>
Copy link
Member

Choose a reason for hiding this comment

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

얘 가져갈게요 ㅋㅋㅎ

Copy link
Collaborator

@jihyunniiii jihyunniiii left a comment

Choose a reason for hiding this comment

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

수고하셨숩니당 🍞

app:layout_constraintTop_toTopOf="@+id/tv_home_best_review_title1" />

<androidx.recyclerview.widget.RecyclerView
android:id="@+id/layout_home_best_review_list"
Copy link
Collaborator

Choose a reason for hiding this comment

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

이거 rv_home_best_review_list 로 변경 부탁!!

app:layout_constraintTop_toTopOf="@+id/tv_home_best_bakery_title1" />

<androidx.recyclerview.widget.RecyclerView
android:id="@+id/layout_home_best_bakery_list"
Copy link
Collaborator

Choose a reason for hiding this comment

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

요기도 네이밍 수정 부탁합니다!

app:layout_constraintTop_toBottomOf="@id/tv_home_best_review_title2"
tools:listitem="@layout/item_home_best_review" />

<TextView
Copy link
Collaborator

Choose a reason for hiding this comment

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

요기도 아이디 필요하다면 넣어주기!

</LinearLayout>

<com.google.android.material.chip.Chip
android:id="@+id/home_first_near_station"
Copy link
Collaborator

Choose a reason for hiding this comment

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

얘도요

tools:text="건대역" />

<com.google.android.material.chip.Chip
android:id="@+id/home_second_near_station"
Copy link
Collaborator

Choose a reason for hiding this comment

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

이것도요!

@Dan2dani Dan2dani merged commit 5751628 into develop Jul 12, 2023
1 check passed
@Dan2dani Dan2dani deleted the feat-home-view branch August 13, 2023 08:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

[feat] 홈 뷰 구현
3 participants