Skip to content
Snippets Groups Projects

Breadcrumb backstack

Merged Nicolas Pomepuy requested to merge Aza/vlc-android:breadcrumb_backstack into master
3 unresolved threads

Description

Change the way we handle the backstack for browsing files.

  • Store the complete file path in PathAdapter to avoid false positive when substituing
  • Make sure the backstack is always complete even when using favorites shortcuts

Motivation and Context

How Has This Been Tested?

Screenshots / GIFs (if appropriate):

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Enhancement (non-breaking change which cleans up / improves existing functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)

Checklist

  • I have read the CONTRIBUTING section of the README document.

Resolves

Fixes: #944 (closed)

Edited by Nicolas Pomepuy

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
9 8 import android.widget.TextView
10 import androidx.collection.SimpleArrayMap
11 9 import androidx.recyclerview.widget.RecyclerView
12 10 import org.videolan.medialibrary.interfaces.media.AbstractMediaWrapper
13 11 import org.videolan.medialibrary.media.MediaLibraryItem
14 12 import org.videolan.vlc.BuildConfig
15 13 import org.videolan.vlc.R
16 14 import org.videolan.vlc.util.AndroidDevices
17
18 private val storages = SimpleArrayMap<String, String>()
15 import org.videolan.vlc.viewmodels.browser.IPathOperationDelegate
16 import org.videolan.vlc.viewmodels.browser.PathOperationDelegate
19 17
20 18 class PathAdapter(val browser: PathAdapterListener, media: AbstractMediaWrapper) : RecyclerView.Adapter<PathAdapter.ViewHolder>() {
21 19
20 private val browserModel = browser.getPathOperationDelegate()
  • Geoffrey Métais
    Geoffrey Métais @Dekans started a thread on an outdated change in commit 7e42d671
  • 176 173
    177 174 override fun showRoot(): Boolean = true
    178 175
    176 override fun getPathOperationDelegate() = viewModel as BrowserModel
  • Geoffrey Métais
    Geoffrey Métais @Dekans started a thread on an outdated change in commit 108d838a
  • 9 8 import android.widget.TextView
    10 import androidx.collection.SimpleArrayMap
    11 9 import androidx.recyclerview.widget.RecyclerView
    12 10 import org.videolan.medialibrary.interfaces.media.AbstractMediaWrapper
    13 11 import org.videolan.medialibrary.media.MediaLibraryItem
    14 12 import org.videolan.vlc.BuildConfig
    15 13 import org.videolan.vlc.R
    16 14 import org.videolan.vlc.util.AndroidDevices
    17
    18 private val storages = SimpleArrayMap<String, String>()
    15 import org.videolan.vlc.viewmodels.browser.IPathOperationDelegate
    16 import org.videolan.vlc.viewmodels.browser.PathOperationDelegate
    19 17
    20 18 class PathAdapter(val browser: PathAdapterListener, media: AbstractMediaWrapper) : RecyclerView.Adapter<PathAdapter.ViewHolder>() {
    21 19
    20 private val browserModel = browser.getPathOperationDelegate()
  • added 1 commit

    • cb5848ee - Refactor BrowserModel: add a delegate to perform the path operations

    Compare with previous version

  • added 1 commit

    • fb5bd3a4 - Correctly navigate to parent even if it's not in backstack

    Compare with previous version

  • mentioned in issue #1031 (closed)

  • Nicolas Pomepuy marked the checklist item Make sure the backstack is always complete even when using favorites shortcuts as completed

    marked the checklist item Make sure the backstack is always complete even when using favorites shortcuts as completed

  • Nicolas Pomepuy unmarked as a Work In Progress

    unmarked as a Work In Progress

  • Nicolas Pomepuy changed the description

    changed the description

  • Geoffrey Métais added 111 commits

    added 111 commits

    • fb5bd3a4...66442839 - 108 commits from branch videolan:master
    • 338a6c82 - PathAdapter now stores full path items to avoid false positives
    • e9f587d5 - Refactor BrowserModel: add a delegate to perform the path operations
    • 04c022e2 - Correctly navigate to parent even if it's not in backstack

    Compare with previous version

  • Geoffrey Métais enabled an automatic merge when the pipeline for 04c022e2 succeeds

    enabled an automatic merge when the pipeline for 04c022e2 succeeds

  • Manually merged.

  • Please register or sign in to reply
    Loading