Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 9f42c68279 | |||
| 031781761c | |||
| 9413c23cc5 |
@@ -23,6 +23,7 @@ struct PreferencesView: View {
|
||||
}
|
||||
}
|
||||
@EnvironmentObject private var sparkleUpdater: SparkleUpdater
|
||||
@Environment(\.colorScheme) private var colorScheme
|
||||
|
||||
@AppStorage("pingInterval") private var storedPingInterval: Int = 10
|
||||
@AppStorage("refreshInterval") private var storedRefreshInterval: Int = 60
|
||||
@@ -143,12 +144,39 @@ struct PreferencesView: View {
|
||||
}
|
||||
private func backgroundColor(for tab: Tab) -> Color {
|
||||
if selection == tab {
|
||||
return Color.accentColor
|
||||
return sidebarSelectionColor
|
||||
}
|
||||
if hoveredTab == tab {
|
||||
return Color.accentColor.opacity(0.2)
|
||||
return sidebarHoverColor
|
||||
}
|
||||
return sidebarBaseColor
|
||||
}
|
||||
|
||||
private var sidebarSelectionColor: Color {
|
||||
switch colorScheme {
|
||||
case .dark:
|
||||
return Color(red: 0.22, green: 0.45, blue: 0.88)
|
||||
default:
|
||||
return Color(red: 0.10, green: 0.39, blue: 0.90)
|
||||
}
|
||||
}
|
||||
|
||||
private var sidebarHoverColor: Color {
|
||||
switch colorScheme {
|
||||
case .dark:
|
||||
return Color(red: 0.20, green: 0.22, blue: 0.27)
|
||||
default:
|
||||
return Color(red: 0.87, green: 0.91, blue: 0.98)
|
||||
}
|
||||
}
|
||||
|
||||
private var sidebarBaseColor: Color {
|
||||
switch colorScheme {
|
||||
case .dark:
|
||||
return Color(red: 0.15, green: 0.16, blue: 0.19)
|
||||
default:
|
||||
return Color(red: 0.96, green: 0.97, blue: 0.99)
|
||||
}
|
||||
return Color.accentColor.opacity(0.08)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -17,6 +17,10 @@ import SwiftUI
|
||||
struct ResourcesView: View {
|
||||
@Binding var server: Server
|
||||
|
||||
private var displayInfo: ServerInfo {
|
||||
server.info ?? .placeholder
|
||||
}
|
||||
|
||||
var body: some View {
|
||||
GeometryReader { geometry in
|
||||
ScrollView {
|
||||
@@ -25,40 +29,40 @@ struct ResourcesView: View {
|
||||
Text("CPU Load")
|
||||
} value: {
|
||||
LoadBarCell(
|
||||
percent: (server.info?.load.percent)!,
|
||||
load1: (server.info?.load.minute1)!,
|
||||
load5: (server.info?.load.minute5)!,
|
||||
load15: (server.info?.load.minute15)!
|
||||
percent: displayInfo.load.percent,
|
||||
load1: displayInfo.load.minute1,
|
||||
load5: displayInfo.load.minute5,
|
||||
load15: displayInfo.load.minute15
|
||||
)
|
||||
}
|
||||
TableRowView {
|
||||
Text("Memory")
|
||||
} value: {
|
||||
UsageBarCell(
|
||||
free: (server.info?.memory.free)!,
|
||||
used: (server.info?.memory.used)!,
|
||||
total: (server.info?.memory.total)!,
|
||||
percent: (server.info?.memory.percent)!
|
||||
free: displayInfo.memory.free,
|
||||
used: displayInfo.memory.used,
|
||||
total: displayInfo.memory.total,
|
||||
percent: displayInfo.memory.percent
|
||||
)
|
||||
}
|
||||
TableRowView {
|
||||
Text("Swap")
|
||||
} value: {
|
||||
UsageBarCell(
|
||||
free: (server.info?.swap.free)!,
|
||||
used: (server.info?.swap.used)!,
|
||||
total: (server.info?.swap.total)!,
|
||||
percent: (server.info?.swap.percent)!
|
||||
free: displayInfo.swap.free,
|
||||
used: displayInfo.swap.used,
|
||||
total: displayInfo.swap.total,
|
||||
percent: displayInfo.swap.percent
|
||||
)
|
||||
}
|
||||
TableRowView {
|
||||
Text("SSD")
|
||||
} value: {
|
||||
UsageBarCell(
|
||||
free: (server.info?.diskSpace.free)!,
|
||||
used: (server.info?.diskSpace.used)!,
|
||||
total: (server.info?.diskSpace.total)!,
|
||||
percent: (server.info?.diskSpace.percent)!
|
||||
free: displayInfo.diskSpace.free,
|
||||
used: displayInfo.diskSpace.used,
|
||||
total: displayInfo.diskSpace.total,
|
||||
percent: displayInfo.diskSpace.percent
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
16
Sparkle/appcast.xml
vendored
16
Sparkle/appcast.xml
vendored
@@ -2,6 +2,14 @@
|
||||
<rss xmlns:sparkle="http://www.andymatuschak.org/xml-namespaces/sparkle" version="2.0">
|
||||
<channel>
|
||||
<title>iKeyMon</title>
|
||||
<item>
|
||||
<title>26.1.3</title>
|
||||
<pubDate>Sun, 19 Apr 2026 11:53:25 +0200</pubDate>
|
||||
<sparkle:version>170</sparkle:version>
|
||||
<sparkle:shortVersionString>26.1.4</sparkle:shortVersionString>
|
||||
<sparkle:minimumSystemVersion>15.2</sparkle:minimumSystemVersion>
|
||||
<enclosure url="https://git.24unix.net/tracer/iKeyMon/releases/download/v26.1.4/iKeyMon-26.1.4.zip" length="3065263" type="application/octet-stream" sparkle:edSignature="kDxHy5KsxeCYz3N4aIEiZAFnqz6lLg4dHCLG6FL+j37xEpFmZM0lfHL2A15Jg936GeE+iGf6WrQJFInhHAvGDg=="/>
|
||||
</item>
|
||||
<item>
|
||||
<title>26.1.3</title>
|
||||
<pubDate>Sat, 03 Jan 2026 18:17:26 +0100</pubDate>
|
||||
@@ -18,13 +26,5 @@
|
||||
<sparkle:minimumSystemVersion>15.2</sparkle:minimumSystemVersion>
|
||||
<enclosure url="https://git.24unix.net/tracer/iKeyMon/releases/download/v26.1.2/iKeyMon-26.1.2.zip" length="3007173" type="application/octet-stream" sparkle:edSignature="CiNeGZ9h4WtI/ZOW371EAEKGK0vWdu1VhBk5ewh2hoq+4C8R9DbnQvDyHvwFy4wh6VpLahp/mXr4gV5alEIRCw=="/>
|
||||
</item>
|
||||
<item>
|
||||
<title>26.1.1</title>
|
||||
<pubDate>Sat, 03 Jan 2026 16:34:21 +0100</pubDate>
|
||||
<sparkle:version>162</sparkle:version>
|
||||
<sparkle:shortVersionString>26.1.1</sparkle:shortVersionString>
|
||||
<sparkle:minimumSystemVersion>15.2</sparkle:minimumSystemVersion>
|
||||
<enclosure url="https://git.24unix.net/tracer/iKeyMon/releases/download/v26.1.1/iKeyMon-26.1.1.zip" length="3007145" type="application/octet-stream" sparkle:edSignature="iIRDl2//fBGMkI0AwE5PzSOZO5fowONqEx/6EH3SLnWxj6LC0LQh+SifVAwpf4g5/zPEMXNrLl+CZB7LEz/HCw=="/>
|
||||
</item>
|
||||
</channel>
|
||||
</rss>
|
||||
@@ -4,7 +4,7 @@ set -euo pipefail
|
||||
ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
|
||||
REMOTE_NAME="${1:-origin}"
|
||||
QUIET_RELEASE="${QUIET_RELEASE:-1}"
|
||||
RELEASE_LOG="${RELEASE_LOG:-$ROOT_DIR/build/release.log}"
|
||||
RELEASE_LOG="${RELEASE_LOG:-$ROOT_DIR/.git/release.log}"
|
||||
|
||||
if [[ -n "${SKIP_RELEASE:-}" ]]; then
|
||||
echo "release: skipped (SKIP_RELEASE=1)"
|
||||
@@ -76,7 +76,7 @@ else
|
||||
fi
|
||||
|
||||
if SKIP_RELEASE=1 git -C "$ROOT_DIR" push --quiet "$REMOTE_NAME" "${release_local_ref:-refs/heads/master}:${release_remote_ref:-refs/heads/master}"; then
|
||||
echo "release: success v${NEW_VERSION}"
|
||||
echo "release: success v${NEW_VERSION} (release commit already pushed; stopping original push)"
|
||||
exit 1
|
||||
else
|
||||
echo "release: push failed (log: $RELEASE_LOG)"
|
||||
|
||||
@@ -322,7 +322,7 @@
|
||||
CODE_SIGN_ENTITLEMENTS = iKeyMon.entitlements;
|
||||
CODE_SIGN_STYLE = Automatic;
|
||||
COMBINE_HIDPI_IMAGES = YES;
|
||||
CURRENT_PROJECT_VERSION = 167;
|
||||
CURRENT_PROJECT_VERSION = 170;
|
||||
DEVELOPMENT_ASSET_PATHS = "\"Preview Content\"";
|
||||
DEVELOPMENT_TEAM = Q5486ZVAFT;
|
||||
ENABLE_HARDENED_RUNTIME = YES;
|
||||
@@ -337,7 +337,7 @@
|
||||
"$(inherited)",
|
||||
"@executable_path/../Frameworks",
|
||||
);
|
||||
MARKETING_VERSION = 26.1.3;
|
||||
MARKETING_VERSION = 26.1.4;
|
||||
PRODUCT_BUNDLE_IDENTIFIER = net.24unix.iKeyMon;
|
||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||
SWIFT_EMIT_LOC_STRINGS = YES;
|
||||
@@ -353,7 +353,7 @@
|
||||
CODE_SIGN_ENTITLEMENTS = iKeyMon.entitlements;
|
||||
CODE_SIGN_STYLE = Automatic;
|
||||
COMBINE_HIDPI_IMAGES = YES;
|
||||
CURRENT_PROJECT_VERSION = 167;
|
||||
CURRENT_PROJECT_VERSION = 170;
|
||||
DEVELOPMENT_ASSET_PATHS = "\"Preview Content\"";
|
||||
DEVELOPMENT_TEAM = Q5486ZVAFT;
|
||||
ENABLE_HARDENED_RUNTIME = YES;
|
||||
@@ -368,7 +368,7 @@
|
||||
"$(inherited)",
|
||||
"@executable_path/../Frameworks",
|
||||
);
|
||||
MARKETING_VERSION = 26.1.3;
|
||||
MARKETING_VERSION = 26.1.4;
|
||||
PRODUCT_BUNDLE_IDENTIFIER = net.24unix.iKeyMon;
|
||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||
SWIFT_EMIT_LOC_STRINGS = YES;
|
||||
|
||||
@@ -3,6 +3,7 @@ set -euo pipefail
|
||||
|
||||
ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
|
||||
BUILD_DIR="$ROOT_DIR/build"
|
||||
DERIVED_DATA_DIR="$BUILD_DIR/derived-data"
|
||||
ARTIFACTS_DIR="$ROOT_DIR/dist"
|
||||
SCHEME="iKeyMon"
|
||||
PROJECT="iKeyMon.xcodeproj"
|
||||
@@ -141,18 +142,18 @@ export SPARKLE_APPCAST_OUTPUT
|
||||
|
||||
"$ROOT_DIR/scripts/sync_version.sh"
|
||||
|
||||
rm -rf "$BUILD_DIR" "$ARTIFACTS_DIR"
|
||||
mkdir -p "$ARTIFACTS_DIR"
|
||||
rm -rf "$DERIVED_DATA_DIR" "$ARTIFACTS_DIR"
|
||||
mkdir -p "$BUILD_DIR" "$ARTIFACTS_DIR"
|
||||
|
||||
xcodebuild \
|
||||
-project "$ROOT_DIR/$PROJECT" \
|
||||
-scheme "$SCHEME" \
|
||||
-configuration Release \
|
||||
-derivedDataPath "$BUILD_DIR" \
|
||||
-derivedDataPath "$DERIVED_DATA_DIR" \
|
||||
CODE_SIGNING_ALLOWED=NO \
|
||||
clean build
|
||||
|
||||
APP_PATH="$BUILD_DIR/Build/Products/Release/iKeyMon.app"
|
||||
APP_PATH="$DERIVED_DATA_DIR/Build/Products/Release/iKeyMon.app"
|
||||
if [[ ! -d "$APP_PATH" ]]; then
|
||||
echo "❌ Failed to find built app at $APP_PATH"
|
||||
exit 1
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
{
|
||||
"marketing_version": "26.1.3"
|
||||
"marketing_version": "26.1.4"
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user