Mastodon
/
metatext-app-ios-iphone-ipad
mirror of https://github.com/metabolist/metatext
1
0
Fork 0
Code Issues Releases Wiki Activity

Sort imports

This commit is contained in:
Justin Mazzocchi 2020-09-04 19:31:43 -07:00
parent 51e6a41bd3
commit 70720b3c26
No known key found for this signature in database
GPG Key ID: E223E6937AAFB01C
45 changed files with 50 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.swiftlint.yml
View File

@ -3,3 +3,5 @@ disabled_rules:
# Swift 5.3
- multiple_closures_with_trailing_closure
- no_space_in_method_call
opt_in_rules:
- sorted_imports

1
DB/Sources/DB/Content/AccountResult.swift
View File

@ -2,7 +2,6 @@
import Foundation
import GRDB
import Mastodon
struct AccountResult: Codable, Hashable, FetchableRecord {
let account: AccountRecord

2
DB/Sources/DB/Content/ContentDatabase.swift
View File

@ -1,7 +1,7 @@
// Copyright © 2020 Metabolist. All rights reserved.
import Foundation
import Combine
import Foundation
import GRDB
import Keychain
import Mastodon

1
DB/Sources/DB/Content/StatusResult.swift
View File

@ -2,7 +2,6 @@
import Foundation
import GRDB
import Mastodon
struct StatusResult: Codable, Hashable, FetchableRecord {
let account: AccountRecord

2
DB/Sources/DB/Identity/IdentityDatabase.swift
View File

@ -1,7 +1,7 @@
// Copyright © 2020 Metabolist. All rights reserved.
import Foundation
import Combine
import Foundation
import GRDB
import Keychain
import Mastodon

2
DB/Tests/DBTests/DBTests.swift
View File

@ -1,5 +1,5 @@
import XCTest
@testable import DB
import XCTest
final class DBTests: XCTestCase {
func testExample() {

10
Extensions/KingfisherOptionsInfo+Extensions.swift
View File

@ -1,12 +1,12 @@
// Copyright © 2020 Metabolist. All rights reserved.
import SwiftUI
import KingfisherSwiftUI
import struct Kingfisher.KingfisherOptionsInfo
import protocol Kingfisher.ImageProcessor
import struct Kingfisher.DownsamplingImageProcessor
import struct Kingfisher.RoundCornerImageProcessor
import struct Kingfisher.FormatIndicatedCacheSerializer
import protocol Kingfisher.ImageProcessor
import struct Kingfisher.KingfisherOptionsInfo
import struct Kingfisher.RoundCornerImageProcessor
import KingfisherSwiftUI
import SwiftUI
extension KingfisherOptionsInfo {
static func downsampled(size: CGSize, scaleFactor: CGFloat, rounded: Bool = true) -> Self {

2
Extensions/NSMutableAttributedString+Extensions.swift
View File

@ -1,8 +1,8 @@
// Copyright © 2020 Metabolist. All rights reserved.
import UIKit
import Kingfisher
import Mastodon
import UIKit
extension NSMutableAttributedString {
func insert(emoji: [Emoji], view: UIView) {

4
HTTP/Sources/HTTP/Client.swift
View File

@ -1,8 +1,8 @@
// Copyright © 2020 Metabolist. All rights reserved.
import Foundation
import Combine
import Alamofire
import Combine
import Foundation
public typealias Session = Alamofire.Session

2
HTTP/Sources/HTTP/Target.swift
View File

@ -1,7 +1,7 @@
// Copyright © 2020 Metabolist. All rights reserved.
import Foundation
import Alamofire
import Foundation
public typealias HTTPMethod = Alamofire.HTTPMethod
public typealias HTTPHeaders = Alamofire.HTTPHeaders

2
HTTP/Tests/HTTPTests/HTTPTests.swift
View File

@ -1,5 +1,5 @@
import XCTest
@testable import HTTP
import XCTest
final class HTTPTests: XCTestCase {
func testExample() {

2
Keychain/Tests/KeychainTests/KeychainTests.swift
View File

@ -1,5 +1,5 @@
import XCTest
@testable import Keychain
import XCTest
final class KeychainTests: XCTestCase {
func testExample() {

2
Mastodon/Sources/Mastodon/Constants.swift
View File

@ -1,3 +1,5 @@
// Copyright © 2020 Metabolist. All rights reserved.
import Foundation
public enum Constants {

2
Mastodon/Tests/MastodonTests/MastodonTests.swift
View File

@ -1,5 +1,5 @@
import XCTest
@testable import Mastodon
import XCTest
final class MastodonTests: XCTestCase {
func testExample() {

2
MastodonAPI/Sources/MastodonAPI/MastodonAPIClient.swift
View File

@ -1,7 +1,7 @@
// Copyright © 2020 Metabolist. All rights reserved.
import Foundation
import Combine
import Foundation
import HTTP
import Mastodon

2
MastodonAPI/Tests/MastodonAPITests/MastodonAPITests.swift
View File

@ -1,5 +1,5 @@
import XCTest
@testable import MastodonAPI
import XCTest
final class MastodonAPITests: XCTestCase {
func testExample() {

2
Notification Service Extension/NotificationService.swift
View File

@ -1,10 +1,10 @@
// Copyright © 2020 Metabolist. All rights reserved.
import UserNotifications
import CryptoKit
import Keychain
import Mastodon
import Secrets
import UserNotifications
class NotificationService: UNNotificationServiceExtension {

2
Secrets/Tests/SecretsTests/SecretsTests.swift
View File

@ -1,5 +1,5 @@
import XCTest
@testable import Secrets
import XCTest
final class SecretsTests: XCTestCase {
func testExample() {

2
ServiceLayer/Sources/ServiceLayer/Services/AllIdentitiesService.swift
View File

@ -1,8 +1,8 @@
// Copyright © 2020 Metabolist. All rights reserved.
import Combine
import DB
import Foundation
import Combine
import Mastodon
import MastodonAPI
import Secrets

2
ServiceLayer/Sources/ServiceLayer/Services/AuthenticationService.swift
View File

@ -1,7 +1,7 @@
// Copyright © 2020 Metabolist. All rights reserved.
import Foundation
import Combine
import Foundation
import Mastodon
import MastodonAPI

2
ServiceLayer/Sources/ServiceLayer/Services/IdentityService.swift
View File

@ -1,8 +1,8 @@
// Copyright © 2020 Metabolist. All rights reserved.
import Combine
import DB
import Foundation
import Combine
import Mastodon
import MastodonAPI
import Secrets

2
ServiceLayer/Sources/ServiceLayer/Services/StatusService.swift
View File

@ -1,8 +1,8 @@
// Copyright © 2020 Metabolist. All rights reserved.
import Foundation
import Combine
import DB
import Foundation
import Mastodon
import MastodonAPI

2
ServiceLayer/Sources/ServiceLayer/Services/UserNotificationService.swift
View File

@ -1,7 +1,7 @@
// Copyright © 2020 Metabolist. All rights reserved.
import Foundation
import Combine
import Foundation
import UserNotifications
public struct UserNotificationService {

2
ServiceLayer/Sources/ServiceLayer/Utilities/WebAuthSession.swift
View File

@ -1,8 +1,8 @@
// Copyright © 2020 Metabolist. All rights reserved.
import Foundation
import AuthenticationServices
import Combine
import Foundation
public protocol WebAuthSession: AnyObject {
init(url URL: URL,

2
ServiceLayer/Tests/ServiceLayerTests/AuthenticationServiceTests.swift
View File

@ -1,10 +1,10 @@
// Copyright © 2020 Metabolist. All rights reserved.
import XCTest
import Combine
import CombineExpectations
@testable import ServiceLayer
@testable import ServiceLayerMocks
import XCTest
class AuthenticationServiceTests: XCTestCase {
func testAuthentication() throws {

2
System/AppDelegate.swift
View File

@ -1,7 +1,7 @@
// Copyright © 2020 Metabolist. All rights reserved.
import UIKit
import Combine
import UIKit
class AppDelegate: NSObject {
@Published private var application: UIApplication?

2
View Controllers/StatusListViewController.swift
View File

@ -1,7 +1,7 @@
// Copyright © 2020 Metabolist. All rights reserved.
import SwiftUI
import Combine
import SwiftUI
import ViewModels
class StatusListViewController: UITableViewController {

2
ViewModels/Sources/PreviewViewModels/ViewModelMocks.swift
View File

@ -1,7 +1,7 @@
// Copyright © 2020 Metabolist. All rights reserved.
import Foundation
import Combine
import Foundation
import HTTP
import Mastodon
import MastodonAPI

2
ViewModels/Sources/ViewModels/AddIdentityViewModel.swift
View File

@ -1,7 +1,7 @@
// Copyright © 2020 Metabolist. All rights reserved.
import Foundation
import Combine
import Foundation
import ServiceLayer
public class AddIdentityViewModel: ObservableObject {

2
ViewModels/Sources/ViewModels/EditFilterViewModel.swift
View File

@ -1,7 +1,7 @@
// Copyright © 2020 Metabolist. All rights reserved.
import Foundation
import Combine
import Foundation
import Mastodon
import ServiceLayer

2
ViewModels/Sources/ViewModels/Extensions/Publisher+Extensions.swift
View File

@ -1,7 +1,7 @@
// Copyright © 2020 Metabolist. All rights reserved.
import Foundation
import Combine
import Foundation
extension Publisher {
func assignErrorsToAlertItem<Root: AnyObject>(

2
ViewModels/Sources/ViewModels/FiltersViewModel.swift
View File

@ -1,7 +1,7 @@
// Copyright © 2020 Metabolist. All rights reserved.
import Foundation
import Combine
import Foundation
import Mastodon
import ServiceLayer

2
ViewModels/Sources/ViewModels/ListsViewModel.swift
View File

@ -1,7 +1,7 @@
// Copyright © 2020 Metabolist. All rights reserved.
import Foundation
import Combine
import Foundation
import Mastodon
import ServiceLayer

2
ViewModels/Sources/ViewModels/NotificationTypesPreferencesViewModel.swift
View File

@ -1,7 +1,7 @@
// Copyright © 2020 Metabolist. All rights reserved.
import Foundation
import Combine
import Foundation
import Mastodon
import ServiceLayer

2
ViewModels/Sources/ViewModels/PostingReadingPreferencesViewModel.swift
View File

@ -1,7 +1,7 @@
// Copyright © 2020 Metabolist. All rights reserved.
import Foundation
import Combine
import Foundation
import ServiceLayer
public class PostingReadingPreferencesViewModel: ObservableObject {

2
ViewModels/Sources/ViewModels/RootViewModel.swift
View File

@ -1,7 +1,7 @@
// Copyright © 2020 Metabolist. All rights reserved.
import Foundation
import Combine
import Foundation
import ServiceLayer
public final class RootViewModel: ObservableObject {

2
ViewModels/Sources/ViewModels/StatusListViewModel.swift
View File

@ -1,7 +1,7 @@
// Copyright © 2020 Metabolist. All rights reserved.
import Foundation
import Combine
import Foundation
import Mastodon
import ServiceLayer

2
ViewModels/Sources/ViewModels/StatusViewModel.swift
View File

@ -1,7 +1,7 @@
// Copyright © 2020 Metabolist. All rights reserved.
import Foundation
import Combine
import Foundation
import Mastodon
import ServiceLayer

2
ViewModels/Sources/ViewModels/TabNavigationViewModel.swift
View File

@ -1,7 +1,7 @@
// Copyright © 2020 Metabolist. All rights reserved.
import Foundation
import Combine
import Foundation
import Mastodon
import ServiceLayer

2
ViewModels/Tests/ViewModelsTests/AddIdentityViewModelTests.swift
View File

@ -1,6 +1,5 @@
// Copyright © 2020 Metabolist. All rights reserved.
import XCTest
import Combine
import CombineExpectations
import HTTP
@ -9,6 +8,7 @@ import MockKeychain
import ServiceLayer
import ServiceLayerMocks
@testable import ViewModels
import XCTest
class AddIdentityViewModelTests: XCTestCase {
func testAddIdentity() throws {

2
ViewModels/Tests/ViewModelsTests/RootViewModelTests.swift
View File

@ -1,11 +1,11 @@
// Copyright © 2020 Metabolist. All rights reserved.
import XCTest
import Combine
import CombineExpectations
import ServiceLayer
import ServiceLayerMocks
@testable import ViewModels
import XCTest
class RootViewModelTests: XCTestCase {
var cancellables = Set<AnyCancellable>()

2
Views/Attachments/AttachmentView.swift
View File

@ -1,7 +1,7 @@
// Copyright © 2020 Metabolist. All rights reserved.
import UIKit
import Kingfisher
import UIKit
import ViewModels
class AttachmentView: UIView {

2
Views/IdentitiesView.swift
View File

@ -1,7 +1,7 @@
// Copyright © 2020 Metabolist. All rights reserved.
import SwiftUI
import KingfisherSwiftUI
import SwiftUI
import ViewModels
struct IdentitiesView: View {

2
Views/SecondaryNavigationView.swift
View File

@ -1,7 +1,7 @@
// Copyright © 2020 Metabolist. All rights reserved.
import SwiftUI
import KingfisherSwiftUI
import SwiftUI
import ViewModels
struct SecondaryNavigationView: View {

2
Views/TabNavigationView.swift
View File

@ -1,8 +1,8 @@
// Copyright © 2020 Metabolist. All rights reserved.
import SwiftUI
import KingfisherSwiftUI
import enum Mastodon.Timeline
import SwiftUI
import ViewModels
struct TabNavigationView: View {