Skip to content

Feature Edit Notes #13

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
mehdiyari merged 2 commits into from
May 21, 2023
Merged

Feature Edit Notes #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ff0280a
Add edit feature for texts
mehdiyari May 20, 2023
13fae26
Fix some issues related to configuration change
mehdiyari May 21, 2023
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
3 changes: 3 additions & 0 deletions app/src/main/java/ir/mehdiyari/krypt/data/file/FilesDao.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,4 +57,7 @@ interface FilesDao {
thumbFileName: String,
mediaType: List<FileTypeEnum> = listOf(FileTypeEnum.Photo, FileTypeEnum.Video)
): FileEntity?

@Update(entity = FileEntity::class, onConflict = OnConflictStrategy.REPLACE)
suspend fun updateFile(fileEntity: FileEntity)
}
4 changes: 4 additions & 0 deletions app/src/main/java/ir/mehdiyari/krypt/data/repositories/FilesRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,4 +169,8 @@ class FilesRepository @Inject constructor(
FileTypeEnum.Audio
)
}

suspend fun updateFile(fileEntity: FileEntity): Unit = withContext(ioDispatcher) {
filedDao.updateFile(fileEntity)
}
}
188 changes: 102 additions & 86 deletions app/src/main/java/ir/mehdiyari/krypt/ui/text/add/AddTextComposeView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import androidx.compose.material.icons.filled.ArrowBack
import androidx.compose.material.icons.filled.Delete
import androidx.compose.material.icons.filled.Done
import androidx.compose.runtime.*
import androidx.compose.runtime.saveable.rememberSaveable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
Expand All @@ -16,7 +17,6 @@ import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.TextStyle
import androidx.compose.ui.text.font.FontFamily
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.input.TextFieldValue
import androidx.compose.ui.text.intl.LocaleList
import androidx.compose.ui.text.style.TextDirection
import androidx.compose.ui.tooling.preview.Preview
Expand All @@ -39,63 +39,95 @@ fun AddTextComposeView(
return@KryptTheme
}

val textTitleField = remember { mutableStateOf(TextFieldValue()) }
val textContentField = remember { mutableStateOf(TextFieldValue()) }
val textTitleField = rememberSaveable { mutableStateOf("") }
val textContentField = rememberSaveable { mutableStateOf("") }

val isPreviewMode = argsState is AddTextArgsViewState.TextArg
val isEditMode = argsState is AddTextArgsViewState.TextArg

if (isPreviewMode) {
if (isEditMode && textContentField.value.isEmpty() && textTitleField.value.isEmpty()) {
argsState as AddTextArgsViewState.TextArg
textTitleField.value = TextFieldValue(argsState.textEntity.title)
textContentField.value = TextFieldValue(argsState.textEntity.content)
textTitleField.value = argsState.textEntity.title
textContentField.value = argsState.textEntity.content
} else {
textContentField.value = TextFieldValue(sharedContentText ?: "")
if (!sharedContentText.isNullOrBlank()) {
textContentField.value = sharedContentText
}
}

Scaffold(
topBar = {
TopBarSurface(
onNavigationClickIcon,
textTitleField,
isPreviewMode = isPreviewMode
Scaffold(topBar = {
TopBarSurface(
onNavigationClickIcon,
textTitleField,
)
}, content = {
Column(
modifier = Modifier
.fillMaxWidth()
.fillMaxHeight()
) {
ContentTextField(
textContentField,
)
}, content = {
Column(
modifier = Modifier
.fillMaxWidth()
.fillMaxHeight()
) {
ContentTextField(
textContentField,
isPreviewMode = isPreviewMode
}
})

if (!isEditMode) {
Column(
horizontalAlignment = Alignment.End,
verticalArrangement = Arrangement.Bottom,
modifier = Modifier.padding(15.dp)
) {
SaveTextFab {
viewModel.saveNote(
textTitleField.value.trim(),
textContentField.value
)
}
})

if (!isPreviewMode) {
SaveTextFab {
viewModel.saveNote(textTitleField.value.text.trim(), textContentField.value.text)
}
} else {
DeleteTextFab {
viewModel.deleteNote()
EditAndDeleteButtons(
textTitleField, textContentField, viewModel::deleteNote, viewModel::saveNote
)
}
}
}

@Composable
@Preview
private fun EditAndDeleteButtons(
textTitleField: MutableState<String> = mutableStateOf("Title"),
textContentField: MutableState<String> = mutableStateOf("Content"),
deleteNote: (() -> Unit)? = null,
saveNote: ((title: String, context: String) -> Unit)? = null,
) {
Column(
horizontalAlignment = Alignment.End,
verticalArrangement = Arrangement.Bottom,
modifier = Modifier.padding(15.dp)
) {
Row {
DeleteTextFab(modifier = Modifier.padding(4.dp)) {
deleteNote?.invoke()
}

SaveTextFab(modifier = Modifier.padding(4.dp)) {
saveNote?.invoke(textTitleField.value.trim(), textContentField.value)
}
}

}
}

@Composable
@Preview
private fun TopBarSurface(
onNavigationClickIcon: () -> Unit = {},
textTitleField: MutableState<TextFieldValue> = mutableStateOf(TextFieldValue("Test")),
isPreviewMode: Boolean = false
textTitleField: MutableState<String> = mutableStateOf("Test"),
) {
Surface(
modifier = Modifier
.fillMaxWidth()
.height(55.dp),
elevation = 8.dp
.height(55.dp), elevation = 8.dp
) {
Row(
modifier = Modifier
Expand All @@ -104,26 +136,23 @@ private fun TopBarSurface(
) {
IconButton(modifier = Modifier
.fillMaxHeight()
.padding(0.dp),
onClick = {
onNavigationClickIcon()
}) {
.padding(0.dp), onClick = {
onNavigationClickIcon()
}) {
Icon(Icons.Filled.ArrowBack, "")
}

TextField(
value = textTitleField.value,
onValueChange = {
if (it.text.length < 32) {
if (it.length < 32) {
textTitleField.value = it
}
},
label = { Text(text = stringResource(id = R.string.text_title)) },
modifier = Modifier
.fillMaxHeight(),
modifier = Modifier.fillMaxHeight(),
textStyle = TextStyle(
color = MaterialTheme.colors.onBackground,
fontWeight = FontWeight.Bold
color = MaterialTheme.colors.onBackground, fontWeight = FontWeight.Bold
),
shape = RectangleShape,
colors = TextFieldDefaults.textFieldColors(
Expand All @@ -134,7 +163,6 @@ private fun TopBarSurface(
disabledIndicatorColor = Color.Transparent
),
singleLine = true,
readOnly = isPreviewMode
)
}
}
Expand All @@ -143,8 +171,7 @@ private fun TopBarSurface(
@Composable
@Preview
private fun ContentTextField(
textContentField: MutableState<TextFieldValue> = mutableStateOf(TextFieldValue("Test")),
isPreviewMode: Boolean = false
textContentField: MutableState<String> = mutableStateOf(("Test")),
) {
TextField(
value = textContentField.value,
Expand All @@ -153,7 +180,7 @@ private fun ContentTextField(
modifier = Modifier
.fillMaxHeight()
.fillMaxWidth()
.padding(bottom = if (isPreviewMode) 0.dp else 55.dp),
.padding(bottom = 55.dp),
textStyle = TextStyle(
color = MaterialTheme.colors.onBackground,
fontSize = 18.sp,
Expand All @@ -169,57 +196,46 @@ private fun ContentTextField(
unfocusedIndicatorColor = Color.Transparent,
disabledIndicatorColor = Color.Transparent
),
readOnly = isPreviewMode
)
}

@Composable
@Preview
private fun SaveTextFab(
onSaveClick: () -> Unit = {}
modifier: Modifier = Modifier,
onSaveClick: () -> Unit = {},
) {
Column(
horizontalAlignment = Alignment.End,
verticalArrangement = Arrangement.Bottom,
modifier = Modifier.padding(15.dp)
) {
ExtendedFloatingActionButton(
onClick = { onSaveClick() },
icon = {
Icon(
Icons.Filled.Done,
contentDescription = stringResource(id = R.string.save_text)
)
},
text = { Text(text = stringResource(id = R.string.save_text)) },
backgroundColor = MaterialTheme.colors.primary,
contentColor = MaterialTheme.colors.onPrimary
)
}
ExtendedFloatingActionButton(
onClick = { onSaveClick() },
icon = {
Icon(
Icons.Filled.Done, contentDescription = stringResource(id = R.string.save_text)
)
},
text = { Text(text = stringResource(id = R.string.save_text)) },
backgroundColor = MaterialTheme.colors.primary,
contentColor = MaterialTheme.colors.onPrimary,
modifier = modifier,
)
}


@Composable
@Preview
private fun DeleteTextFab(
onDeleteClick: () -> Unit = {}
modifier: Modifier = Modifier,
onDeleteClick: () -> Unit = {},
) {
Column(
horizontalAlignment = Alignment.End,
verticalArrangement = Arrangement.Bottom,
modifier = Modifier.padding(15.dp)
) {
ExtendedFloatingActionButton(
onClick = { onDeleteClick() },
icon = {
Icon(
Icons.Filled.Delete,
contentDescription = stringResource(id = R.string.delete_text)
)
},
text = { Text(text = stringResource(id = R.string.delete_text)) },
backgroundColor = MaterialTheme.colors.error,
contentColor = MaterialTheme.colors.onError
)
}
ExtendedFloatingActionButton(
onClick = { onDeleteClick() },
icon = {
Icon(
Icons.Filled.Delete, contentDescription = stringResource(id = R.string.delete_text)
)
},
text = { Text(text = stringResource(id = R.string.delete_text)) },
backgroundColor = MaterialTheme.colors.error,
contentColor = MaterialTheme.colors.onError,
modifier = modifier,
)
}
52 changes: 43 additions & 9 deletions app/src/main/java/ir/mehdiyari/krypt/ui/text/add/AddTextViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,17 +36,21 @@ class AddTextViewModel @Inject constructor(
val argsTextViewState = _argsTextViewState.asStateFlow()

fun saveNote(title: String, content: String) {
viewModelScope.launch(ioDispatcher) {
if (title.trim().isEmpty()) {
_saveNoteValidation.emit(R.string.title_must_not_empty)
return@launch
}
if (title.trim().isEmpty()) {
_saveNoteValidation.value = R.string.title_must_not_empty
return
}

if (content.isEmpty()) {
_saveNoteValidation.emit(R.string.content_must_not_empty)
return@launch
}
if (content.isEmpty()) {
_saveNoteValidation.value = R.string.content_must_not_empty
return
}

if (argsTextViewState.value is AddTextArgsViewState.TextArg) {
return updateNote(title, content)
}

viewModelScope.launch(ioDispatcher) {
textFilesUtils.mapTitleAndContentToFile(title, content).also { textFile ->
val encryptedFileResult = textFilesUtils.encryptTextFiles(textFile)
if (encryptedFileResult.first) {
Expand All @@ -73,6 +77,36 @@ class AddTextViewModel @Inject constructor(
}
}

private fun updateNote(title: String, content: String) {
val textEntity = (argsTextViewState.value as? AddTextArgsViewState.TextArg)?.textEntity
if (textEntity == null) {
_argsTextViewState.value = AddTextArgsViewState.Error(R.string.something_went_wrong)
return
}

viewModelScope.launch(ioDispatcher) {
textFilesUtils.mapTitleAndContentToFile(title, content).also { textFile ->
val encryptedFileResult = textFilesUtils.encryptTextFiles(textFile)
if (encryptedFileResult.first) {
textFile.delete()
val localTextEntity = filesRepository.getFileById(textEntity.id)!!
filesRepository.updateFile(
localTextEntity.copy(
filePath = encryptedFileResult.second!!,
metaData = textFilesUtils.getEncryptedBase64MetaDataFromTitleAndContent(
title = title,
content = content,
) ?: ""
)
)
_saveNoteState.emit(true)
} else {
_saveNoteState.emit(false)
}
}
}
}

fun handleInputTextID(textId: Long) {
if (textId != -1L) {
viewModelScope.launch(ioDispatcher) {
Expand Down