Skip to content

fix notes screen issue #2485

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

Merged
therajanmaurya merged 12 commits into from
Sep 3, 2025
Merged

fix notes screen issue #2485

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
2a942d5
fix notes screen issue
Arinyadav1 Sep 1, 2025
b35d7cf
Merge branch 'development' into fix-notes_screen_issue
Arinyadav1 Sep 1, 2025
d357a0d
update
Arinyadav1 Sep 1, 2025
351b2cf
Merge branch 'fix-notes_screen_issue' of https://github.com/Arinyadav…
Arinyadav1 Sep 1, 2025
98e4bf0
update
Arinyadav1 Sep 1, 2025
c31d2e3
Merge branch 'development' into fix-notes_screen_issue
Arinyadav1 Sep 1, 2025
aa8e9fb
Merge branch 'development' into fix-notes_screen_issue
Arinyadav1 Sep 1, 2025
95d18e7
update
Arinyadav1 Sep 2, 2025
46f7526
Merge branch 'development' into fix-notes_screen_issue
Arinyadav1 Sep 2, 2025
391bb6e
update
Arinyadav1 Sep 2, 2025
571ae51
update
Arinyadav1 Sep 3, 2025
cc53b3b
update
Arinyadav1 Sep 3, 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
22 changes: 15 additions & 7 deletions feature/note/src/commonMain/kotlin/com/mifos/feature/note/addEditNotes/AddEditNoteScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.OutlinedTextFieldDefaults
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.getValue
import androidx.compose.runtime.remember
import androidx.compose.ui.Modifier
Expand All @@ -44,6 +45,7 @@ import com.mifos.core.designsystem.theme.MifosTypography
import com.mifos.core.ui.components.MifosAlertDialog
import com.mifos.core.ui.components.MifosErrorComponent
import com.mifos.core.ui.util.EventsEffect
import kotlinx.coroutines.delay
import org.jetbrains.compose.resources.stringResource
import org.koin.compose.viewmodel.koinViewModel

Expand Down Expand Up @@ -112,7 +114,12 @@ fun AddEditNoteScreenDialog(
)
}

AddEditNoteState.DialogState.Success -> {
onAction(AddEditNoteAction.NavigateBackWithUpdateList)
Comment thread
Arinyadav1 marked this conversation as resolved.
Outdated
}

null -> Unit

}
}

Expand All @@ -131,10 +138,14 @@ internal fun AddEditNoteScreenScaffold(
.fillMaxSize()
.padding(paddingValues),
) {
AddEditNote(
state = state,
onAction = onAction,
)

if(state.dialogState !is AddEditNoteState.DialogState.Loading){
AddEditNote(
state = state,
onAction = onAction,
)
}

}
}
}
Expand Down Expand Up @@ -221,9 +232,6 @@ private fun AddEditNote(
} else {
onAction(AddEditNoteAction.AddNote(state.textFieldNotesPayload))
}
if (state.isError) {
onAction(AddEditNoteAction.NavigateBack)
}
},
colors = ButtonDefaults.outlinedButtonColors(
contentColor = MaterialTheme.colorScheme.onPrimary,
Expand Down
25 changes: 16 additions & 9 deletions ...re/note/src/commonMain/kotlin/com/mifos/feature/note/addEditNotes/AddEditNoteViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,20 +125,20 @@ class AddEditNoteViewModel(
mutableStateFlow.update {
it.copy(
dialogState = AddEditNoteState.DialogState.Error(Res.string.feature_note_Unexpected_error),
isError = false,
)
}
}

DataState.Loading -> {
// no need to show loading for this
mutableStateFlow.update {
it.copy(dialogState = AddEditNoteState.DialogState.Loading)
}
}

is DataState.Success -> {
mutableStateFlow.update {
it.copy(
isError = true,
dialogState = null,
dialogState = AddEditNoteState.DialogState.Success,
successMessage = Res.string.feature_note_add_success,
notesPayloadInitialData = state.textFieldNotesPayload.note,
)
Expand All @@ -159,18 +159,18 @@ class AddEditNoteViewModel(
mutableStateFlow.update {
it.copy(
dialogState = AddEditNoteState.DialogState.Error(Res.string.feature_note_Unexpected_error),
isError = false,
)
}
}
DataState.Loading -> {
// no need to show loading for this
mutableStateFlow.update {
it.copy(dialogState = AddEditNoteState.DialogState.Loading)
}
}
is DataState.Success -> {
mutableStateFlow.update {
it.copy(
isError = true,
dialogState = null,
dialogState = AddEditNoteState.DialogState.Success,
successMessage = Res.string.feature_note_edit_success,
notesPayloadInitialData = state.textFieldNotesPayload.note,
)
Expand All @@ -185,6 +185,10 @@ class AddEditNoteViewModel(
override fun handleAction(action: AddEditNoteAction) {
when (action) {
AddEditNoteAction.NavigateBack -> {
sendEvent(AddEditNoteEvent.NavigateBack)
}

AddEditNoteAction.NavigateBackWithUpdateList -> {
sendEvent(AddEditNoteEvent.NavigateBackWithUpdateList)
}

Expand Down Expand Up @@ -242,6 +246,8 @@ class AddEditNoteViewModel(
sendEvent(AddEditNoteEvent.NavigateBack)
}
}


}
}
}
Expand All @@ -257,14 +263,14 @@ data class AddEditNoteState(
val textFieldNotesPayload: NotesPayload = NotesPayload(null),
val notesPayloadInitialData: String? = null,
val showDialog: Boolean = false,
val isError: Boolean = true,
val dialogState: DialogState? = null,
val networkConnection: Boolean = false,
) {
sealed interface DialogState {
data class Error(val message: StringResource) : DialogState
data object Loading : DialogState
data object MisTouchBack : DialogState
data object Success : DialogState
}
}

Expand All @@ -275,6 +281,7 @@ sealed interface AddEditNoteEvent {

sealed interface AddEditNoteAction {
data object NavigateBack : AddEditNoteAction
data object NavigateBackWithUpdateList : AddEditNoteAction
data object OnRetry : AddEditNoteAction
data class AddNote(val notesPayload: NotesPayload) : AddEditNoteAction
data class EditNote(val notesPayload: NotesPayload) : AddEditNoteAction
Expand Down
56 changes: 34 additions & 22 deletions feature/note/src/commonMain/kotlin/com/mifos/feature/note/notes/NoteScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,17 +84,25 @@ internal fun NoteScreenScaffold(
EventsEffect(viewModel.eventFlow) { event ->
when (event) {
NoteEvent.NavigateBack -> onNavigateBack()
NoteEvent.NavigateAddNote -> onNavigateAddEditNote(state.resourceId, state.resourceType, null)
NoteEvent.NavigateEditNote -> onNavigateAddEditNote(state.resourceId, state.resourceType, state.expandedNoteId)
NoteEvent.NavigateAddNote -> onNavigateAddEditNote(
state.resourceId,
state.resourceType,
null,
)

NoteEvent.NavigateEditNote -> onNavigateAddEditNote(
state.resourceId,
state.resourceType,
state.expandedNoteId,
)
}
}

if (!state.isError && state.notes.isNotEmpty()) {
NoteScreenScaffold(
state = state,
onAction = remember(viewModel) { { viewModel.trySendAction(it) } },
)
}

NoteScreenScaffold(
state = state,
onAction = remember(viewModel) { { viewModel.trySendAction(it) } },
)

NoteScreenDialog(
state = state,
Expand Down Expand Up @@ -152,10 +160,12 @@ internal fun NoteScreenScaffold(
isRefreshing = state.isRefreshing,
onRefresh = { onAction(NoteAction.OnRefresh) },
) {
NoteContent(
state = state,
onAction = onAction,
)
if (state.dialogState != NoteState.DialogState.Loading && !state.isError) {
NoteContent(
state = state,
onAction = onAction,
)
}
Comment thread
Arinyadav1 marked this conversation as resolved.
Outdated
Comment thread
Arinyadav1 marked this conversation as resolved.
Outdated
}
}
}
Expand Down Expand Up @@ -271,7 +281,9 @@ private fun NoteItem(
width = 1.dp,
color = MaterialTheme.colorScheme.secondaryContainer,
shape = shape,
),
).clickable {
id?.let { onAction(NoteAction.OnToggleExpanded(id)) }
},
shape = shape,
elevation = DesignToken.spacing.none,
) {
Expand All @@ -292,9 +304,7 @@ private fun NoteItem(
Icon(
imageVector = MifosIcons.MoreHoriz,
contentDescription = null,
modifier = Modifier.clickable {
id?.let { onAction(NoteAction.OnToggleExpanded(id)) }
}.size(DesignToken.sizes.iconAverage),
modifier = Modifier.size(DesignToken.sizes.iconAverage),
)
}

Expand Down Expand Up @@ -368,9 +378,10 @@ private fun ContextualActions(
verticalArrangement = Arrangement.spacedBy(DesignToken.spacing.medium),
) {
Row(
modifier = Modifier.clickable {
onAction(NoteAction.OnClickEditScreen)
},
modifier = Modifier.fillMaxWidth()
.clickable {
onAction(NoteAction.OnClickEditScreen)
},
horizontalArrangement = Arrangement.spacedBy(
DesignToken.spacing.medium,
),
Expand All @@ -389,9 +400,10 @@ private fun ContextualActions(
}

Row(
modifier = Modifier.clickable {
onAction(NoteAction.ShowDialog)
},
modifier = Modifier.fillMaxWidth()
.clickable {
onAction(NoteAction.ShowDialog)
},
horizontalArrangement = Arrangement.spacedBy(
DesignToken.spacing.medium,
),
Expand Down
Loading