Merge branch 'UiChanges' of https://github.com/surbhicis/PyBitmessage into UiChanges

Author: surbhicis

.gitignore

@@ -18,3 +18,5 @@ dist
 docs/_*/*
 docs/autodoc/
 pyan/
+.buildozer/
+bin/

src/bitmessagekivy/android/python-for-android/recipes/kivymd/__init__.py

@@ -10,36 +10,14 @@
 class KivyMDRecipe(PythonRecipe):
     # This recipe installs KivyMD into the android dist from source
     version = 'master'
-    # url = 'https://gitlab.com/kivymd/KivyMD/repository/{version}/archive.zip'
-    url = 'https://github.com/HeaTTheatR/KivyMD/archive/master.zip'
+    url = 'https://github.com/surbhicis/kivymd/archive/master.zip'
     depends = ['kivy']
     site_packages_name = 'kivymd'
     call_hostpython_via_targetpython = False
-    # patches = ['kivymd-fix-dev-compatibility.patch']
-    # Made commented as use different repo for updates
 
     def should_build(self, arch):
         return True
 
-    # def unpack(self, arch):
-    #     info_main('Unpacking {} for {}'.format(self.name, arch))
-    #
-    #     build_dir = self.get_build_container_dir(arch)
-    #
-    #     user_dir = environ.get('P4A_{}_DIR'.format(self.name.lower()))
-    #
-    #     if user_dir is not None:
-    #         info("Installing KivyMD development version (from modded source)")
-    #         self.clean_build()
-    #         shprint(sh.rm, '-rf', build_dir)
-    #         shprint(sh.mkdir, '-p', build_dir)
-    #         shprint(sh.rmdir, build_dir)
-    #         ensure_dir(build_dir)
-    #         ensure_dir(build_dir + "/kivymd")
-    #         shprint(sh.cp, user_dir + '/setup.py', self.get_build_dir(arch) + "/setup.py")
-    #         shprint(sh.cp, '-a', user_dir + "/kivymd", self.get_build_dir(arch) + "/kivymd")
-    #         return
-
     def get_recipe_env(self, arch):
         env = super(KivyMDRecipe, self).get_recipe_env(arch)
         env['PYTHON_ROOT'] = self.ctx.get_python_install_dir()

src/bitmessagekivy/identiconGeneration.py

@@ -0,0 +1,92 @@
+"""
+src/identiconGeneration.py
+=================================
+"""
+import hashlib
+from PIL import Image
+from kivy.core.image import Image as CoreImage
+from kivy.uix.image import Image as kiImage
+from io import BytesIO
+""" Core classes for loading images and converting them to a Texture.
+The raw image data can be keep in memory for further access """
+
+
+# constants
+RESOLUTION = 128, 128
+V_RESOLUTION = 7, 7
+BACKGROUND_COLOR = 255, 255, 255, 255
+MODE = "RGB"
+
+
+def generate(Generate_string=None):
+    """Generating string"""
+    hash_string = generate_hash(Generate_string)
+    color = random_color(hash_string)
+    image = Image.new(MODE, V_RESOLUTION, BACKGROUND_COLOR)
+    image = generate_image(image, color, hash_string)
+    image = image.resize(RESOLUTION, 0)
+
+    data = BytesIO()
+    image.save(data, format='png')
+    data.seek(0)
+    # yes you actually need this
+    im = CoreImage(BytesIO(data.read()), ext='png')
+    beeld = kiImage()
+    # only use this line in first code instance
+    beeld.texture = im.texture
+    return beeld
+    # image.show()
+
+
+def generate_hash(string):
+    """Generating hash"""
+    try:
+        # make input case insensitive
+        string = str.lower(string)
+        hash_object = hashlib.md5(str.encode(string))
+        print hash_object.hexdigest()
+
+        # returned object is a hex string
+        return hash_object.hexdigest()
+
+    except IndexError:
+        print "Error: Please enter a string as an argument."
+
+
+def random_color(hash_string):
+    """Getting random color"""
+    # remove first three digits from hex string
+    split = 6
+    rgb = hash_string[:split]
+
+    split = 2
+    r = rgb[:split]
+    g = rgb[split:2 * split]
+    b = rgb[2 * split:3 * split]
+
+    color = (int(r, 16), int(g, 16),
+             int(b, 16), 0xFF)
+
+    return color
+
+
+def generate_image(image, color, hash_string):
+    """Generating images"""
+    hash_string = hash_string[6:]
+
+    lower_x = 1
+    lower_y = 1
+    upper_x = int(V_RESOLUTION[0] / 2) + 1
+    upper_y = V_RESOLUTION[1] - 1
+    limit_x = V_RESOLUTION[0] - 1
+    index = 0
+
+    for x in range(lower_x, upper_x):
+        for y in range(lower_y, upper_y):
+            if int(hash_string[index], 16) % 2 == 0:
+                image.putpixel((x, y), color)
+                image.putpixel((limit_x - x, y), color)
+
+            index = index + 1
+
+    return image

src/bitmessagekivy/kivy_helper_search.py

@@ -7,13 +7,16 @@ 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 '''
+    elif folder == "addressbook":
+        sqlStatementBase = '''SELECT label, address From addressbook '''
     else:
         sqlStatementBase = '''SELECT folder, msgid, toaddress, message, fromaddress, subject, received, read
             FROM inbox '''
+
     sqlStatementParts = []
     sqlArguments = []
     if account is not None:
@@ -24,22 +27,33 @@ def search_sql(xAddress="toaddress", account=None, folder="inbox", where=None, w
         else:
             sqlStatementParts.append(xAddress + " = ? ")
             sqlArguments.append(account)
-    if folder is not None:
-        if folder == "new":
-            folder = "inbox"
-            unreadOnly = True
-        sqlStatementParts.append("folder = ? ")
-        sqlArguments.append(folder)
-    else:
-        sqlStatementParts.append("folder != ?")
-        sqlArguments.append("trash")
+    if folder is not "addressbook":
+        if folder is not None:
+            if folder == "new":
+                folder = "inbox"
+                unreadOnly = True
+            sqlStatementParts.append("folder = ? ")
+            sqlArguments.append(folder)
+        else:
+            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)
+        sqlStatementBase += " ORDER BY lastactiontime DESC"
+    elif folder == "inbox":
+        sqlStatementBase += " ORDER BY received DESC"
+    return sqlQuery(sqlStatementBase, sqlArguments)