From 53a26d20c1fc3cbd815ac1b7754a365591c647b9 Mon Sep 17 00:00:00 2001
From: akshayaurora <akshayaurora@gmail.com>
Date: Wed, 26 Sep 2018 01:17:59 +0530
Subject: [PATCH] fixes for android

---
 buildozer.spec                            | 10 +++++-----
 eventsapp/main.py                         |  6 ++++--
 eventsapp/uix/screens/navigationscreen.py | 11 +++++------
 eventsapp/uix/screens/screenregister.py   |  4 +++-
 4 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/buildozer.spec b/buildozer.spec
index e6834b3..ba6722c 100644
--- a/buildozer.spec
+++ b/buildozer.spec
@@ -36,7 +36,7 @@ version = 0.1
 
 # (list) Application requirements
 # comma seperated e.g. requirements = sqlite3,kivy
-requirements = kivy, openssl, requests, pil, futures, sentry==0.3.0
+requirements = android, kivy, openssl, requests, pil, futures, sentry-sdk==0.3.0, urllib3, certifi
 
 # (str) Custom source folders for requirements
 # Sets custom source for any requirements with recipes
@@ -46,7 +46,7 @@ requirements = kivy, openssl, requests, pil, futures, sentry==0.3.0
 #garden_requirements =
 
 # (str) Presplash of the application
-presplash.filename = %(source.dir)s/../tools/splash.png
+presplash.filename = %(source.dir)s/../tools/splash.jpg
 
 # (str) Icon of the application
 icon.filename = %(source.dir)s/data/icon.png
@@ -85,7 +85,7 @@ fullscreen = 0
 #android.presplash_color = #FFFFFF
 
 # (list) Permissions
-android.permissions = INTERNET, READ_EXTERNAL_STORAGE, WRITE_EXTERNAL_STORAGE
+android.permissions = INTERNET, READ_EXTERNAL_STORAGE, WRITE_EXTERNAL_STORAGE, CAMERA
 
 # (int) Android API to use
 #android.api = 19
@@ -144,11 +144,11 @@ android.permissions = INTERNET, READ_EXTERNAL_STORAGE, WRITE_EXTERNAL_STORAGE
 
 # (list) Gradle dependencies to add (currently works only with sdl2_gradle
 # bootstrap)
-android.add_src = electrum/gui/kivy/data/java-classes/
+android.add_src = eventsapp/data/java-classes/
 
 android.gradle_dependencies = me.dm7.barcodescanner:zxing:1.9.8
 
-android.add_activities = org.python.qr.SimpleScannerActivity
+android.add_activities = org.pythonindia.qr.SimpleScannerActivity
 
 # (list) Java classes to add as activities to the manifest.
 #android.add_activites = com.example.ExampleActivity
diff --git a/eventsapp/main.py b/eventsapp/main.py
index 60bf2b1..45a92ca 100644
--- a/eventsapp/main.py
+++ b/eventsapp/main.py
@@ -7,8 +7,10 @@
 __version__ = '0.0.2'
 
 # setup error reporting
-# import sentry_sdk
-# sentry_sdk.init("https://0002ee03a88d419a886333ab69f01df5@sentry.io/1284618")
+import sentry_sdk
+sentry_sdk.init(
+    "https://0002ee03a88d419a886333ab69f01df5@sentry.io/1284618",
+    debug=True)
 # That's all for error reporting
 
 import os
diff --git a/eventsapp/uix/screens/navigationscreen.py b/eventsapp/uix/screens/navigationscreen.py
index 7bdc4e8..d3c651a 100644
--- a/eventsapp/uix/screens/navigationscreen.py
+++ b/eventsapp/uix/screens/navigationscreen.py
@@ -40,12 +40,6 @@ class NavigationScreen(Screen):
         size_hint: 1, None
         height: dp(130)
         mipmap: True
-        on_touch_up:
-            if self.collide_point(*args[1].opos) and\
-            self.collide_point(*args[1].pos) and\
-            args[1].is_triple_tap: load_screen(\
-            'ScreenRegister', manager=app.navigation_manager);\
-            app.navigationdrawer.toggle_state()
     ScrollView
         GridLayout
             cols: 1
@@ -87,6 +81,11 @@ class NavigationScreen(Screen):
                 on_released:
                     load_screen(\
                     'ScreenCommunity', manager=app.navigation_manager)
+            MenuButton
+                text: 'Registeration'
+                on_released:
+                    load_screen(\
+                    'ScreenRegister', manager=app.navigation_manager)
             MenuButton
                 text: 'About'
                 on_released:
diff --git a/eventsapp/uix/screens/screenregister.py b/eventsapp/uix/screens/screenregister.py
index ffd6ce1..bc248de 100644
--- a/eventsapp/uix/screens/screenregister.py
+++ b/eventsapp/uix/screens/screenregister.py
@@ -61,6 +61,7 @@ class ScreenRegister(Factory.Screen):
                 ActiveButton:
                     height: dp(30)
                     text: 'Change...'
+                    width: dp(100)
                     size_hint_x: None
                     pos_hint: {'center_y': .5}
                     on_release: root.show_file_chooser()
@@ -105,6 +106,7 @@ class ScreenRegister(Factory.Screen):
                 height: dp(30)
                 text: "Check..."
                 size_hint_x: None
+                width: dp(100)
                 pos_hint: {'center_y': .5}
                 on_release: root.check_attendee(ti.text)
         BackLabel
@@ -115,7 +117,7 @@ class ScreenRegister(Factory.Screen):
                 padding: dp(9)
                 size_hint: 1, None
                 height: self.minimum_height
-                spacing: dp(9)
+                spacing: dp(13)
                 cols: 1
                 BackLabel
                     id: lbl_name