boxes/themes: Set recipient bars to be thick colored lines.

Following recipient names, eg. stream/topic or PM recipients, we
previously had a full-height bar covering the width of the message-list.
This shrinks the height of that bar to be a thick line, also now colored
if associated with a stream.

For non-stream narrows which use the 'general_narrow' style, this adds a
new 'general_bar' style for styling the lines adjacent to this text.

Tests amended.

Author: neiljp

tests/ui/test_ui_tools.py

@@ -4,7 +4,7 @@
 
 import pytest
 from bs4 import BeautifulSoup
-from urwid import AttrWrap, Columns, Padding, Text
+from urwid import Columns, Divider, Padding, Text
 
 from zulipterminal.config.keys import is_command_key, keys_for_command
 from zulipterminal.helper import powerset
@@ -1703,7 +1703,6 @@ def test_main_view_renders_slash_me(self, mocker, message, content,
     ], ids=['different_stream_before', 'different_topic_before', 'PM_before'])
     def test_main_view_generates_stream_header(self, mocker, message,
                                                to_vary_in_last_message):
-        mocker.patch(VIEWS + ".urwid.Text")
         self.model.stream_dict = {
             5: {
                 'color': '#bd6',
@@ -1713,10 +1712,11 @@ def test_main_view_generates_stream_header(self, mocker, message,
         msg_box = MessageBox(message, self.model, last_message)
         view_components = msg_box.main_view()
         assert len(view_components) == 3
-        assert isinstance(view_components[0], AttrWrap)
-        assert view_components[0].get_attr() == 'bar'
-        assert isinstance(view_components[1], Columns)
-        assert isinstance(view_components[2], Padding)
+
+        assert isinstance(view_components[0], Columns)
+
+        assert isinstance(view_components[0][0], Text)
+        assert isinstance(view_components[0][1], Divider)
 
     @pytest.mark.parametrize('message', [
         {
@@ -1761,15 +1761,16 @@ def test_main_view_generates_stream_header(self, mocker, message,
     ], ids=['larger_pm_group', 'stream_before'])
     def test_main_view_generates_PM_header(self, mocker, message,
                                            to_vary_in_last_message):
-        mocker.patch(VIEWS + ".urwid.Text")
         last_message = dict(message, **to_vary_in_last_message)
         msg_box = MessageBox(message, self.model, last_message)
         view_components = msg_box.main_view()
         assert len(view_components) == 3
-        assert isinstance(view_components[0], AttrWrap)
-        assert view_components[0].get_attr() == 'bar'
-        assert isinstance(view_components[1], Columns)
-        assert isinstance(view_components[2], Padding)
+
+        assert isinstance(view_components[0], Columns)
+
+        assert isinstance(view_components[0][0], Text)
+        assert isinstance(view_components[0][1], Text)
+        assert isinstance(view_components[0][2], Divider)
 
     @pytest.mark.parametrize(['msg_narrow', 'msg_type', 'assert_header_bar',
                               'assert_search_bar'], [
@@ -1814,7 +1815,7 @@ def test_msg_generates_search_and_header_bar(self, mocker,
         search_bar = msg_box.top_search_bar()
         header_bar = msg_box.top_header_bar(msg_box)
 
-        assert header_bar.text.startswith(assert_header_bar)
+        assert header_bar[0].text.startswith(assert_header_bar)
         assert search_bar.text_to_fill == assert_search_bar
 
     # Assume recipient (PM/stream/topic) header is unchanged below

zulipterminal/config/themes.py

@@ -13,6 +13,7 @@
     'msg_selected': 'standout',
     'header': 'bold',
     'general_narrow': 'standout',
+    'general_bar': '',
     'name': '',
     'unread': 'strikethrough',
     'user_active': 'bold',
@@ -96,6 +97,8 @@
          None,             DEF['dark_cyan'],          DEF['dark_blue']),
         ('general_narrow', 'white',                   'dark blue',
          None,             DEF['white'],              DEF['dark_blue']),
+        ('general_bar',    'white',                   'black',
+         None,             DEF['white'],              DEF['black']),
         ('name',           'yellow, bold',            'black',
          None,             DEF['yellow:bold'],        DEF['black']),
         ('unread',         'dark blue',               'black',
@@ -158,6 +161,8 @@
          None,             'dark cyan',       DARKBLUE),
         ('general_narrow', 'white',           'dark blue',
          None,             WHITE,             DARKBLUE),
+        ('general_bar',    'white',           'black',
+         None,             WHITE,             BLACK),
         ('name',           'yellow, bold',    'black',
          None,             YELLOWBOLD,        BLACK),
         ('unread',         'light magenta',   'black',
@@ -213,6 +218,7 @@
         ('msg_selected',   'black',           'light green'),
         ('header',         'white',           'dark blue'),
         ('general_narrow', 'white',           'dark blue'),
+        ('general_bar',    'dark blue',       'white'),
         ('name',           'dark green',      'white'),
         ('unread',         'dark gray',       'light gray'),
         ('user_active',    'dark green',      'white'),
@@ -244,6 +250,7 @@
         ('msg_selected',   'black',           'light gray'),
         ('header',         'black',           'dark blue'),
         ('general_narrow', 'white',           'dark blue'),
+        ('general_bar',    'dark blue',       'light blue'),
         ('name',           'dark red',        'light blue'),
         ('unread',         'light gray',      'light blue'),
         ('user_active',    'light green, bold', 'light blue'),

zulipterminal/ui_tools/boxes.py

@@ -282,15 +282,18 @@ def _is_private_message_to_self(self) -> bool:
 
     def stream_header(self) -> Any:
         stream_topic_separator = '▶'
-        bar_color = self.model.stream_dict[self.stream_id]['color']
-        bar_color = 's' + bar_color
+        color = self.model.stream_dict[self.stream_id]['color']
+        bar_color = 's' + color
         stream_title_markup = ('bar', [
             (bar_color, '{} {} '.format(self.stream_name,
                                         stream_topic_separator)),
             ('title', ' {} '.format(self.topic_name))
         ])
         stream_title = urwid.Text(stream_title_markup)
-        header = urwid.AttrWrap(stream_title, 'bar')
+        header = urwid.Columns([
+            (len(stream_title.text), stream_title),
+            urwid.AttrWrap(urwid.Divider('━'), color),
+        ])
         header.markup = stream_title_markup
         return header
 
@@ -300,7 +303,11 @@ def private_header(self) -> Any:
             ('general_narrow', self.recipients_names)
         ])
         title = urwid.Text(title_markup)
-        header = urwid.AttrWrap(title, 'bar')
+        header = urwid.Columns([
+            (len(title.text), title),
+            (1, urwid.Text(' ')),
+            urwid.AttrWrap(urwid.Divider('━'), 'general_bar'),
+        ])
         header.markup = title_markup
         return header