wbrawner/antimine-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'add-recycler-padding' of github.com:lucasnlm/antimine-android into add-recycler-padding

Browse source
This commit is contained in:
Lucas Lima 2020-12-16 21:48:29 -03:00
commit 0ba4bb4a11
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
common/src/main/java/dev/lucasnlm/antimine/common/level/view/CommonLevelFragment.kt
View file

@ -54,7 +54,7 @@ abstract class CommonLevelFragment(@LayoutRes val contentLayoutId: Int) : Fragme
val width = view.measuredWidth
val recyclerViewWidth = (dimensionRepository.areaSize() * boardWidth)
val separatorsWidth = (dimensionRepository.areaSeparator() * (boardWidth + 2))
return ((width - recyclerViewWidth - separatorsWidth) / 2).coerceAtLeast(0f).nextDown().toInt()
return ((width - recyclerViewWidth - separatorsWidth) / 2).coerceAtLeast(0.0f).nextDown().toInt()
}
private fun calcVerticalPadding(view: View, boardHeight: Int): Int {
@ -65,7 +65,7 @@ abstract class CommonLevelFragment(@LayoutRes val contentLayoutId: Int) : Fragme
val recyclerViewHeight = (dimensionRepository.areaSize() * boardHeight)
val separatorsHeight = (2 * dimensionRepository.areaSeparator() * (boardHeight - 1))
val calculatedHeight = (height - recyclerViewHeight - separatorsHeight - adsHeight)
return ((calculatedHeight / 2) - adsHeight).coerceAtLeast(0f).toInt()
return ((calculatedHeight / 2) - adsHeight).coerceAtLeast(0.0f).toInt()
}
open fun dpFromPx(context: Context, px: Float): Int {