mobile/home-assistant-android
mobile/home-assistant-android
1
0
Fork 0
mirror of https://github.com/home-assistant/android synced 2024-10-07 00:29:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Hide all entities when we dont have domains to show, show empty message just in case (#3767)

Browse source
This commit is contained in:
Daniel Shokouhi 2023-08-07 13:35:50 -07:00 committed by GitHub
parent 73bc7b01fa
commit 6a8fd5989a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 24 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/io/homeassistant/companion/android/util/vehicle/GridItems.kt
View file

@ -189,6 +189,8 @@ fun getDomainList(
)
}
}
listBuilder.setNoItemsMessage(carContext.getString(R.string.no_supported_entities))
return listBuilder
}

13
app/src/main/java/io/homeassistant/companion/android/vehicle/DomainListScreen.kt
View file

@ -39,6 +39,7 @@ class DomainListScreen(
}
private val domains = mutableSetOf<String>()
private var domainsAdded = false
override fun onDrivingOptimizedChanged(newState: Boolean) {
invalidate()
@ -52,11 +53,11 @@ class DomainListScreen(
.distinct()
.filter { it in SUPPORTED_DOMAINS }
.toSet()
if (newDomains.size != domains.size || newDomains != domains) {
domains.clear()
domains.addAll(newDomains)
invalidate()
}
val invalidate = newDomains.size != domains.size || newDomains != domains || !domainsAdded
domains.clear()
domains.addAll(newDomains)
domainsAdded = true
if (invalidate) invalidate()
}
}
}
@ -82,7 +83,7 @@ class DomainListScreen(
setActionStrip(nativeModeActionStrip(carContext))
}
val domainBuild = domainList.build()
if (domainBuild.items.isEmpty()) {
if (!domainsAdded) {
setLoading(true)
} else {
setLoading(false)

26
app/src/main/java/io/homeassistant/companion/android/vehicle/EntityGridVehicleScreen.kt
View file

@ -109,18 +109,20 @@ class EntityGridVehicleScreen(
allEntities
).build()
)
listBuilder.addItem(
getDomainsGridItem(
carContext,
screenManager,
serverManager,
integrationRepository,
serverId,
allEntities,
prefsRepository,
entityRegistry
).build()
)
if (domains.isNotEmpty()) {
listBuilder.addItem(
getDomainsGridItem(
carContext,
screenManager,
serverManager,
integrationRepository,
serverId,
allEntities,
prefsRepository,
entityRegistry
).build()
)
}
if (shouldSwitchServers) {
listBuilder.addItem(
getChangeServerGridItem(

2
app/src/main/java/io/homeassistant/companion/android/vehicle/MainVehicleScreen.kt
View file

@ -124,7 +124,7 @@ class MainVehicleScreen(
) { onChangeServer(it) }.getEntityGridItems(favoritesEntities)
} else {
var builder = ItemList.Builder()
if (domains.isNotEmpty()) {
if (domains.isNotEmpty() && domainsAdded) {
builder = getDomainList(
domains,
carContext,