Update to Ubuntu Touch 20.04 focal

AsteroidOS · Jan 19, 2024 · 4fa210f · 4fa210f
1 parent 8343fd0
commit 4fa210f
Show file tree

Hide file tree

Showing 18 changed files with 28 additions and 28 deletions.
diff --git a/app/qml/components/ExpandableListItem.qml b/app/qml/components/ExpandableListItem.qml
@@ -1,5 +1,5 @@
 import QtQuick 2.4
-import Ubuntu.Components 1.3
+import Lomiri.Components 1.3
 
 ListItem {
     id: expandableListItem
@@ -45,7 +45,7 @@ ListItem {
                     rotation: expandableListItem.expansion.expanded ? 180 : 0
 
                     Behavior on rotation {
-                        UbuntuNumberAnimation {}
+                        LomiriNumberAnimation {}
                     }
                 }
             }

diff --git a/app/qml/components/InfoBar.qml b/app/qml/components/InfoBar.qml
@@ -1,5 +1,5 @@
 import QtQuick 2.4
-import Ubuntu.Components 1.3
+import Lomiri.Components 1.3
 
 Rectangle {
     id: infoBar
@@ -49,14 +49,14 @@ Rectangle {
     SequentialAnimation {
         id: animaDestroy
 
-        UbuntuNumberAnimation {
+        LomiriNumberAnimation {
             target: infoBar.anchors
             property: "bottomMargin"
             to: -infoBar.height
             duration: 500; easing.type: Easing.InOutCirc
         }
 
-        UbuntuNumberAnimation {
+        LomiriNumberAnimation {
             target: infoBar
             property: "opacity"
             to: 0
@@ -66,10 +66,10 @@ Rectangle {
 
 
     Behavior on opacity {
-        UbuntuNumberAnimation { duration: 500; easing.type: Easing.InOutCirc }
+        LomiriNumberAnimation { duration: 500; easing.type: Easing.InOutCirc }
     }
 
     Behavior on anchors.bottomMargin {
-        UbuntuNumberAnimation { duration: 500; easing.type: Easing.InOutCirc }
+        LomiriNumberAnimation { duration: 500; easing.type: Easing.InOutCirc }
     }
 }
diff --git a/app/qml/components/NotificationServiceItem.qml b/app/qml/components/NotificationServiceItem.qml
@@ -1,5 +1,5 @@
 import QtQuick 2.4
-import Ubuntu.Components 1.3
+import Lomiri.Components 1.3
 import "../components"
 
 Item {

diff --git a/app/qml/components/StandardListItem.qml b/app/qml/components/StandardListItem.qml
@@ -1,5 +1,5 @@
 import QtQuick 2.4
-import Ubuntu.Components 1.3
+import Lomiri.Components 1.3
 
 ListItem {
     id: listItem

diff --git a/app/qml/pages/ExportPage.qml b/app/qml/pages/ExportPage.qml
@@ -1,6 +1,6 @@
 import QtQuick 2.9
-import Ubuntu.Components 1.3
-import Ubuntu.Content 1.3
+import Lomiri.Components 1.3
+import Lomiri.Content 1.3
 import "../components"
 
 Page {

diff --git a/app/qml/pages/InfoPage.qml b/app/qml/pages/InfoPage.qml
@@ -1,6 +1,6 @@
 import QtQuick 2.4
 import QtQuick.Layouts 1.1
-import Ubuntu.Components 1.3
+import Lomiri.Components 1.3
 
 Page {
 
@@ -33,7 +33,7 @@ Page {
         anchors.top: header.bottom
         width:parent.width
 
-        UbuntuShape {
+        LomiriShape {
             width: units.gu(15); height: units.gu(15)
             anchors.horizontalCenter: parent.horizontalCenter
             radius: "medium"
@@ -53,7 +53,7 @@ Page {
 
         Label {
             width: parent.width
-            color: UbuntuColors.ash
+            color: LomiriColors.ash
             horizontalAlignment: Text.AlignHCenter
             text: i18n.tr("Version ") + "0.0.7"
         }
@@ -67,7 +67,7 @@ Page {
 
         Label {
             width: parent.width
-            linkColor: UbuntuColors.orange
+            linkColor: LomiriColors.orange
             horizontalAlignment: Text.AlignHCenter
             wrapMode: Text.WrapAtWordBoundaryOrAnywhere
             //TRANSLATORS: Please make sure the URLs are correct

diff --git a/app/qml/pages/LoadingPage.qml b/app/qml/pages/LoadingPage.qml
@@ -1,6 +1,6 @@
 import QtQuick 2.4
 import QtQuick.Layouts 1.1
-import Ubuntu.Components 1.3
+import Lomiri.Components 1.3
 
 Page {
     id: root

diff --git a/app/qml/pages/LocationPicker.qml b/app/qml/pages/LocationPicker.qml
@@ -1,6 +1,6 @@
 import QtQuick 2.4
 import QtQuick.Layouts 1.1
-import Ubuntu.Components 1.3
+import Lomiri.Components 1.3
 
 Page {
 

diff --git a/app/qml/pages/MainMenuPage.qml b/app/qml/pages/MainMenuPage.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.4
 import QtQuick.Controls.Suru 2.2
 import QtQuick.Layouts 1.1
-import Ubuntu.Components 1.3
+import Lomiri.Components 1.3
 import "../components"
 
 Page {

diff --git a/app/qml/pages/ScreenshotPage.qml b/app/qml/pages/ScreenshotPage.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.4
 import QtQuick.Layouts 1.1
-import Ubuntu.Components 1.3
-import Ubuntu.Content 1.3
+import Lomiri.Components 1.3
+import Lomiri.Content 1.3
 
 Page {
     id: scrShot

diff --git a/app/qml/pages/WatchesPage.qml b/app/qml/pages/WatchesPage.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.4
 import QtQuick.Controls.Suru 2.2
 import QtQuick.Layouts 1.1
-import Ubuntu.Components 1.3
+import Lomiri.Components 1.3
 
 Page {
     id: watchesPage

diff --git a/app/qml/pages/WeatherSettingsDialog.qml b/app/qml/pages/WeatherSettingsDialog.qml
@@ -1,6 +1,6 @@
 import QtQuick 2.4
 import QtQuick.Layouts 1.1
-import Ubuntu.Components 1.3
+import Lomiri.Components 1.3
 
 Page {
 

diff --git a/app/qml/telescope.qml b/app/qml/telescope.qml
@@ -1,6 +1,6 @@
 import QtQuick 2.4
 import QtQuick.Controls.Suru 2.2
-import Ubuntu.Components 1.3
+import Lomiri.Components 1.3
 import org.asteroid.syncservice 1.0
 import "controller"
 

diff --git a/asteroidsyncservice b/asteroidsyncservice
diff --git a/asteroidsyncserviced.apparmor b/asteroidsyncserviced.apparmor
@@ -8,5 +8,5 @@
         "content_exchange_source"
     ],
     "template": "unconfined",
-    "policy_version": 16.04
+    "policy_version": 20.04
 }
diff --git a/manifest.json.in b/manifest.json.in
@@ -15,6 +15,6 @@
     },
     "version": "0.0.7",
     "maintainer": "Stefan Weng <[email protected]>",
-    "framework" : "ubuntu-sdk-16.04.5"
+    "framework" : "ubuntu-sdk-20.04"
 }
 
diff --git a/telescope.apparmor b/telescope.apparmor
@@ -5,5 +5,5 @@
         "accounts"
     ],
     "template": "unconfined",
-    "policy_version": 16.04
+    "policy_version": 20.04
 }
diff --git a/telescope.desktop.in b/telescope.desktop.in
@@ -4,4 +4,4 @@ Exec=env QML2_IMPORT_PATH=usr/lib/$${ARCH_TRIPLET}/qt5/qml telescope
 Icon=assets/icon.svg
 Terminal=false
 Type=Application
-X-Ubuntu-Touch=true
+X-Lomiri-Touch=true
+1 −1		.gitmodules
+41 −0		CMakeLists.txt
+61 −12		README.md
+0 −5		asteroidsyncservice.pro
+22 −0		asteroidsyncservice/CMakeLists.txt
+0 −49		asteroidsyncservice/asteroidsyncservice.pro
+2 −1		asteroidsyncservice/platforms/sailfishos/servicecontrol.h
+22 −13		asteroidsyncservice/platforms/ubuntutouch/servicecontrol.cpp
+0 −5		asteroidsyncservice/starfish.pri
+1 −7		asteroidsyncservice/syncservice_plugin.cpp
+1 −1		asteroidsyncservice/syncservice_plugin.h
+0 −5		asteroidsyncservice/telescope.pri
+10 −4		asteroidsyncservice/watch.cpp
+3 −1		asteroidsyncservice/watch.h
+26 −0		asteroidsyncservice_config.h.in
+63 −0		asteroidsyncserviced/CMakeLists.txt
+12 −0		asteroidsyncserviced/asteroidsync.service.in
+0 −45		asteroidsyncserviced/asteroidsyncserviced.pro
+0 −26		asteroidsyncserviced/bluez/bluez_adapter1.cpp
+0 −66		asteroidsyncserviced/bluez/bluez_adapter1.h
+0 −26		asteroidsyncserviced/bluez/bluez_agentmanager1.cpp
+0 −68		asteroidsyncserviced/bluez/bluez_agentmanager1.h
+0 −26		asteroidsyncserviced/bluez/bluez_device1.cpp
+0 −85		asteroidsyncserviced/bluez/bluez_device1.h
+32 −14		asteroidsyncserviced/bluez/bluezclient.cpp
+13 −15		asteroidsyncserviced/bluez/bluezclient.h
+31 −0		asteroidsyncserviced/bluez/bluezclient_p.h
+0 −1		asteroidsyncserviced/bluez/dbus-shared.h
+0 −16		asteroidsyncserviced/bluez/org.bluez.AgentManager1.xml
+57 −9		asteroidsyncserviced/dbusinterface.cpp
+2 −2		asteroidsyncserviced/dbusinterface.h
+1 −1		asteroidsyncserviced/harbour-asteroidsyncserviced.service
+1 −1		asteroidsyncserviced/libasteroid
+1 −1		asteroidsyncserviced/libwatchfish
+5 −15		asteroidsyncserviced/main.cpp
+13 −13		asteroidsyncserviced/platforms/sailfishos/platform.cpp
+10 −10		asteroidsyncserviced/platforms/sailfishos/platform.h
+41 −25		asteroidsyncserviced/platforms/ubuntutouch/platform.cpp
+11 −9		asteroidsyncserviced/platforms/ubuntutouch/platform.h
+0 −11		asteroidsyncserviced/starfish.pri
+0 −5		asteroidsyncserviced/telescope.pri
+1 −1		asteroidsyncserviced/watchesmanager.cpp
+3 −3		asteroidsyncserviced/watchesmanager.h
+37 −0		doc/01_intro.md
+45 −0		doc/02_architecture.md
+18 −0		doc/03_dbus.md
+23 −0		doc/99_glossary.md
+37 −0		doc/CMakeLists.txt
+1 −0		doc/asteroid-logo.svg
+2,485 −0		doc/doxygen.conf.in
+7 −7		rpm/asteroidsyncservice.spec
+0 −2		version.pri