Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 30 additions & 10 deletions Sources/CryptoMakoApp/ContentView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,19 @@ struct ContentView: View {
var body: some View {
Group {
if visibility.isVisible {
TabView(selection: $tabs.selection) {
VaultTabView()
.tabItem { Label("Vault", systemImage: "lock.rectangle.stack") }
.tag(VaultAppModel.MainTab.vault)
BackupView(syncEngine: model.backupSync)
.tabItem { Label("Backup", systemImage: "externaldrive.badge.timemachine") }
.tag(VaultAppModel.MainTab.backup)
SettingsView()
.tabItem { Label("Settings", systemImage: "gearshape") }
.tag(VaultAppModel.MainTab.settings)
VStack(spacing: 0) {
TabView(selection: $tabs.selection) {
VaultTabView()
.tabItem { Label("Vault", systemImage: "lock.rectangle.stack") }
.tag(VaultAppModel.MainTab.vault)
BackupView(syncEngine: model.backupSync)
.tabItem { Label("Backup", systemImage: "externaldrive.badge.timemachine") }
.tag(VaultAppModel.MainTab.backup)
SettingsView()
.tabItem { Label("Settings", systemImage: "gearshape") }
.tag(VaultAppModel.MainTab.settings)
}
AppVersionFooter()
}
} else {
Color.clear
Expand All @@ -50,6 +53,23 @@ struct ContentView: View {
}
}

/// Subtle version line under the tab view, visible on every tab.
/// Static string resolved once from Bundle.main; observes nothing, so it adds no
/// SwiftUI invalidation to the shell (see #68).
private struct AppVersionFooter: View {
private static let text = "CryptoMako \(AppVersion.displayString)"

var body: some View {
Text(Self.text)
.appFont(.caption2)
.foregroundStyle(.tertiary)
.textSelection(.enabled)
.frame(maxWidth: .infinity, alignment: .center)
.padding(.vertical, 4)
.accessibilityLabel("CryptoMako version \(AppVersion.displayString)")
}
}

/// Applies the window text size; observes the model itself so the shell above does not.
private struct AppTextSizeModifier: ViewModifier {
@ObservedObject var model: VaultAppModel
Expand Down
2 changes: 1 addition & 1 deletion homebrew-cryptomako
Submodule homebrew-cryptomako updated from 81d19d to 91da37
2 changes: 1 addition & 1 deletion linux/cmd/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
//
// go build -ldflags "-X github.com/guillebot/cryptomako/linux/cmd.Version=1.0.0 -X github.com/guillebot/cryptomako/linux/cmd.GitCommit=$(git rev-parse --short HEAD)"
var (
Version = "1.0.11"
Version = "1.0.12"
GitCommit = "unknown"
)

Expand Down
2 changes: 1 addition & 1 deletion linux/packaging/build-deb.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ set -euo pipefail
ROOT="$(cd "$(dirname "$0")/.." && pwd)"
cd "$ROOT"

VERSION="${VERSION:-1.0.11}"
VERSION="${VERSION:-1.0.12}"
if [[ -n "${ARCH:-}" ]]; then
:
elif command -v dpkg >/dev/null 2>&1; then
Expand Down
4 changes: 2 additions & 2 deletions project.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ packages:

settings:
base:
MARKETING_VERSION: "1.0.11"
CURRENT_PROJECT_VERSION: "111"
MARKETING_VERSION: "1.0.12"
CURRENT_PROJECT_VERSION: "112"
SWIFT_VERSION: "5.10"
CODE_SIGN_STYLE: Automatic
# Xcode 16 debug builds split a target into a stub plus a .debug.dylib for
Expand Down
Loading