Skip to content

Commit

Permalink
Merge #b73b5e0 in to 2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
freQniK committed Oct 9, 2024
1 parent 03f0c67 commit 49f5f8c
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 10 deletions.
2 changes: 1 addition & 1 deletion src/typedef/konstants.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ class HTTParams():
]
GRPC = "grpc.ungovernable.dev:443"
GRPCS = [GRPC] + [
"grc.mathnodes.com:443",
"grpc.mathnodes.com:443",
"grpc.dvpn.me:443",
"grpc.noncompliant.network:443",
"grpc.ungovernable.dev:443",
Expand Down
4 changes: 2 additions & 2 deletions src/ui/interfaces.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
from kivymd.uix.tooltip import MDTooltip
from kivy.uix.switch import Switch
from kivy_garden.mapview.view import MapView
from kivymd.uix.behaviors import RoundedRectangularElevationBehavior, CircularElevationBehavior, RectangularRippleBehavior, CircularRippleBehavior
from kivymd.uix.behaviors import RoundedRectangularElevationBehavior, RectangularRippleBehavior, CircularRippleBehavior
from kivymd.uix.fitimage.fitimage import FitImage
from kivy.uix.behaviors import ButtonBehavior
from kivymd.uix.textfield.textfield import MDTextField
Expand Down Expand Up @@ -92,7 +92,7 @@ class SelectableRecycleGridLayout(FocusBehavior, LayoutSelectionBehavior,
class ContinentMap(MapView):
pass

class DisplayPic(CircularElevationBehavior, ButtonBehavior, FitImage):
class DisplayPic(ButtonBehavior, FitImage):
pass

class ClickableTextFieldRoundCC(MDRelativeLayout):
Expand Down
8 changes: 4 additions & 4 deletions src/ui/screens.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,28 +19,28 @@
from helpers.helpers import format_byte_size
from helpers.bandwidth import compute_consumed_data, compute_consumed_hours, init_GetConsumedWhileConnected, GetConsumedWhileConnected

from kivy.properties import BooleanProperty, StringProperty, ColorProperty
from kivy.properties import BooleanProperty, StringProperty, ColorProperty,ObjectProperty, NumericProperty
from kivy.uix.screenmanager import Screen, SlideTransition
from kivymd.uix.button import MDFlatButton, MDRaisedButton,MDTextButton, MDFillRoundFlatButton
from kivymd.uix.dialog import MDDialog
from kivy.clock import Clock, mainthread
from kivyoav.delayed import delayable
from kivy.properties import ObjectProperty
from kivymd.uix.card import MDCard
from kivy.utils import get_color_from_hex
from kivy.metrics import dp
from kivymd.uix.menu import MDDropdownMenu
from kivymd.uix.behaviors import HoverBehavior
from kivymd.theming import ThemableBehavior
from kivy.core.window import Window
from kivymd.uix.behaviors.elevation import RectangularElevationBehavior
#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
from kivy.uix.floatlayout import FloatLayout
from kivymd.uix.anchorlayout import MDAnchorLayout

from kivy.app import App

import requests
from requests.auth import HTTPBasicAuth
Expand Down Expand Up @@ -1969,7 +1969,7 @@ def set_previous_screen(self):
'''
This is the card class of the country cards on the left panel
'''
class RecycleViewCountryRow(MDCard,RectangularElevationBehavior,ThemableBehavior, HoverBehavior):
class RecycleViewCountryRow(MDCard,ThemableBehavior, HoverBehavior):
text = StringProperty()

def on_enter(self, *args):
Expand Down
5 changes: 2 additions & 3 deletions src/ui/widgets.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
from kivymd.uix.list import OneLineIconListItem
from kivymd.uix.behaviors import HoverBehavior
from kivymd.theming import ThemableBehavior
from kivymd.uix.behaviors.elevation import RectangularElevationBehavior
from kivyoav.delayed import delayable

from functools import partial
Expand Down Expand Up @@ -1560,7 +1559,7 @@ def closeDialog(self, inst):
print(str(e))
self.dialog = None

class WalletCoinRow(MDCard,RectangularElevationBehavior,ThemableBehavior, HoverBehavior):
class WalletCoinRow(MDCard,ThemableBehavior, HoverBehavior):
logo = StringProperty('')
text = StringProperty('')

Expand All @@ -1571,7 +1570,7 @@ class RowContainer(MDBoxLayout):
'''
Recycler of the node cards after clicking country
'''
class RecycleViewRow(MDCard,RectangularElevationBehavior,ThemableBehavior, HoverBehavior):
class RecycleViewRow(MDCard,ThemableBehavior, HoverBehavior):
dialog = None
node_data = ObjectProperty()
#node_types = ObjectProperty()
Expand Down

0 comments on commit 49f5f8c

Please sign in to comment.