Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Android auto: Switch to GridTemplate for home screen and default to favorites if defined #3694

Merged
merged 16 commits into from
Jul 27, 2023
Merged

Android auto: Switch to GridTemplate for home screen and default to favorites if defined #3694

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
ee62c6d
Android auto: default to favorites if defined
dshokouhi Jul 21, 2023
7082ffc
Fix changing servers
dshokouhi Jul 21, 2023
521fe95
Fix empty favorites list
dshokouhi Jul 21, 2023
8ca48b4
Review comments
dshokouhi Jul 21, 2023
bddf485
Account for extra grid items when showing favorites
dshokouhi Jul 21, 2023
9992c1c
Switch to grid view for home screen, show all domains when there are …
dshokouhi Jul 21, 2023
a639d71
Review comments
dshokouhi Jul 22, 2023
dc2625c
Clean up and move some methods to util
dshokouhi Jul 23, 2023
e1ffdf8
Collect favorites with allEntities
dshokouhi Jul 23, 2023
236072f
Review comments
dshokouhi Jul 24, 2023
de62afb
Move native mode logic back
dshokouhi Jul 24, 2023
8cfa61a
Check distraction again in domain screen
dshokouhi Jul 24, 2023
9980933
Use base class to get distraction optimized variable
dshokouhi Jul 25, 2023
21d7221
Send blank template if user is not logged in
dshokouhi Jul 25, 2023
b22046a
Mark variables as private
dshokouhi Jul 25, 2023
205d3fa
Fix icon resolution for grid items
dshokouhi Jul 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 74 additions & 0 deletions app/src/main/java/io/homeassistant/companion/android/vehicle/DomainListScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
package io.homeassistant.companion.android.vehicle

import android.os.Build
import androidx.annotation.RequiresApi
import androidx.car.app.CarContext
import androidx.car.app.Screen
import androidx.car.app.model.Action
import androidx.car.app.model.ListTemplate
import androidx.car.app.model.Template
import androidx.lifecycle.lifecycleScope
import io.homeassistant.companion.android.BuildConfig
import io.homeassistant.companion.android.common.R
import io.homeassistant.companion.android.common.data.integration.Entity
import io.homeassistant.companion.android.common.data.integration.IntegrationRepository
import io.homeassistant.companion.android.common.data.integration.domain
import io.homeassistant.companion.android.common.data.prefs.PrefsRepository
import io.homeassistant.companion.android.common.data.servers.ServerManager
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.launch

@RequiresApi(Build.VERSION_CODES.O)
class DomainListScreen(
carContext: CarContext,
val serverManager: ServerManager,
val integrationRepository: IntegrationRepository,
private val serverId: StateFlow<Int>,
private val allEntities: Flow<Map<String, Entity<*>>>,
private val prefsRepository: PrefsRepository
) : Screen(carContext) {

private val domains = mutableSetOf<String>()

init {
lifecycleScope.launch {
allEntities.collect { entities ->
val newDomains = entities.values
.map { it.domain }
.distinct()
.filter { it in MainVehicleScreen.SUPPORTED_DOMAINS }
.toSet()
if (newDomains.size != domains.size || newDomains != domains) {
domains.clear()
domains.addAll(newDomains)
invalidate()
}
}
}
}
override fun onGetTemplate(): Template {
val screen = MainVehicleScreen(
dshokouhi marked this conversation as resolved.
Show resolved Hide resolved
carContext,
serverManager,
serverId,
allEntities,
prefsRepository
) { }
val domainList = screen.addDomainList(domains)

return ListTemplate.Builder().apply {
setTitle(carContext.getString(R.string.all_entities))
setHeaderAction(Action.BACK)
if (screen.isAutomotive && !screen.iDrivingOptimized && BuildConfig.FLAVOR != "full") {
setActionStrip(screen.nativeModeActionStrip())
}
if (domainList.build().items.isEmpty()) {
dshokouhi marked this conversation as resolved.
Show resolved Hide resolved
setLoading(true)
} else {
setLoading(false)
setSingleList(domainList.build())
}
}.build()
}
}
115 changes: 111 additions & 4 deletions app/src/main/java/io/homeassistant/companion/android/vehicle/EntityGridVehicleScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,30 +20,42 @@ import com.mikepenz.iconics.IconicsDrawable
import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial
import com.mikepenz.iconics.utils.sizeDp
import com.mikepenz.iconics.utils.toAndroidIconCompat
import io.homeassistant.companion.android.common.R
import io.homeassistant.companion.android.common.data.integration.Entity
import io.homeassistant.companion.android.common.data.integration.IntegrationRepository
import io.homeassistant.companion.android.common.data.integration.domain
import io.homeassistant.companion.android.common.data.integration.friendlyName
import io.homeassistant.companion.android.common.data.integration.friendlyState
import io.homeassistant.companion.android.common.data.integration.getIcon
import io.homeassistant.companion.android.common.data.integration.isExecuting
import io.homeassistant.companion.android.common.data.integration.onPressed
import io.homeassistant.companion.android.common.data.prefs.PrefsRepository
import io.homeassistant.companion.android.common.data.servers.ServerManager
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.flow.map
import kotlinx.coroutines.launch

@RequiresApi(Build.VERSION_CODES.O)
class EntityGridVehicleScreen(
carContext: CarContext,
val serverManager: ServerManager,
val serverId: StateFlow<Int>,
val prefsRepository: PrefsRepository,
val integrationRepository: IntegrationRepository,
val title: String,
val entitiesFlow: Flow<List<Entity<*>>>
private val entitiesFlow: Flow<List<Entity<*>>>,
private val allEntities: Flow<Map<String, Entity<*>>>,
private val onChangeServer: (Int) -> Unit
) : Screen(carContext) {

companion object {
private const val TAG = "EntityGridVehicleScreen"
}

var loading = true
private var loading = true
var entities: List<Entity<*>> = listOf()
private val isFavorites = title == carContext.getString(R.string.favorites)

init {
lifecycleScope.launch {
Expand All @@ -58,7 +70,7 @@ class EntityGridVehicleScreen(
}
}

override fun onGetTemplate(): Template {
fun getEntityGridItems(entities: List<Entity<*>>): ItemList.Builder {
val manager = carContext.getCarService(ConstraintManager::class.java)
val gridLimit = manager.getContentLimit(ConstraintManager.CONTENT_LIMIT_TYPE_GRID)

Expand Down Expand Up @@ -98,14 +110,109 @@ class EntityGridVehicleScreen(
listBuilder.addItem(gridItem.build())
}

if (isFavorites) {
val navGridItem = GridItem.Builder().apply {
setTitle(carContext.getString(R.string.aa_navigation))
setImage(
CarIcon.Builder(
IconicsDrawable(
carContext,
CommunityMaterial.Icon3.cmd_map_outline
).apply {
sizeDp = 48
}.toAndroidIconCompat()
)
.setTint(CarColor.DEFAULT)
.build()
)
setOnClickListener {
Log.i(TAG, "Navigation clicked")
screenManager.push(
MapVehicleScreen(
carContext,
integrationRepository,
allEntities.map { it.values.filter { entity -> entity.domain in MainVehicleScreen.MAP_DOMAINS } }
)
)
}
}
listBuilder.addItem(navGridItem.build())
val categoryItem = GridItem.Builder().apply {
setTitle(carContext.getString(R.string.all_entities))
setImage(
CarIcon.Builder(
IconicsDrawable(
carContext,
CommunityMaterial.Icon3.cmd_view_list
).apply {
sizeDp = 48
}.toAndroidIconCompat()
)
.setTint(CarColor.DEFAULT)
.build()
)
setOnClickListener {
Log.i(TAG, "Categories clicked")
screenManager.push(
DomainListScreen(
carContext,
serverManager,
integrationRepository,
serverId,
allEntities,
prefsRepository
)
)
}
}
listBuilder.addItem(categoryItem.build())
if (serverManager.defaultServers.size > 1) {
val changeServerItem = GridItem.Builder().apply {
setTitle(carContext.getString(R.string.aa_change_server))
setImage(
CarIcon.Builder(
IconicsDrawable(
carContext,
CommunityMaterial.Icon2.cmd_home_switch
).apply {
sizeDp = 48
}.toAndroidIconCompat()
)
.setTint(CarColor.DEFAULT)
.build()
)
setOnClickListener {
Log.i(TAG, "Change server clicked")
screenManager.pushForResult(
ChangeServerScreen(
carContext,
serverManager,
serverId
)
) {
it?.toString()?.toIntOrNull()?.let { serverId ->
onChangeServer(serverId)
}
}
}
}
listBuilder.addItem(changeServerItem.build())
}
}
return listBuilder
}

override fun onGetTemplate(): Template {
val entityGrid = getEntityGridItems(entities)

return GridTemplate.Builder().apply {
setTitle(title)
setHeaderAction(Action.BACK)
if (loading) {
setLoading(true)
} else {
setLoading(false)
setSingleList(listBuilder.build())
setSingleList(entityGrid.build())
}
}.build()
}
Expand Down
Loading