178 changed files with 2175 additions and 2615 deletions
--- a/.github/workflows/flatpak.yml
+++ b/.github/workflows/flatpak.yml
@ -34,4 +34,4 @@ jobs:
        uses: actions/upload-artifact@v6
        with:
          name: flatpak-${{ matrix.arch }}
-          path: result/nexus.federated.nexus.flatpak
+          path: result/nexus.federated.Nexus.flatpak
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@ -19,7 +19,7 @@ jobs:
      - name: Set up Flutter
        uses: subosito/flutter-action@v2
        with:
-          flutter-version: 3.44.4
+          flutter-version: 3.41.9

      - name: Set up Go
        uses: actions/setup-go@v6
@ -52,6 +52,12 @@ jobs:
          cp /mingw64/bin/libwinpthread-1.dll build/windows/x64/runner/Release/
          cp /mingw64/bin/libstdc++-6.dll build/windows/x64/runner/Release/

+      - name: Upload exe zip
+        uses: actions/upload-artifact@v6
+        with:
+          name: windows-portable
+          path: build/windows/x64/runner/Release/
+
      - name: Install Inno Setup
        run: choco install innosetup -y

--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@ -10,7 +10,6 @@
        "msgtype",
        "muks",
        "prefs",
-        "unban",
-        "unredact"
+        "unban"
    ]
 }
--- a/README.md
+++ b/README.md
@ -19,10 +19,13 @@ A simple and user-friendly Matrix client made with Flutter and a Gomuks backend.
    - [x] Linux
    - [x] Windows
    - [x] Android
-    - [ ] MacOS ([#50](https://git.federated.nexus/Nexus/nexus/issues/50))
+    - [ ] MacOS
    - [ ] iOS
    - [ ] Web (may not be possible)
- [x] Login (via OAuth)
+- [x] Login
+    - [x] Username / password auth
+    - [ ] OAuth / OIDC
+    - [x] Improve initial sync experience
 - [x] Rooms / Spaces
    - [x] Displaying and choosing
    - [x] Reading, showing unread
@ -86,12 +89,14 @@ A simple and user-friendly Matrix client made with Flutter and a Gomuks backend.
                - [ ] Clickable
        - [x] Custom emojis/stickers
        - [x] History loading
+            - [x] Backwards
+            - [ ] Forwards
    - [x] Editing
    - [x] Deleting
 - [x] Reactions
- [x] Pins
-    - [x] Displaying
-    - [x] Pinning/Unpinning
+- [ ] Pins
+    - [ ] Displaying
+    - [ ] Creating
 - [ ] Threads
 - [x] Profile popouts
    - [x] Working actions
@ -108,18 +113,44 @@ A simple and user-friendly Matrix client made with Flutter and a Gomuks backend.
 - [ ] Notifications using UnifiedPush ([#35](https://git.federated.nexus/Nexus/nexus/issues/35))
 - [ ] Group calls using [MSC4195](https://github.com/matrix-org/matrix-spec-proposals/pull/4195)
 - [ ] Invites
- [x] Settings
+- [ ] Settings ([#37](https://git.federated.nexus/Nexus/nexus/issues/37))
+    - [ ] Matrix: URIs vs Matrix.to links
+    - [ ] Light/Dark mode
+    - [ ] Remote Gomuks instance
+    - [ ] SSD or CSD
+    - [ ] Align your message bubbles to left or right
+    - [ ] Show media by default
+    - [ ] Dynamic Theming
+    - [ ] Personas
+        - [ ] Setting per-message profiles for users (MSC4461)
+        - [ ] Explain how to send messages using a certain PMP
+    - [ ] Devices
+        - [ ] Viewing devices
+        - [ ] Verifying devices
+    - [ ] URL preview: Server / Sending Client (Beeper spec) / None
+    - [ ] Account changes
+        - [ ] Display name
+        - [ ] Profile picture
+        - [ ] Timezone
+        - [ ] Pronouns
+        - [ ] Password
+    - [ ] About
+    - [x] Log Out

 ## Try it out

 If you want to try out Nexus, grab one of the following artifacts from CI:

 - [Android APK](https://nightly.link/Henry-Hiles/nexus/workflows/android/main/APK.zip)
- [Windows EXE](https://nightly.link/Henry-Hiles/nexus/workflows/windows/main/windows-installer.zip)
+- Windows
+    - [Portable Build](https://nightly.link/Henry-Hiles/nexus/workflows/windows/main/windows-portable.zip)
+    - [Installer](https://nightly.link/Henry-Hiles/nexus/workflows/windows/main/windows-installer.zip)
 - Flatpak
    - [AArch64/Arm64](https://nightly.link/Henry-Hiles/nexus/workflows/flatpak/main/flatpak-aarch64.zip)
    - [x86_64/AMD64](https://nightly.link/Henry-Hiles/nexus/workflows/flatpak/main/flatpak-x86_64.zip)

+Or, try the Nix package: `nix run git+https://git.federated.nexus/Nexus/nexus`
+
 ## Build it yourself

 ### Prerequisites
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@ -30,7 +30,7 @@ if (keystorePropertiesFile.exists()) {
 }

 android {
-    namespace = "nexus.federated.nexus"
+    namespace = "nexus.federated.Nexus"
    ndkVersion = flutter.ndkVersion
    compileSdk = 34

@ -40,11 +40,12 @@ android {
    }

    kotlinOptions {
+        // do we want to update.. eventually?
        jvmTarget = "17"
    }

    defaultConfig {
-        applicationId = "nexus.federated.nexus"
+        applicationId = "nexus.federated.Nexus"
        minSdk = 29
        targetSdkVersion flutter.targetSdkVersion
        versionCode = flutterVersionCode.toInteger()
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@ -22,14 +22,6 @@
            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
            android:hardwareAccelerated="true"
            android:windowSoftInputMode="adjustResize">
-			<meta-data android:name="flutter_deeplinking_enabled" android:value="false" />
-			<intent-filter>
-				<action android:name="android.intent.action.VIEW" />
-				<category android:name="android.intent.category.DEFAULT" />
-				<category android:name="android.intent.category.BROWSABLE" />
-
-				<data android:scheme="nexus.federated.nexus" />
-			</intent-filter>
            <meta-data
              android:name="io.flutter.embedding.android.NormalTheme"
              android:resource="@style/NormalTheme"
--- a/android/app/src/main/kotlin/com/example/mobile_requester_app/MainActivity.kt
+++ b/android/app/src/main/kotlin/com/example/mobile_requester_app/MainActivity.kt
@ -1,4 +1,4 @@
-package nexus.federated.nexus
+package nexus.federated.Nexus

 import io.flutter.embedding.android.FlutterActivity

--- a/android/gradle.properties
+++ b/android/gradle.properties
@ -1,7 +1,3 @@
 org.gradle.jvmargs=-Xmx4G -XX:+HeapDumpOnOutOfMemoryError
 android.useAndroidX=true
 android.enableJetifier=true
-# This builtInKotlin flag was added automatically by Flutter migrator
-android.builtInKotlin=false
-# This newDsl flag was added automatically by Flutter migrator
-android.newDsl=false
--- a/assets/fonts/NotoColorEmoji.ttf
+++ b/assets/fonts/NotoColorEmoji.ttf
--- a/assets/fonts/Roboto.ttf
+++ b/assets/fonts/Roboto.ttf
--- a/flake.lock
+++ b/flake.lock
@ -5,11 +5,11 @@
        "nixpkgs-lib": "nixpkgs-lib"
      },
      "locked": {
-        "lastModified": 1782949081,
-        "narHash": "sha256-vp6Y/Grm98ESt6ceOkWiHWyZRDV3J1RID4w+6NWK9yA=",
+        "lastModified": 1778716662,
+        "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "17c9d6cdfc60c64f4ee8d306f9bc0b4ccb51481e",
+        "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb",
        "type": "github"
      },
      "original": {
@ -73,11 +73,11 @@
    },
    "nixpkgs-lib": {
      "locked": {
-        "lastModified": 1782614948,
-        "narHash": "sha256-ePjCwr1sNm9NYUqywL7QfK3JnlS015msC+eBu2zKlp8=",
+        "lastModified": 1777168982,
+        "narHash": "sha256-GOkGPcboWE9BmGCRMLX3worL4EMnsnG8MyKmXNeYuhQ=",
        "owner": "nix-community",
        "repo": "nixpkgs.lib",
-        "rev": "db3f255737b94216eb71cce308e2912cf6bc2d7c",
+        "rev": "f5901329dade4a6ea039af1433fb087bd9c1fe14",
        "type": "github"
      },
      "original": {
@ -88,11 +88,11 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1784497964,
-        "narHash": "sha256-vlHUuqAcbcH2RKmHbPiuQzbv1pnzzavXnI62RD0bqCU=",
+        "lastModified": 1778869304,
+        "narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "241313f4e8e508cb9b13278c2b0fa25b9ca27163",
+        "rev": "d233902339c02a9c334e7e593de68855ad26c4cb",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@ -52,7 +52,7 @@
              flatpak = inputs.nix2flatpak.lib.${system}.mkFlatpak {
                appName = "Nexus";
                developer = "QuadRadical";
-                appId = "nexus.federated.nexus";
+                appId = "nexus.federated.Nexus";
                package = default;
                runtime = "org.gnome.Platform/49";
                permissions = {
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 3c759ba03a5235deb82cb1559ebc42c36ee0e874
+Subproject commit 23638a8d2b5ad7ed9f72a0ec39f56cac119c45fb
--- a/hook/build.dart
+++ b/hook/build.dart
@ -1,9 +1,7 @@
 import "dart:io";
-import "package:collection/collection.dart";
 import "package:hooks/hooks.dart";
 import "package:code_assets/code_assets.dart";
 import "package:nexus/helpers/extensions/get_xcode_sdk.dart";
-import "package:path/path.dart";

 Future<void> main(List<String> args) => build(args, (input, output) async {
  if (!input.config.buildCodeAssets) return;
@ -12,24 +10,14 @@ Future<void> main(List<String> args) => build(args, (input, output) async {
  final targetArch = codeConfig.targetArchitecture;

  String libFileName;
-  Map<String, String> extraEnv = {};
+  Map<String, String> env = {};
  switch (targetOS) {
    case OS.linux:
      libFileName = "libgomuks.so";
      break;
    case OS.macOS:
      libFileName = "libgomuks.dylib";
-      extraEnv = {
-        "SDKROOT": await getXCodeSDK(),
-        "CGO_ENABLED": "1",
-        "GOARCH": switch (targetArch) {
-          Architecture.arm64 => "arm64",
-          Architecture.x64 => "amd64",
-          _ => throw UnsupportedError(
-            "Unsupported macOS architecture: $targetArch",
-          ),
-        },
-      };
+      env = {"SDKROOT": await getXCodeSDK()};
      break;
    case OS.windows:
      libFileName = "libgomuks.dll";
@ -39,48 +27,23 @@ Future<void> main(List<String> args) => build(args, (input, output) async {

      final targetNdkApi = codeConfig.android.targetNdkApi;

-      Future<String?> findNdkFromSdk() async {
-        final androidHome =
-            Platform.environment["ANDROID_HOME"] ??
-            Platform.environment["ANDROID_SDK_ROOT"];
-        if (androidHome == null) return null;
-
-        final ndkDir = Directory(join(androidHome, "ndk"));
-        if (!await ndkDir.exists()) return null;
-
-        final versions = await ndkDir.list().toList();
-        return versions.sortedBy((file) => file.path).lastOrNull?.path;
-      }
-
      final ndkHome =
          Platform.environment["ANDROID_NDK_HOME"] ??
          Platform.environment["ANDROID_NDK_ROOT"] ??
          Platform.environment["NDK_HOME"] ??
-          await findNdkFromSdk();
-
+          await _findNdkFromSdk();
      if (ndkHome == null) {
        throw Exception(
          "Could not find Android NDK. Set ANDROID_NDK_HOME or install via sdkmanager.",
        );
      }

-      // TODO: Someone please give me a way to detect host architecture so I can change this
-      final hostTag =
-          Platform.environment["ANDROID_HOST_TAG"] ??
-          "${Platform.operatingSystem}-x86_64";
-      final ccTriple = switch (targetArch) {
-        Architecture.arm64 => "aarch64-linux-android",
-        Architecture.arm => "armv7a-linux-androideabi",
-        Architecture.x64 => "x86_64-linux-android",
-        Architecture.ia32 => "i686-linux-android",
-        _ => throw UnsupportedError(
-          "Unsupported Android architecture: $targetArch",
-        ),
-      };
+      final hostTag = _ndkHostTag();
+      final (goArch, ccTriple) = _androidArch(targetArch);
      final cc =
          "$ndkHome/toolchains/llvm/prebuilt/$hostTag/bin/$ccTriple$targetNdkApi-clang";

-      extraEnv = {"GOOS": "android", "CC": cc};
+      env = {"CGO_ENABLED": "1", "GOOS": "android", "GOARCH": goArch, "CC": cc};
      break;
    default:
      throw UnsupportedError("Unsupported OS: $targetOS");
@ -93,10 +56,10 @@ Future<void> main(List<String> args) => build(args, (input, output) async {
    final buildDir = input.packageRoot.resolve("build/");
    libFile = buildDir.resolve("${targetArch.name}/$libFileName");

+    // goheif/dav1d supported on Android would need to fix upstream
    final tags = [
      "sqlite_fts5",
      "goolm",
-      // goheif/dav1d is not supported on Android, would need to be fixed upstream
      if (targetOS == OS.android) "noheic",
    ].join(",");
    print(
@ -106,17 +69,7 @@ Future<void> main(List<String> args) => build(args, (input, output) async {
      "go",
      ["build", "-tags", tags, "-o", libFile.path, "-buildmode=c-shared"],
      workingDirectory: gomuksBuildDir.resolve("pkg/ffi/").toFilePath(),
-      environment: {
-        "CGO_ENABLED": "1",
-        "GOARCH": switch (targetArch) {
-          Architecture.arm64 => "arm64",
-          Architecture.arm => "arm",
-          Architecture.x64 => "amd64",
-          Architecture.ia32 => "386",
-          _ => throw UnsupportedError("Unsupported architecture: $targetArch"),
-        },
-        ...extraEnv,
-      },
+      environment: env.isNotEmpty ? env : null,
    );

    if (result.exitCode != 0) {
@ -141,3 +94,43 @@ Future<void> main(List<String> args) => build(args, (input, output) async {
    ..dependencies.add(gomuksBuildDir);
  print("Done!");
 });
+
+Future<String?> _findNdkFromSdk() async {
+  // pretty sure this wont be needed with nix, i'll get this removed
+  final androidHome =
+      Platform.environment["ANDROID_HOME"] ??
+      Platform.environment["ANDROID_SDK_ROOT"];
+  if (androidHome == null) return null;
+  final ndkDir = Directory("$androidHome/ndk");
+  if (!await ndkDir.exists()) return null;
+  final versions = await ndkDir.list().toList();
+  if (versions.isEmpty) return null;
+  versions.sort((a, b) => a.path.compareTo(b.path));
+  return versions.last.path;
+}
+
+String _ndkHostTag() {
+  if (Platform.isMacOS) {
+    return "darwin-x86_64";
+  } else if (Platform.isLinux) {
+    return "linux-x86_64";
+  } else if (Platform.isWindows) {
+    return "windows-x86_64";
+  }
+  throw UnsupportedError("Unsupported host platform for Android NDK");
+}
+
+(String goArch, String ccTriple) _androidArch(Architecture arch) {
+  switch (arch) {
+    case Architecture.arm64:
+      return ("arm64", "aarch64-linux-android");
+    case Architecture.arm:
+      return ("arm", "armv7a-linux-androideabi");
+    case Architecture.x64:
+      return ("amd64", "x86_64-linux-android");
+    case Architecture.ia32:
+      return ("386", "i686-linux-android");
+    default:
+      throw UnsupportedError("Unsupported Android architecture: $arch");
+  }
+}
--- a/ios/.gitignore
+++ b/ios/.gitignore
@ -0,0 +1,34 @@
+**/dgph
+*.mode1v3
+*.mode2v3
+*.moved-aside
+*.pbxuser
+*.perspectivev3
+**/*sync/
+.sconsign.dblite
+.tags*
+**/.vagrant/
+**/DerivedData/
+Icon?
+**/Pods/
+**/.symlinks/
+profile
+xcuserdata
+**/.generated/
+Flutter/App.framework
+Flutter/Flutter.framework
+Flutter/Flutter.podspec
+Flutter/Generated.xcconfig
+Flutter/ephemeral/
+Flutter/app.flx
+Flutter/app.zip
+Flutter/flutter_assets/
+Flutter/flutter_export_environment.sh
+ServiceDefinitions.json
+Runner/GeneratedPluginRegistrant.*
+
+# Exceptions to above rules.
+!default.mode1v3
+!default.mode2v3
+!default.pbxuser
+!default.perspectivev3
--- a/ios/Flutter/AppFrameworkInfo.plist
+++ b/ios/Flutter/AppFrameworkInfo.plist
@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleExecutable</key>
+	<string>App</string>
+	<key>CFBundleIdentifier</key>
+	<string>nexus.federated.Nexus</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>App</string>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1.0</string>
+	<key>MinimumOSVersion</key>
+	<string>15.5</string>
+</dict>
+</plist>
--- a/ios/Flutter/Debug.xcconfig
+++ b/ios/Flutter/Debug.xcconfig
@ -0,0 +1,2 @@
+#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
+#include "Generated.xcconfig"
--- a/ios/Flutter/Release.xcconfig
+++ b/ios/Flutter/Release.xcconfig
@ -0,0 +1,2 @@
+#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
+#include "Generated.xcconfig"
--- a/ios/Podfile
+++ b/ios/Podfile
@ -0,0 +1,55 @@
+platform :ios, 16
+ENV['COCOAPODS_DISABLE_STATS'] = 'true'
+
+project 'Runner', {
+  'Debug' => :debug,
+  'Profile' => :release,
+  'Release' => :release,
+}
+
+def flutter_root
+  generated_xcode_build_settings_path = File.expand_path(File.join('..', 'Flutter', 'Generated.xcconfig'), __FILE__)
+  unless File.exist?(generated_xcode_build_settings_path)
+    raise "#{generated_xcode_build_settings_path} must exist. If you're running pod install manually, make sure flutter pub get is executed first"
+  end
+
+  File.foreach(generated_xcode_build_settings_path) do |line|
+    matches = line.match(/FLUTTER_ROOT\=(.*)/)
+    return matches[1].strip if matches
+  end
+  raise "FLUTTER_ROOT not found in #{generated_xcode_build_settings_path}. Try deleting Generated.xcconfig, then run flutter pub get"
+end
+
+require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root)
+
+flutter_ios_podfile_setup
+
+target 'Runner' do
+  use_frameworks!
+  use_modular_headers!
+  
+  flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
+end
+
+post_install do |installer|
+  installer.pods_project.targets.each do |target|
+    target.build_configurations.each do |config|
+        if config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] == '8.0'
+          config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '11.0'
+        end
+    end
+    flutter_additional_ios_build_settings target
+  end
+
+  ################  Awesome Notifications pod modification 1  ###################
+  awesome_pod_file = File.expand_path(File.join('plugins', 'awesome_notifications', 'ios', 'Scripts', 'AwesomePodFile'), '.symlinks')
+  require awesome_pod_file
+  update_awesome_pod_build_settings(installer)
+  ################  Awesome Notifications pod modification 1  ###################
+end
+
+################  Awesome Notifications pod modification 2  ###################
+awesome_pod_file = File.expand_path(File.join('plugins', 'awesome_notifications', 'ios', 'Scripts', 'AwesomePodFile'), '.symlinks')
+require awesome_pod_file
+update_awesome_main_target_settings('Runner', File.dirname(File.realpath(__FILE__)), flutter_root)
+################  Awesome Notifications pod modification 2  ###################
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@ -0,0 +1,582 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 54;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
+		3965FF1D950A2B2E051F6219 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5E598BBDD2ED0112E344B590 /* Pods_Runner.framework */; };
+		3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
+		74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; };
+		97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
+		97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
+		97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXCopyFilesBuildPhase section */
+		9705A1C41CF9048500538489 /* Embed Frameworks */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "";
+			dstSubfolderSpec = 10;
+			files = (
+			);
+			name = "Embed Frameworks";
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXCopyFilesBuildPhase section */
+
+/* Begin PBXFileReference section */
+		1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
+		1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
+		3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
+		5E598BBDD2ED0112E344B590 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		6A2D47C573B065AD356C7183 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
+		74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
+		74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
+		7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
+		9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
+		9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; };
+		97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		97C146FB1CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
+		97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
+		97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
+		97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		CA00A9F43BB1AB7D908E180A /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
+		DFFCB3F45BF495277AE4D3EE /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		97C146EB1CF9000F007C117D /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				3965FF1D950A2B2E051F6219 /* Pods_Runner.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		7226BEAE3D25CA120A434CC9 /* Pods */ = {
+			isa = PBXGroup;
+			children = (
+				DFFCB3F45BF495277AE4D3EE /* Pods-Runner.debug.xcconfig */,
+				CA00A9F43BB1AB7D908E180A /* Pods-Runner.release.xcconfig */,
+				6A2D47C573B065AD356C7183 /* Pods-Runner.profile.xcconfig */,
+			);
+			path = Pods;
+			sourceTree = "<group>";
+		};
+		9740EEB11CF90186004384FC /* Flutter */ = {
+			isa = PBXGroup;
+			children = (
+				3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */,
+				9740EEB21CF90195004384FC /* Debug.xcconfig */,
+				7AFA3C8E1D35360C0083082E /* Release.xcconfig */,
+				9740EEB31CF90195004384FC /* Generated.xcconfig */,
+			);
+			name = Flutter;
+			sourceTree = "<group>";
+		};
+		97C146E51CF9000F007C117D = {
+			isa = PBXGroup;
+			children = (
+				9740EEB11CF90186004384FC /* Flutter */,
+				97C146F01CF9000F007C117D /* Runner */,
+				97C146EF1CF9000F007C117D /* Products */,
+				7226BEAE3D25CA120A434CC9 /* Pods */,
+				E396C277672D83FCFDB51CCB /* Frameworks */,
+			);
+			sourceTree = "<group>";
+		};
+		97C146EF1CF9000F007C117D /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				97C146EE1CF9000F007C117D /* Runner.app */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		97C146F01CF9000F007C117D /* Runner */ = {
+			isa = PBXGroup;
+			children = (
+				97C146FA1CF9000F007C117D /* Main.storyboard */,
+				97C146FD1CF9000F007C117D /* Assets.xcassets */,
+				97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */,
+				97C147021CF9000F007C117D /* Info.plist */,
+				1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */,
+				1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */,
+				74858FAE1ED2DC5600515810 /* AppDelegate.swift */,
+				74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */,
+			);
+			path = Runner;
+			sourceTree = "<group>";
+		};
+		E396C277672D83FCFDB51CCB /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				5E598BBDD2ED0112E344B590 /* Pods_Runner.framework */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXNativeTarget section */
+		97C146ED1CF9000F007C117D /* Runner */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
+			buildPhases = (
+				A3B5CB395514F4BF9CDF304E /* [CP] Check Pods Manifest.lock */,
+				9740EEB61CF901F6004384FC /* Run Script */,
+				97C146EA1CF9000F007C117D /* Sources */,
+				97C146EB1CF9000F007C117D /* Frameworks */,
+				97C146EC1CF9000F007C117D /* Resources */,
+				9705A1C41CF9048500538489 /* Embed Frameworks */,
+				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
+				C3C8545BDAC52D360D298A29 /* [CP] Embed Pods Frameworks */,
+				F46F66CC32F585BBF2FB675E /* [CP] Copy Pods Resources */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = Runner;
+			productName = Runner;
+			productReference = 97C146EE1CF9000F007C117D /* Runner.app */;
+			productType = "com.apple.product-type.application";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		97C146E61CF9000F007C117D /* Project object */ = {
+			isa = PBXProject;
+			attributes = {
+				BuildIndependentTargetsInParallel = YES;
+				LastUpgradeCheck = 1510;
+				ORGANIZATIONNAME = "";
+				TargetAttributes = {
+					97C146ED1CF9000F007C117D = {
+						CreatedOnToolsVersion = 7.3.1;
+						LastSwiftMigration = 1100;
+					};
+				};
+			};
+			buildConfigurationList = 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */;
+			compatibilityVersion = "Xcode 9.3";
+			developmentRegion = en;
+			hasScannedForEncodings = 0;
+			knownRegions = (
+				en,
+				Base,
+			);
+			mainGroup = 97C146E51CF9000F007C117D;
+			productRefGroup = 97C146EF1CF9000F007C117D /* Products */;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				97C146ED1CF9000F007C117D /* Runner */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXResourcesBuildPhase section */
+		97C146EC1CF9000F007C117D /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */,
+				3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */,
+				97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */,
+				97C146FC1CF9000F007C117D /* Main.storyboard in Resources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXResourcesBuildPhase section */
+
+/* Begin PBXShellScriptBuildPhase section */
+		3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
+			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+				"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}",
+			);
+			name = "Thin Binary";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
+		};
+		9740EEB61CF901F6004384FC /* Run Script */ = {
+			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "Run Script";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
+		};
+		A3B5CB395514F4BF9CDF304E /* [CP] Check Pods Manifest.lock */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
+			);
+			name = "[CP] Check Pods Manifest.lock";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
+			showEnvVarsInLog = 0;
+		};
+		C3C8545BDAC52D360D298A29 /* [CP] Embed Pods Frameworks */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
+			);
+			name = "[CP] Embed Pods Frameworks";
+			outputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
+		F46F66CC32F585BBF2FB675E /* [CP] Copy Pods Resources */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
+			);
+			name = "[CP] Copy Pods Resources";
+			outputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
+/* End PBXShellScriptBuildPhase section */
+
+/* Begin PBXSourcesBuildPhase section */
+		97C146EA1CF9000F007C117D /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */,
+				1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin PBXVariantGroup section */
+		97C146FA1CF9000F007C117D /* Main.storyboard */ = {
+			isa = PBXVariantGroup;
+			children = (
+				97C146FB1CF9000F007C117D /* Base */,
+			);
+			name = Main.storyboard;
+			sourceTree = "<group>";
+		};
+		97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */ = {
+			isa = PBXVariantGroup;
+			children = (
+				97C147001CF9000F007C117D /* Base */,
+			);
+			name = LaunchScreen.storyboard;
+			sourceTree = "<group>";
+		};
+/* End PBXVariantGroup section */
+
+/* Begin XCBuildConfiguration section */
+		249021D3217E4FDB00AE95B9 /* Profile */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				ENABLE_NS_ASSERTIONS = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				MTL_ENABLE_DEBUG_INFO = NO;
+				SDKROOT = iphoneos;
+				SUPPORTED_PLATFORMS = iphoneos;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				VALIDATE_PRODUCT = YES;
+			};
+			name = Profile;
+		};
+		249021D4217E4FDB00AE95B9 /* Profile */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
+			buildSettings = {
+				APPLICATION_EXTENSION_API_ONLY = NO;
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = AppIcon;
+				BUILD_LIBRARY_FOR_DISTRIBUTION = NO;
+				CLANG_ENABLE_MODULES = YES;
+				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+				DEVELOPMENT_TEAM = P3ZD9TNSKZ;
+				ENABLE_BITCODE = NO;
+				INFOPLIST_FILE = Runner/Info.plist;
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+				);
+				PRODUCT_BUNDLE_IDENTIFIER = nexus.federated.Nexus;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
+				SWIFT_VERSION = 5.0;
+				VERSIONING_SYSTEM = "apple-generic";
+			};
+			name = Profile;
+		};
+		97C147031CF9000F007C117D /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = dwarf;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				MTL_ENABLE_DEBUG_INFO = YES;
+				ONLY_ACTIVE_ARCH = YES;
+				SDKROOT = iphoneos;
+				TARGETED_DEVICE_FAMILY = "1,2";
+			};
+			name = Debug;
+		};
+		97C147041CF9000F007C117D /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				ENABLE_NS_ASSERTIONS = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				MTL_ENABLE_DEBUG_INFO = NO;
+				SDKROOT = iphoneos;
+				SUPPORTED_PLATFORMS = iphoneos;
+				SWIFT_COMPILATION_MODE = wholemodule;
+				SWIFT_OPTIMIZATION_LEVEL = "-O";
+				TARGETED_DEVICE_FAMILY = "1,2";
+				VALIDATE_PRODUCT = YES;
+			};
+			name = Release;
+		};
+		97C147061CF9000F007C117D /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */;
+			buildSettings = {
+				APPLICATION_EXTENSION_API_ONLY = NO;
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = AppIcon;
+				BUILD_LIBRARY_FOR_DISTRIBUTION = NO;
+				CLANG_ENABLE_MODULES = YES;
+				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+				DEVELOPMENT_TEAM = P3ZD9TNSKZ;
+				ENABLE_BITCODE = NO;
+				INFOPLIST_FILE = Runner/Info.plist;
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+				);
+				PRODUCT_BUNDLE_IDENTIFIER = nexus.federated.Nexus;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 5.0;
+				VERSIONING_SYSTEM = "apple-generic";
+			};
+			name = Debug;
+		};
+		97C147071CF9000F007C117D /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
+			buildSettings = {
+				APPLICATION_EXTENSION_API_ONLY = NO;
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = AppIcon;
+				BUILD_LIBRARY_FOR_DISTRIBUTION = NO;
+				CLANG_ENABLE_MODULES = YES;
+				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+				DEVELOPMENT_TEAM = P3ZD9TNSKZ;
+				ENABLE_BITCODE = NO;
+				INFOPLIST_FILE = Runner/Info.plist;
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+				);
+				PRODUCT_BUNDLE_IDENTIFIER = nexus.federated.Nexus;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
+				SWIFT_VERSION = 5.0;
+				VERSIONING_SYSTEM = "apple-generic";
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				97C147031CF9000F007C117D /* Debug */,
+				97C147041CF9000F007C117D /* Release */,
+				249021D3217E4FDB00AE95B9 /* Profile */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				97C147061CF9000F007C117D /* Debug */,
+				97C147071CF9000F007C117D /* Release */,
+				249021D4217E4FDB00AE95B9 /* Profile */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = 97C146E61CF9000F007C117D /* Project object */;
+}
--- a/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata
+++ b/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata
@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "self:">
+   </FileRef>
+</Workspace>
--- a/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
+++ b/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
--- a/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
+++ b/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>PreviewsEnabled</key>
+	<false/>
+</dict>
+</plist>
--- a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
+++ b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1510"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "97C146ED1CF9000F007C117D"
+               BuildableName = "Runner.app"
+               BlueprintName = "Runner"
+               ReferencedContainer = "container:Runner.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "97C146ED1CF9000F007C117D"
+            BuildableName = "Runner.app"
+            BlueprintName = "Runner"
+            ReferencedContainer = "container:Runner.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <Testables>
+         <TestableReference
+            skipped = "NO"
+            parallelizable = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "331C8080294A63A400263BE5"
+               BuildableName = "RunnerTests.xctest"
+               BlueprintName = "RunnerTests"
+               ReferencedContainer = "container:Runner.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      enableGPUValidationMode = "1"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "97C146ED1CF9000F007C117D"
+            BuildableName = "Runner.app"
+            BlueprintName = "Runner"
+            ReferencedContainer = "container:Runner.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Profile"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "97C146ED1CF9000F007C117D"
+            BuildableName = "Runner.app"
+            BlueprintName = "Runner"
+            ReferencedContainer = "container:Runner.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
--- a/ios/Runner.xcworkspace/contents.xcworkspacedata
+++ b/ios/Runner.xcworkspace/contents.xcworkspacedata
@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "group:Runner.xcodeproj">
+   </FileRef>
+   <FileRef
+      location = "group:Pods/Pods.xcodeproj">
+   </FileRef>
+</Workspace>
--- a/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
+++ b/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
--- a/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
+++ b/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>PreviewsEnabled</key>
+	<false/>
+</dict>
+</plist>
--- a/ios/Runner/AppDelegate.swift
+++ b/ios/Runner/AppDelegate.swift
@ -0,0 +1,13 @@
+import UIKit
+import Flutter
+
+@main
+@objc class AppDelegate: FlutterAppDelegate {
+  override func application(
+    _ application: UIApplication,
+    didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?
+  ) -> Bool {
+    GeneratedPluginRegistrant.register(with: self)
+    return super.application(application, didFinishLaunchingWithOptions: launchOptions)
+  }
+}
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
@ -0,0 +1 @@
+{"images":[{"size":"20x20","idiom":"iphone","filename":"Icon-App-20x20@2x.png","scale":"2x"},{"size":"20x20","idiom":"iphone","filename":"Icon-App-20x20@3x.png","scale":"3x"},{"size":"29x29","idiom":"iphone","filename":"Icon-App-29x29@1x.png","scale":"1x"},{"size":"29x29","idiom":"iphone","filename":"Icon-App-29x29@2x.png","scale":"2x"},{"size":"29x29","idiom":"iphone","filename":"Icon-App-29x29@3x.png","scale":"3x"},{"size":"40x40","idiom":"iphone","filename":"Icon-App-40x40@2x.png","scale":"2x"},{"size":"40x40","idiom":"iphone","filename":"Icon-App-40x40@3x.png","scale":"3x"},{"size":"57x57","idiom":"iphone","filename":"Icon-App-57x57@1x.png","scale":"1x"},{"size":"57x57","idiom":"iphone","filename":"Icon-App-57x57@2x.png","scale":"2x"},{"size":"60x60","idiom":"iphone","filename":"Icon-App-60x60@2x.png","scale":"2x"},{"size":"60x60","idiom":"iphone","filename":"Icon-App-60x60@3x.png","scale":"3x"},{"size":"20x20","idiom":"ipad","filename":"Icon-App-20x20@1x.png","scale":"1x"},{"size":"20x20","idiom":"ipad","filename":"Icon-App-20x20@2x.png","scale":"2x"},{"size":"29x29","idiom":"ipad","filename":"Icon-App-29x29@1x.png","scale":"1x"},{"size":"29x29","idiom":"ipad","filename":"Icon-App-29x29@2x.png","scale":"2x"},{"size":"40x40","idiom":"ipad","filename":"Icon-App-40x40@1x.png","scale":"1x"},{"size":"40x40","idiom":"ipad","filename":"Icon-App-40x40@2x.png","scale":"2x"},{"size":"50x50","idiom":"ipad","filename":"Icon-App-50x50@1x.png","scale":"1x"},{"size":"50x50","idiom":"ipad","filename":"Icon-App-50x50@2x.png","scale":"2x"},{"size":"72x72","idiom":"ipad","filename":"Icon-App-72x72@1x.png","scale":"1x"},{"size":"72x72","idiom":"ipad","filename":"Icon-App-72x72@2x.png","scale":"2x"},{"size":"76x76","idiom":"ipad","filename":"Icon-App-76x76@1x.png","scale":"1x"},{"size":"76x76","idiom":"ipad","filename":"Icon-App-76x76@2x.png","scale":"2x"},{"size":"83.5x83.5","idiom":"ipad","filename":"Icon-App-83.5x83.5@2x.png","scale":"2x"},{"size":"1024x1024","idiom":"ios-marketing","filename":"Icon-App-1024x1024@1x.png","scale":"1x"}],"info":{"version":1,"author":"xcode"}}
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@1x.png
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@1x.png
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@2x.png
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@2x.png
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@1x.png
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@1x.png
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@2x.png
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@2x.png
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png
--- a/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json
+++ b/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json
@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "LaunchImage.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "LaunchImage@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "LaunchImage@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
--- a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png
+++ b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png
--- a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png
+++ b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png
--- a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png
+++ b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png
--- a/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md
+++ b/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md
@ -0,0 +1,5 @@
+# Launch Screen Assets
+
+You can customize the launch screen with your own desired assets by replacing the image files in this directory.
+
+You can also do it by opening your Flutter project's Xcode project with `open ios/Runner.xcworkspace`, selecting `Runner/Assets.xcassets` in the Project Navigator and dropping in the desired images.
--- a/ios/Runner/Base.lproj/LaunchScreen.storyboard
+++ b/ios/Runner/Base.lproj/LaunchScreen.storyboard
@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="12121" systemVersion="16G29" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12089"/>
+    </dependencies>
+    <scenes>
+        <!--View Controller-->
+        <scene sceneID="EHf-IW-A2E">
+            <objects>
+                <viewController id="01J-lp-oVM" sceneMemberID="viewController">
+                    <layoutGuides>
+                        <viewControllerLayoutGuide type="top" id="Ydg-fD-yQy"/>
+                        <viewControllerLayoutGuide type="bottom" id="xbc-2k-c8Z"/>
+                    </layoutGuides>
+                    <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" image="LaunchImage" translatesAutoresizingMaskIntoConstraints="NO" id="YRO-k0-Ey4">
+                            </imageView>
+                        </subviews>
+                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <constraints>
+                            <constraint firstItem="YRO-k0-Ey4" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" id="1a2-6s-vTC"/>
+                            <constraint firstItem="YRO-k0-Ey4" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="centerY" id="4X2-HB-R7a"/>
+                        </constraints>
+                    </view>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="53" y="375"/>
+        </scene>
+    </scenes>
+    <resources>
+        <image name="LaunchImage" width="168" height="185"/>
+    </resources>
+</document>
--- a/ios/Runner/Base.lproj/Main.storyboard
+++ b/ios/Runner/Base.lproj/Main.storyboard
@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10117" systemVersion="15F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="BYZ-38-t0r">
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
+    </dependencies>
+    <scenes>
+        <!--Flutter View Controller-->
+        <scene sceneID="tne-QT-ifu">
+            <objects>
+                <viewController id="BYZ-38-t0r" customClass="FlutterViewController" sceneMemberID="viewController">
+                    <layoutGuides>
+                        <viewControllerLayoutGuide type="top" id="y3c-jy-aDJ"/>
+                        <viewControllerLayoutGuide type="bottom" id="wfy-db-euE"/>
+                    </layoutGuides>
+                    <view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
+                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+                    </view>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
+            </objects>
+        </scene>
+    </scenes>
+</document>
--- a/ios/Runner/Info.plist
+++ b/ios/Runner/Info.plist
@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CADisableMinimumFrameDurationOnPhone</key>
+	<true/>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleDisplayName</key>
+	<string>Nexus</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>nexus</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>$(FLUTTER_BUILD_NAME)</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>$(FLUTTER_BUILD_NUMBER)</string>
+	<key>LSSupportsOpeningDocumentsInPlace</key>
+	<true/>
+	<key>LSApplicationQueriesSchemes</key>
+	<array>
+	<string>file</string>
+	<string>https</string>
+	<string>http</string>
+	<string>mailto</string>
+	<string>tel</string>
+	</array>
+	<key>UIFileSharingEnabled</key>
+	<true/>
+	<key>ITSAppUsesNonExemptEncryption</key>
+	<false/>
+	<key>LSRequiresIPhoneOS</key>
+	<true/>
+	<key>NSCameraUsageDescription</key>
+	<string>This app needs camera access to scan asset QR codes</string>
+	<key>NSMicrophoneUsageDescription</key>
+	<string>This app doesn't use your microphone.</string>
+	<key>NSPhotoLibraryUsageDescription</key>
+	<string>This app doesn't use your photo library.</string>
+	<key>UIApplicationSupportsIndirectInputEvents</key>
+	<true/>
+	<key>UILaunchStoryboardName</key>
+	<string>LaunchScreen</string>
+	<key>UIMainStoryboardFile</key>
+	<string>Main</string>
+	<key>UISupportedInterfaceOrientations</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+	<key>UISupportedInterfaceOrientations~ipad</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationPortraitUpsideDown</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+</dict>
+</plist>
--- a/ios/Runner/Runner-Bridging-Header.h
+++ b/ios/Runner/Runner-Bridging-Header.h
@ -0,0 +1 @@
+#import "GeneratedPluginRegistrant.h"
--- a/lib/controllers/account_data_controller.dart
+++ b/lib/controllers/account_data_controller.dart
--- a/lib/controllers/auth_url.dart
+++ b/lib/controllers/auth_url.dart
@ -1,32 +0,0 @@
-import "package:flutter_riverpod/flutter_riverpod.dart";
-import "package:nexus/controllers/client.dart";
-import "package:nexus/controllers/client_id.dart";
-import "package:nexus/models/oauth_auth_code_response.dart";
-import "package:nexus/models/requests/oauth/get_auth_url.dart";
-
-class AuthUrlController extends AsyncNotifier<OAuthAuthCodeResponse> {
-  final Uri homeserver;
-  AuthUrlController(this.homeserver);
-
-  @override
-  Future<OAuthAuthCodeResponse> build() async => ref
-      .watch(ClientController.provider.notifier)
-      .getAuthUrl(
-        .new(
-          homeserverUrl: homeserver,
-          redirectUri: .new(scheme: "nexus.federated.nexus", path: "/"),
-          responseMode: .query,
-          scopes: .new([Scope.clientApi, Scope.device]),
-          clientId: await ref.watch(
-            ClientIdController.provider(homeserver).future,
-          ),
-        ),
-      );
-
-  static final provider =
-      AsyncNotifierProvider.family<
-        AuthUrlController,
-        OAuthAuthCodeResponse,
-        Uri
-      >(AuthUrlController.new);
-}
--- a/lib/controllers/author_controller.dart
+++ b/lib/controllers/author_controller.dart
@ -1,6 +1,6 @@
 import "dart:async";
 import "package:flutter_riverpod/flutter_riverpod.dart";
-import "package:nexus/controllers/user.dart";
+import "package:nexus/controllers/user_controller.dart";
 import "package:nexus/models/content/membership.dart";
 import "package:nexus/models/event.dart";

--- a/lib/controllers/client_controller.dart
+++ b/lib/controllers/client_controller.dart
@ -5,33 +5,29 @@ import "dart:math";
 import "package:fast_immutable_collections/fast_immutable_collections.dart";
 import "package:ffi/ffi.dart";
 import "package:flutter/foundation.dart";
-import "package:nexus/controllers/account_data.dart";
-import "package:nexus/controllers/client_state.dart";
-import "package:nexus/controllers/init_complete.dart";
-import "package:nexus/controllers/rooms.dart";
-import "package:nexus/controllers/space_edges.dart";
-import "package:nexus/controllers/sync_status.dart";
-import "package:nexus/controllers/top_level_spaces.dart";
+import "package:nexus/controllers/account_data_controller.dart";
+import "package:nexus/controllers/client_state_controller.dart";
+import "package:nexus/controllers/init_complete_controller.dart";
+import "package:nexus/controllers/rooms_controller.dart";
+import "package:nexus/controllers/space_edges_controller.dart";
+import "package:nexus/controllers/sync_status_controller.dart";
+import "package:nexus/controllers/top_level_spaces_controller.dart";
 import "package:nexus/helpers/extensions/gomuks_buffer.dart";
 import "package:nexus/main.dart";
 import "package:nexus/models/event.dart";
-import "package:nexus/models/oauth_auth_code_response.dart";
 import "package:nexus/models/paginate.dart";
-import "package:nexus/models/requests/get_event.dart";
-import "package:nexus/models/requests/get_related_events.dart";
-import "package:nexus/models/requests/get_room_state.dart";
-import "package:nexus/models/requests/join_room.dart";
+import "package:nexus/models/requests/get_event_request.dart";
+import "package:nexus/models/requests/get_related_events_request.dart";
+import "package:nexus/models/requests/get_room_state_request.dart";
+import "package:nexus/models/requests/join_room_request.dart";
+import "package:nexus/models/requests/login_request.dart";
 import "package:nexus/models/profile.dart";
-import "package:nexus/models/requests/oauth/exchange_token.dart";
-import "package:nexus/models/requests/oauth/get_auth_url.dart";
-import "package:nexus/models/requests/oauth/register_client.dart";
-import "package:nexus/models/requests/paginate.dart";
-import "package:nexus/models/requests/redact_event.dart";
-import "package:nexus/models/requests/report.dart";
-import "package:nexus/models/requests/send_event.dart";
-import "package:nexus/models/requests/send_message.dart";
-import "package:nexus/models/requests/set_membership.dart";
-import "package:nexus/models/requests/set_state.dart";
+import "package:nexus/models/requests/paginate_request.dart";
+import "package:nexus/models/requests/redact_event_request.dart";
+import "package:nexus/models/requests/report_request.dart";
+import "package:nexus/models/requests/send_event_request.dart";
+import "package:nexus/models/requests/send_message_request.dart";
+import "package:nexus/models/requests/set_membership_request.dart";
 import "package:nexus/models/room.dart";
 import "package:nexus/models/sync_data.dart";
 import "package:nexus/src/third_party/gomuks.g.dart";
@ -163,10 +159,7 @@ class ClientController extends AsyncNotifier<int> {
    calloc.free(bufferPointer);

    final json = response.buf.toJson();
-    if (response.command.cast<Utf8>().toDartString() == "error") {
-      throw json;
-    }
-
+    if (json is String) throw json;
    return json;
  }

@ -176,27 +169,8 @@ class ClientController extends AsyncNotifier<int> {
  Future<Event> sendMessage(SendMessageRequest request) async =>
      Event.fromJson(await _sendCommand("send_message", request.toJson()));

-  Future<Event> sendEvent(SendEventRequest request) async {
-    final json = request.toJson();
-    final content = request.content.toJson();
-
-    return Event.fromJson(
-      await _sendCommand("send_event", {
-        ...json,
-        "content": {
-          ...content,
-          "m.relates_to": {
-            ...((content["m.relates_to"] as Map<String, dynamic>?) ?? {}),
-            "event_id": request.relatesTo,
-            "rel_type": request.relationType,
-          },
-        },
-      }),
-    );
-  }
-
-  Future<String?> setState(SetStateRequest request) async =>
-      await _sendCommand("set_state", request.toJson());
+  Future<Event> sendEvent(SendEventRequest request) async =>
+      Event.fromJson(await _sendCommand("send_event", request.toJson()));

  Future<String?> verify(String recoveryKey) async {
    try {
@ -266,8 +240,6 @@ class ClientController extends AsyncNotifier<int> {
  Future<void> setMembership(SetMembershipRequest request) =>
      _sendCommand("set_membership", request.toJson());

-  Future<void> logout() => _sendCommand("logout");
-
  Future<void> markRead(Room room) async {
    final eventRowId = room.timeline[room.timeline.keys.reduce(max)];
    final event = eventRowId == null ? null : room.events[eventRowId];
@ -280,19 +252,14 @@ class ClientController extends AsyncNotifier<int> {
    });
  }

-  Future<String> registerClient(OAuthRegisterClientRequest request) async =>
-      (await _sendCommand(
-        "oauth_register_client",
-        request.toJson(),
-      ))["client_id"];
-
-  Future<OAuthAuthCodeResponse> getAuthUrl(OAuthGetAuthUrl request) async =>
-      .fromJson(
-        await _sendCommand("oauth_get_authorization_url", request.toJson()),
-      );
-
-  Future<void> exchangeToken(OAuthExchangeTokenRequest request) async =>
-      await _sendCommand("oauth_exchange_token", request.toJson());
+  Future<String?> login(LoginRequest login) async {
+    try {
+      await _sendCommand("login", login.toJson());
+      return null;
+    } catch (error) {
+      return error.toString();
+    }
+  }

  Future<Uri?> discoverHomeserver(Uri homeserver) async {
    try {
--- a/lib/controllers/client_id.dart
+++ b/lib/controllers/client_id.dart
@ -1,33 +0,0 @@
-import "package:flutter_riverpod/flutter_riverpod.dart";
-import "package:nexus/controllers/client.dart";
-
-class ClientIdController extends AsyncNotifier<String> {
-  final Uri homeserver;
-  ClientIdController(this.homeserver);
-
-  @override
-  Future<String> build() => ref
-      .watch(ClientController.provider.notifier)
-      .registerClient(
-        .new(
-          clientName: "Nexus",
-          applicationType: .native,
-          grantTypes: .new([.authorizationCode, .refreshToken]),
-          responseTypes: .new([.code]),
-          logoUri: Uri.https(
-            "nexus.federated.nexus",
-            "raw/branch/main/assets/mobile.svg",
-          ),
-          homeserverUrl: homeserver,
-          clientUri: Uri.https("nexus.federated.nexus"),
-          redirectUris: .new([
-            .new(scheme: "nexus.federated.nexus", path: "/"),
-          ]),
-        ),
-      );
-
-  static final provider =
-      AsyncNotifierProvider.family<ClientIdController, String, Uri>(
-        ClientIdController.new,
-      );
-}
--- a/lib/controllers/client_state_controller.dart
+++ b/lib/controllers/client_state_controller.dart
--- a/lib/controllers/cross_cache_controller.dart
+++ b/lib/controllers/cross_cache_controller.dart
--- a/lib/controllers/emoji_controller.dart
+++ b/lib/controllers/emoji_controller.dart
--- a/lib/controllers/event_controller.dart
+++ b/lib/controllers/event_controller.dart
@ -1,9 +1,9 @@
 import "package:collection/collection.dart";
 import "package:flutter_riverpod/flutter_riverpod.dart";
-import "package:nexus/controllers/client.dart";
-import "package:nexus/controllers/rooms.dart";
+import "package:nexus/controllers/client_controller.dart";
+import "package:nexus/controllers/rooms_controller.dart";
 import "package:nexus/models/event.dart";
-import "package:nexus/models/requests/get_event.dart";
+import "package:nexus/models/requests/get_event_request.dart";

 class EventController extends AsyncNotifier<Event?> {
  final GetEventRequest request;
--- a/lib/controllers/header_controller.dart
+++ b/lib/controllers/header_controller.dart
@ -1,6 +1,6 @@
 import "package:flutter_riverpod/flutter_riverpod.dart";
-import "package:nexus/controllers/client.dart";
-import "package:nexus/controllers/client_state.dart";
+import "package:nexus/controllers/client_controller.dart";
+import "package:nexus/controllers/client_state_controller.dart";

 class HeaderController extends AsyncNotifier<Map<String, String>> {
  @override
--- a/lib/controllers/init_complete_controller.dart
+++ b/lib/controllers/init_complete_controller.dart
--- a/lib/controllers/key_controller.dart
+++ b/lib/controllers/key_controller.dart
@ -1,5 +1,5 @@
 import "package:flutter_riverpod/flutter_riverpod.dart";
-import "package:nexus/controllers/shared_prefs.dart";
+import "package:nexus/controllers/shared_prefs_controller.dart";

 class KeyController extends Notifier<String?> {
  final String key;
--- a/lib/controllers/members_by_status_controller.dart
+++ b/lib/controllers/members_by_status_controller.dart
@ -1,7 +1,7 @@
 import "package:fast_immutable_collections/fast_immutable_collections.dart";
 import "package:flutter_riverpod/flutter_riverpod.dart";
-import "package:nexus/controllers/members.dart";
-import "package:nexus/models/configs/members_by_status.dart";
+import "package:nexus/controllers/members_controller.dart";
+import "package:nexus/models/configs/members_by_status_config.dart";
 import "package:nexus/models/content/membership.dart";
 import "package:nexus/models/event.dart";

--- a/lib/controllers/members_controller.dart
+++ b/lib/controllers/members_controller.dart
@ -1,10 +1,10 @@
 import "package:fast_immutable_collections/fast_immutable_collections.dart";
 import "package:flutter_riverpod/flutter_riverpod.dart";
-import "package:nexus/controllers/client.dart";
-import "package:nexus/controllers/rooms.dart";
+import "package:nexus/controllers/client_controller.dart";
+import "package:nexus/controllers/rooms_controller.dart";
 import "package:nexus/models/content/content.dart";
 import "package:nexus/models/event.dart";
-import "package:nexus/models/requests/get_room_state.dart";
+import "package:nexus/models/requests/get_room_state_request.dart";

 class MembersController extends AsyncNotifier<ISet<Event>> {
  final String roomId;
--- a/lib/controllers/members_grouped_controller.dart
+++ b/lib/controllers/members_grouped_controller.dart
@ -1,9 +1,9 @@
 import "package:fast_immutable_collections/fast_immutable_collections.dart";
 import "package:flutter_riverpod/flutter_riverpod.dart";
-import "package:nexus/controllers/members_by_status.dart";
-import "package:nexus/controllers/room_creators.dart";
-import "package:nexus/controllers/rooms.dart";
-import "package:nexus/models/configs/members_by_status.dart";
+import "package:nexus/controllers/members_by_status_controller.dart";
+import "package:nexus/controllers/room_creators_controller.dart";
+import "package:nexus/controllers/rooms_controller.dart";
+import "package:nexus/models/configs/members_by_status_config.dart";
 import "package:nexus/models/content/content.dart";
 import "package:nexus/models/content/power_levels.dart";
 import "package:nexus/models/event.dart";
--- a/lib/controllers/multi_provider_controller.dart
+++ b/lib/controllers/multi_provider_controller.dart
--- a/lib/controllers/pinned_events.dart
+++ b/lib/controllers/pinned_events.dart
@ -1,30 +0,0 @@
-import "package:fast_immutable_collections/fast_immutable_collections.dart";
-import "package:hooks_riverpod/hooks_riverpod.dart";
-import "package:nexus/controllers/event.dart";
-import "package:nexus/controllers/pinned_ids.dart";
-import "package:nexus/models/event.dart";
-
-class PinnedEventsController extends AsyncNotifier<IList<Event>> {
-  final String roomId;
-  PinnedEventsController(this.roomId);
-
-  @override
-  Future<IList<Event>> build() async {
-    final pinIds = ref.watch(PinnedIdsController.provider(roomId));
-
-    return (await Future.wait(
-      pinIds.map(
-        (eventId) => ref.watch(
-          EventController.provider(
-            .new(eventId: eventId, roomId: roomId),
-          ).future,
-        ),
-      ),
-    )).nonNulls.toIList();
-  }
-
-  static final provider = AsyncNotifierProvider.family
-      .autoDispose<PinnedEventsController, IList<Event>, String>(
-        PinnedEventsController.new,
-      );
-}
--- a/lib/controllers/pinned_ids.dart
+++ b/lib/controllers/pinned_ids.dart
@ -1,53 +0,0 @@
-import "package:fast_immutable_collections/fast_immutable_collections.dart";
-import "package:hooks_riverpod/hooks_riverpod.dart";
-import "package:nexus/controllers/client.dart";
-import "package:nexus/controllers/rooms.dart";
-import "package:nexus/models/content/content.dart";
-import "package:nexus/models/content/pinned_events.dart";
-
-class PinnedIdsController extends Notifier<IList<String>> {
-  final String roomId;
-  PinnedIdsController(this.roomId);
-
-  @override
-  IList<String> build() {
-    final room = ref.watch(
-      RoomsController.provider.select((rooms) => rooms[roomId]),
-    );
-
-    if (room == null) return .new();
-
-    final pinnedRowId = room.state[EventType.pinnedEvents.type]?[""];
-    final pinnedStateEvent = pinnedRowId == null
-        ? null
-        : room.events[pinnedRowId];
-
-    if (pinnedStateEvent?.content case PinnedEventsContent content) {
-      return content.pinnedEvents;
-    }
-
-    return .new();
-  }
-
-  Future<void> addPin(String eventId) async =>
-      setPinned(.new(pinnedEvents: .new(state.add(eventId))));
-
-  Future<void> removePin(String eventId) async =>
-      setPinned(.new(pinnedEvents: .new(state.remove(eventId))));
-
-  Future<void> setPinned(PinnedEventsContent content) => ref
-      .read(ClientController.provider.notifier)
-      .setState(
-        .new(
-          roomId: roomId,
-          type: EventType.pinnedEvents.type,
-          stateKey: "",
-          content: content,
-        ),
-      );
-
-  static final provider = NotifierProvider.family
-      .autoDispose<PinnedIdsController, IList<String>, String>(
-        PinnedIdsController.new,
-      );
-}
--- a/lib/controllers/power_level_controller.dart
+++ b/lib/controllers/power_level_controller.dart
@ -1,8 +1,8 @@
 import "package:flutter_riverpod/flutter_riverpod.dart";
-import "package:nexus/controllers/client_state.dart";
-import "package:nexus/controllers/room_creators.dart";
-import "package:nexus/controllers/rooms.dart";
-import "package:nexus/models/configs/power_level.dart";
+import "package:nexus/controllers/client_state_controller.dart";
+import "package:nexus/controllers/room_creators_controller.dart";
+import "package:nexus/controllers/rooms_controller.dart";
+import "package:nexus/models/configs/power_level_config.dart";
 import "package:nexus/models/content/content.dart";
 import "package:nexus/models/content/power_levels.dart";

--- a/lib/controllers/profile_controller.dart
+++ b/lib/controllers/profile_controller.dart
@ -1,5 +1,5 @@
 import "package:flutter_riverpod/flutter_riverpod.dart";
-import "package:nexus/controllers/client.dart";
+import "package:nexus/controllers/client_controller.dart";
 import "package:nexus/models/profile.dart";

 class ProfileController extends AsyncNotifier<Profile> {
--- a/lib/controllers/reactions_controller.dart
+++ b/lib/controllers/reactions_controller.dart
@ -1,8 +1,8 @@
 import "package:fast_immutable_collections/fast_immutable_collections.dart";
 import "package:flutter_riverpod/flutter_riverpod.dart";
-import "package:nexus/controllers/client.dart";
-import "package:nexus/controllers/rooms.dart";
-import "package:nexus/models/configs/reactions.dart";
+import "package:nexus/controllers/client_controller.dart";
+import "package:nexus/controllers/rooms_controller.dart";
+import "package:nexus/models/configs/reactions_config.dart";
 import "package:nexus/models/content/reaction.dart";

 class ReactionsController extends AsyncNotifier<IMap<String, IList<String>>> {
--- a/lib/controllers/room_chat_controller.dart
+++ b/lib/controllers/room_chat_controller.dart
@ -4,14 +4,14 @@ import "package:collection/collection.dart";
 import "package:fast_immutable_collections/fast_immutable_collections.dart";
 import "package:flutter_riverpod/flutter_riverpod.dart";
 import "package:fluttertagger/fluttertagger.dart";
-import "package:nexus/controllers/client.dart";
-import "package:nexus/controllers/rooms.dart";
+import "package:nexus/controllers/client_controller.dart";
+import "package:nexus/controllers/rooms_controller.dart";
 import "package:nexus/models/content/content.dart";
 import "package:nexus/models/content/reaction.dart";
 import "package:nexus/models/event.dart";
-import "package:nexus/models/requests/redact_event.dart";
+import "package:nexus/models/requests/redact_event_request.dart";
 import "package:nexus/models/relation_type.dart";
-import "package:nexus/models/requests/send_message.dart";
+import "package:nexus/models/requests/send_message_request.dart";
 import "package:nexus/models/room.dart";

 class RoomChatController extends AsyncNotifier<IList<Event>?> {
@ -205,11 +205,15 @@ class RoomChatController extends AsyncNotifier<IList<Event>?> {
      .new(
        roomId: roomId,
        type: EventType.reaction.type,
-        content: ReactionContent(key: reaction),
+        content: {
+          "m.relates_to": {
+            "event_id": event.eventId,
+            "rel_type": "m.annotation",
+            "key": reaction,
+          },
+        },
        synchronous: true,
        disableEncryption: true,
-        relatesTo: event.eventId,
-        relationType: "m.annotation",
      ),
    );
  }
--- a/lib/controllers/room_creators_controller.dart
+++ b/lib/controllers/room_creators_controller.dart
--- a/lib/controllers/rooms_controller.dart
+++ b/lib/controllers/rooms_controller.dart
--- a/lib/controllers/settings.dart
+++ b/lib/controllers/settings.dart
@ -1,27 +0,0 @@
-import "dart:convert";
-import "package:flutter_riverpod/flutter_riverpod.dart";
-import "package:nexus/controllers/settings_file.dart";
-import "package:nexus/models/settings.dart";
-
-class SettingsController extends AsyncNotifier<Settings> {
-  @override
-  Future<Settings> build() async {
-    final file = await ref.watch(SettingsFileController.provider.future);
-
-    try {
-      return Settings.fromJson(json.decode(await file.readAsString()));
-    } catch (_) {
-      return Settings();
-    }
-  }
-
-  Future<void> set(Settings settings) async {
-    state = AsyncData(settings);
-    final file = await ref.watch(SettingsFileController.provider.future);
-    await file.writeAsString(json.encode(settings.toJson()));
-  }
-
-  static final provider = AsyncNotifierProvider<SettingsController, Settings>(
-    SettingsController.new,
-  );
-}
--- a/lib/controllers/settings_file.dart
+++ b/lib/controllers/settings_file.dart
@ -1,23 +0,0 @@
-import "dart:io";
-import "package:flutter_riverpod/flutter_riverpod.dart";
-import "package:path/path.dart";
-import "package:path_provider/path_provider.dart";
-import "package:xdg_directories/xdg_directories.dart";
-
-class SettingsFileController extends AsyncNotifier<File> {
-  @override
-  Future<File> build() async {
-    final directory = await switch (Platform.isLinux) {
-      true => Directory(
-        join(configHome.absolute.path, "nexus"),
-      ).create(recursive: true),
-      false => getApplicationSupportDirectory(),
-    };
-
-    return File(join(directory.absolute.path, "config.json"));
-  }
-
-  static final provider = AsyncNotifierProvider<SettingsFileController, File>(
-    SettingsFileController.new,
-  );
-}
--- a/lib/controllers/settings_sections.dart
+++ b/lib/controllers/settings_sections.dart
@ -1,135 +0,0 @@
-import "dart:io";
-import "package:fast_immutable_collections/fast_immutable_collections.dart";
-import "package:flutter/material.dart";
-import "package:flutter_riverpod/flutter_riverpod.dart";
-import "package:intl/intl.dart";
-import "package:m3e_buttons/m3e_buttons.dart";
-import "package:nexus/controllers/client.dart";
-import "package:nexus/controllers/settings.dart";
-import "package:nexus/models/settings_category.dart";
-import "package:nexus/main.dart";
-import "package:nexus/widgets/settings/dialog_list_tile.dart";
-
-class SettingsSectionsController
-    extends AsyncNotifier<IMap<String, IList<SettingsCategory>>> {
-  @override
-  Future<IMap<String, IList<SettingsCategory>>> build() async {
-    final settings = await ref.watch(SettingsController.provider.future);
-
-    return .new({
-      "General": .new([
-        .new(
-          title: "Appearance",
-          icon: Icons.brush,
-          settings: .new([
-            .new(
-              title: "Theme",
-              description:
-                  "Toggle between Light Mode, Dark Mode, and System themes.",
-              icon: Icons.contrast,
-              builder: (title, description, icon) => DialogListTile<ThemeMode>(
-                icon: Icon(icon),
-                title: title,
-                subtitle: Text(description),
-                initialValue: settings.theme,
-                options: ThemeMode.values,
-                getName: (option) => toBeginningOfSentenceCase(option.name),
-                onChanged: (value) => ref
-                    .watch(SettingsController.provider.notifier)
-                    .set(settings.copyWith(theme: value))
-                    .onError(showError),
-              ),
-            ),
-            .new(
-              title: "Use Dynamic Theme",
-              icon: Icons.palette,
-              description:
-                  "Toggle on or off Dynamic Theme. Only available on Android, Linux, Windows, or MacOS.",
-              builder: (title, description, icon) => SwitchListTile(
-                title: Text(title),
-                subtitle: Text(description),
-                secondary: Icon(icon),
-                value: settings.useDynamicTheming,
-                onChanged:
-                    (Platform.isAndroid ||
-                        Platform.isLinux ||
-                        Platform.isMacOS ||
-                        Platform.isWindows)
-                    ? (value) => ref
-                          .watch(SettingsController.provider.notifier)
-                          .set(settings.copyWith(useDynamicTheming: value))
-                          .onError(showError)
-                    : null,
-              ),
-            ),
-          ]),
-        ),
-        .new(
-          title: "Behavior",
-          icon: Icons.psychology,
-          settings: .new([
-            .new(
-              title: "Linux Mobile Mode",
-              description:
-                  "Enables some fixes for Linux mobile, e.g. disabling dragging appbar for moving window.",
-              icon: Icons.construction,
-              builder: (title, description, icon) => SwitchListTile(
-                title: Text(title),
-                subtitle: Text(description),
-                secondary: Icon(icon),
-                value: settings.linuxMobileMode,
-                onChanged: Platform.isLinux
-                    ? (value) => ref
-                          .watch(SettingsController.provider.notifier)
-                          .set(settings.copyWith(linuxMobileMode: value))
-                          .onError(showError)
-                    : null,
-              ),
-            ),
-          ]),
-        ),
-      ]),
-      "Account": .new([
-        .new(title: "Profile", icon: Icons.person, settings: .new([])),
-        .new(
-          title: "Other",
-          icon: Icons.key,
-          settings: .new([
-            .new(
-              title: "Log Out",
-              description:
-                  "Log out of your account, returning you to the login page.",
-              builder: (title, description, icon) => Builder(
-                builder: (context) {
-                  final colorScheme = Theme.of(context).colorScheme;
-                  return M3EButton.icon(
-                    onPressed: () async {
-                      await ref
-                          .watch(ClientController.provider.notifier)
-                          .logout();
-                      if (context.mounted) Navigator.of(context).pop();
-                    },
-                    label: Text(title),
-                    icon: Icon(icon),
-                    tooltip: description,
-                    decoration: .styleFrom(
-                      backgroundColor: colorScheme.errorContainer,
-                      foregroundColor: colorScheme.onErrorContainer,
-                    ),
-                  );
-                },
-              ),
-              icon: Icons.logout,
-            ),
-          ]),
-        ),
-      ]),
-    });
-  }
-
-  static final provider =
-      AsyncNotifierProvider.autoDispose<
-        SettingsSectionsController,
-        IMap<String, IList<SettingsCategory>>
-      >(SettingsSectionsController.new);
-}
--- a/lib/controllers/shared_prefs_controller.dart
+++ b/lib/controllers/shared_prefs_controller.dart
--- a/lib/controllers/space_edges_controller.dart
+++ b/lib/controllers/space_edges_controller.dart
--- a/lib/controllers/spaces_controller.dart
+++ b/lib/controllers/spaces_controller.dart
@ -2,10 +2,10 @@ import "package:collection/collection.dart";
 import "package:fast_immutable_collections/fast_immutable_collections.dart";
 import "package:flutter/material.dart";
 import "package:flutter_riverpod/flutter_riverpod.dart";
-import "package:nexus/controllers/account_data.dart";
-import "package:nexus/controllers/rooms.dart";
-import "package:nexus/controllers/top_level_spaces.dart";
-import "package:nexus/controllers/space_edges.dart";
+import "package:nexus/controllers/account_data_controller.dart";
+import "package:nexus/controllers/rooms_controller.dart";
+import "package:nexus/controllers/top_level_spaces_controller.dart";
+import "package:nexus/controllers/space_edges_controller.dart";
 import "package:nexus/models/room.dart";
 import "package:nexus/models/space.dart";
 import "package:nexus/models/subspace.dart";
--- a/lib/controllers/sync_status_controller.dart
+++ b/lib/controllers/sync_status_controller.dart
--- a/lib/controllers/top_level_spaces_controller.dart
+++ b/lib/controllers/top_level_spaces_controller.dart
--- a/lib/controllers/url_preview_controller.dart
+++ b/lib/controllers/url_preview_controller.dart
@ -1,8 +1,8 @@
 import "dart:convert";
 import "package:flutter_riverpod/flutter_riverpod.dart";
 import "package:http/http.dart";
-import "package:nexus/controllers/client_state.dart";
-import "package:nexus/controllers/header.dart";
+import "package:nexus/controllers/client_state_controller.dart";
+import "package:nexus/controllers/header_controller.dart";
 import "package:nexus/helpers/extensions/mxc_to_https.dart";
 import "package:nexus/models/open_graph_data.dart";

--- a/lib/controllers/user_controller.dart
+++ b/lib/controllers/user_controller.dart
@ -1,10 +1,10 @@
 import "dart:async";
 import "package:collection/collection.dart";
 import "package:flutter_riverpod/flutter_riverpod.dart";
-import "package:nexus/controllers/members.dart";
-import "package:nexus/controllers/profile.dart";
+import "package:nexus/controllers/members_controller.dart";
+import "package:nexus/controllers/profile_controller.dart";
 import "package:nexus/helpers/extensions/get_localpart.dart";
-import "package:nexus/models/configs/user.dart";
+import "package:nexus/models/configs/user_config.dart";
 import "package:nexus/models/content/membership.dart";

 class UserController extends AsyncNotifier<MembershipContent> {
--- a/lib/controllers/via_controller.dart
+++ b/lib/controllers/via_controller.dart
@ -1,7 +1,7 @@
 import "package:collection/collection.dart";
 import "package:fast_immutable_collections/fast_immutable_collections.dart";
 import "package:flutter_riverpod/flutter_riverpod.dart";
-import "package:nexus/controllers/client_state.dart";
+import "package:nexus/controllers/client_state_controller.dart";
 import "package:nexus/models/content/content.dart";
 import "package:nexus/models/content/membership.dart";
 import "package:nexus/models/content/power_levels.dart";
--- a/lib/helpers/extensions/get_headers.dart
+++ b/lib/helpers/extensions/get_headers.dart
@ -1,5 +1,5 @@
 import "package:flutter_riverpod/flutter_riverpod.dart";
-import "package:nexus/controllers/header.dart";
+import "package:nexus/controllers/header_controller.dart";

 extension GetHeaders on WidgetRef {
  Map<String, String> get headers =>
--- a/lib/helpers/extensions/scheme_to_theme.dart
+++ b/lib/helpers/extensions/scheme_to_theme.dart
@ -12,7 +12,7 @@ extension SchemeToTheme on ColorScheme {
      backgroundColor: surfaceContainerLow,
    ),
    textTheme: ThemeData(
-      fontFamilyFallback: ["sans", "emoji", "fallback-sans", "fallback-emoji"],
+      fontFamilyFallback: ["sans", "emoji"],
      brightness: brightness,
    ).textTheme,
    inputDecorationTheme: const InputDecorationTheme(
--- a/lib/helpers/extensions/show_about_dialog.dart
+++ b/lib/helpers/extensions/show_about_dialog.dart
@ -1,83 +0,0 @@
-import "package:flutter/material.dart";
-import "package:flutter_svg/flutter_svg.dart";
-import "package:hooks_riverpod/hooks_riverpod.dart";
-import "package:m3e_card_list/m3e_card_list.dart";
-import "package:nexus/helpers/launch_helper.dart";
-import "package:package_info_plus/package_info_plus.dart";
-
-extension ShowContextMenu on BuildContext {
-  Future<void> showAboutDialog(WidgetRef ref) async {
-    final packageInfo = await PackageInfo.fromPlatform();
-
-    if (mounted) {
-      showDialog(
-        context: this,
-        builder: (context) => AlertDialog(
-          content: Column(
-            mainAxisSize: .min,
-            spacing: 16,
-            children: [
-              Row(
-                spacing: 12,
-                children: [
-                  SvgPicture.asset("assets/icon.svg", width: 64),
-                  Expanded(
-                    child: Column(
-                      crossAxisAlignment: .start,
-                      children: [
-                        Wrap(
-                          crossAxisAlignment: .center,
-                          spacing: 4,
-                          children: [
-                            Text(
-                              "Nexus",
-                              style: Theme.of(context).textTheme.headlineMedium,
-                            ),
-                            Text("(${packageInfo.version})"),
-                          ],
-                        ),
-
-                        Text(
-                          "A simple and user-friendly Matrix client",
-                          overflow: .ellipsis,
-                          style: Theme.of(context).textTheme.titleMedium,
-                        ),
-                      ],
-                    ),
-                  ),
-                ],
-              ),
-              M3ECardColumn(
-                onTap: (index) =>
-                    ref.watch(LaunchHelper.provider).launchUrl(switch (index) {
-                      0 => Uri.https("git.federated.nexus", "nexus/nexus"),
-                      _ => Uri.https("liberapay.com", "QuadRadical"),
-                    }),
-                children: [
-                  ListTile(
-                    leading: Icon(Icons.commit),
-                    title: Text("Source Code"),
-                  ),
-                  ListTile(
-                    leading: Icon(Icons.favorite, color: Colors.pinkAccent),
-                    title: Text("Donate"),
-                  ),
-                ],
-              ),
-            ],
-          ),
-          actions: [
-            TextButton(
-              onPressed: () => showLicensePage(context: context),
-              child: Text("View licenses"),
-            ),
-            TextButton(
-              onPressed: Navigator.of(context).pop,
-              child: Text("Close"),
-            ),
-          ],
-        ),
-      );
-    }
-  }
-}
--- a/lib/helpers/font_licenses.dart
+++ b/lib/helpers/font_licenses.dart
@ -1,196 +0,0 @@
-import "package:flutter/foundation.dart";
-
-const fontLicenses = [
-  LicenseEntryWithLineBreaks(
-    ["Noto Color Emoji"],
-    """Copyright 2021 Google Inc. All Rights Reserved.
-
-This Font Software is licensed under the SIL Open Font License, Version 1.1.
-This license is copied below, and is also available with a FAQ at:
-https://openfontlicense.org
-
-
-----------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
-----------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide a free and
-open framework in which fonts may be shared and improved in partnership
-with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded, 
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply
-to any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components as
-distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting -- in part or in whole -- any of the components of the
-Original Version, by changing formats or by porting the Font Software to a
-new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,
-in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the corresponding
-Copyright Holder. This restriction only applies to the primary font name as
-presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created
-using the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.""",
-  ),
-  LicenseEntryWithLineBreaks(
-    ["Roboto"],
-    """Copyright 2011 The Roboto Project Authors (https://github.com/googlefonts/roboto-classic)
-
-This Font Software is licensed under the SIL Open Font License, Version 1.1.
-This license is copied below, and is also available with a FAQ at:
-https://openfontlicense.org
-
-
-----------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
-----------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide a free and
-open framework in which fonts may be shared and improved in partnership
-with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded, 
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply
-to any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components as
-distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting -- in part or in whole -- any of the components of the
-Original Version, by changing formats or by porting the Font Software to a
-new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,
-in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the corresponding
-Copyright Holder. This restriction only applies to the primary font name as
-presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created
-using the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.""",
-  ),
-];
--- a/lib/main.dart
+++ b/lib/main.dart
@ -4,18 +4,16 @@ import "package:fast_immutable_collections/fast_immutable_collections.dart";
 import "package:flutter/foundation.dart";
 import "package:flutter_riverpod/flutter_riverpod.dart";
 import "package:media_kit/media_kit.dart";
-import "package:nexus/controllers/client.dart";
-import "package:nexus/controllers/client_state.dart";
-import "package:nexus/controllers/header.dart";
-import "package:nexus/controllers/multi_provider.dart";
-import "package:nexus/controllers/settings.dart";
-import "package:nexus/controllers/shared_prefs.dart";
+import "package:nexus/controllers/client_controller.dart";
+import "package:nexus/controllers/client_state_controller.dart";
+import "package:nexus/controllers/header_controller.dart";
+import "package:nexus/controllers/multi_provider_controller.dart";
+import "package:nexus/controllers/shared_prefs_controller.dart";
 import "package:nexus/helpers/extensions/better_when.dart";
 import "package:nexus/helpers/extensions/scheme_to_theme.dart";
-import "package:nexus/helpers/font_licenses.dart";
-import "package:nexus/pages/chat.dart";
-import "package:nexus/pages/select_server.dart";
-import "package:nexus/pages/verify.dart";
+import "package:nexus/pages/chat_page.dart";
+import "package:nexus/pages/select_server_page.dart";
+import "package:nexus/pages/verify_page.dart";
 import "package:nexus/widgets/error_dialog.dart";
 import "package:nexus/widgets/loading.dart";
 import "package:window_manager/window_manager.dart";
@ -72,14 +70,11 @@ void main() async {
    await windowManager.setMinimumSize(Size.square(500));
  }

-  LicenseRegistry.addLicense(() => Stream.fromIterable(fontLicenses));
-
  FlutterError.onError = (FlutterErrorDetails details) =>
      showError(details.exception.toString(), details.stack);

  runApp(
    ProviderScope(
-      retry: null,
      observers: [
        // Change false to true if you want debug information on provider reloads
        // ignore: dead_code
@ -95,43 +90,20 @@ class App extends StatelessWidget {

  @override
  Widget build(BuildContext context) => DynamicColorBuilder(
-    builder: (lightDynamic, darkDynamic) => Consumer(
-      builder: (context, ref, child) => MaterialApp(
+    builder: (lightDynamic, darkDynamic) => MaterialApp(
      navigatorKey: navigatorKey,
      debugShowCheckedModeBanner: false,
      // Use indigo to work around bugs in theme generation
-        theme:
-            (ref
-                        .watch(SettingsController.provider)
-                        .maybeWhen(
-                          orElse: () => lightDynamic,
-                          data: (settings) =>
-                              settings.useDynamicTheming ? lightDynamic : null,
-                        ) ??
-                    ColorScheme.fromSeed(seedColor: Colors.indigo))
+      theme: (lightDynamic ?? ColorScheme.fromSeed(seedColor: Colors.indigo))
          .theme,
      darkTheme:
-            (ref
-                        .watch(SettingsController.provider)
-                        .maybeWhen(
-                          orElse: () => darkDynamic,
-                          data: (settings) =>
-                              settings.useDynamicTheming ? darkDynamic : null,
-                        ) ??
+          (darkDynamic ??
                  ColorScheme.fromSeed(
                    seedColor: Colors.indigo,
                    brightness: Brightness.dark,
                  ))
              .theme,
-        themeMode: ref
-            .watch(SettingsController.provider)
-            .maybeWhen(
-              data: (settings) => settings.theme,
-              orElse: () => ThemeMode.system,
-            ),
-        home: child,
-      ),
-      child: Scaffold(
+      home: Scaffold(
        body: Consumer(
          builder: (_, ref, _) => ref
              .watch(
--- a/lib/models/configs/members_by_status_config.dart
+++ b/lib/models/configs/members_by_status_config.dart
@ -1,7 +1,7 @@
 import "package:freezed_annotation/freezed_annotation.dart";
 import "package:nexus/models/membership_status.dart";
-part "members_by_status.freezed.dart";
-part "members_by_status.g.dart";
+part "members_by_status_config.freezed.dart";
+part "members_by_status_config.g.dart";

@freezed
 abstract class MembersByStatusConfig with _$MembersByStatusConfig {
--- a/Show more
+++ b/Show more
				`@ -0,0 +1 @@`
				{"images":[{"size":"20x20","idiom":"iphone","filename":"Icon-App-20x20@2x.png","scale":"2x"},{"size":"20x20","idiom":"iphone","filename":"Icon-App-20x20@3x.png","scale":"3x"},{"size":"29x29","idiom":"iphone","filename":"Icon-App-29x29@1x.png","scale":"1x"},{"size":"29x29","idiom":"iphone","filename":"Icon-App-29x29@2x.png","scale":"2x"},{"size":"29x29","idiom":"iphone","filename":"Icon-App-29x29@3x.png","scale":"3x"},{"size":"40x40","idiom":"iphone","filename":"Icon-App-40x40@2x.png","scale":"2x"},{"size":"40x40","idiom":"iphone","filename":"Icon-App-40x40@3x.png","scale":"3x"},{"size":"57x57","idiom":"iphone","filename":"Icon-App-57x57@1x.png","scale":"1x"},{"size":"57x57","idiom":"iphone","filename":"Icon-App-57x57@2x.png","scale":"2x"},{"size":"60x60","idiom":"iphone","filename":"Icon-App-60x60@2x.png","scale":"2x"},{"size":"60x60","idiom":"iphone","filename":"Icon-App-60x60@3x.png","scale":"3x"},{"size":"20x20","idiom":"ipad","filename":"Icon-App-20x20@1x.png","scale":"1x"},{"size":"20x20","idiom":"ipad","filename":"Icon-App-20x20@2x.png","scale":"2x"},{"size":"29x29","idiom":"ipad","filename":"Icon-App-29x29@1x.png","scale":"1x"},{"size":"29x29","idiom":"ipad","filename":"Icon-App-29x29@2x.png","scale":"2x"},{"size":"40x40","idiom":"ipad","filename":"Icon-App-40x40@1x.png","scale":"1x"},{"size":"40x40","idiom":"ipad","filename":"Icon-App-40x40@2x.png","scale":"2x"},{"size":"50x50","idiom":"ipad","filename":"Icon-App-50x50@1x.png","scale":"1x"},{"size":"50x50","idiom":"ipad","filename":"Icon-App-50x50@2x.png","scale":"2x"},{"size":"72x72","idiom":"ipad","filename":"Icon-App-72x72@1x.png","scale":"1x"},{"size":"72x72","idiom":"ipad","filename":"Icon-App-72x72@2x.png","scale":"2x"},{"size":"76x76","idiom":"ipad","filename":"Icon-App-76x76@1x.png","scale":"1x"},{"size":"76x76","idiom":"ipad","filename":"Icon-App-76x76@2x.png","scale":"2x"},{"size":"83.5x83.5","idiom":"ipad","filename":"Icon-App-83.5x83.5@2x.png","scale":"2x"},{"size":"1024x1024","idiom":"ios-marketing","filename":"Icon-App-1024x1024@1x.png","scale":"1x"}],"info":{"version":1,"author":"xcode"}}