Bachelorproef
/
bap-poc-phase-2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated to latest Adwaita for Swift version

This commit is contained in:
TheAlgorithm476 2025-04-16 11:03:15 +02:00
parent b8b7e692cc
commit 46232968f6
2 changed files with 15 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
Sources/AdwaitaTemplate.swift
View File

@ -9,22 +9,20 @@ struct AdwaitaTemplate: App {
var scene: Scene { var scene: Scene {
Window(id: "main") { window in Window(id: "main") { window in
VStack { VStack(spacing: 8) {
Text("Calculations here...") Text("Calculations here...")
.selectable(false) .selectable(false)
VStack { VStack(spacing: 8) {
HStack { HStack(spacing: 8) {
Button("AC") {} Button("AC") {}
.keyboardShortcut("c", app: app) .keyboardShortcut("c", app: app)
Button("") {} Button("") {}
Button("%") {} Button("%") {}
.keyboardShortcut("%", app: app) .keyboardShortcut("percent", app: app)
Button("/") {} Button("/") {}
.keyboardShortcut("/", app: app) .keyboardShortcut("slash", app: app)
} }
.modifyContent(VStack.self) { $0.spacing(8) } HStack(spacing: 8) {
.frame(maxWidth: .none)
HStack {
Button("7") {} Button("7") {}
.keyboardShortcut("7", app: app) .keyboardShortcut("7", app: app)
Button("8") {} Button("8") {}
@ -32,11 +30,9 @@ struct AdwaitaTemplate: App {
Button("9") {} Button("9") {}
.keyboardShortcut("9", app: app) .keyboardShortcut("9", app: app)
Button("*") {} Button("*") {}
.keyboardShortcut("*", app: app) .keyboardShortcut("asterisk", app: app)
} }
.modifyContent(VStack.self) { $0.spacing(8) } HStack(spacing: 8) {
.frame(maxWidth: .none)
HStack {
Button("4") {} Button("4") {}
.keyboardShortcut("4", app: app) .keyboardShortcut("4", app: app)
Button("5") {} Button("5") {}
@ -44,11 +40,9 @@ struct AdwaitaTemplate: App {
Button("6") {} Button("6") {}
.keyboardShortcut("6", app: app) .keyboardShortcut("6", app: app)
Button("-") {} Button("-") {}
.keyboardShortcut("-", app: app) .keyboardShortcut("minus", app: app)
} }
.modifyContent(VStack.self) { $0.spacing(8) } HStack(spacing: 8) {
.frame(maxWidth: .none)
HStack {
Button("1") {} Button("1") {}
.keyboardShortcut("1", app: app) .keyboardShortcut("1", app: app)
Button("2") {} Button("2") {}
@ -56,26 +50,20 @@ struct AdwaitaTemplate: App {
Button("3") {} Button("3") {}
.keyboardShortcut("3", app: app) .keyboardShortcut("3", app: app)
Button("+") {} Button("+") {}
.keyboardShortcut("+", app: app) .keyboardShortcut("plus", app: app)
} }
.modifyContent(VStack.self) { $0.spacing(8) } HStack(spacing: 8) {
.frame(maxWidth: .none)
HStack {
Button("0") {} Button("0") {}
.keyboardShortcut("0", app: app) .keyboardShortcut("0", app: app)
Button("") {} Button("") {}
Button(",") {} Button(",") {}
.keyboardShortcut(",", app: app) .keyboardShortcut("comma", app: app)
Button("=") {} Button("=") {}
.keyboardShortcut("=", app: app) .keyboardShortcut("equal", app: app)
} }
.modifyContent(VStack.self) { $0.spacing(8) }
.frame(maxWidth: .none)
} }
.spacing(8)
.frame(maxHeight: .none) .frame(maxHeight: .none)
} }
.spacing(8)
.padding() .padding()
.topToolbar { .topToolbar {
ToolbarView(app: app, window: window) ToolbarView(app: app, window: window)

2
io.github.AparokshaUI.AdwaitaTemplate.json
View File

@ -1,7 +1,7 @@
{ {
"app-id": "io.github.AparokshaUI.AdwaitaTemplate", "app-id": "io.github.AparokshaUI.AdwaitaTemplate",
"runtime": "org.gnome.Platform", "runtime": "org.gnome.Platform",
"runtime-version": "47", "runtime-version": "48",
"sdk": "org.gnome.Sdk", "sdk": "org.gnome.Sdk",
"sdk-extensions": [ "sdk-extensions": [
"org.freedesktop.Sdk.Extension.swift6" "org.freedesktop.Sdk.Extension.swift6"