diff --git a/.gitignore b/.gitignore index 0aa3360..88b2032 100644 --- a/.gitignore +++ b/.gitignore @@ -33,7 +33,6 @@ MANIFEST # Usually these files are written by a python script from a template # before PyInstaller builds the exe, so as to inject date/other infos into it. *.manifest -*.spec # Installer logs pip-log.txt diff --git a/buildozer.spec b/buildozer.spec new file mode 100644 index 0000000..6f08704 --- /dev/null +++ b/buildozer.spec @@ -0,0 +1,329 @@ +[app] + +# (str) Title of your application +title = HuaFetcher + +# (str) Package name +package.name = huafetcher + +# (str) Package domain (needed for android/ios packaging) +package.domain = cz.linux + +# (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.5 + +# (str) Application versioning (method 2) +# version.regex = __version__ = ['"](.*)['"] +# version.filename = %(source.dir)s/main.py + +# (list) Application requirements +# comma separated e.g. requirements = sqlite3,kivy +requirements = python3,kivy,requests,urllib3,chardet,idna + +# (str) Custom source folders for requirements +# Sets custom source for any requirements with recipes +# requirements.source.kivy = ../../kivy + +# (list) Garden requirements +#garden_requirements = + +# (str) Presplash of the application +presplash.filename = %(source.dir)s/data/icon.png + +# (str) Icon of the application +icon.filename = %(source.dir)s/data/icon.png + +# (str) Supported orientation (one of landscape, sensorLandscape, 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 = 3 + +# 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,WRITE_EXTERNAL_STORAGE,READ_EXTERNAL_STORAGE + +# (int) Target Android API, should be as high as possible. +#android.api = 27 + +# (int) Minimum API your APK will support. +#android.minapi = 21 + +# (int) Android SDK version to use +#android.sdk = 20 + +# (str) Android NDK version to use +#android.ndk = 19b + +# (int) Android NDK API to use. This is the minimum API your app will support, it should usually match android.minapi. +#android.ndk_api = 21 + +# (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 =~/android_ndk + +# (str) Android SDK directory (if empty, it will be automatically downloaded.) +android.sdk_path = ~/android_sdk + +# (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 + +# (bool) If True, then automatically accept SDK license +# agreements. This is intended for automation only. If set to False, +# the default, you will be shown the license when first running +# buildozer. +android.accept_sdk_license = True + +# (str) Android entry point, default is ok for Kivy-based app +#android.entrypoint = org.renpy.android.PythonActivity + +# (str) Android app theme, default is ok for Kivy-based app +# android.apptheme = "@android:style/Theme.NoTitleBar" + +# (list) Pattern to whitelist for the whole project +#android.whitelist = + +# (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 = + +# (list) add java compile options +# this can for example be necessary when importing certain java libraries using the 'android.gradle_dependencies' option +# see https://developer.android.com/studio/write/java8-support for further information +# android.add_compile_options = "sourceCompatibility = 1.8", "targetCompatibility = 1.8" + +# (list) Gradle repositories to add {can be necessary for some android.gradle_dependencies} +# please enclose in double quotes +# e.g. android.gradle_repositories = "maven { url 'https://kotlin.bintray.com/ktor' }" +#android.add_gradle_repositories = + +# (list) packaging options to add +# see https://google.github.io/android-gradle-dsl/current/com.android.build.gradle.internal.dsl.PackagingOptions.html +# can be necessary to solve conflicts in gradle_dependencies +# please enclose in double quotes +# e.g. android.add_packaging_options = "exclude 'META-INF/common.kotlin_module'", "exclude 'META-INF/*.kotlin_module'" +#android.add_gradle_repositories = + +# (list) Java classes to add as activities to the manifest. +#android.add_activities = com.example.ExampleActivity + +# (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 tag +#android.manifest.intent_filters = + +# (str) launchMode to set for the main activity +#android.manifest.launch_mode = standard + +# (list) Android additional 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_arm64_v8a = libs/android-v8/*.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 = + +# (list) Android shared libraries which will be added to AndroidManifest.xml using tag +#android.uses_library = + +# (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, x86_64 +android.arch = armeabi-v7a + +# (int) overrides automatic versionCode computation (used in build.gradle) +# this is not the same as app version and should only be edited if you know what you're doing +# android.numeric_version = 1 + +# +# Python for android (p4a) specific +# + +# (str) python-for-android fork to use, defaults to upstream (kivy) +#p4a.fork = kivy + +# (str) python-for-android branch to use, defaults to master +#p4a.branch = master + +# (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 + +# (int) port number to specify an explicit --port= p4a argument (eg for bootstrap flask) +#p4a.port = + + +# +# iOS specific +# + +# (str) Path to a custom kivy-ios folder +#ios.kivy_ios_dir = ../kivy-ios +# Alternately, specify the URL and branch of a git checkout: +ios.kivy_ios_url = https://github.com/kivy/kivy-ios +ios.kivy_ios_branch = master + +# Another platform dependency: ios-deploy +# Uncomment to use a custom checkout +#ios.ios_deploy_dir = ../ios_deploy +# Or specify URL and branch +ios.ios_deploy_url = https://github.com/phonegap/ios-deploy +ios.ios_deploy_branch = 1.7.0 + +# (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: ()" + +# (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 diff --git a/huami_token.py b/huami_token.py index 7ccaf8d..5675235 100644 --- a/huami_token.py +++ b/huami_token.py @@ -81,6 +81,8 @@ class HuamiAmazfit: self.access_token = redirect_url_parameters['access'] self.country_code = redirect_url_parameters['country_code'] + return True + def login(self, external_token=None): print("Logging in...") diff --git a/main.py b/main.py index fc011ef..cb39cc1 100644 --- a/main.py +++ b/main.py @@ -15,7 +15,7 @@ from kivy.core.clipboard import Clipboard from kivy.storage.jsonstore import JsonStore DEBUG=False -DEBUG=True +#DEBUG=True def debug_print(*xargs): if DEBUG: @@ -91,7 +91,7 @@ class Main(App): buttons_layout = BoxLayout(orientation="horizontal", spacing=SPACING) rows_layout = BoxLayout(orientation="vertical", spacing=SPACING) - self.instructions_label=MyLeftLabel(text='Huafetcher') + self.instructions_label=MyLeftLabel(text='Huafetcher', halign="left") rows_layout.add_widget(self.instructions_label) dropdown = DropDown() @@ -256,34 +256,50 @@ class Main(App): def on_press_button_gettoken(self, instance): debug_print('You pressed the button login!') debug_print(self.huamidevice) - self.instructions_label.text="log in and paste url here" if self.huamidevice.method == 'xiaomi': + self.instructions_label.text="log in and paste url here" login_url = urls.URLS["login_xiaomi"] - if ( platform != 'android' ): - import webbrowser - webbrowser.open(login_url, new = 2) - else: - from jnius import autoclass - from jnius import cast + if ( platform != 'android' ): + import webbrowser + webbrowser.open(login_url, new = 2) + else: + from jnius import autoclass + from jnius import cast - PythonActivity = autoclass('org.kivy.android.PythonActivity') - Intent = autoclass('android.content.Intent') - Uri = autoclass('android.net.Uri') - intent = Intent() - intent.setAction(Intent.ACTION_VIEW) - intent.setData(Uri.parse(login_url)) - currentActivity = cast('android.app.Activity', PythonActivity.mActivity) - currentActivity.startActivity(intent) + PythonActivity = autoclass('org.kivy.android.PythonActivity') + Intent = autoclass('android.content.Intent') + Uri = autoclass('android.net.Uri') + intent = Intent() + intent.setAction(Intent.ACTION_VIEW) + intent.setData(Uri.parse(login_url)) + currentActivity = cast('android.app.Activity', PythonActivity.mActivity) + currentActivity.startActivity(intent) - self.huamidevice.get_access_token() + try: + res=self.huamidevice.get_access_token() + if res: + if self.huamidevice.user_id is not None: + self.instructions_label.text="Signed in as: {}, getting data".format(self.huamidevice.user_id) + else: + self.instructions_label.text="You must sign in first" + + except Exception as e: + debug_print(e) + self.instructions_label.text=f"{e}" def on_press_button_fetch_key(self, instance): debug_print('You pressed the button fetch!') debug_print(self.huamidevice) self.instructions_label.text="signing in" - if (self.huamidevice.login()): - self.instructions_label.text="Signed in as: {}, getting data".format(self.huamidevice.user_id) + try: + res=self.huamidevice.login() + if res: + self.instructions_label.text="Signed in as: {}, getting data".format(self.huamidevice.user_id) + except Exception as e: + debug_print(e) + self.instructions_label.text=f"{e}" + return device_keys = self.huamidevice.get_wearable_auth_keys() @@ -326,8 +342,14 @@ class Main(App): debug_print('You pressed the button agps!') debug_print(self.huamidevice) self.instructions_label.text="signing in" - if (self.huamidevice.login()): - self.instructions_label.text="Signed in as: {}, getting data".format(self.huamidevice.user_id) + try: + res=self.huamidevice.login() + if res: + self.instructions_label.text="Signed in as: {}, getting data".format(self.huamidevice.user_id) + except Exception as e: + debug_print(e) + self.instructions_label.text=f"{e}" + return self.huamidevice.get_gps_data() agps_file_names = ["cep_alm_pak.zip"] diff --git a/release.sh b/release.sh index 8c72528..a2feb9d 100755 --- a/release.sh +++ b/release.sh @@ -1,15 +1,6 @@ #!/bin/bash -# save current branch into variable to be able to return to it later -currentBranch=$(git symbolic-ref --short HEAD) -git stash -git checkout master -git pull -git rebase origin/develop - commitCount=$(git rev-list HEAD --count) git tag -a "$commitCount" HEAD -m "Android Release $commitCount" git push origin master:master --tags -git checkout "$currentBranch" -git stash apply