From a8e1e7a760bcd713ad9ae3bcaaff02cf7b191399 Mon Sep 17 00:00:00 2001 From: navjot Date: Wed, 13 May 2020 20:29:19 +0530 Subject: [PATCH 1/2] worked on message listing compatibility or chip tag labeling --- src/bitmessagekivy/kv/inbox.kv | 7 +++++- src/bitmessagekivy/kv/maildetail.kv | 11 ++++++--- src/bitmessagekivy/kv/popup.kv | 5 +++- src/bitmessagekivy/mpybit.py | 38 +++++++++++------------------ 4 files changed, 31 insertions(+), 30 deletions(-) diff --git a/src/bitmessagekivy/kv/inbox.kv b/src/bitmessagekivy/kv/inbox.kv index 106d2d47..4aadf21f 100644 --- a/src/bitmessagekivy/kv/inbox.kv +++ b/src/bitmessagekivy/kv/inbox.kv @@ -29,4 +29,9 @@ MDList: id: ml Loader: - ComposerButton: \ No newline at end of file + ComposerButton: + +: + size_hint:(None, None) + font_style: 'Caption' + halign: 'center' diff --git a/src/bitmessagekivy/kv/maildetail.kv b/src/bitmessagekivy/kv/maildetail.kv index 4072635f..714e56b6 100644 --- a/src/bitmessagekivy/kv/maildetail.kv +++ b/src/bitmessagekivy/kv/maildetail.kv @@ -32,18 +32,21 @@ divider: None on_press: root.detailedPopup() BadgeText: + size_hint:(None, None) + size:[120, 140] if app.app_platform == 'android' else [64, 80] text: root.time_tag - halign:'right' + halign:'center' font_style:'Caption' pos_hint: {'center_y': .8} _txt_right_pad: dp(70) + font_size: '11sp' MDChip: - size_hint: (None, None) + size_hint: (.16 if app.app_platform == 'android' else .07 , None) label: root.page_type icon: '' - pos_hint: {'center_x': .94, 'center_y': .3} + pos_hint: {'center_x': .91 if app.app_platform == 'android' else .95, 'center_y': .3} radius: 8 - height: 18 + height: self.parent.height/4 AvatarSampleWidget: source: root.avatarImg MDLabel: diff --git a/src/bitmessagekivy/kv/popup.kv b/src/bitmessagekivy/kv/popup.kv index e7ee48c3..26ff017c 100644 --- a/src/bitmessagekivy/kv/popup.kv +++ b/src/bitmessagekivy/kv/popup.kv @@ -102,7 +102,7 @@ BoxLayout: size_hint_y: None orientation: 'vertical' - spacing:dp(20) + spacing:dp(15) MDLabel: font_style: 'Subtitle2' theme_text_color: 'Primary' @@ -128,6 +128,9 @@ text: "Address" font_size: '17sp' halign: 'left' + Widget: + size_hint_y: None + height: dp(1) BoxLayout: orientation: 'horizontal' MDLabel: diff --git a/src/bitmessagekivy/mpybit.py b/src/bitmessagekivy/mpybit.py index 1b3a2b01..dae50156 100644 --- a/src/bitmessagekivy/mpybit.py +++ b/src/bitmessagekivy/mpybit.py @@ -114,22 +114,22 @@ def ShowTimeHistoy(act_time): def AddTimeWidget(time): # pylint: disable=redefined-outer-name """This method is used to create TimeWidget""" - action_time = BadgeText( - size_hint=(None, None), + action_time = TimeTagRightSampleWidget( text=str(ShowTimeHistoy(time)), - halign='right', font_style='Caption', - size=[65, 70]) + size=[120, 140] if platform == 'android' else [64, 80]) + action_time.font_size='11sp' return action_time def chipTag(text): """This method is used for showing chip tag""" obj = MDChip() - obj.size_hint = (None, None) + # obj.size_hint = (None, None) + obj.size_hint = (.16 if platform == 'android' else .07 , None) obj.label = text obj.icon = '' - obj.pos_hint = {'center_x': .96, 'center_y': .2} + obj.pos_hint = {'center_x': .91 if platform == 'android' else .94, 'center_y': .3} obj.height = dp(18) obj.radius = 8 return obj @@ -420,31 +420,15 @@ class MyAddress(Screen): if state.association == item['secondary_text']: badge_obj = BadgeText( size_hint=(None, None), - text='Active', halign='right', + text='Active', halign='center', # font_size = '50sp', - font_style='Body1', size=[50, 60], + font_style='Body1', size=[85 if platform == 'android' else 50, 60], theme_text_color='Custom', text_color=NavigateApp().theme_cls.primary_color) badge_obj.font_size = '13sp' meny.add_widget(badge_obj) else: meny.add_widget(ToggleBtn(active=True if is_enable == 'true' else False)) - # carousel = Carousel(direction='right') - # carousel.height = meny.height - # carousel.size_hint_y = None - # carousel.ignore_perpendicular_swipes = True - # carousel.data_index = 0 - # carousel.min_move = 0.2 - # del_btn = Button(text='Disable' if is_enable == 'true' else 'Enable') - # if is_enable == 'true': - # del_btn.background_normal = '' - # del_btn.background_color = (1, 0, 0, 1) if is_enable == 'true' else (0, 1, 0, 1) - # del_btn.bind( - # on_press=partial( - # self.disableAddress if is_enable == 'true' else self.enableAddress , item['secondary_text'])) - # carousel.add_widget(del_btn) - # carousel.add_widget(meny) - # carousel.index = 1 self.ids.ml.add_widget(meny) def check_scroll_y(self, instance, somethingelse): @@ -2234,6 +2218,12 @@ class IconRightSampleWidget(IRightBodyTouch, MDIconButton): pass +class TimeTagRightSampleWidget(IRightBodyTouch, MDLabel): + """Right icon sample widget""" + + pass + + class ToggleBtn(IRightBodyTouch, MDSwitch): """Right toggle button widget""" pass From b4a7bcc3b2e35242a3e2b98a5f3745119e028e91 Mon Sep 17 00:00:00 2001 From: navjot Date: Wed, 13 May 2020 21:31:22 +0530 Subject: [PATCH 2/2] fixed flake8, pycodestyle and pylint issues --- src/bitmessagekivy/mpybit.py | 35 ++++++++++++++++++----------------- src/tests/test_chatmsg.py | 5 ++--- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/bitmessagekivy/mpybit.py b/src/bitmessagekivy/mpybit.py index dae50156..f2a77f07 100644 --- a/src/bitmessagekivy/mpybit.py +++ b/src/bitmessagekivy/mpybit.py @@ -3,6 +3,7 @@ Bitmessage android(mobile) interface """ # pylint: disable=too-many-lines,import-error,no-name-in-module,unused-argument # pylint: disable=too-many-ancestors,too-many-locals,useless-super-delegation +# pylint: disable=protected-access import os import time from bitmessagekivy import identiconGeneration @@ -118,7 +119,7 @@ def AddTimeWidget(time): # pylint: disable=redefined-outer-name text=str(ShowTimeHistoy(time)), font_style='Caption', size=[120, 140] if platform == 'android' else [64, 80]) - action_time.font_size='11sp' + action_time.font_size = '11sp' return action_time @@ -126,7 +127,7 @@ def chipTag(text): """This method is used for showing chip tag""" obj = MDChip() # obj.size_hint = (None, None) - obj.size_hint = (.16 if platform == 'android' else .07 , None) + obj.size_hint = (.16 if platform == 'android' else .07, None) obj.label = text obj.icon = '' obj.pos_hint = {'center_x': .91 if platform == 'android' else .94, 'center_y': .3} @@ -221,7 +222,7 @@ class Inbox(Screen): text=item['text'], secondary_text=item['secondary_text'], theme_text_color='Custom', text_color=NavigateApp().theme_cls.primary_color) - meny._txt_right_pad=dp(70) + meny._txt_right_pad = dp(70) meny.add_widget(AvatarSampleWidget( source='./images/text_images/{}.png'.format( avatarImageFirstLetter(item['secondary_text'].strip())))) @@ -407,7 +408,7 @@ class MyAddress(Screen): text=item['text'], secondary_text=item['secondary_text'], theme_text_color='Custom' if is_enable == 'true' else 'Primary', text_color=NavigateApp().theme_cls.primary_color,) - meny._txt_right_pad=dp(70) + meny._txt_right_pad = dp(70) try: meny.canvas.children[6].rgba = [0, 0, 0, 0] if is_enable == 'true' else [0.5, 0.5, 0.5, 0.5] except Exception: @@ -419,12 +420,12 @@ class MyAddress(Screen): self.myadd_detail, item['secondary_text'], item['text'])) if state.association == item['secondary_text']: badge_obj = BadgeText( - size_hint=(None, None), - text='Active', halign='center', - # font_size = '50sp', - font_style='Body1', size=[85 if platform == 'android' else 50, 60], - theme_text_color='Custom', - text_color=NavigateApp().theme_cls.primary_color) + size_hint=(None, None), + size=[85 if platform == 'android' else 50, 60], + text='Active', halign='center', + font_style='Body1', theme_text_color='Custom', + text_color=NavigateApp().theme_cls.primary_color + ) badge_obj.font_size = '13sp' meny.add_widget(badge_obj) else: @@ -1127,7 +1128,7 @@ class Sent(Screen): text=item['text'], secondary_text=item['secondary_text'], theme_text_color='Custom', text_color=NavigateApp().theme_cls.primary_color) - meny._txt_right_pad=dp(70) + meny._txt_right_pad = dp(70) meny.add_widget(AvatarSampleWidget( source='./images/text_images/{}.png'.format( avatarImageFirstLetter(item['secondary_text'].strip())))) @@ -1346,7 +1347,7 @@ class Trash(Screen): subject) >= 50 else (subject + ',' + body)[0:50] + '........').replace('\t', '').replace(' ', ''), theme_text_color='Custom', text_color=NavigateApp().theme_cls.primary_color) - meny._txt_right_pad=dp(70) + meny._txt_right_pad = dp(70) img_latter = './images/text_images/{}.png'.format( subject[0].upper() if (subject[0].upper() >= 'A' and subject[0].upper() <= 'Z') else '!') meny.add_widget(AvatarSampleWidget(source=img_latter)) @@ -1580,7 +1581,7 @@ class NavigateApp(MDApp): # android_path = os.path.expanduser # ("~/user/0/org.test.bitapp/files/app/") if not os.path.exists('./images/default_identicon/{}.png'.format( - BMConfigParser().addresses()[0])): + BMConfigParser().addresses()[0])): android_path = os.path.join( os.environ['ANDROID_PRIVATE'] + '/app/') img.texture.save('{1}/images/default_identicon/{0}.png'.format( @@ -2012,7 +2013,7 @@ class NavigateApp(MDApp): self.manager = ModalView(size_hint=(1, 1), auto_dismiss=False) self.file_manager = MDFileManager( exit_manager=self.exit_manager, - select_path=self.select_path, + select_path=self.select_path, previous=False, ext=['.png', '.jpg'] ) @@ -2049,7 +2050,7 @@ class NavigateApp(MDApp): newImg = PilImage.open(path).resize((300, 300)) if platform == 'android': android_path = os.path.join( - os.environ['ANDROID_PRIVATE'] + '/app/') + os.environ['ANDROID_PRIVATE'] + '/app/') newImg.save('{1}/images/default_identicon/{0}.png'.format( state.association, android_path)) else: @@ -2604,7 +2605,7 @@ class Draft(Screen): text='Draft', secondary_text=item['text'], theme_text_color='Custom', text_color=NavigateApp().theme_cls.primary_color) - meny._txt_right_pad=dp(70) + meny._txt_right_pad = dp(70) meny.add_widget(AvatarSampleWidget( source='./images/avatar.png')) meny.bind(on_press=partial( @@ -2807,7 +2808,7 @@ class Allmails(Screen): subject + ',' + body)[0:50] + '........').replace('\t', '').replace(' ', ''), theme_text_color='Custom', text_color=NavigateApp().theme_cls.primary_color) - meny._txt_right_pad=dp(70) + meny._txt_right_pad = dp(70) meny.add_widget(AvatarSampleWidget( source='./images/text_images/{}.png'.format( avatarImageFirstLetter(body.strip())))) diff --git a/src/tests/test_chatmsg.py b/src/tests/test_chatmsg.py index 87459a22..06542f4e 100644 --- a/src/tests/test_chatmsg.py +++ b/src/tests/test_chatmsg.py @@ -11,13 +11,12 @@ class TestCharMessage(unittest.TestCase): """ def test_decode(self): """Test various types of decode method""" - chat_obj = Chatmsg() import messagetypes result = messagetypes.constructObject({'': 'chatmsg', 'message': 'hello world'}) self.assertTrue(isinstance(result.message, str)) - def test_encode(self): + """Test various types of encode method""" chat_obj = Chatmsg() - result = chat_obj.encode({'message':'hello world'}) + result = chat_obj.encode({'message': 'hello world'}) self.assertTrue(True if result['message'] else False)