# HG changeset patch
# User Goffi <goffi@goffi.org>
# Date 1576085202 -3600
# Node ID b77792cc6d1219614d0c7dd558461d1093355dd6
# Parent  d9d2b56f46db3977e2fdd95618afcc3befb3ff00
use Kivy garden's new infrastructure for modernmenu and contextmenu:

dependencies are updated, the legacy kivy-garden tool is not needed anymore, thus
installation is simplified.

diff -r d9d2b56f46db -r b77792cc6d12 .p4a
--- a/.p4a	Fri Dec 06 13:25:33 2019 +0100
+++ b/.p4a	Wed Dec 11 18:26:42 2019 +0100
@@ -4,7 +4,7 @@
 --dist-name cagou_dev_build
 --debug
 --bootstrap=sdl2
---requirements "hostpython3, kivy, sqlite3, omemo, omemo-backend-signal, service_identity, automat, attrs, twisted, wokkel, hg+https://repos.goffi.org/sat, hg+https://repos.goffi.org/sat_tmp, pillow, pyxdg, markdown, html2text, python-dateutil, pycrypto, plyer, android, python-potr, shortuuid, babel, lxml, pudb, urwid, cryptography, openssl, pyopenssl, pyasn1, pyasn1-modules"
+--requirements "hostpython3, kivy, kivy_garden.modernmenu, kivy_garden.contextmenu>=0.1.0.dev1, sqlite3, omemo, omemo-backend-signal, service_identity, automat, attrs, twisted, wokkel, hg+https://repos.goffi.org/sat, hg+https://repos.goffi.org/sat_tmp, pillow, pyxdg, markdown, html2text, python-dateutil, pycrypto, plyer, android, python-potr, shortuuid, babel, lxml, pudb, urwid, cryptography, openssl, pyopenssl, pyasn1, pyasn1-modules"
 --private . --package=org.salutatoi.cagou --name "Cagou"
 --version 0.1
 --whitelist .p4a_whitelist
diff -r d9d2b56f46db -r b77792cc6d12 cagou/core/menu.py
--- a/cagou/core/menu.py	Fri Dec 06 13:25:33 2019 +0100
+++ b/cagou/core/menu.py	Wed Dec 11 18:26:42 2019 +0100
@@ -27,7 +27,7 @@
 from kivy.uix.popup import Popup
 from cagou.core.utils import FilterBehavior
 from kivy import properties
-from kivy.garden import contextmenu, modernmenu
+from kivy_garden import contextmenu, modernmenu
 from sat_frontends.quick_frontend import quick_menus
 from kivy.core.window import Window
 from kivy.animation import Animation
diff -r d9d2b56f46db -r b77792cc6d12 cagou/plugins/plugin_wid_file_sharing.kv
--- a/cagou/plugins/plugin_wid_file_sharing.kv	Fri Dec 06 13:25:33 2019 +0100
+++ b/cagou/plugins/plugin_wid_file_sharing.kv	Wed Dec 11 18:26:42 2019 +0100
@@ -14,7 +14,7 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#:import ModernMenu kivy.garden.modernmenu.ModernMenu
+#:import ModernMenu kivy_garden.modernmenu.ModernMenu
 
 
 <ModeBtn>:
diff -r d9d2b56f46db -r b77792cc6d12 setup.py
--- a/setup.py	Fri Dec 06 13:25:33 2019 +0100
+++ b/setup.py	Wed Dec 11 18:26:42 2019 +0100
@@ -26,6 +26,8 @@
 
 install_requires = [
     'kivy>=1.10.0',
+    'kivy_garden.modernmenu',
+    'kivy_garden.contextmenu>=0.1.0.dev1',
     'pillow',
     'plyer',
     'sat>=0.7.0dev0',