From 573268fbf5151428a62d74998713c3e1633a8cc8 Mon Sep 17 00:00:00 2001 From: Juraj Bednar Date: Sun, 31 Dec 2023 20:33:58 +0100 Subject: [PATCH 1/2] fix macos parameter order --- sbapp/Makefile | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/sbapp/Makefile b/sbapp/Makefile index 025cd60..39a471b 100644 --- a/sbapp/Makefile +++ b/sbapp/Makefile @@ -4,15 +4,15 @@ prepare: activate cleanrns getrns clean: @echo Cleaning... - -(rm ./__pycache__ -r) - -(rm ./app_storage -r) - -(rm ./share/pkg/* -r) - -(rm ./share/mirrors/* -r) - -(rm ./bin -r) + -(rm -r ./__pycache__) + -(rm -r ./app_storage) + -(rm -r ./share/pkg/*) + -(rm -r ./share/mirrors/*) + -(rm -r ./bin) cleanlibs: buildozer android clean - + cleanall: clean cleanlibs activate: @@ -40,7 +40,7 @@ injectxml: cp patches/file_paths.xml .buildozer/android/platform/build-arm64-v8a_armeabi-v7a/dists/sideband/src/main/res/xml/ cp patches/AndroidManifest.tmpl.xml .buildozer/android/platform/build-arm64-v8a_armeabi-v7a/dists/sideband/templates/ cp patches/p4a_build.py .buildozer/android/platform/build-arm64-v8a_armeabi-v7a/dists/sideband/build.py - + debug: buildozer android debug @@ -57,7 +57,7 @@ endif fetchshare: rm ./share/pkg/* - rm ./share/mirrors/* -r + rm -r ./share/mirrors/* cp ../../dist_archive/rns-*-py3-none-any.whl ./share/pkg/ cp ../../dist_archive/rnspure-*-py3-none-any.whl ./share/pkg/ cp ../../dist_archive/lxmf-*-py3-none-any.whl ./share/pkg/ @@ -89,11 +89,13 @@ console: (adb logcat | grep "python\|sidebandservice") getrns: - (cp -rv ../../Reticulum/RNS ./;rm ./RNS/Utilities/RNS) - -(rm ./RNS/__pycache__ -r) - (cp -rv ../../LXMF/LXMF ./;rm ./LXMF/Utilities/LXMF) - -(rm ./LXMF/__pycache__ -r) + cp -rv ../../Reticulum/RNS ./ + -(rm -r ./RNS/Utilities/RNS) + -(rm -r ./RNS/__pycache__) + cp -rv ../../LXMF/LXMF ./ + -(rm -r ./LXMF/Utilities/LXMF) + -(rm -r ./LXMF/__pycache__) cleanrns: - -(rm ./RNS -r) - -(rm ./LXMF -r) + -(rm -r ./RNS) + -(rm -r ./LXMF) From 7229c4be2ca20ce8c8fcecee94f9644a71496f47 Mon Sep 17 00:00:00 2001 From: Juraj Bednar Date: Sun, 31 Dec 2023 21:50:28 +0100 Subject: [PATCH 2/2] Fix for predictive text Kivy's default for input boxes changed from "text" to "null" in Kivy 2.1.0. Not specifying it disallowed typing using predictive text keyboards such as Gboard or Swiftkey swiping, which was irritating, when you are typing text messages. --- sbapp/ui/messages.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sbapp/ui/messages.py b/sbapp/ui/messages.py index 1cbfd56..026432d 100644 --- a/sbapp/ui/messages.py +++ b/sbapp/ui/messages.py @@ -711,6 +711,7 @@ def close_send_error_dialog(self, sender=None): MDTextField: id: message_text keyboard_suggestions: True + input_type: "text" multiline: True hint_text: "Write message" mode: "rectangle" @@ -767,4 +768,4 @@ def close_send_error_dialog(self, sender=None): IconLeftWidget: icon: root.icon -""") \ No newline at end of file +""")