Ubuntu Weather App

Merge lp://staging/~ubuntu-weather-dev/ubuntu-weather-app/reboot-finish-listitem-migration into lp://staging/ubuntu-weather-app/obsolete.trunk

  1. reboot-finish-listitem-migration
  2. Merge into trunk
Proposed by Victor Thompson
Status: Superseded
Proposed branch: lp://staging/~ubuntu-weather-dev/ubuntu-weather-app/reboot-finish-listitem-migration
Merge into: lp://staging/ubuntu-weather-app/obsolete.trunk
Diff against target: 13647 lines (+13151/-0) (has conflicts)
89 files modified
.bzrignore (+19/-0)
AUTHORS (+9/-0)
CMakeLists.txt (+101/-0)
COPYING (+674/-0)
README (+11/-0)
README.autopilot (+57/-0)
README.translations (+37/-0)
app/CMakeLists.txt (+16/-0)
app/components/CMakeLists.txt (+5/-0)
app/components/CurrentLocation.qml (+97/-0)
app/components/DayDelegate.qml (+248/-0)
app/components/EmptyStateComponent.qml (+67/-0)
app/components/ExpandableListItem.qml (+90/-0)
app/components/FakeHeader.qml (+39/-0)
app/components/FastScroll.js (+130/-0)
app/components/FastScroll.qml (+321/-0)
app/components/ForecastDetailsDelegate.qml (+49/-0)
app/components/HeaderRow.qml (+44/-0)
app/components/HomeGraphic.qml (+39/-0)
app/components/HomeHourly.qml (+101/-0)
app/components/HomeTempInfo.qml (+73/-0)
app/components/LoadingIndicator.qml (+87/-0)
app/components/MultiSelectListView.qml (+71/-0)
app/components/PageWithBottomEdge.qml (+461/-0)
app/components/SettingsButton.qml (+43/-0)
app/components/StandardListItem.qml (+48/-0)
app/components/WeatherListView.qml (+31/-0)
app/data/CMakeLists.txt (+5/-0)
app/data/CitiesList.js (+65/-0)
app/data/Storage.qml (+214/-0)
app/data/WeatherApi.js (+760/-0)
app/data/key.js (+1/-0)
app/data/suncalc.js (+300/-0)
app/graphics/CMakeLists.txt (+5/-0)
app/graphics/extended-information_chance-of-rain.svg (+153/-0)
app/graphics/extended-information_humidity.svg (+147/-0)
app/graphics/extended-information_sunrise.svg (+88/-0)
app/graphics/extended-information_sunset.svg (+88/-0)
app/graphics/extended-information_uv-level.svg (+270/-0)
app/graphics/extended-information_wind.svg (+155/-0)
app/ubuntu-weather-app.qml (+292/-0)
app/ui/AddLocationPage.qml (+310/-0)
app/ui/CMakeLists.txt (+7/-0)
app/ui/HomePage.qml (+198/-0)
app/ui/LocationPane.qml (+200/-0)
app/ui/LocationsPage.qml (+308/-0)
app/ui/SettingsPage.qml (+51/-0)
app/ui/settings/CMakeLists.txt (+5/-0)
app/ui/settings/DataProviderPage.qml (+61/-0)
app/ui/settings/LocationPage.qml (+36/-0)
app/ui/settings/RefreshIntervalPage.qml (+55/-0)
app/ui/settings/UnitsPage.qml (+111/-0)
debian/changelog (+197/-0)
debian/compat (+1/-0)
debian/control (+41/-0)
debian/copyright (+79/-0)
debian/rules (+14/-0)
debian/source/format (+1/-0)
debian/ubuntu-weather-app-autopilot.install (+1/-0)
debian/ubuntu-weather-app.install (+1/-0)
manifest.json.in (+23/-0)
po/CMakeLists.txt (+33/-0)
po/com.ubuntu.weather.pot (+196/-0)
po/de.po (+216/-0)
po/en_GB.po (+214/-0)
po/fr.po (+216/-0)
po/gl.po (+214/-0)
po/hu.po (+213/-0)
po/pl.po (+216/-0)
po/pt.po (+213/-0)
po/ru.po (+213/-0)
po/sv.po (+212/-0)
po/zh_TW.po (+212/-0)
tests/CMakeLists.txt (+1/-0)
tests/autopilot/CMakeLists.txt (+10/-0)
tests/autopilot/ubuntu_weather_app/CMakeLists.txt (+10/-0)
tests/autopilot/ubuntu_weather_app/__init__.py (+113/-0)
tests/autopilot/ubuntu_weather_app/databases/34e1e542f2f083ff18f537b07a380071.ini (+6/-0)
tests/autopilot/ubuntu_weather_app/databases/CMakeLists.txt (+6/-0)
tests/autopilot/ubuntu_weather_app/databases/location_added.conf (+3/-0)
tests/autopilot/ubuntu_weather_app/files/1.json (+1509/-0)
tests/autopilot/ubuntu_weather_app/files/2.json (+1509/-0)
tests/autopilot/ubuntu_weather_app/files/CMakeLists.txt (+6/-0)
tests/autopilot/ubuntu_weather_app/tests/CMakeLists.txt (+6/-0)
tests/autopilot/ubuntu_weather_app/tests/__init__.py (+303/-0)
tests/autopilot/ubuntu_weather_app/tests/test_empty_state.py (+37/-0)
tests/autopilot/ubuntu_weather_app/tests/test_home_page.py (+32/-0)
ubuntu-weather-app.apparmor (+8/-0)
ubuntu-weather-app.desktop.in.in (+13/-0)
Conflict adding file .bzrignore.  Moved existing file to .bzrignore.moved.
Conflict adding file AUTHORS.  Moved existing file to AUTHORS.moved.
Conflict adding file CMakeLists.txt.  Moved existing file to CMakeLists.txt.moved.
Conflict adding file COPYING.  Moved existing file to COPYING.moved.
Conflict adding file README.  Moved existing file to README.moved.
Conflict adding file README.translations.  Moved existing file to README.translations.moved.
Conflict adding file debian.  Moved existing file to debian.moved.
Conflict adding file po.  Moved existing file to po.moved.
Conflict adding file tests.  Moved existing file to tests.moved.
To merge this branch: bzr merge lp://staging/~ubuntu-weather-dev/ubuntu-weather-app/reboot-finish-listitem-migration
Reviewer Review Type Date Requested Status
Ubuntu Weather Developers Pending
Review via email: mp+266980@code.staging.launchpad.net

Commit message

This MP implements the following,

* 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

To post a comment you must log in.
lp://staging/~ubuntu-weather-dev/ubuntu-weather-app/reboot-finish-listitem-migration updated
71. By Victor Thompson

Update for comments

72. By Victor Thompson

Fix visual issues

73. By Victor Thompson

Merge and resolve conflicts

74. By Victor Thompson

Merge of trunk

75. By Victor Thompson

Merge and resolve conflicts.

76. By Victor Thompson

fix bad conflict resolution

77. By Victor Thompson

Merge of trunk and resolve conflicts.

78. By Victor Thompson

Removed bad FakeHeader

79. By Victor Thompson

Fix pot file

80. By Victor Thompson

Merge of trunk

81. By Victor Thompson

rebase on UC1.3 branch

82. By Victor Thompson

Merge trunk, resolve conflicts, and add changelog entry

Unmerged revisions

82. By Victor Thompson

Merge trunk, resolve conflicts, and add changelog entry

81. By Victor Thompson

rebase on UC1.3 branch

80. By Victor Thompson

Merge of trunk

79. By Victor Thompson

Fix pot file

78. By Victor Thompson

Removed bad FakeHeader

77. By Victor Thompson

Merge of trunk and resolve conflicts.

76. By Victor Thompson

fix bad conflict resolution

75. By Victor Thompson

Merge and resolve conflicts.

74. By Victor Thompson

Merge of trunk

73. By Victor Thompson

Merge and resolve conflicts

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