Skip to content

Commit 929d9af

Browse files
committed
Refactor mpybit and add msg_composer dropdown
1 parent 76d6e40 commit 929d9af

File tree

3 files changed

+24
-0
lines changed

3 files changed

+24
-0
lines changed

src/bitmessagekivy/kv/msg_composer.kv

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
id: btn
3939
background_color: app.theme_cls.primary_dark
4040
values: app.identity_list
41+
on_text: root.auto_fill_fromaddr() if self.text != 'Select' else ''
4142
option_cls: Factory.get("ComposerSpinnerOption")
4243
background_normal: ''
4344
background_color: app.theme_cls.primary_color

src/bitmessagekivy/main.kv

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -292,6 +292,7 @@ MDNavigationLayout:
292292
elevation_normal: 8
293293
md_bg_color: [0.941, 0, 0,1]
294294
on_press: app.root.ids.scr_mngr.current = 'create'
295+
on_press: app.clear_composer()
295296

296297

297298
<SwipeToDeleteItem>:

src/bitmessagekivy/mpybit.py

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -309,6 +309,28 @@ def on_request_close(self, *args): # pylint: disable=no-self-use
309309
AppClosingPopup().open()
310310
return True
311311

312+
def clear_composer(self):
313+
"""If slow down, the new composer edit screen"""
314+
self.set_navbar_for_composer()
315+
composer_obj = self.root.ids.id_create.children[1].ids
316+
composer_obj.ti.text = ''
317+
composer_obj.composer_dropdown.text = 'Select'
318+
composer_obj.txt_input.text = ''
319+
composer_obj.subject.text = ''
320+
composer_obj.body.text = ''
321+
self.kivy_state_obj.in_composer = True
322+
self.kivy_state_obj = False
323+
324+
def set_navbar_for_composer(self):
325+
"""Clearing toolbar data when composer open"""
326+
self.root.ids.toolbar.left_action_items = [
327+
['arrow-left', lambda x: self.back_press()]]
328+
self.root.ids.toolbar.right_action_items = [
329+
['refresh',
330+
lambda x: self.root.ids.id_create.children[1].reset_composer()],
331+
['send',
332+
lambda x: self.root.ids.id_create.children[1].send(self)]]
333+
312334
def set_identicon(self, text):
313335
"""Show identicon in address spinner"""
314336
img = identiconGeneration.generate(text)

0 commit comments

Comments
 (0)