From 0ec069429421258b2af7ae31e8493fe47dc5d3f4 Mon Sep 17 00:00:00 2001
From: Nico Alt <nicoalt@posteo.org>
Date: Thu, 31 Dec 2020 12:00:00 +0000
Subject: [PATCH] Add conversation_sidebar module

---
 briar-gtk/briar_gtk/conversation/conversation_presenter.py  | 2 +-
 briar-gtk/briar_gtk/conversation_sidebar/__init__.py        | 6 ++++++
 .../{widgets => conversation_sidebar}/contact_row.py        | 2 +-
 .../conversation_sidebar_presenter.py}                      | 2 +-
 .../conversation_sidebar_view.py}                           | 6 +++---
 5 files changed, 12 insertions(+), 6 deletions(-)
 create mode 100644 briar-gtk/briar_gtk/conversation_sidebar/__init__.py
 rename briar-gtk/briar_gtk/{widgets => conversation_sidebar}/contact_row.py (98%)
 rename briar-gtk/briar_gtk/{presenters/sidebar.py => conversation_sidebar/conversation_sidebar_presenter.py} (98%)
 rename briar-gtk/briar_gtk/{views/sidebar.py => conversation_sidebar/conversation_sidebar_view.py} (85%)

diff --git a/briar-gtk/briar_gtk/conversation/conversation_presenter.py b/briar-gtk/briar_gtk/conversation/conversation_presenter.py
index e66e497..9e40afb 100644
--- a/briar-gtk/briar_gtk/conversation/conversation_presenter.py
+++ b/briar-gtk/briar_gtk/conversation/conversation_presenter.py
@@ -6,7 +6,7 @@ from briar_gtk.handlers.notification import NotificationHandler
 from briar_gtk.presenters.private_chat import PrivateChatPresenter
 from briar_gtk.define import APP
 from briar_gtk.views.private_chat import PrivateChatView
-from briar_gtk.views.sidebar import SidebarView
+from briar_gtk.conversation_sidebar.conversation_sidebar_view import SidebarView
 from briar_gtk.conversation.about_dialog import AboutDialogWidget
 
 
diff --git a/briar-gtk/briar_gtk/conversation_sidebar/__init__.py b/briar-gtk/briar_gtk/conversation_sidebar/__init__.py
new file mode 100644
index 0000000..ea313da
--- /dev/null
+++ b/briar-gtk/briar_gtk/conversation_sidebar/__init__.py
@@ -0,0 +1,6 @@
+# Copyright (c) 2021 Nico Alt
+# SPDX-License-Identifier: AGPL-3.0-only
+# License-Filename: LICENSE.md
+"""
+Conversation sidebar in Briar GTK
+"""
diff --git a/briar-gtk/briar_gtk/widgets/contact_row.py b/briar-gtk/briar_gtk/conversation_sidebar/contact_row.py
similarity index 98%
rename from briar-gtk/briar_gtk/widgets/contact_row.py
rename to briar-gtk/briar_gtk/conversation_sidebar/contact_row.py
index bd0d7fe..d7e8897 100644
--- a/briar-gtk/briar_gtk/widgets/contact_row.py
+++ b/briar-gtk/briar_gtk/conversation_sidebar/contact_row.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Nico Alt
+# Copyright (c) 2020-2021 Nico Alt
 # SPDX-License-Identifier: AGPL-3.0-only
 # License-Filename: LICENSE.md
 #
diff --git a/briar-gtk/briar_gtk/presenters/sidebar.py b/briar-gtk/briar_gtk/conversation_sidebar/conversation_sidebar_presenter.py
similarity index 98%
rename from briar-gtk/briar_gtk/presenters/sidebar.py
rename to briar-gtk/briar_gtk/conversation_sidebar/conversation_sidebar_presenter.py
index dfbecf6..e572928 100644
--- a/briar-gtk/briar_gtk/presenters/sidebar.py
+++ b/briar-gtk/briar_gtk/conversation_sidebar/conversation_sidebar_presenter.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Nico Alt
+# Copyright (c) 2020-2021 Nico Alt
 # SPDX-License-Identifier: AGPL-3.0-only
 # License-Filename: LICENSE.md
 
diff --git a/briar-gtk/briar_gtk/views/sidebar.py b/briar-gtk/briar_gtk/conversation_sidebar/conversation_sidebar_view.py
similarity index 85%
rename from briar-gtk/briar_gtk/views/sidebar.py
rename to briar-gtk/briar_gtk/conversation_sidebar/conversation_sidebar_view.py
index d425300..ab11312 100644
--- a/briar-gtk/briar_gtk/views/sidebar.py
+++ b/briar-gtk/briar_gtk/conversation_sidebar/conversation_sidebar_view.py
@@ -1,9 +1,9 @@
-# Copyright (c) 2020 Nico Alt
+# Copyright (c) 2020-2021 Nico Alt
 # SPDX-License-Identifier: AGPL-3.0-only
 # License-Filename: LICENSE.md
 from briar_gtk.define import APP
-from briar_gtk.presenters.sidebar import SidebarPresenter
-from briar_gtk.widgets.contact_row import ContactRowWidget
+from briar_gtk.conversation_sidebar.conversation_sidebar_presenter import SidebarPresenter
+from briar_gtk.conversation_sidebar.contact_row import ContactRowWidget
 
 
 class SidebarView:
-- 
GitLab