From 7b5a1660f85b2394556df70ebfe30b185bc56374 Mon Sep 17 00:00:00 2001
From: Iuri Matias <iuri.matias@gmail.com>
Date: Wed, 10 Feb 2021 15:41:00 -0500
Subject: [PATCH] make compact mode the default

---
 ui/app/AppLayouts/Chat/ChatColumn/ChatMessages.qml        | 2 +-
 ui/app/AppLayouts/Chat/ChatColumn/Message.qml             | 2 +-
 .../Chat/ChatColumn/MessageComponents/ChatReply.qml       | 2 +-
 .../Chat/ChatColumn/MessageComponents/ChatText.qml        | 4 ++--
 .../Chat/ChatColumn/MessageComponents/EmojiReactions.qml  | 8 ++++----
 .../Chat/ChatColumn/MessageComponents/NormalMessage.qml   | 2 +-
 .../Chat/CommunityComponents/CommunityButton.qml          | 2 +-
 ui/app/AppLayouts/Chat/ContactsColumn/Channel.qml         | 2 +-
 ui/app/AppLayouts/Chat/ContactsColumn/ChannelList.qml     | 4 ++--
 .../AppLayouts/Profile/Sections/AppearanceContainer.qml   | 8 ++++----
 ui/main.qml                                               | 4 ++--
 11 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/ui/app/AppLayouts/Chat/ChatColumn/ChatMessages.qml b/ui/app/AppLayouts/Chat/ChatColumn/ChatMessages.qml
index 814387c25f..6a06619a14 100644
--- a/ui/app/AppLayouts/Chat/ChatColumn/ChatMessages.qml
+++ b/ui/app/AppLayouts/Chat/ChatColumn/ChatMessages.qml
@@ -35,7 +35,7 @@ ScrollView {
         id: chatLogView
         anchors.fill: parent
         anchors.bottomMargin: Style.current.bigPadding
-        spacing: appSettings.compactMode ? 0 : 4
+        spacing: appSettings.useCompactMode ? 0 : 4
         boundsBehavior: Flickable.StopAtBounds
         flickDeceleration: 10000
         Layout.fillWidth: true
diff --git a/ui/app/AppLayouts/Chat/ChatColumn/Message.qml b/ui/app/AppLayouts/Chat/ChatColumn/Message.qml
index 46421caf7a..a912ae6c3b 100644
--- a/ui/app/AppLayouts/Chat/ChatColumn/Message.qml
+++ b/ui/app/AppLayouts/Chat/ChatColumn/Message.qml
@@ -154,7 +154,7 @@ Item {
                     return invitationBubble
                 default:
                     return isStatusUpdate ? statusUpdateComponent :
-                                            (appSettings.compactMode ? compactMessageComponent : messageComponent)
+                                            (appSettings.useCompactMode ? compactMessageComponent : messageComponent)
 
             }
         }
diff --git a/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/ChatReply.qml b/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/ChatReply.qml
index b5f998d07a..d17c2627de 100644
--- a/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/ChatReply.qml
+++ b/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/ChatReply.qml
@@ -61,7 +61,7 @@ Loader {
                 anchors.topMargin: 5
                 text: `<style type="text/css">`+
                         `a {`+
-                            `color: ${isCurrentUser && !appSettings.compactMode ? Style.current.white : Style.current.textColor};`+
+                            `color: ${isCurrentUser && !appSettings.useCompactMode ? Style.current.white : Style.current.textColor};`+
                         `}`+
                         `a.mention {`+
                             `color: ${isCurrentUser ? Style.current.cyan : Style.current.turquoise};`+
diff --git a/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/ChatText.qml b/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/ChatText.qml
index 011eafc1a5..f6eb20d2fb 100644
--- a/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/ChatText.qml
+++ b/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/ChatText.qml
@@ -6,7 +6,7 @@ import QtGraphicalEffects 1.0
 Item {
     property bool longChatText: true
     property bool veryLongChatText: chatsModel.plainText(message).length >
-                                    (appSettings.compactMode ? Constants.limitLongChatTextCompactMode : Constants.limitLongChatText)
+                                    (appSettings.useCompactMode ? Constants.limitLongChatTextCompactMode : Constants.limitLongChatText)
     property bool readMore: false
     property alias textField: chatText
 
@@ -79,7 +79,7 @@ Item {
                                 `line-height: 22px;` +
                             `}` +
                             `a {` +
-                                `color: ${isCurrentUser && !appSettings.compactMode ? Style.current.white : Style.current.textColor};` +
+                                `color: ${isCurrentUser && !appSettings.useCompactMode ? Style.current.white : Style.current.textColor};` +
                             `}` +
                             `a.mention {` +
                                 `color: ${Style.current.mentionColor};` +
diff --git a/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/EmojiReactions.qml b/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/EmojiReactions.qml
index 8e8eb67861..c24a0454c5 100644
--- a/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/EmojiReactions.qml
+++ b/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/EmojiReactions.qml
@@ -86,9 +86,9 @@ Item {
                     width: 10
                     height: 10
                     anchors.top: parent.top
-                    anchors.left: !isCurrentUser || appSettings.compactMode ? parent.left : undefined
+                    anchors.left: !isCurrentUser || appSettings.useCompactMode ? parent.left : undefined
                     anchors.leftMargin: 0
-                    anchors.right: !isCurrentUser || appSettings.compactMode ? undefined : parent.right
+                    anchors.right: !isCurrentUser || appSettings.useCompactMode ? undefined : parent.right
                     anchors.rightMargin: 0
                     radius: 2
                     z: -1
@@ -115,9 +115,9 @@ Item {
                                 width: 10
                                 height: 10
                                 anchors.top: parent.top
-                                anchors.left: !isCurrentUser || appSettings.compactMode ? parent.left : undefined
+                                anchors.left: !isCurrentUser || appSettings.useCompactMode ? parent.left : undefined
                                 anchors.leftMargin: 0
-                                anchors.right: !isCurrentUser || appSettings.compactMode ? undefined : parent.right
+                                anchors.right: !isCurrentUser || appSettings.useCompactMode ? undefined : parent.right
                                 anchors.rightMargin: 0
                                 radius: 2
                                 z: -1
diff --git a/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/NormalMessage.qml b/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/NormalMessage.qml
index 676e945d3a..8fae9c407c 100644
--- a/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/NormalMessage.qml
+++ b/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/NormalMessage.qml
@@ -140,7 +140,7 @@ Item {
             anchors.rightMargin: chatBox.longChatText ? chatBox.chatHorizontalPadding : 0
             textField.color: !root.isCurrentUser ? Style.current.textColor : Style.current.currentUserTextColor
             Connections {
-                target: appSettings.compactMode ? null : chatBox
+                target: appSettings.useCompactMode ? null : chatBox
                 onLongChatTextChanged: {
                     chatText.setWidths()
                 }
diff --git a/ui/app/AppLayouts/Chat/CommunityComponents/CommunityButton.qml b/ui/app/AppLayouts/Chat/CommunityComponents/CommunityButton.qml
index da5f979d44..254248a0d9 100644
--- a/ui/app/AppLayouts/Chat/CommunityComponents/CommunityButton.qml
+++ b/ui/app/AppLayouts/Chat/CommunityComponents/CommunityButton.qml
@@ -13,7 +13,7 @@ Rectangle {
     property string image: "../../../img/ens-header-dark@2x.png"
     property bool hasMentions: false
     property string searchStr: ""
-    property bool isCompact: appSettings.compactMode
+    property bool isCompact: appSettings.useCompactMode
     property bool hovered: false
 
     id: communityButton
diff --git a/ui/app/AppLayouts/Chat/ContactsColumn/Channel.qml b/ui/app/AppLayouts/Chat/ContactsColumn/Channel.qml
index ca8f72fc87..79012d8d62 100644
--- a/ui/app/AppLayouts/Chat/ContactsColumn/Channel.qml
+++ b/ui/app/AppLayouts/Chat/ContactsColumn/Channel.qml
@@ -15,7 +15,7 @@ Rectangle {
     property bool hasMentions: false
     property int chatType: Constants.chatTypePublic
     property string searchStr: ""
-    property bool isCompact: appSettings.compactMode
+    property bool isCompact: appSettings.useCompactMode
     property int contentType: 1
     property bool muted: false
     property bool hovered: false
diff --git a/ui/app/AppLayouts/Chat/ContactsColumn/ChannelList.qml b/ui/app/AppLayouts/Chat/ContactsColumn/ChannelList.qml
index 769a0139ae..a239cdb6ec 100644
--- a/ui/app/AppLayouts/Chat/ContactsColumn/ChannelList.qml
+++ b/ui/app/AppLayouts/Chat/ContactsColumn/ChannelList.qml
@@ -20,10 +20,10 @@ Item {
 
     ListView {
         id: chatGroupsListView
-        spacing: appSettings.compactMode ? 4 : Style.current.halfPadding
+        spacing: appSettings.useCompactMode ? 4 : Style.current.halfPadding
         anchors.top: parent.top
         height: childrenRect.height
-        visible: height > (appSettings.compactMode ? 30 : 50)
+        visible: height > (appSettings.useCompactMode ? 30 : 50)
         anchors.right: parent.right
         anchors.left: parent.left
         interactive: false
diff --git a/ui/app/AppLayouts/Profile/Sections/AppearanceContainer.qml b/ui/app/AppLayouts/Profile/Sections/AppearanceContainer.qml
index ea2681ce12..aea892d972 100644
--- a/ui/app/AppLayouts/Profile/Sections/AppearanceContainer.qml
+++ b/ui/app/AppLayouts/Profile/Sections/AppearanceContainer.qml
@@ -192,10 +192,10 @@ ScrollView {
                 image.source: "../../../img/appearance-normal-light.svg"
                 image.height: 186
                 control.text: qsTr("Normal")
-                control.checked: !appSettings.compactMode
+                control.checked: !appSettings.useCompactMode
                 onRadioCheckedChanged: {
                     if (checked) {
-                        appSettings.compactMode = false
+                        appSettings.useCompactMode = false
                     }
                 }
             }
@@ -205,10 +205,10 @@ ScrollView {
                 image.source: "../../../img/appearance-compact-light.svg"
                 image.height: 186
                 control.text: qsTr("Compact")
-                control.checked: appSettings.compactMode
+                control.checked: appSettings.useCompactMode
                 onRadioCheckedChanged: {
                     if (checked) {
-                        appSettings.compactMode = true
+                        appSettings.useCompactMode = true
                     }
                 }
             }
diff --git a/ui/main.qml b/ui/main.qml
index d50a12af4d..1c2f1d3700 100644
--- a/ui/main.qml
+++ b/ui/main.qml
@@ -99,7 +99,7 @@ ApplicationWindow {
         property bool browserEnabled: false
         property bool displayChatImages: false
         property bool timelineEnabled: true
-        property bool compactMode
+        property bool useCompactMode
         property string locale: "en"
         property var recentEmojis: []
         property real volume: 0.2
@@ -147,7 +147,7 @@ ApplicationWindow {
         property bool nodeManagementEnabled: defaultAppSettings.nodeManagementEnabled
         property bool browserEnabled: defaultAppSettings.browserEnabled
         property bool displayChatImages: defaultAppSettings.displayChatImages
-        property bool compactMode: defaultAppSettings.compactMode
+        property bool useCompactMode: defaultAppSettings.useCompactMode
         property bool timelineEnabled: defaultAppSettings.timelineEnabled
         property string locale: defaultAppSettings.locale
         property var recentEmojis: defaultAppSettings.recentEmojis