From bd02a7c04506dccd516b8dbe96f36ea080a17e68 Mon Sep 17 00:00:00 2001
From: Nico Alt <nicoalt@posteo.org>
Date: Thu, 17 Dec 2020 20:42:42 +0100
Subject: [PATCH] Make AddContactView from AddContactContainer

---
 .../briar_gtk/{containers => views}/add_contact.py | 14 ++++++++++----
 briar-gtk/briar_gtk/window.py                      |  4 ++--
 2 files changed, 12 insertions(+), 6 deletions(-)
 rename briar-gtk/briar_gtk/{containers => views}/add_contact.py (93%)

diff --git a/briar-gtk/briar_gtk/containers/add_contact.py b/briar-gtk/briar_gtk/views/add_contact.py
similarity index 93%
rename from briar-gtk/briar_gtk/containers/add_contact.py
rename to briar-gtk/briar_gtk/views/add_contact.py
index ba0cebc..8486f4f 100644
--- a/briar-gtk/briar_gtk/containers/add_contact.py
+++ b/briar-gtk/briar_gtk/views/add_contact.py
@@ -1,18 +1,18 @@
 # Copyright (c) 2019 Nico Alt
 # SPDX-License-Identifier: AGPL-3.0-only
 # License-Filename: LICENSE.md
-
+import os
 from gettext import gettext as _
+from gi.repository import Gtk
 
 from briar_wrapper.models.contacts import Contacts
 
 from briar_gtk.actions.add_contact import AddContactActions
 from briar_gtk.actions.prefixes import ADD_CONTACT_PREFIX
-from briar_gtk.container import Container
-from briar_gtk.define import APP
+from briar_gtk.define import APP, RESOURCES_DIR
 
 
-class AddContactContainer(Container):
+class AddContactView(Gtk.Overlay):
 
     ADD_CONTACT_UI = "add_contact.ui"
     STACK_NAME = "add_contact_flow_stack"
@@ -20,6 +20,7 @@ class AddContactContainer(Container):
 
     def __init__(self):
         super().__init__()
+        self.builder = Gtk.Builder()
         AddContactActions(self)
         self._setup_view()
         self._load_content()
@@ -72,6 +73,11 @@ class AddContactContainer(Container):
         self._setup_add_contact_flow_headers()
         self._setup_link_enter_listener()
 
+    def _add_from_resource(self, ui_filename):
+        self.builder.add_from_resource(
+            os.path.join(RESOURCES_DIR, ui_filename)
+        )
+
     def _load_content(self):
         contacts = Contacts(APP().api)
         own_link = contacts.get_link()
diff --git a/briar-gtk/briar_gtk/window.py b/briar-gtk/briar_gtk/window.py
index c9fb847..408780d 100644
--- a/briar-gtk/briar_gtk/window.py
+++ b/briar-gtk/briar_gtk/window.py
@@ -8,7 +8,7 @@ from gettext import gettext as _
 from gi.repository import Gio, Gtk
 
 from briar_gtk.actions.window import WindowActions
-from briar_gtk.containers.add_contact import AddContactContainer
+from briar_gtk.views.add_contact import AddContactView
 from briar_gtk.controllers.main_window import MainWindowController
 from briar_gtk.views.main_window import MainWindowView
 from briar_gtk.containers.startup import StartupContainer
@@ -111,7 +111,7 @@ class Window(Gtk.ApplicationWindow):
         self.current_controller = main_window_controller
 
     def _setup_add_contact_container(self):
-        self._setup_container(AddContactContainer())
+        self._setup_container(AddContactView())
 
     def _setup_builder(self):
         builder = Gtk.Builder.new()
-- 
GitLab