Fix a few UI Issues (#438)

* Fix a few UI Issues * SwiftLint * More slight UI tweaks
PlayCover · Oct 25, 2022 · 0b4df8c · 0b4df8c
1 parent 4e3a28a
commit 0b4df8c
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 24 deletions.
diff --git a/PlayCover/Views/App Views/PlayAppView.swift b/PlayCover/Views/App Views/PlayAppView.swift
@@ -240,27 +240,25 @@ struct PlayAppConditionalView: View {
                     }
                     .frame(width: 60, height: 60)
 
-                    HStack {
-                        let noPlayToolsWarning = Text(
-                            app.hasPlayTools ? "" : "\(Image(systemName: "exclamationmark.triangle")) "
-                        )
+                    let noPlayToolsWarning = Text(
+                        app.hasPlayTools ? "" : "\(Image(systemName: "exclamationmark.triangle"))  "
+                    )
 
-                        Text("\(noPlayToolsWarning)\(app.name)")
-                            .lineLimit(1)
-                            .multilineTextAlignment(.center)
-                            .padding(.horizontal, 4)
-                            .padding(.vertical, 2)
-                            .foregroundColor(selected?.info.bundleIdentifier == app.info.bundleIdentifier ?
-                                             selectedTextColor : Color.primary)
-                            .background(
-                                RoundedRectangle(cornerRadius: 4)
-                                    .fill(selected?.info.bundleIdentifier == app.info.bundleIdentifier ?
-                                          selectedBackgroundColor : Color.clear)
-                                    .brightness(-0.2)
-                                )
-                            .help("settings.noPlayTools")
-                            .fixedSize()
-                    }
+                    Text("\(noPlayToolsWarning)\(app.name)")
+                        .lineLimit(1)
+                        .multilineTextAlignment(.center)
+                        .padding(.horizontal, 4)
+                        .padding(.vertical, 2)
+                        .foregroundColor(selected?.info.bundleIdentifier == app.info.bundleIdentifier ?
+                                         selectedTextColor : Color.primary)
+                        .background(
+                            RoundedRectangle(cornerRadius: 4)
+                                .fill(selected?.info.bundleIdentifier == app.info.bundleIdentifier ?
+                                      selectedBackgroundColor : Color.clear)
+                                .brightness(-0.2)
+                            )
+                        .help("settings.noPlayTools")
+                        .frame(width: 130, height: 20)
                 }
                 .frame(width: 130, height: 130)
             }

diff --git a/PlayCover/Views/AppSettingsView.swift b/PlayCover/Views/AppSettingsView.swift
@@ -43,10 +43,12 @@ struct AppSettingsView: View {
                         Spacer()
                     }
 
+                    let noPlayToolsWarning = Image(systemName: "exclamationmark.triangle")
+                    let warning = NSLocalizedString("settings.noPlayTools", comment: "")
+
                     if !viewModel.app.hasPlayTools {
-                        HStack(spacing: 3) {
-                            Image(systemName: "exclamationmark.triangle")
-                            Text(NSLocalizedString("settings.noPlayTools", comment: ""))
+                        HStack {
+                            Text("\(noPlayToolsWarning) \(warning)")
                                 .font(.caption)
                                 .multilineTextAlignment(.leading)
                             Spacer()
@@ -248,6 +250,8 @@ struct GraphicsView: View {
                         Text("settings.text.detectedResolution")
                         Spacer()
                         Text("\(width) x \(height)")
+                    } else {
+                        Spacer()
                     }
                 }
                 HStack {
@@ -373,6 +377,7 @@ struct MiscView: View {
             VStack {
                 HStack {
                     Toggle("settings.toggle.discord", isOn: $settings.settings.discordActivity.enable)
+                    Spacer()
                     Button("settings.button.discord") { showPopover = true }
                         .popover(isPresented: $showPopover, arrowEdge: .bottom) {
                             VStack {
@@ -412,14 +417,15 @@ struct MiscView: View {
                                 }.padding(.bottom)
                             }
                         }
-                    Spacer()
                 }.disabled(!app.hasPlayTools)
                 if #available(macOS 13.0, *) {
                     HStack {
                         Toggle("settings.toggle.hud", isOn: $settings.metalHudEnabled)
                         Spacer()
                     }
                 }
+                Spacer()
+                    .frame(height: 20)
                 HStack {
                     Button(app.hasPlayTools ? "settings.removePlayTools" : "alert.install.injectPlayTools") {
                         if app.hasPlayTools {