Add ViewController (#540)

Mastodon.xcodeproj/project.pbxproj

@@ -88,6 +88,7 @@
 		62FD27D52893708A00B205C5 /* BookmarkViewModel+Diffable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 62FD27D42893708A00B205C5 /* BookmarkViewModel+Diffable.swift */; };
 		87FFDA5D898A5C42ADCB35E7 /* Pods_Mastodon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A4ABE34829701A4496C5BB64 /* Pods_Mastodon.framework */; };
 		C24C97032922F30500BAE8CB /* RefreshControl.swift in Sources */ = {isa = PBXBuildFile; fileRef = C24C97022922F30500BAE8CB /* RefreshControl.swift */; };
+		D8A6AB6C291C5136003AB663 /* MastodonLoginViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8A6AB6B291C5136003AB663 /* MastodonLoginViewController.swift */; };
 		DB0009A626AEE5DC009B9D2D /* Intents.intentdefinition in Sources */ = {isa = PBXBuildFile; fileRef = DB0009A926AEE5DC009B9D2D /* Intents.intentdefinition */; settings = {ATTRIBUTES = (codegen, ); }; };
 		DB0009A726AEE5DC009B9D2D /* Intents.intentdefinition in Sources */ = {isa = PBXBuildFile; fileRef = DB0009A926AEE5DC009B9D2D /* Intents.intentdefinition */; };
 		DB0140CF25C42AEE00F9F3CF /* OSLog.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB0140CE25C42AEE00F9F3CF /* OSLog.swift */; };
@@ -608,6 +609,7 @@
 		C3789232A52F43529CA67E95 /* Pods-MastodonIntent.asdk - debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MastodonIntent.asdk - debug.xcconfig"; path = "Target Support Files/Pods-MastodonIntent/Pods-MastodonIntent.asdk - debug.xcconfig"; sourceTree = "<group>"; };
 		CD92E0F10BDE4FE7C4B999F2 /* Pods_MastodonTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_MastodonTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		D7D7CF93E262178800077512 /* Pods-Mastodon-AppShared.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Mastodon-AppShared.debug.xcconfig"; path = "Target Support Files/Pods-Mastodon-AppShared/Pods-Mastodon-AppShared.debug.xcconfig"; sourceTree = "<group>"; };
+		D8A6AB6B291C5136003AB663 /* MastodonLoginViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MastodonLoginViewController.swift; sourceTree = "<group>"; };
 		DB0009A826AEE5DC009B9D2D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.intentdefinition; name = Base; path = Base.lproj/Intents.intentdefinition; sourceTree = "<group>"; };
 		DB0009AD26AEE5E4009B9D2D /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/Intents.strings; sourceTree = "<group>"; };
 		DB0140CE25C42AEE00F9F3CF /* OSLog.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OSLog.swift; sourceTree = "<group>"; };
@@ -1494,9 +1496,18 @@
 			path = Bookmark;
 			sourceTree = "<group>";
 		};
+		D8A6AB68291C50F3003AB663 /* Login */ = {
+			isa = PBXGroup;
+			children = (
+				D8A6AB6B291C5136003AB663 /* MastodonLoginViewController.swift */,
+			);
+			path = Login;
+			sourceTree = "<group>";
+		};
 		DB01409B25C40BB600F9F3CF /* Onboarding */ = {
 			isa = PBXGroup;
 			children = (
+				D8A6AB68291C50F3003AB663 /* Login */,
 				DB68A03825E900CC00CFDF14 /* Share */,
 				0FAA0FDD25E0B5700017CCDE /* Welcome */,
 				0FAA102525E1125D0017CCDE /* PickServer */,
@@ -3422,6 +3433,7 @@
 				DB697DDB278F4DE3004EF2F7 /* DataSourceProvider+StatusTableViewCellDelegate.swift in Sources */,
 				DB87D4512609CF1E00D12C0D /* ComposeStatusPollOptionAppendEntryCollectionViewCell.swift in Sources */,
 				DBB45B5627B39FC9002DC5A7 /* MediaPreviewVideoViewController.swift in Sources */,
+				D8A6AB6C291C5136003AB663 /* MastodonLoginViewController.swift in Sources */,
 				DB0FCB8027968F70006C02E2 /* MastodonStatusThreadViewModel.swift in Sources */,
 				DB67D08627312E67006A36CF /* WizardViewController.swift in Sources */,
 				DB6746EB278ED8B0008A6B94 /* PollOptionView+Configuration.swift in Sources */,

Mastodon.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -1,257 +0,0 @@
-{
-  "pins" : [
-    {
-      "identity" : "alamofire",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/Alamofire/Alamofire.git",
-      "state" : {
-        "revision" : "354dda32d89fc8cd4f5c46487f64957d355f53d8",
-        "version" : "5.6.1"
-      }
-    },
-    {
-      "identity" : "alamofireimage",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/Alamofire/AlamofireImage.git",
-      "state" : {
-        "revision" : "98cbb00ce0ec5fc8e52a5b50a6bfc08d3e5aee10",
-        "version" : "4.2.0"
-      }
-    },
-    {
-      "identity" : "commonoslog",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/MainasuK/CommonOSLog",
-      "state" : {
-        "revision" : "c121624a30698e9886efe38aebb36ff51c01b6c2",
-        "version" : "0.1.1"
-      }
-    },
-    {
-      "identity" : "faviconfinder",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/will-lumley/FaviconFinder.git",
-      "state" : {
-        "revision" : "1f74844f77f79b95c0bb0130b3a87d4f340e6d3a",
-        "version" : "3.3.0"
-      }
-    },
-    {
-      "identity" : "flanimatedimage",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/Flipboard/FLAnimatedImage.git",
-      "state" : {
-        "revision" : "e7f9fd4681ae41bf6f3056db08af4f401d61da52",
-        "version" : "1.0.16"
-      }
-    },
-    {
-      "identity" : "fpsindicator",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/MainasuK/FPSIndicator.git",
-      "state" : {
-        "revision" : "e4a5067ccd5293b024c767f09e51056afd4a4796",
-        "version" : "1.1.0"
-      }
-    },
-    {
-      "identity" : "fuzi",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/cezheng/Fuzi.git",
-      "state" : {
-        "revision" : "f08c8323da21e985f3772610753bcfc652c2103f",
-        "version" : "3.1.3"
-      }
-    },
-    {
-      "identity" : "keychainaccess",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/kishikawakatsumi/KeychainAccess.git",
-      "state" : {
-        "revision" : "84e546727d66f1adc5439debad16270d0fdd04e7",
-        "version" : "4.2.2"
-      }
-    },
-    {
-      "identity" : "kingfisher",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/onevcat/Kingfisher.git",
-      "state" : {
-        "revision" : "44e891bdb61426a95e31492a67c7c0dfad1f87c5",
-        "version" : "7.4.1"
-      }
-    },
-    {
-      "identity" : "metatextkit",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/TwidereProject/MetaTextKit.git",
-      "state" : {
-        "revision" : "dcd5255d6930c2fab408dc8562c577547e477624",
-        "version" : "2.2.5"
-      }
-    },
-    {
-      "identity" : "nextlevelsessionexporter",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/NextLevel/NextLevelSessionExporter.git",
-      "state" : {
-        "revision" : "b6c0cce1aa37fe1547d694f958fac3c3524b74da",
-        "version" : "0.4.6"
-      }
-    },
-    {
-      "identity" : "nuke",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/kean/Nuke.git",
-      "state" : {
-        "revision" : "0ea7545b5c918285aacc044dc75048625c8257cc",
-        "version" : "10.8.0"
-      }
-    },
-    {
-      "identity" : "nuke-flanimatedimage-plugin",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/kean/Nuke-FLAnimatedImage-Plugin.git",
-      "state" : {
-        "revision" : "b59c346a7d536336db3b0f12c72c6e53ee709e16",
-        "version" : "8.0.0"
-      }
-    },
-    {
-      "identity" : "pageboy",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/uias/Pageboy",
-      "state" : {
-        "revision" : "34ecb6e7c4e0e07494960ab2f7cc9a02293915a6",
-        "version" : "3.6.2"
-      }
-    },
-    {
-      "identity" : "panmodal",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/slackhq/PanModal.git",
-      "state" : {
-        "revision" : "b012aecb6b67a8e46369227f893c12544846613f",
-        "version" : "1.2.7"
-      }
-    },
-    {
-      "identity" : "sdwebimage",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/SDWebImage/SDWebImage.git",
-      "state" : {
-        "revision" : "2e63d0061da449ad0ed130768d05dceb1496de44",
-        "version" : "5.12.5"
-      }
-    },
-    {
-      "identity" : "stripes",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/eneko/Stripes.git",
-      "state" : {
-        "revision" : "d533fd44b8043a3abbf523e733599173d6f98c11",
-        "version" : "0.2.0"
-      }
-    },
-    {
-      "identity" : "swift-collections",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/apple/swift-collections.git",
-      "state" : {
-        "revision" : "f504716c27d2e5d4144fa4794b12129301d17729",
-        "version" : "1.0.3"
-      }
-    },
-    {
-      "identity" : "swift-nio",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/apple/swift-nio.git",
-      "state" : {
-        "revision" : "546610d52b19be3e19935e0880bb06b9c03f5cef",
-        "version" : "1.14.4"
-      }
-    },
-    {
-      "identity" : "swift-nio-zlib-support",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/apple/swift-nio-zlib-support.git",
-      "state" : {
-        "revision" : "37760e9a52030bb9011972c5213c3350fa9d41fd",
-        "version" : "1.0.0"
-      }
-    },
-    {
-      "identity" : "swiftsoup",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/scinfu/SwiftSoup.git",
-      "state" : {
-        "revision" : "41e7c263fb8c277e980ebcb9b0b5f6031d3d4886",
-        "version" : "2.4.2"
-      }
-    },
-    {
-      "identity" : "swiftui-introspect",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/siteline/SwiftUI-Introspect.git",
-      "state" : {
-        "revision" : "f2616860a41f9d9932da412a8978fec79c06fe24",
-        "version" : "0.1.4"
-      }
-    },
-    {
-      "identity" : "tabbarpager",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/TwidereProject/TabBarPager.git",
-      "state" : {
-        "revision" : "488aa66d157a648901b61721212c0dec23d27ee5",
-        "version" : "0.1.0"
-      }
-    },
-    {
-      "identity" : "tabman",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/uias/Tabman",
-      "state" : {
-        "revision" : "4a4f7c755b875ffd4f9ef10d67a67883669d2465",
-        "version" : "2.13.0"
-      }
-    },
-    {
-      "identity" : "thirdpartymailer",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/vtourraine/ThirdPartyMailer.git",
-      "state" : {
-        "revision" : "44c1cfaa6969963f22691aa67f88a69e3b6d651f",
-        "version" : "2.1.0"
-      }
-    },
-    {
-      "identity" : "tocropviewcontroller",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/TimOliver/TOCropViewController.git",
-      "state" : {
-        "revision" : "d0470491f56e734731bbf77991944c0dfdee3e0e",
-        "version" : "2.6.1"
-      }
-    },
-    {
-      "identity" : "uihostingconfigurationbackport",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/woxtu/UIHostingConfigurationBackport.git",
-      "state" : {
-        "revision" : "6091f2d38faa4b24fc2ca0389c651e2f666624a3",
-        "version" : "0.1.0"
-      }
-    },
-    {
-      "identity" : "uitextview-placeholder",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/MainasuK/UITextView-Placeholder.git",
-      "state" : {
-        "revision" : "20f513ded04a040cdf5467f0891849b1763ede3b",
-        "version" : "1.4.1"
-      }
-    }
-  ],
-  "version" : 2
-}

Mastodon/Coordinator/SceneCoordinator.swift

@@ -149,7 +149,7 @@ extension SceneCoordinator {
         case mastodonConfirmEmail(viewModel: MastodonConfirmEmailViewModel)
         case mastodonResendEmail(viewModel: MastodonResendEmailViewModel)
         case mastodonWebView(viewModel: WebViewModel)
-        //TODO: @zeitschlag new case for welcome back select your server welcome-screen + Screen and ViewModel etc.
+        case mastodonLogin
 
         // search
         case searchDetail(viewModel: SearchDetailViewModel)
@@ -200,6 +200,7 @@ extension SceneCoordinator {
             case .welcome,
                  .mastodonPickServer,
                  .mastodonRegister,
+                 .mastodonLogin,
                  .mastodonServerRules,
                  .mastodonConfirmEmail,
                  .mastodonResendEmail:
@@ -404,6 +405,8 @@ private extension SceneCoordinator {
             let _viewController = MastodonConfirmEmailViewController()
             _viewController.viewModel = viewModel
             viewController = _viewController
+        case .mastodonLogin:
+            viewController = MastodonLoginViewController()
         case .mastodonResendEmail(let viewModel):
             let _viewController = MastodonResendEmailViewController()
             _viewController.viewModel = viewModel

Mastodon/Scene/Onboarding/Login/MastodonLoginViewController.swift

@@ -0,0 +1,25 @@
+//
+//  MastodonLoginViewController.swift
+//  Mastodon
+//
+//  Created by Nathan Mattes on 09.11.22.
+//
+
+import UIKit
+
+class MastodonLoginViewController: UIViewController {
+
+    // Title, Subtitle
+    // SearchBox, queries api.joinmastodon.org/servers with domain
+    // List with (filtered) domains
+    // back-button, next-button (enabled if user selectes a server or url is valid
+    // next-button does MastodonPickServerViewController.doSignIn()
+
+    init() {
+        super.init(nibName: nil, bundle: nil)
+        view.backgroundColor = .systemGreen
+    }
+
+    required init?(coder: NSCoder) { fatalError("init(coder:) has not been implemented") }
+}
+

Mastodon/Scene/Onboarding/PickServer/MastodonPickServerViewController.swift

@@ -276,6 +276,7 @@ extension MastodonPickServerViewController {
         }
     }
 
+    //TODO: @zeitschlag Move to MastodonLoginViewController
     private func doSignIn() {
         guard let server = viewModel.selectedServer.value else { return }
         authenticationViewModel.isAuthenticating.send(true)