Merge pull request #5342 from vector-im/steve/5321_bubbles_lauching

Message bubbles: Add settings and build flag

Config/BuildSettings.swift

@@ -291,6 +291,13 @@ final class BuildSettings: NSObject {
     static let roomScreenAllowMediaLibraryAction: Bool = true
     static let roomScreenAllowStickerAction: Bool = true
     static let roomScreenAllowFilesAction: Bool = true
+    
+    // Timeline style
+    static let roomScreenAllowTimelineStyleConfiguration: Bool = false
+    static let roomScreenTimelineDefaultStyleIdentifier: RoomTimelineStyleIdentifier = .plain
+    static var roomScreenEnableMessageBubblesByDefault: Bool {
+        return self.roomScreenTimelineDefaultStyleIdentifier == .bubble
+    }
 
     /// Allow split view detail view stacking    
     static let allowSplitViewDetailsScreenStacking: Bool = true

Riot/Assets/en.lproj/Vector.strings

@@ -655,6 +655,8 @@ Tap the + to start adding people.";
 
 "settings_show_NSFW_public_rooms" = "Show NSFW public rooms";
 
+"settings_enable_room_message_bubbles" = "Message bubbles";
+
 // Security settings
 "security_settings_title" = "Security";
 "security_settings_crypto_sessions" = "MY SESSIONS";

Riot/Generated/Strings.swift

@@ -4539,6 +4539,10 @@ public class VectorL10n: NSObject {
   public static var settingsEnableRageshake: String { 
     return VectorL10n.tr("Vector", "settings_enable_rageshake") 
   }
+  /// Message bubbles
+  public static var settingsEnableRoomMessageBubbles: String { 
+    return VectorL10n.tr("Vector", "settings_enable_room_message_bubbles") 
+  }
   /// Encrypted direct messages
   public static var settingsEncryptedDirectMessages: String { 
     return VectorL10n.tr("Vector", "settings_encrypted_direct_messages") 

Riot/Managers/Settings/RiotSettings.swift

@@ -194,6 +194,9 @@ final class RiotSettings: NSObject {
     @UserDefault(key: "roomScreenShowsURLPreviews", defaultValue: true, storage: defaults)
     var roomScreenShowsURLPreviews
     
+    @UserDefault(key: "roomScreenEnableMessageBubbles", defaultValue: BuildSettings.roomScreenEnableMessageBubblesByDefault, storage: defaults)
+    var roomScreenEnableMessageBubbles
+    
     // MARK: - Room Contextual Menu
     
     @UserDefault(key: "roomContextualMenuShowMoreOptionForMessages", defaultValue: BuildSettings.roomContextualMenuShowMoreOptionForMessages, storage: defaults)

Riot/Modules/Room/Views/BubbleCells/Styles/RoomTimelineStyleIdentifier.swift

@@ -0,0 +1,23 @@
+// 
+// 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
+
+/// Represents the room timeline style identifiers available
+enum RoomTimelineStyleIdentifier {
+    case plain
+    case bubble
+}