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.

Sign up for GitHub

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

Jump to bottom

[FEATURE] Modified HomeScreen Ui #66

Merged
merged 11 commits into from
Apr 27, 2024
Merged

[FEATURE] Modified HomeScreen Ui #66

merged 11 commits into from
Apr 27, 2024

Conversation

KanuKim97
Copy link
Collaborator

@KanuKim97 KanuKim97 commented Apr 25, 2024 •
edited
Loading

Description

  • 수정된 디자인에 따른 HomeScreen UI 작성

Content

  1. designsystem 모듈에 ElevatedCard와 Card가 추가되었습니다.
  • 최대한 확장 가능한 형태로 작성했으며 네이밍은 prefix [Gnr] + composable 로 작성했습니다.
  1. IcArrowRight 아이콘이 추가되었습니다.
  2. 컬러 FFF7F9FF 를 추가했습니다.
  3. 디자인 변경에 따른 MatchCard와 DashboardCard가 수정되었습니다.
  4. 4번에 따른 HomeScreen.kt의 코드도 수정되었습니다.
  5. ViewModel의 usecases flow 코드에 TODO 주석을 사용했습니다.
  • 현재 Ui State 처리를 고민 중이며 이는 따로 PR하겠습니다.

History

  • 2024.04.26 : b6bacf5 : ElevatedCard, Card 네이밍 prefix 수정 (GNR -> Gnr)
  • 2024.04.27 : 408903a : Review에 따른 Dashboard.kt 파일의 컨벤션 수정

Result screenshot

스크린샷 2024-04-25 18 38 57

Comment

  • PR과 코드리뷰 완료 후 Merge 되면 ToDoList에 완료 처리 하겠습니다.

@KanuKim97
[ADD]
4d7e4f0 
  - add ColorFFF7F9FF
  - add ElevatedCard.kt

[MOD]
  - mod UpcomingMatchCard
  - mod HomeScreen
@KanuKim97
[MOD]
199d7e6 
  - mod HomeScreen.kt
  - mod MatchCard.kt (RecentlyMatchCard)
  - mod DashboardCard.kt
  - mod Code Convention ElevatedCard.kt
@KanuKim97
Merge branch 'dev' into feature/mod-home-ui
a7931d6
@KanuKim97
[MOD]
631e58b 
  - mod HomeScreen.kt
  - mod HomeViewModel.kt
  - mod MatchCard.kt
@KanuKim97
Merge branch 'dev' into feature/mod-home-ui
0a35007 
# Conflicts:
#	feature/home/src/main/java/com/eshc/goonersapp/feature/home/HomeScreen.kt
@KanuKim97
[MOD]
7ba7bd2 
 - mod DashboardCard.kt
 - mod HomeScreen.kt, HomeViewModel.kt,

[ADD]
 - add IcArrowRight.kt
 - add Card.kt
@KanuKim97
[MOD]
5981467 
 - mod MatchCard.kt
@KanuKim97
[MOD]
172da56 
 - mod HomeScreen
@KanuKim97
[MOD]
8823a95 
 - mod MatchCard.kt
@KanuKim97 KanuKim97 added the feature New feature or request label Apr 25, 2024
@KanuKim97 KanuKim97 requested a review from eshc123 April 25, 2024 09:41
@KanuKim97 KanuKim97 self-assigned this Apr 25, 2024
@KanuKim97
[MOD]
b6bacf5 
 - mod Card.kt, ElevatedCard.kt naming (GNR -> Gnr)
eshc123
eshc123 approved these changes Apr 26, 2024
View reviewed changes
Copy link
Owner

@eshc123 eshc123 left a comment

Choose a reason for hiding this comment

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

확인했습니디!

feature/home/src/main/java/com/eshc/goonersapp/feature/home/component/DashboardCard.kt Outdated Show resolved Hide resolved
feature/home/src/main/java/com/eshc/goonersapp/feature/home/component/DashboardCard.kt Outdated Show resolved Hide resolved
@KanuKim97
[Modified]
408903a 
 - mod DashboardCard code convention
 - mod LeagueDashboardItem code convention
@eshc123 eshc123 merged commit 9e0f4f0 into eshc123:dev Apr 27, 2024
@KanuKim97 KanuKim97 deleted the feature/mod-home-ui branch July 1, 2024 13:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@eshc123 eshc123 eshc123 approved these changes

Assignees

@KanuKim97 KanuKim97

Labels
feature New feature or request
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@KanuKim97 @eshc123