Android/Kivy:

- metadata updates
- some cleanup

buildozer/mkcards

@@ -1,39 +1,9 @@
 #!/bin/bash
 #set -eux
 
-#loadmode="forge"
-loadmode=" "
-
 rm -rf cardsets
 
-if [ "$loadmode" == "forge" ]; then
-	cardsets_dir=PySolFC-Cardsets--Minimal-2.2.0
-	cardsets_file=${cardsets_dir}.tar.xz
-
-	echo '### prepare cardsets'
-
-	if [ ! -f ${cardsets_file} ]; then
-  	echo '### downloading cardsets'
-  	wget https://netix.dl.sourceforge.net/project/pysolfc/PySolFC-Cardsets/minimal/${cardsets_file}
-	fi
-
-	if [ ! -d ${cardsets_dir} ]; then
-  	echo '### extracting cardsets'
-  	tar -xf ${cardsets_file}
-	fi
-
-	echo '### processing cardsets'
-	(
-  	cd ${cardsets_dir}
-	  ../../scripts/cardconv gif png
-  	for i in cardset-*-png; do
-    	rm -rf `basename $i -png`
-  	done
-	)
-
-	ln -s ${cardsets_dir} cardsets
-
-else
+if [ 1 ]; then
 	cardsets_dir=PySolFC-Cardsets
 
 	if [ ! -d ${cardsets_dir} ]; then

fastlane/metadata/android/de/full_description.txt

@@ -1,11 +1,12 @@
 PySolFC ist eine Kollektion von Solitair Spielen.
 
-Das Projekt bietet über mehr als 1000 unterschiedliche Spiele wie Patiencen,
-Mahjongg, shishensho, memories und andere. Das Originalprojekt läuft unter
-Linux, Windows und MacOS und wurde ursprünglich auf Sourceforge publiziert.
-<a href="https://pysolfc.sourceforge.io/">https://pysolfc.sourceforge.io/</a>.
+PySolFC ist eine Desktop-Anwendung, die unter Linux, Windows und Mac läuft. Sie
+bietet mehr als 1000 Solitärspiele wie Patiencen, Mahjongg, Shishensho, Memory
+und andere und wird auf
+<a href="https://pysolfc.sourceforge.io/">https://pysolfc.sourceforge.io</a>
+veröffentlicht. Wenn Sie nach einer Desktop-Version suchen, werfen Sie einen
+Blick darauf.
 
-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.
+Die Android-App basiert auf dieser Arbeit und stellt eine Auswahl der
+Desktopfunktionen bereit. Sie wird von ausgewählten Snapshots aus
+den Quellen erstellt und veröffentlicht.

fastlane/metadata/android/en-US/changelogs/102130000.txt

@@ -1,24 +1,14 @@
 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.
+- 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.
+- 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).
+- 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.
+- 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.
+- consult NEWS.asscidoc or html-src/news.html on the github repo for more change informations.

fastlane/metadata/android/en-US/full_description.txt

@@ -1,7 +1,11 @@
 PySolFC is a collection of solitaire games written in Python.
 
-The project provides more than 1000 solitaire games such as patiences, mahjongg,
-shishensho, memory and others. The original project runs on linux, windows and
-macos and was published at sourceforge. See <a href="https://pysolfc.sourceforge.io/">https://pysolfc.sourceforge.io/</a>.
-A new user interface has been developed using the kivy framework to meet
-requirements of touch screens devices.
+PySolFC is a desktop application that runs on Linux, Windows and Mac. It
+offers more than 1000 solitaire games such as Patience, Mahjongg, Shishensho,
+Memory and others and is published on
+<a href="https://pysolfc.sourceforge.io/">https://pysolfc.sourceforge.io</a>.
+If you are looking for a desktop version, take a look.
+
+The Android app is based on this work and provides a selection of the desktop
+functions. It is created and published from selected snapshots out of
+the sources.

pysollib/kivy/tkwidget.py

@@ -228,7 +228,7 @@ class PysolAboutDialog(object):
         logging.info('PysolAboutDialog: txt=%s' % text)
 
         text = text + '\n\n' + 'Adaptation to Kivy/Android\n' + \
-            ' Copyright (C) (2016-23) LB'
+            ' Copyright (C) (2016-24) LB'
 
         self.parent = parent
         self.app = app

pysollib/options.py

@@ -405,7 +405,11 @@ class Options:
         self.mouse_button1 = 1
         self.mouse_button2 = 2
         self.mouse_button3 = 3
-        self.mouse_type = 'drag-n-drop'  # or 'sticky-mouse' or 'point-n-click'
+        # mouse_type:  'drag-n-drop' or 'sticky-mouse' or 'point-n-click'
+        if TOOLKIT == 'kivy':
+            self.mouse_type = 'point-n-click'
+        else:
+            self.mouse_type = 'drag-n-drop'
         self.mouse_undo = False         # use mouse for undo/redo
         self.negative_bottom = True
         self.translate_game_names = True