mirror of
https://github.com/sky-systems/sky_phone.git
synced 2026-09-04 17:23:25 +00:00
MERGE - integrate latest dev changes
This commit is contained in:
+17
-2
@@ -18,6 +18,7 @@ import PhonePasscode from '@/components/PhonePasscode.vue'
|
||||
import PhoneNotifications from '@/components/PhoneNotifications.vue'
|
||||
import NotificationPhonePreview from '@/components/NotificationPhonePreview.vue'
|
||||
import PhoneStatusBar from '@/components/PhoneStatusBar.vue'
|
||||
import RadioHud from '@/components/RadioHud.vue'
|
||||
import SimPhonePicker, {
|
||||
type SimPhoneChoice,
|
||||
} from '@/components/SimPhonePicker.vue'
|
||||
@@ -364,6 +365,7 @@ function onMessage(event: MessageEvent<AppMessage>): void {
|
||||
appId: 'calendar',
|
||||
subtitle: new Intl.DateTimeFormat(phone.lang, {
|
||||
hour: '2-digit',
|
||||
hourCycle: 'h23',
|
||||
minute: '2-digit',
|
||||
}).format(startsAt),
|
||||
text:
|
||||
@@ -757,6 +759,7 @@ onBeforeUnmount(() => {
|
||||
|
||||
<template>
|
||||
<PhoneMediaCapture />
|
||||
<RadioHud />
|
||||
<SimPhonePicker
|
||||
v-if="simPicker"
|
||||
:choices="simPicker.choices"
|
||||
@@ -795,10 +798,21 @@ onBeforeUnmount(() => {
|
||||
v-if="phone.isOpen || notifications.current"
|
||||
class="phone-resolution-wrapper phone-resolution-wrapper--primary"
|
||||
>
|
||||
<section class="phone-device" :aria-label="phone.t('Common.phone')">
|
||||
<section
|
||||
class="phone-device"
|
||||
:class="{
|
||||
'phone-app--light': !phone.isDarkMode,
|
||||
[`phone-app--${phone.preferences.settings.graphicsMode}`]: true,
|
||||
}"
|
||||
:aria-label="phone.t('Common.phone')"
|
||||
>
|
||||
<div
|
||||
class="phone-screen"
|
||||
:class="{ 'phone-screen--app': isAppRoute }"
|
||||
:class="{
|
||||
'phone-screen--app': isAppRoute,
|
||||
'phone-app--light': !phone.isDarkMode,
|
||||
[`phone-app--${phone.preferences.settings.graphicsMode}`]: true,
|
||||
}"
|
||||
>
|
||||
<k-app
|
||||
theme="ios"
|
||||
@@ -809,6 +823,7 @@ onBeforeUnmount(() => {
|
||||
:class="{
|
||||
dark: phone.isDarkMode,
|
||||
'phone-app--light': !phone.isDarkMode,
|
||||
[`phone-app--${phone.preferences.settings.graphicsMode}`]: true,
|
||||
'phone-app--unlocking': isUnlocking,
|
||||
}"
|
||||
>
|
||||
|
||||
Reference in New Issue
Block a user