diff --git a/src/panels/energy/strategies/energy-view-strategy.ts b/src/panels/energy/strategies/energy-view-strategy.ts index 5f620f8ad7..59f703a4ae 100644 --- a/src/panels/energy/strategies/energy-view-strategy.ts +++ b/src/panels/energy/strategies/energy-view-strategy.ts @@ -11,7 +11,7 @@ import { shouldShowFloorsAndAreas } from "./show-floors-and-areas"; import { LARGE_SCREEN_CONDITION, SMALL_SCREEN_CONDITION, -} from "../../lovelace/strategies/helpers/screen-conditions"; +} from "../../lovelace/strategies/helpers/view-columns-conditions"; @customElement("energy-view-strategy") export class EnergyViewStrategy extends ReactiveElement { diff --git a/src/panels/light/strategies/light-view-strategy.ts b/src/panels/light/strategies/light-view-strategy.ts index c499920ce7..538195f2aa 100644 --- a/src/panels/light/strategies/light-view-strategy.ts +++ b/src/panels/light/strategies/light-view-strategy.ts @@ -15,7 +15,7 @@ import { computeAreaTileCardConfig } from "../../lovelace/strategies/areas/helpe import { LARGE_SCREEN_CONDITION, SMALL_SCREEN_CONDITION, -} from "../../lovelace/strategies/helpers/screen-conditions"; +} from "../../lovelace/strategies/helpers/view-columns-conditions"; import type { ToggleGroupCardConfig } from "../../lovelace/cards/types"; import type { ButtonHeadingBadgeConfig } from "../../lovelace/heading-badges/types"; diff --git a/src/panels/lovelace/strategies/helpers/screen-conditions.ts b/src/panels/lovelace/strategies/helpers/screen-conditions.ts deleted file mode 100644 index 971aedb358..0000000000 --- a/src/panels/lovelace/strategies/helpers/screen-conditions.ts +++ /dev/null @@ -1,14 +0,0 @@ -import type { - Condition, - ScreenCondition, -} from "../../common/validate-condition"; - -export const LARGE_SCREEN_CONDITION: ScreenCondition = { - condition: "screen", - media_query: "(min-width: 871px)", -}; - -export const SMALL_SCREEN_CONDITION: Condition = { - condition: "not", - conditions: [LARGE_SCREEN_CONDITION], -}; diff --git a/src/panels/lovelace/strategies/helpers/view-columns-conditions.ts b/src/panels/lovelace/strategies/helpers/view-columns-conditions.ts new file mode 100644 index 0000000000..4a8d5a14df --- /dev/null +++ b/src/panels/lovelace/strategies/helpers/view-columns-conditions.ts @@ -0,0 +1,11 @@ +import type { ViewColumnsCondition } from "../../common/validate-condition"; + +export const LARGE_SCREEN_CONDITION: ViewColumnsCondition = { + condition: "view_columns", + min: 2, +}; + +export const SMALL_SCREEN_CONDITION: ViewColumnsCondition = { + condition: "view_columns", + max: 1, +}; diff --git a/src/panels/lovelace/strategies/home/home-overview-view-strategy.ts b/src/panels/lovelace/strategies/home/home-overview-view-strategy.ts index 75a2184a1f..7e594404f0 100644 --- a/src/panels/lovelace/strategies/home/home-overview-view-strategy.ts +++ b/src/panels/lovelace/strategies/home/home-overview-view-strategy.ts @@ -30,7 +30,7 @@ import type { import { LARGE_SCREEN_CONDITION, SMALL_SCREEN_CONDITION, -} from "../helpers/screen-conditions"; +} from "../helpers/view-columns-conditions"; import type { CommonControlSectionStrategyConfig } from "../usage_prediction/common-controls-section-strategy"; import { HOME_SUMMARIES_FILTERS } from "./helpers/home-summaries"; import { OTHER_DEVICES_FILTERS } from "./helpers/other-devices-filters";