Fix: The default width for all Views

filimo · Jan 12, 2020 · 0845b49 · 0845b49
1 parent a184212
commit 0845b49
Show file tree

Hide file tree

Showing 14 changed files with 15 additions and 15 deletions.
diff --git a/ReaderTranslator.xcodeproj/project.pbxproj b/ReaderTranslator.xcodeproj/project.pbxproj
@@ -255,7 +255,6 @@
 		F0AB12B4233F599C005B9F2A /* StatusBarView_Voice_Favorite.swift in Sources */ = {isa = PBXBuildFile; fileRef = F0AB12B3233F599C005B9F2A /* StatusBarView_Voice_Favorite.swift */; };
 		F0AB12B6233F59B4005B9F2A /* StatusBarView_Voice_Volume.swift in Sources */ = {isa = PBXBuildFile; fileRef = F0AB12B5233F59B4005B9F2A /* StatusBarView_Voice_Volume.swift */; };
 		F0AB182523A5504200A71CA6 /* SentencesView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F0AB182423A5504200A71CA6 /* SentencesView.swift */; };
-		F0AD8B1B236413F60017C22F /* AvailableView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F0AD8B1A236413F60017C22F /* AvailableView.swift */; };
 		F0AD8B1C236413F60017C22F /* AvailableView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F0AD8B1A236413F60017C22F /* AvailableView.swift */; };
 		F0AD8B1E236414070017C22F /* TranslateAction.swift in Sources */ = {isa = PBXBuildFile; fileRef = F0AD8B1D236414070017C22F /* TranslateAction.swift */; };
 		F0AD8B1F236414070017C22F /* TranslateAction.swift in Sources */ = {isa = PBXBuildFile; fileRef = F0AD8B1D236414070017C22F /* TranslateAction.swift */; };
@@ -1730,7 +1729,6 @@
 				F0814BA223562AF300212F52 /* Set.swift in Sources */,
 				F0C36A962359AF75001E396C /* StatusBarView_Bookmarks.swift in Sources */,
 				F06B0946239CB8FA00A39A86 /* BookmarksView_List_Detail.swift in Sources */,
-				F0AD8B1B236413F60017C22F /* AvailableView.swift in Sources */,
 				F049244F2341F54800F3C728 /* Image.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;

diff --git a/ReaderTranslator.xcodeproj/xcshareddata/xcschemes/ReaderTranslatorPlayer_Mac_Test.xcscheme b/ReaderTranslator.xcodeproj/xcshareddata/xcschemes/ReaderTranslatorPlayer_Mac_Test.xcscheme
@@ -21,11 +21,11 @@
             </BuildableReference>
          </BuildActionEntry>
          <BuildActionEntry
-            buildForTesting = "YES"
+            buildForTesting = "NO"
             buildForRunning = "YES"
             buildForProfiling = "NO"
             buildForArchiving = "NO"
-            buildForAnalyzing = "YES">
+            buildForAnalyzing = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "F0754436234479DA00E1D88E"

diff --git a/ReaderTranslator/Model/AvailableView.swift b/ReaderTranslator/Model/AvailableView.swift
@@ -29,7 +29,7 @@ enum AvailableView: String, Codable, CaseIterable {
     var width: Binding<String> {
         Binding<String>(
             get: {
-                "\(ViewsStore.shared.viewWidth[self] ?? 500)"
+                "\(ViewsStore.shared.viewWidth[self] ?? ViewsStore.defaultWidth)"
             },
             set: {
                 ViewsStore.shared.viewWidth[self] = $0.cgFloatValue

diff --git a/ReaderTranslator/Stores/ViewsStore.swift b/ReaderTranslator/Stores/ViewsStore.swift
@@ -11,6 +11,8 @@ import Foundation
 final class ViewsStore: ObservableObject {
     private init() {}
     static let shared = ViewsStore()
+
+    static let defaultWidth: CGFloat = 500
 
     @Published(key: "enabledViews") var enabledViews: Set<AvailableView> = [.reverso, .gTranslator]
     @Published(key: "viewWidth") var viewWidth: [AvailableView: CGFloat] = [:]

diff --git a/ReaderTranslator/Views/ReaderView/Modes/Bookmarks/BookmarksView.swift b/ReaderTranslator/Views/ReaderView/Modes/Bookmarks/BookmarksView.swift
@@ -23,7 +23,7 @@ struct BookmarksView: View {
             TextField("", text: $filter).frame(width: bookmarkWidth * CGFloat(columnts))
             BookmarksView_List(columnts: columnts, width: bookmarkWidth, filter: $filter)
             BookmarksView_Controls()
-        }.frame(width: viewsStore.viewWidth[.bookmarks])
+        }.frame(width: viewsStore.viewWidth[.bookmarks] ?? ViewsStore.defaultWidth)
     }
 }
 

diff --git a/ReaderTranslator/Views/ReaderView/Modes/CollinsView.swift b/ReaderTranslator/Views/ReaderView/Modes/CollinsView.swift
@@ -16,7 +16,7 @@ struct CollinsView: View {
     var body: some View {
         WebViewContainer {
             CollinsRepresenter(selectedText: self.$store.translateAction)
-        }.frame(width: viewsStore.viewWidth[.collins])
+        }.frame(width: viewsStore.viewWidth[.collins] ?? ViewsStore.defaultWidth)
     }
 }
 

diff --git a/ReaderTranslator/Views/ReaderView/Modes/GTranslatorView.swift b/ReaderTranslator/Views/ReaderView/Modes/GTranslatorView.swift
@@ -15,7 +15,7 @@ struct GTranslatorView: View {
     var body: some View {
         WebViewContainer {
             GTranslatorRepresenter(selectedText: self.$store.translateAction)
-        }.frame(width: viewsStore.viewWidth[.gTranslator])
+        }.frame(width: viewsStore.viewWidth[.gTranslator] ?? ViewsStore.defaultWidth)
     }
 }
 

diff --git a/ReaderTranslator/Views/ReaderView/Modes/LongmanView.swift b/ReaderTranslator/Views/ReaderView/Modes/LongmanView.swift
@@ -15,7 +15,7 @@ struct LongmanView: View {
     var body: some View {
         WebViewContainer {
             LongmanRepresenter(selectedText: self.$store.translateAction)
-        }.frame(width: viewsStore.viewWidth[.longman])
+        }.frame(width: viewsStore.viewWidth[.longman] ?? ViewsStore.defaultWidth)
     }
 }
 

diff --git a/ReaderTranslator/Views/ReaderView/Modes/MacmillanView.swift b/ReaderTranslator/Views/ReaderView/Modes/MacmillanView.swift
@@ -15,7 +15,7 @@ struct MacmillanView: View {
     var body: some View {
         WebViewContainer {
             MacmillanRepresenter(selectedText: self.$store.translateAction)
-        }.frame(width: viewsStore.viewWidth[.macmillan])
+        }.frame(width: viewsStore.viewWidth[.macmillan] ?? ViewsStore.defaultWidth)
     }
 }
 

diff --git a/ReaderTranslator/Views/ReaderView/Modes/ReaderView_Pdf/ReaderView_Pdf.swift b/ReaderTranslator/Views/ReaderView/Modes/ReaderView_Pdf/ReaderView_Pdf.swift
@@ -16,7 +16,7 @@ struct ReaderView_Pdf: View {
         VStack {
             PDFKitView()
             ReaderView_Pdf_Toolbar()
-        }.frame(width: viewsStore.viewWidth[.pdf])
+        }.frame(width: viewsStore.viewWidth[.pdf] ?? ViewsStore.defaultWidth)
     }
 }
 

diff --git a/ReaderTranslator/Views/ReaderView/Modes/ReversoView.swift b/ReaderTranslator/Views/ReaderView/Modes/ReversoView.swift
@@ -15,7 +15,7 @@ struct ReversoView: View {
     var body: some View {
         WebViewContainer {
             ReversoRepresenter(selectedText: self.$store.translateAction)
-        }.frame(width: viewsStore.viewWidth[.reverso])
+        }.frame(width: viewsStore.viewWidth[.reverso] ?? ViewsStore.defaultWidth)
     }
 }
 

diff --git a/ReaderTranslator/Views/ReaderView/Modes/StackExchangeView.swift b/ReaderTranslator/Views/ReaderView/Modes/StackExchangeView.swift
@@ -15,7 +15,7 @@ struct StackExchangeView: View {
     var body: some View {
         WebViewContainer {
             StackExchangeRepresenter(selectedText: self.$store.translateAction)
-        }.frame(width: viewsStore.viewWidth[.stackExchange])
+        }.frame(width: viewsStore.viewWidth[.stackExchange] ?? ViewsStore.defaultWidth)
     }
 }
 

diff --git a/ReaderTranslator/Views/ReaderView/Modes/WikipediaView.swift b/ReaderTranslator/Views/ReaderView/Modes/WikipediaView.swift
@@ -15,7 +15,7 @@ struct WikipediaView: View {
     var body: some View {
         WebViewContainer {
             WikipediaRepresenter(selectedText: self.$store.translateAction)
-        }.frame(width: viewsStore.viewWidth[.wikipedia])
+        }.frame(width: viewsStore.viewWidth[.wikipedia] ?? ViewsStore.defaultWidth)
     }
 }
 

diff --git a/ReaderTranslator/Views/ReaderView/Modes/YTranslatorView.swift b/ReaderTranslator/Views/ReaderView/Modes/YTranslatorView.swift
@@ -15,7 +15,7 @@ struct YTranslatorView: View {
     var body: some View {
         WebViewContainer {
             YTranslatorRepresenter(selectedText: self.$store.translateAction)
-        }.frame(width: viewsStore.viewWidth[.yTranslator])
+        }.frame(width: viewsStore.viewWidth[.yTranslator] ?? ViewsStore.defaultWidth)
     }
 }