diff --git a/README.android b/README.android index 66411e03..3ef3913e 100644 --- a/README.android +++ b/README.android @@ -1,12 +1,10 @@ -Prerequisites (needs root): +Build Prerequisites (needs root): +--------------------------------- - IMPORTANT: - Scripts and instruction in directory 'android' are OUTDATED and - not maintained any more. Instead refer to directory 'buildozer'. - - You need a linux workstation (either native or virtual). No graphic - desktop is needed, cmdline only is sufficient. + You need a linux workstation (either native or virtual). It needs + x86 hardware (either intel or amd). No graphic desktop is needed, + cmdline only is sufficient. On freshly installed systems you will need to add about the following packages: @@ -37,7 +35,7 @@ Prerequisites (needs root): - dev-vcs/git - dev-java/ant - For further instructions consult buildozer/build-instruction.txt. + For detailed instructions consult buildozer/build-instruction.txt. NOTES: 1) This information is supplied to give you a hint, when running into @@ -46,44 +44,27 @@ Prerequisites (needs root): 6 GB of free disk space. Cardsets: +--------- The Apk includes a minimal set of cards for playing. - On Android 9 and lower you can also add additional cardsets: +Additional user supplied data: +------------------------------ - Additional cardsets can be installed in ${HOME}/.PySolFC/cardsets/. - On an android device this is equivalent to /sdcard/.PySolFC/cardsets/. - Cardsets must use the 'png' image format. Use scripts/cardconv - (on a linux system) to convert them, before copying them to the device. + NOTE: + To be able to add additional resources to your app, you need to + enable storage access in the android settings for the app. Go to + Settings/Apps/PySolFC/Permissions. - IMPORTANT: This can only be supported for Android Version 9 and lower. - Android as of Version 10 and later restricts access to so called - 'external-storage' drasitcally. There is currently no way around it - with the given application. + Resources are stored in ~/.PySolFC/. On an android device this is + equivalent to /sdcard/.PySolFC/. -LB230301. - - Allow external storage access for Android 10 and later. - - - on Android 10 it ist still possible to write to the extenal storage. A - user has to manually allow at least access to media files in the - settings for the app. - - For later Versions the MANAGE_EXTERNAL_STORAGE permission was added - to the Android Manifest. If the Android 12 user wants to store - and read Files from /sdcard/.PySolFC directory he/she can enable - 'Allow management of all Files' in the settings. - NOTE: - This is actually against the policies of Google and such an app - would fairliy get published on Play Store - but its the simplest - way to get this working again. Only users that need this (e.g. because - they want to install additional Cardsets) need to do that. The app will - never query you for that. You may do it on your own. - -LB230327. - - Scheduled for the next Android release: - - Screen rotation lock. - - Toolbar actualised - - Protection from accidental reset or redeal. - -LB230919. + Additional cardsets can be installed in ~/.PySolFC/cardsets/. + Important: Cardsets must use the 'png' image format. Use + scripts/cardconv (on a gnu/linux system) to convert, before copying + them to the device. + + Byond cardsets you may also wish to add your own backgrounds. You can + add them to ~/.PySolFC/data/tiles (patterns) and to + ~/.PySolFC/data/tiles/save-aspect/ (images). 'png' and 'jpg' image + formats are supported. diff --git a/README.kivy b/README.kivy index 21bf402f..99248ad1 100644 --- a/README.kivy +++ b/README.kivy @@ -2,7 +2,7 @@ Introduction ------------ -This is a version of the PySol FC open source project +This is a version of the PySolFC open source project (http://pysolfc.sourceforge.net) Early investigations of the code showed, that it would not be @@ -25,24 +25,18 @@ Images The original images supplied by the collection are of type gif. In kivy, that image type loads very slowly. Moreover, many cards cannot be loaded, because of decoding errors. -To prevent these problems, the kivy version was -modified to not read any gif images. +To prevent these problems, the kivy version was modified to not read +any gif images. -Some cardsets have been translated to PNG, a format -that is processed by both the tk and the kivy versions. +For all GIF images in the directories data/images and data/tiles, +corresponding images in the PNG format have been added. -Some others, for which transparency information is not -processed correctly even from the PBF images, have been translated -to the BMP image format (while keeping their GIF variant for -the tk version). BMP format is only processed by the -kivy version. +To convert the cardsets to png format, a shell script, 'cardconv' , has been +added to the scripts directory. It requires Bash and ImageMagick +to be installed. -Additional cardsets are available from the SourceForge -project. To use them with kivy, they need to be converted to -the BMP format. A shell script, 'cardconv' , has been added -to the scripts directory (it requires Bash and ImageMagick). +Additional cardsets are available from the SourceForge project. To use +them with kivy, make sure they to also convert them to the png format if +needed. -For all GIF images in the directories data/images and data/tiles , -corresponding images in the PNG format have been added too. - -LB170321. +LB230126. diff --git a/buildozer/build-instructions.txt b/buildozer/build-instructions.txt index 03636f7a..207cfbf4 100644 --- a/buildozer/build-instructions.txt +++ b/buildozer/build-instructions.txt @@ -13,6 +13,8 @@ and through pip. Prepare ------- +Move to directory buildozer. + First create and enter a virtualenv and load all required python modules using pip install. diff --git a/fastlane/metadata/android/de/full_description.txt b/fastlane/metadata/android/de/full_description.txt index ba20eff9..97384369 100644 --- a/fastlane/metadata/android/de/full_description.txt +++ b/fastlane/metadata/android/de/full_description.txt @@ -5,7 +5,7 @@ Mahjongg, shishensho, memories und andere. Das Originalprojekt läuft unter Linux, Windows und MacOS und wurde ursprünglich auf Sourceforge publiziert. https://pysolfc.sourceforge.io/. -Das ursprüngliche Projekt war in weiser Voraussicht so konzipiert, dass -es unterschiedliche Grafik Systeme unterstützen in der Lage war. Auf diesem +Das Projekt war in weiser Voraussicht so konzipiert, dass +es unterschiedliche Grafik Systeme zu unterstützen in der Lage war. Auf diesem Ansatz wurde eine neue Grafikoberfläche mit dem Kivy Framework realisiert, welches auch auf Android lauffähig ist. diff --git a/fastlane/metadata/android/en-US/changelogs/102122100.txt b/fastlane/metadata/android/en-US/changelogs/102122100.txt index a9c36c12..6fc4cbe9 100644 --- a/fastlane/metadata/android/en-US/changelogs/102122100.txt +++ b/fastlane/metadata/android/en-US/changelogs/102122100.txt @@ -1,19 +1,24 @@ Android specific: -- Temporary screen orientation lock added. While playing a game screen - rotation is locked with the first card move, unlocked when selecting - menu or pause. -- Toolbar: configuration of displayed toolbar buttons added to the options - menu. +- 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 buttons for 'new deal' and 'restart' now display a - toast. Tap to it to accept. -- Implementation of full picture hint for the new puzzle type games. +- 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) implemented -- Animation synchronised (so as the tk version does)- This prevents - some stacking order corruptions reported earlier. -- libraries updated to kivy v2.2.1 and python v3.10 +- 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: -- consult NEWS.asscidoc or html-src/news.html on - github for more change informations. +- many new games. +- consult NEWS.asscidoc or html-src/news.html on the github repo for more + change informations. diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/1.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/1.png index 0978e3b5..96a1a76f 100644 Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/1.png and b/fastlane/metadata/android/en-US/images/phoneScreenshots/1.png differ diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/2.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/2.png index 7bbda86f..b331e90e 100644 Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/2.png and b/fastlane/metadata/android/en-US/images/phoneScreenshots/2.png differ diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/3.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/3.png new file mode 100644 index 00000000..e3bbb7e2 Binary files /dev/null and b/fastlane/metadata/android/en-US/images/phoneScreenshots/3.png differ diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/4.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/4.png new file mode 100644 index 00000000..2f986225 Binary files /dev/null and b/fastlane/metadata/android/en-US/images/phoneScreenshots/4.png differ diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/5.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/5.png new file mode 100644 index 00000000..c260d869 Binary files /dev/null and b/fastlane/metadata/android/en-US/images/phoneScreenshots/5.png differ diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/6.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/6.png new file mode 100644 index 00000000..d8722b87 Binary files /dev/null and b/fastlane/metadata/android/en-US/images/phoneScreenshots/6.png differ diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/7.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/7.png new file mode 100644 index 00000000..acea9dcc Binary files /dev/null and b/fastlane/metadata/android/en-US/images/phoneScreenshots/7.png differ