From fe4e6767aa73dce18809c042c26d3709020fe043 Mon Sep 17 00:00:00 2001 From: tibbi Date: Wed, 5 Feb 2020 12:03:45 +0100 Subject: [PATCH] apply the selected font size on a few places --- .../contacts/pro/adapters/ContactsAdapter.kt | 11 ++++++----- .../contacts/pro/adapters/GroupsAdapter.kt | 10 +++++----- .../contacts/pro/adapters/SelectContactsAdapter.kt | 9 +++++---- app/src/main/res/layout/item_contact_with_number.xml | 2 +- 4 files changed, 17 insertions(+), 15 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/ContactsAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/ContactsAdapter.kt index e4310dcb..0441ef8f 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/ContactsAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/ContactsAdapter.kt @@ -1,6 +1,7 @@ package com.simplemobiletools.contacts.pro.adapters import android.graphics.drawable.Drawable +import android.util.TypedValue import android.view.Menu import android.view.View import android.view.ViewGroup @@ -12,10 +13,7 @@ import com.bumptech.glide.signature.ObjectKey import com.simplemobiletools.commons.adapters.MyRecyclerViewAdapter import com.simplemobiletools.commons.dialogs.ConfirmationDialog import com.simplemobiletools.commons.dialogs.RadioGroupDialog -import com.simplemobiletools.commons.extensions.beVisibleIf -import com.simplemobiletools.commons.extensions.getAdjustedPrimaryColor -import com.simplemobiletools.commons.extensions.getColoredDrawableWithColor -import com.simplemobiletools.commons.extensions.highlightTextPart +import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.commons.helpers.ensureBackgroundThread import com.simplemobiletools.commons.models.RadioItem import com.simplemobiletools.commons.views.FastScroller @@ -46,6 +44,7 @@ class ContactsAdapter(activity: SimpleActivity, var contactItems: ArrayList @@ -286,6 +285,7 @@ class ContactsAdapter(activity: SimpleActivity, var contactItems: ArrayList, val var adjustedPrimaryColor = activity.getAdjustedPrimaryColor() var showContactThumbnails = activity.config.showContactThumbnails + var fontSize = activity.getTextSize() init { setupDragListener(true) @@ -72,7 +71,7 @@ class GroupsAdapter(activity: SimpleActivity, var groups: ArrayList, val override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = createViewHolder(R.layout.item_group, parent) - override fun onBindViewHolder(holder: MyRecyclerViewAdapter.ViewHolder, position: Int) { + override fun onBindViewHolder(holder: ViewHolder, position: Int) { val group = groups[position] holder.bindView(group, true, true) { itemView, layoutPosition -> setupView(itemView, group) @@ -164,6 +163,7 @@ class GroupsAdapter(activity: SimpleActivity, var groups: ArrayList, val group_name.apply { setTextColor(textColor) + setTextSize(TypedValue.COMPLEX_UNIT_PX, fontSize) text = groupTitle if (showContactThumbnails) { diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/SelectContactsAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/SelectContactsAdapter.kt index 00f6f5d7..e69b25fe 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/SelectContactsAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/SelectContactsAdapter.kt @@ -1,6 +1,7 @@ package com.simplemobiletools.contacts.pro.adapters import android.util.SparseArray +import android.util.TypedValue import android.view.View import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView @@ -9,10 +10,7 @@ import com.bumptech.glide.load.engine.DiskCacheStrategy import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions import com.bumptech.glide.request.RequestOptions import com.bumptech.glide.signature.ObjectKey -import com.simplemobiletools.commons.extensions.beVisibleIf -import com.simplemobiletools.commons.extensions.getAdjustedPrimaryColor -import com.simplemobiletools.commons.extensions.getColoredDrawableWithColor -import com.simplemobiletools.commons.extensions.highlightTextPart +import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.commons.views.FastScroller import com.simplemobiletools.commons.views.MyRecyclerView import com.simplemobiletools.contacts.pro.R @@ -31,6 +29,7 @@ class SelectContactsAdapter(val activity: SimpleActivity, var contacts: ArrayLis private val config = activity.config private val textColor = config.textColor private val adjustedPrimaryColor = activity.getAdjustedPrimaryColor() + private val fontSize = activity.getTextSize() private val contactDrawable = activity.resources.getColoredDrawableWithColor(R.drawable.ic_person_vector, textColor) private val showContactThumbnails = config.showContactThumbnails @@ -121,6 +120,7 @@ class SelectContactsAdapter(val activity: SimpleActivity, var contacts: ArrayLis } contact_name.setTextColor(textColor) + contact_name.setTextSize(TypedValue.COMPLEX_UNIT_PX, fontSize) if (!showContactThumbnails && !showPhoneNumbers) { contact_name.setPadding(bigPadding, bigPadding, bigPadding, bigPadding) } else { @@ -138,6 +138,7 @@ class SelectContactsAdapter(val activity: SimpleActivity, var contacts: ArrayLis contact_number.text = if (textToHighlight.isEmpty()) numberText else numberText.highlightTextPart(textToHighlight, adjustedPrimaryColor, false, true) contact_number.setTextColor(textColor) contact_number.setPadding(if (showContactThumbnails) smallPadding else bigPadding, 0, smallPadding, 0) + contact_number.setTextSize(TypedValue.COMPLEX_UNIT_PX, fontSize) } contact_frame.setOnClickListener { diff --git a/app/src/main/res/layout/item_contact_with_number.xml b/app/src/main/res/layout/item_contact_with_number.xml index 3a0dd8ca..b491454c 100644 --- a/app/src/main/res/layout/item_contact_with_number.xml +++ b/app/src/main/res/layout/item_contact_with_number.xml @@ -45,7 +45,7 @@ android:layout_toEndOf="@+id/contact_tmb" android:alpha="0.6" android:maxLines="1" - android:textSize="@dimen/bigger_text_size" + android:textSize="@dimen/big_text_size" tools:text="0123 456 789" />