diff --git a/comrad/app/screens/feed/feed.py b/comrad/app/screens/feed/feed.py index 847134e..8533d5e 100644 --- a/comrad/app/screens/feed/feed.py +++ b/comrad/app/screens/feed/feed.py @@ -127,7 +127,7 @@ class PostCard(MDCard): self.timestamp = data.get('timestamp',None) # self.bind(minimum_height=self.setter('height')) - author_prefix=data.get('author_prefix','@') + author_prefix=data.get('author_prefix','Comrad @') author_label_font_size=data.get('author_label_font_size','24sp') recip_label_font_size=data.get('author_label_font_size','14sp') diff --git a/comrad/app/screens/login/login.py b/comrad/app/screens/login/login.py index 78564da..427bd0f 100644 --- a/comrad/app/screens/login/login.py +++ b/comrad/app/screens/login/login.py @@ -208,6 +208,13 @@ class LoginScreen(BaseScreen): # self.login_status.text='You should be able to log into this account.' if commie.privkey: logger.info(f'passkey login succeeded') + + # get new data + res = await commie.get_updates() + if not res.get('res_login',{}).get('success'): + return {'success':False,'res_refresh':refresh} + + # otherwise, ok self.login_status.text=f'Welcome back, Comrad @{un}' self.app.is_logged_in=True self.app.username=commie.name @@ -395,7 +402,7 @@ class LoginScreen(BaseScreen): await logfunc(f'You can also share it IRL, phone to phone, as a QR code. It is saved to {fnfn} and looks like this.',img_src=fnfn,comrad_name='Keymaker') - await logfunc(f"(2) Your PRIVATE encryption key, on the other hand, will be stored encrypted on your device hardware. Do not it this with anyone or across any network whatsoever.") + await logfunc(f"(2) Your PRIVATE encryption key, on the other hand, will be stored encrypted on your device hardware. Do not share it with anyone or across any network whatsoever.") # done! await logfunc(f'Congratulations. Welcome, {commie}.',pause=True,clear=True) diff --git a/comrad/app/screens/map.py b/comrad/app/screens/map.py index c4e11d9..d87d96e 100644 --- a/comrad/app/screens/map.py +++ b/comrad/app/screens/map.py @@ -52,6 +52,8 @@ class MapWidget(MDDialog2): def color_marker(self): return rgb(*COLOR_ICON) @property def color_line(self): return rgb(*COLOR_ICON) + @property + def color_line_dark(self): return rgb(*grullo2) def __init__(self): self.last_lat = None @@ -193,20 +195,23 @@ class MapWidget(MDDialog2): color = random.choice(ALL_COLORS) self.points+=[(lat,long,desc)] - # point - plt.plot( - long, - lat, - '+', - markersize=25, - linewidth=10, - color=self.color_marker,#rgb(*color), - transform=ccrs.Geodetic(), - ) + # # point + # plt.plot( + # long, + # lat, + # '+', + # markersize=25, + # linewidth=10, + # color=self.color_marker,#rgb(*color), + # transform=ccrs.Geodetic(), + # ) # line if self.last_lat and self.last_long: # if self.ax.lines: self.ax.lines.pop(0) + for line in self.ax.lines: + line.set_color(self.color_line_dark) + plt.plot( [self.last_long, long], [self.last_lat, lat], @@ -234,6 +239,7 @@ class MapWidget(MDDialog2): # wait and show def open(self,maxwait=666,pulse=0.1): + self.ax.lines=[] self.draw() if not self.intro_label: self.intro_label = self.makelabel('Comrad @Tor: Routing you through the global maze of the deep web ...')