some updates

core/datastore/src/main/kotlin/dev/meloda/fast/datastore/AppSettings.kt

@@ -191,7 +191,7 @@ object AppSettings {
         var enableHaptic: Boolean
             get() = get(
                 SettingsKeys.KEY_DEBUG_ENABLE_HAPTIC,
-                true
+                SettingsKeys.DEFAULT_DEBUG_ENABLE_HAPTIC
             )
             set(value) = put(SettingsKeys.KEY_DEBUG_ENABLE_HAPTIC, value)
 
@@ -202,6 +202,13 @@ object AppSettings {
             ).let(LogLevel::parse)
             set(level) = put(SettingsKeys.KEY_DEBUG_NETWORK_LOG_LEVEL, level.value)
 
+        var useSystemFont: Boolean
+            get() = get(
+                SettingsKeys.KEY_DEBUG_USE_SYSTEM_FONT,
+                SettingsKeys.DEFAULT_DEBUG_USE_SYSTEM_FONT
+            )
+            set(value) = put(SettingsKeys.KEY_DEBUG_USE_SYSTEM_FONT, value)
+
         var showDebugCategory: Boolean
             get() = get(
                 SettingsKeys.KEY_SHOW_DEBUG_CATEGORY,

core/datastore/src/main/kotlin/dev/meloda/fast/datastore/SettingsKeys.kt

@@ -46,8 +46,11 @@ object SettingsKeys {
     const val KEY_DEBUG_HIDE_DEBUG_LIST = "debug_hide_debug_list"
     const val KEY_ENABLE_ANIMATIONS_IN_MESSAGES = "debug_enable_animations_in_messages"
     const val KEY_DEBUG_ENABLE_HAPTIC = "debug_enable_haptic"
+    const val DEFAULT_DEBUG_ENABLE_HAPTIC = true
     const val KEY_DEBUG_NETWORK_LOG_LEVEL = "debug_network_log_level"
     const val DEFAULT_NETWORK_LOG_LEVEL = 0
+    const val KEY_DEBUG_USE_SYSTEM_FONT = "debug_use_system_font"
+    const val DEFAULT_DEBUG_USE_SYSTEM_FONT = false
 
     const val KEY_SHOW_DEBUG_CATEGORY = "show_debug_category"
 

core/datastore/src/main/kotlin/dev/meloda/fast/datastore/UserSettings.kt

@@ -24,6 +24,7 @@ interface UserSettings {
     val useBlur: StateFlow<Boolean>
     val showEmojiButton: StateFlow<Boolean>
     val showTimeInActionMessages: StateFlow<Boolean>
+    val useSystemFont: StateFlow<Boolean>
     val showDebugCategory: StateFlow<Boolean>
 
     fun onUseContactNamesChanged(use: Boolean)
@@ -44,6 +45,7 @@ interface UserSettings {
     fun onUseBlurChanged(use: Boolean)
     fun onShowEmojiButtonChanged(show: Boolean)
     fun onShowTimeInActionMessagesChanged(show: Boolean)
+    fun onUseSystemFontChanged(use: Boolean)
     fun onShowDebugCategoryChanged(show: Boolean)
 }
 
@@ -68,6 +70,7 @@ class UserSettingsImpl : UserSettings {
     override val showEmojiButton = MutableStateFlow(AppSettings.Debug.showEmojiButton)
     override val showTimeInActionMessages =
         MutableStateFlow(AppSettings.Debug.showTimeInActionMessages)
+    override val useSystemFont = MutableStateFlow(AppSettings.Debug.useSystemFont)
     override val showDebugCategory = MutableStateFlow(AppSettings.Debug.showDebugCategory)
 
     override fun onUseContactNamesChanged(use: Boolean) {
@@ -126,6 +129,10 @@ class UserSettingsImpl : UserSettings {
         showTimeInActionMessages.value = show
     }
 
+    override fun onUseSystemFontChanged(use: Boolean) {
+        useSystemFont.value = use
+    }
+
     override fun onShowDebugCategoryChanged(show: Boolean) {
         showDebugCategory.value = show
     }

core/ui/src/main/kotlin/dev/meloda/fast/ui/model/ThemeConfig.kt

@@ -6,5 +6,6 @@ data class ThemeConfig(
     val selectedColorScheme: Int,
     val amoledDark: Boolean,
     val enableBlur: Boolean,
-    val enableMultiline: Boolean
+    val enableMultiline: Boolean,
+    val useSystemFont: Boolean
 )

core/ui/src/main/kotlin/dev/meloda/fast/ui/theme/AppTheme.kt

@@ -112,7 +112,8 @@ val LocalThemeConfig = compositionLocalOf {
         selectedColorScheme = 0,
         amoledDark = false,
         enableBlur = false,
-        enableMultiline = false
+        enableMultiline = false,
+        useSystemFont = false
     )
 }
 
@@ -137,6 +138,7 @@ fun AppTheme(
     useDarkTheme: Boolean = false,
     useDynamicColors: Boolean = false,
     useAmoledBackground: Boolean = false,
+    useSystemFont: Boolean = false,
     selectedColorScheme: Int = 0,
     content: @Composable () -> Unit
 ) {
@@ -165,17 +167,21 @@ fun AppTheme(
         }
     }
 
-    val typography = MaterialTheme.typography.copy(
-        displayLarge = MaterialTheme.typography.displayLarge.copy(fontFamily = googleSansFonts),
-        displayMedium = MaterialTheme.typography.displayMedium.copy(fontFamily = googleSansFonts),
-        displaySmall = MaterialTheme.typography.displaySmall.copy(fontFamily = googleSansFonts),
-        headlineLarge = MaterialTheme.typography.headlineLarge.copy(fontFamily = googleSansFonts),
-        headlineMedium = MaterialTheme.typography.headlineMedium.copy(fontFamily = googleSansFonts),
-        headlineSmall = MaterialTheme.typography.headlineSmall.copy(fontFamily = googleSansFonts),
-        bodyLarge = MaterialTheme.typography.bodyLarge.copy(fontFamily = robotoFonts),
-        bodyMedium = MaterialTheme.typography.bodyMedium.copy(fontFamily = robotoFonts),
-        bodySmall = MaterialTheme.typography.bodySmall.copy(fontFamily = robotoFonts)
-    )
+    val typography = if (useSystemFont) {
+        MaterialTheme.typography
+    } else {
+        MaterialTheme.typography.copy(
+            displayLarge = MaterialTheme.typography.displayLarge.copy(fontFamily = googleSansFonts),
+            displayMedium = MaterialTheme.typography.displayMedium.copy(fontFamily = googleSansFonts),
+            displaySmall = MaterialTheme.typography.displaySmall.copy(fontFamily = googleSansFonts),
+            headlineLarge = MaterialTheme.typography.headlineLarge.copy(fontFamily = googleSansFonts),
+            headlineMedium = MaterialTheme.typography.headlineMedium.copy(fontFamily = googleSansFonts),
+            headlineSmall = MaterialTheme.typography.headlineSmall.copy(fontFamily = googleSansFonts),
+            bodyLarge = MaterialTheme.typography.bodyLarge.copy(fontFamily = robotoFonts),
+            bodyMedium = MaterialTheme.typography.bodyMedium.copy(fontFamily = robotoFonts),
+            bodySmall = MaterialTheme.typography.bodySmall.copy(fontFamily = robotoFonts),
+        )
+    }
 
     val view = LocalView.current
     if (!view.isInEditMode) {

core/ui/src/main/res/drawable/ic_round_push_pin_24.xml

@@ -4,7 +4,7 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="#ffffff"
         android:fillType="evenOdd"
         android:pathData="M19,12.87c0,-0.47 -0.34,-0.85 -0.8,-0.98C16.93,11.54 16,10.38 16,9V4l1,0c0.55,0 1,-0.45 1,-1c0,-0.55 -0.45,-1 -1,-1H7C6.45,2 6,2.45 6,3c0,0.55 0.45,1 1,1l1,0v5c0,1.38 -0.93,2.54 -2.2,2.89C5.34,12.02 5,12.4 5,12.87V13c0,0.55 0.45,1 1,1h4.98L11,21c0,0.55 0.45,1 1,1c0.55,0 1,-0.45 1,-1l-0.02,-7H18c0.55,0 1,-0.45 1,-1V12.87z" />
 </vector>