Merge pull request #10 from morishin/configurable-column-width

Make configurable column width
morishin · Jan 24, 2024 · 7ca3ee0 · 7ca3ee0
2 parents 7c3948d + 5de36a6
commit 7ca3ee0
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/XDeck/Config/AppConfig.swift b/XDeck/Config/AppConfig.swift
@@ -6,6 +6,7 @@ enum AppConfigError: Error {
 }
 
 struct AppConfig: Decodable {
+    var columnWidth: Int?
     var columns: [Column]
 
     struct Column: Decodable {

diff --git a/XDeck/Config/schema.json b/XDeck/Config/schema.json
@@ -5,6 +5,9 @@
     "$schema": {
       "type": "string"
     },
+    "columnWidth": {
+      "type": "integer"
+    },
     "columns": {
       "type": "array",
       "items": {

diff --git a/XDeck/Config/settings.json b/XDeck/Config/settings.json
@@ -1,5 +1,6 @@
 {
   "$schema": "./schema.json",
+  "columnWidth": 380,
   "columns": [
     {
       "type": "forYou"

diff --git a/XDeck/View/ContentView.swift b/XDeck/View/ContentView.swift
@@ -11,7 +11,7 @@ struct ContentView: View {
     @State var isShowingAlert: Bool = false
     @State var alertMessage: String? = nil
     @State var backgroundColor: Color = .white
-    @State var columnWidth: CGFloat = 380
+    @State var columnWidth: CGFloat
     @State var refreshSwitch: Bool = false
     @State var scriptExecutionRequest: String? = nil
     @State var isShowConfirmOpenPreference: Bool = false
@@ -47,6 +47,11 @@ struct ContentView: View {
             """
     }
 
+    init(appConfig: AppConfig) {
+        self.appConfig = appConfig
+        self._columnWidth = State<CGFloat>(initialValue: appConfig.columnWidth.map(CGFloat.init) ?? Self.defaultColumnWidth)
+    }
+
     @ViewBuilder
     private func makeColumn(
         column: AppConfig.Column, isLeftMostXColumn: Bool, profileUrl: Binding<URL?>
@@ -121,11 +126,11 @@ struct ContentView: View {
         ZStack {
             Button("+") {
                 pageZoom = pageZoom + 0.2
-                columnWidth = Self.defaultColumnWidth * pageZoom
+                columnWidth = (appConfig.columnWidth.map(CGFloat.init) ?? Self.defaultColumnWidth) * pageZoom
             }.keyboardShortcut("+").opacity(0)
             Button("-") {
                 pageZoom = pageZoom - 0.2
-                columnWidth = Self.defaultColumnWidth * pageZoom
+                columnWidth = (appConfig.columnWidth.map(CGFloat.init) ?? Self.defaultColumnWidth) * pageZoom
             }.keyboardShortcut("-").opacity(0)
             Button("r") {
                 refreshSwitch = !refreshSwitch