From aa5dbc69947e6a711a79afd470e3e930d31b7222 Mon Sep 17 00:00:00 2001
From: Richard Ramos <info@richardramos.me>
Date: Wed, 27 May 2020 17:09:12 -0400
Subject: [PATCH] fix: moving components to correct shared folder

---
 ui/app/AppLayouts/Chat/ChatColumn.qml                 |  2 +-
 ui/app/AppLayouts/Chat/ContactsColumn.qml             |  2 +-
 ui/app/AppLayouts/Chat/components/PublicChatPopup.qml |  2 +-
 ui/app/AppLayouts/Shared/qmldir                       |  2 --
 ui/nim-status-client.pro                              | 10 ++++++++++
 ui/{app/AppLayouts/Shared => shared}/PopupMenu.qml    |  2 +-
 ui/{app/AppLayouts/Shared => shared}/Separator.qml    |  2 +-
 ui/shared/qmldir                                      |  2 ++
 8 files changed, 17 insertions(+), 7 deletions(-)
 delete mode 100644 ui/app/AppLayouts/Shared/qmldir
 rename ui/{app/AppLayouts/Shared => shared}/PopupMenu.qml (99%)
 rename ui/{app/AppLayouts/Shared => shared}/Separator.qml (84%)

diff --git a/ui/app/AppLayouts/Chat/ChatColumn.qml b/ui/app/AppLayouts/Chat/ChatColumn.qml
index 140637d26b..f26bf7d81e 100644
--- a/ui/app/AppLayouts/Chat/ChatColumn.qml
+++ b/ui/app/AppLayouts/Chat/ChatColumn.qml
@@ -3,7 +3,7 @@ import QtQuick.Controls 2.3
 import QtQuick.Controls 2.12 as QQC2
 import QtQuick.Layouts 1.3
 import Qt.labs.platform 1.1
-import "../Shared"
+import "../../../shared"
 import "../../../imports"
 
 StackLayout {
diff --git a/ui/app/AppLayouts/Chat/ContactsColumn.qml b/ui/app/AppLayouts/Chat/ContactsColumn.qml
index 3c02f83fa3..7caef9be89 100644
--- a/ui/app/AppLayouts/Chat/ContactsColumn.qml
+++ b/ui/app/AppLayouts/Chat/ContactsColumn.qml
@@ -5,7 +5,7 @@ import QtQuick.Layouts 1.3
 import Qt.labs.platform 1.1
 import QtGraphicalEffects 1.12
 import "../../../imports"
-import "../Shared"
+import "../../../shared"
 import "./components"
 
 Item {
diff --git a/ui/app/AppLayouts/Chat/components/PublicChatPopup.qml b/ui/app/AppLayouts/Chat/components/PublicChatPopup.qml
index b168b76e10..7c387b6291 100644
--- a/ui/app/AppLayouts/Chat/components/PublicChatPopup.qml
+++ b/ui/app/AppLayouts/Chat/components/PublicChatPopup.qml
@@ -2,7 +2,7 @@ import QtQuick 2.12
 import QtQuick.Controls 2.3
 import QtQuick.Layouts 1.3
 import "../../../../imports"
-import "../../Shared"
+import "../../../../shared"
 import "./"
 
 Item {
diff --git a/ui/app/AppLayouts/Shared/qmldir b/ui/app/AppLayouts/Shared/qmldir
deleted file mode 100644
index 84389c8a04..0000000000
--- a/ui/app/AppLayouts/Shared/qmldir
+++ /dev/null
@@ -1,2 +0,0 @@
-Separator 1.0 Separator.qml
-PopupMenu 1.0 PopupMenu.qml
\ No newline at end of file
diff --git a/ui/nim-status-client.pro b/ui/nim-status-client.pro
index 9e364e0d96..6944728152 100644
--- a/ui/nim-status-client.pro
+++ b/ui/nim-status-client.pro
@@ -53,6 +53,7 @@ DISTFILES += \
     app/AppLayouts/Chat/ChatColumn.qml \
     app/AppLayouts/Chat/ChatLayout.qml \
     app/AppLayouts/Chat/ContactsColumn.qml \
+    app/AppLayouts/Chat/components/PublicChatPopup.qml \
     app/AppLayouts/Chat/components/SuggestedChannel.qml \
     app/AppLayouts/Chat/components/qmldir \
     app/AppLayouts/Chat/qmldir \
@@ -64,12 +65,19 @@ DISTFILES += \
     app/AppLayouts/WalletLayout.qml \
     app/AppLayouts/qmldir \
     app/AppMain.qml \
+    app/img/arrow-btn-active.svg \
+    app/img/arrow-btn-inactive.svg \
     app/img/compass.svg \
     app/img/compassActive.svg \
+    app/img/close.svg \
+    app/img/group_chat.svg \
+    app/img/hash.svg \
     app/img/message.svg \
     app/img/messageActive.svg \
+    app/img/new_chat.svg \
     app/img/profile.svg \
     app/img/profileActive.svg \
+    app/img/public_chat.svg \
     app/img/search.svg \
     app/img/wallet.svg \
     app/img/walletActive.svg \
@@ -96,6 +104,8 @@ DISTFILES += \
     onboarding/img/wallet@2x.jpg \
     onboarding/img/wallet@3x.jpg \
     onboarding/qmldir \
+    shared/PopupMenu.qml \
+    shared/Separator.qml \
     shared/StyledButton.qml \
     shared/RoundedIcon.qml \
     shared/qmldir
diff --git a/ui/app/AppLayouts/Shared/PopupMenu.qml b/ui/shared/PopupMenu.qml
similarity index 99%
rename from ui/app/AppLayouts/Shared/PopupMenu.qml
rename to ui/shared/PopupMenu.qml
index c9f59b6468..abc1ae007d 100644
--- a/ui/app/AppLayouts/Shared/PopupMenu.qml
+++ b/ui/shared/PopupMenu.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
 import QtGraphicalEffects 1.12
-import "../../../imports"
+import "../imports"
 
 Menu {
     property alias arrowX: bgPopupMenuTopArrow.x
diff --git a/ui/app/AppLayouts/Shared/Separator.qml b/ui/shared/Separator.qml
similarity index 84%
rename from ui/app/AppLayouts/Shared/Separator.qml
rename to ui/shared/Separator.qml
index 066b260aa1..6d2473d979 100644
--- a/ui/app/AppLayouts/Shared/Separator.qml
+++ b/ui/shared/Separator.qml
@@ -1,5 +1,5 @@
 import QtQuick 2.12
-import "../../../imports"
+import "../imports"
 
 Rectangle {
       id: separator
diff --git a/ui/shared/qmldir b/ui/shared/qmldir
index 94e1b6e5c7..4790eca0b3 100644
--- a/ui/shared/qmldir
+++ b/ui/shared/qmldir
@@ -1,2 +1,4 @@
 StyledButton 1.0 StyledButton.qml
 RoundedIcon 1.0 RoundedIcon.qml
+PopupMenu 1.0 PopupMenu.qml
+Separator 1.0 Separator.qml