wbrawner/PassAndroid
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Simplify / leverage kotlin more

Browse source
This commit is contained in:
ligi 2016-11-14 20:09:16 +01:00
parent c19357000e
commit a7a42420f8
No known key found for this signature in database
GPG key ID: 8E81894010ABF23D
1 changed files with 9 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
android/src/main/java/org/ligi/passandroid/ui/pass_view_holder/PassViewHolder.kt
View file

@ -101,22 +101,17 @@ abstract class PassViewHolder(val view: CardView) : RecyclerView.ViewHolder(view
}
private fun getDateOrExtraText(pass: Pass): ZonedDateTime? {
if (pass.calendarTimespan != null && pass.calendarTimespan!!.from != null) {
return pass.calendarTimespan!!.from
}
if (pass.validTimespans.orEmpty().isNotEmpty()) {
return pass.validTimespans!![0].to
}
return null
private fun getDateOrExtraText(pass: Pass) = when {
pass.calendarTimespan?.from != null -> pass.calendarTimespan!!.from
pass.validTimespans.orEmpty().isNotEmpty() -> pass.validTimespans!![0].to
else -> null
}
@Visibility
protected open fun getVisibilityForGlobalAndLocal(global: Boolean, local: Boolean): Int {
if (global) {
return GONE
}
return if (local) VISIBLE else INVISIBLE
protected open fun getVisibilityForGlobalAndLocal(global: Boolean, local: Boolean) = when {
global -> GONE
local -> VISIBLE
else -> INVISIBLE
}
}