Skip to content

Commit 4fa210f

Browse files
jmlichjmlich
committed
Update to Ubuntu Touch 20.04 focal
1 parent 8343fd0 commit 4fa210f

18 files changed

+28
-28
lines changed

Diff for: ‎app/qml/components/ExpandableListItem.qml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import QtQuick 2.4
2-
import Ubuntu.Components 1.3
2+
import Lomiri.Components 1.3
33

44
ListItem {
55
id: expandableListItem
@@ -45,7 +45,7 @@ ListItem {
4545
rotation: expandableListItem.expansion.expanded ? 180 : 0
4646

4747
Behavior on rotation {
48-
UbuntuNumberAnimation {}
48+
LomiriNumberAnimation {}
4949
}
5050
}
5151
}

Diff for: ‎app/qml/components/InfoBar.qml

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import QtQuick 2.4
2-
import Ubuntu.Components 1.3
2+
import Lomiri.Components 1.3
33

44
Rectangle {
55
id: infoBar
@@ -49,14 +49,14 @@ Rectangle {
4949
SequentialAnimation {
5050
id: animaDestroy
5151

52-
UbuntuNumberAnimation {
52+
LomiriNumberAnimation {
5353
target: infoBar.anchors
5454
property: "bottomMargin"
5555
to: -infoBar.height
5656
duration: 500; easing.type: Easing.InOutCirc
5757
}
5858

59-
UbuntuNumberAnimation {
59+
LomiriNumberAnimation {
6060
target: infoBar
6161
property: "opacity"
6262
to: 0
@@ -66,10 +66,10 @@ Rectangle {
6666

6767

6868
Behavior on opacity {
69-
UbuntuNumberAnimation { duration: 500; easing.type: Easing.InOutCirc }
69+
LomiriNumberAnimation { duration: 500; easing.type: Easing.InOutCirc }
7070
}
7171

7272
Behavior on anchors.bottomMargin {
73-
UbuntuNumberAnimation { duration: 500; easing.type: Easing.InOutCirc }
73+
LomiriNumberAnimation { duration: 500; easing.type: Easing.InOutCirc }
7474
}
7575
}

Diff for: ‎app/qml/components/NotificationServiceItem.qml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import QtQuick 2.4
2-
import Ubuntu.Components 1.3
2+
import Lomiri.Components 1.3
33
import "../components"
44

55
Item {

Diff for: ‎app/qml/components/StandardListItem.qml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import QtQuick 2.4
2-
import Ubuntu.Components 1.3
2+
import Lomiri.Components 1.3
33

44
ListItem {
55
id: listItem

Diff for: ‎app/qml/pages/ExportPage.qml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import QtQuick 2.9
2-
import Ubuntu.Components 1.3
3-
import Ubuntu.Content 1.3
2+
import Lomiri.Components 1.3
3+
import Lomiri.Content 1.3
44
import "../components"
55

66
Page {

Diff for: ‎app/qml/pages/InfoPage.qml

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import QtQuick 2.4
22
import QtQuick.Layouts 1.1
3-
import Ubuntu.Components 1.3
3+
import Lomiri.Components 1.3
44

55
Page {
66

@@ -33,7 +33,7 @@ Page {
3333
anchors.top: header.bottom
3434
width:parent.width
3535

36-
UbuntuShape {
36+
LomiriShape {
3737
width: units.gu(15); height: units.gu(15)
3838
anchors.horizontalCenter: parent.horizontalCenter
3939
radius: "medium"
@@ -53,7 +53,7 @@ Page {
5353

5454
Label {
5555
width: parent.width
56-
color: UbuntuColors.ash
56+
color: LomiriColors.ash
5757
horizontalAlignment: Text.AlignHCenter
5858
text: i18n.tr("Version ") + "0.0.7"
5959
}
@@ -67,7 +67,7 @@ Page {
6767

6868
Label {
6969
width: parent.width
70-
linkColor: UbuntuColors.orange
70+
linkColor: LomiriColors.orange
7171
horizontalAlignment: Text.AlignHCenter
7272
wrapMode: Text.WrapAtWordBoundaryOrAnywhere
7373
//TRANSLATORS: Please make sure the URLs are correct

Diff for: ‎app/qml/pages/LoadingPage.qml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import QtQuick 2.4
22
import QtQuick.Layouts 1.1
3-
import Ubuntu.Components 1.3
3+
import Lomiri.Components 1.3
44

55
Page {
66
id: root

Diff for: ‎app/qml/pages/LocationPicker.qml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import QtQuick 2.4
22
import QtQuick.Layouts 1.1
3-
import Ubuntu.Components 1.3
3+
import Lomiri.Components 1.3
44

55
Page {
66

Diff for: ‎app/qml/pages/MainMenuPage.qml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import QtQuick 2.4
22
import QtQuick.Controls.Suru 2.2
33
import QtQuick.Layouts 1.1
4-
import Ubuntu.Components 1.3
4+
import Lomiri.Components 1.3
55
import "../components"
66

77
Page {

Diff for: ‎app/qml/pages/ScreenshotPage.qml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import QtQuick 2.4
22
import QtQuick.Layouts 1.1
3-
import Ubuntu.Components 1.3
4-
import Ubuntu.Content 1.3
3+
import Lomiri.Components 1.3
4+
import Lomiri.Content 1.3
55

66
Page {
77
id: scrShot

Diff for: ‎app/qml/pages/WatchesPage.qml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import QtQuick 2.4
22
import QtQuick.Controls.Suru 2.2
33
import QtQuick.Layouts 1.1
4-
import Ubuntu.Components 1.3
4+
import Lomiri.Components 1.3
55

66
Page {
77
id: watchesPage

Diff for: ‎app/qml/pages/WeatherSettingsDialog.qml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import QtQuick 2.4
22
import QtQuick.Layouts 1.1
3-
import Ubuntu.Components 1.3
3+
import Lomiri.Components 1.3
44

55
Page {
66

Diff for: ‎app/qml/telescope.qml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import QtQuick 2.4
22
import QtQuick.Controls.Suru 2.2
3-
import Ubuntu.Components 1.3
3+
import Lomiri.Components 1.3
44
import org.asteroid.syncservice 1.0
55
import "controller"
66

Diff for: ‎asteroidsyncservice

Submodule asteroidsyncservice updated 52 files

Diff for: ‎asteroidsyncserviced.apparmor

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@
88
"content_exchange_source"
99
],
1010
"template": "unconfined",
11-
"policy_version": 16.04
11+
"policy_version": 20.04
1212
}

Diff for: ‎manifest.json.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@
1515
},
1616
"version": "0.0.7",
1717
"maintainer": "Stefan Weng <[email protected]>",
18-
"framework" : "ubuntu-sdk-16.04.5"
18+
"framework" : "ubuntu-sdk-20.04"
1919
}
2020

Diff for: ‎telescope.apparmor

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@
55
"accounts"
66
],
77
"template": "unconfined",
8-
"policy_version": 16.04
8+
"policy_version": 20.04
99
}

Diff for: ‎telescope.desktop.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ Exec=env QML2_IMPORT_PATH=usr/lib/$${ARCH_TRIPLET}/qt5/qml telescope
44
Icon=assets/icon.svg
55
Terminal=false
66
Type=Application
7-
X-Ubuntu-Touch=true
7+
X-Lomiri-Touch=true

0 commit comments

Comments
 (0)