Skip to content
Snippets Groups Projects
Verified Commit 44b65e95 authored by Janne Mareike Koschinski's avatar Janne Mareike Koschinski
Browse files

Minor code cleanup

parent e557c945
No related branches found
No related tags found
No related merge requests found
...@@ -46,7 +46,6 @@ import de.kuschku.quasseldroid.util.helper.visibleIf ...@@ -46,7 +46,6 @@ import de.kuschku.quasseldroid.util.helper.visibleIf
import de.kuschku.quasseldroid.util.irc.format.ContentFormatter import de.kuschku.quasseldroid.util.irc.format.ContentFormatter
import de.kuschku.quasseldroid.util.irc.format.IrcFormatDeserializer import de.kuschku.quasseldroid.util.irc.format.IrcFormatDeserializer
import de.kuschku.quasseldroid.util.ui.SpanFormatter import de.kuschku.quasseldroid.util.ui.SpanFormatter
import de.kuschku.quasseldroid.viewmodel.EditorViewModel
import de.kuschku.quasseldroid.viewmodel.data.FormattedMessage import de.kuschku.quasseldroid.viewmodel.data.FormattedMessage
import de.kuschku.quasseldroid.viewmodel.helper.EditorViewModelHelper.Companion.IGNORED_CHARS import de.kuschku.quasseldroid.viewmodel.helper.EditorViewModelHelper.Companion.IGNORED_CHARS
import org.threeten.bp.ZoneId import org.threeten.bp.ZoneId
...@@ -70,12 +69,11 @@ class QuasselMessageRenderer @Inject constructor( ...@@ -70,12 +69,11 @@ class QuasselMessageRenderer @Inject constructor(
private val monospaceItalic = Typeface.create(Typeface.MONOSPACE, Typeface.ITALIC) private val monospaceItalic = Typeface.create(Typeface.MONOSPACE, Typeface.ITALIC)
private fun timePattern(showSeconds: Boolean, private fun timePattern(showSeconds: Boolean, use24hClock: Boolean) = when {
use24hClock: Boolean) = when (use24hClock to showSeconds) { !use24hClock and showSeconds -> "hh:mm:ss a"
false to true -> "hh:mm:ss a" !use24hClock and !showSeconds -> "hh:mm a"
false to false -> "hh:mm a"
true to true -> "HH:mm:ss" use24hClock and showSeconds -> "HH:mm:ss"
else -> "HH:mm" else -> "HH:mm"
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment