Merge commits: #635402b,#bcf047b,#862a1a7,#eba1dc1,#33ed123,#7a759de into main

Author: freQniK

src/coin_api/get_price.py

@@ -1,15 +1,14 @@
 from adapters import HTTPRequests
 from typedef.konstants import IBCTokens
 import coin_api.scrtxxs as scrtxxs
-import asyncio
 import random
 
 class GetPriceAPI():
     #DEC_AscenDEX = "https://ascendex.com/api/pro/v1/spot/ticker?symbol=DEC/USDT"
     CoinStats    = "https://openapiv1.coinstats.app/coins/%s"
 
-
-    async def get_usd(self, coin):
+    
+    def get_usd(self, coin):
         N = random.randint(0,len(scrtxxs.COINSTATS_API_KEYS)-1)
         API_KEY = scrtxxs.COINSTATS_API_KEYS[N]
         headers = {
@@ -18,9 +17,9 @@ async def get_usd(self, coin):
         }
         Request = HTTPRequests.MakeRequest(headers=headers)
         http = Request.hadapter()
-
+        
         for key,value in IBCTokens.CSAPPMAP.items():
-            if coin.lower() == key:
+            if coin.lower() == key: 
                 try:
                     r = http.get(self.CoinStats % value)
                     print(r.json())

src/fonts/DejaVuMathTeXGyre.ttf

@@ -168,6 +168,7 @@ class OurWorld():
                       'Lithuania': [55.3500003, 23.7499997], 
                       'Luxembourg': [49.8158683, 6.1296751], 
                       'Macedonia': [41.6171214, 21.7168387], 
+                      'North Macedonia': [41.6171214, 21.7168387],
                       'Malta': [35.8885993, 14.4476911], 
                       'Moldova': [47.2879608, 28.5670941], 
                       'Monaco': [43.7323492, 7.4276832], 

src/fonts/arial-unicode-ms.ttf

@@ -177,7 +177,7 @@ WindowManager:
             NodeRV:
                 md_bg_color: get_color_from_hex("#121212")    
                 id: rv
-                size_hint: (.3,1)
+                size_hint: (.2,1)
 
         MDBottomNavigation:
             size_hint_y: 0.125
@@ -232,7 +232,7 @@ WindowManager:
             ActionView:
                 ActionPrevious:
                     icon: "arrow-left-circle"
-                    title: 'Go Back'
+                    title: 'Map'
                     with_previous: True
                     on_release: root.set_previous_screen() 
 <SubscriptionScreen>
@@ -248,7 +248,7 @@ WindowManager:
             ActionView:
                 ActionPrevious:
                     icon: "arrow-left-circle"
-                    title: 'Go Back'
+                    title: 'Map'
                     with_previous: True
                     on_release: root.set_previous_screen()
 
@@ -542,7 +542,7 @@ WindowManager:
     num_text: ""
     country_text: " "
     source_image: " "
-    on_press: root.show_country_nodes(root.country_text)
+    on_press: root.switch_window(root.country_text)
     md_bg_color: get_color_from_hex("#121212")
     MDBoxLayout:
         DisplayPic:

src/geography/continents.py

@@ -23,7 +23,7 @@ class MyMainApp(MDApp):
     def __init__(self,**kwargs):
         super(MyMainApp,self).__init__(**kwargs)
         from kivy.core.window import Window
-        Window.size = (1010, 710)
+        Window.size = (1280, 800)
 
         # Get Primary Monitor Resolution
         # Scaled down and not using tkinter library
@@ -40,8 +40,8 @@ def __init__(self,**kwargs):
         dim.append(primary_monitor.width)
         dim.append(primary_monitor.height)
 
-        Window.left = int((dim[0] - 1010)/2)
-        Window.top = int((dim[1] - 710)/2)
+        Window.left = int((dim[0] - 1280)/2)
+        Window.top = int((dim[1] - 800)/2)
 
 
 

src/imgs/72x54.zip

@@ -72,6 +72,7 @@ class TextStrings():
 class MeileColors():
     DIALOG_BG_COLOR          = "#121212"
     INACTIVE_DIALOG_BG_COLOR = "#50507c"
+    ROW_HOVER                = "#39363c"
     FONT_FACE                = "../fonts/mplus-2c-bold.ttf"
     MAP_MARKER               = "../imgs/location_pin.png"
     HEALTH_ICON              = "shield-plus"

src/kv/meile.kv

@@ -32,6 +32,8 @@
 from kivymd.uix.behaviors.elevation import RectangularElevationBehavior
 from kivy_garden.mapview import MapMarkerPopup, MapView, MapSource
 from kivymd.toast import toast
+from kivy.uix.carousel import Carousel
+from kivymd.uix.boxlayout import MDBoxLayout
 
 
 import requests
@@ -337,6 +339,8 @@ class MainWindow(Screen):
     clock = None
     PersistentBandwidth = {}
     ConnectedDict = {'v2ray_pid' : None,  'result' : False}
+    NodeWidget = None
+    Markers = []
 
 
     def __init__(self, node_tree, **kwargs):
@@ -372,31 +376,33 @@ def build(self, dt):
 
         for name_tab in OurWorld.CONTINENTS:
             tab = Tab(tab_label_text=name_tab)
-            self.manager.get_screen(WindowNames.MAIN_WINDOW).ids.android_tabs.add_widget(tab)
+            self.ids.android_tabs.add_widget(tab)
 
         self.get_ip_address(None)
 
         self.on_tab_switch(
             None,
             None,
             None,
-            self.manager.get_screen(WindowNames.MAIN_WINDOW).ids.android_tabs.ids.layout.children[-1].text
+            self.ids.android_tabs.ids.layout.children[-1].text
         )
 
 
     def build_meile_map(self):
-        if not self.MeileMapBuilt:
+        
+        if not self.MeileMapBuilt: 
             self.MeileMap = MapView(lat=50.6394, lon=3.057, zoom=2)
             source = MapSource(url="https://server.arcgisonline.com/arcgis/rest/services/Canvas/World_Dark_Gray_Base/MapServer/tile/{z}/{y}/{x}.png",
-                               cache_key="meile-map-canvas-dark-grey-base",
+                               cache_key="meile-map-canvas-dark-grey-base", 
                                tile_size=512,
                                image_ext="png",
                                attribution="@ Meile",
                                size_hint=(.7,1))
             #self.MeileMap.map_source = "osm"
             self.MeileMap.map_source = source
-
-            self.ids.country_map.add_widget(self.MeileMap)
+            self.carousel = Carousel(direction='right')
+            self.ids.country_map.add_widget(self.carousel)
+            self.carousel.add_widget(self.MeileMap)
             self.AddCountryNodePins(False)
             self.MeileMapBuilt = True
 
@@ -407,23 +413,32 @@ def get_font(self):
     def AddCountryNodePins(self, clear):
         Config = MeileGuiConfig()
         try:
+            
+            if clear: 
+                for m in self.Makers:
+                    self.MeileMap.remove_marker(m)
+                self.Markers.clear()
+                
             for continent in self.MeileLand.CONTINENTS:
                 for ncountry in self.NodeTree.NodeTree.children(continent):
-                    loc = self.MeileLand.CountryLatLong[ncountry.tag]
-                    marker = MapMarkerPopup(lat=loc[0], lon=loc[1], source=Config.resource_path(MeileColors.MAP_MARKER))
-                    marker.add_widget(MDMapCountryButton(text='%s - %s' %(ncountry.tag, len(self.NodeTree.NodeTree.children(ncountry.tag))),
-                                                   theme_text_color="Custom",
-                                                   md_bg_color=get_color_from_hex(MeileColors.DIALOG_BG_COLOR),
-                                                   text_color=(1,1,1,1),
-                                                   on_release=partial(self.load_country_nodes, ncountry.tag)
-                                                   ))
-                    if not clear:
+                    try:
+                        loc = self.MeileLand.CountryLatLong[ncountry.tag]
+                        marker = MapMarkerPopup(lat=loc[0], lon=loc[1], source=Config.resource_path(MeileColors.MAP_MARKER))
+                        marker.add_widget(MDMapCountryButton(text='%s - %s' %(ncountry.tag, len(self.NodeTree.NodeTree.children(ncountry.tag))),
+                                                       theme_text_color="Custom",
+                                                       md_bg_color=get_color_from_hex(MeileColors.DIALOG_BG_COLOR),
+                                                       text_color=(1,1,1,1),
+                                                       on_release=partial(self.load_country_nodes, ncountry.tag)
+                                                       ))
+                        
+                        self.Markers.append(marker)
                         self.MeileMap.add_marker(marker)
-                    else:
-                        self.MeileMap.remove_marker(marker)
+                    except:
+                        continue
         except Exception as e:
             print(str(e))
             pass
+                
         self.get_continent_coordinates(self.MeileLand.CONTINENTS[0])
 
     def set_item(self, text_item):
@@ -745,8 +760,9 @@ def refresh_nodes_and_subs(self):
     def Refresh(self, latency, *kwargs):
         self.remove_loading_widget(None)
         self.AddCountryNodePins(True)
+        yield 0.314
         self.add_loading_popup("Reloading Nodes...")
-        yield 0.5
+        yield 0.314
         try:
             self.NodeTree.NodeTree = None
             thread = ThreadWithResult(target=self.NodeTree.get_nodes, args=(latency.return_latency(),))
@@ -764,7 +780,7 @@ def Refresh(self, latency, *kwargs):
 
     @mainthread
     def on_tab_switch(self, instance_tabs, instance_tab, instance_tabs_label, tab_text):
-        self.manager.get_screen(WindowNames.MAIN_WINDOW).ids.rv.data = []
+        self.ids.rv.data = []
         if not tab_text:
             tab_text = OurWorld.CONTINENTS[0]
 
@@ -848,24 +864,29 @@ def switch_window(self, window):
         Meile.app.root.current = window
 
     def switch_to_sub_window(self):
-        Meile.app.root.add_widget(SubscriptionScreen(name=WindowNames.SUBSCRIPTIONS, node_tree=self.NodeTree))
-        Meile.app.root.transition = SlideTransition(direction = "left")
-        Meile.app.root.current = WindowNames.SUBSCRIPTIONS
+        try:
+            self.carousel.remove_widget(self.NodeWidget)
+        except Exception as e:
+            print(str(e))
+        self.NodeWidget = SubscriptionScreen(name=WindowNames.SUBSCRIPTIONS, node_tree=self.NodeTree)
+        self.carousel.add_widget(self.NodeWidget)
+        self.carousel.load_slide(self.NodeWidget)
 
     def load_country_nodes(self, country, *kwargs):
+        mw = Meile.app.root.get_screen(WindowNames.MAIN_WINDOW)
         NodeTree = NodeTreeData(Meile.app.root.get_screen(WindowNames.MAIN_WINDOW).NodeTree.NodeTree)
         try:
-            Meile.app.root.remove_widget(Meile.app.root.get_screen(WindowNames.NODES))
+            mw.carousel.remove_widget(self.NodeWidget)
         except Exception as e:
             print(str(e))
             pass
-        Meile.app.root.add_widget(NodeScreen(name="nodes",
-                                             node_tree=NodeTree,
-                                             country=country,
-                                             sort=Meile.app.root.get_screen(WindowNames.MAIN_WINDOW).Sort))
-
-        Meile.app.root.transition = SlideTransition(direction = "up")
-        Meile.app.root.current = WindowNames.NODES
+        
+        self.NodeWidget = NodeScreen(name="nodes",
+                                     node_tree=NodeTree,
+                                     country=country,
+                                     sort=self.Sort)
+        self.carousel.add_widget(self.NodeWidget)
+        self.carousel.load_slide(self.NodeWidget)
 
 
 class WalletScreen(Screen):
@@ -1038,7 +1059,7 @@ def set_previous_screen(self):
         Meile.app.root.current = WindowNames.MAIN_WINDOW
 
 
-class SubscriptionScreen(Screen):
+class SubscriptionScreen(MDBoxLayout):
     SubResult = None
 
     def __init__(self, node_tree,  **kwargs):
@@ -1057,7 +1078,7 @@ def __init__(self, node_tree,  **kwargs):
             return
 
     def GetSubscriptions(self):
-        mw = self.manager.get_screen(WindowNames.MAIN_WINDOW)
+        mw = Meile.app.root.get_screen(WindowNames.MAIN_WINDOW)
         try:
             thread = ThreadWithResult(target=self.NodeTree.get_subscriptions, args=(self.address,))
             thread.start()
@@ -1071,7 +1092,7 @@ def GetSubscriptions(self):
     def subs_callback(self, dt):
         floc = "../imgs/"
         yield 0.314
-        mw = self.manager.get_screen(WindowNames.MAIN_WINDOW)
+        mw = Meile.app.root.get_screen(WindowNames.MAIN_WINDOW)
 
         if not mw.SubResult:
             self.GetSubscriptions()
@@ -1201,12 +1222,15 @@ def sub_address_error(self):
         self.dialog.open()
 
     def set_previous_screen(self):
-        Meile.app.root.remove_widget(self)
-        Meile.app.root.transistion = SlideTransition(direction="right")
-        Meile.app.root.current = WindowNames.MAIN_WINDOW
-
-
-class NodeScreen(Screen):
+        mw = Meile.app.root.get_screen(WindowNames.MAIN_WINDOW)
+        mw.carousel.remove_widget(mw.NodeWidget)
+        mw.carousel.load_previous()
+
+'''
+Main widget of country cards in carousel.
+Contains: widgets.RecyclerViewRow, RecyclerViewCountryRow        
+'''
+class NodeScreen(MDBoxLayout):
     NodeTree = None
     Country = None
     MeileConfig = None
@@ -1428,42 +1452,41 @@ def add_rv_data(self, node, flagloc):
         )
 
     def set_previous_screen(self):
+        mw = Meile.app.root.get_screen(WindowNames.MAIN_WINDOW)
+        mw.carousel.remove_widget(mw.NodeWidget)
+        mw.carousel.load_previous()
 
-        Meile.app.root.remove_widget(self)
-        Meile.app.root.transistion = SlideTransition(direction="down")
-        Meile.app.root.current = WindowNames.MAIN_WINDOW
-
-
+'''
+This is the card class of the country cards on the left panel        
+'''
 class RecycleViewCountryRow(MDCard,RectangularElevationBehavior,ThemableBehavior, HoverBehavior):
     text = StringProperty()
 
     def on_enter(self, *args):
-        self.md_bg_color = get_color_from_hex("#200c3a")
+        self.md_bg_color = get_color_from_hex(MeileColors.ROW_HOVER)
         Window.set_system_cursor('hand')
 
     def on_leave(self, *args):
         self.md_bg_color = get_color_from_hex(MeileColors.DIALOG_BG_COLOR)
         Window.set_system_cursor('arrow')
 
-    def show_country_nodes(self, country):
-        print(country)
-        self.switch_window(country)
-
     def switch_window(self, country):
+        print(country)
         NodeTree = NodeTreeData(Meile.app.root.get_screen(WindowNames.MAIN_WINDOW).NodeTree.NodeTree)
+        mw       = Meile.app.root.get_screen(WindowNames.MAIN_WINDOW)
+        
         try:
-            Meile.app.root.remove_widget(Meile.app.root.get_screen(WindowNames.NODES))
+            mw.carousel.remove_widget(mw.NodeWidget)
         except Exception as e:
             print(str(e))
             pass
-        Meile.app.root.add_widget(NodeScreen(name="nodes",
-                                             node_tree=NodeTree,
-                                             country=country,
-                                             sort=Meile.app.root.get_screen(WindowNames.MAIN_WINDOW).Sort))
-
-        Meile.app.root.transition = SlideTransition(direction = "up")
-        Meile.app.root.current = WindowNames.NODES
-
+        
+        mw.NodeWidget = NodeScreen(name="nodes",
+                                   node_tree=NodeTree,
+                                   country=country,
+                                   sort=mw.Sort)
+        mw.carousel.add_widget(mw.NodeWidget)
+        mw.carousel.load_next()
 
 class HelpScreen(Screen):