sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-04-14 19:56:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

improve task score notification display

Browse source
This commit is contained in:
Phillip Thelen 2022-12-05 11:01:21 +01:00
parent d7523c7bdf
commit dc33e91010
1 changed files with 28 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
Habitica/src/main/java/com/habitrpg/android/habitica/interactors/NotifyUserUseCase.kt
View file

@ -19,7 +19,7 @@ import com.habitrpg.android.habitica.ui.activities.BaseActivity
import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar
import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar.SnackbarDisplayType
import com.habitrpg.shared.habitica.extensions.round
import java.text.NumberFormat
import javax.inject.Inject
import kotlin.math.abs
@ -60,6 +60,10 @@ constructor(
) : FlowUseCase.RequestValues
companion object {
val formatter = NumberFormat.getInstance().apply {
this.minimumFractionDigits = 0
this.maximumFractionDigits = 2
}
fun getNotificationAndAddStatsToUser(
context: Context,
@ -115,9 +119,9 @@ constructor(
val iconDrawable = BitmapDrawable(context.resources, icon)
textView.setCompoundDrawablesWithIntrinsicBounds(iconDrawable, null, null, null)
val text: String = if (value > 0) {
" + " + abs(value.round(2)).toString()
" + " + formatter.format(abs(value))
} else {
" - " + abs(value.round(2)).toString()
" - " + formatter.format(abs(value))
}
textView.text = text
textView.gravity = Gravity.CENTER_VERTICAL
@ -125,6 +129,14 @@ constructor(
return textView
}
private fun formatValue(value: Double): String {
return if (value >= 0) {
" + " + formatter.format(abs(value))
} else {
" - " + formatter.format(abs(value))
}
}
fun getNotificationAndAddStatsToUserAsText(
xp: Double?,
hp: Double?,
@ -134,24 +146,23 @@ constructor(
val builder = SpannableStringBuilder()
var displayType = SnackbarDisplayType.NORMAL
if ((xp ?: 0.0) > 0) {
builder.append(" + ").append(xp?.round(2).toString()).append(" Exp")
if (xp != null && xp != 0.0) {
builder.append(formatValue(xp)).append(" Exp")
}
if (hp != 0.0) {
displayType = SnackbarDisplayType.FAILURE
builder.append(" - ").append(abs(hp?.round(2) ?: 0.0).toString()).append(" Health")
}
if (gold != 0.0) {
if ((gold ?: 0.0) > 0) {
builder.append(" + ").append(gold?.round(2).toString())
} else if ((gold ?: 0.0) < 0) {
if (hp != null && hp != 0.0) {
if (hp < 0) {
displayType = SnackbarDisplayType.FAILURE
builder.append(" - ").append(abs(gold?.round(2) ?: 0.0).toString())
}
builder.append(" Gold")
builder.append(formatValue(hp)).append(" Health")
}
if ((mp ?: 0.0) > 0) {
builder.append(" + ").append(mp?.round(2).toString()).append(" Mana")
if (gold != null && gold != 0.0) {
if (gold < 0) {
displayType = SnackbarDisplayType.FAILURE
}
builder.append(formatValue(gold)).append(" Gold")
}
if (mp != null && mp != 0.0) {
builder.append(formatValue(mp)).append(" Exp").append(" Mana")
}
return Pair(builder, displayType)