mobile/davx5-ose
mobile/davx5-ose
1
0
Fork 0
mirror of https://github.com/bitfireAT/davx5-ose synced 2024-09-30 00:11:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor changes

Browse source
This commit is contained in:
Ricki Hirner 2024-06-25 15:01:39 +02:00
parent c7b18b1f41
commit 85b29329eb
1 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
app/src/main/kotlin/at/bitfire/davdroid/ui/intro/IntroModel.kt
View file

@ -12,22 +12,16 @@ class IntroModel @Inject constructor(
private val introPages = introPageFactory.introPages
private var _pages: List<IntroPage>? = null
val pages: List<IntroPage>
@Synchronized
get() {
_pages?.let { return it }
val pages: List<IntroPage> by lazy {
calculatePages()
}
val newPages = calculatePages()
_pages = newPages
return newPages
}
private fun calculatePages(): List<IntroPage> {
for (page in introPages)
Logger.log.fine("Found intro page ${page::class.java} with order ${page.getShowPolicy()}")
// Calculate which intro pages shall be shown
val activePages: Map<IntroPage, IntroPage.ShowPolicy> = introPages
.associateWith { page ->
page.getShowPolicy().also { policy ->
@ -36,6 +30,7 @@ class IntroModel @Inject constructor(
}
.filterValues { it != IntroPage.ShowPolicy.DONT_SHOW }
// Show intro screen when there's at least one page that shall [always] be shown
val anyShowAlways = activePages.values.any { it == IntroPage.ShowPolicy.SHOW_ALWAYS }
return if (anyShowAlways) {
val pages = mutableListOf<IntroPage>()
@ -46,4 +41,5 @@ class IntroModel @Inject constructor(
} else
emptyList()
}
}
}