libervia-desktop-kivy: cagou/core/cagou

comparison cagou/core/cagou_main.py @ 322:e2b51663d8b8

core, android: new share widget + added Cagou to "share" menu: - new intent filter to add Cagou to share menu for all media types - minimum Kivy version is now 1.11.0 - new "Share" widget to display data to share via SàT and select the target - new core.platform_ module (the suffix "_" avoid trouble with standard "platform" module), for platform specific code. - Android intent are now checked on startup and "on_new_intent" events - if a android.intent.action.SEND action is received (i.e. some data is shared), the "Share" widget is shown - new Cagou.share method to share data using "Share" widget - new Cagou.getAncestorWidget method to easily retrieve an instance of a specific class in a widget's ancestors - ContactList's Avatar and ContactItem widgets have been moved to core.common

author	Goffi <goffi@goffi.org>
date	Fri, 06 Dec 2019 13:23:03 +0100
parents	834d5c267219
children	5bd583d00594

comparison

equal deleted inserted replaced

-:a6eb154ba266
+:e2b51663d8b8
-#!/usr//bin/env python2
+#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 # Cagou: desktop/mobile frontend for Salut à Toi XMPP client
 # Copyright (C) 2016-2019 Jérôme Poisson (goffi@goffi.org)
 # This program is free software: you can redistribute it and/or modify
 from sat.core.i18n import _
 from . import kivy_hack
 kivy_hack.do_hack()
 from .constants import Const as C
 from sat.core import log as logging
-log = logging.getLogger(__name__)
 from sat.core import exceptions
 from sat_frontends.quick_frontend.quick_app import QuickApp
 from sat_frontends.quick_frontend import quick_widgets
 from sat_frontends.quick_frontend import quick_chat
 from sat_frontends.quick_frontend import quick_utils
 from sat_frontends.tools import jid
 from sat.tools import utils as sat_utils
 from sat.tools import config
 from sat.tools.common import dynamic_import
 import kivy
-kivy.require('1.10.0')
+kivy.require('1.11.0')
 import kivy.support
 main_config = config.parseMainConf()
 bridge_name = config.getConfig(main_config, '', 'bridge', 'dbus')
 # FIXME: event loop is choosen according to bridge_name, a better way should be used
 if 'dbus' in bridge_name:
 from kivy.animation import Animation
 from kivy.metrics import dp
 from kivy import utils as kivy_utils
 from kivy.config import Config as KivyConfig
 from .cagou_widget import CagouWidget
+from .share_widget import ShareWidget
 from . import widgets_handler
 from .common import IconButton
 from . import menu
 from . import dialog
 from importlib import import_module
 import sat
 import cagou
 import cagou.plugins
 import cagou.kv
+log = logging.getLogger(__name__)
 try:
 from plyer import notification
 except ImportError:
 notification = None
 log.warning(_("Can't import plyer, some features disabled"))
 ## platform specific settings ##
 if kivy_utils.platform == "android":
 import socket
+from .platform_ import android
-# FIXME: move to separate android module
+android.init_platform()
-# sys.platform is "linux" on android by default
+else:
-# so we change it to allow backend to detect android
+# we don't want multi-touch emulation with mouse
-sys.platform = "android"
-C.PLUGIN_EXT = 'pyc'
+# this option doesn't make sense on Android and cause troubles, so we only activate
-SOCKET_DIR = "/data/data/org.salutatoi.cagou/"
+# it for other platforms (cf. https://github.com/kivy/kivy/issues/6229)
-SOCKET_FILE = ".socket"
+KivyConfig.set('input', 'mouse', 'mouse,disable_multitouch')
-STATE_RUNNING = b"running"
-STATE_PAUSED = b"paused"
-STATE_STOPPED = b"stopped"
 ## General Configuration ##
 # we want white background by default
 Window.clearcolor = (1, 1, 1, 1)
-# we don't want multi-touch emulation with mouse
-if sys.platform != 'android':
-# this option doesn't make sense on Android and cause troubles
-# cf. https://github.com/kivy/kivy/issues/6229
-KivyConfig.set('input', 'mouse', 'mouse,disable_multitouch')
 class NotifsIcon(IconButton):
 notifs = properties.ListProperty()
 if sys.platform == "android":
 # XXX: we use a separated socket instead of bridge because if we
 #      try to call a bridge method in on_pause method, the call data
 #      is not written before the actual pause
 s = self._frontend_status_socket = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
-s.connect(os.path.join(SOCKET_DIR, SOCKET_FILE))
+s.connect(os.path.join(android.SOCKET_DIR, android.SOCKET_FILE))
-s.sendall(STATE_RUNNING)
+s.sendall(android.STATE_RUNNING)
 def on_pause(self):
 self.host.sync = False
-self._frontend_status_socket.sendall(STATE_PAUSED)
+self._frontend_status_socket.sendall(android.STATE_PAUSED)
 return True
 def on_resume(self):
-self._frontend_status_socket.sendall(STATE_RUNNING)
+self._frontend_status_socket.sendall(android.STATE_RUNNING)
 self.host.sync = True
 def on_stop(self):
 if sys.platform == "android":
-self._frontend_status_socket.sendall(STATE_STOPPED)
+self._frontend_status_socket.sendall(android.STATE_STOPPED)
 self._frontend_status_socket.close()
 def key_input(self, window, key, scancode, codepoint, modifier):
 if key == 27:
 # we disable [esc] handling, because default action is to quit app
 return True
 elif key == 292:
 # F11: full screen
 if not Window.fullscreen:
-window.fullscreen = 'auto'
+Window.fullscreen = 'auto'
 else:
-window.fullscreen = False
+Window.fullscreen = False
 return True
 elif key == 109 and modifier == ['alt']:
 # M-m we hide/show menu
 menu = self.root.root_menus
 if menu.height:
 def __init__(self):
 if bridge_name == 'embedded':
 from sat.core import sat_main
 self.sat = sat_main.SAT()
-if sys.platform == 'android':
-from jnius import autoclass
-service = autoclass('org.salutatoi.cagou.ServiceBackend')
-mActivity = autoclass('org.kivy.android.PythonActivity').mActivity
-argument = ''
-service.start(mActivity, argument)
-self.service = service
 bridge_module = dynamic_import.bridge(bridge_name, 'sat_frontends.bridge')
 if bridge_module is None:
 log.error(f"Can't import {bridge_name} bridge")
 sys.exit(3)
 if not self.tls_validation:
 from cagou.core import patches
 patches.apply()
 log.warning("SSL certificate validation is disabled, this is unsecure!")
+if sys.platform == 'android':
+android.host_init(self)
 @property
 def visible_widgets(self):
 for w_list in self._visible_widgets.values():
 for w in w_list:
 yield w
 self.app.root.changeWidget(widget, "extra")
 self.app.root.show("extra")
 def closeUI(self):
 self.app.root.show()
+screen = self.app.root._manager.get_screen("extra")
+screen.clear_widgets()
 def getDefaultAvatar(self, entity=None):
 return self.app.default_avatar
 def _dialog_cb(self, cb, *args, **kwargs):
 )
 self.addNotifWidget(wid)
 else:
 log.warning(_("unknown dialog type: {dialog_type}").format(dialog_type=type))
+def share(self, media_type, data):
+share_wid = ShareWidget(media_type=media_type, data=data)
+try:
+self.showExtraUI(share_wid)
+except Exception as e:
+log.error(e)
+self.closeUI()
 def desktop_notif(self, message, title='', duration=5000):
 global notification
 if notification is not None:
 try:
 timeout = duration)
 except Exception as e:
 log.warning(_("Can't use notifications, disabling: {msg}").format(
 msg = e))
 notification = None
+def getAncestorWidget(self, wid, cls):
+"""Retrieve an ancestor of given class
+@param wid(Widget): current widget
+@param cls(type): class of the ancestor to retrieve
+@return (Widget, None): found instance or None
+"""
+parent = wid.parent
+while parent and parent.__class__ != cls:
+parent = parent.parent
+return parent

Mercurial > libervia-desktop-kivy

comparison cagou/core/cagou_main.py @ 322:e2b51663d8b8