forked from Blendman974/faceclaw
<details> <summary>Prompts Used</summary> On the main page, there's a triple-dot menu. Its icon is currently black-on-dark (this is true on both a light-mode device and a dark-mode device; the top bark has a dark background in both cases). Make that icon white instead. We have a connection-status indicator on the main page, that says "Disconnected" or "Connected" or "Reconnecting". Let's move this onto the top-bar, as white text, right-aligned next to the triple-dot menu. We have several problem-status warnings, eg for not having battery-optimization permission, that appear on the main page in the form of a large button below the screen preview. Let's convert all of thes into a yellow triangle ! icon that appears on the top bar, in between the connection-status indicator and the triple-dot menu. Tapping it will open a modal that shows the message that was previously shown, with a button to do the suggested action. > All three changes are in, and the project builds and typechecks cleanly. Here's what I did: > > **White overflow icon** — The root cause is that NativeScript builds its toolbar programmatically, so the `theme` overlay in `NativeScriptToolbarStyle` (an XML-inflation-time attribute) never applied, and the overflow icon fell back to the light activity theme's dark `textColorSecondary`. I added an `actionOverflowButtonStyle` with a white `android:tint` to `AppThemeBase` in `App_Resources/Android/src/main/res/values/styles.xml`, so the icon is white on every page's bar (they all share the dark #424242 background), in both light and dark device themes. > > **Connection status in the top bar** — The ActionBar now has a custom titleView (`main-page.xml:5`): "Faceclaw" on the left, and a right-aligned white status label next to the menu. Since the old status string could be a whole sentence ("Reconnecting after ...", "Failed: ..."), the bar shows a short label derived from the connection phase — Connected / Connecting / Reconnecting / Disconnected / Charging / Disconnecting / Failed — and tapping it opens an alert with the full status message, so failure details aren't lost. The old status label below the controls is removed. > > **Warnings → ⚠️ icon + modal** — The three inline warning blocks (Even-app conflict, firmware, battery optimization) are gone from the page body in both portrait and landscape. A yellow warning-triangle emoji now sits between the status label and the overflow menu whenever any warning is active. Tapping it opens an in-page modal (same overlay pattern as the existing text-setting editor) titled "Attention needed", listing each active warning with its original message and action button, plus a Close button. The modal closes when you take an action, and auto-closes if the last warning clears while it's open. One side effect: the landscape layout previously showed the firmware warning without its install button — in the modal it now has the button like everything else. > > Worth an on-device check: the overflow-icon tint (theme change, so a full reinstall rather than hot reload), and that the titleView labels sit vertically centered against the toolbar height. <hr> Thanks. That all looks good, except there are some stylign issues on the warning modal. On a wide tablet, the modal is full-width, which is too wide. When the device is dark-mode, the "Attention needed" title is white-on-light-gray. The title and the warning text need some left/right padding between them and the edges of the modal. > All three styling issues are fixed and the build is clean: > > - **Too wide on tablets**: the modal's width now comes from a `warningsModalWidth` getter in the view model — screen width minus the margins on phones, capped at 480 DIPs on tablets — and it's centered horizontally. It re-computes on orientation change along with the other layout metrics. > - **White title in dark mode**: the theme's `.ns-dark .h2` rule was beating my `.warnings-modal Label` rule on specificity. I added a `.ns-dark .warnings-modal Label` selector so all text in the modal stays dark-on-light in both modes (the modal deliberately keeps its light look, matching the text-setting modal). > - **Missing edge padding**: NativeScript ScrollViews don't apply their own padding to their content, so the `padding: 16` on the modal was silently doing nothing. It now lives on an inner `warnings-modal-content` StackLayout; the border/background/margin stay on the ScrollView. > > One note: the text-setting editor modal (`system-name-modal`) uses the same `h2`-on-light-background pattern, so its title likely has the same white-on-light problem in dark mode — I left it alone since you only flagged the warnings modal, but it'd be the same one-line fix if you want it. </details>
120 lines
7.3 KiB
XML
120 lines
7.3 KiB
XML
<Page xmlns="http://schemas.nativescript.org/tns.xsd" xmlns:rc="phone-ui" navigatingTo="navigatingTo" loaded="loaded" unloaded="unloaded">
|
|
<ActionBar>
|
|
<!-- Custom titleView: app title on the left; connection status and the
|
|
warning-triangle indicator right-aligned beside the overflow menu. -->
|
|
<GridLayout columns="auto,*,auto,auto" width="100%" verticalAlignment="center">
|
|
<Label col="0" text="Faceclaw" class="action-bar-title" />
|
|
<Label col="2" text="{{ connectionStatusLabel }}" tap="{{ onConnectionStatusTap }}" class="action-bar-status" />
|
|
<Label col="3" text="⚠️" tap="{{ onWarningIconTap }}" visibility="{{ warningIconVisibility }}" class="action-bar-warning" />
|
|
</GridLayout>
|
|
<ActionItem text="{{ buttonLabel }}" tap="{{ onTap }}" isEnabled="{{ connectItemEnabled }}" android.position="popup" />
|
|
<ActionItem text="Pair glasses" tap="{{ onPairGlassesTap }}" isEnabled="{{ canRun }}" android.position="popup" />
|
|
<ActionItem text="Configure devices" tap="{{ onConfigureTap }}" isEnabled="{{ canRun }}" android.position="popup" />
|
|
<ActionItem text="Permissions" tap="{{ onPermissionsTap }}" android.position="popup" />
|
|
<ActionItem text="Take screenshot" tap="{{ onTakeScreenshotTap }}" android.position="popup" />
|
|
<ActionItem text="Record screen" tap="{{ onRecordScreenTap }}" android.position="popup" />
|
|
<ActionItem text="Uninstall custom firmware" tap="{{ onUninstallFirmwareTap }}" isEnabled="{{ canRun }}" android.position="popup" />
|
|
</ActionBar>
|
|
|
|
<GridLayout>
|
|
<GridLayout rows="auto,*" visibility="{{ portraitLayoutVisibility }}">
|
|
<StackLayout row="0" visibility="{{ displayPreviewVisibility }}">
|
|
<Image src="{{ displayPreview }}" stretch="fill" height="{{ displayPreviewHeight }}"
|
|
tap="{{ onMirrorTap }}" doubleTap="{{ onMirrorDoubleTap }}" longPress="{{ onMirrorLongPress }}" swipe="{{ onMirrorSwipe }}" />
|
|
</StackLayout>
|
|
<GridLayout
|
|
row="0"
|
|
class="display-preview-message"
|
|
height="{{ displayPreviewHeight }}"
|
|
visibility="{{ displayPreviewMessageVisibility }}">
|
|
<Label text="{{ displayPreviewMessage }}" textWrap="true" horizontalAlignment="center" verticalAlignment="center" />
|
|
</GridLayout>
|
|
<StackLayout row="1" class="p-20">
|
|
<rc:remote-controls />
|
|
<Button text="Stop recording" tap="{{ onStopRecordingTap }}" visibility="{{ stopRecordingButtonVisibility }}" />
|
|
</StackLayout>
|
|
</GridLayout>
|
|
|
|
<GridLayout class="p-20" visibility="{{ landscapeLayoutVisibility }}">
|
|
<GridLayout rows="auto" columns="*,360">
|
|
<StackLayout row="0" col="0" visibility="{{ displayPreviewVisibility }}" horizontalAlignment="left">
|
|
<Image
|
|
src="{{ displayPreview }}"
|
|
stretch="fill"
|
|
width="{{ landscapeDisplayPreviewWidth }}"
|
|
height="{{ landscapeDisplayPreviewHeight }}"
|
|
tap="{{ onMirrorTap }}" doubleTap="{{ onMirrorDoubleTap }}" longPress="{{ onMirrorLongPress }}" swipe="{{ onMirrorSwipe }}" />
|
|
</StackLayout>
|
|
<GridLayout
|
|
row="0"
|
|
col="0"
|
|
class="display-preview-message"
|
|
horizontalAlignment="left"
|
|
width="{{ landscapeDisplayPreviewWidth }}"
|
|
height="{{ landscapeDisplayPreviewHeight }}"
|
|
visibility="{{ displayPreviewMessageVisibility }}">
|
|
<Label text="{{ displayPreviewMessage }}" textWrap="true" horizontalAlignment="center" verticalAlignment="center" />
|
|
</GridLayout>
|
|
<StackLayout row="0" col="1" class="m-l-16">
|
|
<rc:remote-controls />
|
|
<Button text="Stop recording" tap="{{ onStopRecordingTap }}" visibility="{{ stopRecordingButtonVisibility }}" />
|
|
</StackLayout>
|
|
</GridLayout>
|
|
</GridLayout>
|
|
<ScrollView
|
|
class="warnings-modal"
|
|
visibility="{{ warningsModalVisibility }}"
|
|
width="{{ warningsModalWidth }}"
|
|
horizontalAlignment="center"
|
|
verticalAlignment="center">
|
|
<StackLayout class="warnings-modal-content">
|
|
<Label text="Attention needed" class="h2" />
|
|
<StackLayout visibility="{{ evenAppConflictWarningVisibility }}" class="warnings-modal-item">
|
|
<Label text="{{ evenAppConflictMessage }}" textWrap="true" />
|
|
<Button text="Open Even app settings" tap="{{ onOpenEvenAppSettingsTap }}" class="-primary" />
|
|
</StackLayout>
|
|
<StackLayout visibility="{{ firmwareWarningVisibility }}" class="warnings-modal-item">
|
|
<Label text="{{ firmwareWarningMessage }}" textWrap="true" />
|
|
<Button text="Install custom firmware" tap="{{ onInstallFirmwareTap }}" class="-primary" />
|
|
</StackLayout>
|
|
<StackLayout visibility="{{ batteryOptimizationWarningVisibility }}" class="warnings-modal-item">
|
|
<Label text="Android will slow Faceclaw to a crawl when the phone screen is off unless it is exempt from battery optimization." textWrap="true" />
|
|
<Button text="Allow unrestricted background usage" tap="{{ onAllowBackgroundUsageTap }}" class="-primary" />
|
|
</StackLayout>
|
|
<Button text="Close" tap="{{ onWarningsModalCloseTap }}" />
|
|
</StackLayout>
|
|
</ScrollView>
|
|
<StackLayout
|
|
class="system-name-modal"
|
|
visibility="{{ textSettingEditorVisibility }}"
|
|
horizontalAlignment="stretch"
|
|
verticalAlignment="top">
|
|
<Label text="{{ activeTextEditorTitle }}" class="h2" />
|
|
<Label text="{{ activeTextSettingTitle }}" />
|
|
<TextField
|
|
id="settingsTextField"
|
|
text="{{ activeTextSettingValue }}"
|
|
textChange="{{ onTextSettingTextChange }}"
|
|
returnPress="{{ onPrimaryTextSettingReturnPress }}"
|
|
autocorrect="false"
|
|
autocapitalizationType="none"
|
|
keyboardType="{{ activeTextSettingKeyboardType }}"
|
|
secure="{{ activeTextSettingSecure }}"
|
|
returnKeyType="{{ primaryTextSettingReturnKeyType }}" />
|
|
<StackLayout visibility="{{ secondaryTextSettingVisibility }}">
|
|
<Label text="{{ secondaryTextSettingTitle }}" />
|
|
<TextField
|
|
id="secondarySettingsTextField"
|
|
text="{{ secondaryTextSettingValue }}"
|
|
textChange="{{ onSecondaryTextSettingTextChange }}"
|
|
returnPress="{{ onSecondaryTextSettingReturnPress }}"
|
|
autocorrect="false"
|
|
autocapitalizationType="none"
|
|
keyboardType="{{ secondaryTextSettingKeyboardType }}"
|
|
secure="{{ secondaryTextSettingSecure }}"
|
|
returnKeyType="done" />
|
|
</StackLayout>
|
|
</StackLayout>
|
|
</GridLayout>
|
|
</Page>
|