Skip to content

Commit b0e4a0c

Browse files
JoyinJoesterJoyinJoester
committed
save changes
1 parent a5f56ce commit b0e4a0c

File tree

4 files changed

+170
-125
lines changed

4 files changed

+170
-125
lines changed

‎Monica for Android/app/src/main/java/takagi/ru/monica/ui/components/ExpressiveTopBar.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ fun ExpressiveTopBar(
7979
Box(
8080
modifier = modifier
8181
.fillMaxWidth()
82-
.heightIn(min = 88.dp, max = 88.dp)
82+
.heightIn(min = 88.dp)
8383
.padding(horizontal = 24.dp, vertical = 16.dp),
8484
contentAlignment = Alignment.Center
8585
) {

‎Monica for Android/app/src/main/java/takagi/ru/monica/ui/password/PasswordListContent.kt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2254,6 +2254,8 @@ private fun PasswordListTopSection(
22542254
}
22552255
)
22562256

2257+
Spacer(modifier = Modifier.height(6.dp))
2258+
22572259
val unifiedSelectedFilter = when (val filter = currentFilter) {
22582260
is CategoryFilter.All -> UnifiedCategoryFilterSelection.All
22592261
is CategoryFilter.Archived -> UnifiedCategoryFilterSelection.All

‎Monica for Android/app/src/main/java/takagi/ru/monica/ui/screens/AddEditNoteScreen.kt‎

Lines changed: 85 additions & 117 deletions
Original file line numberDiff line numberDiff line change
@@ -455,72 +455,7 @@ fun AddEditNoteScreen(
455455
}
456456
}
457457
},
458-
bottomBar = {
459-
val bottomBarAlpha = when {
460-
isEditorModeAnimating && !transitionFromFullScreen && transitionToFullScreen -> {
461-
(1f - editorModeProgress.value * 1.2f).coerceIn(0f, 1f)
462-
}
463-
464-
isEditorModeAnimating && transitionFromFullScreen && !transitionToFullScreen -> {
465-
((editorModeProgress.value - 0.2f) / 0.8f).coerceIn(0f, 1f)
466-
}
467-
468-
!isFullScreenEditor && !editorState.isMarkdownPreview -> 1f
469-
else -> 0f
470-
}
471-
472-
if (bottomBarAlpha > 0.01f && !editorState.isMarkdownPreview) {
473-
val toolbarContent: @Composable () -> Unit = {
474-
MarkdownQuickToolbar(
475-
onAction = { action ->
476-
when (action) {
477-
MarkdownEditorAction.Image -> {
478-
if (isBitwardenNoteTarget) {
479-
Toast.makeText(
480-
context,
481-
context.getString(R.string.note_bitwarden_inline_image_disabled_toast),
482-
Toast.LENGTH_SHORT
483-
).show()
484-
} else {
485-
pendingImageInsertionCursor = editorState.contentField.selection.start
486-
.coerceIn(0, editorState.contentField.text.length)
487-
showAddImageDialog = true
488-
}
489-
}
490-
491-
else -> {
492-
editorViewModel.updateContent(
493-
applyMarkdownAction(editorState.contentField, action)
494-
)
495-
}
496-
}
497-
}
498-
)
499-
}
500-
501-
Surface(
502-
modifier = Modifier
503-
.fillMaxWidth()
504-
.navigationBarsPadding()
505-
.imePadding(),
506-
color = MaterialTheme.colorScheme.surface,
507-
tonalElevation = 2.dp,
508-
shadowElevation = 2.dp
509-
) {
510-
Column(
511-
modifier = Modifier
512-
.graphicsLayer {
513-
alpha = bottomBarAlpha
514-
scaleX = 0.96f + (0.04f * bottomBarAlpha)
515-
scaleY = 0.96f + (0.04f * bottomBarAlpha)
516-
}
517-
.padding(horizontal = 12.dp, vertical = 8.dp)
518-
) {
519-
toolbarContent()
520-
}
521-
}
522-
}
523-
}
458+
bottomBar = {}
524459
) { paddingValues ->
525460
val toolbarContent: @Composable () -> Unit = {
526461
MarkdownQuickToolbar(
@@ -993,13 +928,17 @@ private fun NoteEditorModeBody(
993928
}
994929
) {
995930
if (fullScreen) {
996-
Box(
931+
Column(
997932
modifier = Modifier
998933
.fillMaxSize()
999934
.imePadding()
1000935
.padding(horizontal = 16.dp)
936+
.padding(bottom = 12.dp)
1001937
) {
1002938
NoteEditorSection(
939+
modifier = Modifier
940+
.fillMaxWidth()
941+
.weight(1f),
1003942
title = editorState.title,
1004943
onTitleChange = onTitleChange,
1005944
content = editorState.contentField,
@@ -1021,10 +960,8 @@ private fun NoteEditorModeBody(
1021960
if (!editorState.isMarkdownPreview) {
1022961
Row(
1023962
modifier = Modifier
1024-
.align(androidx.compose.ui.Alignment.BottomCenter)
1025963
.fillMaxWidth()
1026-
.navigationBarsPadding()
1027-
.padding(horizontal = 4.dp, vertical = 12.dp),
964+
.padding(top = 12.dp, bottom = 4.dp),
1028965
horizontalArrangement = Arrangement.Center
1029966
) {
1030967
Surface(
@@ -1046,58 +983,89 @@ private fun NoteEditorModeBody(
1046983
Column(
1047984
modifier = Modifier
1048985
.fillMaxSize()
1049-
.verticalScroll(normalEditorScrollState)
986+
.imePadding()
1050987
.padding(horizontal = 16.dp, vertical = 12.dp)
1051-
.padding(bottom = if (!editorState.isMarkdownPreview) 84.dp else 0.dp),
988+
.padding(bottom = 12.dp),
1052989
verticalArrangement = Arrangement.spacedBy(14.dp)
1053990
) {
1054-
StorageTargetSelectorCard(
1055-
keepassDatabases = keepassDatabases,
1056-
selectedKeePassDatabaseId = editorState.keepassDatabaseId,
1057-
onKeePassDatabaseSelected = onKeePassDatabaseSelected,
1058-
bitwardenVaults = bitwardenVaults,
1059-
selectedBitwardenVaultId = editorState.bitwardenVaultId,
1060-
onBitwardenVaultSelected = onBitwardenVaultSelected,
1061-
categories = categories,
1062-
selectedCategoryId = editorState.selectedCategoryId,
1063-
onCategorySelected = onCategorySelected,
1064-
selectedBitwardenFolderId = editorState.bitwardenFolderId,
1065-
onBitwardenFolderSelected = onBitwardenFolderSelected
1066-
)
1067-
1068-
NoteEditorSection(
1069-
title = editorState.title,
1070-
onTitleChange = onTitleChange,
1071-
content = editorState.contentField,
1072-
onContentChange = onContentChange,
1073-
isMarkdownPreview = editorState.isMarkdownPreview,
1074-
onMarkdownPreviewModeChange = onPreviewModeChange,
1075-
showModeSwitcher = true,
1076-
codeBlockCollapseMode = NoteCodeBlockCollapseMode.COMPACT,
1077-
inlineImageBitmaps = noteImageBitmaps,
1078-
onPreviewInlineImage = onPreviewInlineImage,
1079-
onTaskItemToggle = onTaskItemToggle,
1080-
tagsText = editorState.tagsText,
1081-
onTagsTextChange = onTagsTextChange,
1082-
borderless = false,
1083-
showTags = true,
1084-
editorTakesRemainingSpace = false
1085-
)
991+
Column(
992+
modifier = Modifier
993+
.weight(1f)
994+
.verticalScroll(normalEditorScrollState),
995+
verticalArrangement = Arrangement.spacedBy(14.dp)
996+
) {
997+
StorageTargetSelectorCard(
998+
keepassDatabases = keepassDatabases,
999+
selectedKeePassDatabaseId = editorState.keepassDatabaseId,
1000+
onKeePassDatabaseSelected = onKeePassDatabaseSelected,
1001+
bitwardenVaults = bitwardenVaults,
1002+
selectedBitwardenVaultId = editorState.bitwardenVaultId,
1003+
onBitwardenVaultSelected = onBitwardenVaultSelected,
1004+
categories = categories,
1005+
selectedCategoryId = editorState.selectedCategoryId,
1006+
onCategorySelected = onCategorySelected,
1007+
selectedBitwardenFolderId = editorState.bitwardenFolderId,
1008+
onBitwardenFolderSelected = onBitwardenFolderSelected
1009+
)
10861010

1087-
if (isEditing) {
1088-
NoteImagesSection(
1089-
noteImagePaths = editorState.noteImagePaths,
1090-
noteImageBitmaps = noteImageBitmaps,
1091-
imageActionsEnabled = !isBitwardenNoteTarget,
1092-
disabledReason = if (isBitwardenNoteTarget) {
1093-
stringResource(R.string.note_bitwarden_inline_image_disabled_reason)
1094-
} else {
1095-
null
1096-
},
1097-
onAddImageClick = onAddImageClick,
1098-
onPreviewImage = onPreviewInlineImage,
1099-
onRemoveImage = onRemoveImage
1011+
NoteEditorSection(
1012+
modifier = Modifier.fillMaxWidth(),
1013+
title = editorState.title,
1014+
onTitleChange = onTitleChange,
1015+
content = editorState.contentField,
1016+
onContentChange = onContentChange,
1017+
isMarkdownPreview = editorState.isMarkdownPreview,
1018+
onMarkdownPreviewModeChange = onPreviewModeChange,
1019+
showModeSwitcher = true,
1020+
codeBlockCollapseMode = NoteCodeBlockCollapseMode.COMPACT,
1021+
inlineImageBitmaps = noteImageBitmaps,
1022+
onPreviewInlineImage = onPreviewInlineImage,
1023+
onTaskItemToggle = onTaskItemToggle,
1024+
tagsText = editorState.tagsText,
1025+
onTagsTextChange = onTagsTextChange,
1026+
borderless = false,
1027+
showTags = true,
1028+
editorTakesRemainingSpace = false
11001029
)
1030+
1031+
if (isEditing) {
1032+
NoteImagesSection(
1033+
noteImagePaths = editorState.noteImagePaths,
1034+
noteImageBitmaps = noteImageBitmaps,
1035+
imageActionsEnabled = !isBitwardenNoteTarget,
1036+
disabledReason = if (isBitwardenNoteTarget) {
1037+
stringResource(R.string.note_bitwarden_inline_image_disabled_reason)
1038+
} else {
1039+
null
1040+
},
1041+
onAddImageClick = onAddImageClick,
1042+
onPreviewImage = onPreviewInlineImage,
1043+
onRemoveImage = onRemoveImage
1044+
)
1045+
}
1046+
}
1047+
1048+
if (!editorState.isMarkdownPreview) {
1049+
Row(
1050+
modifier = Modifier
1051+
.fillMaxWidth()
1052+
.padding(top = 12.dp)
1053+
.navigationBarsPadding(),
1054+
horizontalArrangement = Arrangement.Center
1055+
) {
1056+
Surface(
1057+
shape = RoundedCornerShape(20.dp),
1058+
color = MaterialTheme.colorScheme.surface,
1059+
tonalElevation = 6.dp,
1060+
shadowElevation = 8.dp
1061+
) {
1062+
Column(
1063+
modifier = Modifier.padding(horizontal = 12.dp, vertical = 8.dp)
1064+
) {
1065+
toolbarContent()
1066+
}
1067+
}
1068+
}
11011069
}
11021070
}
11031071
}

0 commit comments

Comments
 (0)