Make text sizes more flexible (#906)

Author: Crustack

TRANSLATIONS.md

@@ -19,34 +19,34 @@ See [Android Translations Converter](https://github.com/Crustack/android-transla
 <!-- translations:start -->
 | Language | Coverage |
 |----------|----------|
-| 🇺🇸 English | 100% (337/337) |
-| 🇪🇸 Catalan | 19% (65/337) |
-| 🇨🇿 Czech | 92% (313/337) |
-| 🇩🇰 Danish | 20% (69/337) |
-| 🇩🇪 German | 99% (335/337) |
-| 🇬🇷 Greek | 21% (72/337) |
-| 🇪🇸 Spanish | 93% (314/337) |
-| 🇫🇷 French | 97% (327/337) |
-| 🇭🇺 Hungarian | 19% (65/337) |
-| 🇮🇩 Indonesian | 22% (75/337) |
-| 🇮🇹 Italian | 86% (291/337) |
-| 🇯🇵 Japanese | 21% (73/337) |
-| 🇲🇲 Burmese | 26% (90/337) |
-| 🇳🇴 Norwegian Bokmål | 31% (106/337) |
-| 🇳🇱 Dutch | 62% (212/337) |
-| 🇳🇴 Norwegian Nynorsk | 31% (106/337) |
-| 🇵🇱 Polish | 89% (300/337) |
-| 🇧🇷 Portuguese (Brazil) | 92% (312/337) |
-| 🇵🇹 Portuguese (Portugal) | 21% (71/337) |
-| 🇷🇴 Romanian | 89% (301/337) |
-| 🇷🇺 Russian | 90% (305/337) |
-| 🇸🇰 Slovak | 19% (65/337) |
-| 🇸🇮 Slovenian | 32% (109/337) |
-| 🇸🇪 Swedish | 18% (63/337) |
-| 🇵🇭 Tagalog | 19% (65/337) |
-| 🇹🇷 Turkish | 21% (73/337) |
-| 🇺🇦 Ukrainian | 98% (331/337) |
-| 🇻🇳 Vietnamese | 31% (107/337) |
-| 🇨🇳 Chinese (Simplified) | 97% (328/337) |
-| 🇹🇼 Chinese (Traditional) | 87% (294/337) |
+| 🇺🇸 English | 100% (339/339) |
+| 🇪🇸 Catalan | 19% (65/339) |
+| 🇨🇿 Czech | 92% (314/339) |
+| 🇩🇰 Danish | 20% (69/339) |
+| 🇩🇪 German | 99% (336/339) |
+| 🇬🇷 Greek | 21% (72/339) |
+| 🇪🇸 Spanish | 92% (315/339) |
+| 🇫🇷 French | 96% (328/339) |
+| 🇭🇺 Hungarian | 19% (65/339) |
+| 🇮🇩 Indonesian | 22% (75/339) |
+| 🇮🇹 Italian | 86% (292/339) |
+| 🇯🇵 Japanese | 21% (73/339) |
+| 🇲🇲 Burmese | 26% (91/339) |
+| 🇳🇴 Norwegian Bokmål | 31% (107/339) |
+| 🇳🇱 Dutch | 62% (213/339) |
+| 🇳🇴 Norwegian Nynorsk | 31% (107/339) |
+| 🇵🇱 Polish | 88% (301/339) |
+| 🇧🇷 Portuguese (Brazil) | 92% (313/339) |
+| 🇵🇹 Portuguese (Portugal) | 20% (71/339) |
+| 🇷🇴 Romanian | 89% (302/339) |
+| 🇷🇺 Russian | 90% (306/339) |
+| 🇸🇰 Slovak | 19% (65/339) |
+| 🇸🇮 Slovenian | 32% (110/339) |
+| 🇸🇪 Swedish | 18% (63/339) |
+| 🇵🇭 Tagalog | 19% (65/339) |
+| 🇹🇷 Turkish | 21% (73/339) |
+| 🇺🇦 Ukrainian | 97% (332/339) |
+| 🇻🇳 Vietnamese | 31% (108/339) |
+| 🇨🇳 Chinese (Simplified) | 97% (329/339) |
+| 🇹🇼 Chinese (Traditional) | 87% (295/339) |
 <!-- translations:end -->

app/src/main/java/com/philkes/notallyx/presentation/UiExtensions.kt

@@ -110,7 +110,7 @@ import com.philkes.notallyx.presentation.view.note.listitem.ListManager
 import com.philkes.notallyx.presentation.view.note.listitem.adapter.ListItemVH
 import com.philkes.notallyx.presentation.viewmodel.BaseNoteModel
 import com.philkes.notallyx.presentation.viewmodel.preference.DateFormat
-import com.philkes.notallyx.presentation.viewmodel.preference.TextSize
+import com.philkes.notallyx.presentation.viewmodel.preference.displayBodySize
 import com.philkes.notallyx.utils.changehistory.ChangeHistory
 import com.philkes.notallyx.utils.changehistory.EditTextState
 import com.philkes.notallyx.utils.changehistory.EditTextWithHistoryChange
@@ -299,6 +299,10 @@ fun TextView.displayFormattedTimestamp(
     } else visibility = View.GONE
 }
 
+fun TextView.setTextSizeSp(textSizeSp: Float) {
+    setTextSize(TypedValue.COMPLEX_UNIT_SP, textSizeSp)
+}
+
 val Int.dp: Int
     get() = (this * Resources.getSystem().displayMetrics.density + 0.5f).toInt()
 
@@ -1043,7 +1047,7 @@ fun Window.setLightStatusAndNavBar(value: Boolean, view: View = decorView) {
 
 fun ChipGroup.bindLabels(
     labels: List<String>,
-    textSize: TextSize,
+    textSize: Float,
     paddingTop: Boolean,
     color: Int? = null,
     onClick: ((label: String) -> Unit)? = null,
@@ -1062,7 +1066,7 @@ fun ChipGroup.bindLabels(
         for (label in labels) {
             LabelBinding.inflate(inflater, this, true).root.apply {
                 background = getOutlinedDrawable(this@bindLabels.context)
-                setTextSize(TypedValue.COMPLEX_UNIT_SP, labelSize)
+                setTextSizeSp(labelSize)
                 text = label
                 color?.let { setControlsContrastColorForAllViews(it) }
                 onClick?.let { setOnClickListener { it(label) } }
@@ -1138,7 +1142,7 @@ fun Context.createTextView(textResId: Int, padding: Int = 16.dp): TextView {
     }
 }
 
-fun Chip.setupReminderChip(baseNote: BaseNote) {
+fun Chip.setupReminderChip(baseNote: BaseNote, textSize: Float? = null) {
     val now = Date(System.currentTimeMillis())
     val mostRecentNotificationDate =
         baseNote.reminders.findNextNotificationDate()
@@ -1150,6 +1154,15 @@ fun Chip.setupReminderChip(baseNote: BaseNote) {
     this.apply {
         visibility = VISIBLE
         text = mostRecentNotificationDate.format()
+        textSize?.let {
+            setTextSizeSp(it)
+            chipIconSize =
+                TypedValue.applyDimension(
+                    TypedValue.COMPLEX_UNIT_SP,
+                    it + 4,
+                    resources.displayMetrics,
+                )
+        }
         setCloseIconVisible(baseNote.reminders.haveAnyRepetition())
         val isElapsed = mostRecentNotificationDate < now
         alpha = if (isElapsed) 0.5f else 1.0f

app/src/main/java/com/philkes/notallyx/presentation/activity/main/fragment/NotallyFragment.kt

@@ -263,7 +263,7 @@ abstract class NotallyFragment : Fragment(), ItemListener {
                     dateFormat.value,
                     notesSorting.value,
                     BaseNoteVHPreferences(
-                        textSize.value,
+                        textSizeOverview.value,
                         maxItems.value,
                         maxLines.value,
                         maxTitle.value,

app/src/main/java/com/philkes/notallyx/presentation/activity/main/fragment/settings/PreferenceBindingExtensions.kt

@@ -25,6 +25,7 @@ import com.philkes.notallyx.databinding.PreferenceSeekbarBinding
 import com.philkes.notallyx.presentation.checkedTag
 import com.philkes.notallyx.presentation.select
 import com.philkes.notallyx.presentation.setCancelButton
+import com.philkes.notallyx.presentation.setTextSizeSp
 import com.philkes.notallyx.presentation.showAndFocus
 import com.philkes.notallyx.presentation.showToast
 import com.philkes.notallyx.presentation.view.misc.MenuDialog
@@ -34,6 +35,7 @@ import com.philkes.notallyx.presentation.viewmodel.preference.BooleanPreference
 import com.philkes.notallyx.presentation.viewmodel.preference.Constants.PASSWORD_EMPTY
 import com.philkes.notallyx.presentation.viewmodel.preference.DateFormat
 import com.philkes.notallyx.presentation.viewmodel.preference.EnumPreference
+import com.philkes.notallyx.presentation.viewmodel.preference.FloatPreference
 import com.philkes.notallyx.presentation.viewmodel.preference.IntPreference
 import com.philkes.notallyx.presentation.viewmodel.preference.NotallyXPreferences.Companion.EMPTY_PATH
 import com.philkes.notallyx.presentation.viewmodel.preference.NotallyXPreferences.Companion.START_VIEW_DEFAULT
@@ -509,6 +511,43 @@ fun PreferenceSeekbarBinding.setup(
     }
 }
 
+fun PreferenceSeekbarBinding.setupTextSizePreference(
+    preference: FloatPreference,
+    context: Context,
+    value: Float = preference.value,
+    tooltipResId: Int? = null,
+    onChange: (newValue: Float) -> Unit,
+) {
+    setup(
+        value.toInt(),
+        preference.titleResId!!,
+        preference.min.toInt(),
+        preference.max.toInt(),
+        context,
+        tooltipResId = tooltipResId,
+    ) { newValue ->
+        onChange(newValue.toFloat())
+    }
+    PreviewText.apply {
+        isVisible = false
+        setTextSizeSp(value)
+    }
+    Slider.apply {
+        addOnChangeListener { _, newValue, _ -> PreviewText.setTextSizeSp(newValue) }
+        addOnSliderTouchListener(
+            object : Slider.OnSliderTouchListener {
+                override fun onStartTrackingTouch(slider: Slider) {
+                    PreviewText.isVisible = true
+                }
+
+                override fun onStopTrackingTouch(slider: Slider) {
+                    PreviewText.isVisible = false
+                }
+            }
+        )
+    }
+}
+
 fun PreferenceSeekbarBinding.setupAutoSaveIdleTime(
     preference: IntPreference,
     context: Context,

app/src/main/java/com/philkes/notallyx/presentation/activity/main/fragment/settings/SettingsFragment.kt

@@ -307,9 +307,22 @@ class SettingsFragment : Fragment() {
             }
         }
 
-        textSize.observe(viewLifecycleOwner) { value ->
-            binding.TextSize.setup(textSize, value, requireContext()) { newValue ->
-                model.savePreference(textSize, newValue)
+        textSizeNoteEditor.observe(viewLifecycleOwner) { value ->
+            binding.TextSize.setupTextSizePreference(
+                textSizeNoteEditor,
+                requireContext(),
+                value = value,
+            ) { newValue ->
+                model.savePreference(textSizeNoteEditor, newValue)
+            }
+        }
+        textSizeOverview.observe(viewLifecycleOwner) { value ->
+            binding.TextSizeOverview.setupTextSizePreference(
+                textSizeOverview,
+                requireContext(),
+                value = value,
+            ) { newValue ->
+                model.savePreference(textSizeOverview, newValue)
             }
         }
         alwaysShowSearchBar.observe(viewLifecycleOwner) { value ->

app/src/main/java/com/philkes/notallyx/presentation/activity/note/EditActivity.kt

@@ -13,7 +13,6 @@ import android.text.Editable
 import android.text.Spanned
 import android.text.style.URLSpan
 import android.util.Log
-import android.util.TypedValue
 import android.view.MenuItem
 import android.view.View
 import android.view.View.GONE
@@ -57,6 +56,7 @@ import com.philkes.notallyx.presentation.isLightColor
 import com.philkes.notallyx.presentation.setCancelButton
 import com.philkes.notallyx.presentation.setControlsContrastColorForAllViews
 import com.philkes.notallyx.presentation.setLightStatusAndNavBar
+import com.philkes.notallyx.presentation.setTextSizeSp
 import com.philkes.notallyx.presentation.setupProgressDialog
 import com.philkes.notallyx.presentation.setupReminderChip
 import com.philkes.notallyx.presentation.showKeyboard
@@ -74,6 +74,9 @@ import com.philkes.notallyx.presentation.viewmodel.preference.EditAction
 import com.philkes.notallyx.presentation.viewmodel.preference.ListItemSort
 import com.philkes.notallyx.presentation.viewmodel.preference.NotallyXPreferences
 import com.philkes.notallyx.presentation.viewmodel.preference.NotesSortBy
+import com.philkes.notallyx.presentation.viewmodel.preference.displaySmallerSize
+import com.philkes.notallyx.presentation.viewmodel.preference.editBodySize
+import com.philkes.notallyx.presentation.viewmodel.preference.editTitleSize
 import com.philkes.notallyx.presentation.widget.WidgetProvider
 import com.philkes.notallyx.utils.FileError
 import com.philkes.notallyx.utils.changeStatusAndNavigationBarColor
@@ -671,7 +674,10 @@ abstract class EditActivity(private val type: Type) : LockedActivity<ActivityEdi
             if (preferences.applyDateFormatInNoteView.value) {
                 preferences.dateFormat.value
             } else DateFormat.ABSOLUTE
-        binding.Date.displayFormattedTimestamp(date, dateFormat, datePrefixResId)
+        binding.Date.apply {
+            displayFormattedTimestamp(date, dateFormat, datePrefixResId)
+            setTextSizeSp(notallyModel.textSize.displaySmallerSize)
+        }
         binding.EnterTitle.setText(notallyModel.title)
         bindLabels()
         setColor()
@@ -925,13 +931,9 @@ abstract class EditActivity(private val type: Type) : LockedActivity<ActivityEdi
             }
         }
 
-        val title = notallyModel.textSize.editTitleSize
-        val date = notallyModel.textSize.displayBodySize
-        val body = notallyModel.textSize.editBodySize
-
-        binding.EnterTitle.setTextSize(TypedValue.COMPLEX_UNIT_SP, title)
-        binding.Date.setTextSize(TypedValue.COMPLEX_UNIT_SP, date)
-        binding.EnterBody.setTextSize(TypedValue.COMPLEX_UNIT_SP, body)
+        binding.EnterTitle.setTextSizeSp(notallyModel.textSize.editTitleSize)
+        binding.Date.setTextSizeSp(notallyModel.textSize.displaySmallerSize)
+        binding.EnterBody.setTextSizeSp(notallyModel.textSize.editBodySize)
 
         setupImages()
         setupFiles()
@@ -979,7 +981,10 @@ abstract class EditActivity(private val type: Type) : LockedActivity<ActivityEdi
 
     fun setupEditNoteReminderChip() {
         notallyModel.originalNote?.let { note ->
-            binding.EditNoteReminderChip.setupReminderChip(note)
+            binding.EditNoteReminderChip.setupReminderChip(
+                note,
+                notallyModel.textSize.displaySmallerSize,
+            )
             binding.EditNoteReminderChip.setOnClickListener {
                 val intent =
                     Intent(this@EditActivity, RemindersActivity::class.java)

app/src/main/java/com/philkes/notallyx/presentation/activity/note/PickNoteActivity.kt

@@ -52,7 +52,7 @@ open class PickNoteActivity : LockedActivity<ActivityPickNoteBinding>(), ItemLis
                     dateFormat.value,
                     notesSorting.value,
                     BaseNoteVHPreferences(
-                        textSize.value,
+                        textSizeOverview.value,
                         maxItems.value,
                         maxLines.value,
                         maxTitle.value,