Merge lp://staging/~nik90/podbird/devel-branch-sync-1 into lp://staging/podbird

Proposed by Nekhelesh Ramananthan
Status: Merged
Approved by: Michael Sheldon
Approved revision: 185
Merged at revision: 151
Proposed branch: lp://staging/~nik90/podbird/devel-branch-sync-1
Merge into: lp://staging/podbird
Prerequisite: lp://staging/~nik90/podbird/uc-1.3-migrate
Diff against target: 2425 lines (+920/-866)
14 files modified
app/components/HeaderListItem.qml (+2/-0)
app/components/SingleValueListItem.qml (+0/-42)
app/components/TabsList.qml (+0/-60)
app/podbird.qml (+4/-17)
app/podcasts.js (+37/-19)
app/themes/Dark.qml (+3/-3)
app/themes/Light.qml (+3/-3)
app/ui/EpisodesPage.qml (+91/-92)
app/ui/EpisodesTab.qml (+625/-0)
app/ui/PodcastsTab.qml (+6/-15)
app/ui/SearchPage.qml (+4/-14)
app/ui/SettingsPage.qml (+14/-0)
app/ui/WhatsNewTab.qml (+0/-488)
po/com.mikeasoft.podbird.pot (+131/-113)
To merge this branch: bzr merge lp://staging/~nik90/podbird/devel-branch-sync-1
Reviewer Review Type Date Requested Status
Michael Sheldon Approve
Review via email: mp+289563@code.staging.launchpad.net

Description of the change

- Added new navigation structure (combined Add new podcasts tab and podcasts tab), (replaced whatsnew tab with episodes tab)
- Fixed episode description not readable in dark theme
- Added ability to favourite episodes
- Removed zebra colouring as requested by design
- Implemented part of the new design given by kevin
- Renamed "WhatsNew" to "Recent"

@Mike, From our discussion on IRC, we agreed to keep the "Add new Podcasts" as a separate tab. However I implemented that change several commits later. So while it is not part of this MP, it has been included in devel-branch-sync-3 to avoid code conflict.

To post a comment you must log in.
Revision history for this message
Nekhelesh Ramananthan (nik90) wrote :

Note 1: In the code diff, it shows "SingleValueListItem.qml" file being removed and then readded. This is due to bzr merge from lp:podbird/devel. The only change is the addition of 2 lines,

+ divider.anchors.leftMargin: units.gu(2)
+ divider.anchors.rightMargin: units.gu(2)

Revision history for this message
Nekhelesh Ramananthan (nik90) wrote :

Note 2: Same case with TabsList.qml file. It shows it being removed and then readded. This is again due to bzr merge from lp:podbird/devel. The only change is the removal of "Add new podcasts" Tab and the replacement of "What's New" with "Episodes" tab.

As explained in the MP description, the "Add new podcasts" has been readded in a later commit in lp:podbird/devel and will be backported in the next MP.

Revision history for this message
Michael Sheldon (michael-sheldon) wrote :

See inline diff for fixes needed to the database upgrade cases

review: Needs Fixing
185. By Nekhelesh Ramananthan

Fixed db upgrade issue

Revision history for this message
Michael Sheldon (michael-sheldon) wrote :

Looks good :)

review: Approve

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