move full module and reorganize folders

Podfile

@@ -11,9 +11,9 @@ use_frameworks!
 # - `{ {kit spec hash} => {sdk spec hash}` to depend on specific pod options (:git => …, :podspec => …) for each repo. Used by Fastfile during CI
 #
 # Warning: our internal tooling depends on the name of this variable name, so be sure not to change it
-$matrixKitVersion = '= 0.15.7'
+# $matrixKitVersion = '= 0.15.7'
 # $matrixKitVersion = :local
-# $matrixKitVersion = {'develop' => 'develop'}
+$matrixKitVersion = {'develop' => 'develop'}
 
 ########################################
 
@@ -46,7 +46,7 @@ abstract_target 'RiotPods' do
   pod 'GBDeviceInfo', '~> 6.6.0'
   pod 'Reusable', '~> 4.1'
   pod 'KeychainAccess', '~> 4.2.2'
- 
+
   # Piwik for analytics
   pod 'MatomoTracker', '~> 7.4.1'
 
@@ -103,7 +103,7 @@ post_install do |installer|
       # Plus the app does not enable it
       config.build_settings['ENABLE_BITCODE'] = 'NO'
 
-      # Make fastlane(xcodebuild) happy by preventing it from building for arm64 simulator 
+      # Make fastlane(xcodebuild) happy by preventing it from building for arm64 simulator
       config.build_settings["EXCLUDED_ARCHS[sdk=iphonesimulator*]"] = "arm64"
 
       # Force ReadMoreTextView to use Swift 5.2 version (as there is no code changes to perform)
@@ -111,7 +111,7 @@ post_install do |installer|
         config.build_settings['SWIFT_VERSION'] = '5.2'
       end
 
-      # Stop Xcode 12 complaining about old IPHONEOS_DEPLOYMENT_TARGET from pods 
+      # Stop Xcode 12 complaining about old IPHONEOS_DEPLOYMENT_TARGET from pods
       config.build_settings.delete 'IPHONEOS_DEPLOYMENT_TARGET'
     end
   end

RiotSwiftUI/Modules/Room/NotificationSettings/Model/RoomNotificationSettingsViewState.swift

@@ -0,0 +1,43 @@
+// 
+// Copyright 2021 New Vector Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+import Foundation
+
+/// RoomNotificationSettingsViewController view state
+struct RoomNotificationSettingsViewState: RoomNotificationSettingsViewStateType {
+    let roomEncrypted: Bool
+    var saving: Bool
+    var notificationState: RoomNotificationState
+    var avatarData: AvatarType?
+    var displayName: String?
+}
+
+extension RoomNotificationSettingsViewState {
+    var notificationOptions: [RoomNotificationState] {
+        if roomEncrypted {
+            return [.all, .mute]
+        } else {
+            return RoomNotificationState.allCases
+        }
+    }
+}
+
+extension RoomNotificationSettingsViewState {
+    var roomEncryptedString: String {
+        roomEncrypted ? VectorL10n.roomNotifsSettingsEncryptedRoomNotice : ""
+    }
+}
+

RiotSwiftUI/Modules/Room/NotificationSettings/Model/RoomNotificationSettingsViewStateType.swift

@@ -18,25 +18,6 @@
 
 import Foundation
 
-/// RoomNotificationSettingsViewController view state
-struct RoomNotificationSettingsViewState: RoomNotificationSettingsViewStateType {
-    let roomEncrypted: Bool
-    var saving: Bool
-    var notificationState: RoomNotificationState
-    var avatarData: AvatarType?
-    var displayName: String?
-}
-
-extension RoomNotificationSettingsViewState {
-    var notificationOptions: [RoomNotificationState] {
-        if roomEncrypted {
-            return [.all, .mute]
-        } else {
-            return RoomNotificationState.allCases
-        }
-    }
-}
-
 protocol RoomNotificationSettingsViewStateType {
     var saving: Bool { get }
     var roomEncrypted: Bool { get }
@@ -46,8 +27,3 @@ protocol RoomNotificationSettingsViewStateType {
     var displayName: String? { get }
 }
 
-extension RoomNotificationSettingsViewState {
-    var roomEncryptedString: String {
-        roomEncrypted ? VectorL10n.roomNotifsSettingsEncryptedRoomNotice : ""
-    }
-}