From a9f6c420a871da754f94a5b92eba9979a36157b2 Mon Sep 17 00:00:00 2001 From: freqnik Date: Sun, 7 Jul 2024 17:19:56 -0400 Subject: [PATCH] Add toml dependency. Update setup.py/requirements.txt. Add Description of Sentinel and link to sentinel.co in Help Screen for Foundation compliance --- requirements.txt | 1 + setup.py | 3 ++- src/kv/meile.kv | 45 +++++++++++++++++++++++++++++++++++++++++++-- src/ui/screens.py | 5 +++++ 4 files changed, 51 insertions(+), 3 deletions(-) diff --git a/requirements.txt b/requirements.txt index 75d9244..e32858e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -87,6 +87,7 @@ sentinel_protobuf==0.3.3 six==1.16.0 sniffio==1.3.1 stripe==4.2.0 +toml==0.10.2 treelib==1.6.1 typing_extensions==4.10.0 Unidecode==1.3.6 diff --git a/setup.py b/setup.py index e7c8c19..ca215d1 100644 --- a/setup.py +++ b/setup.py @@ -48,6 +48,7 @@ "unidecode", "dnspython", "bip_utils", + "toml", # "cosmpy", # Replaced by sentinel-python-sdk + mospy @@ -65,7 +66,7 @@ "jwcrypto" ], package_data={ - "conf": ["config/config.ini"], + "conf": ["config/config.ini", "config/dnscrypt-proxy.toml"], "bin": ["sentinelcli", "warp-cli", "warp-svc", "tun2socks", "v2ray"], "awoc": ["data/world.json"], "fonts": ["Roboto-BoldItalic.ttf", "arial-unicode-ms.ttf", "mplus-2c-bold.ttf"], diff --git a/src/kv/meile.kv b/src/kv/meile.kv index ea16919..4e90ea1 100644 --- a/src/kv/meile.kv +++ b/src/kv/meile.kv @@ -1962,7 +1962,7 @@ WindowManager: size_hint: (1, 1) height: self.parent.height MDGridLayout: - rows: 18 + rows: 27 cols: 1 size_hint_y: None size_hint_x: 1 @@ -2132,6 +2132,45 @@ WindowManager: theme_text_color: "Custom" text_color: get_color_from_hex(MeileColors.MEILE) font_size: "12dp" + + MDLabel: + font_name: "Roboto-BoldItalic" + text: "What is a Sentinel?" + size_hint_y: None + height: self.texture_size[1] + size_hint_x: 1 + halign: "center" + + MDLabel: + font_name: "DejaVuSans" + text: "Sentinel is a Layer-1 blockchain within the Cosmos ecosystem. It was founded in 2017, and provides privacy services, such as decentralized VPN to users both of traditional commerce and blockchain enthusiasts. It's native coin ticker is $DVPN. " + size_hint_y: None + height: self.texture_size[1] + size_hint_x: 1 + pos_hint_x: .9 + halign: "center" + theme_text_color: "Custom" + text_color: get_color_from_hex(MeileColors.MEILE) + font_size: "12dp" + + MDBoxLayout: + size_hint_y: None + height: dp(48) # Adjust height as needed + orientation: "vertical" + + MDFlatButton: + text: "Read More" + size_hint_x: None + width: self.parent.width # Full width of the parent (MDBoxLayout) + pos_hint: {'center_x': 0.5} + on_release: root.open_sentinel() + MDLabel: + MDLabel: + MDLabel: + MDLabel: + MDLabel: + MDLabel: + : name: "fiatgateway" title: "Re-fuel" @@ -2388,4 +2427,6 @@ WindowManager: : size_hint: None, None - text_size: self.size \ No newline at end of file + text_size: self.width, None + halign: "center" + valign: "middle" \ No newline at end of file diff --git a/src/ui/screens.py b/src/ui/screens.py index 68f9fd1..16e9717 100644 --- a/src/ui/screens.py +++ b/src/ui/screens.py @@ -2011,6 +2011,11 @@ def set_previous_screen(self): Meile.app.root.transistion = SlideTransition(direction="right") Meile.app.root.current = WindowNames.MAIN_WINDOW + def open_sentinel(self): + import webbrowser + + webbrowser.open('https://sentinel.co') + class SettingsScreen(Screen): MeileConfig = MeileGuiConfig()