-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #373 from apeun-gidaechi/feature/372-setting-gener…
…al-and-alarm-screen Feature/Setting general and Alarm screen
- Loading branch information
Showing
30 changed files
with
403 additions
and
24 deletions.
There are no files selected for viewing
2 changes: 1 addition & 1 deletion
2
data/core/src/main/java/com/seugi/data/core/mapper/TokenMapper.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
data/firebase-token/src/main/java/com/seugi/data/firebasetoken/mapper/FirebaseTokenMapper.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
data/workspace/src/main/java/com/seugi/data/workspace/mapper/WorkspaceMapper.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
90 changes: 90 additions & 0 deletions
90
...detail/src/main/java/com/seugi/workspacedetail/feature/settingalarm/SettingAlarmScreen.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,90 @@ | ||
| package com.seugi.workspacedetail.feature.settingalarm | ||
|
|
||
| import androidx.compose.foundation.layout.Column | ||
| import androidx.compose.foundation.layout.Row | ||
| import androidx.compose.foundation.layout.Spacer | ||
| import androidx.compose.foundation.layout.fillMaxWidth | ||
| import androidx.compose.foundation.layout.height | ||
| import androidx.compose.foundation.layout.padding | ||
| import androidx.compose.material3.Scaffold | ||
| import androidx.compose.material3.Text | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.runtime.LaunchedEffect | ||
| import androidx.compose.runtime.getValue | ||
| import androidx.compose.runtime.setValue | ||
| import androidx.compose.ui.Alignment | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.unit.dp | ||
| import androidx.hilt.navigation.compose.hiltViewModel | ||
| import androidx.lifecycle.compose.collectAsStateWithLifecycle | ||
| import com.seugi.designsystem.animation.bounceClick | ||
| import com.seugi.designsystem.component.SeugiToggle | ||
| import com.seugi.designsystem.component.SeugiTopBar | ||
| import com.seugi.designsystem.theme.SeugiTheme | ||
|
|
||
| @Composable | ||
| internal fun SettingAlarmScreen(viewModel: SettingAlarmViewModel = hiltViewModel(), workspaceId: String, popBackStack: () -> Unit) { | ||
| val alarmState by viewModel.alarmState.collectAsStateWithLifecycle() | ||
|
|
||
| LaunchedEffect(workspaceId) { | ||
| viewModel.load(workspaceId) | ||
| } | ||
|
|
||
| Scaffold( | ||
| topBar = { | ||
| SeugiTopBar( | ||
| title = { | ||
| Text( | ||
| text = "알림 설정", | ||
| style = SeugiTheme.typography.subtitle1, | ||
| color = SeugiTheme.colors.black, | ||
| ) | ||
| }, | ||
| onNavigationIconClick = popBackStack, | ||
| ) | ||
| }, | ||
| containerColor = SeugiTheme.colors.white, | ||
| ) { | ||
| Column( | ||
| modifier = Modifier | ||
| .padding(it) | ||
| .fillMaxWidth(), | ||
| ) { | ||
| Spacer(modifier = Modifier.height(6.dp)) | ||
| Row( | ||
| modifier = Modifier | ||
| .fillMaxWidth() | ||
| .height(56.dp) | ||
| .bounceClick( | ||
| onClick = { | ||
| viewModel.changeAlarmState( | ||
| alarmState = !alarmState, | ||
| workspaceId = workspaceId, | ||
| ) | ||
| }, | ||
| ) | ||
| .padding( | ||
| horizontal = 20.dp, | ||
| vertical = 12.5.dp, | ||
| ), | ||
| verticalAlignment = Alignment.CenterVertically, | ||
| ) { | ||
| Text( | ||
| text = "전체 알림 허용", | ||
| style = SeugiTheme.typography.subtitle2, | ||
| color = SeugiTheme.colors.black, | ||
| ) | ||
| Spacer(modifier = Modifier.weight(1f)) | ||
| SeugiToggle( | ||
| checked = alarmState, | ||
| onCheckedChangeListener = { | ||
| viewModel.changeAlarmState( | ||
| alarmState = it, | ||
| workspaceId = workspaceId, | ||
| ) | ||
| }, | ||
| ) | ||
| } | ||
| } | ||
| } | ||
| } |
57 changes: 57 additions & 0 deletions
57
...ail/src/main/java/com/seugi/workspacedetail/feature/settingalarm/SettingAlarmViewModel.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| package com.seugi.workspacedetail.feature.settingalarm | ||
|
|
||
| import androidx.lifecycle.ViewModel | ||
| import androidx.lifecycle.viewModelScope | ||
| import com.seugi.common.model.Result | ||
| import com.seugi.common.utiles.DispatcherType | ||
| import com.seugi.common.utiles.SeugiDispatcher | ||
| import com.seugi.data.workspace.WorkspaceRepository | ||
| import dagger.hilt.android.lifecycle.HiltViewModel | ||
| import javax.inject.Inject | ||
| import kotlinx.coroutines.CoroutineDispatcher | ||
| import kotlinx.coroutines.flow.MutableStateFlow | ||
| import kotlinx.coroutines.flow.asStateFlow | ||
| import kotlinx.coroutines.flow.update | ||
| import kotlinx.coroutines.launch | ||
|
|
||
| @HiltViewModel | ||
| class SettingAlarmViewModel @Inject constructor( | ||
| @SeugiDispatcher(DispatcherType.IO) private val dispatcher: CoroutineDispatcher, | ||
| private val workspaceRepository: WorkspaceRepository, | ||
| ) : ViewModel() { | ||
|
|
||
| private val _alarmState = MutableStateFlow(false) | ||
| val alarmState = _alarmState.asStateFlow() | ||
|
|
||
| fun load(workspaceId: String) = viewModelScope.launch(dispatcher) { | ||
| workspaceRepository.getIsWorkspaceReceiveFCM(workspaceId).collect { | ||
| when (it) { | ||
| is Result.Success -> { | ||
| _alarmState.update { _ -> | ||
| it.data | ||
| } | ||
| } | ||
| is Result.Error -> { | ||
| it.throwable.printStackTrace() | ||
| } | ||
| Result.Loading -> {} | ||
| } | ||
| } | ||
| } | ||
|
|
||
| fun changeAlarmState(alarmState: Boolean, workspaceId: String) = viewModelScope.launch(dispatcher) { | ||
| workspaceRepository.changeIsWorkspaceReceiveFCM(alarmState, workspaceId).collect { | ||
| when (it) { | ||
| is Result.Success -> { | ||
| _alarmState.update { _ -> | ||
| alarmState | ||
| } | ||
| } | ||
| is Result.Error -> { | ||
| it.throwable.printStackTrace() | ||
| } | ||
| Result.Loading -> {} | ||
| } | ||
| } | ||
| } | ||
| } |
93 changes: 93 additions & 0 deletions
93
...il/src/main/java/com/seugi/workspacedetail/feature/settinggeneral/SettingGeneralScreen.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,93 @@ | ||
| package com.seugi.workspacedetail.feature.settinggeneral | ||
|
|
||
| import androidx.compose.foundation.layout.Column | ||
| import androidx.compose.foundation.layout.Row | ||
| import androidx.compose.foundation.layout.Spacer | ||
| import androidx.compose.foundation.layout.fillMaxWidth | ||
| import androidx.compose.foundation.layout.height | ||
| import androidx.compose.foundation.layout.padding | ||
| import androidx.compose.foundation.layout.size | ||
| import androidx.compose.material3.Icon | ||
| import androidx.compose.material3.Scaffold | ||
| import androidx.compose.material3.Text | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.runtime.getValue | ||
| import androidx.compose.runtime.mutableStateOf | ||
| import androidx.compose.runtime.remember | ||
| import androidx.compose.runtime.setValue | ||
| import androidx.compose.ui.Alignment | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.res.painterResource | ||
| import androidx.compose.ui.unit.dp | ||
| import com.seugi.designsystem.animation.bounceClick | ||
| import com.seugi.designsystem.component.SeugiDialog | ||
| import com.seugi.designsystem.component.SeugiTopBar | ||
| import com.seugi.designsystem.theme.SeugiTheme | ||
| import com.seugi.workspacecdetail.R | ||
|
|
||
| @Composable | ||
| internal fun SettingGeneralScreen(popBackStack: () -> Unit) { | ||
| var showDialog by remember { mutableStateOf(false) } | ||
|
|
||
| if (showDialog) { | ||
| SeugiDialog( | ||
| title = "탈퇴 실패 안내", | ||
| content = "시연 모드에서는 탈퇴가 불가능합니다.", | ||
| onDismissRequest = { | ||
| showDialog = false | ||
| }, | ||
| ) | ||
| } | ||
|
|
||
| Scaffold( | ||
| topBar = { | ||
| SeugiTopBar( | ||
| title = { | ||
| Text( | ||
| text = "일반", | ||
| style = SeugiTheme.typography.subtitle1, | ||
| color = SeugiTheme.colors.black, | ||
| ) | ||
| }, | ||
| onNavigationIconClick = popBackStack, | ||
| ) | ||
| }, | ||
| containerColor = SeugiTheme.colors.white, | ||
| ) { | ||
| Column( | ||
| modifier = Modifier | ||
| .padding(it) | ||
| .fillMaxWidth(), | ||
| ) { | ||
| Spacer(modifier = Modifier.height(6.dp)) | ||
| Row( | ||
| modifier = Modifier | ||
| .fillMaxWidth() | ||
| .height(56.dp) | ||
| .bounceClick( | ||
| onClick = { | ||
| showDialog = true | ||
| }, | ||
| ) | ||
| .padding( | ||
| horizontal = 20.dp, | ||
| vertical = 16.dp, | ||
| ), | ||
| verticalAlignment = Alignment.CenterVertically, | ||
| ) { | ||
| Text( | ||
| text = "학교 나가기", | ||
| style = SeugiTheme.typography.subtitle2, | ||
| color = SeugiTheme.colors.red500, | ||
| ) | ||
| Spacer(modifier = Modifier.weight(1f)) | ||
| Icon( | ||
| modifier = Modifier.size(24.dp), | ||
| painter = painterResource(id = com.seugi.designsystem.R.drawable.ic_expand_right_line), | ||
| contentDescription = null, | ||
| tint = SeugiTheme.colors.gray400, | ||
| ) | ||
| } | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.