Improve ui of some views

Whisky-App · Apr 9, 2024 · 753412c · 753412c
1 parent bd81905
commit 753412c
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 24 deletions.
diff --git a/Whisky/Views/Bottle/BottleCreationView.swift b/Whisky/Views/Bottle/BottleCreationView.swift
@@ -45,19 +45,22 @@ struct BottleCreationView: View {
                     }
                 }
 
-                HStack {
+                HStack(alignment: .top) {
                     VStack(alignment: .leading) {
                         Text("create.path")
                             .foregroundStyle(.primary)
-                        Text(bottlePath)
-                            .foregroundStyle(.secondary)
-                            .truncationMode(.middle)
-                            .lineLimit(2)
-                            .help(bottlePath)
+                        if !bottlePath.isEmpty {
+                            Text(bottlePath)
+                                .font(.callout)
+                                .foregroundStyle(.secondary)
+                                .truncationMode(.middle)
+                                .lineLimit(2)
+                                .help(bottlePath)
+                        }
                     }
 
                     Spacer()
-                    Button {
+                    Button("create.browse") {
                         let panel = NSOpenPanel()
                         panel.canChooseFiles = false
                         panel.canChooseDirectories = true
@@ -71,8 +74,6 @@ struct BottleCreationView: View {
                                 }
                             }
                         }
-                    } label: {
-                        Text("create.browse")
                     }
                 }
             }

diff --git a/Whisky/Views/Bottle/Pins/PinCreationView.swift b/Whisky/Views/Bottle/Pins/PinCreationView.swift
@@ -35,15 +35,18 @@ struct PinCreationView: View {
             Form {
                 TextField("pin.name", text: $newPinName)
 
-                HStack {
+                HStack(alignment: .top) {
                     VStack(alignment: .leading) {
                         Text("pin.path")
                             .foregroundStyle(.primary)
-                        Text(pinPath)
-                            .foregroundStyle(.secondary)
-                            .truncationMode(.middle)
-                            .lineLimit(2)
-                            .help(pinPath)
+                        if !pinPath.isEmpty {
+                            Text(pinPath)
+                                .font(.callout)
+                                .foregroundStyle(.secondary)
+                                .truncationMode(.middle)
+                                .lineLimit(2)
+                                .help(pinPath)
+                        }
                     }
 
                     Spacer()

diff --git a/Whisky/Views/Settings/SettingsView.swift b/Whisky/Views/Settings/SettingsView.swift
@@ -31,19 +31,22 @@ struct SettingsView: View {
         Form {
             Section("settings.general") {
                 Toggle("settings.toggle.kill.on.terminate", isOn: $killOnTerminate)
-                HStack {
+                HStack(alignment: .top) {
                     VStack(alignment: .leading) {
                         Text("settings.path")
                             .foregroundStyle(.primary)
-                        Text(bottlePath)
-                            .foregroundStyle(.secondary)
-                            .truncationMode(.middle)
-                            .lineLimit(2)
-                            .help(bottlePath)
+                        if !bottlePath.isEmpty {
+                            Text(bottlePath)
+                                .font(.callout)
+                                .foregroundStyle(.secondary)
+                                .truncationMode(.middle)
+                                .lineLimit(2)
+                                .help(bottlePath)
+                        }
                     }
 
                     Spacer()
-                    Button {
+                    Button("create.browse") {
                         let panel = NSOpenPanel()
                         panel.canChooseFiles = false
                         panel.canChooseDirectories = true
@@ -57,8 +60,6 @@ struct SettingsView: View {
                                 }
                             }
                         }
-                    } label: {
-                        Text("create.browse")
                     }
                 }
             }