superapp audio item fix

app/build.gradle

@@ -84,6 +84,12 @@ android {
     }
 }
 
+task testClasses {
+    doLast {
+        println 'This is a dummy testClasses task'
+    }
+}
+
 dependencies {
     implementation 'com.microsoft.appcenter:appcenter-analytics:5.0.1'
     implementation 'com.microsoft.appcenter:appcenter-crashes:5.0.1'

app/src/main/java/ru/vtosters/lite/music/cache/helpers/TracklistHelper.java

@@ -6,12 +6,14 @@ import com.vk.dto.music.MusicTrack;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
+import ru.vtosters.hooks.other.Preferences;
 import ru.vtosters.lite.music.cache.CacheDatabaseDelegate;
 import ru.vtosters.lite.music.cache.FileCacheImplementation;
 
 import java.io.File;
 import java.net.MalformedURLException;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 public class TracklistHelper {
@@ -20,9 +22,18 @@ public class TracklistHelper {
     }
 
     public static List<MusicTrack> getTracks() {
-        return CacheDatabaseDelegate.getTracks();
+        List<MusicTrack> tracks = CacheDatabaseDelegate.getTracks();
+
+        boolean doNotinvertOrder = Preferences.getBoolValue("invertCachedTracks", false);
+
+        if (!doNotinvertOrder) {
+            Collections.reverse(tracks);
+        }
+
+        return tracks;
     }
 
+
     public static List<MusicTrack> getTracks(String id) {
         return CacheDatabaseDelegate.getTracksByAlbum(id);
     }
@@ -33,9 +44,11 @@ public class TracklistHelper {
 
     public static JSONArray tracksToIds(List<MusicTrack> tracks) {
         var arr = new JSONArray();
+
         for (MusicTrack track : tracks) {
             arr.put(track.y1());
         }
+
         return arr;
     }
 

app/src/main/java/ru/vtosters/lite/ui/fragments/MediaFragment.java

@@ -123,6 +123,8 @@ public class MediaFragment extends TrackedMaterialPreferenceToolbarFragment {
             return true;
         });
 
+        findPreference("invertCachedTracks").setVisible(CacheDatabaseDelegate.hasTracks());
+
         if (!LibVKXClient.isVkxInstalled()) {
             findPreference("vkx_sett").setVisible(false);
         }

app/src/main/java/ru/vtosters/lite/utils/SuperAppUtils.java

@@ -19,8 +19,8 @@ public class SuperAppUtils {
     }
 
     public static JSONObject superapp(JSONObject json) throws JSONException {
-        var superApps = Preferences.getPreferences().getString("superapp_items",
-                "menu,miniapps,vkpay_slim,greeting,promo,holiday,weather,sport,games,informer,food,event,music,vk_run").split(",");
+        var superApps = Preferences.getPreferences().getString("superapp_items", "menu,miniapps,vkpay_slim,greeting,promo,holiday,weather,sport,games,informer,food,event,music,vk_run").split(",");
+
         if (superApps.length == 0) return json;
 
         var oldItems = json.optJSONArray("items");
@@ -31,7 +31,24 @@ public class SuperAppUtils {
                 var type = item.optString("type");
                 for (String superApp : superApps) {
                     if (type.equals(superApp))
-                        newItems.put(item);
+                        if (superApp.equals("menu")) { // superapp menu fix
+                            String menuitems = "groups,audios,stickers,podcasts,shopping,lives,videos,games,vk_calls,vk_pay,ads_easy_promote,classifieds,events";
+                            JSONObject menuItem = new JSONObject();
+                            JSONArray menuItems = new JSONArray();
+
+                            generateMenuItems(menuitems, menuItems);
+
+                            JSONObject object = new JSONObject();
+                            object.put("count", menuitems.split(",").length);
+                            object.put("items", menuItems);
+
+                            menuItem.put("type", "menu");
+                            menuItem.put("object", object);
+
+                            newItems.put(menuItem);
+                        } else {
+                            newItems.put(item);
+                        }
                 }
             }
             for (int i = 0; i < superApps.length; i++) {
@@ -46,4 +63,16 @@ public class SuperAppUtils {
 
         return json.putOpt("items", newItems);
     }
+
+    private static void generateMenuItems(String str, JSONArray jsonArray) throws JSONException {
+        String[] strings = str.split(",");
+
+        for (String string : strings) {
+            JSONObject jsonObject = new JSONObject();
+
+            jsonObject.put("name", string);
+
+            jsonArray.put(jsonObject);
+        }
+    }
 }

smali/res/values-be/strings.xml

@@ -7032,4 +7032,7 @@
     <string name="clear_all_cache">Ачысціць ўвесь кэш?</string>
     <string name="cache_size">Памер прыкладання</string>
     <string name="cache_size_summ">Вага кэша прыкладання</string>
+
+    <string name="invertcached_title">Інвертаваць cпіс</string>
+    <string name="invertcached_summ">Інвертаваць cпіс кэшаваных трэкаў</string>
 </resources>

smali/res/values-ru/strings.xml

@@ -6414,4 +6414,7 @@
     <string name="clear_all_cache">Очистить весь кеш?</string>
     <string name="cache_size">Размер приложения</string>
     <string name="cache_size_summ">Вес кеша приложения</string>
+
+    <string name="invertcached_title">Инвертировать список</string>
+    <string name="invertcached_summ">Инвертировать список кешированных треков</string>
 </resources>

smali/res/values-uk/strings.xml

@@ -6339,4 +6339,7 @@
     <string name="clear_all_cache">Очистити весь кеш?</string>
     <string name="cache_size">Розмір програми</string>
     <string name="cache_size_summ">Вага кеша додатки</string>
+
+    <string name="invertcached_title">Інвертувати список</string>
+    <string name="invertcached_summ">Інвертувати список кешованих треків</string>
 </resources>

smali/res/values/strings.xml

@@ -6552,4 +6552,7 @@ May look like a fake leaving the online"</string>
     <string name="clear_all_cache">Clear all cache?</string>
     <string name="cache_size">App size</string>
     <string name="cache_size_summ">Cache size</string>
+
+    <string name="invertcached_title">Invert list</string>
+    <string name="invertcached_summ">Invert cached track list</string>
 </resources>

smali/res/xml/preferences_media.xml

@@ -18,6 +18,11 @@
         <Preference
                 android:key="cached_tracks"
                 android:title="@string/cached_tracks_title"/>
+        <com.vtosters.lite.ui.MaterialSwitchPreference
+                android:defaultValue="false"
+                android:key="invertCachedTracks"
+                android:summary="@string/invertcached_summ"
+                android:title="@string/invertcached_title"/>
         <com.vtosters.lite.ui.MaterialSwitchPreference
                 android:defaultValue="false"
                 android:key="autocache"