Removed SpinKit

Author: halilozercan

.idea/markdown-navigator/profiles_settings.xml

@@ -20,9 +20,9 @@ android {
 }
 
 dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation project(path: ":bettervideoplayer")
-    implementation "com.android.support:appcompat-v7:$project.googleAPIsVersion"
-    implementation "com.android.support:support-compat:$project.googleAPIsVersion"
-    implementation "com.android.support:support-v4:$project.googleAPIsVersion"
+    api fileTree(dir: 'libs', include: ['*.jar'])
+    api project(path: ":bettervideoplayer")
+    api "com.android.support:appcompat-v7:$project.googleAPIsVersion"
+    api "com.android.support:support-compat:$project.googleAPIsVersion"
+    api "com.android.support:support-v4:$project.googleAPIsVersion"
 }

.idea/misc.xml

@@ -2,6 +2,7 @@
 
 import android.content.Intent;
 import android.net.Uri;
+import android.support.v4.content.ContextCompat;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 import android.support.v7.widget.Toolbar;
@@ -40,13 +41,14 @@ public void onClick(View view) {
 
         if(savedInstanceState == null) {
             bvp.setAutoPlay(true);
-            bvp.setSource(Uri.parse("android.resource://" + getPackageName() + "/" + R.raw.video));
+            bvp.setSource(Uri.parse("android.resource://" + getPackageName() + "/" + com.halilibo.sample.R.raw.video));
             bvp.setCaptions(R.raw.sub, CaptionsView.CMime.SUBRIP);
         }
 
         bvp.setHideControlsOnPlay(true);
 
         bvp.getToolbar().inflateMenu(R.menu.menu_dizi);
+        bvp.getToolbar().setOverflowIcon(ContextCompat.getDrawable(this, R.drawable.ic_settings_white_24dp));
         bvp.getToolbar().setOnMenuItemClickListener(new Toolbar.OnMenuItemClickListener() {
             @Override
             public boolean onMenuItemClick(MenuItem item) {

.idea/modules.xml

@@ -25,10 +25,8 @@ dependencies {
     implementation "com.android.support:appcompat-v7:$project.googleAPIsVersion"
     implementation "com.android.support:support-compat:$project.googleAPIsVersion"
     implementation "com.android.support:design:$project.googleAPIsVersion"
-    implementation 'me.zhanghai.android.materialprogressbar:library:1.1.7'
+    implementation 'me.zhanghai.android.materialprogressbar:library:1.4.2'
     implementation 'org.adw.library:discrete-seekbar:1.0.1'
-    implementation 'com.devbrackets.android:exomedia:3.0.1'
-    implementation 'com.github.ybq:Android-SpinKit:1.1.0'
 }
 
 // build a jar with source files

.idea/runConfigurations.xml

@@ -4,6 +4,7 @@
 import android.animation.AnimatorListenerAdapter;
 import android.annotation.TargetApi;
 import android.content.Context;
+import android.content.res.ColorStateList;
 import android.content.res.Resources;
 import android.content.res.TypedArray;
 import android.graphics.Color;
@@ -28,7 +29,6 @@
 import android.util.AttributeSet;
 import android.util.Log;
 import android.util.TypedValue;
-import android.view.GestureDetector;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.Surface;
@@ -44,28 +44,18 @@
 import android.widget.RelativeLayout;
 import android.widget.SeekBar;
 import android.widget.TextView;
-
-import com.github.ybq.android.spinkit.SpinKitView;
-import com.github.ybq.android.spinkit.style.ChasingDots;
-import com.github.ybq.android.spinkit.style.Circle;
-import com.github.ybq.android.spinkit.style.CubeGrid;
-import com.github.ybq.android.spinkit.style.DoubleBounce;
-import com.github.ybq.android.spinkit.style.FadingCircle;
-import com.github.ybq.android.spinkit.style.Pulse;
-import com.github.ybq.android.spinkit.style.RotatingCircle;
-import com.github.ybq.android.spinkit.style.RotatingPlane;
-import com.github.ybq.android.spinkit.style.ThreeBounce;
-import com.github.ybq.android.spinkit.style.WanderingCubes;
-import com.github.ybq.android.spinkit.style.Wave;
 import com.halilibo.bettervideoplayer.subtitle.CaptionsView;
 import com.halilibo.bettervideoplayer.utility.EmptyCallback;
 import com.halilibo.bettervideoplayer.utility.Util;
 
 import java.io.IOException;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
+import java.util.HashMap;
 import java.util.Map;
 
+import me.zhanghai.android.materialprogressbar.MaterialProgressBar;
+
 /**
  * @author Aidan Follestad
  * Modified and improved by Halil Ozercan
@@ -79,7 +69,7 @@ public class BetterVideoPlayer extends RelativeLayout implements IUserMethods,
   private static final String BETTER_VIDEO_PLAYER_BRIGHTNESS = "BETTER_VIDEO_PLAYER_BRIGHTNESS";
   private static final int UPDATE_INTERVAL = 100;
 
-  private SpinKitView mProgressBar;
+  private MaterialProgressBar mProgressBar;
   private TextView mPositionTextView, viewForward, viewBackward;
 
   private CaptionsView mSubView;
@@ -88,33 +78,12 @@ public class BetterVideoPlayer extends RelativeLayout implements IUserMethods,
   private String mTitle;
   private int mSubViewTextSize;
   private int mSubViewTextColor;
-  private Context context;
 
   /**
    * Window that hold the player. Necessary for setting brightness.
    */
   private Window mWindow;
 
-  private static final int DOUBLE_BOUNCE = 0;
-  private static final int ROTATING_PLANE = 1;
-  private static final int WAVE = 2;
-  private static final int WANDERING_CUBES = 3;
-  private static final int PULSE = 4;
-  private static final int CHASING_DOTS = 5;
-  private static final int THREE_BOUNCE = 6;
-  private static final int CIRCLE = 7;
-  private static final int CUBE_GRID = 8;
-  private static final int FADING_CIRCLE = 9;
-  private static final int ROTATING_CIRCLE = 10;
-
-  @IntDef({DOUBLE_BOUNCE, ROTATING_PLANE, WAVE,
-      WANDERING_CUBES, PULSE, CHASING_DOTS,
-      THREE_BOUNCE, CIRCLE, CUBE_GRID,
-      FADING_CIRCLE, ROTATING_CIRCLE})
-  @Retention(RetentionPolicy.SOURCE)
-  public @interface LoadingStyle {
-  }
-
   private static final int PLAY_BUTTON = 0;
   private static final int PAUSE_BUTTON = 1;
   private static final int RESTART_BUTTON = 2;
@@ -172,7 +141,7 @@ public BetterVideoPlayer(Context context, AttributeSet attrs, int defStyleAttr)
   private int viewVisibility;
 
   private Uri mSource;
-  private Map<String, String> headers;
+  private Map<String, String> headers = new HashMap<>();
 
   private BetterVideoCallback mCallback;
   private BetterVideoProgressCallback mProgressCallback;
@@ -189,15 +158,13 @@ public BetterVideoPlayer(Context context, AttributeSet attrs, int defStyleAttr)
   private int mGestureType = NO_GESTURE;
   private boolean mAutoPlay = false;
   private boolean mControlsDisabled = false;
-  private int mLoadingStyle = CHASING_DOTS;
   private int mInitialPosition = -1;
   private int mHideControlsDuration = 2000; // defaults to 2 seconds.
   private int mDoubleTapSeekDuration;
 
 
   private void init(Context context, AttributeSet attrs) {
     setBackgroundColor(Color.BLACK);
-    this.context = context;
     if (attrs != null) {
       TypedArray a = context.getTheme().obtainStyledAttributes(
           attrs,
@@ -219,8 +186,6 @@ private void init(Context context, AttributeSet attrs) {
             R.styleable.BetterVideoPlayer_bvp_pauseDrawable);
         mRestartDrawable = a.getDrawable(
             R.styleable.BetterVideoPlayer_bvp_restartDrawable);
-        mLoadingStyle = a.getInt(
-            R.styleable.SpinKitView_SpinKit_Style, 0);
         mHideControlsDuration = a.getInteger(
             R.styleable.BetterVideoPlayer_bvp_hideControlsDuration, mHideControlsDuration);
 
@@ -245,7 +210,7 @@ private void init(Context context, AttributeSet attrs) {
             getResources().getDimensionPixelSize(R.dimen.bvp_subtitle_size));
         mSubViewTextColor = a.getColor(
             R.styleable.BetterVideoPlayer_bvp_captionColor,
-            ContextCompat.getColor(context, R.color.bvp_subtitle_color));
+                getResources().getColor(R.color.bvp_subtitle_color));
 
       } catch (Exception e) {
         LOG("Exception " + e.getMessage());
@@ -255,7 +220,7 @@ private void init(Context context, AttributeSet attrs) {
       }
     } else {
       mSubViewTextSize = getResources().getDimensionPixelSize(R.dimen.bvp_subtitle_size);
-      mSubViewTextColor = ContextCompat.getColor(context, R.color.bvp_subtitle_color);
+      mSubViewTextColor = getResources().getColor(R.color.bvp_subtitle_color);
     }
 
     if (mPlayDrawable == null)
@@ -874,15 +839,14 @@ protected void onFinishInflate() {
 
     // Inflate and add progress
     mProgressFrame = li.inflate(R.layout.bvp_include_progress, this, false);
-    mProgressBar = mProgressFrame.findViewById(R.id.spin_kit);
+    mProgressBar = mProgressFrame.findViewById(R.id.material_progress_bar);
     mBottomProgressBar = mProgressFrame.findViewById(R.id.progressBarBottom);
 
     TypedValue typedValue = new TypedValue();
     Resources.Theme theme = getContext().getTheme();
     theme.resolveAttribute(R.attr.colorAccent, typedValue, true);
     int color = typedValue.data;
-    mProgressBar.setColor(color);
-    setLoadingStyle(mLoadingStyle);
+    mProgressBar.setProgressTintList(ColorStateList.valueOf(color));
 
     mPositionTextView = mProgressFrame.findViewById(R.id.position_textview);
     mPositionTextView.setShadowLayer(3, 3, 3, Color.BLACK);
@@ -1067,50 +1031,6 @@ public void setLoop(boolean loop) {
     this.mLoop = loop;
   }
 
-  @Override
-  public void setLoadingStyle(@LoadingStyle int style) {
-    Drawable drawable;
-    switch (style) {
-      case DOUBLE_BOUNCE:
-        drawable = new DoubleBounce();
-        break;
-      case ROTATING_PLANE:
-        drawable = new RotatingPlane();
-        break;
-      case WAVE:
-        drawable = new Wave();
-        break;
-      case WANDERING_CUBES:
-        drawable = new WanderingCubes();
-        break;
-      case PULSE:
-        drawable = new Pulse();
-        break;
-      case CHASING_DOTS:
-        drawable = new ChasingDots();
-        break;
-      case THREE_BOUNCE:
-        drawable = new ThreeBounce();
-        break;
-      case CIRCLE:
-        drawable = new Circle();
-        break;
-      case CUBE_GRID:
-        drawable = new CubeGrid();
-        break;
-      case FADING_CIRCLE:
-        drawable = new FadingCircle();
-        break;
-      case ROTATING_CIRCLE:
-        drawable = new RotatingCircle();
-        break;
-      default:
-        drawable = new ThreeBounce();
-        break;
-    }
-    mProgressBar.setIndeterminateDrawable(drawable);
-  }
-
   OnSwipeTouchListener clickFrameSwipeListener =
       new OnSwipeTouchListener(true) {
 

app/build.gradle

@@ -11,11 +11,11 @@
 public class HelperMethods {
 
     public static boolean isRemotePath(Uri path){
-        return (path.getScheme().equals("http") || path.getScheme().equals("https"));
+        return ("http".equals(path.getScheme()) || "https".equals(path.getScheme()));
     }
 
     public static String secondsToDuration(int seconds){
-        return String.format("%02d:%02d:%02d",
+        return String.format(Locale.getDefault(), "%02d:%02d:%02d",
             seconds / 3600,
             (seconds % 3600) / 60,
             (seconds % 60)

app/src/main/java/com/halilibo/sample/MainActivity.java

@@ -19,7 +19,7 @@
 import java.util.Map;
 
 /**
- * @author Aidan Follestad (halilibo)
+ * @author Aidan Follestad (halilozercan)
  * This interface defines which methods should be available to
  * library users. The methods found here constitutes the actual
  * interface of the player.
@@ -55,13 +55,6 @@ void setVolume(@FloatRange(from = 0f, to = 1f) float leftVolume,
 
     void setLoop(boolean loop);
 
-    /**
-     * BetterVideoPlayer utilizes @see com.github.ybq.android.spinkit.SpinKitView
-     * to have 'better' loading animations.
-     * @param style A style from SpinKit family.
-     */
-    void setLoadingStyle(@BetterVideoPlayer.LoadingStyle int style);
-
     void setHideControlsDuration(int hideControlsDuration);
 
     void setInitialPosition(@IntRange(from = 0, to = Integer.MAX_VALUE) int pos);

app/src/main/res/drawable-hdpi/ic_settings_white_24dp.png

@@ -3,7 +3,7 @@
     <item>
         <shape>
             <gradient
-                android:startColor="#BB000000"
+                android:startColor="#88000000"
                 android:endColor="#00000000"
                 android:angle="270" />
         </shape>

app/src/main/res/drawable-mdpi/ic_settings_white_24dp.png

@@ -2,17 +2,19 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical">
 
-    <com.github.ybq.android.spinkit.SpinKitView
-        android:id="@+id/spin_kit"
-        style="@style/SpinKitView.Large.FadingCircle"
+    <me.zhanghai.android.materialprogressbar.MaterialProgressBar
+        android:id="@+id/material_progress_bar"
         android:layout_centerVertical="true"
         android:layout_centerHorizontal="true"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:visibility="visible" />
+        android:visibility="visible"
+        android:indeterminate="true"
+        app:mpb_progressStyle="circular"/>
 
     <TextView
         android:id="@+id/position_textview"