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

Clean up some left over code after update to getIcon (#3827)

Browse source
This commit is contained in:
Daniel Shokouhi 2023-08-31 16:53:10 -07:00 committed by GitHub
parent a9b7dfdb68
commit 90bf7369e2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 20 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -154,18 +154,16 @@ fun getDomainList(
if (!domainIsEmpty) {
listBuilder.addItem(
GridItem.Builder().apply {
if (icon != null) {
setImage(
CarIcon.Builder(
IconicsDrawable(carContext, icon)
.apply {
sizeDp = 64
}.toAndroidIconCompat()
)
.setTint(CarColor.DEFAULT)
.build()
setImage(
CarIcon.Builder(
IconicsDrawable(carContext, icon)
.apply {
sizeDp = 64
}.toAndroidIconCompat()
)
}
.setTint(CarColor.DEFAULT)
.build()
)
}
.setTitle(friendlyDomain)
.setOnClickListener {

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

@ -19,7 +19,6 @@ import androidx.lifecycle.Lifecycle
import androidx.lifecycle.lifecycleScope
import androidx.lifecycle.repeatOnLifecycle
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
@ -164,7 +163,7 @@ class EntityGridVehicleScreen(
Log.i(TAG, "Grid limit ($gridLimit) reached, not adding more entities (${entities.size}) for $title ")
return@forEachIndexed
}
val icon = entity.getIcon(carContext) ?: CommunityMaterial.Icon.cmd_cloud_question
val icon = entity.getIcon(carContext)
val gridItem =
GridItem.Builder()
.setLoading(false)

3
app/src/main/java/io/homeassistant/companion/android/vehicle/MapVehicleScreen.kt
View file

@ -19,7 +19,6 @@ import androidx.lifecycle.Lifecycle
import androidx.lifecycle.lifecycleScope
import androidx.lifecycle.repeatOnLifecycle
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
@ -93,7 +92,7 @@ class MapVehicleScreen(
Log.i(TAG, "Grid limit ($gridLimit) reached, not adding any more navigation entities (${entities.size})")
return@forEachIndexed
}
val icon = pair.first.getIcon(carContext) ?: CommunityMaterial.Icon.cmd_account
val icon = pair.first.getIcon(carContext)
gridBuilder.addItem(
GridItem.Builder()
.setTitle(pair.first.friendlyName)

3
wear/src/main/java/io/homeassistant/companion/android/complications/EntityStateDataSourceService.kt
View file

@ -13,7 +13,6 @@ import androidx.wear.watchface.complications.data.ShortTextComplicationData
import androidx.wear.watchface.complications.datasource.ComplicationRequest
import androidx.wear.watchface.complications.datasource.SuspendingComplicationDataSourceService
import com.mikepenz.iconics.IconicsDrawable
import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial
import com.mikepenz.iconics.utils.colorInt
import dagger.hilt.android.AndroidEntryPoint
import io.homeassistant.companion.android.common.R
@ -69,7 +68,7 @@ class EntityStateDataSourceService : SuspendingComplicationDataSourceService() {
null
}
val icon = entity.getIcon(applicationContext) ?: CommunityMaterial.Icon.cmd_bookmark
val icon = entity.getIcon(applicationContext)
val iconBitmap = IconicsDrawable(this, icon).apply {
colorInt = Color.WHITE
}.toBitmap()

2
wear/src/main/java/io/homeassistant/companion/android/complications/views/ComplicationConfigMainView.kt
View file

@ -106,7 +106,7 @@ fun MainConfigView(
modifier = Modifier.fillMaxWidth(),
icon = {
Image(
asset = iconBitmap ?: CommunityMaterial.Icon.cmd_bookmark,
asset = iconBitmap,
colorFilter = ColorFilter.tint(wearColorPalette.onSurface)
)
},

4
wear/src/main/java/io/homeassistant/companion/android/home/views/MainView.kt
View file

@ -96,7 +96,7 @@ fun MainView(
.fillMaxWidth(),
icon = {
Image(
asset = getIcon(cached?.icon, favoriteEntityID.split(".")[0], context) ?: CommunityMaterial.Icon.cmd_bookmark,
asset = getIcon(cached?.icon, favoriteEntityID.split(".")[0], context),
colorFilter = ColorFilter.tint(wearColorPalette.onSurface)
)
},
@ -273,7 +273,7 @@ fun MainView(
"",
domain,
context
)?.let { Image(asset = it) }
).let { Image(asset = it) }
},
label = {
Text(text = mainViewModel.stringForDomain(domain)!!)

3
wear/src/main/java/io/homeassistant/companion/android/home/views/SetFavoriteView.kt
View file

@ -16,7 +16,6 @@ import androidx.wear.compose.material.Text
import androidx.wear.compose.material.ToggleChip
import androidx.wear.compose.material.ToggleChipDefaults
import com.mikepenz.iconics.compose.Image
import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial
import io.homeassistant.companion.android.common.data.integration.Entity
import io.homeassistant.companion.android.common.data.integration.getIcon
import io.homeassistant.companion.android.home.MainViewModel
@ -100,7 +99,7 @@ private fun FavoriteToggleChip(
.fillMaxWidth(),
appIcon = {
Image(
asset = iconBitmap ?: CommunityMaterial.Icon.cmd_bookmark,
asset = iconBitmap,
colorFilter = ColorFilter.tint(wearColorPalette.onSurface)
)
},

2
wear/src/main/java/io/homeassistant/companion/android/home/views/SetShortcutsTileView.kt
View file

@ -62,7 +62,7 @@ fun SetShortcutsTileView(
.fillMaxWidth(),
icon = {
Image(
iconBitmap ?: CommunityMaterial.Icon.cmd_bookmark,
iconBitmap,
colorFilter = ColorFilter.tint(Color.White)
)
},

3
wear/src/main/java/io/homeassistant/companion/android/tiles/ShortcutsTile.kt
View file

@ -29,7 +29,6 @@ import androidx.wear.tiles.TileService
import com.google.common.util.concurrent.ListenableFuture
import com.mikepenz.iconics.IconicsColor
import com.mikepenz.iconics.IconicsDrawable
import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial
import com.mikepenz.iconics.utils.backgroundColor
import com.mikepenz.iconics.utils.colorInt
import com.mikepenz.iconics.utils.sizeDp
@ -117,7 +116,7 @@ class ShortcutsTile : TileService() {
entity.icon,
entity.domain,
this@ShortcutsTile
) ?: CommunityMaterial.Icon.cmd_bookmark
)
val iconBitmap = IconicsDrawable(this@ShortcutsTile, iconIIcon).apply {
colorInt = Color.WHITE
sizeDp = iconSize.roundToInt()

2
wear/src/main/java/io/homeassistant/companion/android/util/CommonFunctions.kt
View file

@ -30,7 +30,7 @@ fun stringForDomain(domain: String, context: Context): String? =
)
)[domain]?.let { context.getString(it) }
fun getIcon(icon: String?, domain: String, context: Context): IIcon? {
fun getIcon(icon: String?, domain: String, context: Context): IIcon {
val simpleEntity = Entity(
"$domain.ha_android_placeholder",
"",

2
wear/src/main/java/io/homeassistant/companion/android/views/ChooseEntityView.kt
View file

@ -126,7 +126,7 @@ private fun ChooseEntityChip(
.fillMaxWidth(),
icon = {
Image(
asset = iconBitmap ?: CommunityMaterial.Icon.cmd_bookmark,
asset = iconBitmap,
colorFilter = ColorFilter.tint(Color.White)
)
},