tenkuma/jamfish
tenkuma/jamfish
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Cleaned up the Util classes

Browse source
This commit is contained in:
Karim Abou Zeid 2015-07-11 02:08:54 +02:00
commit 88d4dd8e80
37 changed files with 214 additions and 417 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/com/kabouzeid/gramophone/loader/AlbumLoader.java
View file

@ -11,7 +11,7 @@ import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import com.kabouzeid.gramophone.model.Album;
import com.kabouzeid.gramophone.util.PreferenceUtils;
import com.kabouzeid.gramophone.util.PreferenceUtil;
import java.util.ArrayList;
@ -78,7 +78,7 @@ public class AlbumLoader {
}
public static Cursor makeAlbumCursor(@NonNull final Context context, final String selection, final String[] values) {
return makeAlbumCursor(context, selection, values, PreferenceUtils.getInstance(context).getAlbumSortOrder());
return makeAlbumCursor(context, selection, values, PreferenceUtil.getInstance(context).getAlbumSortOrder());
}
public static Cursor makeAlbumCursor(@NonNull final Context context, final String selection, final String[] values, final String sortOrder) {

4
app/src/main/java/com/kabouzeid/gramophone/loader/AlbumSongLoader.java
View file

@ -6,7 +6,7 @@ import android.provider.MediaStore;
import android.support.annotation.NonNull;
import com.kabouzeid.gramophone.model.Song;
import com.kabouzeid.gramophone.util.PreferenceUtils;
import com.kabouzeid.gramophone.util.PreferenceUtil;
import java.util.ArrayList;
@ -27,7 +27,7 @@ public class AlbumSongLoader {
new String[]{
String.valueOf(albumId)
},
PreferenceUtils.getInstance(context).getAlbumSongSortOrder()
PreferenceUtil.getInstance(context).getAlbumSongSortOrder()
);
}
}

4
app/src/main/java/com/kabouzeid/gramophone/loader/ArtistAlbumLoader.java
View file

@ -6,7 +6,7 @@ import android.provider.MediaStore;
import android.support.annotation.NonNull;
import com.kabouzeid.gramophone.model.Album;
import com.kabouzeid.gramophone.util.PreferenceUtils;
import com.kabouzeid.gramophone.util.PreferenceUtil;
import java.util.ArrayList;
@ -25,7 +25,7 @@ public class ArtistAlbumLoader {
MediaStore.Audio.Artists.Albums.getContentUri("external", artistId),
null,
null,
PreferenceUtils.getInstance(context).getArtistAlbumSortOrder()
PreferenceUtil.getInstance(context).getArtistAlbumSortOrder()
);
}
}

4
app/src/main/java/com/kabouzeid/gramophone/loader/ArtistLoader.java
View file

@ -9,7 +9,7 @@ import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import com.kabouzeid.gramophone.model.Artist;
import com.kabouzeid.gramophone.util.PreferenceUtils;
import com.kabouzeid.gramophone.util.PreferenceUtil;
import java.util.ArrayList;
@ -85,6 +85,6 @@ public class ArtistLoader {
ArtistColumns.NUMBER_OF_ALBUMS,
/* 3 */
ArtistColumns.NUMBER_OF_TRACKS
}, selection, values, PreferenceUtils.getInstance(context).getArtistSortOrder());
}, selection, values, PreferenceUtil.getInstance(context).getArtistSortOrder());
}
}

4
app/src/main/java/com/kabouzeid/gramophone/loader/ArtistSongLoader.java
View file

@ -6,7 +6,7 @@ import android.provider.MediaStore;
import android.support.annotation.NonNull;
import com.kabouzeid.gramophone.model.Song;
import com.kabouzeid.gramophone.util.PreferenceUtils;
import com.kabouzeid.gramophone.util.PreferenceUtil;
import java.util.ArrayList;
@ -27,7 +27,7 @@ public class ArtistSongLoader {
new String[]{
String.valueOf(artistId)
},
PreferenceUtils.getInstance(context).getArtistSongSortOrder()
PreferenceUtil.getInstance(context).getArtistSongSortOrder()
);
}
}

4
app/src/main/java/com/kabouzeid/gramophone/loader/LastAddedLoader.java
View file

@ -6,7 +6,7 @@ import android.provider.MediaStore;
import android.support.annotation.NonNull;
import com.kabouzeid.gramophone.model.Song;
import com.kabouzeid.gramophone.util.PreferenceUtils;
import com.kabouzeid.gramophone.util.PreferenceUtil;
import java.util.ArrayList;
@ -20,7 +20,7 @@ public class LastAddedLoader {
public static Cursor makeLastAddedCursor(@NonNull final Context context) {
long fourWeeksAgo = (System.currentTimeMillis() / 1000) - (4 * 3600 * 24 * 7);
// possible saved timestamp caused by user "clearing" the last added playlist
long cutoff = PreferenceUtils.getInstance(context).getLastAddedCutOffTimestamp() / 1000;
long cutoff = PreferenceUtil.getInstance(context).getLastAddedCutOffTimestamp() / 1000;
if (cutoff < fourWeeksAgo) {
cutoff = fourWeeksAgo;
}

4
app/src/main/java/com/kabouzeid/gramophone/loader/SongLoader.java
View file

@ -9,7 +9,7 @@ import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import com.kabouzeid.gramophone.model.Song;
import com.kabouzeid.gramophone.util.PreferenceUtils;
import com.kabouzeid.gramophone.util.PreferenceUtil;
import java.util.ArrayList;
@ -78,7 +78,7 @@ public class SongLoader {
}
public static Cursor makeSongCursor(@NonNull final Context context, final String selection, final String[] values) {
return makeSongCursor(context, selection, values, PreferenceUtils.getInstance(context).getSongSortOrder());
return makeSongCursor(context, selection, values, PreferenceUtil.getInstance(context).getSongSortOrder());
}
public static Cursor makeSongCursor(@NonNull final Context context, @Nullable final String selection, final String[] values, final String sortOrder) {