diff --git a/pyinstaller.cmd b/pyinstaller.cmd index 9ddf800..be130ae 100644 --- a/pyinstaller.cmd +++ b/pyinstaller.cmd @@ -6,7 +6,10 @@ if [[ $# -lt 1 ]]; then fi new_version="$1" +build_version=`date +%s%3N` + sed -i "s/VERSION = \".*\"/VERSION = \"$new_version\"/" src/typedef/konstants.py +sed -i "s/BUILD = \".*\"/BUILD = \"$build_version\"/" src/typedef/konstants.py # Linux pyinstaller --onefile --collect-all bip_utils --collect-all mospy_wallet --collect-all sentinel_protobuf --collect-all sentinel_sdk --collect-all stripe --collect-all kivy_garden --add-data src/fonts:../fonts --add-data src/awoc/datum/:datum --add-data src/utils/fonts/:../utils/fonts --add-data src/utils/coinimg/:../utils/coinimg --add-data src/imgs/:../imgs --add-data src/kv/:../kv --add-data src/conf/config/:config --add-data src/bin/:../bin src/main/meile_gui.py diff --git a/requirements.txt b/requirements.txt index e32858e..68eb612 100644 --- a/requirements.txt +++ b/requirements.txt @@ -53,7 +53,7 @@ kivyoav==0.42 mapview==1.0.6 mnemonic==0.21 more-itertools==10.2.0 -mospy-wallet==0.5.4 +mospy-wallet==0.6.0 pexpect==4.8.0 Pillow==9.2.0 protobuf==4.23.4 @@ -82,7 +82,7 @@ safe-pysha3==1.0.4 save-thread-result==0.0.9 screeninfo==0.8.1 SecretStorage==3.3.3 -sentinel-sdk==0.0.4 +sentinel-sdk==0.0.5 sentinel_protobuf==0.3.3 six==1.16.0 sniffio==1.3.1 diff --git a/src/kv/meile.kv b/src/kv/meile.kv index af9e64b..a20111f 100644 --- a/src/kv/meile.kv +++ b/src/kv/meile.kv @@ -1947,7 +1947,7 @@ WindowManager: halign: "center" MDLabel: font_name: "Roboto-Bold" - text: root.GetMeileVersion() + text: root.GetMeileVersion("V") font_size: "16sp" size_hint_y: None height: self.texture_size[1] + dp(20) @@ -1956,6 +1956,15 @@ WindowManager: theme_text_color: "Custom" text_color: get_color_from_hex(MeileColors.MEILE) halign: "center" + MDLabel: + font_name: "Roboto-Bold" + text: "build: " + root.GetMeileVersion(spec="B") + font_size: "13sp" + size_hint_y: None + height: self.texture_size[1] + dp(20) + theme_text_color: "Custom" + text_color: get_color_from_hex(MeileColors.MEILE) + halign: "center" ScrollView: effect_cls: "ScrollEffect" scroll_type: ['bars'] diff --git a/src/typedef/konstants.py b/src/typedef/konstants.py index b939223..ac88035 100644 --- a/src/typedef/konstants.py +++ b/src/typedef/konstants.py @@ -544,7 +544,8 @@ class IBCTokens(): #mu_coins = ["tsent", "udvpn", "uscrt", "uosmo", "uatom", "udec"] class TextStrings(): dash = "-" - VERSION = "2.0.0-beta3" + VERSION = "2.0.0-beta3.1" + BUILD = "1722988800718" RootTag = "SENTINEL" PassedHealthCheck = "Passed Sentinel Health Check" FailedHealthCheck = "Failed Sentinel Health Check" diff --git a/src/ui/screens.py b/src/ui/screens.py index 16e9717..e0736dc 100644 --- a/src/ui/screens.py +++ b/src/ui/screens.py @@ -2002,8 +2002,11 @@ def switch_window(self, country): class HelpScreen(Screen): - def GetMeileVersion(self): - return TextStrings.VERSION + def GetMeileVersion(self, spec: str = "V"): + if spec == "V": + return TextStrings.VERSION + else: + return str(TextStrings.BUILD) def set_previous_screen(self):