Changes made on UI for Desktop and Mobile Clients with suggested review changes

src/buildozer.spec

@@ -0,0 +1,275 @@
+[app]
+
+# (str) Title of your application
+title = PyBitmessage
+
+# (str) Package name
+package.name = PyBitmessage
+
+# (str) Package domain (needed for android/ios packaging)
+package.domain = org.test
+
+# (str) Source code where the main.py live
+source.dir = .
+
+# (list) Source files to include (let empty to include all the files)
+source.include_exts = py,png,jpg,kv,atlas
+
+# (list) List of inclusions using pattern matching
+#source.include_patterns = assets/*,images/*.png
+
+# (list) Source files to exclude (let empty to not exclude anything)
+#source.exclude_exts = spec
+
+# (list) List of directory to exclude (let empty to not exclude anything)
+#source.exclude_dirs = tests, bin
+
+# (list) List of exclusions using pattern matching
+#source.exclude_patterns = license,images/*/*.jpg
+
+# (str) Application versioning (method 1)
+version = 0.1
+
+# (str) Application versioning (method 2)
+# version.regex = __version__ = ['"](.*)['"]
+# version.filename = %(source.dir)s/main.py
+
+# (list) Application requirements
+# comma seperated e.g. requirements = sqlite3,kivy
+requirements = python2, sqlite3, kivy, openssl
+
+# (str) Custom source folders for requirements
+# Sets custom source for any requirements with recipes
+# requirements.source.kivy = ../../kivy
+#requirements.source.sqlite3 =
+
+# (list) Garden requirements
+#garden_requirements =
+
+# (str) Presplash of the application
+#presplash.filename = %(source.dir)s/data/presplash.png
+
+# (str) Icon of the application
+#icon.filename = %(source.dir)s/data/icon.png
+
+# (str) Supported orientation (one of landscape, portrait or all)
+orientation = portrait
+
+# (list) List of service to declare
+#services = NAME:ENTRYPOINT_TO_PY,NAME2:ENTRYPOINT2_TO_PY
+
+#
+# OSX Specific
+#
+
+#
+# author = © Copyright Info
+
+# change the major version of python used by the app
+#osx.python_version = 2
+
+
+# Kivy version to use
+osx.kivy_version = 1.9.1
+
+#
+# Android specific
+#
+
+# (bool) Indicate if the application should be fullscreen or not
+fullscreen = 0
+
+# (string) Presplash background color (for new android toolchain)
+# Supported formats are: #RRGGBB #AARRGGBB or one of the following names:
+# red, blue, green, black, white, gray, cyan, magenta, yellow, lightgray,
+# darkgray, grey, lightgrey, darkgrey, aqua, fuchsia, lime, maroon, navy,
+# olive, purple, silver, teal.
+#android.presplash_color = #FFFFFF
+
+# (list) Permissions
+android.permissions = INTERNET
+
+# (int) Android API to use
+#android.api = 19
+
+# (int) Minimum API required
+#android.minapi = 9
+
+# (int) Android SDK version to use
+#android.sdk = 20
+
+# (str) Android NDK version to use
+#android.ndk = 9c
+
+# (bool) Use --private data storage (True) or --dir public storage (False)
+#android.private_storage = True
+
+# (str) Android NDK directory (if empty, it will be automatically downloaded.)
+#android.ndk_path =
+
+# (str) Android SDK directory (if empty, it will be automatically downloaded.)
+#android.sdk_path =
+
+# (str) ANT directory (if empty, it will be automatically downloaded.)
+#android.ant_path =
+
+# (bool) If True, then skip trying to update the Android sdk
+# This can be useful to avoid excess Internet downloads or save time
+# when an update is due and you just want to test/build your package
+# android.skip_update = False
+
+# (str) Android entry point, default is ok for Kivy-based app
+#android.entrypoint = org.renpy.android.PythonActivity
+
+# (list) Pattern to whitelist for the whole project
+#android.whitelist =
+
+android.whitelist = /usr/lib/komodo-edit/python/lib/python2.7/lib-dynload/_sqlite3.so
+
+
+# (str) Path to a custom whitelist file
+#android.whitelist_src =
+
+# (str) Path to a custom blacklist file
+#android.blacklist_src =
+
+# (list) List of Java .jar files to add to the libs so that pyjnius can access
+# their classes. Don't add jars that you do not need, since extra jars can slow
+# down the build process. Allows wildcards matching, for example:
+# OUYA-ODK/libs/*.jar
+#android.add_jars = foo.jar,bar.jar,path/to/more/*.jar
+
+# (list) List of Java files to add to the android project (can be java or a
+# directory containing the files)
+#android.add_src =
+
+# (list) Android AAR archives to add (currently works only with sdl2_gradle
+# bootstrap)
+#android.add_aars =
+
+# (list) Gradle dependencies to add (currently works only with sdl2_gradle
+# bootstrap)
+#android.gradle_dependencies =
+, /home/cis/Downloads/libssl1.0.2_1.0.2l-2+deb9u2_amd64
+# (str) python-for-android branch to use, defaults to stable
+#p4a.branch = stable
+
+# (str) OUYA Console category. Should be one of GAME or APP
+# If you leave this blank, OUYA support will not be enabled
+#android.ouya.category = GAME
+
+# (str) Filename of OUYA Console icon. It must be a 732x412 png image.
+#android.ouya.icon.filename = %(source.dir)s/data/ouya_icon.png
+
+# (str) XML file to include as an intent filters in <activity> tag
+#android.manifest.intent_filters =
+
+# (list) Android additionnal libraries to copy into libs/armeabi
+#android.add_libs_armeabi = libs/android/*.so
+#android.add_libs_armeabi_v7a = libs/android-v7/*.so
+#android.add_libs_x86 = libs/android-x86/*.so
+#android.add_libs_mips = libs/android-mips/*.so
+
+# (bool) Indicate whether the screen should stay on
+# Don't forget to add the WAKE_LOCK permission if you set this to True
+#android.wakelock = False
+
+# (list) Android application meta-data to set (key=value format)
+#android.meta_data =
+
+# (list) Android library project to add (will be added in the
+# project.properties automatically.)
+#android.library_references =
+
+# (str) Android logcat filters to use
+#android.logcat_filters = *:S python:D
+
+# (bool) Copy library instead of making a libpymodules.so
+#android.copy_libs = 1
+
+# (str) The Android arch to build for, choices: armeabi-v7a, arm64-v8a, x86
+android.arch = armeabi-v7a
+
+#
+# Python for android (p4a) specific
+#
+
+# (str) python-for-android git clone directory (if empty, it will be automatically cloned from github)
+#p4a.source_dir =
+
+# (str) The directory in which python-for-android should look for your own build recipes (if any)
+#p4a.local_recipes =
+
+# (str) Filename to the hook for p4a
+#p4a.hook =
+
+# (str) Bootstrap to use for android builds
+# p4a.bootstrap = sdl2
+
+
+#
+# iOS specific
+#
+
+# (str) Path to a custom kivy-ios folder
+#ios.kivy_ios_dir = ../kivy-ios
+
+# (str) Name of the certificate to use for signing the debug version
+# Get a list of available identities: buildozer ios list_identities
+#ios.codesign.debug = "iPhone Developer: <lastname> <firstname> (<hexstring>)"
+
+# (str) Name of the certificate to use for signing the release version
+#ios.codesign.release = %(ios.codesign.debug)s
+
+
+[buildozer]
+
+# (int) Log level (0 = error only, 1 = info, 2 = debug (with command output))
+log_level = 2
+
+# (int) Display warning if buildozer is run as root (0 = False, 1 = True)
+warn_on_root = 1
+
+# (str) Path to build artifact storage, absolute or relative to spec file
+# build_dir = ./.buildozer
+
+# (str) Path to build output (i.e. .apk, .ipa) storage
+# bin_dir = ./bin
+
+#    -----------------------------------------------------------------------------
+#    List as sections
+#
+#    You can define all the "list" as [section:key].
+#    Each line will be considered as a option to the list.
+#    Let's take [app] / source.exclude_patterns.
+#    Instead of doing:
+#
+#[app]
+#source.exclude_patterns = license,data/audio/*.wav,data/images/original/*
+#
+#    This can be translated into:
+#
+#[app:source.exclude_patterns]
+#license
+#data/audio/*.wav
+#data/images/original/*
+#
+
+
+#    -----------------------------------------------------------------------------
+#    Profiles
+#
+#    You can extend section / key with a profile
+#    For example, you want to deploy a demo version of your application without
+#    HD content. You could first change the title to add "(demo)" in the name
+#    and extend the excluded directories to remove the HD content.
+#
+#[app@demo]
+#title = My Application (demo)
+#
+#[app:source.exclude_patterns@demo]
+#images/hd/*
+#
+#    Then, invoke the command line with the "demo" profile:
+#
+#buildozer --profile demo android debug

src/main.kv

@@ -1,27 +1,167 @@
-<CustomButton@Button>:
+#:import FadeTransition kivy.uix.screenmanager.FadeTransition
-    font_size: 26
-<LoginScreen>:
-    padding: 200
-    spacing: 10
-    rows:2
 
+<Display>:
     BoxLayout:
-        AnchorLayout:
+        orientation: "vertical"
+        BoxLayout: 
+            size_hint: 1, None
+            height: '48dp'
+            Button:
+                text: 'messages'
+                on_release: sm.current = 'screen_one'
+                background_color: (0,0,0,0)
+                color: 0,0,0,1
+            Button:
+                text: 'send'
+                on_release: sm.current = 'screen_two'
+                background_color: (0,0,0,0)
+                color: 0,0,0,1
+            Button:
+                text: 'subscription'
+                on_release: sm.current = 'screen_three'
+                background_color: (0,0,0,0)
+                color: 0,0,0,1
+            Button:
+                text: 'four'
+                on_release: sm.current = 'screen_four'
+                background_color: (0,0,0,0) 
+                color: 0,0,0,1
+
+            Button:
+                text: 'chans'
+                on_release: sm.current = 'screen_five'
+                background_color: (0,0,0,0) 
+                color: 0,0,0,1
+            Button:
+                text: 'blacklist'
+                on_release: sm.current = 'screen_six'
+                background_color: (0,0,0,0) 
+                color: 0,0,0,1
+
+        ScreenManager:
+            id: sm
+            transition: FadeTransition()
+            Screen_One:
+            Screen_Two:
+            Screen_three:
+            Screen_four:
+            Screen_five:
+            Screen_six:
+            EmailScreen:
+
+<Screen_One>:
+    name: 'screen_one'      
+    BoxLayout:
+        padding: 10,10,10,300
+        orientation: "vertical"
+        Button:
+            text: "create"
+            size_hint_y: 0.3
+            size_hint_x: 0.1
+            color: 0,0,0,1
+            background_color: (0,0,0,0)
+        Button:
+            text: "inbox"
+            background_color: (0,0,0,0)
+            size_hint_y: 0.3
+            size_hint_x: 0.1
+            color: 0,0,0,1
+        Button:
+            text: "new"
+            background_color: (0,0,0,0)
+            size_hint_y: 0.3
+            size_hint_x: 0.1
+            color: 0,0,0,1
+            on_press:
+                root.manager.current = 'email'
+        Button:
+            text: "sent"
+            background_color: (0,0,0,0)
+            size_hint_y: 0.3
+            size_hint_x: 0.1
+            color: 0,0,0,1
+
+<Screen_Two>:
+    name: 'screen_two'      
+    Label:
+        text: "Two"
+
+<Screen_three>:
+    name: 'screen_three'      
+    Label:
+        text: "Three"
+
+<Screen_four>:
+    name: 'screen_four'      
+    Label:
+        text: "four"
+
+<Screen_five>:
+    name: 'screen_five'      
+    Label:
+        text: "Two"
+
+<Screen_six>:
+    name: 'screen_six'      
+    Label:
+        text: "Two"
+
+<EmailScreen>:
+    name: 'email'
+    BoxLayout:
+        padding: 100,10,100,100
+        id: login_layout
+        orientation: "vertical"
+        GridLayout:
+            rows: 2
+            orientation: 'vertical'
+            spacing: 10
+            Label:
+                text: 'From: '
+                background_color: (0,0,0,0)
+                color: 0,0,0,1
+                font_size: 18
+                pos_hint: {"x":.15,"y":1}
+                text_size: root.width-20, 20
+
             TextInput:
-                id: user_input
+                multiline:False
-                font_size: 65
+                size_hint: 1,.4
-                hint_text: "enter text"
 
-    BoxLayout:
+        GridLayout:
-        spacing: 10
+            rows: 2
-        Button:
+            orientation: 'vertical'
-            background_color: (1.0, 2.0, 8.0, 1.0)
+            Label:
-            id: sendmessage
+                text: 'To: '
-            text: 'SendMessage'
+                background_color: (0,0,0,0)
-            on_press: root.send()
+                color: 0,0,0,1
+                font_size: 18
+                pos_hint: {"x":.15,"y":.5}
+                text_size: root.width-20, 20
+
+            TextInput:
+                multiline:False
+                size_hint: 1,.4
+                pos_hint: {"x":.2,"y":.5}
+
+        GridLayout:
+            rows: 2
+            orientation: 'vertical'
+            Label:
+                text: 'Message'
+                background_color: (0,0,0,0)
+                color: 0,0,0,1
+                pos_hint: {"x":.15,"y":.5}
+                font_size: 18
+                text_size: root.width-20, 20
+
+            TextInput:
+                id: msg
+                multiline:True
+                size_hint: 1,2
 
         Button:
-            background_color: (1.0, 2.0, 8.0, 1.0)
+            text: "SEND"
-            id: btnExit
+            size_hint_y: 0.1
-            text: "Exit"
+            size_hint_x: 0.2
-            on_press: root.sayexit()
+            pos_hint: {"x":.15,"y":1}

src/mpybit.py

@@ -1,5 +1,7 @@
 import time
 
+from debug import logger
+
 from addresses import addBMIfNotPresent, decodeAddress
 
 from bmconfigparser import BMConfigParser
@@ -23,7 +25,7 @@ class LoginScreen(GridLayout):
     """This will use for sending message to recipents from mobile client."""
 
     def send(self):
-        """This used for sending message with subject and body."""
+        """It is used for sending message with subject and body."""
         queues.apiAddressGeneratorReturnQueue.queue.clear()
         streamNumberForAddress = 1
         label = "CisDevelper"
@@ -36,13 +38,11 @@ class LoginScreen(GridLayout):
             "", eighteenByteRipe, nonceTrialsPerByte,
             payloadLengthExtraBytes
         ))
-        print(BMConfigParser().sections(), "BMConfigParser().sections()")
         fromAddress = queues.apiAddressGeneratorReturnQueue.get()
         toAddress = "BM-2cWyUfBdY2FbgyuCb7abFZ49JYxSzUhNFe"
         message = self.ids.user_input.text
         subject = 'Test'
         encoding = 3
-        print("message: ", self.ids.user_input.text)
         sendMessageToPeople = True
         if sendMessageToPeople:
             if toAddress != '':
@@ -52,11 +52,11 @@ class LoginScreen(GridLayout):
                     toAddress = addBMIfNotPresent(toAddress)
 
                     if addressVersionNumber > 4 or addressVersionNumber <= 1:
-                        print("addressVersionNumber > 4 or addressVersionNumber <= 1")
+                        logger.info("addressVersionNumber > 4 or addressVersionNumber <= 1")
                     if streamNumber > 1 or streamNumber == 0:
-                        print("streamNumber > 1 or streamNumber == 0")
+                        logger.info("streamNumber > 1 or streamNumber == 0")
                     if statusIconColor == 'red':
-                        print("shared.statusIconColor == 'red'")
+                        logger.info("shared.statusIconColor == 'red'")
                     stealthLevel = BMConfigParser().safeGetInt(
                         'bitmessagesettings', 'ackstealthlevel')
                     ackdata = genAckPayload(streamNumber, stealthLevel)
@@ -81,7 +81,7 @@ class LoginScreen(GridLayout):
                     return None
 
     def sayexit(self):
-        """This method will exit the application screen."""
+        """Method will exit the application screen."""
         shutdown.doCleanShutdown()
         Window.close()
 
@@ -89,7 +89,9 @@ class LoginScreen(GridLayout):
 class MainApp(App):
     """The App class is the base for creating Kivy applications
     Think of it as your main entry point into the Kivy run loop."""
+
     def build(self):
-        """To initialize an app with a widget tree, we need to override the build()
+        """To initialize an app with a widget tree, we need to override the build().
-        method in our app class and return the widget tree which we have constructed.."""
+        method in our app class and return the widget tree which we have constructed..
+        """
         return LoginScreen()