|
6 | 6 | // |
7 | 7 |
|
8 | 8 | import SwiftUI |
9 | | -import TabularData |
10 | 9 |
|
11 | 10 | struct StatusBarDetailsView: View { |
12 | 11 | @ObservedObject var iostates = IOStates() |
13 | 12 | var body: some View { |
14 | | - List(iostates.items, id: \.pid) { item in |
15 | | - StatusBarDetailsItemView(state: item) |
| 13 | + VStack(alignment: .leading, spacing: 0) { |
| 14 | + // Header: Total traffic summary |
| 15 | + VStack(alignment: .leading, spacing: 6) { |
| 16 | + Text(NSLocalizedString("network_traffic", comment: "Network Traffic")) |
| 17 | + .font(.system(size: 13, weight: .semibold)) |
| 18 | + HStack(spacing: 16) { |
| 19 | + Label { |
| 20 | + Text(formatbytes(iostates.total.outbounds)) |
| 21 | + .font(.system(size: 11, weight: .medium, design: .monospaced)) |
| 22 | + } icon: { |
| 23 | + Image(systemName: "arrow.up") |
| 24 | + .font(.system(size: 9, weight: .semibold)) |
| 25 | + .foregroundColor(.orange) |
| 26 | + } |
| 27 | + Label { |
| 28 | + Text(formatbytes(iostates.total.inbounds)) |
| 29 | + .font(.system(size: 11, weight: .medium, design: .monospaced)) |
| 30 | + } icon: { |
| 31 | + Image(systemName: "arrow.down") |
| 32 | + .font(.system(size: 9, weight: .semibold)) |
| 33 | + .foregroundColor(.cyan) |
| 34 | + } |
| 35 | + } |
| 36 | + } |
| 37 | + .padding(.horizontal, 12) |
| 38 | + .padding(.vertical, 10) |
| 39 | + |
| 40 | + Divider() |
| 41 | + .padding(.horizontal, 8) |
| 42 | + |
| 43 | + // Process list |
| 44 | + if iostates.items.isEmpty { |
| 45 | + Text(NSLocalizedString("no_activity", comment: "No network activity")) |
| 46 | + .foregroundColor(.secondary) |
| 47 | + .font(.system(size: 11)) |
| 48 | + .frame(maxWidth: .infinity, alignment: .center) |
| 49 | + .padding(.vertical, 20) |
| 50 | + } else { |
| 51 | + ScrollView { |
| 52 | + VStack(spacing: 0) { |
| 53 | + ForEach(iostates.items) { item in |
| 54 | + StatusBarDetailsItemView(state: item) |
| 55 | + } |
| 56 | + } |
| 57 | + } |
| 58 | + .frame(maxHeight: 260) |
| 59 | + } |
16 | 60 | } |
17 | | - .listStyle(.sidebar) |
| 61 | + .frame(width: 280) |
18 | 62 | } |
19 | 63 | } |
20 | 64 |
|
21 | 65 | struct StatusBarDetailsItemView: View { |
22 | 66 | var state: NetworkState = NetworkState() |
23 | 67 |
|
24 | 68 | var body: some View { |
25 | | - HStack(alignment: VerticalAlignment.center, spacing: 0) { |
| 69 | + HStack { |
26 | 70 | Text(state.name) |
27 | | - .frame(width: 140, alignment: Alignment.leading) |
28 | | - VStack(alignment: .trailing) { |
29 | | - Text(String(format: "%@ ▲", arguments: [formatbytes(state.outbounds)])) |
30 | | - Text(String(format: "%@ ▼", arguments: [formatbytes(state.inbounds)])) |
| 71 | + .font(.system(size: 11)) |
| 72 | + .lineLimit(1) |
| 73 | + .truncationMode(.tail) |
| 74 | + .frame(maxWidth: .infinity, alignment: .leading) |
| 75 | + .help(state.name) |
| 76 | + |
| 77 | + VStack(alignment: .trailing, spacing: 1) { |
| 78 | + HStack(spacing: 2) { |
| 79 | + Image(systemName: "arrow.up") |
| 80 | + .font(.system(size: 7, weight: .medium)) |
| 81 | + .foregroundColor(.orange) |
| 82 | + Text(formatbytes(state.outbounds)) |
| 83 | + .font(.system(size: 9, weight: .medium, design: .monospaced)) |
| 84 | + } |
| 85 | + HStack(spacing: 2) { |
| 86 | + Image(systemName: "arrow.down") |
| 87 | + .font(.system(size: 7, weight: .medium)) |
| 88 | + .foregroundColor(.cyan) |
| 89 | + Text(formatbytes(state.inbounds)) |
| 90 | + .font(.system(size: 9, weight: .medium, design: .monospaced)) |
| 91 | + } |
31 | 92 | } |
32 | 93 | .fixedSize() |
33 | | - .font(.system(size: 9, weight: .medium)) |
34 | | - .frame(width: 60, alignment: Alignment.trailing) |
35 | 94 | } |
| 95 | + .padding(.horizontal, 12) |
| 96 | + .padding(.vertical, 5) |
36 | 97 | } |
37 | 98 | } |
38 | 99 |
|
39 | 100 | struct StatusBarMenuView_Previews: PreviewProvider { |
40 | 101 | static let data = { () -> IOStates in |
41 | 102 | let ret = IOStates() |
| 103 | + ret.total = NetworkState(pid: 0, name: "total", inbounds: 10240, outbounds: 2048) |
42 | 104 | ret.items = [ |
43 | | - NetworkState(pid: 1, name: "process", inbounds: 512, outbounds: 512), |
44 | | - NetworkState(pid: 2, name: "process", inbounds: 64, outbounds: 1), |
| 105 | + NetworkState(pid: 1, name: "Chrome", inbounds: 5120, outbounds: 1024), |
| 106 | + NetworkState(pid: 2, name: "Slack", inbounds: 2048, outbounds: 512), |
| 107 | + NetworkState(pid: 3, name: "Terminal", inbounds: 1024, outbounds: 256), |
45 | 108 | ] |
46 | 109 | return ret |
47 | 110 | }() |
48 | 111 | static var previews: some View { |
49 | 112 | StatusBarDetailsView(iostates: data) |
50 | | - .frame(width: 200.0) |
51 | 113 | } |
52 | 114 | } |
53 | 115 |
|
54 | 116 | struct StatusBarDetailsItemView_Previews: PreviewProvider { |
55 | 117 | static var previews: some View { |
56 | | - StatusBarDetailsItemView(state: NetworkState(name: "process", inbounds: 1023, outbounds: 1000)) |
| 118 | + StatusBarDetailsItemView(state: NetworkState(pid: 1, name: "Chrome", inbounds: 10240, outbounds: 2048)) |
| 119 | + .frame(width: 280) |
57 | 120 | } |
58 | 121 | } |
0 commit comments