From 9ea97aabbb512a76901cc8f33e3fe1855cf7b900 Mon Sep 17 00:00:00 2001 From: Alex Hart Date: Thu, 18 Nov 2021 11:35:47 -0400 Subject: [PATCH] Fix badge row count calculation. --- .../main/java/org/thoughtcrime/securesms/badges/Badges.kt | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/badges/Badges.kt b/app/src/main/java/org/thoughtcrime/securesms/badges/Badges.kt index 0a6535ab9e..64a82b6beb 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/badges/Badges.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/badges/Badges.kt @@ -9,7 +9,6 @@ import com.google.android.flexbox.FlexboxLayoutManager import com.google.android.flexbox.JustifyContent import org.signal.core.util.DimensionUnit import org.thoughtcrime.securesms.BuildConfig -import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.badges.models.Badge import org.thoughtcrime.securesms.badges.models.Badge.Category.Companion.fromCode import org.thoughtcrime.securesms.components.settings.DSLConfiguration @@ -37,13 +36,9 @@ object Badges { } .forEach { customPref(it) } - val gutter = context.resources.getDimensionPixelSize(R.dimen.dsl_settings_gutter) - val buffer = DimensionUnit.DP.toPixels(12f) - val gutterExtra = gutter - buffer val badgeSize = DimensionUnit.DP.toPixels(88f) val windowWidth = context.resources.displayMetrics.widthPixels - val availableWidth = windowWidth - gutterExtra - val perRow = (availableWidth / badgeSize).toInt() + val perRow = (windowWidth / badgeSize).toInt() val empties = ((perRow - (badges.size % perRow)) % perRow) repeat(empties) {