Verschönere Ausgabe von Floats mit .0

master
Niko Diamadis 4 years ago
parent fc7b765ec2
commit 2316a39bd9
Signed by: niko
GPG Key ID: BE53B0B17B1B142E

@ -80,3 +80,12 @@ private fun closeKeyboard(activity: Activity) {
}
imm.hideSoftInputFromWindow(view.windowToken, 0)
}
internal fun Float.toPrettyString(): String {
val string = this.toString()
return if (!string.endsWith(".0")) {
string
} else {
string.dropLast(2)
}
}

@ -223,8 +223,9 @@ class MissionFragment : Fragment() {
val date = SimpleDateFormat("dd.MM.yyyy", Locale.GERMANY).format(mission!!.date())
time = mission.time()
duration = mission.duration
val prettyDuration = duration.toPrettyString()
time = if (time != "") ", $time ($duration h)" else ", $duration h"
time = if (time != "") ", $time ($prettyDuration h)" else ", $prettyDuration h"
val dateTime = date + time
binding.apply {

@ -10,6 +10,7 @@ import androidx.recyclerview.widget.ListAdapter
import androidx.recyclerview.widget.RecyclerView
import com.cyb3rko.techniklogger.R
import com.cyb3rko.techniklogger.data.objects.Mission
import com.cyb3rko.techniklogger.toPrettyString
import java.text.SimpleDateFormat
import java.util.*
@ -31,7 +32,7 @@ internal class MissionAdapter(
holder.locationView.text = entry.location
val date = SimpleDateFormat("dd.MM.yyyy", Locale.GERMANY).format(entry.date())
@SuppressLint("SetTextI18n")
holder.dateView.text = "${date}, ${entry.duration} h"
holder.dateView.text = "${date}, ${entry.duration.toPrettyString()} h"
holder.itemView.setOnClickListener {
action(entry.objectId)
}

@ -9,6 +9,7 @@ import androidx.recyclerview.widget.ListAdapter
import androidx.recyclerview.widget.RecyclerView
import com.cyb3rko.techniklogger.R
import com.cyb3rko.techniklogger.data.objects.Participation
import com.cyb3rko.techniklogger.toPrettyString
internal class ParticipationAdapter(
val action: (participation: Participation) -> Unit
@ -21,7 +22,7 @@ internal class ParticipationAdapter(
override fun onBindViewHolder(holder: ViewHolder, position: Int) {
val entry = getItem(position)
val title = "${entry.name}, ${entry.duration} h"
val title = "${entry.name}, ${entry.duration.toPrettyString()} h"
holder.titleView.text = title
holder.titleView.setOnClickListener {
action(entry)

Loading…
Cancel
Save