mirror
/
Signal-Android
kopia lustrzana https://github.com/ryukoposting/Signal-Android
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Fix badge row count calculation.

fork-5.53.8
Alex Hart 2021-11-18 11:35:47 -04:00
rodzic 811d79c873
commit 9ea97aabbb
1 zmienionych plików z 1 dodań i 6 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

7
app/src/main/java/org/thoughtcrime/securesms/badges/Badges.kt
Wyświetl plik

@ -9,7 +9,6 @@ import com.google.android.flexbox.FlexboxLayoutManager
import com.google.android.flexbox.JustifyContent import com.google.android.flexbox.JustifyContent
import org.signal.core.util.DimensionUnit import org.signal.core.util.DimensionUnit
import org.thoughtcrime.securesms.BuildConfig import org.thoughtcrime.securesms.BuildConfig
import org.thoughtcrime.securesms.R
import org.thoughtcrime.securesms.badges.models.Badge import org.thoughtcrime.securesms.badges.models.Badge
import org.thoughtcrime.securesms.badges.models.Badge.Category.Companion.fromCode import org.thoughtcrime.securesms.badges.models.Badge.Category.Companion.fromCode
import org.thoughtcrime.securesms.components.settings.DSLConfiguration import org.thoughtcrime.securesms.components.settings.DSLConfiguration
@ -37,13 +36,9 @@ object Badges {
} }
.forEach { customPref(it) } .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 badgeSize = DimensionUnit.DP.toPixels(88f)
val windowWidth = context.resources.displayMetrics.widthPixels val windowWidth = context.resources.displayMetrics.widthPixels
val availableWidth = windowWidth - gutterExtra val perRow = (windowWidth / badgeSize).toInt()
val perRow = (availableWidth / badgeSize).toInt()
val empties = ((perRow - (badges.size % perRow)) % perRow) val empties = ((perRow - (badges.size % perRow)) % perRow)
repeat(empties) { repeat(empties) {