Merge branch 'feature/4386_whitelisting' into 'develop'

MESSENGER-4392 messges bubbles as default

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!109

Config/BWIBuildSettings.swift

@@ -182,7 +182,9 @@ class BWIBuildSettings: NSObject {
                       "74c038bb4e26fb1d0fcc14474ec9ff6fe3ec158e13286a787b90a22ee638ac18",
                       "3740163f98aeda7dba285d2af1bfc351db395868268e2759ca701f926a6605a5",
                       "240b05d9a54999140d23f21d104209fbc5e5179366ba3a7e58c8fad763aa88bd",
-                      "4d5b6dcf02396274be58a69c4bbeba975b529f6b19c504fc99a37892ee1cf0b5"]
+                      "4d5b6dcf02396274be58a69c4bbeba975b529f6b19c504fc99a37892ee1cf0b5",
+                      "0d157119821bd9d76ac4f24c7f44f56e6bb5b766a6d5ee7dad6634420e79271a"
+    ]
     
     // use a different badge color if the user was mentioned in a room
     var showMentionsInRoom = true
@@ -512,7 +514,7 @@ class BWIBuildSettings: NSObject {
             
     // MARK: - Message Bubbles bwi show in our menu and only for beta builds
     
-    var bwiShowMessageBubbleSettings = true
+    var bwiShowMessageBubbleSettings = false
 
     // bwi disable encrypted option in message context menu
     var roomContextualMenuShowEncryptionOption = false

Riot/Generated/BWIStrings.swift

@@ -1063,6 +1063,26 @@ public class BWIL10n: NSObject {
   public static func roomMemberPowerLevelModeratorIn(_ p1: String) -> String {
     return BWIL10n.tr("Bwi", "room_member_power_level_moderator_in", p1)
   }
+  /// Es gelten globale Benachrichtigungseinstellungen
+  public static var roomNotifsSettingsAllDescription: String { 
+    return BWIL10n.tr("Bwi", "room_notifs_settings_all_description") 
+  }
+  /// Standardeinstellungen
+  public static var roomNotifsSettingsAllMessages: String { 
+    return BWIL10n.tr("Bwi", "room_notifs_settings_all_messages") 
+  }
+  /// 
+  public static var roomNotifsSettingsEncryptedRoomNotice: String { 
+    return BWIL10n.tr("Bwi", "room_notifs_settings_encrypted_room_notice") 
+  }
+  /// Benachrichtigungen aus
+  public static var roomNotifsSettingsNone: String { 
+    return BWIL10n.tr("Bwi", "room_notifs_settings_none") 
+  }
+  /// Einstellungen für diesen Raum
+  public static var roomNotifsSettingsNotifyMeFor: String { 
+    return BWIL10n.tr("Bwi", "room_notifs_settings_notify_me_for") 
+  }
   /// Aus diesem Raum bannen
   public static var roomParticipantsActionBan: String { 
     return BWIL10n.tr("Bwi", "room_participants_action_ban") 
@@ -1527,6 +1547,10 @@ public class BWIL10n: NSObject {
   public static var settingsPasswordUpdated: String { 
     return BWIL10n.tr("Bwi", "settings_password_updated") 
   }
+  /// Permalink Prefix
+  public static var settingsPermalinkPrefixPickerTitle: String { 
+    return BWIL10n.tr("Bwi", "settings_permalink_prefix_picker_title") 
+  }
   /// Einladungen
   public static var settingsRoomInvitations: String { 
     return BWIL10n.tr("Bwi", "settings_room_invitations") 

Riot/Generated/Images.swift

@@ -179,6 +179,7 @@ internal class Asset: NSObject {
     internal static let plusFloatingAction = ImageAsset(name: "plus_floating_action")
     internal static let versionCheckCloseIcon = ImageAsset(name: "version_check_close_icon")
     internal static let versionCheckInfoIcon = ImageAsset(name: "version_check_info_icon")
+    internal static let image = ImageAsset(name: "Image")
     internal static let integrationManagerIconpile = ImageAsset(name: "integration_manager_iconpile")
     internal static let closeBanner = ImageAsset(name: "close_banner")
     internal static let importFilesButton = ImageAsset(name: "import_files_button")
@@ -227,6 +228,7 @@ internal class Asset: NSObject {
     internal static let newClose = ImageAsset(name: "new_close")
     internal static let roomActivitiesRetry = ImageAsset(name: "room_activities_retry")
     internal static let roomScrollUp = ImageAsset(name: "room_scroll_up")
+    internal static let roomScrollUpBum = ImageAsset(name: "room_scroll_up_bum")
     internal static let scrolldown = ImageAsset(name: "scrolldown")
     internal static let scrolldownDark = ImageAsset(name: "scrolldown_dark")
     internal static let sendingMessageTick = ImageAsset(name: "sending_message_tick")
@@ -245,6 +247,7 @@ internal class Asset: NSObject {
     internal static let inputTextBackground = ImageAsset(name: "input_text_background")
     internal static let saveIcon = ImageAsset(name: "save_icon")
     internal static let sendIcon = ImageAsset(name: "send_icon")
+    internal static let sendIconBum = ImageAsset(name: "send_icon_bum")
     internal static let uploadIcon = ImageAsset(name: "upload_icon")
     internal static let uploadIconDark = ImageAsset(name: "upload_icon_dark")
     internal static let videoCall = ImageAsset(name: "video_call")
@@ -262,10 +265,12 @@ internal class Asset: NSObject {
     internal static let locationMapError = ImageAsset(name: "location_map_error")
     internal static let locationMarkerIcon = ImageAsset(name: "location_marker_icon")
     internal static let locationPinIcon = ImageAsset(name: "location_pin_icon")
+    internal static let locationPinIconBum = ImageAsset(name: "location_pin_icon_bum")
     internal static let locationShareIcon = ImageAsset(name: "location_share_icon")
     internal static let locationUserMarker = ImageAsset(name: "location_user_marker")
     internal static let pollCheckboxDefault = ImageAsset(name: "poll_checkbox_default")
     internal static let pollCheckboxSelected = ImageAsset(name: "poll_checkbox_selected")
+    internal static let pollCheckboxSelectedBum = ImageAsset(name: "poll_checkbox_selected_bum")
     internal static let pollDeleteIcon = ImageAsset(name: "poll_delete_icon")
     internal static let pollDeleteOptionIcon = ImageAsset(name: "poll_delete_option_icon")
     internal static let pollEditIcon = ImageAsset(name: "poll_edit_icon")
@@ -289,6 +294,7 @@ internal class Asset: NSObject {
     internal static let voiceMessagePlayButton = ImageAsset(name: "voice_message_play_button")
     internal static let voiceMessageRecordButtonDefault = ImageAsset(name: "voice_message_record_button_default")
     internal static let voiceMessageRecordButtonRecording = ImageAsset(name: "voice_message_record_button_recording")
+    internal static let voiceMessageRecordButtonRecordingBum = ImageAsset(name: "voice_message_record_button_recording_bum")
     internal static let voiceMessageRecordIcon = ImageAsset(name: "voice_message_record_icon")
     internal static let addMemberFloatingAction = ImageAsset(name: "add_member_floating_action")
     internal static let addParticipant = ImageAsset(name: "add_participant")

Riot/Managers/Settings/RiotSettings.swift

@@ -283,8 +283,8 @@ final class RiotSettings: NSObject {
     var roomScreenEnableMessageBubbles
 
     var roomTimelineStyleIdentifier: RoomTimelineStyleIdentifier {
-//        return .bubble   // bwi: on by default because there is no toggle in the settings
-        return self.roomScreenEnableMessageBubbles ? .bubble : .plain
+        return .bubble   // bwi: on by default because there is no toggle in the settings
+    //    return self.roomScreenEnableMessageBubbles ? .bubble : .plain
     }
 
     /// A setting used to display the latest known display name and avatar in the timeline