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

[UI/#51] 필터링 재설정 UI 구현 #76

Merged
merged 18 commits into from
Jul 15, 2024
Merged

[UI/#51] 필터링 재설정 UI 구현 #76

merged 18 commits into from
Jul 15, 2024

Conversation

Hyobeen-Park
Copy link
Member

⛳️ Work Description

  • 필터링 UI 구현

📸 Screenshot

Screen_Recording_20240714_064238_Terning-Android.mp4

📢 To Reviewers

  • 모두 모두 진짜 화이팅~~~

@Hyobeen-Park
[FEAT/#51] navigation 설정
293864e
@Hyobeen-Park
Merge remote-tracking branch 'origin/develop' into ui/#51-home-change…
f694f05 
…-filter
@Hyobeen-Park
[FEAT/#51] 홈 - 필터링 재설정 연결
9d64fcf
@Hyobeen-Park
Merge remote-tracking branch 'origin/develop' into ui/#51-home-change…
b1e52d4 
…-filter
@Hyobeen-Park
[CHORE/#51] invoke() 삭제
ea2a729
@Hyobeen-Park
[FEAT/#51] 탑바 적용
603d2eb
@Hyobeen-Park
Merge remote-tracking branch 'origin/develop' into ui/#51-home-change…
0ec7ef4 
…-filter
@Hyobeen-Park
[FEAT/#51] 탑바 그림자 적용
6e7a7ee
@Hyobeen-Park
Merge remote-tracking branch 'origin/develop' into ui/#51-home-change…
6c84848 
…-filter

# Conflicts:
#	core/src/main/java/com/terning/core/designsystem/component/topappbar/BackButtonTopAppBar.kt
#	feature/src/main/java/com/terning/feature/home/home/HomeRoute.kt
#	feature/src/main/java/com/terning/feature/main/MainScreen.kt
@Hyobeen-Park
[CHORE/#51] 중복된 string 제거
d09fd0b
@Hyobeen-Park
[FEAT/#51] 기본 UI 구현
8c8386f
@Hyobeen-Park
[FEAT/#51] 라디오 버튼 추가
e01f98b
@Hyobeen-Park
[FEAT/#51] UI 구현
d3e7509
@Hyobeen-Park
[FEAT/#51] 홈 필터링 데이터 연결
7611e53
@Hyobeen-Park Hyobeen-Park added UI 💐 UI 작업 효빈💚 효빈 labels Jul 13, 2024
@Hyobeen-Park Hyobeen-Park self-assigned this Jul 13, 2024
leeeyubin
leeeyubin approved these changes Jul 15, 2024
View reviewed changes
Copy link
Member

@leeeyubin leeeyubin left a comment

Choose a reason for hiding this comment

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

마지막까지 UI하느라 넘넘 수고많았어용!!!

...e/src/main/java/com/terning/feature/home/changefilter/component/ChangeFilteringRadioGroup.kt
Comment on lines +20 to +26
@Composable
fun ChangeFilteringRadioGroup(
filterType: Int,
internFilterData: InternFilterData?,
onButtonClick: (Int) -> Unit,
modifier: Modifier = Modifier,
) {
Copy link
Member

Choose a reason for hiding this comment

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

internFilterData가 nullalbe한 이유는 무엇인가용

Copy link
Member Author

Choose a reason for hiding this comment

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

온보딩에서 필터링을 하지 않고 넘어온 유저들은 필터링 데이터가 없어서 nullable하게 처리했습니다! 필터링 정보가 없는 유저들은 필터링 재설정 화면으로 넘어갔을 때 0번째 버튼이 눌려져 있도록 기본값 설정을 해뒀는데 이 부분은 제가 한번 더 확인해볼게요!!

feature/src/main/java/com/terning/feature/home/home/HomeRoute.kt Outdated
Comment on lines 216 to 218
@Composable
private fun ShowInternFilter(userNameState: UserNameState) {
if (userNameState.internFilter == null) {
private fun ShowInternFilter(userNameState: UserNameState, navController: NavHostController) {
if (userNameState.internFilter?.grade == null) {
Copy link
Member

Choose a reason for hiding this comment

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

NavHostController를 내리지 말구 onChangeFilterClick을 올려서 Route에서 처리하는 건 어떤가요..?

Copy link
Member Author

Choose a reason for hiding this comment

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

오호!! 한번 고쳐보겠습니다!!

feature/src/main/java/com/terning/feature/home/home/HomeViewModel.kt Outdated
Comment on lines 49 to 50
getRecommendData()
// listOf()
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
Member Author

Choose a reason for hiding this comment

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

이거 데이터 있을때랑 없을 때를 계속 테스트를 해봐야 해서 이렇게 한건데 지우는거 까먹었네요.. 하핫 머지 하기 전에 지우고 하겠습니다~!!

feature/src/main/java/com/terning/feature/main/MainNavigator.kt Outdated
Comment on lines 24 to 25

val startDestination = SignIn
val startDestination = Home
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
Member Author

Choose a reason for hiding this comment

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

잡았다!! 하핫....

arinming
arinming approved these changes Jul 15, 2024
View reviewed changes
Copy link
Contributor

@arinming arinming left a comment

Choose a reason for hiding this comment

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

홈 뷰 하느라 고생 많으셨어요 ㅠ!!!

feature/src/main/java/com/terning/feature/home/changefilter/ChangeFilterRoute.kt Outdated
}

@Composable
private fun showTitle(
Copy link
Contributor

Choose a reason for hiding this comment

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

showTitle -> ShowTitle으로 수정해주시면 좋을 것 같습니도~

Copy link
Member Author

Choose a reason for hiding this comment

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

헉스 수정하겠습니다!

...e/src/main/java/com/terning/feature/home/changefilter/component/ChangeFilteringRadioGroup.kt
filterType: Int,
internFilterData: InternFilterData?,
onButtonClick: (Int) -> Unit,
modifier: Modifier = Modifier,
Copy link
Contributor

Choose a reason for hiding this comment

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

modifier가 쓰이지 않고 있는데, LazyColumn에서 Modifier로 선언하지 않고 modifier 써주시는 건 어떨까요?

Copy link
Member Author

Choose a reason for hiding this comment

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

오호 좋아요!

...e/src/main/java/com/terning/feature/home/changefilter/component/ChangeFilteringRadioGroup.kt
}

val selectedIndex = remember { mutableIntStateOf(0) }
var selectedButton = remember { mutableStateListOf(false, false, false, false) }
Copy link
Contributor

Choose a reason for hiding this comment

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

var로 선ㄴ언하신 이유가 있나욤?

Copy link
Member Author

Choose a reason for hiding this comment

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

이게 계속 수정이 되어야 해서 var로 선언했어요!!!

feature/src/main/java/com/terning/feature/home/home/component/HomeFilteringScreen.kt
@@ -68,29 +70,21 @@ fun HomeFilteringScreen(
}

HomeFilteringText(
text = grade.toString() + stringResource(id = R.string.home_recommend_filtering_grade),
text = grade,
Copy link
Contributor

Choose a reason for hiding this comment

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

깔끔해졌네요ㅕ~!

feature/src/main/res/values/strings.xml Outdated
@@ -112,12 +109,9 @@
<string name="filtering_button">다음으로</string>

<!-- changeFilter -->
Copy link
Contributor

Choose a reason for hiding this comment

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

여기 ChangeFilter로 바꿔주시면 통일감 있을 것 같아요!

Copy link
Member Author

Choose a reason for hiding this comment

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

네 감사합니다~~!!!

boiledEgg-s
boiledEgg-s approved these changes Jul 15, 2024
View reviewed changes
Copy link
Member

@boiledEgg-s boiledEgg-s left a comment

Choose a reason for hiding this comment

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

다들 잘 커멘트 달아줘서 달게 없네요ㅎㅎ 너어어무 고생많으셨습니두~~

@Hyobeen-Park Hyobeen-Park merged commit 5cfdab5 into develop Jul 15, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@leeeyubin leeeyubin leeeyubin approved these changes

@boiledEgg-s boiledEgg-s boiledEgg-s approved these changes

@arinming arinming arinming approved these changes

Assignees

@Hyobeen-Park Hyobeen-Park

Labels
UI 💐 UI 작업 효빈💚 효빈
Projects
None yet
Milestone
1차 스프린트 UI 작업
Development

Successfully merging this pull request may close these issues.

[UI] 홈뷰 / 필터링 재설정 UI 구현
4 participants
@Hyobeen-Park @arinming @boiledEgg-s @leeeyubin