Extension cleanup (#814)

mlemgroup · Dec 18, 2023 · e697b13 · e697b13
1 parent c9fc505
commit e697b13
Show file tree

Hide file tree

Showing 59 changed files with 454 additions and 393 deletions.
diff --git a/Mlem.xcodeproj/project.pbxproj b/Mlem.xcodeproj/project.pbxproj
diff --git a/...nsions/Array - Move Elements Around.swift → ...Extensions/Array/Array+MoveElements.swift b/...nsions/Array - Move Elements Around.swift → ...Extensions/Array/Array+MoveElements.swift
@@ -1,5 +1,5 @@
 //
-//  Array - Move Elements Around.swift
+//  Array+MoveElements.swift
 //  Mlem
 //
 //  Created by David Bureš on 07.05.2023.

diff --git a/Mlem/Extensions/Array - Prepend.swift → Mlem/Extensions/Array/Array+Prepend.swift b/Mlem/Extensions/Array - Prepend.swift → Mlem/Extensions/Array/Array+Prepend.swift
@@ -1,5 +1,5 @@
 //
-//  Array - Prepend.swift
+//  Array+Prepend.swift
 //  Mlem
 //
 //  Created by David Bureš on 07.05.2023.

diff --git a/Mlem/Extensions/Array+SafeIndexing.swift → ...Extensions/Array/Array+SafeIndexing.swift b/Mlem/Extensions/Array+SafeIndexing.swift → ...Extensions/Array/Array+SafeIndexing.swift
@@ -7,8 +7,8 @@
 
 import Foundation
 
-extension Array {
-    public subscript(safeIndex index: Int) -> Element? {
+public extension Array {
+    subscript(safeIndex index: Int) -> Element? {
         guard index >= 0, index < endIndex else {
             return nil
         }

diff --git a/...xtensions/Bundle - Current App Icon.swift → ...tensions/Bundle/Bundle+IconFileName.swift b/...xtensions/Bundle - Current App Icon.swift → ...tensions/Bundle/Bundle+IconFileName.swift
@@ -1,5 +1,5 @@
 //
-//  Bundle - Current App Icon.swift
+//  Bundle+IconFileName.swift
 //  Mlem
 //
 //  Created by tht7 on 28/06/2023.

diff --git a/Mlem/Extensions/Bundle.swift → ...nsions/Bundle/Bundle+VersionNumbers.swift b/Mlem/Extensions/Bundle.swift → ...nsions/Bundle/Bundle+VersionNumbers.swift
@@ -1,5 +1,5 @@
 //
-//  Bundle.swift
+//  Bundle+VersionNumbers.swift
 //  Mlem
 //
 //  Created by Jake Shirley on 6/23/23.

diff --git a/Mlem/Extensions/Color.swift → Mlem/Extensions/Color/Color+Colors.swift b/Mlem/Extensions/Color.swift → Mlem/Extensions/Color/Color+Colors.swift
@@ -1,5 +1,5 @@
 //
-//  Color.swift
+//  Color+Colors.swift
 //  Mlem
 //
 //  Created by David Bureš on 26.03.2022.
@@ -19,14 +19,3 @@ extension Color {
     static let downvoteColor = Color.red
     static let saveColor = Color.green
 }
-
-public extension Color {
-    static func random(randomOpacity: Bool = false) -> Color {
-        Color(
-            red: .random(in: 0 ... 1),
-            green: .random(in: 0 ... 1),
-            blue: .random(in: 0 ... 1),
-            opacity: randomOpacity ? .random(in: 0 ... 1) : 1
-        )
-    }
-}
diff --git a/Mlem/Extensions/Date.swift → Mlem/Extensions/Date/Date+RelativeTime.swift b/Mlem/Extensions/Date.swift → Mlem/Extensions/Date/Date+RelativeTime.swift
@@ -1,5 +1,5 @@
 //
-//  Date.swift
+//  Date+RelativeTime.swift
 //  Mlem
 //
 //  Created by Jake Shirley on 6/22/23.

diff --git a/Mlem/Extensions/Dictionary - Append.swift b/Mlem/Extensions/Dictionary - Append.swift
diff --git a/Mlem/Extensions/Double.swift → .../Extensions/Double/Double+MaxZIndex.swift b/Mlem/Extensions/Double.swift → .../Extensions/Double/Double+MaxZIndex.swift
@@ -1,5 +1,5 @@
 //
-//  Double.swift
+//  Double+MaxZIndex.swift
 //  Mlem
 //
 //  Created by Bosco Ho on 2023-08-07.

diff --git a/Mlem/Extensions/Environment+AppFlow.swift → ...entValues/EnvironmentValues+AppFlow.swift b/Mlem/Extensions/Environment+AppFlow.swift → ...entValues/EnvironmentValues+AppFlow.swift
@@ -1,5 +1,5 @@
 //
-//  Environment+AppFlow.swift
+//  EnvironmentValues+AppFlow.swift
 //  Mlem
 //
 //  Created by mormaer on 08/09/2023.

diff --git a/...ions/Environment - EasterFlagSetter.swift → .../EnvironmentValues+EasterFlagSetter.swift b/...ions/Environment - EasterFlagSetter.swift → .../EnvironmentValues+EasterFlagSetter.swift
@@ -1,5 +1,5 @@
 //
-//  View - EasterFlags.swift
+//  EnvironmentValues+EasterFlagSetter.swift
 //  Mlem
 //
 //  Created by tht7 on 14/07/2023.

diff --git a/Mlem/Extensions/EnvironmentValues/EnvironmentValues+NavigationPath.swift b/Mlem/Extensions/EnvironmentValues/EnvironmentValues+NavigationPath.swift
@@ -0,0 +1,20 @@
+//
+//  EnvironmentValues+NavigationPath.swift
+//  Mlem
+//
+//  Created by Eric Andrews on 2023-12-16.
+//
+
+import Foundation
+import SwiftUI
+
+private struct NavigationPathGetter: EnvironmentKey {
+    static let defaultValue: Binding<NavigationPath> = .constant(NavigationPath())
+}
+
+extension EnvironmentValues {
+    var navigationPath: Binding<NavigationPath> {
+        get { self[NavigationPathGetter.self] }
+        set { self[NavigationPathGetter.self] = newValue }
+    }
+}
diff --git a/Mlem/Extensions/EnvironmentValues/EnvironmentValues+NavigationPathWithRoutes.swift b/Mlem/Extensions/EnvironmentValues/EnvironmentValues+NavigationPathWithRoutes.swift
@@ -0,0 +1,20 @@
+//
+//  EnvironmentValues+NavigationPathWithRoutes.swift
+//  Mlem
+//
+//  Created by tht7 on 22/06/2023.
+//
+
+import Foundation
+import SwiftUI
+
+private struct NavigationPathWithRoutes: EnvironmentKey {
+    static let defaultValue: Binding<[AppRoute]> = .constant([])
+}
+
+extension EnvironmentValues {
+    var navigationPathWithRoutes: Binding<[AppRoute]> {
+        get { self[NavigationPathWithRoutes.self] }
+        set { self[NavigationPathWithRoutes.self] = newValue }
+    }
+}
diff --git a/...s/Environment+ScrollViewReaderProxy.swift → ...ronmentValues+ScrollViewReaderProxy.swift b/...s/Environment+ScrollViewReaderProxy.swift → ...ronmentValues+ScrollViewReaderProxy.swift
@@ -1,5 +1,5 @@
 //
-//  Environment+ScrollViewReaderProxy.swift
+//  EnvironmentValues+ScrollViewReaderProxy.swift
 //  Mlem
 //
 //  Created by Bosco Ho on 2023-09-12.

diff --git a/...ancyTabBarReselectionEnvironmentKey.swift → ...nmentValues+TabReselectionHashValue.swift b/...ancyTabBarReselectionEnvironmentKey.swift → ...nmentValues+TabReselectionHashValue.swift
@@ -1,5 +1,5 @@
 //
-//  FancyTabBarReselectionEnvironmentKey.swift
+//  EnvironmentValues+TabReselectionHashValue.swift
 //  Mlem
 //
 //  Created by Eric Andrews on 2023-11-02.

diff --git a/.../FancyTabBarSelectionEnvironmentKey.swift → ...ronmentValues+TabSelectionHashValue.swift b/.../FancyTabBarSelectionEnvironmentKey.swift → ...ronmentValues+TabSelectionHashValue.swift
@@ -1,5 +1,5 @@
 //
-//  FancyTabBarSelectionEnvironmentKey.swift
+//  EnvironmentValues+TabSelectionHashValue.swift
 //  Mlem
 //
 //  Created by Eric Andrews on 2023-07-17.

diff --git a/Mlem/Extensions/Error+Equatable.swift → Mlem/Extensions/Error/Error+Equatable.swift b/Mlem/Extensions/Error+Equatable.swift → Mlem/Extensions/Error/Error+Equatable.swift
diff --git a/Mlem/Extensions/Image.swift b/Mlem/Extensions/Image.swift
diff --git a/Mlem/Extensions/Int.swift b/Mlem/Extensions/Int.swift
diff --git a/Mlem/Extensions/JSONDecoder+Default.swift → ...ons/JSONDecoder/JSONDecoder+Default.swift b/Mlem/Extensions/JSONDecoder+Default.swift → ...ons/JSONDecoder/JSONDecoder+Default.swift
diff --git a/Mlem/Extensions/Navigation getter.swift b/Mlem/Extensions/Navigation getter.swift
diff --git a/...tensions/OperationQueue - Easy init.swift → ...ueue/OperationQueue+ConvenienceInit.swift b/...tensions/OperationQueue - Easy init.swift → ...ueue/OperationQueue+ConvenienceInit.swift
@@ -1,5 +1,5 @@
 //
-//  OperationQueue - Easy init.swift
+//  OperationQueue+ConvenienceInit.swift
 //  Mlem
 //
 //  Created by tht7 on 08/07/2023.

diff --git a/Mlem/Extensions/String.swift b/Mlem/Extensions/String.swift
diff --git a/Mlem/Extensions/String/String+Alphabet.swift b/Mlem/Extensions/String/String+Alphabet.swift
@@ -0,0 +1,14 @@
+//
+//  String+Alphabet.swift
+//  Mlem
+//
+//  Created by Eric Andrews on 2023-12-16.
+//
+
+import Foundation
+
+extension [String] {
+    static var alphabet: Self {
+        ["A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z"]
+    }
+}
diff --git a/...ring - Contains Elements From Array.swift → Mlem/Extensions/String/String+Contains.swift b/...ring - Contains Elements From Array.swift → Mlem/Extensions/String/String+Contains.swift
@@ -1,5 +1,5 @@
 //
-//  String - Contains Elements From Array.swift
+//  String+Contains.swift
 //  Mlem
 //
 //  Created by David Bureš on 04.05.2023.

diff --git a/Mlem/Extensions/String/String+IsNotEmpty.swift b/Mlem/Extensions/String/String+IsNotEmpty.swift
@@ -0,0 +1,14 @@
+//
+//  String+IsNotEmpty.swift
+//  Mlem
+//
+//  Created by Eric Andrews on 2023-12-16.
+//
+
+import Foundation
+
+extension String {
+    var isNotEmpty: Bool {
+        !isEmpty
+    }
+}
diff --git a/Mlem/Extensions/String/String+Trimmed.swift b/Mlem/Extensions/String/String+Trimmed.swift
@@ -0,0 +1,14 @@
+//
+//  String+Trimmed.swift
+//  Mlem
+//
+//  Created by Eric Andrews on 2023-12-16.
+//
+
+import Foundation
+
+extension String {
+    var trimmed: String {
+        trimmingCharacters(in: .whitespacesAndNewlines)
+    }
+}
diff --git a/Mlem/Extensions/String/String+WithEscapedCharacters.swift b/Mlem/Extensions/String/String+WithEscapedCharacters.swift
@@ -0,0 +1,19 @@
+//
+//  String+WithEscapedCharacters.swift
+//  Mlem
+//
+//  Created by Eric Andrews on 2023-12-16.
+//
+
+import Foundation
+
+extension String {
+    func withEscapedCharacters() -> String? {
+        do {
+            let jsonRepresentation = try JSONEncoder().encode(self)
+            return String(data: jsonRepresentation, encoding: .utf8)
+        } catch {
+            return nil
+        }
+    }
+}
diff --git a/Mlem/Extensions/Task+Notifiable.swift → Mlem/Extensions/Task/Task+Notifiable.swift b/Mlem/Extensions/Task+Notifiable.swift → Mlem/Extensions/Task/Task+Notifiable.swift
diff --git a/Mlem/Extensions/TimeInterval+Period.swift → ...ns/TimeInterval/TimeInterval+Period.swift b/Mlem/Extensions/TimeInterval+Period.swift → ...ns/TimeInterval/TimeInterval+Period.swift
diff --git a/Mlem/Extensions/UIApplication.swift → ...cation/UIApplication+FirstKeyWindow.swift b/Mlem/Extensions/UIApplication.swift → ...cation/UIApplication+FirstKeyWindow.swift
@@ -1,5 +1,5 @@
 //
-//  UIApplication - First Key Window.swift
+//  UIApplication+FirstKeyWindow.swift
 //  Mlem
 //
 //  Created by David Bureš on 18.05.2023.
@@ -16,8 +16,4 @@ extension UIApplication {
             .first?
             .keyWindow
     }
-
-    var topMostViewController: UIViewController? {
-        UIApplication.shared.firstKeyWindow?.rootViewController?.topMostViewController()
-    }
 }
diff --git a/Mlem/Extensions/UIApplication/UIApplication+TopMostViewController.swift b/Mlem/Extensions/UIApplication/UIApplication+TopMostViewController.swift
@@ -0,0 +1,15 @@
+//
+//  UIApplication+TopMostViewController.swift
+//  Mlem
+//
+//  Created by Eric Andrews on 2023-12-16.
+//
+
+import Foundation
+import UIKit
+
+extension UIApplication {
+    var topMostViewController: UIViewController? {
+        UIApplication.shared.firstKeyWindow?.rootViewController?.topMostViewController()
+    }
+}
diff --git a/...ceStyle - SettingsOption conformant.swift → ...IUserInterfaceStyle+SettingsOptions.swift b/...ceStyle - SettingsOption conformant.swift → ...IUserInterfaceStyle+SettingsOptions.swift
@@ -1,5 +1,5 @@
 //
-//  UIUserInterfaceStyle - SettingsOption conformant.swift
+//  UIUserInterfaceStyle+SettingsOptions.swift
 //  Mlem
 //
 //  Created by Eric Andrews on 2023-06-19.