Flatten the nested enum

Whisky-App · Apr 10, 2024 · e7bd167 · e7bd167
1 parent 7ab9f58
commit e7bd167
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 15 deletions.
diff --git a/Whisky/Utils/Constants.swift b/Whisky/Utils/Constants.swift
@@ -18,11 +18,8 @@
 
 import Foundation
 
-enum Constant {
-    // swiftlint:disable:next type_name
-    enum width {
-        static let small: Double = 400
-        static let medium: Double = 500
-        static let large: Double = 600
-    }
+enum ViewWidth {
+    static let small: Double = 400
+    static let medium: Double = 500
+    static let large: Double = 600
 }
diff --git a/Whisky/Views/Bottle/BottleCreationView.swift b/Whisky/Views/Bottle/BottleCreationView.swift
@@ -84,7 +84,7 @@ struct BottleCreationView: View {
             }
         }
         .fixedVerticalSize()
-        .frame(width: Constant.width.small)
+        .frame(width: ViewWidth.small)
     }
 
     func submit() {

diff --git a/Whisky/Views/Bottle/ConfigView.swift b/Whisky/Views/Bottle/ConfigView.swift
@@ -301,7 +301,7 @@ struct DPIConfigSheetView: View {
             }
         }
         .padding()
-        .frame(width: Constant.width.medium, height: 240)
+        .frame(width: ViewWidth.medium, height: 240)
     }
 }
 

diff --git a/Whisky/Views/Bottle/Pins/PinCreationView.swift b/Whisky/Views/Bottle/Pins/PinCreationView.swift
@@ -94,7 +94,7 @@ struct PinCreationView: View {
             }
         }
         .fixedVerticalSize()
-        .frame(minWidth: Constant.width.small)
+        .frame(minWidth: ViewWidth.small)
     }
 
     func submit() {

diff --git a/Whisky/Views/Bottle/WinetricksView.swift b/Whisky/Views/Bottle/WinetricksView.swift
@@ -84,6 +84,6 @@ struct WinetricksView: View {
                 winetricks = await Winetricks.parseVerbs()
             }
         }
-        .frame(minWidth: Constant.width.large, minHeight: 400)
+        .frame(minWidth: ViewWidth.large, minHeight: 400)
     }
 }
diff --git a/Whisky/Views/Common/RenameView.swift b/Whisky/Views/Common/RenameView.swift
@@ -58,7 +58,7 @@ struct RenameView: View {
             }
         }
         .fixedVerticalSize()
-        .frame(minWidth: Constant.width.small)
+        .frame(minWidth: ViewWidth.small)
     }
 
     var isNameValid: Bool {

diff --git a/Whisky/Views/FileOpenView.swift b/Whisky/Views/FileOpenView.swift
@@ -56,7 +56,7 @@ struct FileOpenView: View {
             }
         }
         .fixedVerticalSize()
-        .frame(width: Constant.width.small)
+        .frame(width: ViewWidth.small)
         .onAppear {
             // Makes sure there are more than 0 bottles.
             // Otherwise, it will crash on the nil cascade

diff --git a/Whisky/Views/Settings/SettingsView.swift b/Whisky/Views/Settings/SettingsView.swift
@@ -54,7 +54,7 @@ struct SettingsView: View {
         }
         .formStyle(.grouped)
         .fixedVerticalSize()
-        .frame(width: Constant.width.medium)
+        .frame(width: ViewWidth.medium)
     }
 }
 

diff --git a/Whisky/Views/WhiskyApp.swift b/Whisky/Views/WhiskyApp.swift
@@ -36,7 +36,7 @@ struct WhiskyApp: App {
     var body: some Scene {
         WindowGroup {
             ContentView(showSetup: $showSetup)
-                .frame(minWidth: Constant.width.large, minHeight: 316)
+                .frame(minWidth: ViewWidth.large, minHeight: 316)
                 .environmentObject(BottleVM.shared)
                 .onAppear {
                     NSWindow.allowsAutomaticWindowTabbing = false
-Original file line number
+Diff line change
@@ Expand Up / @@ -301,7 +301,7 @@ struct DPIConfigSheetView: View { @@
                 }
             }
             .padding()
-            .frame(width: Constant.width.medium, height: 240)
+            .frame(width: ViewWidth.medium, height: 240)
         }
     }
@@ Expand Down @@