From 9b2c6ae59b168e27bbf27f6f2333256ba945dbfa Mon Sep 17 00:00:00 2001
From: quadrismegistus <ryan.heuser@gmail.com>
Date: Sat, 26 Sep 2020 14:03:12 +0100
Subject: [PATCH] fix?

---
 komrade/app/main.py                |  2 +-
 komrade/app/screens/base.py        | 33 ++++--------------------------
 komrade/app/screens/login/login.py |  5 +++++
 3 files changed, 10 insertions(+), 30 deletions(-)

diff --git a/komrade/app/main.py b/komrade/app/main.py
index 255c7d4..5f3275e 100644
--- a/komrade/app/main.py
+++ b/komrade/app/main.py
@@ -130,7 +130,7 @@ class MessagePopupCard(MDDialog2):
     def __init__(self,*x,**y):
         y['color_bg']=rgb(*COLOR_BG,a=0.5)
         y['type']='custom'
-        y['overlay_color']=rgb(*COLOR_BG,a=0.5)  #rgb(*COLOR_BG)
+        y['overlay_color']=rgb(*COLOR_BG,a=0)  #rgb(*COLOR_BG)
         self.color_bg=rgb(*COLOR_BG)
         super().__init__(*x,**y)
         self.ok_to_continue=False
diff --git a/komrade/app/screens/base.py b/komrade/app/screens/base.py
index 5ac3697..19e059e 100644
--- a/komrade/app/screens/base.py
+++ b/komrade/app/screens/base.py
@@ -4,7 +4,7 @@ from kivymd.uix.boxlayout import MDBoxLayout
 from kivymd.uix.label import MDLabel
 from kivy.app import App
 import asyncio
-
+from komrade.app.screens.dialog import MDDialog2
 
 
 ### Layout
@@ -13,7 +13,9 @@ import asyncio
 class BaseScreen(MDScreen):
 
     def on_pre_enter(self):
-        self.clear_widgets()
+        # self.clear_widgets()
+        self.app.clear_widget_tree(MDDialog2)
+        pass
 
     @property
     def root(self):
@@ -34,33 +36,6 @@ class BaseScreen(MDScreen):
 
 
 
-# class CardScreen(BaseScreen):
-#     @property
-#     def cards(self):
-#         if not hasattr(self,'_cards'): self._cards=[]
-#         return self._cards
-
-#     def clear_deck(self):
-#         for card in self.cards:
-#             self.ids.post_carousel.remove_widget(card)
-
-#     def add_card(self,data):
-#         card = PostCard(data)
-#         if not hasattr(self,'_cards'): self._cards=[]
-#         self._cards.append(card)
-
-#         self.app.log('card!',data)
-#         self.app.log('ids:',self.ids.keys(), type(self))
-#         self.app.log('card obj?',card)
-#         # self.ids.post_carousel.add_widget(card)
-#         stop
-
-
-
-
-
-
-
 
 
 
diff --git a/komrade/app/screens/login/login.py b/komrade/app/screens/login/login.py
index fa17721..54f16ed 100644
--- a/komrade/app/screens/login/login.py
+++ b/komrade/app/screens/login/login.py
@@ -395,6 +395,11 @@ class LoginScreen(BaseScreen):
         await logfunc('returning...')
 
         from komrade.app.screens.map import MapWidget
+        if self.app.map:
+            self.app.map.dismiss()
+            self.app.map=None
+        self.app.change_screen('feed')
+        
         return resp_msg_d
 
     
\ No newline at end of file