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

[UI/#204] 홈 뷰 / UI 수정사항 반영 및 리팩토링 #232

Merged
merged 42 commits into from
Sep 9, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
3c3cdd5
[UI/#204] 홈 뷰 곧 마감되는 공고 아이템 수정
Hyobeen-Park Aug 28, 2024
2ae81c5
[UI/#204] 홈 뷰 곧 마감되는 공고 아이템 padding 값 수정
Hyobeen-Park Aug 30, 2024
879e51f
[UI/#204] 홈 뷰 필터링 버튼 수정
Hyobeen-Park Aug 30, 2024
11b4442
[UI/#204] 홈 뷰 필터링 정보 수정
Hyobeen-Park Aug 30, 2024
50ab00e
Merge remote-tracking branch 'origin/develop' into ui/#204-home-view
Hyobeen-Park Aug 30, 2024
85ccbe4
[CHORE/#204] 변수명 및 함수 파라미터 수정
Hyobeen-Park Aug 30, 2024
b5b99f0
[UI/#204] divider 삭제
Hyobeen-Park Aug 30, 2024
61496e0
[UI/#204] 정렬버튼 컴포넌트 패딩 수정
Hyobeen-Park Aug 30, 2024
e885a11
[UI/#204] 공고 개수 표시 UI 구현
Hyobeen-Park Aug 30, 2024
6318b9a
[UI/#204] theme 색상 추가
Hyobeen-Park Aug 30, 2024
edc307f
[UI/#204] domain/type에 enum class 추가
Hyobeen-Park Aug 30, 2024
f67afb8
[UI/#204] string 수정
Hyobeen-Park Aug 30, 2024
356d985
[UI/#204] 필터링 재설정 바텀시트 구현
Hyobeen-Park Aug 30, 2024
b329364
[UI/#204] 필터링 재설정 화면 버튼 색상 수정
Hyobeen-Park Aug 30, 2024
384fe8e
[UI/#204] 바텀시트 관련 로직 수정
Hyobeen-Park Aug 30, 2024
28f8b72
[DELETE/#204] 기존 필터링 재설정 뷰 삭제
Hyobeen-Park Aug 30, 2024
735354d
Merge remote-tracking branch 'origin/develop' into ui/#204-home-view
Hyobeen-Park Sep 6, 2024
ca9f314
[UI/#204] 필터링 정보 표시
Hyobeen-Park Sep 6, 2024
f0ae573
[MOD/#204] enum class 패키지 이동 및 파라미터 수정
Hyobeen-Park Sep 6, 2024
5327a86
[MOD/#204] 곧 마감되는 공고 서버통신 수정
Hyobeen-Park Sep 6, 2024
8a58059
[CHORE/#204] 패키지 이동
Hyobeen-Park Sep 7, 2024
91f8762
Merge remote-tracking branch 'origin/develop' into ui/#204-home-view
Hyobeen-Park Sep 7, 2024
33d3dd3
[REFACTOR/#204] 맞춤 공고 API 수정사항 반영
Hyobeen-Park Sep 7, 2024
76521ad
[CHORE/#204] 근무 기간 enum 수정
Hyobeen-Park Sep 8, 2024
f8718ff
Merge remote-tracking branch 'origin/develop' into ui/#204-home-view
Hyobeen-Park Sep 8, 2024
b3f3efb
[MOD/#204] enum 함수 추가
Hyobeen-Park Sep 8, 2024
a58d6b0
[REFACTOR/#204] 필터링 재설정 API 수정사항 반영
Hyobeen-Park Sep 8, 2024
8a72727
[REFACTOR/#204] 곧 마감 정보 리팩토링
Hyobeen-Park Sep 8, 2024
0907e8a
[CHORE/#204] test style 적용
Hyobeen-Park Sep 8, 2024
aaadc13
[REFACTOR/#204] 곧 마감 공고 로직 수정
Hyobeen-Park Sep 8, 2024
6a02360
[CHORE/#204] 코드 정리
Hyobeen-Park Sep 8, 2024
58b7425
[CHORE/#204] 필터링 인덱스 int로 수정
Hyobeen-Park Sep 9, 2024
631ec67
Merge remote-tracking branch 'origin/develop' into ui/#204-home-view
Hyobeen-Park Sep 9, 2024
1cfe864
[FEAT/#204] 맞춤 공고 스크랩 다이얼로그 연결
Hyobeen-Park Sep 9, 2024
e849735
[FEAT/#204] 곧 마감 공고 스크랩 다이얼로그 연결
Hyobeen-Park Sep 9, 2024
a4b1cab
[DELETE/#204] 기존 홈 뷰 다이얼로그 삭제
Hyobeen-Park Sep 9, 2024
f3ba7bc
[MOD/#204] 데이트피커 수정
Hyobeen-Park Sep 9, 2024
27adb74
[CHORE/#204] string 추출
Hyobeen-Park Sep 9, 2024
2c207d9
[CHORE/#204] 함수 전달 방식 수정
Hyobeen-Park Sep 9, 2024
34f73a8
[CHORE/#204] 색상 수정
Hyobeen-Park Sep 9, 2024
f103667
Merge remote-tracking branch 'origin/develop' into ui/#204-home-view
Hyobeen-Park Sep 9, 2024
ec25157
[FEAT/#204] 버튼 캘린더로 연결
Hyobeen-Park Sep 9, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
[DELETE/#204] 기존 필터링 재설정 뷰 삭제
  • Loading branch information
Hyobeen-Park committed Aug 30, 2024
commit 28f8b72e04fc11007f2619544464cc55ac4b3c07

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ import com.terning.domain.entity.home.HomeTodayIntern
import com.terning.domain.type.Grade
import com.terning.domain.type.WorkingPeriod
import com.terning.feature.R
import com.terning.feature.home.changefilter.navigation.navigateChangeFilter
import com.terning.feature.home.home.component.HomeFilteringBottomSheet
import com.terning.feature.home.home.component.HomeFilteringEmptyIntern
import com.terning.feature.home.home.component.HomeFilteringScreen
Expand Down Expand Up @@ -104,15 +103,13 @@ fun HomeRoute(
.collect { sideEffect ->
when (sideEffect) {
is HomeSideEffect.ShowToast -> context.toast(sideEffect.message)
is HomeSideEffect.NavigateToChangeFilter -> navController.navigateChangeFilter()
is HomeSideEffect.NavigateToHome -> navController.navigateUp()
}
}
}

HomeScreen(
homeDialogState = homeDialogState,
onChangeFilterClick = { navController.navigateChangeFilter() },
navigateToIntern = { navController.navigateIntern(announcementId = it) },
viewModel = viewModel,
)
Expand All @@ -122,7 +119,6 @@ fun HomeRoute(
@Composable
fun HomeScreen(
homeDialogState: HomeDialogState,
onChangeFilterClick: () -> Unit,
navigateToIntern: (Long) -> Unit,
viewModel: HomeViewModel,
) {
Expand Down
Loading