Embed radial seek bar

to remove dependy of JCenter artifact repository
kaaholst · Nov 1, 2024 · 8601856 · 8601856
1 parent 5c676eb
commit 8601856
Show file tree

Hide file tree

Showing 8 changed files with 875 additions and 57 deletions.
diff --git a/Squeezer/build.gradle b/Squeezer/build.gradle
@@ -30,9 +30,6 @@ dependencies {
     // Changelogs, see https://github.com/cketti/ckChangeLog.
     implementation 'de.cketti.library.changelog:ckchangelog:1.2.0'
 
-    // Radial SeekBar
-    implementation 'com.sdsmdg.harjot:croller:1.0.7'
-
     // Fastscroller
     implementation 'com.quiph.ui:recyclerviewfastscroller:1.0.0'
 

diff --git a/Squeezer/src/main/java/uk/org/ngo/squeezer/NowPlayingFragment.java b/Squeezer/src/main/java/uk/org/ngo/squeezer/NowPlayingFragment.java
@@ -60,8 +60,6 @@
 import com.google.android.material.button.MaterialButton;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.android.material.slider.Slider;
-import com.sdsmdg.harjot.crollerTest.Croller;
-import com.sdsmdg.harjot.crollerTest.OnCrollerChangeListener;
 
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
@@ -107,9 +105,11 @@
 import uk.org.ngo.squeezer.service.event.SongTimeChanged;
 import uk.org.ngo.squeezer.util.ImageFetcher;
 import uk.org.ngo.squeezer.widget.CallStatePermissionLauncher;
+import uk.org.ngo.squeezer.widget.RadialSeekBar;
+import uk.org.ngo.squeezer.widget.OnRadialSeekBarChangeListener;
 import uk.org.ngo.squeezer.widget.OnSwipeListener;
 
-public class NowPlayingFragment extends Fragment  implements OnCrollerChangeListener, CallStateDialog.CallStateDialogHost {
+public class NowPlayingFragment extends Fragment  implements OnRadialSeekBarChangeListener, CallStateDialog.CallStateDialogHost {
 
     private static final String TAG = "NowPlayingFragment";
 
@@ -188,7 +188,7 @@ public class NowPlayingFragment extends Fragment  implements OnCrollerChangeList
 
     // For the small artwork layout
     private CheckBox muteToggle;
-    private Croller volumeWheel;
+    private RadialSeekBar volumeWheel;
     private int currentProgress = 0;
     private boolean trackingTouch;
 
@@ -445,7 +445,7 @@ public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
                     mActivity.recreate();
                 });
 
-                volumeWheel.setOnCrollerChangeListener(this);
+                volumeWheel.setOnRadialSeekBarChangeListener(this);
                 muteToggle.setOnClickListener(view -> requireService().toggleMute());
 
                 v.findViewById(R.id.settings).setOnClickListener(view1 -> {
@@ -900,7 +900,7 @@ private void updateVolumeInfo() {
                 volumeWheel.setIndicatorColor(ColorUtils.setAlphaComponent(volumeWheel.getIndicatorColor(), volumeInfo.muted ? 63 : 255));
                 volumeWheel.setProgressPrimaryColor(ColorUtils.setAlphaComponent(volumeWheel.getProgressPrimaryColor(), volumeInfo.muted ? 63 : 255));
                 volumeWheel.setProgressSecondaryColor(ColorUtils.setAlphaComponent(volumeWheel.getProgressSecondaryColor(), volumeInfo.muted ? 63 : 255));
-                volumeWheel.setOnCrollerChangeListener(volumeInfo.muted ? null : this);
+                volumeWheel.setOnRadialSeekBarChangeListener(volumeInfo.muted ? null : this);
                 volumeWheel.setOnTouchListener(volumeInfo.muted ? (view, motionEvent) -> true : null);
             }
         }
@@ -1272,7 +1272,7 @@ public void onEvent(PlayerVolume event) {
     }
 
     @Override
-    public void onProgressChanged(Croller croller, int progress) {
+    public void onProgressChanged(RadialSeekBar seekBar, int progress) {
         if (currentProgress != progress) {
             currentProgress = progress;
             volumeWheel.setLabel(String.valueOf(progress));
@@ -1281,12 +1281,12 @@ public void onProgressChanged(Croller croller, int progress) {
     }
 
     @Override
-    public void onStartTrackingTouch(Croller croller) {
+    public void onStartTrackingTouch(RadialSeekBar seekBar) {
         trackingTouch = true;
     }
 
     @Override
-    public void onStopTrackingTouch(Croller croller) {
+    public void onStopTrackingTouch(RadialSeekBar seekBar) {
         trackingTouch = false;
     }
 

diff --git a/Squeezer/src/main/java/uk/org/ngo/squeezer/widget/Croller.java b/Squeezer/src/main/java/uk/org/ngo/squeezer/widget/Croller.java
diff --git a/Squeezer/src/main/java/uk/org/ngo/squeezer/widget/OnRadialSeekBarChangeListener.java b/Squeezer/src/main/java/uk/org/ngo/squeezer/widget/OnRadialSeekBarChangeListener.java
@@ -0,0 +1,9 @@
+package uk.org.ngo.squeezer.widget;
+
+public interface OnRadialSeekBarChangeListener {
+    void onProgressChanged(RadialSeekBar seekBar, int progress);
+
+    void onStartTrackingTouch(RadialSeekBar seekBar);
+
+    void onStopTrackingTouch(RadialSeekBar seekBar);
+}