Switch to real Table for history on macOS

Also removed the separate window used to display the history, because the history is now just part of the regular navigation list like it has been on iOS.

Author: NinjaCheetah

Global/RNGToolApp.swift

@@ -24,11 +24,6 @@ struct RNGToolApp: App {
         Settings {
             SettingsView().environmentObject(settingsData)
         }
-        WindowGroup("History") {
-            History().environmentObject(settingsData)
-                .frame(width: 400, height: 200)
-                .frame(maxWidth: 400, maxHeight: 200)
-        }.handlesExternalEvents(matching: Set(arrayLiteral: "History"))
         WindowGroup("Update") {
             UpdateCheck()
                 .frame(width: 300, height: 100)
@@ -40,7 +35,6 @@ struct RNGToolApp: App {
 
 #if os(macOS)
 enum OpenWindows: String, CaseIterable {
-    case History = "History"
     case Update = "Update"
 
     func open(){

Global/RNGToolCommands.swift

@@ -18,13 +18,6 @@ struct RNGToolCommands: Commands {
                 OpenWindows.Update.open()
             }
         }
-        CommandGroup(before: CommandGroupPlacement.sidebar) {
-            Button("Show History") {
-                OpenWindows.History.open()
-            }
-            .keyboardShortcut("h", modifiers: [.command, .shift])
-            Divider()
-        }
         #endif
     }
 }

RNGTool.xcodeproj/project.pbxproj

@@ -609,7 +609,7 @@
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 4;
+				CURRENT_PROJECT_VERSION = 5;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"RNGTool/Preview Content\"";
 				DEVELOPMENT_TEAM = 5GF7GKNTK4;
@@ -641,7 +641,7 @@
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 4;
+				CURRENT_PROJECT_VERSION = 5;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"RNGTool/Preview Content\"";
 				DEVELOPMENT_TEAM = 5GF7GKNTK4;

RNGTool/History.swift

@@ -10,61 +10,31 @@ import Foundation
 
 struct History: View {
     @EnvironmentObject var settingsData: SettingsData
+    @State private var selectedEntries = Set<HistoryTable.ID>()
 
     var body: some View {
-        GeometryReader { geometry in
-            ScrollView {
-                HStack {
-                    VStack(alignment: .leading) {
-                        Text("ID")
-                            .foregroundColor(.secondary)
-                        Divider()
-                        ForEach(0..<settingsData.historyTable.count, id: \.self) { index in
-                            Text("\(index)")
-                                .padding(.bottom, 3)
+        // History on macOS, now with 100% more actual table! This looks much much better.
+        Table(settingsData.historyTable, selection: $selectedEntries) {
+            TableColumn("Mode Used") { item in
+                Text(item.modeUsed)
+                    .contextMenu {
+                        Button("Copy") {
+                            copyToClipboard(item: item.modeUsed)
                         }
-                        Spacer()
                     }
-                    .frame(width: 50)
-                    VStack(alignment: .leading) {
-                        Text("Mode Used")
-                            .foregroundColor(.secondary)
-                        Divider()
-                        ForEach(0..<settingsData.historyTable.count, id: \.self) { index in
-                            Text("\(settingsData.historyTable[index].modeUsed)")
-                                .padding(.bottom, 3)
-                        }
-                        Spacer()
-                    }
-                    .frame(width: 150)
-                    VStack(alignment: .leading) {
-                        Text("Result(s)")
-                            .foregroundColor(.secondary)
-                        Divider()
-                        ForEach(0..<settingsData.historyTable.count, id: \.self) { index in
-                            Text("\(settingsData.historyTable[index].numbers)")
-                                .padding(.bottom, 3)
-                                .contextMenu {
-                                    Button(action: {
-                                        copyToClipboard(item: settingsData.historyTable[index].numbers)
-                                    }) {
-                                        Text("Copy")
-                                    }
-                                }
+            }
+            TableColumn("Result(s)") { item in
+                Text(item.numbers)
+                    .contextMenu {
+                        Button("Copy") {
+                            copyToClipboard(item: item.numbers)
                         }
-                        Spacer()
                     }
-                    .frame(width: 200)
-                }
-                .padding(.top, 6)
-                .padding(.leading, 8)
             }
         }
     }
 }
 
-struct History_Previews: PreviewProvider {
-    static var previews: some View {
-        History().environmentObject(SettingsData())
-    }
+#Preview {
+    History().environmentObject(SettingsData())
 }

RNGTool/Modes/DiceMode.swift

@@ -13,7 +13,6 @@ struct DiceMode: View {
     @State private var numDice: Int = 1
     @State private var confirmReset: Bool = false
     @State private var randomNumbers: [Int] = [0]
-    @State private var numsInArray: Int = 0
     @State private var diceImages: [String] = Array(repeating: "d1", count: 18)
     @State private var rollCount: Int = 0
     @State private var showRollHint: Bool = true