Monospace font in Markdown editor setting

Fix: #155
Kin69 · Aug 23, 2024 · a4dafe5 · a4dafe5
1 parent 5c0dd7a
commit a4dafe5
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 1 deletion.
diff --git a/app/src/main/java/com/kin/easynotes/domain/model/Settings.kt b/app/src/main/java/com/kin/easynotes/domain/model/Settings.kt
@@ -18,6 +18,7 @@ data class Settings(
     var gallerySync: Boolean = true,
     var showOnlyTitle: Boolean = false,
     var termsOfService: Boolean = false,
+    var useMonoSpaceFont: Boolean = false,
 
     var cornerRadius: Int = 32,
 )

diff --git a/app/src/main/java/com/kin/easynotes/presentation/screens/edit/EditScreen.kt b/app/src/main/java/com/kin/easynotes/presentation/screens/edit/EditScreen.kt
@@ -309,11 +309,13 @@ fun EditScreen(viewModel: EditViewModel,settingsViewModel: SettingsViewModel, pa
                     isExtremeAmoled = settingsViewModel.settings.value.extremeAmoledMode,
                     onClickBack = { onClickBack() }
                 ) {
+                    println(settingsViewModel.settings.value.useMonoSpaceFont)
                     CustomTextField(
                         value = viewModel.noteName.value,
                         modifier = Modifier.weight(1f),
                         onValueChange = { viewModel.updateNoteName(it) },
                         placeholder = stringResource(R.string.name),
+                        useMonoSpaceFont = settingsViewModel.settings.value.useMonoSpaceFont
                     )
                 }
             }
@@ -330,6 +332,7 @@ fun EditScreen(viewModel: EditViewModel,settingsViewModel: SettingsViewModel, pa
                     onValueChange = { viewModel.updateNoteDescription(it) },
                     modifier = Modifier.fillMaxSize(),
                     placeholder = stringResource(R.string.description),
+                    useMonoSpaceFont = settingsViewModel.settings.value.useMonoSpaceFont
                 )
             }
         )

diff --git a/app/src/main/java/com/kin/easynotes/presentation/screens/edit/components/CustomTextField.kt b/app/src/main/java/com/kin/easynotes/presentation/screens/edit/components/CustomTextField.kt
@@ -3,6 +3,7 @@ package com.kin.easynotes.presentation.screens.edit.components
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.LocalTextStyle
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextField
 import androidx.compose.material3.TextFieldDefaults
@@ -14,10 +15,14 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.TextRange
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.font.FontStyle
 import androidx.compose.ui.text.input.PasswordVisualTransformation
 import androidx.compose.ui.text.input.TextFieldValue
 import androidx.compose.ui.text.input.VisualTransformation
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
 
 @Composable
 fun CustomTextField(
@@ -28,8 +33,10 @@ fun CustomTextField(
     interactionSource: MutableInteractionSource = MutableInteractionSource(),
     singleLine: Boolean = false,
     modifier: Modifier = Modifier,
-    hideContent: Boolean = false
+    hideContent: Boolean = false,
+    useMonoSpaceFont: Boolean = false
 ) {
+
     val visualTransformation = if (hideContent) {
         PasswordVisualTransformation()
     } else {
@@ -38,6 +45,7 @@ fun CustomTextField(
 
     TextField(
         value = value,
+        textStyle =  if (useMonoSpaceFont) LocalTextStyle.current.copy(fontFamily = FontFamily.Monospace) else LocalTextStyle.current,
         visualTransformation = visualTransformation,
         onValueChange = onValueChange,
         interactionSource = interactionSource,

diff --git a/app/src/main/java/com/kin/easynotes/presentation/screens/settings/settings/Behaviour.kt b/app/src/main/java/com/kin/easynotes/presentation/screens/settings/settings/Behaviour.kt
@@ -78,6 +78,7 @@ fun MarkdownScreen(navController: NavController, settingsViewModel: SettingsView
                     }
                 )
             }
+
             item {
                 Spacer(modifier = Modifier.height(18.dp))
                 SettingsBox(

diff --git a/app/src/main/java/com/kin/easynotes/presentation/screens/settings/settings/Language.kt b/app/src/main/java/com/kin/easynotes/presentation/screens/settings/settings/Language.kt
@@ -1,12 +1,18 @@
 package com.kin.easynotes.presentation.screens.settings.settings
 
 import androidx.appcompat.app.AppCompatDelegate
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.rounded.Battery1Bar
+import androidx.compose.material.icons.rounded.FontDownload
 import androidx.compose.material.icons.rounded.Translate
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
 import androidx.core.os.LocaleListCompat
 import androidx.navigation.NavController
 import com.kin.easynotes.R
@@ -34,6 +40,18 @@ fun LanguageScreen(navController: NavController, settingsViewModel: SettingsView
                     customAction = { onExit -> OnLanguageClicked(settingsViewModel) { onExit() }
                     }
                 )
+                Spacer(modifier = Modifier.height(18.dp))
+            }
+            item {
+                SettingsBox(
+                    title = stringResource(id = R.string.monospace_font),
+                    icon = Icons.Rounded.FontDownload,
+                    description = stringResource(id = R.string.monospace_font_description),
+                    radius = shapeManager(radius = settingsViewModel.settings.value.cornerRadius, isBoth = true),
+                    actionType = ActionType.SWITCH,
+                    variable = settingsViewModel.settings.value.useMonoSpaceFont,
+                    switchEnabled = { settingsViewModel.update(settingsViewModel.settings.value.copy(useMonoSpaceFont = it))}
+                )
             }
         }
     }

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -134,4 +134,6 @@
     <string name="file_import_success">Successfully imported</string>
     <string name="file_import_title">Import</string>
     <string name="file_import_description">Import other text files as notes</string>
+    <string name="monospace_font_description">Use monospace font while editing note</string>
+    <string name="monospace_font">Monospace font</string>
 </resources>
-Original file line number
+Diff line change
@@ Expand Up @@
                         }
                     )
                 }
                 item {
                     Spacer(modifier = Modifier.height(18.dp))
                     SettingsBox(
@@ Expand Down @@