merge origin/main into main

Author: grimmthejow

README.md

@@ -127,13 +127,13 @@ A: Make sure storage permissions are granted and your audio files are in support
 **Q: Does XMusic collect any personal data?**  
 A: No. There is no tracking, analytics abuse, or data harvesting.
 
-**Q: Why did playback stop in the background?** 
+**Q: Why did playback stop in the background?**  
 A: Your system’s battery optimization or OEM “power saving” probably killed it. Disable optimizations for XMusic.
 
 **Q: Can I request features or report bugs?**  
 A: Yes. Use GitHub Issues for bugs and feature requests, or join the Telegram community for discussion.
 
-**Q: Why is feature X not available?**
+**Q: Why is feature X not available?**  
 A: If you think this feature will be useful for a lot of people, feel free to suggest it via reaching to our [Telegram Community](https://t.me/xmusiccommunity)
 
 **Q: Is XMusic open source?**  

app/src/main/java/com/xapps/media/xmusic/activity/MainActivity.java

@@ -8,15 +8,13 @@
 import android.media.MediaMetadataRetriever;
 import android.net.Uri;
 import android.os.*;
-import android.util.*;
 import android.view.*;
 import android.view.animation.*;
 import android.widget.*;
 import androidx.activity.*;
 import androidx.activity.OnBackPressedCallback;
 import androidx.annotation.*;
 import androidx.appcompat.app.AppCompatActivity;
-import androidx.core.content.ContextCompat;
 import androidx.core.view.*;
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.ViewModelProvider;
@@ -34,7 +32,6 @@
 import com.google.android.material.search.SearchView;
 import com.google.android.material.transition.MaterialFadeThrough;
 import com.google.common.util.concurrent.ListenableFuture;
-import com.google.common.util.concurrent.MoreExecutors;
 import com.xapps.media.xmusic.R;
 import com.xapps.media.xmusic.activity.controller.ActivityMediaController;
 import com.xapps.media.xmusic.activity.manager.BottomSheetBehaviorManager;
@@ -116,34 +113,34 @@ protected void onSaveInstanceState(@NonNull Bundle outState) {
         super.onSaveInstanceState(outState);
     }
 
-    @Override
+    @Override
 	protected void onCreate(Bundle bundle) {
         isCreated = true;
         EdgeToEdge.enable(this);
         if (Build.VERSION.SDK_INT >= 29) getWindow().setNavigationBarContrastEnforced(false);
         XUtils.updateTheme();
         XUtils.applyDynamicColors(this, DataManager.isOledThemeEnabled());
         if (XUtils.isDarkMode(this) && DataManager.isOledThemeEnabled())getTheme().applyStyle(R.style.ThemeOverlay_XMusic_OLED, true);
-        super.onCreate(bundle);
-		binding = ActivityMainBinding.inflate(getLayoutInflater());
+        super.onCreate(bundle);
+		binding = ActivityMainBinding.inflate(getLayoutInflater());
 		setContentView(binding.getRoot());
         int resourceId = context.getResources().getIdentifier("navigation_bar_height", "dimen", "android");
         int resourceId2 = context.getResources().getIdentifier("status_bar_height", "dimen", "android");
 		if (resourceId > 0 && resourceId2 > 0) {
             statusBarHeight = context.getResources().getDimensionPixelSize(resourceId2);
             navBarHeight = context.getResources().getDimensionPixelSize(resourceId);
 		}
-        loadSongs();
-		initialize();
+        loadSongs();
+		initialize();
 	}
 
-    @Override
+    @Override
 	protected void onResume() {
         CallbackInterface.setActivityCallback(this);
         binding.currentSongTitle.resetMarquee();
         binding.currentSongArtist.resetMarquee();
         binding.artistBigTitle.resetMarquee();
-        binding.songBigTitle.resetMarquee();
+        binding.songBigTitle.resetMarquee();
 	    super.onResume();
         isResuming = true;
         if (mediaController != null) {
@@ -162,10 +159,10 @@ protected void onResume() {
         isResuming = false;
     }
 
-    @Override
+    @Override
 	public void onPause() {
-        CallbackInterface.clearActivityCallback(this);
-		super.onPause();
+        CallbackInterface.clearActivityCallback(this);
+		super.onPause();
 	}
 
     @Override
@@ -234,7 +231,7 @@ private void initialize() {
         Looper looper = handlerThread.getLooper();
         backgroundHandler = new Handler(looper);
         MaterialColorUtils.initColors(this);
-        setupUI();
+        setupUI();
 		setupListeners();
         setupCallbacks();
         bsbManager = new BottomSheetBehaviorManager(this);
@@ -252,12 +249,12 @@ private void setupUI() {
 		progressDrawable.setTransitionEnabled(true);
 		progressDrawable.setAnimate(true);
 		progressDrawable.setTint(MaterialColorUtils.colorPrimary);
-        binding.songSeekbar.setProgressDrawable(progressDrawable);
+        binding.songSeekbar.setProgressDrawable(progressDrawable);
 		bottomSheetColor = MaterialColorUtils.colorSurfaceContainer;
         binding.extendableLayout.setPadding(0, 0, 0, navBarHeight);
         XUtils.setMargins(binding.coversPager, 0, XUtils.getStatusBarHeight(this)*5, 0, 0);
         bsbHeight = binding.expressiveBottomSheet.getPeekHeight();
-        loadSettings();
+        loadSettings();
 	}
 
     public void setSong(int position, boolean ignored) {
@@ -491,17 +488,17 @@ private void restoreStateIfPossible() {
     }
 
     private void setupListeners() {
-        binding.toggleView.setExtraOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View _view) {
+        binding.toggleView.setExtraOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View _view) {
 				if (!binding.toggleView.isAnimating()) {
                     mediaController.pause();
-                    progressDrawable.setAnimate(false);
+                    progressDrawable.setAnimate(false);
 				} else {
                     mediaController.play();
-                    progressDrawable.setAnimate(true);
-				}
-			}
+                    progressDrawable.setAnimate(true);
+				}
+			}
 		});
 
         binding.miniPlayerBottomSheet.setOnClickListener(v -> {
@@ -1255,7 +1252,7 @@ public void loadLyrics(String path) {
             if (lyrics != null && !lyrics.isEmpty()) {
                 LyricsParser.parse(lyrics, result -> {
                     binding.xlyricsView.post(() -> {
-                        binding.xlyricsView.setLyrics(result.lines);
+                        binding.xlyricsView.setLyrics(result.lines());
                         binding.xlyricsView.setListener(MainActivity.this);
 
 						MaterialFadeThrough mft = new MaterialFadeThrough();

app/src/main/java/com/xapps/media/xmusic/fragment/LyricsCustomizeFragment.java

@@ -0,0 +1,62 @@
+package com.xapps.media.xmusic.fragment;
+
+import com.xapps.media.xmusic.activity.RootActivity;
+import com.xapps.media.xmusic.common.SettingsItem;
+import com.xapps.media.xmusic.data.DataManager;
+import com.xapps.media.xmusic.utils.XUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class LyricsCustomizeFragment extends BasePrefsFragment {
+     private RootActivity activity;
+
+    @Override
+    protected List<SettingsItem> provideItems() {
+        activity = (RootActivity) getActivity();
+        List<SettingsItem> settings = new ArrayList<>();
+
+        settings.add(new SettingsItem(SettingsItem.TYPE_HEADER, "h1", "Lyrics font", "", null));
+        settings.add(new SettingsItem(SettingsItem.TYPE_NAV, "font_size", "Font size", "Choose how big lyrics text should be", null));
+        settings.add(new SettingsItem(SettingsItem.TYPE_SWITCH, "use_system_font", "Use System font", "Whether to use the app's font or the system's for rendering lyrics", null));
+        settings.add(new SettingsItem(SettingsItem.TYPE_NAV, "font_weight", "Font weight", "Choose the font weight that suits you", null));
+        settings.add(new SettingsItem(SettingsItem.TYPE_SWITCH, "rounded_font", "Round lyrics letters", "Make the lyrics letters' edges round", null));
+        settings.add(new SettingsItem(SettingsItem.TYPE_HEADER, "h2", "Lyrics Appearance", "", null));
+        settings.add(new SettingsItem(SettingsItem.TYPE_SWITCH, "lyrics_gradient_background", "Enable lyrics gradient", "Display a beautiful gradient background behind the lyrics, might impact performance", null));
+        settings.add(new SettingsItem(SettingsItem.TYPE_SWITCH, "lyrics_blur", "Blur Lyrics", "Apply a blur effect for inactive lyrics lines, might impact performance", null));
+        settings.add(new SettingsItem(SettingsItem.TYPE_SWITCH, "lyrics_sparkles", "Enable Lyrics Sparkles", "Apply a Sparkling effect to the lyrics while being sung", null));
+        settings.add(new SettingsItem(SettingsItem.TYPE_HEADER, "h3", "Lyrics Behavior", "", null));
+        settings.add(new SettingsItem(SettingsItem.TYPE_SWITCH, "lyrics_anticipation", "Enable lyrics anticipation", "Lyrics will always go to next line before it's sung", null));
+        settings.add(new SettingsItem(SettingsItem.TYPE_SWITCH, "lyrics_elastic_scroll", "Enable Staggered Scrolling", "Make the lyrics lines scroll in a delayed way for better immersion", null));
+        settings.add(new SettingsItem(SettingsItem.TYPE_SWITCH, "lyrics_elastic_manual_scroll", "Staggered manual scrolling", "Apply the staggered scroll effect to user manual scrolling, might feel weird", null));
+
+        return settings;
+    }
+
+    @Override
+    public String getFragmentTitle() {
+        return "Customize Lyrics";
+    }
+
+    @Override
+    protected void onItemSelected(SettingsItem item) {
+        switch (item.id) {
+            default -> {
+                XUtils.showMessage(getActivity(), "Feature to be added soon");
+            }
+        }
+    }
+
+    @Override
+    protected void onSwitchChanged(SettingsItem item, boolean value) {
+        super.onSwitchChanged(item, value);
+        switch (item.id) {
+            case "lyrics_elastic_scroll", "lyrics_elastic_manual_scroll", "lyrics_sparkles" -> {
+                activity.updateLyrics();
+            }
+            default -> {
+                XUtils.showMessage(getActivity(), "Feature to be added soon");
+            }
+        }
+    }
+}

app/src/main/java/com/xapps/media/xmusic/models/LyricItem.java

@@ -0,0 +1,15 @@
+package com.xapps.media.xmusic.models;
+
+public class LyricItem {
+    public LyricLine mainLine;
+    public int mainIndex;
+    public LyricLine romajiLine;
+    public int romajiIndex = -1;
+    public LyricLine linkedBgLine;
+    public int linkedBgIndex = -1;
+
+    public LyricItem(LyricLine main, int idx) {
+        this.mainLine = main;
+        this.mainIndex = idx;
+    }
+}

app/src/main/java/com/xapps/media/xmusic/utils/ColorPaletteUtils.java

@@ -1,11 +1,11 @@
 package com.xapps.media.xmusic.utils;
 
+import android.annotation.SuppressLint;
 import android.graphics.Bitmap;
 
 import com.google.android.material.color.utilities.Hct;
 import com.google.android.material.color.utilities.QuantizerCelebi;
 import com.google.android.material.color.utilities.Score;
-import com.google.android.material.color.utilities.Scheme;
 
 import java.util.HashMap;
 import java.util.List;
@@ -52,14 +52,14 @@ public static void generateFromBitmap(Bitmap bitmap, ResultCallback callback) {
                         0, 0, scaled.getWidth(), scaled.getHeight()
                 );
 
-                Map<Integer, Integer> colorMap =
+                @SuppressLint("RestrictedApi") Map<Integer, Integer> colorMap =
                         QuantizerCelebi.quantize(pixels, 16);
 
-                List<Integer> ranked =
+                @SuppressLint("RestrictedApi") List<Integer> ranked =
                         Score.score(colorMap, 0, 1, false);
 
                 int seedColor = ranked.isEmpty() ? 0xFF6750A4 : ranked.get(0);
-                Hct seed = Hct.fromInt(seedColor);
+                @SuppressLint("RestrictedApi") Hct seed = Hct.fromInt(seedColor);
 
                 Map<String, Integer> newLight =
                         generateMaterialTones(seed, false);
@@ -95,12 +95,11 @@ public static void generateFromBitmap(Bitmap bitmap, ResultCallback callback) {
     }
 
     public static void generateFromColor(int color, ResultCallback callback) {
-    
-        int hash = color;
-        if (hash == lastBitmapHash && lightColors != null && darkColors != null) {
+
+        if (color == lastBitmapHash && lightColors != null && darkColors != null) {
             return;
         }
-        Hct seed = Hct.fromInt(color);
+        @SuppressLint("RestrictedApi") Hct seed = Hct.fromInt(color);
 
         Map<String, Integer> newLight =
                 generateMaterialTones(seed, false);
@@ -117,7 +116,7 @@ public static void generateFromColor(int color, ResultCallback callback) {
 
         lightColors = newLight;
         darkColors = newDark;
-        
+
         lastBitmapHash = color;
 
         if (callback != null) {
@@ -140,16 +139,13 @@ private static long hashBitmap(Bitmap bitmap) {
         }
         return hash;
     }
-    
-    public static long getCurrentHash() {
-        return lastBitmapHash;
-    }
 
+    @SuppressLint("RestrictedApi")
     private static Map<String, Integer> generateMaterialTones(Hct hct, boolean isDark) {
         Map<String, Integer> tones = new HashMap<>();
 
-        double hue = hct.getHue() % 360;
-        double chroma = hct.getChroma();
+        @SuppressLint("RestrictedApi") double hue = hct.getHue() % 360;
+        @SuppressLint("RestrictedApi") double chroma = hct.getChroma();
         boolean lowChroma = chroma < 10;
 
         tones.put("primary", Hct.from(hue, lowChroma ? chroma : 40, isDark ? 80 : 30).toInt());
@@ -172,8 +168,4 @@ private static Map<String, Integer> generateMaterialTones(Hct hct, boolean isDar
 
         return tones;
     }
-
-    public static Scheme generateCustomScheme(int seedColor, boolean isDarkMode) {
-        return isDarkMode ? Scheme.dark(seedColor) : Scheme.light(seedColor);
-    }
 }