From cb152bcf80fea87d94e91ac81ab75693cb9e5c4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ensar=20Saraj=C4=8Di=C4=87?= Date: Tue, 22 Aug 2023 15:06:24 +0200 Subject: [PATCH] Take all text scaling into account when determining pagerTabStrip height This fixes #676 --- .../notes/pro/activities/MainActivity.kt | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/MainActivity.kt index abee5f8d..f0078bcc 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/MainActivity.kt @@ -100,9 +100,10 @@ class MainActivity : SimpleActivity() { initViewPager(intent.getLongExtra(OPEN_NOTE_ID, -1L)) binding.pagerTabStrip.drawFullUnderline = false - binding.pagerTabStrip.setTextSize(TypedValue.COMPLEX_UNIT_PX, getPercentageFontSize()) + val textSize = getPercentageFontSize() + binding.pagerTabStrip.setTextSize(TypedValue.COMPLEX_UNIT_PX, textSize) binding.pagerTabStrip.layoutParams.height = - (binding.pagerTabStrip.height + resources.getDimension(com.simplemobiletools.commons.R.dimen.activity_margin) * 2 * (config.fontSizePercentage / 100f)).toInt() + (textSize + resources.getDimension(com.simplemobiletools.commons.R.dimen.medium_margin) * 2).toInt() (binding.pagerTabStrip.layoutParams as ViewPager.LayoutParams).isDecor = true checkWhatsNewDialog() checkIntents(intent) @@ -138,7 +139,10 @@ class MainActivity : SimpleActivity() { refreshMenuItems() binding.pagerTabStrip.apply { - setTextSize(TypedValue.COMPLEX_UNIT_PX, getPercentageFontSize()) + val textSize = getPercentageFontSize() + setTextSize(TypedValue.COMPLEX_UNIT_PX, textSize) + layoutParams.height = + (textSize + resources.getDimension(com.simplemobiletools.commons.R.dimen.medium_margin) * 2).toInt() setGravity(Gravity.CENTER_VERTICAL) setNonPrimaryAlpha(0.4f) setTextColor(getProperPrimaryColor())