reversed list

IRA-Team · Oct 27, 2015 · df1c1a4 · df1c1a4
1 parent f143ad7
commit df1c1a4
Show file tree

Hide file tree

Showing 9 changed files with 36 additions and 15 deletions.
diff --git a/app/src/main/java/com/irateam/vkplayer/activities/ListActivity.java b/app/src/main/java/com/irateam/vkplayer/activities/ListActivity.java
@@ -246,7 +246,7 @@ public boolean onNavigationItemSelected(MenuItem menuItem) {
             cacheUpdateReceiver = new DownloadFinishedReceiver() {
                 @Override
                 public void onDownloadFinished(Audio audio) {
-                    audioAdapter.getList().add(audio);
+                    audioAdapter.getList().add(0, audio);
                     audioAdapter.notifyDataSetChanged();
                 }
             };
@@ -457,12 +457,17 @@ public void onError(String errorMessage) {
             case R.id.action_add_to_playlist:
                 List<Audio> checked = audioAdapter.getCheckedItems();
                 List<Audio> playlist = playerService.getPlaylist();
-                playlist.addAll(checked);
+                List<Audio> listToAdd = new ArrayList<>();
+                for (Audio audio : checked) {
+                    listToAdd.add(audio.clone());
+                }
+                playlist.addAll(0, listToAdd);
                 audioAdapter.notifyDataSetChanged();
                 Snackbar.make(coordinatorLayout, R.string.snackbar_add_to_playlist, Snackbar.LENGTH_LONG)
                         .setAction(R.string.snackbar_cancel, (v -> {
                             for (int i = 0; i < checked.size(); i++)
-                                playlist.remove(playlist.size() - 1);
+                                playlist.remove(0);
+                            audioAdapter.notifyDataSetChanged();
                         }))
                         .show();
                 break;

diff --git a/app/src/main/java/com/irateam/vkplayer/adapters/AudioAdapter.java b/app/src/main/java/com/irateam/vkplayer/adapters/AudioAdapter.java
@@ -115,7 +115,7 @@ public View getView(final int position, View view, ViewGroup parent) {
         element.setTitle(audio.title);
         element.setArtist(audio.artist);
         element.setCoverDrawable(AlbumCoverUtils.createFromAudio(audio));
-        if (audio.id == getPlayingAudioId()) {
+        if (audio.id == getPlayingAudioId() ) {
             if (playerService.isReady()) {
                 element.setPlaying(playerService.isPlaying());
             } else {

diff --git a/app/src/main/java/com/irateam/vkplayer/database/AudioDatabaseHelper.java b/app/src/main/java/com/irateam/vkplayer/database/AudioDatabaseHelper.java
@@ -75,7 +75,7 @@ public List<Audio> getAll() {
         SQLiteDatabase db = getReadableDatabase();
         List<Audio> list = new ArrayList<>();
 
-        Cursor cursor = db.query(TABLE_NAME, null, null, null, null, null, ID);
+        Cursor cursor = db.query(TABLE_NAME, null, null, null, null, null, "_id DESC");
         if (cursor.moveToFirst()) {
             do {
                 list.add(fromCursor(cursor));

diff --git a/app/src/main/java/com/irateam/vkplayer/models/Audio.java b/app/src/main/java/com/irateam/vkplayer/models/Audio.java
@@ -10,7 +10,7 @@
 import java.io.IOException;
 import java.net.URL;
 
-public class Audio extends VKApiAudio {
+public class Audio extends VKApiAudio implements Cloneable {
     public String cachePath;
 
     public boolean isCached() {
@@ -67,5 +67,19 @@ public Audio[] newArray(int size) {
         }
     };
 
-
+    public Audio clone() {
+        Audio audio = new Audio();
+        audio.id = id;
+        audio.owner_id = owner_id;
+        audio.artist = artist;
+        audio.title = title;
+        audio.duration = duration;
+        audio.url = url;
+        audio.lyrics_id = lyrics_id;
+        audio.album_id = album_id;
+        audio.genre = genre;
+        audio.access_key = access_key;
+        audio.cachePath = cachePath;
+        return audio;
+    }
 }
diff --git a/app/src/main/java/com/irateam/vkplayer/services/DownloadService.java b/app/src/main/java/com/irateam/vkplayer/services/DownloadService.java
@@ -27,6 +27,7 @@
 import java.net.URL;
 import java.net.URLConnection;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Queue;
@@ -132,6 +133,7 @@ public void onComplete(VKResponse response) {
                         }
                     }
                 }*/
+                Collections.reverse(vkList);
                 syncQueue = new ConcurrentLinkedQueue<>();
                 for (Audio audio : vkList) {
                     syncQueue.add(audio);

diff --git a/app/src/main/res/menu/menu_list_context.xml b/app/src/main/res/menu/menu_list_context.xml
@@ -17,14 +17,14 @@
     <item
         android:id="@+id/action_remove_from_cache"
         android:icon="@drawable/ic_remove_cache_white_24dp"
-        android:title="@string/action_remove_from_cache"
+        android:title="@string/action_delete_from_cache"
         android:visible="false"
         app:showAsAction="ifRoom" />
 
     <item
         android:id="@+id/action_delete"
         android:icon="@drawable/ic_selected_delete_white_24dp"
-        android:title="@string/action_delete"
+        android:title="@string/action_remove_from_list"
         app:showAsAction="ifRoom" />
 
     <item

diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
@@ -2,7 +2,7 @@
     <string name="app_name">VKPlayer</string>
 
     <string name="action_cache">Save</string>
-    <string name="action_delete">Delete</string>
+    <string name="action_remove_from_list">Remove from list</string>
 
     <string name="title_activity_list">List</string>
     <string name="title_activity_login">Sign in</string>
@@ -57,7 +57,7 @@
     <string name="notification_successful_sync_count">Synchronized audios:</string>
     <string name="action_add_to_playlist">Add to current playlist</string>
     <string name="action_play">Play</string>
-    <string name="action_remove_from_cache">Remove from saved</string>
+    <string name="action_delete_from_cache">Delete from saved</string>
     <string name="snackbar_add_to_playlist">Audios added to current playlist</string>
     <string name="snackbar_cancel">Cancel</string>
     <string name="pref_sync_wifi">Sync using Wi-Fi only</string>

diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
@@ -2,7 +2,7 @@
     <string name="app_name">VKPlayer</string>
 
     <string name="action_cache">Зберегти</string>
-    <string name="action_delete">Видалити</string>
+    <string name="action_remove_from_list">Видалити з списку</string>
 
     <string name="title_activity_list">Список</string>
     <string name="title_activity_login">Авторизація</string>
@@ -57,7 +57,7 @@
     <string name="notification_successful_sync_count">Синхронізовано аудіозаписів:</string>
     <string name="action_add_to_playlist">Додати в поточний плейлист</string>
     <string name="action_play">Грати</string>
-    <string name="action_remove_from_cache">Видалити з збережених</string>
+    <string name="action_delete_from_cache">Видалити з збережених</string>
     <string name="snackbar_add_to_playlist">Аудіозаписи додані в поточний плейлист</string>
     <string name="snackbar_cancel">Відмінити</string>
     <string name="pref_sync_wifi">Синхронізація через Wi-Fi</string>

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -2,8 +2,8 @@
     <string name="app_name">VKPlayer</string>
 
     <string name="action_cache">Сохранить</string>
-    <string name="action_remove_from_cache">Удалить из сохраненных</string>
-    <string name="action_delete">Удалить</string>
+    <string name="action_delete_from_cache">Удалить из сохраненных</string>
+    <string name="action_remove_from_list">Удалить из списка</string>
     <string name="action_play">Играть</string>
     <string name="action_add_to_playlist">Добавить в текущий плейлист</string>
     <string name="snackbar_add_to_playlist">Аудиозаписи добавлены в текущий плейлист</string>