From 70fa0622c60c651a5918fa6da745da2bc5f1e201 Mon Sep 17 00:00:00 2001
From: shekhar-cis <shekhar.c@cisinlabs.com>
Date: Wed, 30 Mar 2022 14:53:43 +0530
Subject: [PATCH] Add draft_widgets

---
 src/bitmessagekivy/baseclass/draft.py         | 24 ++++++++-------
 src/bitmessagekivy/baseclass/draft_widgets.py | 30 +++++++++++++++++++
 2 files changed, 43 insertions(+), 11 deletions(-)
 create mode 100644 src/bitmessagekivy/baseclass/draft_widgets.py

diff --git a/src/bitmessagekivy/baseclass/draft.py b/src/bitmessagekivy/baseclass/draft.py
index cf31599e..2b22b108 100644
--- a/src/bitmessagekivy/baseclass/draft.py
+++ b/src/bitmessagekivy/baseclass/draft.py
@@ -1,5 +1,6 @@
 import time
 
+import os
 from bitmessagekivy import kivy_helper_search
 from bmconfigparser import BMConfigParser
 from helper_sql import sqlExecute
@@ -20,9 +21,10 @@ from bitmessagekivy.baseclass.common import (
     SwipeToDeleteItem, ShowTimeHistoy
 )
 from bitmessagekivy.baseclass.maildetail import MailDetail
+from bitmessagekivy.baseclass.draft_widgets import HelperDraft
 
 
-class Draft(Screen):
+class Draft(Screen, HelperDraft):
     """Draft screen class for kivy Ui"""
 
     data = ListProperty()
@@ -63,14 +65,14 @@ class Draft(Screen):
             self.ids.scroll_y.bind(scroll_y=self.check_scroll_y)
         else:
             self.set_draftCnt('0')
-            content = MDLabel(
-                font_style='Caption',
-                theme_text_color='Primary',
-                text="yet no message for this account!!!!!!!!!!!!!",
-                halign='center',
-                size_hint_y=None,
-                valign='top')
-            self.ids.ml.add_widget(content)
+            # content = MDLabel(
+            #     font_style='Caption',
+            #     theme_text_color='Primary',
+            #     text="yet no message for this account!!!!!!!!!!!!!",
+            #     halign='center',
+            #     size_hint_y=None,
+            #     valign='top')
+            self.ids.ml.add_widget(self.default_label_when_empty())
 
     def draftDataQuery(self, xAddress, where, what, start_indx=0, end_indx=20):
         """This methosd is for retrieving draft messages"""
@@ -104,7 +106,7 @@ class Draft(Screen):
             listItem.secondary_text = item["text"]
             listItem.theme_text_color = "Custom"
             listItem.text_color = ThemeClsColor
-            message_row.ids.avater_img.source = state.imageDir + '/avatar.png'
+            message_row.ids.avater_img.source = os.path.join(state.imageDir, 'avatar.png')
             listItem.bind(on_release=partial(
                 self.draft_detail, item['ackdata'], message_row))
             message_row.ids.time_tag.text = str(ShowTimeHistoy(item['senttime']))
@@ -144,7 +146,7 @@ class Draft(Screen):
 
     def delete_draft(self, data_index, instance, *args):
         """Delete draft message permanently"""
-        sqlExecute("DELETE FROM sent WHERE ackdata = ?;", data_index)
+        sqlExecute("DELETE FROM sent WHERE ackdata = ?", data_index)
         if int(state.draft_count) > 0:
             state.draft_count = str(int(state.draft_count) - 1)
             self.set_draftCnt(state.draft_count)
diff --git a/src/bitmessagekivy/baseclass/draft_widgets.py b/src/bitmessagekivy/baseclass/draft_widgets.py
new file mode 100644
index 00000000..42d1782e
--- /dev/null
+++ b/src/bitmessagekivy/baseclass/draft_widgets.py
@@ -0,0 +1,30 @@
+# pylint: disable=no-member, too-many-arguments
+"""
+Draft screen widgets are here.
+"""
+
+
+from kivymd.uix.button import MDRaisedButton
+from kivymd.uix.dialog import MDDialog
+from kivymd.uix.label import MDLabel
+
+import state
+
+
+class HelperDraft(object):
+    """Widget used in Draft screen are here"""
+    def __init__(self):
+        pass
+
+    @staticmethod
+    def default_label_when_empty():
+        """This function returns default message while no address is there."""
+        empty_screen_msg = "yet no message for this account!!!!!!!!!!!!!"
+        content = MDLabel(
+            font_style='Caption',
+            theme_text_color='Primary',
+            text=empty_screen_msg,
+            halign='center',
+            size_hint_y=None,
+            valign='top')
+        return content