[Android] Rename Sorting interface to SortModule
Geoffrey Métais
git at videolan.org
Mon Sep 23 18:10:56 CEST 2019
vlc-android | branch: 3.2.x | Geoffrey Métais <geoffrey.metais at gmail.com> | Thu Sep 19 09:35:59 2019 +0200| [f78f26a84bbcd1b55928f22a3b10f9ec155c9dad] | committer: Geoffrey Métais
Rename Sorting interface to SortModule
(cherry picked from commit 0468fea116febc0c754e741929f1a1d527320b37)
> https://code.videolan.org/videolan/vlc-android/commit/f78f26a84bbcd1b55928f22a3b10f9ec155c9dad
---
.../org/videolan/vlc/providers/medialibrary/MedialibraryProvider.kt | 2 +-
vlc-android/src/org/videolan/vlc/util/ModelsHelper.kt | 2 +-
vlc-android/src/org/videolan/vlc/viewmodels/SortableModel.kt | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/vlc-android/src/org/videolan/vlc/providers/medialibrary/MedialibraryProvider.kt b/vlc-android/src/org/videolan/vlc/providers/medialibrary/MedialibraryProvider.kt
index 8f57b404a..3cca1729b 100644
--- a/vlc-android/src/org/videolan/vlc/providers/medialibrary/MedialibraryProvider.kt
+++ b/vlc-android/src/org/videolan/vlc/providers/medialibrary/MedialibraryProvider.kt
@@ -36,7 +36,7 @@ import org.videolan.vlc.util.*
import org.videolan.vlc.viewmodels.SortableModel
abstract class MedialibraryProvider<T : MediaLibraryItem>(val context: Context, val scope: SortableModel) : HeaderProvider(),
- ISortModel
+ SortModule
{
private val settings = Settings.getInstance(context)
protected val medialibrary = AbstractMedialibrary.getInstance()
diff --git a/vlc-android/src/org/videolan/vlc/util/ModelsHelper.kt b/vlc-android/src/org/videolan/vlc/util/ModelsHelper.kt
index 45e09f455..977fb23a5 100644
--- a/vlc-android/src/org/videolan/vlc/util/ModelsHelper.kt
+++ b/vlc-android/src/org/videolan/vlc/util/ModelsHelper.kt
@@ -235,7 +235,7 @@ interface RefreshModel {
fun refresh()
}
-interface ISortModel {
+interface SortModule {
fun sort(sort: Int)
fun canSortByName() = true
fun canSortByFileNameName() = false
diff --git a/vlc-android/src/org/videolan/vlc/viewmodels/SortableModel.kt b/vlc-android/src/org/videolan/vlc/viewmodels/SortableModel.kt
index 4748797d1..ebeeb0eaf 100644
--- a/vlc-android/src/org/videolan/vlc/viewmodels/SortableModel.kt
+++ b/vlc-android/src/org/videolan/vlc/viewmodels/SortableModel.kt
@@ -2,12 +2,12 @@ package org.videolan.vlc.viewmodels
import android.content.Context
import org.videolan.medialibrary.interfaces.AbstractMedialibrary
-import org.videolan.vlc.util.ISortModel
import org.videolan.vlc.util.RefreshModel
import org.videolan.vlc.util.Settings
+import org.videolan.vlc.util.SortModule
abstract class SortableModel(protected val context: Context): ScopedModel(), RefreshModel,
- ISortModel
+ SortModule
{
private val settings = Settings.getInstance(context)
protected open val sortKey : String = this.javaClass.simpleName
More information about the Android
mailing list