views: Support 'j/k', 'J/K' and 'G/end' for navigation in infoviews.

Extended support for navigation through the other specified keys in
infoviews using PopUpView base class.

Note that unlike the previous implementation, the ListWalker object
is constructed in PopUpView (the base class) instead of the derived
class.

Tests added for navigation keypresses in MessageInfoView and
StreamInfoView.

Author: preetmishra

tests/ui/test_ui_tools.py

@@ -14,7 +14,7 @@
 from zulipterminal.ui_tools.views import (
     HelpView, LeftColumnView, MessageView, MiddleColumnView, ModListWalker,
     MsgInfoView, PopUpConfirmationView, PopUpView, RightColumnView,
-    StreamsView, TopicsView, UsersView,
+    StreamInfoView, StreamsView, TopicsView, UsersView,
 )
 
 
@@ -1213,6 +1213,22 @@ def test_exit_popup_GO_BACK(self, mocker, popup_view, key):
         assert self.controller.exit_popup.called
 
 
+class TestStreamInfoView:
+    @pytest.fixture(autouse=True)
+    def mock_external_classes(self, mocker, monkeypatch):
+        self.controller = mocker.Mock()
+        mocker.patch(VIEWS + ".urwid.SimpleFocusListWalker", return_value=[])
+        self.stream_info_view = StreamInfoView(self.controller, '', '', '')
+
+    def test_keypress_navigation(self, mocker,
+                                 navigation_key_expected_key_pair):
+        key, expected_key = navigation_key_expected_key_pair
+        size = (200, 20)
+        super_keypress = mocker.patch(VIEWS + '.urwid.ListBox.keypress')
+        self.stream_info_view.keypress(size, key)
+        super_keypress.assert_called_once_with(size, expected_key)
+
+
 class TestMsgInfoView:
     @pytest.fixture(autouse=True)
     def mock_external_classes(self, mocker, monkeypatch, message_fixture):
@@ -1282,6 +1298,14 @@ def test_height_reactions(self, message_fixture, to_vary_in_each_message):
         expected_height = 8
         assert self.msg_info_view.height == expected_height
 
+    def test_keypress_navigation(self, mocker,
+                                 navigation_key_expected_key_pair):
+        key, expected_key = navigation_key_expected_key_pair
+        size = (200, 20)
+        super_keypress = mocker.patch(VIEWS + '.urwid.ListBox.keypress')
+        self.msg_info_view.keypress(size, key)
+        super_keypress.assert_called_once_with(size, expected_key)
+
 
 class TestMessageBox:
     @pytest.fixture(autouse=True)

zulipterminal/ui_tools/views.py

@@ -849,26 +849,18 @@ def keypress(self, size: urwid_Size, key: str) -> str:
         return super().keypress(size, key)
 
 
-class StreamInfoView(urwid.ListBox):
+class StreamInfoView(PopUpView):
     def __init__(self, controller: Any, color: str,
                  name: str, desc: str) -> None:
-        self.controller = controller
         # TODO: Width & Height handling could be improved
         self.width = max(len(desc), len("# {}".format(name)))+2
         self.height = 2
-        log = [urwid.Text(desc, align='center')]
-        super().__init__(log)
-
-    def keypress(self, size: Tuple[int, int], key: str) -> str:
-        if (is_command_key('GO_BACK', key) or
-                is_command_key('STREAM_DESC', key)):
-                self.controller.exit_popup()
-        return super().keypress(size, key)
+        stream_info_content = [urwid.Text(desc, align='center')]
+        super().__init__(controller, stream_info_content, 'STREAM_DESC')
 
 
-class MsgInfoView(urwid.ListBox):
+class MsgInfoView(PopUpView):
     def __init__(self, controller: Any, msg: Message) -> None:
-        self.controller = controller
         self.msg = msg
 
         if msg['reactions']:
@@ -896,18 +888,12 @@ def __init__(self, controller: Any, msg: Message) -> None:
         self.width = sum(max_widths)
         self.height = len(msg_info['Reactions'])+4 if msg['reactions'] else 5
 
-        self.log = urwid.SimpleListWalker(
-            [urwid.AttrWrap(
+        msg_info_content = [urwid.AttrWrap(
                 urwid.Columns([
                     urwid.Text(field),
                     (max_widths[1], urwid.Text(data))
                 ], dividechars=2),
                 None if index % 2 else 'bar')
-             for index, (field, data) in enumerate(msg_info.items())])
+             for index, (field, data) in enumerate(msg_info.items())]
 
-        super().__init__(self.log)
-
-    def keypress(self, size: urwid_Size, key: str) -> str:
-        if is_command_key('GO_BACK', key) or is_command_key('MSG_INFO', key):
-            self.controller.exit_popup()
-        return super().keypress(size, key)
+        super().__init__(controller, msg_info_content, 'MSG_INFO')