From 31adf20d65a7eaee7eb6bd7abf4ca1c120410bb7 Mon Sep 17 00:00:00 2001 From: Mark Qvist Date: Mon, 10 Jul 2023 19:20:24 +0200 Subject: [PATCH] Cleanup --- sbapp/buildozer.spec | 2 +- sbapp/services/sidebandservice.py | 2 +- sbapp/ui/announces.py | 10 ++++------ sbapp/ui/conversations.py | 12 +++--------- sbapp/ui/messages.py | 10 ++++------ 5 files changed, 13 insertions(+), 23 deletions(-) diff --git a/sbapp/buildozer.spec b/sbapp/buildozer.spec index 6061c2d..592e3b9 100644 --- a/sbapp/buildozer.spec +++ b/sbapp/buildozer.spec @@ -10,7 +10,7 @@ source.exclude_patterns = app_storage/*,venv/*,Makefile,./Makefil*,requirements, version.regex = __version__ = ['"](.*)['"] version.filename = %(source.dir)s/main.py -android.numeric_version = 20230204 +android.numeric_version = 20230710 # Cryptography recipe is currently broken, using RNS-internal crypto for now requirements = kivy==2.2.1,libbz2,pillow,qrcode==7.3.1,usb4a,usbserial4a diff --git a/sbapp/services/sidebandservice.py b/sbapp/services/sidebandservice.py index 171bf83..6bacded 100644 --- a/sbapp/services/sidebandservice.py +++ b/sbapp/services/sidebandservice.py @@ -1,4 +1,4 @@ -__debug_build__ = True +__debug_build__ = False import time import RNS diff --git a/sbapp/ui/announces.py b/sbapp/ui/announces.py index dae7104..c20c259 100644 --- a/sbapp/ui/announces.py +++ b/sbapp/ui/announces.py @@ -222,12 +222,10 @@ class Announces(): item.dmenu = MDDropdownMenu( caller=item.iconr, items=dm_items, - #position="center", - #width_mult=4, - #elevation=1, - #radius=dp(3), - #opening_transition="linear", - #opening_time=0.0, + position="auto", + width=dp(256), + elevation=0, + radius=dp(3), ) def callback_factory(ref): diff --git a/sbapp/ui/conversations.py b/sbapp/ui/conversations.py index c076888..039c498 100644 --- a/sbapp/ui/conversations.py +++ b/sbapp/ui/conversations.py @@ -255,15 +255,9 @@ class Conversations(): caller=item.iconr, items=dm_items, position="auto", - #border_margin=dp(24), - #width=dp(256), - #elevation=0, - #radius=dp(3), - show_transition="linear", - hide_transition="linear", - #show_duration=0.1, - #hide_duration=0.1, - + width=dp(256), + elevation=0, + radius=dp(3), ) self.conversation_dropdown.effect_cls = ScrollEffect diff --git a/sbapp/ui/messages.py b/sbapp/ui/messages.py index e8b8060..e96f08e 100644 --- a/sbapp/ui/messages.py +++ b/sbapp/ui/messages.py @@ -429,12 +429,10 @@ class Messages(): item.dmenu = MDDropdownMenu( caller=item.ids.msg_submenu, items=dm_items, - #position="center", - #width_mult=4, - #elevation=1, - #radius=dp(3), - #opening_transition="linear", - #opening_time=0.0, + position="auto", + width=dp(256), + elevation=0, + radius=dp(3), ) def callback_factory(ref):