Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
ee7f669
[BOOK-113] feat: feature:settings 모듈 추가
seoyoon513 Jul 8, 2025
425798d
[BOOK-113] chore: settings 모듈 gradle 설정
seoyoon513 Jul 8, 2025
241d34a
[BOOK-113] feat: 설정 화면 UI 구현
seoyoon513 Jul 9, 2025
26cfd22
[BOOK-113] feat: Library 화면에서 Settings 화면으로 이동 임시 구현
seoyoon513 Jul 9, 2025
339b149
[BOOK-113] feat: 바텀시트 구현 및 Event, State 연동
seoyoon513 Jul 10, 2025
7331ee0
Merge branch 'develop' into BOOK-113-feature/#34
seoyoon513 Jul 10, 2025
4036244
[BOOK-113] refactor: screens 모듈 기반 네비게이션 방식 적용
seoyoon513 Jul 10, 2025
899d093
[BOOK-113] feat: 바텀시트 닫혔을 때 애니메이션 적용
seoyoon513 Jul 10, 2025
c71f6d6
[BOOK-113] feat: 바텀시트 닫혔을 때 체크박스 false로 초기화
seoyoon513 Jul 10, 2025
9622a78
[BOOK-113] feat: 앱 버전 정보 표시 로직 추가
seoyoon513 Jul 10, 2025
b5278b3
[BOOK-113] feat: 앱 버전 click 차단
seoyoon513 Jul 10, 2025
0ae13ed
[BOOK-113] chore: code style check success
seoyoon513 Jul 10, 2025
a39fea9
[BOOK-113] chore: 토끼 리뷰 반영
seoyoon513 Jul 10, 2025
38a9942
[BOOK-113] fix: 접두사 오타 수정 (setting -> settings)
seoyoon513 Jul 10, 2025
ba3de34
[BOOK-113] refactor: 앱 버전 관리 로직 UI로 이동
seoyoon513 Jul 10, 2025
d529b1c
[BOOK-113] refactor: 상태 변수명 개선 (Sheet -> BottomSheet)
seoyoon513 Jul 10, 2025
8007d56
[BOOK-113] refactor: BottomSheet 컴포넌트 분리 및 onCancelButtonClick 콜백 추가
seoyoon513 Jul 10, 2025
dd1a421
[BOOK-113] fix: Settings Preview 렌더링 에러 해결
seoyoon513 Jul 10, 2025
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
1 change: 1 addition & 0 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ dependencies {
projects.feature.main,
projects.feature.login,
projects.feature.search,
projects.feature.settings,

libs.androidx.activity.compose,
libs.androidx.startup,
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
package com.ninecraft.booket.core.designsystem.component.divider

import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import com.ninecraft.booket.core.designsystem.theme.ReedTheme

@Composable
fun ReedDivider(modifier: Modifier = Modifier) {
Box(
modifier = modifier
.fillMaxWidth()
.height(8.dp)
.background(ReedTheme.colors.dividerMd),
)
}

@Preview
@Composable
private fun ReedDividerPreview() {
ReedTheme {
ReedDivider()
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import com.ninecraft.booket.core.data.api.repository.AuthRepository
import com.ninecraft.booket.core.data.api.repository.UserRepository
import com.ninecraft.booket.screens.LibraryScreen
import com.ninecraft.booket.screens.LoginScreen
import com.ninecraft.booket.screens.SettingsScreen
import com.orhanobut.logger.Logger
import com.skydoves.compose.effects.RememberedEffect
import com.slack.circuit.codegen.annotations.CircuitInject
Expand Down Expand Up @@ -76,6 +77,10 @@ class LibraryPresenter @AssistedInject constructor(
sideEffect = null
}

is LibraryUiEvent.OnSettingsClick -> {
navigator.goTo(SettingsScreen)
}

is LibraryUiEvent.OnLogoutButtonClick -> {
scope.launch {
try {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,16 @@ import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.material3.CircularProgressIndicator
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.res.vectorResource
import androidx.compose.ui.unit.dp
import com.ninecraft.booket.core.designsystem.DevicePreview
import com.ninecraft.booket.core.designsystem.component.button.ReedButton
Expand Down Expand Up @@ -58,6 +63,18 @@ internal fun LibraryContent(
verticalArrangement = Arrangement.Center,
) {
Box(modifier = modifier.fillMaxSize()) {
IconButton(
modifier = Modifier.align(Alignment.TopEnd),
onClick = {
state.eventSink(LibraryUiEvent.OnSettingsClick)
},
) {
Icon(
imageVector = ImageVector.vectorResource(id = com.ninecraft.booket.core.designsystem.R.drawable.ic_settings),
contentDescription = "Settings Icon",
tint = Color.Unspecified,
)
}
Column(
modifier = Modifier.fillMaxSize(),
horizontalAlignment = Alignment.CenterHorizontally,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,6 @@ sealed interface LibrarySideEffect {

sealed interface LibraryUiEvent : CircuitUiEvent {
data object InitSideEffect : LibraryUiEvent
data object OnSettingsClick : LibraryUiEvent
data object OnLogoutButtonClick : LibraryUiEvent
}
1 change: 1 addition & 0 deletions feature/settings/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/build
21 changes: 21 additions & 0 deletions feature/settings/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
@file:Suppress("INLINE_FROM_HIGHER_PLATFORM")

plugins {
alias(libs.plugins.booket.android.feature)
alias(libs.plugins.kotlin.serialization)
alias(libs.plugins.kotlin.parcelize)
}

android {
namespace = "com.ninecraft.booket.feature.settings"
}

ksp {
arg("circuit.codegen.mode", "hilt")
}

dependencies {
implementations(
libs.logger,
)
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
package com.ninecraft.booket.feature.settings

import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.setValue
import com.ninecraft.booket.screens.SettingsScreen
import com.slack.circuit.codegen.annotations.CircuitInject
import com.slack.circuit.retained.rememberRetained
import com.slack.circuit.runtime.Navigator
import com.slack.circuit.runtime.presenter.Presenter
import dagger.assisted.Assisted
import dagger.assisted.AssistedFactory
import dagger.assisted.AssistedInject
import dagger.hilt.android.components.ActivityRetainedComponent

class SettingsPresenter @AssistedInject constructor(
@Assisted val navigator: Navigator,
) : Presenter<SettingsUiState> {

@Composable
override fun present(): SettingsUiState {
var isLogoutBottomSheetVisible by rememberRetained { mutableStateOf(false) }
var isWithdrawBottomSheetVisible by rememberRetained { mutableStateOf(false) }
var isWithdrawConfirmed by rememberRetained { mutableStateOf(false) }

fun handleEvent(event: SettingsUiEvent) {
when (event) {
is SettingsUiEvent.OnBackClick -> {
navigator.pop()
}

is SettingsUiEvent.OnTermDetailClick -> {
// TODO: 웹뷰 화면으로 이동
}

is SettingsUiEvent.OnLogoutClick -> {
isLogoutBottomSheetVisible = true
}

is SettingsUiEvent.OnWithdrawClick -> {
isWithdrawBottomSheetVisible = true
}

is SettingsUiEvent.OnBottomSheetDismissed -> {
isLogoutBottomSheetVisible = false
isWithdrawBottomSheetVisible = false
isWithdrawConfirmed = false
}

is SettingsUiEvent.OnWithdrawConfirmationToggled -> {
isWithdrawConfirmed = !isWithdrawConfirmed
}

is SettingsUiEvent.Logout -> {
// TODO: 로그아웃 처리 -> 성공 시 로그인 화면으로 이동
}

is SettingsUiEvent.Withdraw -> {
// TODO: 회원탈퇴 처리 -> 성공 시 로그인 화면으로 이동
}
}
}
return SettingsUiState(
isLogoutBottomSheetVisible = isLogoutBottomSheetVisible,
isWithdrawBottomSheetVisible = isWithdrawBottomSheetVisible,
isWithdrawConfirmed = isWithdrawConfirmed,
eventSink = ::handleEvent,
)
}

@CircuitInject(SettingsScreen::class, ActivityRetainedComponent::class)
@AssistedFactory
fun interface Factory {
fun create(navigator: Navigator): SettingsPresenter
}
}
Loading
Loading