core: Display settings in LoadingView.

Stop showing loading settings for theme and autohide  to stdout and use
the LoadingView instead. Note that in case of invalid settings,
output would still be displayed to stdout.

Tests amended.

Author: kaustubh-nair

tests/cli/test_run.py

@@ -93,9 +93,6 @@ def test_valid_zuliprc_but_no_connection(capsys, mocker, minimal_zuliprc,
 
     lines = captured.out.strip().split("\n")
     expected_lines = [
-        "Loading with:",
-        "   theme 'zt_dark' specified with no config.",
-        "   autohide setting 'no_autohide' specified with no config.",
         "\x1b[91m",
         ("Error connecting to Zulip server: {}.\x1b[0m".
             format(server_connection_error)),
@@ -126,13 +123,10 @@ def test_warning_regarding_incomplete_theme(capsys, mocker, monkeypatch,
 
     lines = captured.out.strip().split("\n")
     expected_lines = [
-        "Loading with:",
-        "   theme '{}' specified on command line.".format(bad_theme),
         "\x1b[93m"
         "   WARNING: Incomplete theme; results may vary!",
         "      (you could try: {}, {})"
         "\x1b[0m".format('a', 'b'),
-        "   autohide setting 'no_autohide' specified with no config.",
         "\x1b[91m",
         ("Error connecting to Zulip server: {}.\x1b[0m".
             format(server_connection_error)),

tests/core/test_core.py

@@ -34,15 +34,16 @@ def controller(self, mocker) -> None:
         self.theme = 'default'
         self.autohide = True  # FIXME Add tests for no-autohide
         self.notify_enabled = False
-        return Controller(self.config_file, self.theme, 256, self.autohide,
-                          self.notify_enabled)
+        self.settings = mocker.Mock()
+        return Controller(self.config_file, self.theme, 256, self.settings,
+                          self.autohide, self.notify_enabled)
 
     def test_initialize_controller(self, controller, mocker) -> None:
         self.client.assert_called_once_with(
             config_file=self.config_file,
             client='ZulipTerminal/' + ZT_VERSION + ' ' + platform(),
         )
-        self.loading_view.assert_called_once_with(controller)
+        self.loading_view.assert_called_once_with(controller, self.settings)
         self.model.assert_called_once_with(controller)
         self.view.assert_called_once_with(controller)
         self.model.poll_for_events.assert_called_once_with()

tests/ui/test_ui_tools.py

@@ -2476,7 +2476,9 @@ class TestLoadingView:
     @pytest.fixture
     def loading_view(self, mocker):
         self.controller = mocker.Mock()
-        loading_view = LoadingView(self.controller)
+        self.settings = {'theme': ('wombat', 'on commandline'),
+                         'autohide': ('autohide', 'default')}
+        loading_view = LoadingView(self.controller, self.settings)
         return loading_view
 
     def test_init(self, loading_view):

zulipterminal/cli/run.py

@@ -258,17 +258,13 @@ def main(options: Optional[List[str]]=None) -> None:
                 "{} (by alias '{}')".format(theme_to_use[1], theme_to_use[0])
             )
 
-        print("Loading with:")
-        print("   theme '{}' specified {}.".format(*theme_to_use))
         complete, incomplete = complete_and_incomplete_themes()
         if theme_to_use[0] in incomplete:
             print(in_color('yellow',
                            "   WARNING: Incomplete theme; "
                            "results may vary!\n"
                            "      (you could try: {})".
                            format(", ".join(complete))))
-        print("   autohide setting '{}' specified {}."
-              .format(*zterm['autohide']))
         # For binary settings
         # Specify setting in order True, False
         valid_settings = {
@@ -293,9 +289,13 @@ def main(options: Optional[List[str]]=None) -> None:
         else:
             theme_data = THEMES[theme_to_use[0]]
 
+        settings = {'theme': theme_to_use,
+                    'autohide': zterm['autohide']}
+
         Controller(zuliprc_path,
                    theme_data,
                    int(args.color_depth),
+                   settings,
                    **boolean_settings).main()
     except ServerConnectionFailure as e:
         print(in_color('red',

zulipterminal/core.py

@@ -4,7 +4,7 @@
 import time
 from functools import partial
 from platform import platform
-from typing import Any, List, Optional, Tuple
+from typing import Any, Dict, List, Optional, Tuple
 
 import urwid
 import zulip
@@ -28,7 +28,7 @@ class Controller:
     """
 
     def __init__(self, config_file: str, theme: ThemeSpec,
-                 color_depth: int,
+                 color_depth: int, settings: Dict[str, Any],
                  autohide: bool, notify: bool) -> None:
         self.theme = theme
         self.color_depth = color_depth
@@ -41,7 +41,7 @@ def __init__(self, config_file: str, theme: ThemeSpec,
         self.client = zulip.Client(config_file=config_file,
                                    client='ZulipTerminal/{} {}'.
                                           format(ZT_VERSION, platform()))
-        self.loading_view = LoadingView(self)
+        self.loading_view = LoadingView(self, settings)
         self.init_model_view()
 
     @asynch

zulipterminal/ui_tools/views.py

@@ -989,12 +989,17 @@ def __init__(self, controller: Any, msg: Message, title: str) -> None:
 
 
 class LoadingView(urwid.Filler):
-    def __init__(self, controller: Any) -> None:
+    def __init__(self, controller: Any, settings: Dict[str, Any]) -> None:
         self.controller = controller
-        self.text = ["Welcome to Zulip.\n\n",
+        self.text = [('user_active', "Welcome to Zulip.\n\n\n"),
+                     "Loading with:\n",
+                     "theme '{}' specified {}.\n".format(*settings['theme']),
+                     "autohide setting '{}' specified {}.\n\n"
+                     .format(*settings['autohide']),
                      "Loading..."]
-        text_wid = urwid.Text(self.text, 'center')
-        super().__init__(text_wid, 'middle', 'pack')
+        text_wid = urwid.Text(self.text)
+        padding = urwid.Padding(text_wid, 'center', ('relative', 50))
+        super().__init__(padding, 'middle', 'pack')
 
     def selectable(self) -> bool:
         return True
@@ -1003,4 +1008,4 @@ def keypress(self, size: Tuple[int, int], key: str) -> str:
         return key
 
     def set_spinner(self, spinner: str) -> None:
-        self.base_widget.set_text(self.text + [spinner])
+        self.body.base_widget.set_text(self.text + [spinner])