Skip to content

Commit d64f9d8

Browse files
tibbitibbi
committed
apply the new way of setting font size in percentage everywhere
1 parent a379f57 commit d64f9d8

File tree

9 files changed

+43
-46
lines changed

9 files changed

+43
-46
lines changed

‎app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/MainActivity.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@ class MainActivity : SimpleActivity() {
7979
searchClearBtn = findViewById(R.id.search_clear)
8080

8181
initViewPager(intent.getLongExtra(OPEN_NOTE_ID, -1L))
82-
pager_title_strip.setTextSize(TypedValue.COMPLEX_UNIT_PX, getTextSize())
83-
pager_title_strip.layoutParams.height = (pager_title_strip.height + resources.getDimension(R.dimen.activity_margin) * 2).toInt()
82+
pager_title_strip.setTextSize(TypedValue.COMPLEX_UNIT_PX, getPercentageFontSize())
83+
pager_title_strip.layoutParams.height = (pager_title_strip.height + resources.getDimension(R.dimen.activity_margin) * 2 * (config.fontSizePercentage / 100f)).toInt()
8484
checkWhatsNewDialog()
8585
checkIntents(intent)
8686

@@ -113,7 +113,7 @@ class MainActivity : SimpleActivity() {
113113

114114
invalidateOptionsMenu()
115115
pager_title_strip.apply {
116-
setTextSize(TypedValue.COMPLEX_UNIT_PX, getTextSize())
116+
setTextSize(TypedValue.COMPLEX_UNIT_PX, getPercentageFontSize())
117117
setGravity(Gravity.CENTER_VERTICAL)
118118
setNonPrimaryAlpha(0.4f)
119119
setTextColor(config.textColor)

‎app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/SettingsActivity.kt‎

Lines changed: 23 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,13 @@ import android.content.Intent
44
import android.os.Bundle
55
import android.view.Menu
66
import com.simplemobiletools.commons.dialogs.RadioGroupDialog
7-
import com.simplemobiletools.commons.extensions.*
8-
import com.simplemobiletools.commons.helpers.*
7+
import com.simplemobiletools.commons.extensions.beGone
8+
import com.simplemobiletools.commons.extensions.beVisibleIf
9+
import com.simplemobiletools.commons.extensions.getAdjustedPrimaryColor
10+
import com.simplemobiletools.commons.extensions.updateTextColors
11+
import com.simplemobiletools.commons.helpers.IS_CUSTOMIZING_COLORS
12+
import com.simplemobiletools.commons.helpers.ensureBackgroundThread
13+
import com.simplemobiletools.commons.helpers.isOreoPlus
914
import com.simplemobiletools.commons.models.RadioItem
1015
import com.simplemobiletools.notes.pro.R
1116
import com.simplemobiletools.notes.pro.extensions.config
@@ -151,23 +156,23 @@ class SettingsActivity : SimpleActivity() {
151156
}
152157

153158
private fun setupFontSize() {
154-
settings_font_size.text = getFontSizePercentText(config.fontSize)
159+
settings_font_size.text = getFontSizePercentText(config.fontSizePercentage)
155160
settings_font_size_holder.setOnClickListener {
156161
val items = arrayListOf(
157-
RadioItem(FONT_SIZE_50_PERCENT, getFontSizePercentText(FONT_SIZE_50_PERCENT)),
158-
RadioItem(FONT_SIZE_75_PERCENT, getFontSizePercentText(FONT_SIZE_75_PERCENT)),
159-
RadioItem(FONT_SIZE_100_PERCENT, getFontSizePercentText(FONT_SIZE_100_PERCENT)),
160-
RadioItem(FONT_SIZE_125_PERCENT, getFontSizePercentText(FONT_SIZE_125_PERCENT)),
161-
RadioItem(FONT_SIZE_150_PERCENT, getFontSizePercentText(FONT_SIZE_150_PERCENT)),
162-
RadioItem(FONT_SIZE_175_PERCENT, getFontSizePercentText(FONT_SIZE_175_PERCENT)),
163-
RadioItem(FONT_SIZE_200_PERCENT, getFontSizePercentText(FONT_SIZE_200_PERCENT)),
164-
RadioItem(FONT_SIZE_250_PERCENT, getFontSizePercentText(FONT_SIZE_250_PERCENT)),
165-
RadioItem(FONT_SIZE_300_PERCENT, getFontSizePercentText(FONT_SIZE_300_PERCENT))
162+
RadioItem(FONT_SIZE_50_PERCENT, getFontSizePercentText(FONT_SIZE_50_PERCENT)),
163+
RadioItem(FONT_SIZE_75_PERCENT, getFontSizePercentText(FONT_SIZE_75_PERCENT)),
164+
RadioItem(FONT_SIZE_100_PERCENT, getFontSizePercentText(FONT_SIZE_100_PERCENT)),
165+
RadioItem(FONT_SIZE_125_PERCENT, getFontSizePercentText(FONT_SIZE_125_PERCENT)),
166+
RadioItem(FONT_SIZE_150_PERCENT, getFontSizePercentText(FONT_SIZE_150_PERCENT)),
167+
RadioItem(FONT_SIZE_175_PERCENT, getFontSizePercentText(FONT_SIZE_175_PERCENT)),
168+
RadioItem(FONT_SIZE_200_PERCENT, getFontSizePercentText(FONT_SIZE_200_PERCENT)),
169+
RadioItem(FONT_SIZE_250_PERCENT, getFontSizePercentText(FONT_SIZE_250_PERCENT)),
170+
RadioItem(FONT_SIZE_300_PERCENT, getFontSizePercentText(FONT_SIZE_300_PERCENT))
166171
)
167172

168-
RadioGroupDialog(this@SettingsActivity, items, config.fontSize) {
169-
config.fontSize = it as Int
170-
settings_font_size.text = getFontSizePercentText(config.fontSize)
173+
RadioGroupDialog(this@SettingsActivity, items, config.fontSizePercentage) {
174+
config.fontSizePercentage = it as Int
175+
settings_font_size.text = getFontSizePercentText(config.fontSizePercentage)
171176
updateWidgets()
172177
}
173178
}
@@ -179,9 +184,9 @@ class SettingsActivity : SimpleActivity() {
179184
settings_gravity.text = getGravityText()
180185
settings_gravity_holder.setOnClickListener {
181186
val items = arrayListOf(
182-
RadioItem(GRAVITY_LEFT, getString(R.string.left)),
183-
RadioItem(GRAVITY_CENTER, getString(R.string.center)),
184-
RadioItem(GRAVITY_RIGHT, getString(R.string.right)))
187+
RadioItem(GRAVITY_LEFT, getString(R.string.left)),
188+
RadioItem(GRAVITY_CENTER, getString(R.string.center)),
189+
RadioItem(GRAVITY_RIGHT, getString(R.string.right)))
185190

186191
RadioGroupDialog(this@SettingsActivity, items, config.gravity) {
187192
config.gravity = it as Int

‎app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/WidgetConfigureActivity.kt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import com.simplemobiletools.commons.models.RadioItem
2020
import com.simplemobiletools.notes.pro.R
2121
import com.simplemobiletools.notes.pro.adapters.ChecklistAdapter
2222
import com.simplemobiletools.notes.pro.extensions.config
23+
import com.simplemobiletools.notes.pro.extensions.getPercentageFontSize
2324
import com.simplemobiletools.notes.pro.extensions.widgetsDB
2425
import com.simplemobiletools.notes.pro.helpers.*
2526
import com.simplemobiletools.notes.pro.models.ChecklistItem
@@ -60,7 +61,7 @@ class WidgetConfigureActivity : SimpleActivity() {
6061

6162
override fun onResume() {
6263
super.onResume()
63-
text_note_view.setTextSize(TypedValue.COMPLEX_UNIT_PX, getTextSize())
64+
text_note_view.setTextSize(TypedValue.COMPLEX_UNIT_PX, getPercentageFontSize())
6465
}
6566

6667
override fun onCreateOptionsMenu(menu: Menu): Boolean {

‎app/src/main/kotlin/com/simplemobiletools/notes/pro/adapters/ChecklistAdapter.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ import com.simplemobiletools.commons.adapters.MyRecyclerViewAdapter
1414
import com.simplemobiletools.commons.extensions.applyColorFilter
1515
import com.simplemobiletools.commons.extensions.beVisibleIf
1616
import com.simplemobiletools.commons.extensions.getColoredDrawableWithColor
17-
import com.simplemobiletools.commons.extensions.getTextSize
1817
import com.simplemobiletools.commons.views.MyRecyclerView
1918
import com.simplemobiletools.notes.pro.R
2019
import com.simplemobiletools.notes.pro.dialogs.RenameChecklistItemDialog
2120
import com.simplemobiletools.notes.pro.extensions.config
21+
import com.simplemobiletools.notes.pro.extensions.getPercentageFontSize
2222
import com.simplemobiletools.notes.pro.helpers.DONE_CHECKLIST_ITEM_ALPHA
2323
import com.simplemobiletools.notes.pro.interfaces.ChecklistItemsListener
2424
import com.simplemobiletools.notes.pro.interfaces.ItemMoveCallback
@@ -154,7 +154,7 @@ class ChecklistAdapter(activity: BaseSimpleActivity, var items: ArrayList<Checkl
154154
checklist_title.apply {
155155
text = checklistItem.title
156156
setTextColor(textColor)
157-
setTextSize(TypedValue.COMPLEX_UNIT_PX, context.getTextSize())
157+
setTextSize(TypedValue.COMPLEX_UNIT_PX, context.getPercentageFontSize())
158158
gravity = context.config.getTextGravity()
159159

160160
if (checklistItem.isDone) {

‎app/src/main/kotlin/com/simplemobiletools/notes/pro/adapters/WidgetAdapter.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ import android.widget.RemoteViewsService
99
import com.google.gson.Gson
1010
import com.google.gson.reflect.TypeToken
1111
import com.simplemobiletools.commons.extensions.adjustAlpha
12-
import com.simplemobiletools.commons.extensions.getTextSize
1312
import com.simplemobiletools.commons.extensions.setText
1413
import com.simplemobiletools.commons.extensions.setTextSize
1514
import com.simplemobiletools.commons.helpers.WIDGET_TEXT_COLOR
1615
import com.simplemobiletools.notes.pro.R
1716
import com.simplemobiletools.notes.pro.R.id.checklist_title
1817
import com.simplemobiletools.notes.pro.R.id.widget_text_holder
1918
import com.simplemobiletools.notes.pro.extensions.config
19+
import com.simplemobiletools.notes.pro.extensions.getPercentageFontSize
2020
import com.simplemobiletools.notes.pro.extensions.notesDB
2121
import com.simplemobiletools.notes.pro.helpers.*
2222
import com.simplemobiletools.notes.pro.models.ChecklistItem
@@ -36,7 +36,7 @@ class WidgetAdapter(val context: Context, val intent: Intent) : RemoteViewsServi
3636
return RemoteViews(context.packageName, R.layout.widget_text_layout)
3737
}
3838

39-
val textSize = context.getTextSize() / context.resources.displayMetrics.density
39+
val textSize = context.getPercentageFontSize() / context.resources.displayMetrics.density
4040
if (note!!.type == NoteType.TYPE_CHECKLIST.value) {
4141
remoteView = RemoteViews(context.packageName, R.layout.item_checklist_widget).apply {
4242
val checklistItem = checklistItems.getOrNull(position) ?: return@apply
@@ -95,7 +95,7 @@ class WidgetAdapter(val context: Context, val intent: Intent) : RemoteViewsServi
9595
val checklistItemType = object : TypeToken<List<ChecklistItem>>() {}.type
9696
checklistItems = Gson().fromJson<ArrayList<ChecklistItem>>(note!!.value, checklistItemType) ?: ArrayList(1)
9797
if (context.config.moveUndoneChecklistItems) {
98-
checklistItems .sortBy { it.isDone }
98+
checklistItems.sortBy { it.isDone }
9999
}
100100
}
101101
}

‎app/src/main/kotlin/com/simplemobiletools/notes/pro/extensions/Context.kt‎

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,10 @@ import android.appwidget.AppWidgetManager
44
import android.content.ComponentName
55
import android.content.Context
66
import android.content.Intent
7-
import com.simplemobiletools.commons.extensions.baseConfig
8-
import com.simplemobiletools.commons.helpers.FONT_SIZE_LARGE
9-
import com.simplemobiletools.commons.helpers.FONT_SIZE_MEDIUM
10-
import com.simplemobiletools.commons.helpers.FONT_SIZE_SMALL
117
import com.simplemobiletools.notes.pro.R
128
import com.simplemobiletools.notes.pro.databases.NotesDatabase
13-
import com.simplemobiletools.notes.pro.helpers.*
9+
import com.simplemobiletools.notes.pro.helpers.Config
10+
import com.simplemobiletools.notes.pro.helpers.MyWidgetProvider
1411
import com.simplemobiletools.notes.pro.interfaces.NotesDao
1512
import com.simplemobiletools.notes.pro.interfaces.WidgetsDao
1613

@@ -31,15 +28,4 @@ fun Context.updateWidgets() {
3128
}
3229
}
3330

34-
fun Context.getEditorFontSize(): Float {
35-
val defaultFontSizeDimension = when(resources.getInteger(R.integer.default_font_size)) {
36-
FONT_SIZE_SMALL -> resources.getDimension(R.dimen.small_text_size)
37-
FONT_SIZE_MEDIUM -> resources.getDimension(R.dimen.middle_text_size)
38-
FONT_SIZE_LARGE -> resources.getDimension(R.dimen.big_text_size)
39-
else -> resources.getDimension(R.dimen.extra_big_text_size)
40-
}
41-
return when(baseConfig.fontSize) {
42-
resources.getInteger(R.integer.default_font_size) -> defaultFontSizeDimension
43-
else -> defaultFontSizeDimension * baseConfig.fontSize / 100
44-
}
45-
}
31+
fun Context.getPercentageFontSize() = resources.getDimension(R.dimen.middle_text_size) * (config.fontSizePercentage / 100f)

‎app/src/main/kotlin/com/simplemobiletools/notes/pro/fragments/TextFragment.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import com.simplemobiletools.commons.extensions.*
1818
import com.simplemobiletools.notes.pro.R
1919
import com.simplemobiletools.notes.pro.activities.MainActivity
2020
import com.simplemobiletools.notes.pro.extensions.config
21-
import com.simplemobiletools.notes.pro.extensions.getEditorFontSize
21+
import com.simplemobiletools.notes.pro.extensions.getPercentageFontSize
2222
import com.simplemobiletools.notes.pro.extensions.updateWidgets
2323
import com.simplemobiletools.notes.pro.helpers.MyMovementMethod
2424
import com.simplemobiletools.notes.pro.helpers.NOTE_ID
@@ -127,7 +127,7 @@ class TextFragment : NoteFragment() {
127127

128128
val adjustedPrimaryColor = context.getAdjustedPrimaryColor()
129129
setColors(config.textColor, adjustedPrimaryColor, config.backgroundColor)
130-
setTextSize(TypedValue.COMPLEX_UNIT_PX, context.getEditorFontSize())
130+
setTextSize(TypedValue.COMPLEX_UNIT_PX, context.getPercentageFontSize())
131131
highlightColor = adjustedPrimaryColor.adjustAlpha(.4f)
132132

133133
gravity = config.getTextGravity()

‎app/src/main/kotlin/com/simplemobiletools/notes/pro/helpers/Config.kt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,4 +85,8 @@ class Config(context: Context) : BaseConfig(context) {
8585
GRAVITY_RIGHT -> Gravity.RIGHT
8686
else -> Gravity.LEFT
8787
}
88+
89+
var fontSizePercentage: Int
90+
get() = prefs.getInt(FONT_SIZE_PERCENTAGE, 100)
91+
set(fontSizePercentage) = prefs.edit().putInt(FONT_SIZE_PERCENTAGE, fontSizePercentage).apply()
8892
}

‎app/src/main/kotlin/com/simplemobiletools/notes/pro/helpers/Constants.kt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ const val ENABLE_LINE_WRAP = "enable_line_wrap"
3030
const val USE_INCOGNITO_MODE = "use_incognito_mode"
3131
const val LAST_CREATED_NOTE_TYPE = "last_created_note_type"
3232
const val MOVE_UNDONE_CHECKLIST_ITEMS = "move_undone_checklist_items"
33+
const val FONT_SIZE_PERCENTAGE = "font_size_percentage"
3334

3435
// gravity
3536
const val GRAVITY_LEFT = 0

0 commit comments

Comments
 (0)