Merge lp:~ubuntu-weather-dev/ubuntu-weather-app/reboot-finish-listitem-migration into lp:ubuntu-weather-app
Status: | Superseded |
---|---|
Proposed branch: | lp:~ubuntu-weather-dev/ubuntu-weather-app/reboot-finish-listitem-migration |
Merge into: | lp:ubuntu-weather-app |
Diff against target: |
1214 lines (+96/-946) 12 files modified
app/components/CMakeLists.txt (+0/-2) app/components/ListItemActions/CMakeLists.txt (+0/-5) app/components/ListItemActions/CheckBox.qml (+0/-25) app/components/ListItemActions/Remove.qml (+0/-27) app/components/ListItemReorderComponent.qml (+0/-106) app/components/ListItemWithActions.qml (+0/-496) app/components/MultiSelectHeadState.qml (+0/-72) app/components/MultiSelectListView.qml (+27/-8) app/components/WeatherListItem.qml (+0/-138) app/components/WeatherListView.qml (+1/-2) app/ui/LocationsPage.qml (+63/-48) po/com.ubuntu.weather.pot (+5/-17) |
To merge this branch: | bzr merge lp:~ubuntu-weather-dev/ubuntu-weather-app/reboot-finish-listitem-migration |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Jenkins Bot | continuous-integration | Approve on 2015-11-20 | |
Ubuntu Phone Apps Jenkins Bot | continuous-integration | Approve on 2015-10-18 | |
Andrew Hayzen | 2015-08-05 | Needs Fixing on 2015-08-13 | |
Review via email:
|
This proposal has been superseded by a proposal from 2015-11-20.
Commit message
* Finish the migration to the new SDK list items
* Lock weather app in the Portrait orientation until we get some landscape designs
* Make the page with bottom edge animation less jarring when it reaches the top by adding a fake header (similar to what the clock app does)
Description of the change
* Finished the migration to the new SDK list items
* Locked weather app in the Portrait orientation until we get some landscape designs
* Made the page with bottom edge animation less jarring when it reaches the top by adding a fake header (similar to what the clock app does)
* Buy nik90 a beer for starting this effort
Victor Thompson (vthompson) wrote : | # |
PASSED: Continuous integration, rev:70
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
Andrew Hayzen (ahayzen) wrote : | # |
A few inline comments, visually ...
1) there appears to be a space between the detected location and the first selected location
2) if you multiselect, select an item, then select delete you are still in multiselect mode, this is weird if you remove the last item in the list as you have to hit back what feels like twice. I suggest when delete is pressed in the header that the multiselect mode is cancelled.
- 71. By Victor Thompson on 2015-08-14
-
Update for comments
FAILED: Continuous integration, rev:71
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild:
http://
Victor Thompson (vthompson) wrote : | # |
> Should this have // CUSTOM as a note incase we do a pull of upstream and miss that we made changes?
Sure. I added a comment. I think eventually this will be folded into the SDK anyway. They already pulled in a hint component that we should make use of soonish.
> Why was this changed it looks the same just with { } around it?
No reason that I know of. I didn't like it either when I was resolving merge conflicts. Updated.
> Not A->Z
Fixed.
- 72. By Victor Thompson on 2015-08-14
-
Fix visual issues
FAILED: Continuous integration, rev:72
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild:
http://
- 73. By Victor Thompson on 2015-08-22
-
Merge and resolve conflicts
PASSED: Continuous integration, rev:73
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
- 74. By Victor Thompson on 2015-09-01
-
Merge of trunk
PASSED: Continuous integration, rev:74
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
- 75. By Victor Thompson on 2015-09-25
-
Merge and resolve conflicts.
- 76. By Victor Thompson on 2015-09-25
-
fix bad conflict resolution
PASSED: Continuous integration, rev:76
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
Victor Thompson (vthompson) wrote : | # |
I've been testing this branch a bit. I think many of the list item blockers have been fixed. To aide in testing, could we get a comprehensive list of bugs that we should verify have been fixed?
Andrew Hayzen (ahayzen) wrote : | # |
Its the same set of bugs that are blocking the music one [0]
bug 1469471 (causes checkbox to not update in selectMode)
bug 1468100 (swiping can break selectMode)
bug 1486008 (swipe remove button is too small on mako)
IIRC it was only the last bug that was not fixed, which I think is now fixed in rc-proposed?
0 - https:/
Victor Thompson (vthompson) wrote : | # |
Agreed, bug 1486008 appears to be fixed in rc-proposed.
- 77. By Victor Thompson on 2015-10-18
-
Merge of trunk and resolve conflicts.
PASSED: Continuous integration, rev:77
http://
Executed test runs:
SUCCESS: http://
Click here to trigger a rebuild:
http://
- 78. By Victor Thompson on 2015-10-18
-
Removed bad FakeHeader
- 79. By Victor Thompson on 2015-10-18
-
Fix pot file
PASSED: Continuous integration, rev:79
http://
Executed test runs:
SUCCESS: http://
Click here to trigger a rebuild:
http://
Andrew Hayzen (ahayzen) wrote : | # |
We will need to bump to uc1.3 for this as well, I'll make a branch that this can rebase onto.
FAILED: Continuous integration, rev:79
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
- 80. By Victor Thompson on 2015-11-20
-
Merge of trunk
PASSED: Continuous integration, rev:80
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
- 81. By Victor Thompson on 2015-11-20
-
rebase on UC1.3 branch
- 82. By Victor Thompson on 2015-12-10
-
Merge trunk, resolve conflicts, and add changelog entry
Unmerged revisions
- 82. By Victor Thompson on 2015-12-10
-
Merge trunk, resolve conflicts, and add changelog entry
- 81. By Victor Thompson on 2015-11-20
-
rebase on UC1.3 branch
- 80. By Victor Thompson on 2015-11-20
-
Merge of trunk
- 79. By Victor Thompson on 2015-10-18
-
Fix pot file
- 78. By Victor Thompson on 2015-10-18
-
Removed bad FakeHeader
- 77. By Victor Thompson on 2015-10-18
-
Merge of trunk and resolve conflicts.
- 76. By Victor Thompson on 2015-09-25
-
fix bad conflict resolution
- 75. By Victor Thompson on 2015-09-25
-
Merge and resolve conflicts.
- 74. By Victor Thompson on 2015-09-01
-
Merge of trunk
- 73. By Victor Thompson on 2015-08-22
-
Merge and resolve conflicts
The original MP is here, for reference for remaining issues: https:/ /code.launchpad .net/~nik90/ ubuntu- weather- app/finish- listitem- migration/ +merge/ 263136