remove the kivy gui

.cirrus.yml

@@ -180,34 +180,6 @@ task:
   depends_on:
     - Tox Python 3.8
 
-task:
-  name: Android build (Kivy $APK_ARCH)
-  container:
-    dockerfile: contrib/android/Dockerfile
-    cpu: 2
-    memory: 2G
-  env:
-    APK_ARCH: arm64-v8a
-  packages_tld_folder_cache:
-    folder: packages
-    fingerprint_script:
-      - echo $CIRRUS_TASK_NAME && cat contrib/deterministic-build/requirements.txt && cat contrib/make_packages.sh
-      - git ls-files -s contrib/android/
-  p4a_cache:
-    folders:
-      - ".buildozer/android/platform/build-$APK_ARCH/packages"
-      - ".buildozer/android/platform/build-$APK_ARCH/build"
-    fingerprint_script:
-      # note: should *at least* depend on Dockerfile and p4a_recipes/, but contrib/android/ is simplest
-      - git ls-files -s contrib/android/
-      - echo "kivy $APK_ARCH"
-  build_script:
-    - ./contrib/android/make_apk.sh kivy "$APK_ARCH" debug
-  binaries_artifacts:
-    path: "dist/*"
-  depends_on:
-    - Tox Python 3.8
-
 task:
   name: Android build (QML $APK_ARCH)
   container:

.gitmodules

@@ -4,6 +4,3 @@
 [submodule "electrum/www"]
 	path = electrum/plugins/payserver/www
 	url = https://github.com/spesmilo/electrum-http.git
-[submodule "electrum/gui/kivy/theming/atlas"]
-	path = electrum/gui/kivy/theming/atlas
-	url = https://github.com/spesmilo/electrum-kivy-atlas

contrib/android/Makefile

@@ -19,13 +19,9 @@ export PYTHONHASHSEED     := $(SOURCE_DATE_EPOCH)
 export BUILD_DATE         := $(shell LC_ALL=C TZ=UTC date +'%b %e %Y' -d @$(SOURCE_DATE_EPOCH))
 export BUILD_TIME         := $(shell LC_ALL=C TZ=UTC date +'%H:%M:%S' -d @$(SOURCE_DATE_EPOCH))
 
-# needs kivy installed or in PYTHONPATH
 
-.PHONY: theming apk clean
+.PHONY: apk clean
 
-theming:
-	#bash -c 'for i in network lightning; do convert -background none theming/light/$i.{svg,png}; done'
-	$(PYTHON) -m kivy.atlas ../../electrum/gui/kivy/theming/atlas/light 1024 ../../electrum/gui/kivy/theming/light/*.png
 prepare:
 	# running pre build setup
 	# copy electrum to main.py

contrib/android/Readme.md

@@ -107,12 +107,6 @@ sudo apt-get install qtvirtualkeyboard-plugin
 
 Run electrum with the `-g` switch: `electrum -g qml`
 
-### The Kivy GUI can be run directly on Linux Desktop. How?
-Install Kivy.
-
-Build atlas: `(cd contrib/android/; make theming)`
-
-Run electrum with the `-g` switch: `electrum -g kivy`
 
 ### debug vs release build
 If you just follow the instructions above, you will build the apk

contrib/android/build.sh

@@ -17,12 +17,12 @@ BUILD_UID=$(/usr/bin/stat -c %u "$PROJECT_ROOT")
 
 # check arguments
 if [[ -n "$3" \
-	  && ( "$1" == "kivy" || "$1" == "qml" ) \
+	  && ( "$1" == "qml" ) \
 	  && ( "$2" == "all"  || "$2" == "armeabi-v7a" || "$2" == "arm64-v8a" || "$2" == "x86" || "$2" == "x86_64" ) \
 	  && ( "$3" == "debug"  || "$3" == "release" || "$3" == "release-unsigned" ) ]] ; then
     info "arguments $*"
 else
-    fail "usage: build.sh <kivy|qml> <arm64-v8a|armeabi-v7a|x86|x86_64|all> <debug|release|release-unsigned>"
+    fail "usage: build.sh <qml|...> <arm64-v8a|armeabi-v7a|x86|x86_64|all> <debug|release|release-unsigned>"
     exit 1
 fi
 

contrib/android/buildozer_qml.spec

@@ -61,7 +61,6 @@ requirements =
     libzbar
 
 # (str) Presplash of the application
-#presplash.filename = %(source.dir)s/gui/kivy/theming/splash.png
 presplash.filename = %(source.dir)s/electrum/gui/icons/electrum_presplash.png
 
 # (str) Icon of the application