helcel/beans
2
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases 4 Wiki Activity

Improve stats

Browse Source
This commit is contained in:
fgerber 2024-04-11 00:03:37 +02:00
parent 06f8a1db7a
commit 76b0ad9f41
4 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/net/helcel/beans/activity/StatsActivity.kt
View File

@ -31,6 +31,7 @@ class StatsActivity : AppCompatActivity() {
_binding.stats.layoutManager = _binding.stats.layoutManager =
LinearLayoutManager(this, RecyclerView.VERTICAL, false) LinearLayoutManager(this, RecyclerView.VERTICAL, false)
val adapter = StatsListAdapter(_binding.stats, _binding.name) val adapter = StatsListAdapter(_binding.stats, _binding.name)
_binding.groupColor.setOnClickListener { adapter.invertCountMode() }
_binding.stats.adapter = adapter _binding.stats.adapter = adapter
_binding.pager.adapter = object : FragmentStateAdapter(supportFragmentManager, lifecycle) { _binding.pager.adapter = object : FragmentStateAdapter(supportFragmentManager, lifecycle) {

20
app/src/main/java/net/helcel/beans/activity/adapter/StatsListAdapter.kt
View File

@ -18,6 +18,8 @@ import net.helcel.beans.helper.Theme.getContrastColor
class StatsListAdapter(private val stats: RecyclerView, private val total: MaterialTextView) : class StatsListAdapter(private val stats: RecyclerView, private val total: MaterialTextView) :
RecyclerView.Adapter<StatsListAdapter.StatsViewHolder>() { RecyclerView.Adapter<StatsListAdapter.StatsViewHolder>() {
private val unit = "km²"
private var locMode = LocType.WORLD private var locMode = LocType.WORLD
private lateinit var ctx: Context private lateinit var ctx: Context
private var countMode: Boolean = true private var countMode: Boolean = true
@ -47,7 +49,8 @@ class StatsListAdapter(private val stats: RecyclerView, private val total: Mater
} else { } else {
holder.bind(Data.groups.getGroupFromPos(pos)) holder.bind(Data.groups.getGroupFromPos(pos))
} }
total.text = Settings.getStats(ctx, initialSum, getTotal()) val unitNow = if (!countMode) unit else ""
total.text = Settings.getStats(ctx, initialSum, getTotal(), unitNow)
} }
override fun getItemCount(): Int { override fun getItemCount(): Int {
@ -77,7 +80,13 @@ class StatsListAdapter(private val stats: RecyclerView, private val total: Mater
val viewHolder = stats.findViewHolderForAdapterPosition(it) as? StatsViewHolder val viewHolder = stats.findViewHolderForAdapterPosition(it) as? StatsViewHolder
viewHolder?.refresh(mode) viewHolder?.refresh(mode)
}.reduce { acc, i -> acc?.plus((i ?: 0)) } }.reduce { acc, i -> acc?.plus((i ?: 0)) }
total.text = Settings.getStats(ctx, sum, getTotal()) val unitNow = if (!countMode) unit else ""
total.text = Settings.getStats(ctx, sum, getTotal(), unitNow)
}
fun invertCountMode() {
countMode = !countMode
refreshMode(locMode)
} }
inner class StatsViewHolder( inner class StatsViewHolder(
@ -100,10 +109,7 @@ class StatsListAdapter(private val stats: RecyclerView, private val total: Mater
_binding.groupColor.setTextColor(contrastEntryColor) _binding.groupColor.setTextColor(contrastEntryColor)
_binding.name.setTextColor(contrastEntryColor) _binding.name.setTextColor(contrastEntryColor)
_binding.groupColor.setOnClickListener { _binding.groupColor.setOnClickListener { invertCountMode() }
countMode = !countMode
refreshMode(locMode)
}
compute() compute()
return refresh(locMode) return refresh(locMode)
} }
@ -137,7 +143,7 @@ class StatsListAdapter(private val stats: RecyclerView, private val total: Mater
LocType.STATE -> stateCount.sumOf { it.area } LocType.STATE -> stateCount.sumOf { it.area }
else -> -1 else -> -1
} }
_binding.name.text = area.toString() _binding.name.text = ctx.getString(R.string.number_with_unit, area, unit)
area area
} }
} }

10
app/src/main/java/net/helcel/beans/helper/Settings.kt
View File

@ -53,7 +53,7 @@ object Settings {
} }
} }
fun getStats(ctx: Context, numerator: Int?, denominator: Int?): String { fun getStats(ctx: Context, numerator: Int?, denominator: Int?, unit: String = ""): String {
if (numerator == null || denominator == null || denominator == 0) { if (numerator == null || denominator == null || denominator == 0) {
return "" return ""
} }
@ -63,7 +63,13 @@ object Settings {
(100 * (numerator.toFloat() / denominator.toFloat())).toInt() (100 * (numerator.toFloat() / denominator.toFloat())).toInt()
) )
else -> ctx.getString(R.string.rate, numerator, denominator) else -> {
if (unit == "") {
ctx.getString(R.string.rate, numerator, denominator)
} else {
ctx.getString(R.string.rate_with_unit, numerator, denominator, unit)
}
}
} }
} }
} }

2
app/src/main/res/values/en.xml
View File

@ -30,7 +30,9 @@
<string name="logo">Logo</string> <string name="logo">Logo</string>
<string name="name">Name</string> <string name="name">Name</string>
<string name="rate">%1$d/%2$d</string> <string name="rate">%1$d/%2$d</string>
<string name="rate_with_unit">%1$d / %2$d %3$s</string>
<string name="percentage">%1$d&#65285;</string> <string name="percentage">%1$d&#65285;</string>
<string name="number_with_unit">%1$d %2$s</string>
<string name="color_rrggbb">RRGGBB</string> <string name="color_rrggbb">RRGGBB</string>
<string name="hashtag">#</string> <string name="hashtag">#</string>
<string name="on">On</string> <string name="on">On</string>