diff --git a/buildozer/aversion b/buildozer/aversion new file mode 100755 index 000000000..6e2ad5fa6 --- /dev/null +++ b/buildozer/aversion @@ -0,0 +1,19 @@ +#!/bin/bash + +appdir="" +if [ "$1" ] +then + appdir=$1 +else + exit 1 +fi + +# current android version mumber. +version="2.24.0" +sversion=$(echo $version | sed -E "s:(.*)\..*:\1:") +tuple=$(echo $version | sed -E "s:(.*)\.(.*)\.(.*):(\1, \2, \3):") + +# patch different version info accordingly. +sed -E "s:VERSION_TUPLE =.*:VERSION_TUPLE = $tuple:" -i $appdir/pysollib/settings.py +sed -E "s:(.*\(')dev(',.*):\1fc-$sversion\2:" -i $appdir/pysollib/gamedb.py +echo "VERSION = $version" diff --git a/buildozer/buildozer.init b/buildozer/buildozer.init index 45b3ba0f3..d03620f70 100755 --- a/buildozer/buildozer.init +++ b/buildozer/buildozer.init @@ -34,6 +34,6 @@ cp -a cardsets/* ${tmpdir}/data echo '### eval version' -./version ${tmpdir} > ${tmpdir}/version.txt +./aversion ${tmpdir} > ${tmpdir}/version.txt echo '### end init' diff --git a/buildozer/fdroid.init b/buildozer/fdroid.init index c7efe9ade..419997ada 100755 --- a/buildozer/fdroid.init +++ b/buildozer/fdroid.init @@ -22,12 +22,12 @@ echo '### resize 4k images' echo '### eval version' -./version ${tmpdir} > ${tmpdir}/version.txt +./aversion ${tmpdir} > ${tmpdir}/version.txt echo '### prepare buildozer' sed -r "s:#? ?source\.dir =.*:source.dir = ..:" -i buildozer.spec -sed -r "s:#? ?source\.exclude_dirs =.*:source.exclude_dirs = Screenshots,android,buildozer,tests:" -i buildozer.spec +sed -r "s:#? ?source\.exclude_dirs =.*:source.exclude_dirs = Screenshots,android,buildozer,tests,fastlane:" -i buildozer.spec sed -r "s:#? ?source\.exclude_patterns =.*:source.exclude_patterns = README.*,AUTHORS.md,CONTRIBUTING.md,COPYING,MANIFEST.in,Makefile,NEWS.asciidoc,appdata.xml,pysol.py,run-tests.pl,setup.cfg,setup.py,setup_osx.py,local.properties,p4a_env_vars.txt:" -i buildozer.spec sed -r "s:#? ?android\.skip_update =.*:android.skip_update = True:" -i buildozer.spec sed -r "s:#? ?android\.accept_sdk_license =.*:android.accept_sdk_license = False:" -i buildozer.spec diff --git a/buildozer/minimal.txt b/buildozer/minimal.txt index 2a78e394a..9adc38b0d 100644 --- a/buildozer/minimal.txt +++ b/buildozer/minimal.txt @@ -26,6 +26,7 @@ cardset-neo-hex cardset-neo-tarock cardset-next-matrix cardset-oxymoron +cardset-simple-ishido cardset-standard cardset-tuxedo cardset-uni-mahjongg diff --git a/buildozer/pubspec.json b/buildozer/pubspec.json index c660e60c6..dbb775b73 100644 --- a/buildozer/pubspec.json +++ b/buildozer/pubspec.json @@ -11,10 +11,10 @@ "type": "SINGLE", "filters": [], "attributes": [], - "versionCode": 102122100, - "versionName": "2.21.0", + "versionCode": 102122400, + "versionName": "2.24.0", "outputFile": "pysolfc-release.apk" } ], "elementType": "File" -} \ No newline at end of file +} diff --git a/fastlane/metadata/android/en-US/changelogs/102122400.txt b/fastlane/metadata/android/en-US/changelogs/102122400.txt new file mode 100644 index 000000000..6fc4cbe96 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/102122400.txt @@ -0,0 +1,24 @@ +Android specific: +- Temporary screen orientation lock added. When the app starts (or + restarts) the screen will rotate according to the device orientation. + While playing a game screen rotation is locked with the first + card selection. Screen rotation lock can be disabled by a double click to + the free game area. +- Toolbar: general toolbar show/hide for inividual buttons added to the + options menu. +- Toolbar: dynamic updates on Toolbar and Options settings. +- Toolbar: To prevent occasional restarts or redeals due to 'fat fingers' + a toast has been added to buttons for 'new deal' and 'restart'. To + accept the command tap onto it. +- Implementation of full picture preview for the new puzzle type games. +- Background images from the save-aspect folder now are preserving + correct aspect ratio (bug fix). +- Mahjongg tile overlapping (3d simulation) is now implemented. +- Animation of card moves reworked. This fixes some stacking order corruptions + reported earlier. +- Display of html-text (game rules, licence etc): Black windows fixed. +- Upstream libraries updated to kivy v2.2.1 and python v3.10 +Main version: +- many new games. +- consult NEWS.asscidoc or html-src/news.html on the github repo for more + change informations.