Public Access
Give the phone the second design, and both heads the palette it arrives with
The Android v2 design is what this head draws now: four destinations in a bottom bar — Hosts, Terminal, Keychain, More — with snippets, SFTP, S3, logs and preferences one tap deeper behind the last. The first design's four had nothing behind them, which is what made a hub worth building. The palette moved from green-black to blue-black, and it moved in the shared project because that is where it lives and the desktop v2 specifies the same seventeen tokens. One colour changed meaning rather than value, and it is the only semantic change in the file. Green used to *be* the accent, so Ellipse.dot.live filled with Accent and "the thing to press" and "a shell is open on this host" were the same colour by construction. v2 makes the accent blue and keeps a green for status alone, which finally separates them: Live is that green and nothing merely interactive may use it. The accent is also two colours now — Accent fills, AccentText writes — because a row of chips in the fill colour is a row of things that all look like the primary action. A palette is not one file, which is the part worth knowing before the next one. Nine hex literals lived outside it: the nav bar's own label colours, the accessory keys and their Ctrl-latched state, two scrims, the window background Android paints before Avalonia has a frame, and the launcher vector. The two C# sites now resolve from the dictionary by name rather than restating it. The renderer's page cannot — it is served to a WebView over a loopback socket — so terminal.css and terminal.js keep hand-copied values and say so at both sites. ShellScreen gained More and Buckets, appended rather than slotted in. SFTP and S3 are one screen over one TransfersViewModel differing only in which picker they offer, and the kind is set by the button that navigates rather than on arrival — doing it in OnScreenChanged made every arrival at Transfers force the picker back to hosts, including the desktop's own rail arriving at a screen with a bucket already open. It refuses to change kind while a session is live, because there is one session behind both destinations and switching under it would title a screen S3 while it listed an SFTP host. What the design draws and this does not, on the usual grounds. The FORWARDING screen: nothing here forwards anything, so every toggle would be a control with no effect — it is a paragraph on the hub naming the absence, for the reason the desktop keeps TEAMS in its rail. The terminal's `23 ms · fwd 5432`. An ED25519 badge and a SHA256 line on keychain cards, which need an algorithm field and a fingerprint the item type does not have. An `agent` chip, for an agent that does not exist. Snippet run history and exit codes. The Logs FOLLOW pill, which claims a live tail over records that are written once at close and read when the screen opens, and the severity filter, which has nothing to count — that chip row is spent on the real choice, which of the two logs. S3 bucket totals and lifecycle. And the + on HOSTS, which would open a host editor this head has not got. SFTP is browse, open and delete. Both transfer commands work, and what they work against is the local pane: QueueDownloads writes to Path.Combine(LocalPath, name), and LocalPath starts at SpecialFolder.UserProfile, which on Android is the application's own private directory. A download would have reported success and left the file where the person who asked for it cannot open it, which is worse than not offering it — a refusal is visible and a file in /data/user/0/ is not. The queue is not drawn either, since nothing here can put anything in it. Both return with the document picker. The foreground service still counts zero transfers, and the reason moved rather than went away. Four defects worth naming, because three of them are the kind that compile. A Button as a ListBox ItemTemplate swallows the pointer press before the list sees it, so the files listing selected nothing and every command reading the selection did nothing — the row is a Border now and the phone-only single-tap-to-open is a Tapped handler, which also keeps a desktop single click from walking into directories. Avalonia type selectors are exact, so TextBlock.fingerprint never matched SelectableTextBlock and every fingerprint on this head rendered proportional and unwrapped: that was breaking the never-truncated rule on the host-key sheet already. The new two-level hierarchy had no handler for the system back gesture, so back left the application from a log screen. And the tab's close cross had shrunk to a 30x32 target flush against the select target, which is the one control here that ends a shell with no confirmation and no undo. Fingerprint unlock is raised on arriving at the lock screen rather than waiting for its button, which is still there. Only at launch: a lock the user asked for is not answered with an immediate request to unlock, which makes LOCK look inert and trains the reflex of authenticating at a prompt nobody asked for. And once, because a declined gesture leaves the passphrase box exactly where it was and a prompt that came back after being dismissed would be a modal you cannot get out of to type into it. Two fixes fall on the desktop. Its file listing coloured directories with Info and executables with Accent, which was blue against green and is now two steps of one blue; an executable is Live now. And a bucket's folders were drawn with a 0001-01-01 timestamp, because a prefix has no modification time — blank now, for the reason a directory's size is blank. Verified by the whole suite: 1309 tests over nineteen projects, none failing, including the layout suite that stands up real Avalonia and parses every desktop screen. Both heads build. Not verified on a device — nothing in this head ever has been; see docs/android-port.md. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01AZE3u99BNt6LzgTC5jhbz2
This commit is contained in:
Claude Opus 5
@@ -0,0 +1,173 @@
|
||||
<UserControl xmlns="https://github.com/avaloniaui"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:vm="using:DodoSSH.Client.Shell.ViewModels"
|
||||
xmlns:views="using:DodoSSH.Client.Android.Views"
|
||||
x:Class="DodoSSH.Client.Android.Views.LogsScreen"
|
||||
x:DataType="vm:LogsViewModel"
|
||||
Background="{StaticResource Canvas}">
|
||||
|
||||
<!--
|
||||
Design 07 — LOGS, under MORE.
|
||||
|
||||
Three things on the mock-up are not drawn, and each is the same kind of omission.
|
||||
|
||||
◆ **FOLLOW.** The design's header carries a blinking green "FOLLOW" pill and the screen is described as
|
||||
a live tail over ssh. Nothing here tails anything: these are the keychain's own synced audit records,
|
||||
written once at close, and they are read when the screen is opened. A pill that blinked would be
|
||||
animation standing in for a feature. It is a REFRESH button, which is what actually happens.
|
||||
|
||||
**The severity filter** — ALL / INFO / WARN / ERROR with counts — has nothing to count. A connection
|
||||
record is not a syslog line and carries no level. What this screen genuinely has two of is *logs*, so
|
||||
the design's chip row is spent on the real choice: what was connected to, and what was changed.
|
||||
|
||||
**The host chips** are gone for the same reason: nothing filters either log by host.
|
||||
|
||||
What is kept is the design's row shape — a quiet timestamp, a coloured word, a source, and the fact
|
||||
underneath — because that shape is why a log is readable at 10pt on a phone.
|
||||
-->
|
||||
|
||||
<Grid RowDefinitions="Auto,Auto,Auto,*">
|
||||
|
||||
<!-- ============ header ============ -->
|
||||
<Grid Grid.Row="0" ColumnDefinitions="Auto,*,Auto" Height="56" Margin="8,0">
|
||||
<Button Grid.Column="0" Classes="icon" Content="←"
|
||||
Command="{Binding $parent[views:PhoneShell].((vm:MainWindowViewModel)DataContext).ShowScreenCommand}"
|
||||
CommandParameter="{x:Static vm:ShellScreen.More}" />
|
||||
<TextBlock Grid.Column="1" Classes="heading" Text="Logs" Margin="4,0" />
|
||||
<Button Grid.Column="2" Classes="icon" Content="↻" Command="{Binding RefreshCommand}"
|
||||
IsEnabled="{Binding !IsBusy}" />
|
||||
</Grid>
|
||||
|
||||
<!-- ============ which log ============ -->
|
||||
<!--
|
||||
Mode=OneWay is load-bearing on both of these, not a tidiness: a two-way selection binding moves the
|
||||
chip before the command it is paired with has had a chance to refuse, so the screen would show a
|
||||
section it is not on. The keychain's categories carry the same note.
|
||||
-->
|
||||
<StackPanel Grid.Row="1" Orientation="Horizontal" Spacing="6" Margin="14,0,14,4">
|
||||
<RadioButton GroupName="log" Classes="chip" IsChecked="{Binding ShowsConnections, Mode=OneWay}"
|
||||
Command="{Binding ShowSectionCommand}"
|
||||
CommandParameter="{x:Static vm:LogSection.Connections}"
|
||||
Content="CONNECTIONS" />
|
||||
<RadioButton GroupName="log" Classes="chip" IsChecked="{Binding ShowsActivity, Mode=OneWay}"
|
||||
Command="{Binding ShowSectionCommand}"
|
||||
CommandParameter="{x:Static vm:LogSection.Activity}"
|
||||
Content="KEYCHAIN" />
|
||||
</StackPanel>
|
||||
|
||||
<TextBlock Grid.Row="2" Classes="detail" Margin="18,4,18,6" TextWrapping="Wrap"
|
||||
Text="{Binding Status}" />
|
||||
|
||||
<!-- ============ the log ============ -->
|
||||
<Border Grid.Row="3" Classes="output" Margin="12,0,12,12">
|
||||
<Panel>
|
||||
|
||||
<!-- ============ what was connected to ============ -->
|
||||
<!--
|
||||
One wrapper per section, each holding its own empty state, because "this section is empty" is a
|
||||
pair of facts — which section, and whether it has rows — and a binding cannot say `ShowsConnections
|
||||
&& !HasConnections` without a converter. Two Panels are cheaper than a converter and they keep
|
||||
EmptyMessage, which is already written per section, pointing at the section it describes.
|
||||
-->
|
||||
<Panel IsVisible="{Binding ShowsConnections}">
|
||||
<TextBlock Classes="body" VerticalAlignment="Top" Text="{Binding EmptyMessage}"
|
||||
IsVisible="{Binding !HasConnections}" />
|
||||
|
||||
<ScrollViewer IsVisible="{Binding HasConnections}">
|
||||
<ItemsControl ItemsSource="{Binding Connections}">
|
||||
<ItemsControl.ItemTemplate>
|
||||
<DataTemplate x:DataType="vm:ConnectionLogRowViewModel">
|
||||
<StackPanel Spacing="1" Margin="0,5">
|
||||
<StackPanel Orientation="Horizontal" Spacing="8">
|
||||
<TextBlock Classes="detail" FontSize="10" Text="{Binding Started}"
|
||||
Foreground="{StaticResource TextFaint}" VerticalAlignment="Center" />
|
||||
|
||||
<!--
|
||||
The kind sits where the design puts a severity, because it is the word that tells you
|
||||
what the row is: a shell or a file transfer. Green while the session is still open —
|
||||
the same green the host list uses, and the one thing on this screen that is about now
|
||||
rather than about the past.
|
||||
-->
|
||||
<TextBlock Classes="detail" FontSize="10" FontWeight="SemiBold" Text="{Binding Kind}"
|
||||
Foreground="{StaticResource Info}" VerticalAlignment="Center"
|
||||
IsVisible="{Binding !IsLive}" />
|
||||
<StackPanel Orientation="Horizontal" Spacing="5" IsVisible="{Binding IsLive}"
|
||||
VerticalAlignment="Center">
|
||||
<Ellipse Classes="dot live" Width="6" Height="6" VerticalAlignment="Center" />
|
||||
<TextBlock Classes="detail" FontSize="10" FontWeight="SemiBold"
|
||||
Text="{Binding Kind}" Foreground="{StaticResource Live}" />
|
||||
</StackPanel>
|
||||
|
||||
<TextBlock Classes="detail" FontSize="10" Text="{Binding HostLabel}"
|
||||
Foreground="{StaticResource TextDim}" VerticalAlignment="Center"
|
||||
TextTrimming="CharacterEllipsis" />
|
||||
</StackPanel>
|
||||
|
||||
<TextBlock Classes="detail" FontSize="10.5" Foreground="{StaticResource Text}"
|
||||
Text="{Binding Address}" TextTrimming="CharacterEllipsis" />
|
||||
|
||||
<!--
|
||||
TextDim rather than the `detail` class's own faint step. This block is drawn on
|
||||
TerminalSurface, which is lighter than the Canvas that step was chosen against, so the
|
||||
same colour that reads as quiet on a screen background reads as barely there here.
|
||||
-->
|
||||
<StackPanel Orientation="Horizontal" Spacing="7">
|
||||
<!-- "still open" rather than a dash, which the plan calls out by name. -->
|
||||
<TextBlock Classes="detail" FontSize="9.5" Foreground="{StaticResource TextDim}"
|
||||
Text="{Binding Duration}" />
|
||||
<TextBlock Classes="detail" FontSize="9.5" Foreground="{StaticResource TextDim}"
|
||||
Text="·" />
|
||||
<TextBlock Classes="detail" FontSize="9.5" Foreground="{StaticResource TextDim}"
|
||||
Text="{Binding DeviceName}" TextTrimming="CharacterEllipsis" />
|
||||
</StackPanel>
|
||||
|
||||
<!-- A refused host key is the one outcome worth a colour of its own. -->
|
||||
<TextBlock Classes="detail" FontSize="9.5" IsVisible="{Binding HasOutcome}"
|
||||
Foreground="{StaticResource DangerText}" Text="{Binding Outcome}" />
|
||||
</StackPanel>
|
||||
</DataTemplate>
|
||||
</ItemsControl.ItemTemplate>
|
||||
</ItemsControl>
|
||||
</ScrollViewer>
|
||||
</Panel>
|
||||
|
||||
<!-- ============ what was changed ============ -->
|
||||
<Panel IsVisible="{Binding ShowsActivity}">
|
||||
<TextBlock Classes="body" VerticalAlignment="Top" Text="{Binding EmptyMessage}"
|
||||
IsVisible="{Binding !HasActivity}" />
|
||||
|
||||
<ScrollViewer IsVisible="{Binding HasActivity}">
|
||||
<ItemsControl ItemsSource="{Binding Activity}">
|
||||
<ItemsControl.ItemTemplate>
|
||||
<DataTemplate x:DataType="vm:ActivityLogRowViewModel">
|
||||
<StackPanel Spacing="1" Margin="0,5">
|
||||
<StackPanel Orientation="Horizontal" Spacing="8">
|
||||
<TextBlock Classes="detail" FontSize="10" Text="{Binding At}"
|
||||
Foreground="{StaticResource TextFaint}" VerticalAlignment="Center" />
|
||||
<TextBlock Classes="detail" FontSize="10" FontWeight="SemiBold"
|
||||
Text="{Binding Operation}" Foreground="{StaticResource Info}"
|
||||
VerticalAlignment="Center" />
|
||||
<TextBlock Classes="detail" FontSize="10" Text="{Binding ItemKind}"
|
||||
Foreground="{StaticResource TextDim}" VerticalAlignment="Center" />
|
||||
</StackPanel>
|
||||
|
||||
<TextBlock Classes="detail" FontSize="10.5" Foreground="{StaticResource Text}"
|
||||
Text="{Binding ItemLabel}" TextTrimming="CharacterEllipsis" />
|
||||
|
||||
<!-- The names of the fields that changed, never their values. -->
|
||||
<TextBlock Classes="detail" FontSize="9.5" IsVisible="{Binding HasChangedFields}"
|
||||
Foreground="{StaticResource TextDim}"
|
||||
Text="{Binding ChangedFields}" TextWrapping="Wrap" />
|
||||
</StackPanel>
|
||||
</DataTemplate>
|
||||
</ItemsControl.ItemTemplate>
|
||||
</ItemsControl>
|
||||
</ScrollViewer>
|
||||
</Panel>
|
||||
|
||||
</Panel>
|
||||
</Border>
|
||||
|
||||
</Grid>
|
||||
|
||||
</UserControl>
|
||||
Reference in New Issue
Block a user