Merge lp://qastaging/~rpadovani/ubuntu-calculator-app/bumpToolkit into lp://qastaging/ubuntu-calculator-app

Proposed by Riccardo Padovani
Status: Merged
Approved by: Riccardo Padovani
Approved revision: 242
Merged at revision: 241
Proposed branch: lp://qastaging/~rpadovani/ubuntu-calculator-app/bumpToolkit
Merge into: lp://qastaging/ubuntu-calculator-app
Diff against target: 539 lines (+148/-100)
16 files modified
app/engine/CalculationHistory.qml (+2/-2)
app/ubuntu-calculator-app.qml (+61/-64)
app/ui/CalcKeyboard.qml (+3/-3)
app/ui/FavouritePage.qml (+3/-3)
app/ui/KeyboardButton.qml (+3/-3)
app/ui/KeyboardPage.qml (+19/-2)
app/ui/LandscapeKeyboard.qml (+20/-2)
app/ui/PortraitKeyboard.qml (+19/-2)
app/ui/Screen.qml (+2/-2)
app/ui/ScrollableView.qml (+2/-2)
app/upstreamcomponents/EmptyState.qml (+2/-2)
app/upstreamcomponents/ListItemWithActions.qml (+3/-3)
app/upstreamcomponents/ListItemWithActionsCheckBox.qml (+3/-3)
app/upstreamcomponents/MultipleSelectionVisualModel.qml (+1/-1)
app/upstreamcomponents/PageWithBottomEdge.qml (+4/-5)
manifest.json.in (+1/-1)
To merge this branch: bzr merge lp://qastaging/~rpadovani/ubuntu-calculator-app/bumpToolkit
Reviewer Review Type Date Requested Status
Jenkins Bot continuous-integration Approve
Bartosz Kosiorek Needs Fixing
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Review via email: mp+277012@code.qastaging.launchpad.net

Commit message

Update QtQuick and ubuntu-ui-toolkit

Description of the change

- Update all QtQuick to 2.4 and toolkit to 1.3
- Drop custom header in favour of standard one
- Fix bug #1413789

To post a comment you must log in.
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Bartosz Kosiorek (gang65) wrote :

Some small inline comment.

I will intense test it later today.

review: Needs Fixing
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Riccardo Padovani (rpadovani) wrote :

Thanks!

Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Bartosz Kosiorek (gang65) wrote :

Thanks Riccardo.
I noticed that following warnings are appearing:
file:///home/kosiorek/dev/core/bumpToolkit/app/upstreamcomponents/PageWithBottomEdge.qml:144:5: QML UbuntuShape: 'color' is deprecated. Use 'backgroundColor', 'secondaryBackgroundColor' and 'backgroundMode' instead.

and

uses confusion which is the active page that sets the title and actions.
file:///home/kosiorek/dev/core/bumpToolkit/app/ubuntu-calculator-app.qml:253:9: QML PageWithBottomEdge: Binding loop detected for property "height"
file:///home/kosiorek/dev/core/bumpToolkit/app/ubuntu-calculator-app.qml:253:9: QML PageWithBottomEdge: Binding loop detected for property "height"
file:///home/kosiorek/dev/core/bumpToolkit/app/ubuntu-calculator-app.qml:538:13: QML ScrollableView: Binding loop detected for property "contentHeight"
file:///home/kosiorek/dev/core/bumpToolkit/app/ubuntu-calculator-app.qml:253:9: QML PageWithBottomEdge: Binding loop detected for property "flickable"

and error during scrolling selected entries:
file:///home/kosiorek/dev/core/bumpToolkit/app/ui/ScrollableView.qml:37: TypeError: Cannot read property 'y' of null

Could you please try to fix that?

There are also errors:
file:///usr/lib/x86_64-linux-gnu/qt5/qml/Ubuntu/Components/1.3/PageWrapperUtils.js:90: TypeError: Cannot read property 'createObject' of null

review: Needs Fixing
Revision history for this message
Bartosz Kosiorek (gang65) wrote :

BTW The windows title is working perfectly now! No more "com.ubuntu.calculator" :-)

One more small issue:
When you run first time Calculator, the virtual keyboard is slighly shifted to bottom.
After first click, it moves in correct place.
Could you please take a look at this.

review: Needs Fixing
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Riccardo Padovani (rpadovani) wrote :

I fixed all the warnings, I'm still investigating about the virtual keyboard position

Revision history for this message
Riccardo Padovani (rpadovani) wrote :

I'm quite puzzled about the bug, it happens randomly, not all the time, probably 1 on 3. I have no idea of which is the root case, and I tried a lot of different things.

I'm sure we've already seen something like this, but I don't remember how we fixed it.
If you have any suggestions, please let me know!

Revision history for this message
Riccardo Padovani (rpadovani) wrote :

So, some progress on this.

It seems that when the app is loaded the pagestack changes its height a lot of times:
if you add onHeightChanged: console.log('pagestack ' + height) on line 254 of ubuntu-calculator-app.qml when you start the app you have something like this:

qml: pagestack 565.7091325559794
qml: pagestack 560
qml: pagestack 565.3556258961664
qml: pagestack 560
qml: pagestack 565.0021192363535
qml: pagestack 560
qml: pagestack 564.6486125765405
qml: pagestack 560
qml: pagestack 564.2951059167276
qml: pagestack 560
qml: pagestack 563.9415992569145
qml: pagestack 560
qml: pagestack 563.5880925971016
qml: pagestack 560
qml: pagestack 563.2345859372887
qml: pagestack 560
qml: pagestack 562.8810792774757
qml: pagestack 560
qml: pagestack 562.5275726176627
qml: pagestack 560
qml: pagestack 562.1740659578497
qml: pagestack 560
qml: pagestack 561.8205592980368
qml: pagestack 560
qml: pagestack 561.4670526382238
qml: pagestack 560
qml: pagestack 561.1135459784108
qml: pagestack 560
qml: pagestack 560.7600393185979
qml: pagestack 560
qml: pagestack 560.4065326587848
qml: pagestack 560
qml: pagestack 560.0746782818856
qml: pagestack 560

I need to understand what's the root cause of this change - when I'll be able to isolate it, I think I'll be able to fix it

Revision history for this message
Riccardo Padovani (rpadovani) wrote :

Investigating more, it is related to the header. If I don't hide the header it doesn't happen.

I think is related to https://bugs.launchpad.net/ubuntu/+source/ubuntu-ui-toolkit/+bug/1518002, need to investigate further to find a workaround

Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Riccardo Padovani (rpadovani) wrote :

Okay, I found a workaround until the bug is fixed upstream.

It introduces a bug in the desktop mode (when you resize the window, the app scrolls down) but I think is way less important that this one

Revision history for this message
Bartosz Kosiorek (gang65) wrote :

Hello Riccardo.

Could you please submit bug report for that issue?
It will be great to resolve it upstream.

review: Approve
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
https://core-apps-jenkins.ubuntu.com/job/calculator-app-autolanding/88/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-land-mp/405/console

review: Needs Fixing (continuous-integration)
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
https://core-apps-jenkins.ubuntu.com/job/calculator-app-autolanding/89/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-land-mp/407/console

review: Needs Fixing (continuous-integration)
Revision history for this message
Bartosz Kosiorek (gang65) wrote :

There are same conflicts. Please resolve them. After that just top approve that.

review: Needs Fixing
242. By Riccardo Padovani

Merge upstream and fix conflicts

Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Riccardo Padovani (rpadovani) wrote :

Thanks Bartosz, I fixed conflicts.

The bug upstream is https://bugs.launchpad.net/ubuntu/+source/ubuntu-ui-toolkit/+bug/1518002

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches