From bb78d89682e2245affca15ef13f1bbeed48b2d5e Mon Sep 17 00:00:00 2001 From: J-Jamet Date: Thu, 27 Feb 2020 13:17:01 +0100 Subject: [PATCH] Try to fix aliased text #414 --- .../kunzisoft/keepass/adapters/NodeAdapter.kt | 34 +++++++++---------- .../com/kunzisoft/keepass/view/ViewUtil.kt | 5 +++ 2 files changed, 22 insertions(+), 17 deletions(-) diff --git a/app/src/main/java/com/kunzisoft/keepass/adapters/NodeAdapter.kt b/app/src/main/java/com/kunzisoft/keepass/adapters/NodeAdapter.kt index 9e98b5115..4a5b878a4 100644 --- a/app/src/main/java/com/kunzisoft/keepass/adapters/NodeAdapter.kt +++ b/app/src/main/java/com/kunzisoft/keepass/adapters/NodeAdapter.kt @@ -21,7 +21,6 @@ package com.kunzisoft.keepass.adapters import android.content.Context import android.graphics.Color -import android.graphics.Paint import android.util.Log import android.util.TypedValue import android.view.LayoutInflater @@ -42,6 +41,7 @@ import com.kunzisoft.keepass.database.element.node.Node import com.kunzisoft.keepass.database.element.node.Type import com.kunzisoft.keepass.icons.assignDatabaseIcon import com.kunzisoft.keepass.settings.PreferencesUtil +import com.kunzisoft.keepass.view.setTextSize import com.kunzisoft.keepass.view.strikeOut import java.util.* @@ -58,11 +58,11 @@ class NodeAdapter private var calculateViewTypeTextSize = Array(2) { true} // number of view type private var textSizeUnit: Int = TypedValue.COMPLEX_UNIT_PX - private var prefTextSize: Float = 0F - private var subtextSize: Float = 0F - private var infoTextSize: Float = 0F - private var numberChildrenTextSize: Float = 0F - private var iconSize: Float = 0F + private var prefSizeMultiplier: Float = 0F + private var subtextDefaultDimension: Float = 0F + private var infoTextDefaultDimension: Float = 0F + private var numberChildrenTextDefaultDimension: Float = 0F + private var iconDefaultDimension: Float = 0F private var listSort: SortNodeEnum = SortNodeEnum.DB private var ascendingSort: Boolean = true private var groupsBeforeSort: Boolean = true @@ -87,6 +87,11 @@ class NodeAdapter get() = nodeSortedList.size() <= 0 init { + this.infoTextDefaultDimension = context.resources.getDimension(R.dimen.list_medium_size_default) + this.subtextDefaultDimension = context.resources.getDimension(R.dimen.list_small_size_default) + this.numberChildrenTextDefaultDimension = context.resources.getDimension(R.dimen.list_tiny_size_default) + this.iconDefaultDimension = context.resources.getDimension(R.dimen.list_icon_size_default) + assignPreferences() this.nodeSortedList = SortedList(Node::class.java, object : SortedListAdapterCallback(this) { @@ -119,11 +124,7 @@ class NodeAdapter } fun assignPreferences() { - this.prefTextSize = PreferencesUtil.getListTextSize(context) - this.infoTextSize = context.resources.getDimension(R.dimen.list_medium_size_default) * prefTextSize - this.subtextSize = context.resources.getDimension(R.dimen.list_small_size_default) * prefTextSize - this.numberChildrenTextSize = context.resources.getDimension(R.dimen.list_tiny_size_default) * prefTextSize - this.iconSize = context.resources.getDimension(R.dimen.list_icon_size_default) * prefTextSize + this.prefSizeMultiplier = PreferencesUtil.getListTextSize(context) this.listSort = PreferencesUtil.getListSort(context) this.ascendingSort = PreferencesUtil.getAscendingSort(context) @@ -291,15 +292,15 @@ class NodeAdapter assignDatabaseIcon(mDatabase.drawFactory, subNode.icon, iconColor) // Relative size of the icon layoutParams?.apply { - height = iconSize.toInt() - width = iconSize.toInt() + height = (iconDefaultDimension * prefSizeMultiplier).toInt() + width = (iconDefaultDimension * prefSizeMultiplier).toInt() } } // Assign text holder.text.apply { text = subNode.title - setTextSize(textSizeUnit, infoTextSize) + setTextSize(textSizeUnit, infoTextDefaultDimension, prefSizeMultiplier) strikeOut(subNode.isCurrentlyExpires) } // Add subText with username @@ -320,7 +321,7 @@ class NodeAdapter if (showUserNames && username.isNotEmpty()) { visibility = View.VISIBLE text = username - setTextSize(textSizeUnit, subtextSize) + setTextSize(textSizeUnit, subtextDefaultDimension, prefSizeMultiplier) } } @@ -334,7 +335,7 @@ class NodeAdapter text = (subNode as Group) .getChildEntries(*entryFilters) .size.toString() - setTextSize(textSizeUnit, numberChildrenTextSize) + setTextSize(textSizeUnit, numberChildrenTextDefaultDimension, prefSizeMultiplier) visibility = View.VISIBLE } } else { @@ -352,7 +353,6 @@ class NodeAdapter holder.container.isSelected = actionNodesList.contains(subNode) } - override fun getItemCount(): Int { return nodeSortedList.size() diff --git a/app/src/main/java/com/kunzisoft/keepass/view/ViewUtil.kt b/app/src/main/java/com/kunzisoft/keepass/view/ViewUtil.kt index 17fe14f4a..252017f46 100644 --- a/app/src/main/java/com/kunzisoft/keepass/view/ViewUtil.kt +++ b/app/src/main/java/com/kunzisoft/keepass/view/ViewUtil.kt @@ -52,6 +52,11 @@ fun TextView.applyHiddenStyle(hide: Boolean) { } } +fun TextView.setTextSize(unit: Int, defaultSize: Float, multiplier: Float) { + if (multiplier > 0.0F && multiplier != 1.0F) + setTextSize(unit, defaultSize * multiplier) +} + fun TextView.strikeOut(strikeOut: Boolean) { paintFlags = if (strikeOut) paintFlags or Paint.STRIKE_THRU_TEXT_FLAG