Improved connectivity screen

sbapp/main.py

@@ -506,36 +506,10 @@ class SidebandApp(MDApp):
 
     def connectivity_status(self, sender):
         hs = dp(22)
+
         connectivity_status = ""
         if RNS.vendor.platformutils.get_platform() == "android":
-            if self.sideband.reticulum.is_connected_to_shared_instance:
+            connectivity_status = self.sideband.getstate("service.connectivity_status")
-                connectivity_status = "[size=22dp][b]Connectivity Status[/b][/size]\n\nSideband is connected via a shared Reticulum instance running on this system. Use the rnstatus utility to obtain full connectivity info."
-
-            else:
-                ws = "Disabled"
-                ts = "Disabled"
-                i2s = "Disabled"
-
-                if self.sideband.interface_local != None:
-                    np = len(self.sideband.interface_local.peers)
-                    if np == 1:
-                        ws = "1 reachable peer"
-                    else:
-                        ws = str(np)+" reachable peers"
-
-                if self.sideband.interface_tcp != None:
-                    if self.sideband.interface_tcp.online:
-                        ts = "Connected to "+str(self.sideband.interface_tcp.target_ip)+":"+str(self.sideband.interface_tcp.target_port)
-                    else:
-                        ts = "Interface Down"
-
-                if self.sideband.interface_i2p != None:
-                    if self.sideband.interface_i2p.online:
-                        i2s = "Connected"
-                    else:
-                        i2s = "Connecting to I2P"
-
-                connectivity_status = "[size=22dp][b]Connectivity Status[/b][/size]\n\n[b]Local[/b]\n{ws}\n\n[b]TCP[/b]\n{ts}\n\n[b]I2P[/b]\n{i2s}".format(ws=ws, ts=ts, i2s=i2s)
 
         else:
             if self.sideband.reticulum.is_connected_to_shared_instance:
@@ -801,6 +775,24 @@ class SidebandApp(MDApp):
             self.widget_hide(self.root.ids.connectivity_rnode_cid)
             self.widget_hide(self.root.ids.rnode_support_info)
 
+        def con_collapse_local(collapse=True):
+            self.widget_hide(self.root.ids.connectivity_local_fields, collapse)
+            
+        def con_collapse_tcp(collapse=True):
+            self.widget_hide(self.root.ids.connectivity_tcp_fields, collapse)
+            
+        def con_collapse_i2p(collapse=True):
+            self.widget_hide(self.root.ids.connectivity_i2p_fields, collapse)
+            
+        def con_collapse_bluetooth(collapse=True):
+            self.widget_hide(self.root.ids.connectivity_bluetooth_fields, collapse)
+            
+        def con_collapse_rnode(collapse=True):
+            self.widget_hide(self.root.ids.connectivity_rnode_fields, collapse)
+            
+        def con_collapse_modem(collapse=True):
+            self.widget_hide(self.root.ids.connectivity_modem_fields, collapse)
+            
         def save_connectivity(sender=None, event=None):
             RNS.log("Save connectivity")
             self.sideband.config["connect_local"] = self.root.ids.connectivity_use_local.active
@@ -816,10 +808,18 @@ class SidebandApp(MDApp):
             self.sideband.config["connect_i2p_b32"] = self.root.ids.connectivity_i2p_b32.text
             self.sideband.config["connect_i2p_ifac_netname"] = self.root.ids.connectivity_i2p_ifac_netname.text
             self.sideband.config["connect_i2p_ifac_passphrase"] = self.root.ids.connectivity_i2p_ifac_passphrase.text
+
+            con_collapse_local(collapse=not self.root.ids.connectivity_use_local.active)
+            con_collapse_tcp(collapse=not self.root.ids.connectivity_use_tcp.active)
+            con_collapse_i2p(collapse=not self.root.ids.connectivity_use_i2p.active)
+            con_collapse_rnode(collapse=not self.root.ids.connectivity_use_rnode.active)
+            con_collapse_bluetooth(collapse=not self.root.ids.connectivity_use_bluetooth.active)
+            con_collapse_modem(collapse=not self.root.ids.connectivity_use_modem.active)
+
             self.sideband.save_configuration()
 
         if RNS.vendor.platformutils.get_platform() == "android":
-            if self.sideband.reticulum.is_connected_to_shared_instance:
+            if not self.sideband.getpersistent("service.is_controlling_connectivity"):
                 info =  "Sideband is connected via a shared Reticulum instance running on this system.\n\n"
                 info += "To configure connectivity, edit the relevant configuration file for the instance."
                 self.root.ids.connectivity_info.text = info
@@ -828,25 +828,37 @@ class SidebandApp(MDApp):
             else:
                 info =  "By default, Sideband will try to discover and connect to any available Reticulum networks via active WiFi and/or Ethernet interfaces. If any Reticulum Transport Instances are found, Sideband will use these to connect to wider Reticulum networks. You can disable this behaviour if you don't want it.\n\n"
                 info += "You can also connect to a network via a remote or local Reticulum instance using TCP or I2P. [b]Please Note![/b] Connecting via I2P requires that you already have I2P running on your device, and that the SAM API is enabled.\n\n"
-                info += "For changes to connectivity to take effect, you must shut down and restart Sideband."
+                info += "For changes to connectivity to take effect, you must shut down and restart Sideband.\n"
                 self.root.ids.connectivity_info.text = info
 
                 self.root.ids.connectivity_use_local.active = self.sideband.config["connect_local"]
+                con_collapse_local(collapse=not self.root.ids.connectivity_use_local.active)
                 self.root.ids.connectivity_local_groupid.text = self.sideband.config["connect_local_groupid"]
                 self.root.ids.connectivity_local_ifac_netname.text = self.sideband.config["connect_local_ifac_netname"]
                 self.root.ids.connectivity_local_ifac_passphrase.text = self.sideband.config["connect_local_ifac_passphrase"]
 
                 self.root.ids.connectivity_use_tcp.active = self.sideband.config["connect_tcp"]
+                con_collapse_tcp(collapse=not self.root.ids.connectivity_use_tcp.active)
                 self.root.ids.connectivity_tcp_host.text = self.sideband.config["connect_tcp_host"]
                 self.root.ids.connectivity_tcp_port.text = self.sideband.config["connect_tcp_port"]
                 self.root.ids.connectivity_tcp_ifac_netname.text = self.sideband.config["connect_tcp_ifac_netname"]
                 self.root.ids.connectivity_tcp_ifac_passphrase.text = self.sideband.config["connect_tcp_ifac_passphrase"]
 
                 self.root.ids.connectivity_use_i2p.active = self.sideband.config["connect_i2p"]
+                con_collapse_i2p(collapse=not self.root.ids.connectivity_use_i2p.active)
                 self.root.ids.connectivity_i2p_b32.text = self.sideband.config["connect_i2p_b32"]
                 self.root.ids.connectivity_i2p_ifac_netname.text = self.sideband.config["connect_i2p_ifac_netname"]
                 self.root.ids.connectivity_i2p_ifac_passphrase.text = self.sideband.config["connect_i2p_ifac_passphrase"]
 
+                self.root.ids.connectivity_use_rnode.active = False
+                con_collapse_rnode(collapse=not self.root.ids.connectivity_use_rnode.active)
+
+                self.root.ids.connectivity_use_bluetooth.active = False
+                con_collapse_bluetooth(collapse=not self.root.ids.connectivity_use_bluetooth.active)
+
+                self.root.ids.connectivity_use_modem.active = False
+                con_collapse_modem(collapse=not self.root.ids.connectivity_use_modem.active)
+
                 self.root.ids.connectivity_use_local.bind(active=save_connectivity)
                 self.root.ids.connectivity_local_groupid.bind(on_text_validate=save_connectivity)
                 self.root.ids.connectivity_local_ifac_netname.bind(on_text_validate=save_connectivity)
@@ -860,6 +872,9 @@ class SidebandApp(MDApp):
                 self.root.ids.connectivity_i2p_b32.bind(on_text_validate=save_connectivity)
                 self.root.ids.connectivity_i2p_ifac_netname.bind(on_text_validate=save_connectivity)
                 self.root.ids.connectivity_i2p_ifac_passphrase.bind(on_text_validate=save_connectivity)
+                self.root.ids.connectivity_use_rnode.bind(active=save_connectivity)
+                self.root.ids.connectivity_use_bluetooth.bind(active=save_connectivity)
+
 
         else:
             info = ""

sbapp/services/sidebandservice.py

@@ -113,6 +113,7 @@ class SidebandService():
         self.sideband.service_context = self.android_service
         self.sideband.owner_service = self
         self.sideband.start()
+        self.update_connectivity_type()
     
     def start(self):
         self.should_run = True
@@ -148,10 +149,48 @@ class SidebandService():
                 RNS.log("Releasing wake lock")
                 self.wake_lock.release()
 
+    def update_connectivity_type(self):
+        if self.sideband.reticulum.is_connected_to_shared_instance:
+            is_controlling = False
+        else:
+            is_controlling = True
+
+        self.sideband.setpersistent("service.is_controlling_connectivity", is_controlling)
+    
+    def get_connectivity_status(self):
+        if self.sideband.reticulum.is_connected_to_shared_instance:
+            return "[size=22dp][b]Connectivity Status[/b][/size]\n\nSideband is connected via a shared Reticulum instance running on this system. Use the rnstatus utility to obtain full connectivity info."
+        else:
+            ws = "Disabled"
+            ts = "Disabled"
+            i2s = "Disabled"
+
+            if self.sideband.interface_local != None:
+                np = len(self.sideband.interface_local.peers)
+                if np == 1:
+                    ws = "1 reachable peer"
+                else:
+                    ws = str(np)+" reachable peers"
+
+            if self.sideband.interface_tcp != None:
+                if self.sideband.interface_tcp.online:
+                    ts = "Connected to "+str(self.sideband.interface_tcp.target_ip)+":"+str(self.sideband.interface_tcp.target_port)
+                else:
+                    ts = "Interface Down"
+
+            if self.sideband.interface_i2p != None:
+                if self.sideband.interface_i2p.online:
+                    i2s = "Connected"
+                else:
+                    i2s = "Connecting to I2P"
+
+            return "[size=22dp][b]Connectivity Status[/b][/size]\n\n[b]Local[/b]\n{ws}\n\n[b]TCP[/b]\n{ts}\n\n[b]I2P[/b]\n{i2s}".format(ws=ws, ts=ts, i2s=i2s)
+
     def run(self):
         while self.should_run:
             sleep_time = 1
             self.sideband.setstate("service.heartbeat", time.time())
+            self.sideband.setstate("service.connectivity_status", self.get_connectivity_status())
 
             if self.sideband.getstate("wants.service_stop"):
                 self.should_run = False

sbapp/ui/layouts.py

@@ -183,17 +183,13 @@ MDNavigationLayout:
 
                     MDBoxLayout:
                         orientation: "vertical"
-                        spacing: "24dp"
+                        spacing: "8dp"
                         size_hint_y: None
                         height: self.minimum_height
-                        padding: [dp(28), dp(16), dp(28), dp(16)]
+                        padding: [dp(28), dp(48), dp(28), dp(16)]
 
                         MDLabel:
-                            text: ""
+                            text: "Configuring Connectivity\\n"
-                            font_style: "H6"
-
-                        MDLabel:
-                            text: "Configuring Connectivity"
                             font_style: "H6"
 
                         MDLabel:
@@ -205,11 +201,27 @@ MDNavigationLayout:
                             height: self.texture_size[1]
 
 
+                        # MDBoxLayout:
+                        #     orientation: "horizontal"
+                        #     size_hint_y: None
+                        #     padding: [0,0,dp(24),0]
+                        #     height: dp(48)
+                            
+                        #     MDLabel:
+                        #         text: "Send via Propagation Node by default"
+                        #         font_style: "H6"
+
+                        #     MDSwitch:
+                        #         id: settings_lxmf_delivery_by_default
+                        #         pos_hint: {"center_y": 0.3}
+                        #         disabled: False
+                        #         active: False
+
                         MDBoxLayout:
                             orientation: "horizontal"
-                            # spacing: "24dp"
+                            padding: [0,0,dp(24),0]
                             size_hint_y: None
-                            height: dp(48)
+                            height: dp(24)
                             
                             MDLabel:
                                 id: connectivity_local_label
@@ -218,11 +230,15 @@ MDNavigationLayout:
 
                             MDSwitch:
                                 id: connectivity_use_local
+                                pos_hint: {"center_y": 0.3}
                                 active: False
 
-                        MDLabel:
+                        MDBoxLayout:
-                            text: ""
+                            id: connectivity_local_fields
-                            font_size: dp(16)
+                            orientation: "vertical"
+                            size_hint_y: None
+                            height: self.minimum_height
+                            padding: [0, 0, 0, dp(32)]
 
                             MDTextField:
                                 id: connectivity_local_groupid
@@ -244,12 +260,11 @@ MDNavigationLayout:
                                 font_size: dp(24)
 
 
-
                         MDBoxLayout:
                             orientation: "horizontal"
-                            # spacing: "24dp"
+                            padding: [0,0,dp(24),0]
                             size_hint_y: None
-                            height: dp(48)
+                            height: dp(24)
                             
                             MDLabel:
                                 id: connectivity_tcp_label
@@ -258,9 +273,17 @@ MDNavigationLayout:
 
                             MDSwitch:
                                 id: connectivity_use_tcp
+                                pos_hint: {"center_y": 0.3}
                                 active: False
 
 
+                        MDBoxLayout:
+                            id: connectivity_tcp_fields
+                            orientation: "vertical"
+                            size_hint_y: None
+                            height: self.minimum_height
+                            padding: [0, 0, 0, dp(32)]
+
                             MDTextField:
                                 id: connectivity_tcp_host
                                 hint_text: "TCP Host"
@@ -286,12 +309,11 @@ MDNavigationLayout:
                                 font_size: dp(24)
 
 
-
                         MDBoxLayout:
                             orientation: "horizontal"
-                            # spacing: "24dp"
+                            padding: [0,0,dp(24),0]
                             size_hint_y: None
-                            height: dp(48)
+                            height: dp(24)
                             
                             MDLabel:
                                 id: connectivity_i2p_label
@@ -300,9 +322,17 @@ MDNavigationLayout:
 
                             MDSwitch:
                                 id: connectivity_use_i2p
+                                pos_hint: {"center_y": 0.3}
                                 active: False
 
 
+                        MDBoxLayout:
+                            id: connectivity_i2p_fields
+                            orientation: "vertical"
+                            size_hint_y: None
+                            height: self.minimum_height
+                            padding: [0, 0, 0, dp(32)]
+
                             MDTextField:
                                 id: connectivity_i2p_b32
                                 hint_text: "I2P B32"
@@ -322,12 +352,11 @@ MDNavigationLayout:
                                 font_size: dp(24)
 
 
-
                         MDBoxLayout:
                             orientation: "horizontal"
-                            # spacing: "24dp"
+                            padding: [0,0,dp(24),0]
                             size_hint_y: None
-                            height: dp(48)
+                            height: dp(24)
                             
                             MDLabel:
                                 id: connectivity_rnode_label
@@ -338,21 +367,114 @@ MDNavigationLayout:
                             MDSwitch:
                                 id: connectivity_use_rnode
                                 active: False
+                                pos_hint: {"center_y": 0.3}
                                 disabled: True
 
-                        MDLabel:
+                        MDBoxLayout:
-                            id: rnode_support_info
+                            id: connectivity_rnode_fields
-                            markup: True
+                            orientation: "vertical"
-                            text: "[i]RNode support is in development[/i]"
                             size_hint_y: None
-                            text_size: self.width, None
+                            height: self.minimum_height
-                            height: self.texture_size[1]
+                            padding: [0, 0, 0, dp(32)]
+
+                            # MDLabel:
+                            #     id: rnode_support_info
+                            #     markup: True
+                            #     text: "[i]RNode support is in development[/i]"
+                            #     size_hint_y: None
+                            #     text_size: self.width, None
+                            #     height: self.texture_size[1]
 
                             MDTextField:
                                 id: connectivity_rnode_cid
                                 hint_text: "RNode Pairing ID"
                                 text: ""
                                 font_size: dp(24)
+                                # disabled: True
+
+
+                        MDBoxLayout:
+                            orientation: "horizontal"
+                            padding: [0,0,dp(24),0]
+                            size_hint_y: None
+                            height: dp(24)
+                            
+                            MDLabel:
+                                id: connectivity_bluetooth_label
+                                text: "Connect via Bluetooth"
+                                font_style: "H6"
+                                disabled: True
+
+                            MDSwitch:
+                                id: connectivity_use_bluetooth
+                                active: False
+                                pos_hint: {"center_y": 0.3}
+                                disabled: True
+
+                        MDBoxLayout:
+                            id: connectivity_bluetooth_fields
+                            orientation: "vertical"
+                            size_hint_y: None
+                            height: self.minimum_height
+                            padding: [0, 0, 0, dp(32)]
+
+                            MDTextField:
+                                id: connectivity_bluetooth_cid
+                                hint_text: "Bluetooth Pairing ID"
+                                text: ""
+                                font_size: dp(24)
+                                # disabled: True
+
+
+                        MDBoxLayout:
+                            orientation: "horizontal"
+                            padding: [0,0,dp(24),0]
+                            size_hint_y: None
+                            height: dp(24)
+                            
+                            MDLabel:
+                                id: connectivity_modem_label
+                                text: "Connect via Radio Modem"
+                                font_style: "H6"
+                                disabled: True
+
+                            MDSwitch:
+                                id: connectivity_use_modem
+                                active: False
+                                pos_hint: {"center_y": 0.3}
+                                disabled: True
+
+                        MDBoxLayout:
+                            id: connectivity_modem_fields
+                            orientation: "vertical"
+                            size_hint_y: None
+                            height: self.minimum_height
+                            padding: [0, 0, 0, dp(32)]
+
+                            MDTextField:
+                                id: connectivity_modem_cid
+                                hint_text: "Modem Pairing ID"
+                                text: ""
+                                font_size: dp(24)
+                                # disabled: True
+
+
+                        MDBoxLayout:
+                            orientation: "horizontal"
+                            padding: [0,0,dp(24),0]
+                            size_hint_y: None
+                            height: dp(24)
+                            
+                            MDLabel:
+                                id: connectivity_transport_label
+                                text: "Enable Reticulum Transport"
+                                font_style: "H6"
+                                disabled: True
+
+                            MDSwitch:
+                                id: connectivity_enable_transport
+                                active: False
+                                pos_hint: {"center_y": 0.3}
                                 disabled: True