v1.2.4

app/build.gradle.kts

@@ -16,8 +16,8 @@ android {
  applicationId = "com.yangdai.opennote"
  minSdk = 29
  targetSdk = 34
- versionCode = 123
- versionName = "1.2.3"
+ versionCode = 124
+ versionName = "1.2.4"
  resourceConfigurations += listOf("en", "zh")
 
  testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"

app/src/main/java/com/yangdai/opennote/presentation/component/DrawerContent.kt

@@ -34,14 +34,15 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import com.yangdai.opennote.R
 import com.yangdai.opennote.data.local.entity.FolderEntity
-import com.yangdai.opennote.presentation.navigation.Route
+import com.yangdai.opennote.presentation.navigation.Folders
+import com.yangdai.opennote.presentation.navigation.Settings
 import kotlinx.collections.immutable.ImmutableList
 
 @Composable
 fun DrawerContent(
  folderList: ImmutableList<FolderEntity>,
  selectedDrawerIndex: Int,
- navigateTo: (String) -> Unit,
+ navigateTo: (Any) -> Unit,
  onClick: (Int, FolderEntity) -> Unit
 ) {
 
@@ -60,7 +61,7 @@ fun DrawerContent(
  ) {
  IconButton(
  modifier = Modifier.padding(12.dp),
- onClick = { navigateTo(Route.SETTINGS) }
+ onClick = { navigateTo(Settings) }
  ) {
  Icon(
  imageVector = Icons.Outlined.Settings,
@@ -116,7 +117,7 @@ fun DrawerContent(
  modifier = Modifier
  .fillMaxWidth()
  .padding(NavigationDrawerItemDefaults.ItemPadding),
- onClick = { navigateTo(Route.FOLDERS) }) {
+ onClick = { navigateTo(Folders) }) {
  Text(text = stringResource(R.string.manage_folders), textAlign = TextAlign.Center)
  }
  }

app/src/main/java/com/yangdai/opennote/presentation/component/LinkDialog.kt

@@ -17,13 +17,12 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.yangdai.opennote.R
-import com.yangdai.opennote.presentation.state.LinkState
 
 
 @Composable
 fun LinkDialog(
  onDismissRequest: () -> Unit,
- onConfirm: (LinkState) -> Unit
+ onConfirm: (name: String, uri: String) -> Unit
 ) {
 
  var name by remember { mutableStateOf("") }
@@ -82,7 +81,7 @@ fun LinkDialog(
  ) {
  uri = "https://$uri"
  }
- onConfirm(LinkState(name, uri))
+ onConfirm(name, uri)
  onDismissRequest()
  }
  }
@@ -101,5 +100,6 @@ fun LinkDialog(
 @Composable
 @Preview
 fun LinkDialogPreview() {
- LinkDialog(onDismissRequest = {}, onConfirm = {})
+ LinkDialog(onDismissRequest = {}) { _, _ ->
+ }
 }

app/src/main/java/com/yangdai/opennote/presentation/component/MainContent.kt

@@ -64,7 +64,7 @@ import com.yangdai.opennote.R
 import com.yangdai.opennote.data.local.entity.FolderEntity
 import com.yangdai.opennote.data.local.entity.NoteEntity
 import com.yangdai.opennote.presentation.event.ListEvent
-import com.yangdai.opennote.presentation.navigation.Route
+import com.yangdai.opennote.presentation.navigation.Note
 import com.yangdai.opennote.presentation.state.DataActionState
 import com.yangdai.opennote.presentation.state.DataState
 import kotlinx.collections.immutable.ImmutableList
@@ -84,7 +84,7 @@ fun MainContent(
  isLargeScreen: Boolean,
  dataState: DataState,
  folderList: ImmutableList<FolderEntity>,
- navigateTo: (String) -> Unit,
+ navigateTo: (Any) -> Unit,
  initializeNoteSelection: () -> Unit,
  onSearchBarActivationChange: (Boolean) -> Unit,
  onAllNotesSelectionChange: (Boolean) -> Unit,
@@ -319,7 +319,7 @@ fun MainContent(
  FloatingActionButton(
  onClick = {
  onListEvent(ListEvent.AddNote)
- navigateTo(Route.NOTE)
+ navigateTo(Note)
  }
  ) {
  Icon(imageVector = Icons.Outlined.Add, contentDescription = "Add")

app/src/main/java/com/yangdai/opennote/presentation/component/MarkdownText.kt

@@ -25,23 +25,28 @@ fun MarkdownText(html: String) {
 
  val textColor = MaterialTheme.colorScheme.onSurface.toArgb()
  val codeBackgroundColor = MaterialTheme.colorScheme.surfaceVariant.toArgb()
- val preCodeBackgroundColor = MaterialTheme.colorScheme.surfaceColorAtElevation(1.dp).toArgb()
- val quoteBackgroundColor = MaterialTheme.colorScheme.surfaceDim.toArgb()
+ val preBackgroundColor = MaterialTheme.colorScheme.surfaceColorAtElevation(1.dp).toArgb()
+ val quoteBackgroundColor = MaterialTheme.colorScheme.secondaryContainer.toArgb()
+ val borderColor = MaterialTheme.colorScheme.outline.toArgb()
+
  val hexTextColor = remember {
  String.format("#%06X", 0xFFFFFF and textColor)
  }
  val hexCodeBackgroundColor = remember {
  String.format("#%06X", 0xFFFFFF and codeBackgroundColor)
  }
- val hexPreCodeBackgroundColor = remember {
- String.format("#%06X", 0xFFFFFF and preCodeBackgroundColor)
+ val hexPreBackgroundColor = remember {
+ String.format("#%06X", 0xFFFFFF and preBackgroundColor)
  }
  val hexQuoteBackgroundColor = remember {
  String.format("#%06X", 0xFFFFFF and quoteBackgroundColor)
  }
  val hexLinkColor = remember {
  String.format("#%06X", 0xFFFFFF and linkColor.toArgb())
  }
+ val hexBorderColor = remember {
+ String.format("#%06X", 0xFFFFFF and borderColor)
+ }
 
  val customTabsIntent = remember {
  CustomTabsIntent.Builder()
@@ -103,13 +108,17 @@ fun MarkdownText(html: String) {
  mermaid.initialize({ startOnLoad: true });
  </script>
  <style type="text/css">
- body {color: $hexTextColor; padding: 0px; margin: 0px;}
+ body { color: $hexTextColor; padding: 0px; margin: 0px; }
  a { color: $hexLinkColor; }
  p code { background-color: $hexCodeBackgroundColor; padding: 4px 4px 2px 4px; margin: 4px; border-radius: 4px; }
- pre { background-color: $hexPreCodeBackgroundColor; display: block; padding: 16px; overflow-x: auto;}
+ td code { background-color: $hexCodeBackgroundColor; padding: 4px 4px 2px 4px; margin: 4px; border-radius: 4px; }
+ pre { background-color: $hexPreBackgroundColor; display: block; white-space: nowrap; padding: 16px; overflow-x: auto; }
  blockquote { border-left: 4px solid ${hexQuoteBackgroundColor}; padding-left: 0px; margin-left: 0px; padding-right: 0px; margin-right: 0px; }
  blockquote > * { margin-left: 16px; padding: 0px; }
  blockquote blockquote { margin: 16px; }
+ table { border-collapse: collapse; display: block; white-space: nowrap; overflow-x: auto; margin-right: 1px; }
+ th, td { border: 1px solid $hexBorderColor; padding: 6px 13px; line-height: 1.5; }
+ tr:nth-child(even) { background-color: $hexPreBackgroundColor; }
  </style>
  </head>
  <body>

app/src/main/java/com/yangdai/opennote/presentation/component/ModalNavigationScreen.kt

@@ -16,7 +16,7 @@ fun ModalNavigationScreen(
  folderList: ImmutableList<FolderEntity>,
  selectedDrawerIndex: Int,
  content: @Composable () -> Unit,
- navigateTo: (String) -> Unit,
+ navigateTo: (Any) -> Unit,
  selectDrawer: (Int, FolderEntity)-> Unit
 ) = ModalNavigationDrawer(
  modifier = Modifier.fillMaxSize(),

app/src/main/java/com/yangdai/opennote/presentation/component/NoteEditTextField.kt

@@ -24,7 +24,7 @@ import androidx.compose.ui.input.key.onPreviewKeyEvent
 import androidx.compose.ui.input.key.type
 import androidx.compose.ui.res.stringResource
 import com.yangdai.opennote.R
-import com.yangdai.opennote.presentation.util.add
+import com.yangdai.opennote.presentation.util.addInNewLine
 import com.yangdai.opennote.presentation.util.bold
 import com.yangdai.opennote.presentation.util.inlineCode
 import com.yangdai.opennote.presentation.util.inlineFunction
@@ -49,7 +49,7 @@ fun NoteEditTextField(
  transferableContent.consume { item: ClipData.Item ->
  val hasText = item.text.isNotEmpty()
  if (hasText) {
- state.edit { add(item.text.toString()) }
+ state.edit { addInNewLine(item.text.toString()) }
  }
  hasText
  }

app/src/main/java/com/yangdai/opennote/presentation/component/NoteEditorRow.kt

@@ -1,8 +1,11 @@
 package com.yangdai.opennote.presentation.component
 
+import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.foundation.horizontalScroll
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.navigationBarsPadding
@@ -13,20 +16,28 @@ import androidx.compose.material.icons.automirrored.outlined.Undo
 import androidx.compose.material.icons.outlined.AddChart
 import androidx.compose.material.icons.outlined.CheckBox
 import androidx.compose.material.icons.outlined.Code
+import androidx.compose.material.icons.outlined.DataArray
+import androidx.compose.material.icons.outlined.DataObject
 import androidx.compose.material.icons.outlined.DocumentScanner
 import androidx.compose.material.icons.outlined.FormatBold
 import androidx.compose.material.icons.outlined.FormatItalic
 import androidx.compose.material.icons.outlined.FormatPaint
 import androidx.compose.material.icons.outlined.FormatQuote
 import androidx.compose.material.icons.outlined.FormatStrikethrough
 import androidx.compose.material.icons.outlined.FormatUnderlined
+import androidx.compose.material.icons.outlined.HorizontalRule
 import androidx.compose.material.icons.outlined.Link
+import androidx.compose.material.icons.outlined.TableChart
 import androidx.compose.material.icons.outlined.Title
 import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.painterResource
@@ -40,11 +51,14 @@ fun NoteEditorRow(
  canUndo: Boolean,
  canRedo: Boolean,
  onEdit: (String) -> Unit,
+ onTableButtonClick: () -> Unit,
  onScanButtonClick: () -> Unit,
  onTaskButtonClick: () -> Unit,
  onLinkButtonClick: () -> Unit
 ) {
 
+ var isExpanded by rememberSaveable { mutableStateOf(false) }
+
  Column(
  modifier = Modifier
  .fillMaxWidth()
@@ -86,13 +100,58 @@ fun NoteEditorRow(
 
  if (isMarkdown) {
 
- IconButton(onClick = { onEdit(Constants.Editor.TITLE) }) {
+ IconButton(onClick = { isExpanded = !isExpanded }) {
  Icon(
  imageVector = Icons.Outlined.Title,
- contentDescription = "Title"
+ contentDescription = "Heading Level"
  )
  }
 
+ AnimatedVisibility(visible = isExpanded) {
+ Row(
+ modifier = Modifier.fillMaxHeight(),
+ verticalAlignment = Alignment.CenterVertically,
+ horizontalArrangement = Arrangement.Start
+ ) {
+ IconButton(onClick = { onEdit(Constants.Editor.H1) }) {
+ Icon(
+ painter = painterResource(id = R.drawable.format_h1),
+ contentDescription = "H1"
+ )
+ }
+ IconButton(onClick = { onEdit(Constants.Editor.H2) }) {
+ Icon(
+ painter = painterResource(id = R.drawable.format_h2),
+ contentDescription = "H2"
+ )
+ }
+ IconButton(onClick = { onEdit(Constants.Editor.H3) }) {
+ Icon(
+ painter = painterResource(id = R.drawable.format_h3),
+ contentDescription = "H3"
+ )
+ }
+ IconButton(onClick = { onEdit(Constants.Editor.H4) }) {
+ Icon(
+ painter = painterResource(id = R.drawable.format_h4),
+ contentDescription = "H4"
+ )
+ }
+ IconButton(onClick = { onEdit(Constants.Editor.H5) }) {
+ Icon(
+ painter = painterResource(id = R.drawable.format_h5),
+ contentDescription = "H5"
+ )
+ }
+ IconButton(onClick = { onEdit(Constants.Editor.H6) }) {
+ Icon(
+ painter = painterResource(id = R.drawable.format_h6),
+ contentDescription = "H6"
+ )
+ }
+ }
+ }
+
  IconButton(onClick = { onEdit(Constants.Editor.BOLD) }) {
  Icon(
  imageVector = Icons.Outlined.FormatBold,
@@ -135,6 +194,20 @@ fun NoteEditorRow(
  )
  }
 
+ IconButton(onClick = { onEdit(Constants.Editor.INLINE_BRACKETS) }) {
+ Icon(
+ imageVector = Icons.Outlined.DataArray,
+ contentDescription = "Brackets"
+ )
+ }
+
+ IconButton(onClick = { onEdit(Constants.Editor.INLINE_BRACES) }) {
+ Icon(
+ imageVector = Icons.Outlined.DataObject,
+ contentDescription = "Braces"
+ )
+ }
+
  IconButton(onClick = { onEdit(Constants.Editor.INLINE_FUNC) }) {
  Icon(
  painter = painterResource(id = R.drawable.function),
@@ -149,6 +222,20 @@ fun NoteEditorRow(
  )
  }
 
+ IconButton(onClick = { onEdit(Constants.Editor.RULE) }) {
+ Icon(
+ imageVector = Icons.Outlined.HorizontalRule,
+ contentDescription = "Horizontal Rule"
+ )
+ }
+
+ IconButton(onClick = onTableButtonClick) {
+ Icon(
+ imageVector = Icons.Outlined.TableChart,
+ contentDescription = "Table"
+ )
+ }
+
  IconButton(onClick = { onEdit(Constants.Editor.DIAGRAM) }) {
  Icon(
  imageVector = Icons.Outlined.AddChart,

app/src/main/java/com/yangdai/opennote/presentation/component/PermanentNavigationScreen.kt

@@ -13,7 +13,7 @@ fun PermanentNavigationScreen(
  folderList: ImmutableList<FolderEntity>,
  selectedDrawerIndex: Int,
  content: @Composable () -> Unit,
- navigateTo: (String) -> Unit,
+ navigateTo: (Any) -> Unit,
  selectDrawer: (Int, FolderEntity) -> Unit
 ) = PermanentNavigationDrawer(
  modifier = Modifier.fillMaxSize(),