From 6c48ecf0ccdd0006ba8a0ebe73ca872bacd27cca Mon Sep 17 00:00:00 2001
From: manuroe <manu@matrix.org>
Date: Thu, 4 Apr 2019 16:51:28 +0200
Subject: [PATCH 01/13] Productivity: Create templates for screens and flow
 root coordinators

---
 Riot.xcodeproj/project.pbxproj                | 121 ++++++++++++
 Riot/Generated/Storyboards.swift              |   5 +
 Tools/SwiftGen/swiftgen-config.yml            |   1 +
 Tools/Templates/README.md                     |  24 +++
 .../FlowTemplateCoordinator.swift             |  77 ++++++++
 ...owTemplateCoordinatorBridgePresenter.swift |  77 ++++++++
 .../FlowTemplateCoordinatorType.swift         |  26 +++
 .../TemplateScreenCoordinator.swift           |  68 +++++++
 .../TemplateScreenCoordinatorType.swift       |  27 +++
 .../TemplateScreenViewAction.swift            |  24 +++
 .../TemplateScreenViewController.storyboard   |  92 +++++++++
 .../TemplateScreenViewController.swift        | 185 ++++++++++++++++++
 .../TemplateScreenViewModel.swift             |  85 ++++++++
 .../TemplateScreenViewModelType.swift         |  37 ++++
 .../TemplateScreenViewState.swift             |  24 +++
 Tools/Templates/createScreen.sh               |   0
 16 files changed, 873 insertions(+)
 create mode 100644 Tools/Templates/README.md
 create mode 100644 Tools/Templates/buildable/FlowCoordinatorTemplate/FlowTemplateCoordinator.swift
 create mode 100644 Tools/Templates/buildable/FlowCoordinatorTemplate/FlowTemplateCoordinatorBridgePresenter.swift
 create mode 100644 Tools/Templates/buildable/FlowCoordinatorTemplate/FlowTemplateCoordinatorType.swift
 create mode 100644 Tools/Templates/buildable/ScreenTemplate/TemplateScreenCoordinator.swift
 create mode 100644 Tools/Templates/buildable/ScreenTemplate/TemplateScreenCoordinatorType.swift
 create mode 100644 Tools/Templates/buildable/ScreenTemplate/TemplateScreenViewAction.swift
 create mode 100644 Tools/Templates/buildable/ScreenTemplate/TemplateScreenViewController.storyboard
 create mode 100644 Tools/Templates/buildable/ScreenTemplate/TemplateScreenViewController.swift
 create mode 100644 Tools/Templates/buildable/ScreenTemplate/TemplateScreenViewModel.swift
 create mode 100644 Tools/Templates/buildable/ScreenTemplate/TemplateScreenViewModelType.swift
 create mode 100644 Tools/Templates/buildable/ScreenTemplate/TemplateScreenViewState.swift
 create mode 100644 Tools/Templates/createScreen.sh

diff --git a/Riot.xcodeproj/project.pbxproj b/Riot.xcodeproj/project.pbxproj
index f4f6d4f54..13c95d8fc 100644
--- a/Riot.xcodeproj/project.pbxproj
+++ b/Riot.xcodeproj/project.pbxproj
@@ -22,6 +22,20 @@
 		32242F1721E8FBE500725742 /* Theme.swift in Sources */ = {isa = PBXBuildFile; fileRef = 32242F0D21E8FBA900725742 /* Theme.swift */; };
 		32242F1821E8FBF800725742 /* DefaultTheme.swift in Sources */ = {isa = PBXBuildFile; fileRef = 32242F0F21E8FBA900725742 /* DefaultTheme.swift */; };
 		32242F1921E8FBFB00725742 /* DarkTheme.swift in Sources */ = {isa = PBXBuildFile; fileRef = 32242F1021E8FBA900725742 /* DarkTheme.swift */; };
+		3232AB1422564D9100AD6A5C /* swiftgen-config.yml in Resources */ = {isa = PBXBuildFile; fileRef = 3232AB0022564D9100AD6A5C /* swiftgen-config.yml */; };
+		3232AB1522564D9100AD6A5C /* flat-swift4-vector.stencil in Resources */ = {isa = PBXBuildFile; fileRef = 3232AB0322564D9100AD6A5C /* flat-swift4-vector.stencil */; };
+		3232AB2122564D9100AD6A5C /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = 3232AB1322564D9100AD6A5C /* README.md */; };
+		3232AB482256558300AD6A5C /* FlowTemplateCoordinatorType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3232AB3C2256558300AD6A5C /* FlowTemplateCoordinatorType.swift */; };
+		3232AB492256558300AD6A5C /* FlowTemplateCoordinatorBridgePresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3232AB3D2256558300AD6A5C /* FlowTemplateCoordinatorBridgePresenter.swift */; };
+		3232AB4A2256558300AD6A5C /* FlowTemplateCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3232AB3E2256558300AD6A5C /* FlowTemplateCoordinator.swift */; };
+		3232AB4B2256558300AD6A5C /* TemplateScreenViewController.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3232AB402256558300AD6A5C /* TemplateScreenViewController.storyboard */; };
+		3232AB4C2256558300AD6A5C /* TemplateScreenCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3232AB412256558300AD6A5C /* TemplateScreenCoordinator.swift */; };
+		3232AB4D2256558300AD6A5C /* TemplateScreenCoordinatorType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3232AB422256558300AD6A5C /* TemplateScreenCoordinatorType.swift */; };
+		3232AB4E2256558300AD6A5C /* TemplateScreenViewModelType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3232AB432256558300AD6A5C /* TemplateScreenViewModelType.swift */; };
+		3232AB4F2256558300AD6A5C /* TemplateScreenViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3232AB442256558300AD6A5C /* TemplateScreenViewController.swift */; };
+		3232AB502256558300AD6A5C /* TemplateScreenViewState.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3232AB452256558300AD6A5C /* TemplateScreenViewState.swift */; };
+		3232AB512256558300AD6A5C /* TemplateScreenViewAction.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3232AB462256558300AD6A5C /* TemplateScreenViewAction.swift */; };
+		3232AB522256558300AD6A5C /* TemplateScreenViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3232AB472256558300AD6A5C /* TemplateScreenViewModel.swift */; };
 		3233F7461F3497E2006ACA81 /* JitsiMeet.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3233F7441F3497DA006ACA81 /* JitsiMeet.framework */; };
 		3233F7471F3497E2006ACA81 /* JitsiMeet.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3233F7441F3497DA006ACA81 /* JitsiMeet.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		3275FD8C21A5A2C500B9C13D /* TermsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3275FD8B21A5A2C500B9C13D /* TermsView.swift */; };
@@ -477,6 +491,20 @@
 		32242F0F21E8FBA900725742 /* DefaultTheme.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DefaultTheme.swift; sourceTree = "<group>"; };
 		32242F1021E8FBA900725742 /* DarkTheme.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DarkTheme.swift; sourceTree = "<group>"; };
 		32242F1121E8FBA900725742 /* ThemeService.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThemeService.h; sourceTree = "<group>"; };
+		3232AB0022564D9100AD6A5C /* swiftgen-config.yml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "swiftgen-config.yml"; sourceTree = "<group>"; };
+		3232AB0322564D9100AD6A5C /* flat-swift4-vector.stencil */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "flat-swift4-vector.stencil"; sourceTree = "<group>"; };
+		3232AB1322564D9100AD6A5C /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
+		3232AB3C2256558300AD6A5C /* FlowTemplateCoordinatorType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FlowTemplateCoordinatorType.swift; sourceTree = "<group>"; };
+		3232AB3D2256558300AD6A5C /* FlowTemplateCoordinatorBridgePresenter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FlowTemplateCoordinatorBridgePresenter.swift; sourceTree = "<group>"; };
+		3232AB3E2256558300AD6A5C /* FlowTemplateCoordinator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FlowTemplateCoordinator.swift; sourceTree = "<group>"; };
+		3232AB402256558300AD6A5C /* TemplateScreenViewController.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = TemplateScreenViewController.storyboard; sourceTree = "<group>"; };
+		3232AB412256558300AD6A5C /* TemplateScreenCoordinator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TemplateScreenCoordinator.swift; sourceTree = "<group>"; };
+		3232AB422256558300AD6A5C /* TemplateScreenCoordinatorType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TemplateScreenCoordinatorType.swift; sourceTree = "<group>"; };
+		3232AB432256558300AD6A5C /* TemplateScreenViewModelType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TemplateScreenViewModelType.swift; sourceTree = "<group>"; };
+		3232AB442256558300AD6A5C /* TemplateScreenViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TemplateScreenViewController.swift; sourceTree = "<group>"; };
+		3232AB452256558300AD6A5C /* TemplateScreenViewState.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TemplateScreenViewState.swift; sourceTree = "<group>"; };
+		3232AB462256558300AD6A5C /* TemplateScreenViewAction.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TemplateScreenViewAction.swift; sourceTree = "<group>"; };
+		3232AB472256558300AD6A5C /* TemplateScreenViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TemplateScreenViewModel.swift; sourceTree = "<group>"; };
 		3233F7441F3497DA006ACA81 /* JitsiMeet.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = JitsiMeet.framework; sourceTree = "<group>"; };
 		3267EFB320E379FD00FF1CAA /* CHANGES.rst */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CHANGES.rst; sourceTree = "<group>"; };
 		3267EFB420E379FD00FF1CAA /* Podfile */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; fileEncoding = 4; path = Podfile; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
@@ -1161,6 +1189,83 @@
 			path = Themes;
 			sourceTree = "<group>";
 		};
+		3232AAFE22564D9100AD6A5C /* Tools */ = {
+			isa = PBXGroup;
+			children = (
+				3232AAFF22564D9100AD6A5C /* SwiftGen */,
+				3232AB0422564D9100AD6A5C /* Templates */,
+			);
+			path = Tools;
+			sourceTree = "<group>";
+		};
+		3232AAFF22564D9100AD6A5C /* SwiftGen */ = {
+			isa = PBXGroup;
+			children = (
+				3232AB0022564D9100AD6A5C /* swiftgen-config.yml */,
+				3232AB0122564D9100AD6A5C /* Templates */,
+			);
+			path = SwiftGen;
+			sourceTree = "<group>";
+		};
+		3232AB0122564D9100AD6A5C /* Templates */ = {
+			isa = PBXGroup;
+			children = (
+				3232AB0222564D9100AD6A5C /* Strings */,
+			);
+			path = Templates;
+			sourceTree = "<group>";
+		};
+		3232AB0222564D9100AD6A5C /* Strings */ = {
+			isa = PBXGroup;
+			children = (
+				3232AB0322564D9100AD6A5C /* flat-swift4-vector.stencil */,
+			);
+			path = Strings;
+			sourceTree = "<group>";
+		};
+		3232AB0422564D9100AD6A5C /* Templates */ = {
+			isa = PBXGroup;
+			children = (
+				3232AB1322564D9100AD6A5C /* README.md */,
+				3232AB0522564D9100AD6A5C /* buildable */,
+			);
+			path = Templates;
+			sourceTree = "<group>";
+		};
+		3232AB0522564D9100AD6A5C /* buildable */ = {
+			isa = PBXGroup;
+			children = (
+				3232AB3B2256558300AD6A5C /* FlowCoordinatorTemplate */,
+				3232AB3F2256558300AD6A5C /* ScreenTemplate */,
+			);
+			path = buildable;
+			sourceTree = "<group>";
+		};
+		3232AB3B2256558300AD6A5C /* FlowCoordinatorTemplate */ = {
+			isa = PBXGroup;
+			children = (
+				3232AB3C2256558300AD6A5C /* FlowTemplateCoordinatorType.swift */,
+				3232AB3D2256558300AD6A5C /* FlowTemplateCoordinatorBridgePresenter.swift */,
+				3232AB3E2256558300AD6A5C /* FlowTemplateCoordinator.swift */,
+			);
+			path = FlowCoordinatorTemplate;
+			sourceTree = "<group>";
+		};
+		3232AB3F2256558300AD6A5C /* ScreenTemplate */ = {
+			isa = PBXGroup;
+			children = (
+				3232AB402256558300AD6A5C /* TemplateScreenViewController.storyboard */,
+				3232AB412256558300AD6A5C /* TemplateScreenCoordinator.swift */,
+				3232AB422256558300AD6A5C /* TemplateScreenCoordinatorType.swift */,
+				3232AB432256558300AD6A5C /* TemplateScreenViewModelType.swift */,
+				3232AB442256558300AD6A5C /* TemplateScreenViewController.swift */,
+				3232AB452256558300AD6A5C /* TemplateScreenViewState.swift */,
+				3232AB462256558300AD6A5C /* TemplateScreenViewAction.swift */,
+				3232AB472256558300AD6A5C /* TemplateScreenViewModel.swift */,
+			);
+			path = ScreenTemplate;
+			sourceTree = "<group>";
+		};
 		3233F7291F31F3B4006ACA81 /* libs */ = {
 			isa = PBXGroup;
 			children = (
@@ -2920,6 +3025,7 @@
 				F094A9A31B78D8F000B1FBBF /* Products */,
 				5FC42FA41F5186AFFB6A2404 /* Frameworks */,
 				A237FB70534FB8ADA0D7CFEE /* Pods */,
+				3232AAFE22564D9100AD6A5C /* Tools */,
 			);
 			sourceTree = "<group>";
 			usesTabs = 0;
@@ -3076,6 +3182,7 @@
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
+				English,
 				en,
 				Base,
 				nl,
@@ -3193,17 +3300,21 @@
 				B1B5573720EE6C4D00210D55 /* GroupParticipantsViewController.xib in Resources */,
 				B110872421F098F0003554A5 /* ActivityIndicatorView.xib in Resources */,
 				B1B5573320EE6C4D00210D55 /* GroupHomeViewController.xib in Resources */,
+				3232AB2122564D9100AD6A5C /* README.md in Resources */,
 				B1B5593920EF7BAC00210D55 /* TableViewCellWithCheckBoxes.xib in Resources */,
 				B1B557C120EF5B4500210D55 /* DisabledRoomInputToolbarView.xib in Resources */,
 				B1664DA320F4F96200808783 /* Vector.strings in Resources */,
 				B1B557C720EF5CD400210D55 /* DirectoryServerDetailTableViewCell.xib in Resources */,
 				B1B5582620EF638A00210D55 /* RoomMemberTitleView.xib in Resources */,
+				3232AB1522564D9100AD6A5C /* flat-swift4-vector.stencil in Resources */,
 				F083BDE61E7009ED00A9B29C /* busy.mp3 in Resources */,
 				B1B5574C20EE6C4D00210D55 /* MediaAlbumContentViewController.xib in Resources */,
 				B1B557E820EF60F500210D55 /* MessagesSearchResultTextMsgBubbleCell.xib in Resources */,
 				B1B558D920EF768F00210D55 /* RoomOutgoingEncryptedAttachmentBubbleCell.xib in Resources */,
 				B1B5573020EE6C4D00210D55 /* BugReportViewController.xib in Resources */,
 				B169329B20F39E6300746532 /* Main.storyboard in Resources */,
+				3232AB1422564D9100AD6A5C /* swiftgen-config.yml in Resources */,
+				3232AB4B2256558300AD6A5C /* TemplateScreenViewController.storyboard in Resources */,
 				32B1FEDB21A46F2C00637127 /* TermsView.xib in Resources */,
 				B1B5578E20EF568D00210D55 /* GroupInviteTableViewCell.xib in Resources */,
 				B1B5582020EF625800210D55 /* SimpleRoomTitleView.xib in Resources */,
@@ -3467,6 +3578,7 @@
 				B1FDF56021F5FE5500BA3834 /* KeyBackupSetupPassphraseViewAction.swift in Sources */,
 				B1B5573120EE6C4D00210D55 /* BugReportViewController.m in Sources */,
 				B16932A520F3A21C00746532 /* empty.mm in Sources */,
+				3232AB4A2256558300AD6A5C /* FlowTemplateCoordinator.swift in Sources */,
 				B19EFA3B21F8BB4100FC070E /* KeyBackupRecoverCoordinator.swift in Sources */,
 				B16932FA20F3C51A00746532 /* RecentCellData.m in Sources */,
 				B16932F220F3C49E00746532 /* GroupsDataSource.m in Sources */,
@@ -3479,6 +3591,7 @@
 				B16932B120F3AC9200746532 /* RoomSearchDataSource.m in Sources */,
 				B16932A320F3A21C00746532 /* main.m in Sources */,
 				B1B5574520EE6C4D00210D55 /* StartChatViewController.m in Sources */,
+				3232AB4C2256558300AD6A5C /* TemplateScreenCoordinator.swift in Sources */,
 				B1B5575920EE6C4D00210D55 /* HomeMessagesSearchViewController.m in Sources */,
 				B1B558DE20EF768F00210D55 /* RoomIncomingAttachmentBubbleCell.m in Sources */,
 				B1B5574820EE6C4D00210D55 /* PeopleViewController.m in Sources */,
@@ -3499,6 +3612,7 @@
 				B1B5572320EE6C4D00210D55 /* AttachmentsViewController.m in Sources */,
 				F083BDEE1E7009ED00A9B29C /* MXRoom+Riot.m in Sources */,
 				B1B5598620EFC3E000210D55 /* RiotSettings.swift in Sources */,
+				3232AB4D2256558300AD6A5C /* TemplateScreenCoordinatorType.swift in Sources */,
 				B1B5581720EF625800210D55 /* PreviewRoomTitleView.m in Sources */,
 				B1098BDF21ECE09F000DDA48 /* Strings.swift in Sources */,
 				B1B558C420EF768F00210D55 /* RoomIncomingEncryptedTextMsgWithPaginationTitleWithoutSenderNameBubbleCell.m in Sources */,
@@ -3546,6 +3660,8 @@
 				B169330020F3C97D00746532 /* RoomDataSource.m in Sources */,
 				B1B558ED20EF768F00210D55 /* RoomIncomingTextMsgWithoutSenderNameBubbleCell.m in Sources */,
 				B1B5571920EE6C4D00210D55 /* LanguagePickerViewController.m in Sources */,
+				3232AB512256558300AD6A5C /* TemplateScreenViewAction.swift in Sources */,
+				3232AB4E2256558300AD6A5C /* TemplateScreenViewModelType.swift in Sources */,
 				B1B5590520EF768F00210D55 /* RoomIncomingTextMsgWithoutSenderInfoBubbleCell.m in Sources */,
 				B1B558DD20EF768F00210D55 /* RoomIncomingEncryptedTextMsgBubbleCell.m in Sources */,
 				B1098BE521ECE1FC000DDA48 /* Storyboards.swift in Sources */,
@@ -3567,6 +3683,7 @@
 				B139C21D21FE5BF500BB68EC /* KeyBackupRecoverFromPassphraseViewModelType.swift in Sources */,
 				F083BE031E7009ED00A9B29C /* EventFormatter.m in Sources */,
 				B16932F720F3C50E00746532 /* RecentsDataSource.m in Sources */,
+				3232AB4F2256558300AD6A5C /* TemplateScreenViewController.swift in Sources */,
 				B1B558FC20EF768F00210D55 /* RoomIncomingTextMsgWithPaginationTitleBubbleCell.m in Sources */,
 				B1B5572920EE6C4D00210D55 /* RoomFilesViewController.m in Sources */,
 				B1098C1021ED07E4000DDA48 /* Presentable.swift in Sources */,
@@ -3637,11 +3754,13 @@
 				B17982FF2119FED2001FD722 /* GDPRConsentViewController.swift in Sources */,
 				B1098BE121ECE09F000DDA48 /* Images.swift in Sources */,
 				B1B5575A20EE6C4D00210D55 /* UnifiedSearchViewController.m in Sources */,
+				3232AB492256558300AD6A5C /* FlowTemplateCoordinatorBridgePresenter.swift in Sources */,
 				B1B5572820EE6C4D00210D55 /* RoomViewController.m in Sources */,
 				B1B558C720EF768F00210D55 /* RoomOutgoingEncryptedTextMsgWithPaginationTitleBubbleCell.m in Sources */,
 				B1B558F020EF768F00210D55 /* RoomOutgoingAttachmentWithPaginationTitleBubbleCell.m in Sources */,
 				926FA53F1F4C132000F826C2 /* MXSession+Riot.m in Sources */,
 				B1B5593820EF7BAC00210D55 /* TableViewCellWithLabelAndLargeTextView.m in Sources */,
+				3232AB502256558300AD6A5C /* TemplateScreenViewState.swift in Sources */,
 				B1B558C820EF768F00210D55 /* RoomIncomingEncryptedAttachmentBubbleCell.m in Sources */,
 				B1B557C620EF5CD400210D55 /* DirectoryServerDetailTableViewCell.m in Sources */,
 				B1B5590920EF768F00210D55 /* RoomEmptyBubbleCell.m in Sources */,
@@ -3683,10 +3802,12 @@
 				B1B5574920EE6C4D00210D55 /* RiotSplitViewController.m in Sources */,
 				B1B5574E20EE6C4D00210D55 /* DirectoryServerPickerViewController.m in Sources */,
 				B1DB4F0B223131600065DBFA /* String.swift in Sources */,
+				3232AB522256558300AD6A5C /* TemplateScreenViewModel.swift in Sources */,
 				B1B5575B20EE6C4D00210D55 /* HomeFilesSearchViewController.m in Sources */,
 				B139C22521FF01C100BB68EC /* KeyBackupRecoverFromPassphraseCoordinator.swift in Sources */,
 				B1098BFD21ECFE65000DDA48 /* PasswordStrengthManager.swift in Sources */,
 				B1B558F520EF768F00210D55 /* RoomOutgoingTextMsgWithPaginationTitleBubbleCell.m in Sources */,
+				3232AB482256558300AD6A5C /* FlowTemplateCoordinatorType.swift in Sources */,
 				B1B558F820EF768F00210D55 /* RoomIncomingTextMsgWithPaginationTitleWithoutSenderNameBubbleCell.m in Sources */,
 				32242F0921E8B05F00725742 /* UIColor.swift in Sources */,
 				B16932E720F3C37100746532 /* HomeMessagesSearchDataSource.m in Sources */,
diff --git a/Riot/Generated/Storyboards.swift b/Riot/Generated/Storyboards.swift
index afafd57f1..80f0725b6 100644
--- a/Riot/Generated/Storyboards.swift
+++ b/Riot/Generated/Storyboards.swift
@@ -47,6 +47,11 @@ internal enum StoryboardScene {
 
     internal static let initialScene = InitialSceneType<Riot.KeyBackupSetupSuccessFromRecoveryKeyViewController>(storyboard: KeyBackupSetupSuccessFromRecoveryKeyViewController.self)
   }
+  internal enum TemplateScreenViewController: StoryboardType {
+    internal static let storyboardName = "TemplateScreenViewController"
+
+    internal static let initialScene = InitialSceneType<Riot.TemplateScreenViewController>(storyboard: TemplateScreenViewController.self)
+  }
 }
 // swiftlint:enable explicit_type_interface identifier_name line_length type_body_length type_name
 
diff --git a/Tools/SwiftGen/swiftgen-config.yml b/Tools/SwiftGen/swiftgen-config.yml
index 7da2a05f6..b9d717b2f 100755
--- a/Tools/SwiftGen/swiftgen-config.yml
+++ b/Tools/SwiftGen/swiftgen-config.yml
@@ -3,6 +3,7 @@ output_dir: ../../Riot/Generated/
 ib:  
   - inputs: 
     - Modules/KeyBackup/
+    - ../Tools/Templates/buildable/
     outputs:
       - templateName: scenes-swift4
         output: Storyboards.swift
diff --git a/Tools/Templates/README.md b/Tools/Templates/README.md
new file mode 100644
index 000000000..e48d45706
--- /dev/null
+++ b/Tools/Templates/README.md
@@ -0,0 +1,24 @@
+The `buildable` contains templates with source files that build.
+
+The goal is to turn these templates as Xcode templates. They are part of the Riot project in order to ensure they build
+
+# ScreenTemplate
+This is the boilerplate to create a screen that follows the MVVM-C pattern within the Riot app.
+
+To use it (before it becomes an Xcode template):
+
+- `./createScreen.sh MyScreen [subFolder]`
+- Import the created folder in the Xcode project
+
+`subFolder` is an option subfolder under `Riot/Modules/`
+
+
+# FlowCoordinatorTemplate
+The boilerplate to create a root coordinator and its presenter bridge that can be used from Objective-C.
+ 
+To use it (before it becomes an Xcode template):
+
+- `./createFlowCoordinator.sh MyFlowCoordinator [subFolder]`
+- Import the created folder in the Xcode project
+
+`subFolder` is an option subfolder under `Riot/Modules/`
\ No newline at end of file
diff --git a/Tools/Templates/buildable/FlowCoordinatorTemplate/FlowTemplateCoordinator.swift b/Tools/Templates/buildable/FlowCoordinatorTemplate/FlowTemplateCoordinator.swift
new file mode 100644
index 000000000..e96de671a
--- /dev/null
+++ b/Tools/Templates/buildable/FlowCoordinatorTemplate/FlowTemplateCoordinator.swift
@@ -0,0 +1,77 @@
+/*
+ Copyright 2019 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 UIKit
+
+@objcMembers
+final class FlowTemplateCoordinator: FlowTemplateCoordinatorType {
+    
+    // MARK: - Properties
+    
+    // MARK: Private
+    
+    private let navigationRouter: NavigationRouterType
+    private let session: MXSession
+    
+    // MARK: Public
+    
+    var childCoordinators: [Coordinator] = []
+    
+    weak var delegate: FlowTemplateCoordinatorDelegate?
+    
+    // MARK: - Setup
+    
+    init(session: MXSession) {
+        self.navigationRouter = NavigationRouter(navigationController: RiotNavigationController())
+        self.session = session
+    }    
+    
+    // MARK: - Public methods
+    
+    func start() {
+
+        let rootCoordinator = self.createTemplateScreenCoordinator()
+
+        rootCoordinator.start()
+
+        self.add(childCoordinator: rootCoordinator)
+
+        self.navigationRouter.setRootModule(rootCoordinator)
+      }
+    
+    func toPresentable() -> UIViewController {
+        return self.navigationRouter.toPresentable()
+    }
+    
+    // MARK: - Private methods
+
+    private func createTemplateScreenCoordinator() -> TemplateScreenCoordinator {
+        let coordinator = TemplateScreenCoordinator(session: self.session)
+        coordinator.delegate = self
+        return coordinator
+    }
+}
+
+// MARK: - TemplateScreenCoordinatorDelegate
+extension FlowTemplateCoordinator: TemplateScreenCoordinatorDelegate {
+    func templateScreenCoordinator(_ templateScreenCoordinator: TemplateScreenCoordinatorType, didCompleteWithMessage message: String) {
+        self.delegate?.flowTemplateCoordinatorDidComplete(self)
+    }
+
+    func templateScreenCoordinatorDidCancel(_ templateScreenCoordinator: TemplateScreenCoordinatorType) {
+        self.delegate?.flowTemplateCoordinatorDidComplete(self)
+    }
+}
diff --git a/Tools/Templates/buildable/FlowCoordinatorTemplate/FlowTemplateCoordinatorBridgePresenter.swift b/Tools/Templates/buildable/FlowCoordinatorTemplate/FlowTemplateCoordinatorBridgePresenter.swift
new file mode 100644
index 000000000..6d5eb3242
--- /dev/null
+++ b/Tools/Templates/buildable/FlowCoordinatorTemplate/FlowTemplateCoordinatorBridgePresenter.swift
@@ -0,0 +1,77 @@
+/*
+ Copyright 2019 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
+
+@objc protocol FlowTemplateCoordinatorBridgePresenterDelegate {
+    func flowTemplateCoordinatorBridgePresenterDelegateDidComplete(_ flowTemplateCoordinatorBridgePresenter: FlowTemplateCoordinatorBridgePresenter)
+}
+
+/// FlowTemplateCoordinatorBridgePresenter enables to start FlowTemplateCoordinator from a view controller.
+/// This bridge is used while waiting for global usage of coordinator pattern.
+@objcMembers
+final class FlowTemplateCoordinatorBridgePresenter: NSObject {
+    
+    // MARK: - Properties
+    
+    // MARK: Private
+    
+    private let session: MXSession
+    private var coordinator: FlowTemplateCoordinator?
+    
+    // MARK: Public
+    
+    weak var delegate: FlowTemplateCoordinatorBridgePresenterDelegate?
+    
+    // MARK: - Setup
+    
+    init(session: MXSession) {
+        self.session = session
+        super.init()
+    }
+    
+    // MARK: - Public
+    
+    // NOTE: Default value feature is not compatible with Objective-C.
+    // func present(from viewController: UIViewController, animated: Bool) {
+    //     self.present(from: viewController, isStartedFromSignOut: false, animated: animated)
+    // }
+    
+    func present(from viewController: UIViewController, animated: Bool) {
+        let flowTemplateCoordinator = FlowTemplateCoordinator(session: self.session)
+        flowTemplateCoordinator.delegate = self
+        viewController.present(flowTemplateCoordinator.toPresentable(), animated: animated, completion: nil)
+        flowTemplateCoordinator.start()
+        
+        self.coordinator = flowTemplateCoordinator
+    }
+    
+    func dismiss(animated: Bool) {
+        guard let coordinator = self.coordinator else {
+            return
+        }        
+        coordinator.toPresentable().dismiss(animated: animated) {
+            self.coordinator = nil
+        }
+    }
+}
+
+// MARK: - FlowTemplateCoordinatorDelegate
+extension FlowTemplateCoordinatorBridgePresenter: FlowTemplateCoordinatorDelegate {
+    func flowTemplateCoordinatorDidComplete(_ flowTemplateCoordinator: FlowTemplateCoordinatorType) {
+        self.delegate?.flowTemplateCoordinatorBridgePresenterDelegateDidComplete(self)
+    }
+}
diff --git a/Tools/Templates/buildable/FlowCoordinatorTemplate/FlowTemplateCoordinatorType.swift b/Tools/Templates/buildable/FlowCoordinatorTemplate/FlowTemplateCoordinatorType.swift
new file mode 100644
index 000000000..e4b63d80d
--- /dev/null
+++ b/Tools/Templates/buildable/FlowCoordinatorTemplate/FlowTemplateCoordinatorType.swift
@@ -0,0 +1,26 @@
+/*
+ Copyright 2019 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
+
+protocol FlowTemplateCoordinatorDelegate: class {
+    func flowTemplateCoordinatorDidComplete(_ flowTemplateCoordinator: FlowTemplateCoordinatorType)
+}
+
+/// `FlowTemplateCoordinatorType` is a protocol describing a Coordinator that handle keybackup setup navigation flow.
+protocol FlowTemplateCoordinatorType: Coordinator, Presentable {
+    var delegate: FlowTemplateCoordinatorDelegate? { get }
+}
diff --git a/Tools/Templates/buildable/ScreenTemplate/TemplateScreenCoordinator.swift b/Tools/Templates/buildable/ScreenTemplate/TemplateScreenCoordinator.swift
new file mode 100644
index 000000000..f7c599f3a
--- /dev/null
+++ b/Tools/Templates/buildable/ScreenTemplate/TemplateScreenCoordinator.swift
@@ -0,0 +1,68 @@
+/*
+ Copyright 2019 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
+import UIKit
+
+final class TemplateScreenCoordinator: TemplateScreenCoordinatorType {
+    
+    // MARK: - Properties
+    
+    // MARK: Private
+    
+    private let session: MXSession
+    private var templateScreenViewModel: TemplateScreenViewModelType
+    private let templateScreenViewController: TemplateScreenViewController
+    
+    // MARK: Public
+    
+    var childCoordinators: [Coordinator] = []
+    
+    weak var delegate: TemplateScreenCoordinatorDelegate?
+    
+    // MARK: - Setup
+    
+    init(session: MXSession) {
+        self.session = session
+        
+        let templateScreenViewModel = TemplateScreenViewModel(session: self.session)
+        let templateScreenViewController = TemplateScreenViewController.instantiate(with: templateScreenViewModel)
+        self.templateScreenViewModel = templateScreenViewModel
+        self.templateScreenViewController = templateScreenViewController
+    }
+    
+    // MARK: - Public methods
+    
+    func start() {            
+        self.templateScreenViewModel.coordinatorDelegate = self
+    }
+    
+    func toPresentable() -> UIViewController {
+        return self.templateScreenViewController
+    }
+}
+
+// MARK: - TemplateScreenViewModelCoordinatorDelegate
+extension TemplateScreenCoordinator: TemplateScreenViewModelCoordinatorDelegate {
+    
+    func templateScreenViewModel(_ viewModel: TemplateScreenViewModelType, didCompleteWithMessage message: String) {
+        self.delegate?.templateScreenCoordinator(self, didCompleteWithMessage: message)
+    }
+    
+    func templateScreenViewModelDidCancel(_ viewModel: TemplateScreenViewModelType) {
+        self.delegate?.templateScreenCoordinatorDidCancel(self)
+    }
+}
diff --git a/Tools/Templates/buildable/ScreenTemplate/TemplateScreenCoordinatorType.swift b/Tools/Templates/buildable/ScreenTemplate/TemplateScreenCoordinatorType.swift
new file mode 100644
index 000000000..1701eee2a
--- /dev/null
+++ b/Tools/Templates/buildable/ScreenTemplate/TemplateScreenCoordinatorType.swift
@@ -0,0 +1,27 @@
+/*
+ Copyright 2019 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
+
+protocol TemplateScreenCoordinatorDelegate: class {
+    func templateScreenCoordinator(_ templateScreenCoordinator: TemplateScreenCoordinatorType, didCompleteWithMessage message: String)
+    func templateScreenCoordinatorDidCancel(_ templateScreenCoordinator: TemplateScreenCoordinatorType)
+}
+
+/// `TemplateScreenCoordinatorType` is a protocol describing a Coordinator that handle key backup setup passphrase navigation flow.
+protocol TemplateScreenCoordinatorType: Coordinator, Presentable {
+    var delegate: TemplateScreenCoordinatorDelegate? { get }
+}
diff --git a/Tools/Templates/buildable/ScreenTemplate/TemplateScreenViewAction.swift b/Tools/Templates/buildable/ScreenTemplate/TemplateScreenViewAction.swift
new file mode 100644
index 000000000..8dca49e5c
--- /dev/null
+++ b/Tools/Templates/buildable/ScreenTemplate/TemplateScreenViewAction.swift
@@ -0,0 +1,24 @@
+/*
+ Copyright 2019 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
+
+/// TemplateScreenViewController view actions exposed to view model
+enum TemplateScreenViewAction {
+    case sayHello
+    case complete
+    case cancel
+}
diff --git a/Tools/Templates/buildable/ScreenTemplate/TemplateScreenViewController.storyboard b/Tools/Templates/buildable/ScreenTemplate/TemplateScreenViewController.storyboard
new file mode 100644
index 000000000..35b09e221
--- /dev/null
+++ b/Tools/Templates/buildable/ScreenTemplate/TemplateScreenViewController.storyboard
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="V8j-Lb-PgC">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <scenes>
+        <!--Template Screen View Controller-->
+        <scene sceneID="mt5-wz-YKA">
+            <objects>
+                <viewController extendedLayoutIncludesOpaqueBars="YES" automaticallyAdjustsScrollViewInsets="NO" id="V8j-Lb-PgC" customClass="TemplateScreenViewController" customModule="Riot" customModuleProvider="target" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="EL9-GA-lwo">
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="9U2-KL-ZVA">
+                                <rect key="frame" x="0.0" y="20" width="375" height="647"/>
+                                <subviews>
+                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="e7g-um-WO4">
+                                        <rect key="frame" x="0.0" y="0.0" width="375" height="767"/>
+                                        <subviews>
+                                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="voD-3Q-ryt">
+                                                <rect key="frame" x="0.0" y="0.0" width="375" height="767"/>
+                                                <subviews>
+                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="A message" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bxI-mu-qng">
+                                                        <rect key="frame" x="20" y="86" width="335" height="108"/>
+                                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                                        <fontDescription key="fontDescription" type="system" pointSize="15"/>
+                                                        <nil key="textColor"/>
+                                                        <nil key="highlightedColor"/>
+                                                    </label>
+                                                    <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="DOt-5E-FjF">
+                                                        <rect key="frame" x="172" y="368" width="30" height="30"/>
+                                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                                        <state key="normal" title="OK"/>
+                                                        <connections>
+                                                            <action selector="okButtonAction:" destination="V8j-Lb-PgC" eventType="touchUpInside" id="uvI-tt-Nfj"/>
+                                                        </connections>
+                                                    </button>
+                                                </subviews>
+                                                <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                <constraints>
+                                                    <constraint firstAttribute="width" priority="750" constant="500" id="glD-Sz-73O"/>
+                                                </constraints>
+                                            </view>
+                                        </subviews>
+                                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                        <constraints>
+                                            <constraint firstAttribute="bottom" secondItem="voD-3Q-ryt" secondAttribute="bottom" id="63a-5e-ptU"/>
+                                            <constraint firstItem="voD-3Q-ryt" firstAttribute="centerX" secondItem="e7g-um-WO4" secondAttribute="centerX" id="P2G-mq-gQW"/>
+                                            <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="voD-3Q-ryt" secondAttribute="trailing" id="QgV-SO-5yf"/>
+                                            <constraint firstItem="voD-3Q-ryt" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="e7g-um-WO4" secondAttribute="leading" id="YPo-u1-PtT"/>
+                                            <constraint firstAttribute="height" constant="767" id="n8g-KW-BYU"/>
+                                            <constraint firstItem="voD-3Q-ryt" firstAttribute="top" secondItem="e7g-um-WO4" secondAttribute="top" id="rhQ-96-szL"/>
+                                        </constraints>
+                                    </view>
+                                </subviews>
+                                <constraints>
+                                    <constraint firstAttribute="trailing" secondItem="e7g-um-WO4" secondAttribute="trailing" id="GyG-Fh-PME"/>
+                                    <constraint firstItem="e7g-um-WO4" firstAttribute="width" secondItem="9U2-KL-ZVA" secondAttribute="width" id="Ok2-WQ-Zgc"/>
+                                    <constraint firstAttribute="bottom" secondItem="e7g-um-WO4" secondAttribute="bottom" id="Y46-NP-zAc"/>
+                                    <constraint firstItem="e7g-um-WO4" firstAttribute="leading" secondItem="9U2-KL-ZVA" secondAttribute="leading" id="aoV-Yh-AcD"/>
+                                    <constraint firstItem="e7g-um-WO4" firstAttribute="top" secondItem="9U2-KL-ZVA" secondAttribute="top" id="pFN-bA-SHw"/>
+                                </constraints>
+                            </scrollView>
+                        </subviews>
+                        <color key="backgroundColor" red="0.94509803921568625" green="0.96078431372549022" blue="0.97254901960784312" alpha="1" colorSpace="calibratedRGB"/>
+                        <constraints>
+                            <constraint firstAttribute="bottom" secondItem="9U2-KL-ZVA" secondAttribute="bottom" id="7Cb-nY-CsO"/>
+                            <constraint firstItem="9U2-KL-ZVA" firstAttribute="leading" secondItem="bFg-jh-JZB" secondAttribute="leading" id="GdQ-hK-muG"/>
+                            <constraint firstItem="bFg-jh-JZB" firstAttribute="trailing" secondItem="9U2-KL-ZVA" secondAttribute="trailing" id="sbD-ek-vGJ"/>
+                            <constraint firstItem="bFg-jh-JZB" firstAttribute="top" secondItem="9U2-KL-ZVA" secondAttribute="top" id="wTB-V6-IHV"/>
+                        </constraints>
+                        <viewLayoutGuide key="safeArea" id="bFg-jh-JZB"/>
+                    </view>
+                    <connections>
+                        <outlet property="messageLabel" destination="bxI-mu-qng" id="pbX-aZ-inC"/>
+                        <outlet property="okButton" destination="DOt-5E-FjF" id="ktw-U4-efQ"/>
+                        <outlet property="scrollView" destination="9U2-KL-ZVA" id="ojG-2y-X7b"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="zK0-v6-7Wt" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="-3198" y="-647"/>
+        </scene>
+    </scenes>
+</document>
diff --git a/Tools/Templates/buildable/ScreenTemplate/TemplateScreenViewController.swift b/Tools/Templates/buildable/ScreenTemplate/TemplateScreenViewController.swift
new file mode 100644
index 000000000..4d1e3b3c6
--- /dev/null
+++ b/Tools/Templates/buildable/ScreenTemplate/TemplateScreenViewController.swift
@@ -0,0 +1,185 @@
+/*
+ Copyright 2019 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 UIKit
+
+final class TemplateScreenViewController: UIViewController {
+    
+    // MARK: - Constants
+    
+    private enum Constants {
+        static let aConstant: Int = 666
+    }
+    
+    // MARK: - Properties
+    
+    // MARK: Outlets
+
+    @IBOutlet private weak var scrollView: UIScrollView!
+    
+    @IBOutlet private weak var messageLabel: UILabel!
+    @IBOutlet private weak var okButton: UIButton!
+    
+    // MARK: Private
+
+    private var viewModel: TemplateScreenViewModelType!
+    private var theme: Theme!
+    private var keyboardAvoider: KeyboardAvoider?
+    private var errorPresenter: MXKErrorPresentation!
+    private var activityPresenter: ActivityIndicatorPresenter!
+
+    // MARK: - Setup
+    
+    class func instantiate(with viewModel: TemplateScreenViewModelType) -> TemplateScreenViewController {
+        let viewController = StoryboardScene.TemplateScreenViewController.initialScene.instantiate()
+        viewController.viewModel = viewModel
+        viewController.theme = ThemeService.shared().theme
+        return viewController
+    }
+    
+    // MARK: - Life cycle
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        
+        // Do any additional setup after loading the view.
+        
+        self.title = "Template"
+        
+        self.setupViews()
+        self.keyboardAvoider = KeyboardAvoider(scrollViewContainerView: self.view, scrollView: self.scrollView)
+        self.activityPresenter = ActivityIndicatorPresenter()
+        self.errorPresenter = MXKErrorAlertPresentation()
+        
+        self.registerThemeServiceDidChangeThemeNotification()
+        self.update(theme: self.theme)
+        
+        self.viewModel.viewDelegate = self
+
+        self.viewModel.process(viewAction: .sayHello)
+    }
+
+    override func viewWillAppear(_ animated: Bool) {
+        super.viewWillAppear(animated)
+        
+        self.keyboardAvoider?.startAvoiding()
+    }
+
+    override func viewDidAppear(_ animated: Bool) {
+        super.viewDidAppear(animated)
+    }
+    
+    override func viewDidDisappear(_ animated: Bool) {
+        super.viewDidDisappear(animated)
+        
+        self.keyboardAvoider?.stopAvoiding()
+    }
+    
+    override func viewDidLayoutSubviews() {
+        super.viewDidLayoutSubviews()
+    }
+    
+    override var preferredStatusBarStyle: UIStatusBarStyle {
+        return self.theme.statusBarStyle
+    }
+    
+    // MARK: - Private
+    
+    private func update(theme: Theme) {
+        self.theme = theme
+        
+        self.view.backgroundColor = theme.headerBackgroundColor
+        
+        if let navigationBar = self.navigationController?.navigationBar {
+            theme.applyStyle(onNavigationBar: navigationBar)
+        }
+
+
+        // TODO:
+        self.messageLabel.textColor = theme.textPrimaryColor
+
+        self.okButton.backgroundColor = theme.backgroundColor
+        theme.applyStyle(onButton: self.okButton)
+    }
+    
+    private func registerThemeServiceDidChangeThemeNotification() {
+        NotificationCenter.default.addObserver(self, selector: #selector(themeDidChange), name: .themeServiceDidChangeTheme, object: nil)
+    }
+    
+    @objc private func themeDidChange() {
+        self.update(theme: ThemeService.shared().theme)
+    }
+    
+    private func setupViews() {
+        let cancelBarButtonItem = MXKBarButtonItem(title: VectorL10n.cancel, style: .plain) { [weak self] in
+            self?.cancelButtonAction()
+        }
+        
+        self.navigationItem.rightBarButtonItem = cancelBarButtonItem
+        
+        self.scrollView.keyboardDismissMode = .interactive
+        
+        self.messageLabel.text = "VectorL10n.templateScreenTitle"
+        self.messageLabel.isHidden = true
+    }
+
+    private func render(viewState: TemplateScreenViewState) {
+        switch viewState {
+        case .loading:
+            self.renderLoading()
+        case .loaded:
+            self.renderLoaded()
+        case .error(let error):
+            self.render(error: error)
+        }
+    }
+    
+    private func renderLoading() {
+        self.activityPresenter.presentActivityIndicator(on: self.view, animated: true)
+    }
+    
+    private func renderLoaded() {
+        self.activityPresenter.removeCurrentActivityIndicator(animated: true)
+
+        self.messageLabel.text = self.viewModel.message
+        self.messageLabel.isHidden = false
+    }
+    
+    private func render(error: Error) {
+        self.activityPresenter.removeCurrentActivityIndicator(animated: true)
+        self.errorPresenter.presentError(from: self, forError: error, animated: true, handler: nil)
+    }
+
+    
+    // MARK: - Actions
+
+    @IBAction private func okButtonAction(_ sender: Any) {
+        self.viewModel.process(viewAction: .complete)
+    }
+
+    private func cancelButtonAction() {
+        self.viewModel.process(viewAction: .cancel)
+    }
+}
+
+
+// MARK: - TemplateScreenViewModelViewDelegate
+extension TemplateScreenViewController: TemplateScreenViewModelViewDelegate {
+
+    func templateScreenViewModel(_ viewModel: TemplateScreenViewModelType, didUpdateViewState viewSate: TemplateScreenViewState) {
+        self.render(viewState: viewSate)
+    }
+}
diff --git a/Tools/Templates/buildable/ScreenTemplate/TemplateScreenViewModel.swift b/Tools/Templates/buildable/ScreenTemplate/TemplateScreenViewModel.swift
new file mode 100644
index 000000000..9b716cddf
--- /dev/null
+++ b/Tools/Templates/buildable/ScreenTemplate/TemplateScreenViewModel.swift
@@ -0,0 +1,85 @@
+/*
+ Copyright 2019 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
+
+final class TemplateScreenViewModel: TemplateScreenViewModelType {
+    
+    // MARK: - Properties
+    
+    // MARK: Private
+
+    private let session: MXSession
+    
+    // MARK: Public
+    
+    var message: String?
+
+    weak var viewDelegate: TemplateScreenViewModelViewDelegate?
+    weak var coordinatorDelegate: TemplateScreenViewModelCoordinatorDelegate?
+    
+    // MARK: - Setup
+    
+    init(session: MXSession) {
+        self.session = session
+        self.message = nil
+    }
+    
+    deinit {
+    }
+    
+    // MARK: - Public
+    
+    func process(viewAction: TemplateScreenViewAction) {
+        switch viewAction {
+        case .sayHello:
+            self.setupHelloMessage()
+        case .complete:
+            if let message = self.message {
+            self.coordinatorDelegate?.templateScreenViewModel(self, didCompleteWithMessage: message)
+            }
+        case .cancel:
+            self.coordinatorDelegate?.templateScreenViewModelDidCancel(self)
+        }
+    }
+    
+    // MARK: - Private
+    
+    private func setupHelloMessage() {
+
+        self.update(viewState: .loading)
+
+        // Check first that the user homeserver is federated with the  Riot-bot homeserver
+        self.session.matrixRestClient.displayName(forUser: self.session.myUser.userId) { [weak self]  (response) in
+
+            guard let sself = self else {
+                return
+            }
+            
+            switch response {
+            case .success:
+                sself.message = "Hello \(response.value ?? "you")"
+                sself.update(viewState: .loaded)
+            case .failure(let error):
+                sself.update(viewState: .error(error))
+            }
+        }
+    }
+    
+    private func update(viewState: TemplateScreenViewState) {
+        self.viewDelegate?.templateScreenViewModel(self, didUpdateViewState: viewState)
+    }
+}
diff --git a/Tools/Templates/buildable/ScreenTemplate/TemplateScreenViewModelType.swift b/Tools/Templates/buildable/ScreenTemplate/TemplateScreenViewModelType.swift
new file mode 100644
index 000000000..fd76d45b1
--- /dev/null
+++ b/Tools/Templates/buildable/ScreenTemplate/TemplateScreenViewModelType.swift
@@ -0,0 +1,37 @@
+/*
+ Copyright 2019 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
+
+protocol TemplateScreenViewModelViewDelegate: class {
+    func templateScreenViewModel(_ viewModel: TemplateScreenViewModelType, didUpdateViewState viewSate: TemplateScreenViewState)
+}
+
+protocol TemplateScreenViewModelCoordinatorDelegate: class {
+    func templateScreenViewModel(_ viewModel: TemplateScreenViewModelType, didCompleteWithMessage message: String)    
+    func templateScreenViewModelDidCancel(_ viewModel: TemplateScreenViewModelType)
+}
+
+/// Protocol describing the view model used by `TemplateScreenViewController`
+protocol TemplateScreenViewModelType {
+    
+    var message: String? { get set }
+        
+    var viewDelegate: TemplateScreenViewModelViewDelegate? { get set }
+    var coordinatorDelegate: TemplateScreenViewModelCoordinatorDelegate? { get set }
+    
+    func process(viewAction: TemplateScreenViewAction)
+}
diff --git a/Tools/Templates/buildable/ScreenTemplate/TemplateScreenViewState.swift b/Tools/Templates/buildable/ScreenTemplate/TemplateScreenViewState.swift
new file mode 100644
index 000000000..815fd8196
--- /dev/null
+++ b/Tools/Templates/buildable/ScreenTemplate/TemplateScreenViewState.swift
@@ -0,0 +1,24 @@
+/*
+ Copyright 2019 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
+
+/// TemplateScreenViewController view state
+enum TemplateScreenViewState {
+    case loading
+    case loaded
+    case error(Error)
+}
diff --git a/Tools/Templates/createScreen.sh b/Tools/Templates/createScreen.sh
new file mode 100644
index 000000000..e69de29bb

From 576060fba9ff25c1f5c0d1e3801cac1657c3c392 Mon Sep 17 00:00:00 2001
From: manuroe <manu@matrix.org>
Date: Thu, 4 Apr 2019 18:01:46 +0200
Subject: [PATCH 02/13] Productivity: SwiftGen: expose all storyboards from
 Modules/

except one that is in Objc
---
 Tools/SwiftGen/swiftgen-config.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Tools/SwiftGen/swiftgen-config.yml b/Tools/SwiftGen/swiftgen-config.yml
index b9d717b2f..bb711f244 100755
--- a/Tools/SwiftGen/swiftgen-config.yml
+++ b/Tools/SwiftGen/swiftgen-config.yml
@@ -1,9 +1,10 @@
 input_dir: ../../Riot/
 output_dir: ../../Riot/Generated/
 ib:  
-  - inputs: 
-    - Modules/KeyBackup/
+  - inputs:
     - ../Tools/Templates/buildable/
+    - Modules/
+    filter: ^((?!DeactivateAccountViewController).)*\.(storyboard)
     outputs:
       - templateName: scenes-swift4
         output: Storyboards.swift

From df3261545607e8244f39a32e5ab05cbe0b4305c4 Mon Sep 17 00:00:00 2001
From: manuroe <manu@matrix.org>
Date: Thu, 4 Apr 2019 18:17:19 +0200
Subject: [PATCH 03/13] Productivity: Create createScreen.sh

---
 Tools/Templates/createScreen.sh | 44 +++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)
 mode change 100644 => 100755 Tools/Templates/createScreen.sh

diff --git a/Tools/Templates/createScreen.sh b/Tools/Templates/createScreen.sh
old mode 100644
new mode 100755
index e69de29bb..6307d3565
--- a/Tools/Templates/createScreen.sh
+++ b/Tools/Templates/createScreen.sh
@@ -0,0 +1,44 @@
+#!/bin/bash
+
+if [ $# -eq 0 ]; then
+    echo "Usage: ./createScreen.sh MyScreen [subFolder]"
+    exit 1
+fi 
+
+SCREEN_NAME=$1
+SCREEN_VAR_NAME=`echo $SCREEN_NAME | awk '{ print tolower(substr($0, 1, 1)) substr($0, 2) }'`
+
+MODULE_DIR="../../Riot/Modules"
+
+OUTPUT_DIR="$MODULE_DIR"
+if [ $# -eq 2 ]; 
+then
+    OUTPUT_DIR="$OUTPUT_DIR/$1"
+    if [ ! -e $OUTPUT_DIR ]; then
+        echo "Create folder ${OUTPUT_DIR}"
+        mkdir $OUTPUT_DIR
+    fi 
+    
+    OUTPUT_DIR="$OUTPUT_DIR/$2"
+else
+    OUTPUT_DIR="$OUTPUT_DIR/$1"
+fi
+
+
+if [ -e $OUTPUT_DIR ]; then
+    echo "Error: Folder ${OUTPUT_DIR} already exists"
+    exit 1
+fi 
+
+echo "Create folder ${OUTPUT_DIR}"
+
+cp -R buildable/ScreenTemplate $OUTPUT_DIR
+
+cd $OUTPUT_DIR
+for file in *
+do
+    echo "Building ${file/TemplateScreen/$SCREEN_NAME}..."
+    perl -p -i -e "s/TemplateScreen/"$SCREEN_NAME"/g" $file
+    perl -p -i -e "s/templateScreen/"$SCREEN_VAR_NAME"/g" $file
+    mv ${file} ${file/TemplateScreen/$SCREEN_NAME}
+done
\ No newline at end of file

From 6967b918ec4de4ae2c12258c4fa9175478ae6af6 Mon Sep 17 00:00:00 2001
From: manuroe <manu@matrix.org>
Date: Thu, 4 Apr 2019 18:20:21 +0200
Subject: [PATCH 04/13] CHANGES

---
 CHANGES.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 835b55239..1c0af777e 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -4,6 +4,7 @@ Changes in 0.8.5 (2019-xx-xx)
 Improvements:
  * Push: Add more logs to track spontaneously disabling (#2348).
  * Widgets: Use scalar prod urls in Riot mobile apps (#2349).
+ * Productiviy: Create templates (see Tools/Templates/README.md).
 
 Bug fix:
  * Share extension: Fix a crash when receive a memory warning (PR #2352).

From 9e30a49e608b7ebf75bb93018fef0994053a4e1e Mon Sep 17 00:00:00 2001
From: manuroe <manu@matrix.org>
Date: Thu, 4 Apr 2019 18:35:58 +0200
Subject: [PATCH 05/13] Productivity: createScreen.sh: Fix subFolder parameter

---
 Tools/Templates/createScreen.sh | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/Tools/Templates/createScreen.sh b/Tools/Templates/createScreen.sh
index 6307d3565..18019a48e 100755
--- a/Tools/Templates/createScreen.sh
+++ b/Tools/Templates/createScreen.sh
@@ -13,16 +13,13 @@ MODULE_DIR="../../Riot/Modules"
 OUTPUT_DIR="$MODULE_DIR"
 if [ $# -eq 2 ]; 
 then
-    OUTPUT_DIR="$OUTPUT_DIR/$1"
+    OUTPUT_DIR="$OUTPUT_DIR/$2"
     if [ ! -e $OUTPUT_DIR ]; then
         echo "Create folder ${OUTPUT_DIR}"
         mkdir $OUTPUT_DIR
     fi 
-    
-    OUTPUT_DIR="$OUTPUT_DIR/$2"
-else
-    OUTPUT_DIR="$OUTPUT_DIR/$1"
 fi
+OUTPUT_DIR="$OUTPUT_DIR/$1"
 
 
 if [ -e $OUTPUT_DIR ]; then

From e4b05606bbb8e27d5058f42851540f10d5fcd65e Mon Sep 17 00:00:00 2001
From: manuroe <manu@matrix.org>
Date: Thu, 4 Apr 2019 18:58:32 +0200
Subject: [PATCH 06/13] Productivity: createScreen.sh: Fix subFolder parameter
 again

---
 Tools/Templates/README.md       |  6 +++---
 Tools/Templates/createScreen.sh | 22 ++++++----------------
 2 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/Tools/Templates/README.md b/Tools/Templates/README.md
index e48d45706..931671c79 100644
--- a/Tools/Templates/README.md
+++ b/Tools/Templates/README.md
@@ -7,10 +7,10 @@ This is the boilerplate to create a screen that follows the MVVM-C pattern withi
 
 To use it (before it becomes an Xcode template):
 
-- `./createScreen.sh MyScreen [subFolder]`
+- `./createScreen.sh ScreenFolder MyScreenName`
 - Import the created folder in the Xcode project
 
-`subFolder` is an option subfolder under `Riot/Modules/`
+This will create ScreenFolder within the Riot/Modules. Files inside will be called `MyScreenNameXxx`.
 
 
 # FlowCoordinatorTemplate
@@ -21,4 +21,4 @@ To use it (before it becomes an Xcode template):
 - `./createFlowCoordinator.sh MyFlowCoordinator [subFolder]`
 - Import the created folder in the Xcode project
 
-`subFolder` is an option subfolder under `Riot/Modules/`
\ No newline at end of file
+`subFolder` is an option subfolder under `Riot/Modules/`
diff --git a/Tools/Templates/createScreen.sh b/Tools/Templates/createScreen.sh
index 18019a48e..1c42a0aec 100755
--- a/Tools/Templates/createScreen.sh
+++ b/Tools/Templates/createScreen.sh
@@ -1,27 +1,16 @@
 #!/bin/bash
 
-if [ $# -eq 0 ]; then
-    echo "Usage: ./createScreen.sh MyScreen [subFolder]"
+if [ ! $# -eq 2 ]; then
+    echo "Usage: ./createScreen.sh Folder MyScreenName"
     exit 1
 fi 
 
-SCREEN_NAME=$1
+OUTPUT_DIR="../../Riot/Modules"/$1
+SCREEN_NAME=$2
 SCREEN_VAR_NAME=`echo $SCREEN_NAME | awk '{ print tolower(substr($0, 1, 1)) substr($0, 2) }'`
 
 MODULE_DIR="../../Riot/Modules"
 
-OUTPUT_DIR="$MODULE_DIR"
-if [ $# -eq 2 ]; 
-then
-    OUTPUT_DIR="$OUTPUT_DIR/$2"
-    if [ ! -e $OUTPUT_DIR ]; then
-        echo "Create folder ${OUTPUT_DIR}"
-        mkdir $OUTPUT_DIR
-    fi 
-fi
-OUTPUT_DIR="$OUTPUT_DIR/$1"
-
-
 if [ -e $OUTPUT_DIR ]; then
     echo "Error: Folder ${OUTPUT_DIR} already exists"
     exit 1
@@ -29,7 +18,8 @@ fi
 
 echo "Create folder ${OUTPUT_DIR}"
 
-cp -R buildable/ScreenTemplate $OUTPUT_DIR
+mkdir -p $OUTPUT_DIR
+cp -R buildable/ScreenTemplate/ $OUTPUT_DIR/
 
 cd $OUTPUT_DIR
 for file in *

From c7566865774a77c1ffcd7de5883ffbef38c49af8 Mon Sep 17 00:00:00 2001
From: manuroe <manu@matrix.org>
Date: Thu, 4 Apr 2019 18:59:06 +0200
Subject: [PATCH 07/13] Productivity: Tweak templates a bit

---
 .../FlowCoordinatorTemplate/FlowTemplateCoordinator.swift     | 3 ++-
 .../FlowCoordinatorTemplate/FlowTemplateCoordinatorType.swift | 2 +-
 .../ScreenTemplate/TemplateScreenCoordinatorType.swift        | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Tools/Templates/buildable/FlowCoordinatorTemplate/FlowTemplateCoordinator.swift b/Tools/Templates/buildable/FlowCoordinatorTemplate/FlowTemplateCoordinator.swift
index e96de671a..92264ce19 100644
--- a/Tools/Templates/buildable/FlowCoordinatorTemplate/FlowTemplateCoordinator.swift
+++ b/Tools/Templates/buildable/FlowCoordinatorTemplate/FlowTemplateCoordinator.swift
@@ -27,7 +27,8 @@ final class FlowTemplateCoordinator: FlowTemplateCoordinatorType {
     private let session: MXSession
     
     // MARK: Public
-    
+
+    // Must be used only internally
     var childCoordinators: [Coordinator] = []
     
     weak var delegate: FlowTemplateCoordinatorDelegate?
diff --git a/Tools/Templates/buildable/FlowCoordinatorTemplate/FlowTemplateCoordinatorType.swift b/Tools/Templates/buildable/FlowCoordinatorTemplate/FlowTemplateCoordinatorType.swift
index e4b63d80d..cd754d8d4 100644
--- a/Tools/Templates/buildable/FlowCoordinatorTemplate/FlowTemplateCoordinatorType.swift
+++ b/Tools/Templates/buildable/FlowCoordinatorTemplate/FlowTemplateCoordinatorType.swift
@@ -17,7 +17,7 @@
 import Foundation
 
 protocol FlowTemplateCoordinatorDelegate: class {
-    func flowTemplateCoordinatorDidComplete(_ flowTemplateCoordinator: FlowTemplateCoordinatorType)
+    func flowTemplateCoordinatorDidComplete(_ coordinator: FlowTemplateCoordinatorType)
 }
 
 /// `FlowTemplateCoordinatorType` is a protocol describing a Coordinator that handle keybackup setup navigation flow.
diff --git a/Tools/Templates/buildable/ScreenTemplate/TemplateScreenCoordinatorType.swift b/Tools/Templates/buildable/ScreenTemplate/TemplateScreenCoordinatorType.swift
index 1701eee2a..b8869aafd 100644
--- a/Tools/Templates/buildable/ScreenTemplate/TemplateScreenCoordinatorType.swift
+++ b/Tools/Templates/buildable/ScreenTemplate/TemplateScreenCoordinatorType.swift
@@ -17,8 +17,8 @@
 import Foundation
 
 protocol TemplateScreenCoordinatorDelegate: class {
-    func templateScreenCoordinator(_ templateScreenCoordinator: TemplateScreenCoordinatorType, didCompleteWithMessage message: String)
-    func templateScreenCoordinatorDidCancel(_ templateScreenCoordinator: TemplateScreenCoordinatorType)
+    func templateScreenCoordinator(_ coordinator: TemplateScreenCoordinatorType, didCompleteWithMessage message: String)
+    func templateScreenCoordinatorDidCancel(_ coordinator: TemplateScreenCoordinatorType)
 }
 
 /// `TemplateScreenCoordinatorType` is a protocol describing a Coordinator that handle key backup setup passphrase navigation flow.

From 33bfc1bb2b5cb32d5cb35c2344c7402a65cd51ff Mon Sep 17 00:00:00 2001
From: manuroe <manu@matrix.org>
Date: Thu, 4 Apr 2019 21:06:46 +0200
Subject: [PATCH 08/13] Productivity: Tweak templates a bit more

---
 .../FlowCoordinatorTemplate/FlowTemplateCoordinator.swift     | 4 ++--
 .../FlowTemplateCoordinatorBridgePresenter.swift              | 4 ++--
 .../buildable/ScreenTemplate/TemplateScreenCoordinator.swift  | 3 ++-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Tools/Templates/buildable/FlowCoordinatorTemplate/FlowTemplateCoordinator.swift b/Tools/Templates/buildable/FlowCoordinatorTemplate/FlowTemplateCoordinator.swift
index 92264ce19..720ed34f4 100644
--- a/Tools/Templates/buildable/FlowCoordinatorTemplate/FlowTemplateCoordinator.swift
+++ b/Tools/Templates/buildable/FlowCoordinatorTemplate/FlowTemplateCoordinator.swift
@@ -68,11 +68,11 @@ final class FlowTemplateCoordinator: FlowTemplateCoordinatorType {
 
 // MARK: - TemplateScreenCoordinatorDelegate
 extension FlowTemplateCoordinator: TemplateScreenCoordinatorDelegate {
-    func templateScreenCoordinator(_ templateScreenCoordinator: TemplateScreenCoordinatorType, didCompleteWithMessage message: String) {
+    func templateScreenCoordinator(_ coordinator: TemplateScreenCoordinatorType, didCompleteWithMessage message: String) {
         self.delegate?.flowTemplateCoordinatorDidComplete(self)
     }
 
-    func templateScreenCoordinatorDidCancel(_ templateScreenCoordinator: TemplateScreenCoordinatorType) {
+    func templateScreenCoordinatorDidCancel(_ coordinator: TemplateScreenCoordinatorType) {
         self.delegate?.flowTemplateCoordinatorDidComplete(self)
     }
 }
diff --git a/Tools/Templates/buildable/FlowCoordinatorTemplate/FlowTemplateCoordinatorBridgePresenter.swift b/Tools/Templates/buildable/FlowCoordinatorTemplate/FlowTemplateCoordinatorBridgePresenter.swift
index 6d5eb3242..4e6939611 100644
--- a/Tools/Templates/buildable/FlowCoordinatorTemplate/FlowTemplateCoordinatorBridgePresenter.swift
+++ b/Tools/Templates/buildable/FlowCoordinatorTemplate/FlowTemplateCoordinatorBridgePresenter.swift
@@ -17,7 +17,7 @@
 import Foundation
 
 @objc protocol FlowTemplateCoordinatorBridgePresenterDelegate {
-    func flowTemplateCoordinatorBridgePresenterDelegateDidComplete(_ flowTemplateCoordinatorBridgePresenter: FlowTemplateCoordinatorBridgePresenter)
+    func flowTemplateCoordinatorBridgePresenterDelegateDidComplete(_ coordinatorBridgePresenter: FlowTemplateCoordinatorBridgePresenter)
 }
 
 /// FlowTemplateCoordinatorBridgePresenter enables to start FlowTemplateCoordinator from a view controller.
@@ -71,7 +71,7 @@ final class FlowTemplateCoordinatorBridgePresenter: NSObject {
 
 // MARK: - FlowTemplateCoordinatorDelegate
 extension FlowTemplateCoordinatorBridgePresenter: FlowTemplateCoordinatorDelegate {
-    func flowTemplateCoordinatorDidComplete(_ flowTemplateCoordinator: FlowTemplateCoordinatorType) {
+    func flowTemplateCoordinatorDidComplete(_ coordinator: FlowTemplateCoordinatorType) {
         self.delegate?.flowTemplateCoordinatorBridgePresenterDelegateDidComplete(self)
     }
 }
diff --git a/Tools/Templates/buildable/ScreenTemplate/TemplateScreenCoordinator.swift b/Tools/Templates/buildable/ScreenTemplate/TemplateScreenCoordinator.swift
index f7c599f3a..8cd322e45 100644
--- a/Tools/Templates/buildable/ScreenTemplate/TemplateScreenCoordinator.swift
+++ b/Tools/Templates/buildable/ScreenTemplate/TemplateScreenCoordinator.swift
@@ -28,7 +28,8 @@ final class TemplateScreenCoordinator: TemplateScreenCoordinatorType {
     private let templateScreenViewController: TemplateScreenViewController
     
     // MARK: Public
-    
+
+    // Must be used only internally
     var childCoordinators: [Coordinator] = []
     
     weak var delegate: TemplateScreenCoordinatorDelegate?

From e5c9a262251b2f2f4fda42d805c48dc919b422be Mon Sep 17 00:00:00 2001
From: manuroe <manu@matrix.org>
Date: Thu, 4 Apr 2019 22:11:52 +0200
Subject: [PATCH 09/13] Productivity: Create createRootCoordinator.sh

---
 Tools/Templates/README.md                | 42 +++++++++++++++++++++---
 Tools/Templates/createRootCoordinator.sh | 37 +++++++++++++++++++++
 2 files changed, 74 insertions(+), 5 deletions(-)
 create mode 100755 Tools/Templates/createRootCoordinator.sh

diff --git a/Tools/Templates/README.md b/Tools/Templates/README.md
index 931671c79..0bcde6578 100644
--- a/Tools/Templates/README.md
+++ b/Tools/Templates/README.md
@@ -1,9 +1,9 @@
-The `buildable` contains templates with source files that build.
+The `buildable` folder contains templates with source files that build.
 
 The goal is to turn these templates as Xcode templates. They are part of the Riot project in order to ensure they build
 
 # ScreenTemplate
-This is the boilerplate to create a screen that follows the MVVM-C pattern within the Riot app.
+This is the boilerplate to create a screen that follows the MVVM-C pattern used within the Riot app.
 
 To use it (before it becomes an Xcode template):
 
@@ -18,7 +18,39 @@ The boilerplate to create a root coordinator and its presenter bridge that can b
  
 To use it (before it becomes an Xcode template):
 
-- `./createFlowCoordinator.sh MyFlowCoordinator [subFolder]`
-- Import the created folder in the Xcode project
+- `./createRootCoordinator.sh Folder MyRootCoordinatorName [DefaultScreenName]`
+- Import created files in the Xcode project
 
-`subFolder` is an option subfolder under `Riot/Modules/`
+
+# Usage example
+Following commands:
+
+```
+./createScreen.sh MyFlowDir/MyFirstScreenDir MyFirstScreen
+./createRootCoordinator.sh MyFlowDir MyFlow MyFirstScreen
+```
+
+generate in `Riot/Modules`:
+
+```
+Riot/Modules/MyFlowDir
+├── MyFirstScreenDir
+│   ├── MyFirstScreenCoordinator.swift
+│   ├── MyFirstScreenCoordinatorType.swift
+│   ├── MyFirstScreenViewAction.swift
+│   ├── MyFirstScreenViewController.storyboard
+│   ├── MyFirstScreenViewController.swift
+│   ├── MyFirstScreenViewModel.swift
+│   ├── MyFirstScreenViewModelType.swift
+│   └── MyFirstScreenViewState.swift
+├── MyFlowCoordinator.swift
+├── MyFlowCoordinatorBridgePresenter.swift
+└── MyFlowCoordinatorType.swift
+```
+
+It is then ready to use:
+
+```
+MyFlowCoordinatorBridgePresenter *presenter = [[MyFlowCoordinatorBridgePresenter alloc] initWithSession:session];
+[presenter presentFrom:self animated:YES];
+```
diff --git a/Tools/Templates/createRootCoordinator.sh b/Tools/Templates/createRootCoordinator.sh
new file mode 100755
index 000000000..b82b20bfc
--- /dev/null
+++ b/Tools/Templates/createRootCoordinator.sh
@@ -0,0 +1,37 @@
+#!/bin/bash
+
+if [ ! $# -eq 2 ] && [ ! $# -eq 3 ] ; then
+    echo "Usage: ./createRootCoordinator.sh Folder MyRootCoordinatorName [DefaultScreenName]"
+    exit 1
+fi 
+
+
+OUTPUT_DIR="../../Riot/Modules"/$1
+COORDINATOR_NAME=$2
+COORDINATOR_VAR_NAME=`echo $COORDINATOR_NAME | awk '{ print tolower(substr($0, 1, 1)) substr($0, 2) }'`
+SCREEN_NAME=$3
+SCREEN_VAR_NAME=`echo $SCREEN_NAME | awk '{ print tolower(substr($0, 1, 1)) substr($0, 2) }'`
+    
+MODULE_DIR="../../Riot/Modules"
+
+echo "Create folder ${OUTPUT_DIR}"
+
+mkdir -p $OUTPUT_DIR
+cp -R buildable/FlowCoordinatorTemplate/ $OUTPUT_DIR/
+
+cd $OUTPUT_DIR
+for file in FlowTemplate*
+do
+    if [ -f "$file" ]; then
+        echo "Building ${file/FlowTemplate/$COORDINATOR_NAME}..."
+        perl -p -i -e "s/FlowTemplate/"$COORDINATOR_NAME"/g" $file
+        perl -p -i -e "s/flowTemplate/"$COORDINATOR_VAR_NAME"/g" $file
+    
+        if [ -n "$SCREEN_NAME" ]; then
+            perl -p -i -e "s/TemplateScreen/"$SCREEN_NAME"/g" $file
+            perl -p -i -e "s/templateScreen/"$SCREEN_VAR_NAME"/g" $file
+        fi
+    
+        mv ${file} ${file/FlowTemplate/$COORDINATOR_NAME}
+    fi
+done
\ No newline at end of file

From ad561a06de2f9e768205b3e8b1e602dea740632c Mon Sep 17 00:00:00 2001
From: manuroe <manu@matrix.org>
Date: Fri, 5 Apr 2019 07:57:53 +0200
Subject: [PATCH 10/13] Productivity: Improve Templates/README.md

---
 Tools/Templates/README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Tools/Templates/README.md b/Tools/Templates/README.md
index 0bcde6578..54e33f1aa 100644
--- a/Tools/Templates/README.md
+++ b/Tools/Templates/README.md
@@ -5,12 +5,12 @@ The goal is to turn these templates as Xcode templates. They are part of the Rio
 # ScreenTemplate
 This is the boilerplate to create a screen that follows the MVVM-C pattern used within the Riot app.
 
-To use it (before it becomes an Xcode template):
+To create a screen from this template (before it becomes an Xcode template):
 
 - `./createScreen.sh ScreenFolder MyScreenName`
 - Import the created folder in the Xcode project
 
-This will create ScreenFolder within the Riot/Modules. Files inside will be called `MyScreenNameXxx`.
+This will create ScreenFolder within the Riot/Modules. Files inside will be named `MyScreenNameXxx`.
 
 
 # FlowCoordinatorTemplate
@@ -48,7 +48,7 @@ Riot/Modules/MyFlowDir
 └── MyFlowCoordinatorType.swift
 ```
 
-It is then ready to use:
+The generated code is ready to use. The screen provided by `ScreenTemplate` can by displayed by:
 
 ```
 MyFlowCoordinatorBridgePresenter *presenter = [[MyFlowCoordinatorBridgePresenter alloc] initWithSession:session];

From a157a9c2a98b742ffb8e44e03667961fe3aa7c5d Mon Sep 17 00:00:00 2001
From: manuroe <manu@matrix.org>
Date: Fri, 5 Apr 2019 08:40:10 +0200
Subject: [PATCH 11/13] Productivity: Tweak templates a bit more

---
 Tools/Templates/createRootCoordinator.sh | 3 +++
 Tools/Templates/createScreen.sh          | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/Tools/Templates/createRootCoordinator.sh b/Tools/Templates/createRootCoordinator.sh
index b82b20bfc..f8d3deaa4 100755
--- a/Tools/Templates/createRootCoordinator.sh
+++ b/Tools/Templates/createRootCoordinator.sh
@@ -31,6 +31,9 @@ do
             perl -p -i -e "s/TemplateScreen/"$SCREEN_NAME"/g" $file
             perl -p -i -e "s/templateScreen/"$SCREEN_VAR_NAME"/g" $file
         fi
+        
+        echo "// $ createRootCoordinator.sh $@" | cat - ${file} > /tmp/$$ && mv /tmp/$$ ${file}
+        echo '// File created from FlowTemplate' | cat - ${file} > /tmp/$$ && mv /tmp/$$ ${file}
     
         mv ${file} ${file/FlowTemplate/$COORDINATOR_NAME}
     fi
diff --git a/Tools/Templates/createScreen.sh b/Tools/Templates/createScreen.sh
index 1c42a0aec..acc05a232 100755
--- a/Tools/Templates/createScreen.sh
+++ b/Tools/Templates/createScreen.sh
@@ -27,5 +27,9 @@ do
     echo "Building ${file/TemplateScreen/$SCREEN_NAME}..."
     perl -p -i -e "s/TemplateScreen/"$SCREEN_NAME"/g" $file
     perl -p -i -e "s/templateScreen/"$SCREEN_VAR_NAME"/g" $file
+    
+    echo "// $ createScreen.sh $@" | cat - ${file} > /tmp/$$ && mv /tmp/$$ ${file}
+    echo '// File created from ScreenTemplate' | cat - ${file} > /tmp/$$ && mv /tmp/$$ ${file}
+    
     mv ${file} ${file/TemplateScreen/$SCREEN_NAME}
 done
\ No newline at end of file

From d4f9995cbac8d705d12bd455ff516bba876779ac Mon Sep 17 00:00:00 2001
From: manuroe <manu@matrix.org>
Date: Fri, 5 Apr 2019 08:52:59 +0200
Subject: [PATCH 12/13] Productivity: Tweak templates: No comments in a
 storyboard

---
 Tools/Templates/createScreen.sh | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Tools/Templates/createScreen.sh b/Tools/Templates/createScreen.sh
index acc05a232..3e3062f4b 100755
--- a/Tools/Templates/createScreen.sh
+++ b/Tools/Templates/createScreen.sh
@@ -28,8 +28,11 @@ do
     perl -p -i -e "s/TemplateScreen/"$SCREEN_NAME"/g" $file
     perl -p -i -e "s/templateScreen/"$SCREEN_VAR_NAME"/g" $file
     
-    echo "// $ createScreen.sh $@" | cat - ${file} > /tmp/$$ && mv /tmp/$$ ${file}
-    echo '// File created from ScreenTemplate' | cat - ${file} > /tmp/$$ && mv /tmp/$$ ${file}
+    if [[ ! $file == *.storyboard ]];
+    then
+        echo "// $ createScreen.sh $@" | cat - ${file} > /tmp/$$ && mv /tmp/$$ ${file}
+        echo '// File created from ScreenTemplate' | cat - ${file} > /tmp/$$ && mv /tmp/$$ ${file}
+    fi
     
     mv ${file} ${file/TemplateScreen/$SCREEN_NAME}
 done
\ No newline at end of file

From d92d0407cbefaffb3421ee8a4f2570798b42c86f Mon Sep 17 00:00:00 2001
From: manuroe <manu@matrix.org>
Date: Fri, 5 Apr 2019 09:34:48 +0200
Subject: [PATCH 13/13] Productivity: Fix templates small issue

---
 .../FlowTemplateCoordinatorBridgePresenter.swift                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Tools/Templates/buildable/FlowCoordinatorTemplate/FlowTemplateCoordinatorBridgePresenter.swift b/Tools/Templates/buildable/FlowCoordinatorTemplate/FlowTemplateCoordinatorBridgePresenter.swift
index 4e6939611..042c29106 100644
--- a/Tools/Templates/buildable/FlowCoordinatorTemplate/FlowTemplateCoordinatorBridgePresenter.swift
+++ b/Tools/Templates/buildable/FlowCoordinatorTemplate/FlowTemplateCoordinatorBridgePresenter.swift
@@ -47,7 +47,7 @@ final class FlowTemplateCoordinatorBridgePresenter: NSObject {
     
     // NOTE: Default value feature is not compatible with Objective-C.
     // func present(from viewController: UIViewController, animated: Bool) {
-    //     self.present(from: viewController, isStartedFromSignOut: false, animated: animated)
+    //     self.present(from: viewController, animated: animated)
     // }
     
     func present(from viewController: UIViewController, animated: Bool) {