From 73aa60e554c59bdcf3fe2f91a4ba2df2dc34c9df Mon Sep 17 00:00:00 2001 From: surbhi Date: Fri, 2 Aug 2019 14:41:33 +0530 Subject: [PATCH] kivy searchbar adding with few more implementation --- src/bitmessagekivy/kivy_helper_search.py | 16 +- src/bitmessagekivy/main.kv | 90 ++++++++-- src/bitmessagekivy/mpybit.py | 211 +++++++++++++++++++---- src/state.py | 6 +- 4 files changed, 266 insertions(+), 57 deletions(-) diff --git a/src/bitmessagekivy/kivy_helper_search.py b/src/bitmessagekivy/kivy_helper_search.py index 73a8a1ff..eae6be01 100644 --- a/src/bitmessagekivy/kivy_helper_search.py +++ b/src/bitmessagekivy/kivy_helper_search.py @@ -7,7 +7,7 @@ def search_sql(xAddress="toaddress", account=None, folder="inbox", where=None, w else: what = None - if folder == "sent": + if folder == "sent" or folder == "draft": sqlStatementBase = ''' SELECT toaddress, fromaddress, subject, message, status, ackdata, lastactiontime FROM sent ''' @@ -34,12 +34,20 @@ def search_sql(xAddress="toaddress", account=None, folder="inbox", where=None, w sqlStatementParts.append("folder != ?") sqlArguments.append("trash") if what is not None: - sqlStatementParts.append("%s LIKE ?" % (where)) - sqlArguments.append(what) + for colmns in where: + if len(where) > 1: + if where[0] == colmns: + filter_col = "(%s LIKE ?" % (colmns) + else: + filter_col += " or %s LIKE ? )" % (colmns) + else: + filter_col = "%s LIKE ?" % (colmns) + sqlArguments.append(what) + sqlStatementParts.append(filter_col) if unreadOnly: sqlStatementParts.append("read = 0") if len(sqlStatementParts) > 0: sqlStatementBase += "WHERE " + " AND ".join(sqlStatementParts) if folder == "sent": sqlStatementBase += " ORDER BY lastactiontime" - return sqlQuery(sqlStatementBase, sqlArguments) + return sqlQuery(sqlStatementBase, sqlArguments) \ No newline at end of file diff --git a/src/bitmessagekivy/main.kv b/src/bitmessagekivy/main.kv index 7d1d380f..861bbbac 100644 --- a/src/bitmessagekivy/main.kv +++ b/src/bitmessagekivy/main.kv @@ -36,6 +36,8 @@ #:import MDFloatingActionButton kivymd.button.MDFloatingActionButton #:import Factory kivy.factory.Factory #:import MDTextButton kivymd.button.MDTextButton +#:import FadeTransition kivy.uix.screenmanager.FadeTransition +#:import MDScrollViewRefreshLayout kivymd.refreshlayout.MDScrollViewRefreshLayout #:set color_button (0.784, 0.443, 0.216, 1) # brown #:set color_button_pressed (0.659, 0.522, 0.431, 1) # darker brown @@ -57,7 +59,7 @@ NavigationDrawerTwoLineListItem: text: "Accounts" NavigationDrawerIconButton: - Spinner: + CustomSpinner: pos_hint:{"x":0,"y":.25} id: btn option_cls: Factory.get("MySpinnerOption") @@ -68,7 +70,6 @@ color: color_font values: app.variable_1 on_text:app.getCurrentAccountData(self.text) - on_press: app.limit_spinner() ArrowImg: NavigationDrawerIconButton: id: inbox_cnt @@ -76,43 +77,51 @@ text: "Inbox" on_release: app.root.ids.scr_mngr.current = 'inbox' badge_text: app.mail_count(self.text) + on_press: app.check_search_screen(self) NavigationDrawerIconButton: id: send_cnt icon: 'send' text: "Sent" on_release: app.root.ids.scr_mngr.current = 'sent' badge_text: app.mail_count(self.text) + on_press: app.check_search_screen(self) NavigationDrawerIconButton: id: draft_cnt icon: 'message-draw' text: "Draft" on_release: app.root.ids.scr_mngr.current = 'draft' badge_text: app.mail_count(self.text) + on_press: app.check_search_screen(self) NavigationDrawerIconButton: text: "Starred" icon:'star' on_release: app.root.ids.scr_mngr.current = 'inbox' + on_press: app.check_search_screen(self) NavigationDrawerIconButton: icon: 'archive' text: "Archieve" on_release: app.root.ids.scr_mngr.current = 'trash' badge_text: "9+" + on_press: app.check_search_screen(self) NavigationDrawerIconButton: icon: 'email-open-outline' text: "Spam" on_release: app.root.ids.scr_mngr.current = 'inbox' badge_text: "8+" + on_press: app.check_search_screen(self) NavigationDrawerIconButton: id: trash_cnt icon: 'delete' text: "Trash" on_release: app.root.ids.scr_mngr.current = 'trash' badge_text: app.mail_count(self.text) + on_press: app.check_search_screen(self) NavigationDrawerIconButton: text: "All Mails" icon:'contact-mail' on_release: app.root.ids.scr_mngr.current = 'inbox' badge_text: "999+" + on_press: app.check_search_screen(self) NavigationDrawerDivider: NavigationDrawerSubheader: text: "All labels" @@ -120,26 +129,32 @@ text: "Address Book" icon:'book-multiple' on_release: app.root.ids.scr_mngr.current = 'addressbook' + on_press: app.check_search_screen(self) NavigationDrawerIconButton: text: "Settings" icon:'settings' - on_release: app.root.ids.scr_mngr.current = 'set' + on_release: app.root.ids.scr_mngr.current = 'set' + on_press: app.check_search_screen(self) NavigationDrawerIconButton: text: "Subscriptions/Payment" icon:'wallet' on_release: app.root.ids.scr_mngr.current = 'payment' + on_press: app.check_search_screen(self) NavigationDrawerIconButton: text: "new address" icon:'account-plus' on_release: app.root.ids.scr_mngr.current = 'login' + on_press: app.check_search_screen(self) NavigationDrawerIconButton: text: "Network Status" icon:'server-network' on_release: app.root.ids.scr_mngr.current = 'networkstat' + on_press: app.check_search_screen(self) NavigationDrawerIconButton: text: "My Addresses" icon:'account-multiple' on_release: app.root.ids.scr_mngr.current = 'myaddress' + on_press: app.check_search_screen(self) NavigationLayout: id: nav_layout @@ -148,6 +163,7 @@ NavigationLayout: id: nav_drawer BoxLayout: + id: box_layout orientation: 'vertical' Toolbar: id: toolbar @@ -158,6 +174,45 @@ NavigationLayout: background_palette: 'Primary' background_hue: '500' left_action_items: [['menu', lambda x: app.root.toggle_nav_drawer()]] + Button: + id: reset_navbar + size_hint_y: 0.35 + size_hint_x: 0.2 + opacity: 0 + disabled: True + pos_hint: {'x': .1, 'y': 0.3} + color: 0,0,0,1 + background_color: (0,0,0,0) + on_press:app.reset_navdrawer(self) + Image: + source: './images/left_arrow.png' + center_x: self.parent.center_x + center_y: self.parent.center_y + size: 40, 40 + TextInput: + id: search_input + hint_text: 'search' + opacity: 0 + size_hint: 1,None + height: dp(32) + disabled: True + pos_hint: {'center_x':.565,'center_y': .5} + multiline: False + padding_y: [self.height / 2.0 - (self.line_height / 2.0) * len(self._lines), 0] + padding_x: 20,20 + Button: + id: serch_btn + size_hint_y: 0.35 + size_hint_x: 0.2 + pos_hint: {'x': .1, 'y': 0.3} + color: 0,0,0,1 + background_color: (0,0,0,0) + on_press:app.searchQuery(self, search_input.text) + Image: + source: './images/search_mail.png' + center_x: self.parent.center_x + center_y: self.parent.center_y + size: 55, 55 Button: id: myButton size_hint_y: 0.35 @@ -170,6 +225,7 @@ NavigationLayout: source: './images/addressbookadd.png' center_x: self.parent.center_x center_y: self.parent.center_y + size: 55, 55 ScreenManager: id: scr_mngr Inbox: @@ -208,12 +264,14 @@ NavigationLayout: : name: 'inbox' - ScrollView: - do_scroll_x: False - MDList: - id: ml - - ComposerButton: + FloatLayout: + MDScrollViewRefreshLayout: + id: refresh_layout + refresh_callback: root.refresh_callback + root_layout: root + MDList: + id: ml + ComposerButton : name: 'sent' @@ -272,13 +330,12 @@ NavigationLayout: font_size: '13sp' multiline: False required: True - allow_copy: True helper_text_mode: "on_error" BoxLayout: size_hint_y: None height: dp(40) - Spinner: + CustomSpinner: background_color: app.theme_cls.primary_dark id: btn values: app.variable_1 @@ -569,10 +626,13 @@ NavigationLayout: : name: 'myaddress' - ScrollView: - do_scroll_x: False - MDList: - id: ml + FloatLayout: + MDScrollViewRefreshLayout: + id: refresh_layout + refresh_callback: root.refresh_callback + root_layout: root + MDList: + id: ml ComposerButton: : diff --git a/src/bitmessagekivy/mpybit.py b/src/bitmessagekivy/mpybit.py index b122791f..067eb4e5 100644 --- a/src/bitmessagekivy/mpybit.py +++ b/src/bitmessagekivy/mpybit.py @@ -4,7 +4,7 @@ from kivy.lang import Builder from kivy.metrics import dp from kivy.properties import ObjectProperty from kivy.uix.image import Image -from kivy.uix.screenmanager import Screen +from kivy.uix.screenmanager import Screen, NoTransition from kivymd.bottomsheet import MDListBottomSheet, MDGridBottomSheet from kivymd.button import MDIconButton from kivymd.date_picker import MDDatePicker @@ -48,7 +48,7 @@ from kivy.core.window import Window from functools import partial from kivy.uix.carousel import Carousel from kivy.utils import platform - +from kivy.uix.spinner import Spinner class Navigatorss(MDNavigationDrawer): image_source = StringProperty('images/qidenticon_two.png') @@ -79,6 +79,9 @@ class Inbox(Screen): def loadMessagelist(self, account, where="", what=""): """Load Inbox list for Inbox messages.""" + if state.searcing_text: + where = ['subject', 'message'] + what = state.searcing_text xAddress = 'toaddress' data = [] queryreturn = kivy_helper_search.search_sql( @@ -86,15 +89,16 @@ class Inbox(Screen): if queryreturn: for mail in queryreturn: third_text = mail[3].replace('\n', ' ') - # ('inbox', 'j\xe5(M\xcfPbe\rl\x0f\xa3\r\xef>\xf0\x0b&\t\'}"RYg\x03\x80\x14\x82\xeb&,', 'BM-2cXpNNd7dhTjsv7LHNfmphfUabZk958sA3', 'hello', 'BM-2cWyUfBdY2FbgyuCb7abFZ49JYxSzUhNFe', 'test from peter', '1559121770', 0) data.append({'text': mail[4].strip(), 'secondary_text': mail[5][:10] + '...........' if len(mail[3]) > 10 else mail[3] + '\n' + " " + (third_text[:25] + '...!') if len(third_text) > 25 else third_text, 'receivedTime': mail[6] }) for item in data: meny = ThreeLineAvatarIconListItem(text=item['text'], secondary_text=item['secondary_text'], theme_text_color= 'Custom', text_color=NavigateApp().theme_cls.primary_color) - meny.add_widget(AvatarSampleWidget(source='./images/text_images/{}.png'.format(item['secondary_text'][0].upper()))) + meny.add_widget(AvatarSampleWidget(source='./images/text_images/{}.png'.format(item['secondary_text'][0].upper() if (item['secondary_text'][0].upper() >= 'A' and item['secondary_text'][0].upper() <= 'Z') else '!'))) meny.bind(on_press = partial(self.inbox_detail, item['receivedTime'])) carousel = Carousel(direction='right') if platform == 'android': - carousel.height = 150 + carousel.height = 150 + elif platform == 'linux': + carousel.height = meny.height - 10 carousel.size_hint_y = None carousel.ignore_perpendicular_swipes = True carousel.data_index = 0 @@ -109,7 +113,7 @@ class Inbox(Screen): ach_btn.background_color = (0,1,0,1) ach_btn.bind(on_press=partial(self.archive, item['receivedTime'])) carousel.add_widget(ach_btn) - carousel.index=1 + carousel.index = 1 self.ids.ml.add_widget(carousel) else: content = MDLabel(font_style='Body1', @@ -129,6 +133,8 @@ class Inbox(Screen): src_mng_obj = self.manager else: src_mng_obj = self.parent.parent + + hide_search_btn(src_mng_obj) src_mng_obj.screens[13].clear_widgets() src_mng_obj.screens[13].add_widget(MailDetail()) src_mng_obj.current = 'mailDetail' @@ -160,6 +166,23 @@ class Inbox(Screen): self.parent.parent.screens[4].clear_widgets() self.parent.parent.screens[4].add_widget(Trash()) + def refresh_callback(self, *args): + """A method that updates the state of your application + while the spinner remains on the screen.""" + + def refresh_callback(interval): + """This methods is used for loading the inbox screen data""" + self.ids.ml.clear_widgets() + self.remove_widget(self.children[1]) + try: + screens_obj = self.parent.screens[0] + except Exception as e: + screens_obj = self.parent.parent.screens[0] + screens_obj.add_widget(Inbox()) + self.ids.refresh_layout.refresh_done() + self.tick = 0 + + Clock.schedule_once(refresh_callback, 1) class MyAddress(Screen): @@ -176,7 +199,7 @@ class MyAddress(Screen): data.append({'text': BMConfigParser().get(address, 'label'), 'secondary_text': address}) for item in data: meny = TwoLineAvatarIconListItem(text=item['text'], secondary_text=item['secondary_text'], theme_text_color= 'Custom',text_color=NavigateApp().theme_cls.primary_color) - meny.add_widget(AvatarSampleWidget(source='./images/text_images/{}.png'.format(item['text'][0].upper()))) + meny.add_widget(AvatarSampleWidget(source='./images/text_images/{}.png'.format(item['text'][0].upper() if (item['text'][0].upper() >= 'A' and item['text'][0].upper() <= 'Z') else '!'))) meny.bind(on_press=partial(self.myadd_detail, item['secondary_text'], item['text'])) self.ids.ml.add_widget(meny) else: @@ -198,6 +221,24 @@ class MyAddress(Screen): p.open() p.set_address(fromaddress, label) + def refresh_callback(self, *args): + """A method that updates the state of your application + while the spinner remains on the screen.""" + + def refresh_callback(interval): + """This methods is used for loading the myaddress screen data""" + self.ids.ml.clear_widgets() + self.remove_widget(self.children[1]) + try: + screens_obj = self.parent.screens[9] + except Exception as e: + screens_obj = self.parent.parent.screens[9] + screens_obj.add_widget(MyAddress()) + self.ids.refresh_layout.refresh_done() + self.tick = 0 + + Clock.schedule_once(refresh_callback, 1) + class AddressBook(Screen): """AddressBook Screen uses screen to show widgets of screens.""" @@ -211,12 +252,13 @@ class AddressBook(Screen): if data: for item in data: meny = TwoLineAvatarIconListItem(text=item[0], secondary_text=item[1], theme_text_color='Custom',text_color=NavigateApp().theme_cls.primary_color) - meny.add_widget(AvatarSampleWidget(source='./images/text_images/{}.png'.format(item[0][0].upper()))) + meny.add_widget(AvatarSampleWidget(source='./images/text_images/{}.png'.format(item[0][0].upper() if (item[0][0].upper() >= 'A' and item[0][0].upper() <= 'Z') else '!'))) meny.bind(on_press = partial(self.addBook_detail, item[1], item[0])) - # self.ids.ml.add_widget(meny) carousel = Carousel(direction='right') if platform == 'android': - carousel.height = 140 + carousel.height = 140 + elif platform == 'linux': + carousel.height = meny.height - 10 carousel.size_hint_y = None carousel.ignore_perpendicular_swipes = True carousel.data_index = 0 @@ -358,6 +400,8 @@ class DropDownWidget(BoxLayout): self.parent.parent.current = 'sent' self.ids.btn.text = 'select' self.ids.ti.text = '' + self.parent.parent.parent.parent.parent.ids.serch_btn.opacity = 1 + self.parent.parent.parent.parent.parent.ids.serch_btn.disabled = False return None else: @@ -487,10 +531,6 @@ class AddressSuccessful(Screen): pass -class NavigationLayout(): - pass - - class Sent(Screen): """Sent Screen uses screen to show widgets of screens.""" data = ListProperty() @@ -514,6 +554,9 @@ class Sent(Screen): def loadSent(self, account, where="", what=""): """Load Sent list for Sent messages.""" + if state.searcing_text: + where = ['subject', 'message'] + what = state.searcing_text xAddress = 'fromaddress' queryreturn = kivy_helper_search.search_sql( xAddress, account, "sent", where, what, False) @@ -528,11 +571,13 @@ class Sent(Screen): self.data.append({'text': mail[1].strip(), 'secondary_text': mail[2][:10] + '...........' if len(mail[2]) > 10 else mail[2] + '\n' + " " + (third_text[:25] + '...!') if len(third_text) > 25 else third_text, 'lastactiontime': mail[6]}) for item in self.data: meny = ThreeLineAvatarIconListItem(text=item['text'], secondary_text=item['secondary_text'], theme_text_color= 'Custom', text_color=NavigateApp().theme_cls.primary_color) - meny.add_widget(AvatarSampleWidget(source='./images/text_images/{}.png'.format(item['secondary_text'][0].upper()))) + meny.add_widget(AvatarSampleWidget(source='./images/text_images/{}.png'.format(item['secondary_text'][0].upper() if (item['secondary_text'][0].upper() >= 'A' and item['secondary_text'][0].upper() <= 'Z') else '!'))) meny.bind(on_press = partial(self.sent_detail, item['lastactiontime'])) carousel = Carousel(direction='right') if platform == 'android': - carousel.height = 150 + carousel.height = 150 + elif platform == 'linux': + carousel.height = meny.height - 10 carousel.size_hint_y = None carousel.ignore_perpendicular_swipes = True carousel.data_index = 0 @@ -549,7 +594,6 @@ class Sent(Screen): carousel.add_widget(ach_btn) carousel.index=1 self.ids.ml.add_widget(carousel) - # self.ids.ml.add_widget(meny) else: content = MDLabel(font_style='Body1', theme_text_color='Primary', @@ -568,6 +612,7 @@ class Sent(Screen): src_mng_obj = self.manager else: src_mng_obj = self.parent.parent + hide_search_btn(src_mng_obj) src_mng_obj.screens[13].clear_widgets() src_mng_obj.screens[13].add_widget(MailDetail()) src_mng_obj.current = 'mailDetail' @@ -575,7 +620,7 @@ class Sent(Screen): def delete(self, data_index, instance, *args): """delete sent mail from sent mail listing""" try: - msg_count_objs = self.parent.parent.parent.parent.children[2].ids + msg_count_objs = self.parent.parent.parent.parent.children[2].children[0].ids except Exception as e: msg_count_objs = self.parent.parent.parent.parent.parent.children[2].children[0].ids if int(state.sent_count) > 0: @@ -586,7 +631,6 @@ class Sent(Screen): sqlExecute("UPDATE sent SET folder = 'trash' WHERE lastactiontime = {};".format(data_index)) self.ids.ml.remove_widget(instance.parent.parent) - # self.update_mail_count() self.update_trash() def archive(self, data_index, instance, *args): @@ -623,7 +667,7 @@ class Trash(Screen): for item in trash_data: meny = ThreeLineAvatarIconListItem(text=item[1], secondary_text=item[2], theme_text_color= 'Custom',text_color=NavigateApp().theme_cls.primary_color) - meny.add_widget(AvatarSampleWidget(source='./images/text_images/{}.png'.format(item[2][0].upper()))) + meny.add_widget(AvatarSampleWidget(source='./images/text_images/{}.png'.format(item[2][0].upper() if (item[2][0].upper() >= 'A' and item[2][0].upper() <= 'Z') else '!'))) self.ids.ml.add_widget(meny) class Page(Screen): @@ -676,7 +720,7 @@ class NavigateApp(App): ] def build(self): - import os + import os main_widget = Builder.load_file( os.path.join(os.path.dirname(__file__), 'main.kv')) self.nav_drawer = Navigatorss() @@ -705,7 +749,6 @@ class NavigateApp(App): def showmeaddresses(name="text"): """Show the addresses in spinner to make as dropdown.""" if name == "text": - # return BMConfigParser().get(BMConfigParser().addresses()[0], 'label')[:12] + '..' if bmconfigparserigParser().addresses(): return BMConfigParser().addresses()[0][:16] + '..' else: @@ -774,16 +817,12 @@ class NavigateApp(App): return True return False - def limit_spinner(self): - max = 2.8 - spinner_obj = ContentNavigationDrawer().ids.btn - spinner_obj.dropdown_cls.max_height = spinner_obj.height* max + max * 4 - def on_key(self, window, key, *args): """This method is used for going on previous screen""" if key == 27: # the esc key if self.root.ids.scr_mngr.current == "mailDetail": self.root.ids.scr_mngr.current = 'sent' if state.detailPageType == 'sent' else 'inbox' + show_search_btn(self) # this is for direction of the screen comesup elif self.root.ids.scr_mngr.current == "create": composer_objs = self.root @@ -791,19 +830,21 @@ class NavigateApp(App): to_addr = str(self.root.children[1].children[0].children[0].children[0].children[0].ids.txt_input.text) if from_addr and to_addr: Draft().draft_msg(composer_objs) - # self.root.ids.scr_mngr.current + self.root.ids.serch_btn.opacity = 1 + self.root.ids.serch_btn.disabled = False self.root.ids.scr_mngr.current = 'inbox' elif self.root.ids.scr_mngr.current == "showqrcode": self.root.ids.scr_mngr.current = 'myaddress' elif self.root.ids.scr_mngr.current == "random": - self.root.ids.scr_mngr.current = 'login' + self.root.ids.scr_mngr.current = 'login' else: self.root.ids.scr_mngr.current = 'inbox' + show_search_btn(self) self.root.ids.scr_mngr.transition.direction = 'right' self.root.ids.scr_mngr.transition.bind(on_complete=self.restart) return True - def restart(self, *args): + def restart(self, *args): """this method is used to set transition direction""" self.root.ids.scr_mngr.transition.direction = 'left' self.root.ids.scr_mngr.transition.unbind(on_complete=self.restart) @@ -815,6 +856,8 @@ class NavigateApp(App): def clear_composer(self): """if slow down the nwe will make new composer edit screen""" + self.root.ids.serch_btn.opacity = 0 + self.root.ids.serch_btn.disabled = True composer_obj = self.root.ids.sc3.children[0].ids composer_obj.ti.text = '' composer_obj.btn.text = 'Select' @@ -844,16 +887,77 @@ class NavigateApp(App): state.draft_count = str(sqlQuery("SELECT COUNT(*) FROM sent WHERE fromaddress = '{1}' and folder = '{0}' ;".format(text.lower(), state.association))[0][0]) return state.draft_count - def current_address_label(self, current_address = None): + def current_address_label(self, current_address=None): if BMConfigParser().addresses() or current_address: if current_address: first_name = current_address - else: + else: first_name = BMConfigParser().get(BMConfigParser().addresses()[0], 'label') f_name = first_name.split() return f_name[0][:14]+ '...' if len(f_name[0])>15 else f_name[0] return '' + def searchQuery(self, instance, text): + '''This method is used for showing searched mails''' + if self.root.ids.search_input.opacity == 0: + self.root.ids.search_input.opacity = 1 + self.root.ids.search_input.size_hint = 4,None + # self.root.ids.serch_btn.opacity = 0 + # self.root.ids.serch_btn.disabled = True + self.root.ids.search_input.disabled = False + self.root.ids.search_input.focus = True + self.root.ids.toolbar.left_action_items = [] + self.root.ids.toolbar.title = '' + self.root.ids.myButton.opacity = 0 + self.root.ids.myButton.disabled = True + self.root.ids.reset_navbar.opacity = 1 + self.root.ids.reset_navbar.disabled = False + elif str(text): + state.search_screen = self.root.ids.scr_mngr.current + state.searcing_text = str(text).strip() + if state.search_screen == 'inbox': + self.root.ids.sc1.clear_widgets() + self.root.ids.sc1.add_widget(Inbox()) + else: + self.root.ids.sc4.clear_widgets() + self.root.ids.sc4.add_widget(Sent()) + self.root.ids.scr_mngr.current = state.search_screen + + def reset_navdrawer(self, instance): + '''This methos is used for reseting navigation drawer''' + self.root.ids.search_input.text = '' + self.root.ids.search_input.opacity = 0 + self.root.ids.search_input.size_hint = 1,None + self.root.ids.search_input.disabled = True + self.root.ids.toolbar.left_action_items = [['menu', lambda x: self.root.toggle_nav_drawer()]] + self.root.ids.toolbar.title = self.current_address_label() + self.root.ids.myButton.opacity = 1 + self.root.ids.myButton.disabled = False + self.root.ids.reset_navbar.opacity = 0 + self.root.ids.reset_navbar.disabled = True + state.searcing_text = '' + if state.search_screen == 'inbox': + self.root.ids.sc1.clear_widgets() + self.root.ids.sc1.add_widget(Inbox()) + else: + self.root.ids.sc4.clear_widgets() + self.root.ids.sc4.add_widget(Sent()) + + def check_search_screen(self, instance): + '''This method is used for showing search button only on inbox or sent screen''' + if instance.text == 'Inbox' or instance.text == 'Sent': + self.root.ids.serch_btn.opacity = 1 + self.root.ids.serch_btn.disabled = False + state.searcing_text = '' + self.root.ids.sc1.clear_widgets() + self.root.ids.sc4.clear_widgets() + self.root.ids.sc1.add_widget(Inbox()) + self.root.ids.sc4.add_widget(Sent()) + else: + self.root.ids.serch_btn.opacity = 0 + self.root.ids.serch_btn.disabled = True + return + class GrashofPopup(Popup): def __init__(self, **kwargs): @@ -882,6 +986,8 @@ class GrashofPopup(Popup): queues.UISignalQueue.put(('rerenderAddressBook', '')) self.dismiss() sqlExecute("INSERT INTO addressbook VALUES(?,?)", label, address) + self.parent.children[1].ids.serch_btn.opacity = 0 + self.parent.children[1].ids.serch_btn.disabled = True self.parent.children[1].ids.scr_mngr.current = 'addressbook' def show_error_message(self): @@ -993,6 +1099,8 @@ class MailDetail(Screen): state.trash_count = str(int(state.trash_count) + 1) self.parent.parent.screens[4].clear_widgets() self.parent.parent.screens[4].add_widget(Trash()) + self.parent.parent.parent.parent.parent.ids.serch_btn.opacity = 1 + self.parent.parent.parent.parent.parent.ids.serch_btn.disabled = False def inbox_reply(self): """This method is used for replying inbox messages""" @@ -1124,12 +1232,11 @@ class Draft(Screen): for item in self.data: meny = TwoLineAvatarIconListItem(text='Draft', secondary_text=item['text'], theme_text_color= 'Custom',text_color=NavigateApp().theme_cls.primary_color) meny.add_widget(AvatarSampleWidget(source='./images/avatar.png')) - # wimg = Image(source='/home/cis/transparent1.png', size= (10, 10)) - # meny.bind(on_press = partial(self.sent_detail, item['lastactiontime'])) carousel = Carousel(direction='right') - # carousel = MDCardPost(text_post='Card with text',swipe=True, callback=callback) if platform == 'android': - carousel.height = 150 + carousel.height = 150 + elif platform == 'linux': + carousel.height = meny.height - 10 carousel.size_hint_y = None carousel.ignore_perpendicular_swipes = True carousel.data_index = 0 @@ -1207,4 +1314,34 @@ class Draft(Screen): state.draft_count = str(int(state.draft_count) + 1) src_object.ids.sc16.clear_widgets() src_object.ids.sc16.add_widget(Draft()) - return \ No newline at end of file + return + + +def show_search_btn(self): + '''This method is used to show search button''' + self.root.ids.serch_btn.opacity = 1 + self.root.ids.serch_btn.disabled = False + + +def hide_search_btn(mgr_objs): + '''This method is used to hide search button and search box''' + mgr_objs.parent.parent.parent.ids.serch_btn.opacity = 0 + mgr_objs.parent.parent.parent.ids.serch_btn.disabled = True + mgr_objs.parent.parent.parent.ids.search_input.size_hint = 1,None + mgr_objs.parent.parent.parent.ids.search_input.disabled = True + mgr_objs.parent.parent.parent.ids.search_input.opacity = 0 + mgr_objs.parent.parent.parent.ids.toolbar.left_action_items = [['menu', lambda x: mgr_objs.parent.parent.parent.toggle_nav_drawer()]] + mgr_objs.parent.parent.parent.ids.toolbar.title = NavigateApp().current_address_label() + mgr_objs.parent.parent.parent.ids.myButton.opacity = 1 + mgr_objs.parent.parent.parent.ids.myButton.disabled = False + mgr_objs.parent.parent.parent.ids.reset_navbar.opacity = 0 + mgr_objs.parent.parent.parent.ids.reset_navbar.disabled = True + + +class CustomSpinner(Spinner): + '''This class is used for setting spinner size''' + def __init__(self, *args, **kwargs): + '''This methods is used for setting size of spinner''' + super(CustomSpinner, self).__init__(*args, **kwargs) + max = 2.8 + self.dropdown_cls.max_height = self.height * max + max * 4 \ No newline at end of file diff --git a/src/state.py b/src/state.py index 34bef37b..745f2f4c 100644 --- a/src/state.py +++ b/src/state.py @@ -96,4 +96,8 @@ inbox_count = 0 trash_count = 0 -draft_count = 0 \ No newline at end of file +draft_count = 0 + +searcing_text = '' + +search_screen = '' \ No newline at end of file