Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix macos parameter order #37

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

fix macos parameter order #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
573268f
fix macos parameter order
jooray Dec 31, 2023
7229c4b
Fix for predictive text
jooray Dec 31, 2023
8b444ae
Merge pull request #1 from jooray/jooray-patch-1
jooray Dec 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 16 additions & 14 deletions sbapp/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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

Expand All @@ -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/
Expand Down Expand Up @@ -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)
3 changes: 2 additions & 1 deletion sbapp/ui/messages.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -767,4 +768,4 @@ def close_send_error_dialog(self, sender=None):
<CustomOneLineIconListItem>
IconLeftWidget:
icon: root.icon
""")
""")