Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to Ubuntu Touch 20.04 focal #66

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update to Ubuntu Touch 20.04 focal #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/qml/components/ExpandableListItem.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import QtQuick 2.4
import Ubuntu.Components 1.3
import Lomiri.Components 1.3

ListItem {
id: expandableListItem
Expand Down Expand Up @@ -45,7 +45,7 @@ ListItem {
rotation: expandableListItem.expansion.expanded ? 180 : 0

Behavior on rotation {
UbuntuNumberAnimation {}
LomiriNumberAnimation {}
}
}
}
Expand Down
10 changes: 5 additions & 5 deletions app/qml/components/InfoBar.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import QtQuick 2.4
import Ubuntu.Components 1.3
import Lomiri.Components 1.3

Rectangle {
id: infoBar
Expand Down Expand Up @@ -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
Expand All @@ -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 }
}
}
2 changes: 1 addition & 1 deletion app/qml/components/NotificationServiceItem.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import QtQuick 2.4
import Ubuntu.Components 1.3
import Lomiri.Components 1.3
import "../components"

Item {
Expand Down
2 changes: 1 addition & 1 deletion app/qml/components/StandardListItem.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import QtQuick 2.4
import Ubuntu.Components 1.3
import Lomiri.Components 1.3

ListItem {
id: listItem
Expand Down
4 changes: 2 additions & 2 deletions app/qml/pages/ExportPage.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
8 changes: 4 additions & 4 deletions app/qml/pages/InfoPage.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import QtQuick 2.4
import QtQuick.Layouts 1.1
import Ubuntu.Components 1.3
import Lomiri.Components 1.3

Page {

Expand Down Expand Up @@ -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"
Expand All @@ -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"
}
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion app/qml/pages/LoadingPage.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion app/qml/pages/LocationPicker.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import QtQuick 2.4
import QtQuick.Layouts 1.1
import Ubuntu.Components 1.3
import Lomiri.Components 1.3

Page {

Expand Down
2 changes: 1 addition & 1 deletion app/qml/pages/MainMenuPage.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions app/qml/pages/ScreenshotPage.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion app/qml/pages/WatchesPage.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion app/qml/pages/WeatherSettingsDialog.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import QtQuick 2.4
import QtQuick.Layouts 1.1
import Ubuntu.Components 1.3
import Lomiri.Components 1.3

Page {

Expand Down
2 changes: 1 addition & 1 deletion app/qml/telescope.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"

Expand Down
2 changes: 1 addition & 1 deletion asteroidsyncservice
Open in desktop
Submodule asteroidsyncservice updated 52 files
+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
2 changes: 1 addition & 1 deletion asteroidsyncserviced.apparmor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@
"content_exchange_source"
],
"template": "unconfined",
"policy_version": 16.04
"policy_version": 20.04
}
2 changes: 1 addition & 1 deletion clickable.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
clickable_minimum_required: 7.1.2
clickable_minimum_required: 8.0.0
builder: qmake
kill: telescope
build_args: CONFIG+=telescope
Expand Down
2 changes: 1 addition & 1 deletion manifest.json.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@
},
"version": "0.0.7",
"maintainer": "Stefan Weng <[email protected]>",
"framework" : "ubuntu-sdk-16.04.5"
"framework" : "ubuntu-sdk-20.04"
}

2 changes: 1 addition & 1 deletion telescope.apparmor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
"accounts"
],
"template": "unconfined",
"policy_version": 16.04
"policy_version": 20.04
}
2 changes: 1 addition & 1 deletion telescope.desktop.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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