refactor: move character direction into environment

Author: David Skuza

PocketKit/Sources/PocketKit/Article/TextContentView.swift

@@ -14,6 +14,9 @@ struct TextContentView: View {
     @Environment(\.layoutDirection)
     private var layoutDirection: LayoutDirection
 
+    @Environment(\.characterDirection)
+    private var characterDirection: LayoutDirection
+    
     @EnvironmentObject
     private var settings: ReaderSettings
 
@@ -46,20 +49,24 @@ struct TextContentView: View {
 
 extension TextContentView {
     private var alignment: Alignment {
-        switch settings.languageDirection {
+        switch characterDirection {
         case .leftToRight:
             return layoutDirection == .leftToRight ? .leading : .trailing
         case .rightToLeft:
             return layoutDirection == .rightToLeft ? .leading : .trailing
+        @unknown default:
+            return .leading
         }
     }
 
     private var textAlignment: TextAlignment {
-        switch settings.languageDirection {
+        switch characterDirection {
         case .leftToRight:
             return layoutDirection == .leftToRight ? .leading : .trailing
         case .rightToLeft:
             return layoutDirection == .rightToLeft ? .leading : .trailing
+        @unknown default:
+            return .leading
         }
     }
 }

PocketKit/Sources/PocketKit/Environment.swift

@@ -14,10 +14,14 @@ private struct AuthorizationClientKey: EnvironmentKey {
     static var defaultValue: AuthorizationClient = Services.shared.authClient
 }
 
-struct SourceKey: EnvironmentKey {
+private struct SourceKey: EnvironmentKey {
     static var defaultValue = Services.shared.source
 }
 
+private struct CharacterDirectionKey: EnvironmentKey {
+    static var defaultValue: LayoutDirection = .leftToRight
+}
+
 extension EnvironmentValues {
     var accessTokenStore: AccessTokenStore {
         get { self[AccessTokenStoreKey.self] }
@@ -33,4 +37,9 @@ extension EnvironmentValues {
         get { self[SourceKey.self] }
         set { self[SourceKey.self] = newValue }
     }
+    
+    var characterDirection: LayoutDirection {
+        get { self[CharacterDirectionKey.self] }
+        set { self[CharacterDirectionKey.self] = newValue }
+    }
 }

PocketKit/Sources/PocketKit/Item/Item+Extensions.swift

@@ -5,9 +5,10 @@
 import Foundation
 import Textile
 import Sync
+import SwiftUI
 
 public extension Item {
-    var languageDirection: LanguageDirection {
+    var characterDirection: LayoutDirection {
         let language = language ?? "en"
         let direction = Locale.characterDirection(forLanguage: language)
         return direction == .rightToLeft ? .rightToLeft : .leftToRight

PocketKit/Sources/PocketKit/Item/ItemDestinationView.swift

@@ -22,12 +22,14 @@ struct ItemDestinationView: View {
     private var isPresentingOverflow = false
 
     @StateObject
-    private var settings: ReaderSettings
+    private var settings = ReaderSettings()
 
     @ViewBuilder
     private var destinationView: some View {
         if let article = article {
-            ArticleView(article: article).navigationBarHidden(true)
+            ArticleView(article: article)
+                .navigationBarHidden(true)
+                .environment(\.characterDirection, item.characterDirection)
         } else {
             // TODO: Implement a view for when an article for the item doesn't exist.
             EmptyView()
@@ -36,10 +38,6 @@ struct ItemDestinationView: View {
 
     init(item: Item) {
         self.item = item
-        
-        let settings = ReaderSettings()
-        settings.languageDirection = item.languageDirection
-        _settings = StateObject(wrappedValue: settings)
     }
 
     var body: some View {

PocketKit/Sources/PocketKit/Item/ItemPresenter.swift

@@ -19,10 +19,6 @@ class ItemPresenter: ItemRow {
     public var title: String {
         item.title ?? item.thumbnailURL?.absoluteString ?? "Missing Title"
     }
-    
-    public var languageDirection: LanguageDirection {
-        item.languageDirection
-    }
 
     public var domain: String {
         item.domainMetadata?.name ?? item.domain ?? ""

PocketKit/Sources/PocketKit/Reader/ReaderSettings.swift

@@ -12,8 +12,6 @@ class ReaderSettings: ObservableObject {
 
     @AppStorage("readerFontFamily")
     var fontFamily: FontDescriptor.Family = .graphik
-    
-    var languageDirection: LanguageDirection = .leftToRight
 }
 
 extension FontDescriptor.Family: RawRepresentable {

PocketKit/Sources/Textile/Views/ItemRow.swift

@@ -16,23 +16,14 @@ private extension Style {
     static let detail: Style = .header.sansSerif.p4.with(color: .ui.grey4)
 }
 
-public enum LanguageDirection {
-    case leftToRight
-    case rightToLeft
-}
-
 public protocol ItemRow: ObservableObject {
     var title: String { get }
-    var languageDirection: LanguageDirection { get }
     var domain: String { get }
     var timeToRead: String? { get }
     var thumbnailURL: URL? { get }
 }
 
 public struct ItemRowView<Model: ItemRow>: View {
-    @Environment(\.layoutDirection)
-    private var layoutDirection
-    
     private var model: Model
 
     public init(model: Model) {
@@ -89,7 +80,6 @@ struct ItemRow_Previews: PreviewProvider {
         nascetur ridiculus mus. Donec sed odio dui.
         """
 
-        var languageDirection: LanguageDirection = .leftToRight
         var domain: String = "Etiam Sem Magna Parturient Bibendum"
         var timeToRead: String? = "5 min"
         var thumbnailURL: URL? = URL(string: "http://placekitten.com/200/300")!