import new module

app/build.gradle

@@ -5,7 +5,7 @@ android {
     buildToolsVersion "23.0.2"
 
     defaultConfig {
-        applicationId "com.waynell.videolist"
+        applicationId "com.waynell.videolist.demo"
         minSdkVersion 14
         targetSdkVersion 23
         versionCode 1
@@ -22,11 +22,10 @@ android {
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     testCompile 'junit:junit:4.12'
-    compile 'com.android.support:appcompat-v7:23.2.0'
+    compile 'com.android.support:appcompat-v7:23.2.1'
     compile 'com.github.bumptech.glide:glide:3.7.0'
-    compile 'com.android.support:recyclerview-v7:23.2.0'
     compile 'com.jakewharton:butterknife:7.0.1'
-    compile project(':list-visibility-utils')
+    compile project(':video-list-player')
     compile 'com.squareup.okhttp3:okhttp:3.2.0'
     compile 'com.mikhaellopez:circularprogressbar:1.1.1'
     compile ('com.github.bumptech.glide:okhttp3-integration:1.4.0'){

app/src/main/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.waynell.videolist"
+<manifest package="com.waynell.videolist.demo"
     xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.INTERNET"/>
@@ -21,7 +21,7 @@
             </intent-filter>
         </activity>
 
-        <meta-data android:name="com.waynell.videolist.VideoListGlideModule"
+        <meta-data android:name="com.waynell.videolist.demo.VideoListGlideModule"
             android:value="GlideModule"/>
     </application>
 

app/src/main/java/com/waynell/videolist/MainActivity.java → app/src/main/java/com/waynell/videolist/demo/MainActivity.java

@@ -1,4 +1,4 @@
-package com.waynell.videolist;
+package com.waynell.videolist.demo;
 
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
@@ -7,11 +7,11 @@
 import android.view.LayoutInflater;
 import android.view.ViewGroup;
 
-import com.volokh.danylo.visibility_utils.calculator.DefaultSingleItemCalculatorCallback;
-import com.volokh.danylo.visibility_utils.calculator.SingleListViewItemActiveCalculator;
-import com.volokh.danylo.visibility_utils.scroll.ItemsPositionGetter;
-import com.volokh.danylo.visibility_utils.scroll.RecyclerViewItemPositionGetter;
-import com.waynell.videolist.model.VideoListItem;
+import com.waynell.videolist.demo.model.VideoListItem;
+import com.waynell.videolist.visibility.calculator.DefaultSingleItemCalculatorCallback;
+import com.waynell.videolist.visibility.calculator.SingleListViewItemActiveCalculator;
+import com.waynell.videolist.visibility.scroll.ItemsPositionGetter;
+import com.waynell.videolist.visibility.scroll.RecyclerViewItemPositionGetter;
 
 import java.util.ArrayList;
 import java.util.List;

app/src/main/java/com/waynell/videolist/VideoListGlideModule.java → app/src/main/java/com/waynell/videolist/demo/VideoListGlideModule.java

@@ -1,4 +1,4 @@
-package com.waynell.videolist;
+package com.waynell.videolist.demo;
 
 import android.content.Context;
 import android.os.Handler;

app/src/main/java/com/waynell/videolist/VideoViewHolder.java → app/src/main/java/com/waynell/videolist/demo/VideoViewHolder.java

@@ -1,4 +1,4 @@
-package com.waynell.videolist;
+package com.waynell.videolist.demo;
 
 import android.support.v7.widget.RecyclerView;
 import android.view.View;
@@ -9,10 +9,10 @@
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
 import com.bumptech.glide.load.model.GlideUrl;
 import com.mikhaellopez.circularprogressbar.CircularProgressBar;
-import com.waynell.videolist.model.VideoListItem;
-import com.waynell.videolist.target.VideoLoadTarget;
-import com.waynell.videolist.target.VideoProgressTarget;
-import com.waynell.videolist.ui.TextureVideoView;
+import com.waynell.videolist.demo.model.VideoListItem;
+import com.waynell.videolist.demo.target.VideoLoadTarget;
+import com.waynell.videolist.demo.target.VideoProgressTarget;
+import com.waynell.videolist.widget.TextureVideoView;
 
 import java.io.File;
 import java.io.InputStream;

app/src/main/java/com/waynell/videolist/model/VideoListItem.java → app/src/main/java/com/waynell/videolist/demo/model/VideoListItem.java

@@ -1,12 +1,12 @@
-package com.waynell.videolist.model;
+package com.waynell.videolist.demo.model;
 
 import android.graphics.Rect;
 import android.util.Log;
 import android.view.View;
 import android.widget.ImageView;
 
-import com.volokh.danylo.visibility_utils.items.ListItem;
-import com.waynell.videolist.ui.TextureVideoView;
+import com.waynell.videolist.visibility.items.ListItem;
+import com.waynell.videolist.widget.TextureVideoView;
 
 /**
  * @author Wayne

app/src/main/java/com/waynell/videolist/target/ProgressTarget.java → app/src/main/java/com/waynell/videolist/demo/target/ProgressTarget.java

@@ -1,11 +1,11 @@
-package com.waynell.videolist.target;
+package com.waynell.videolist.demo.target;
 
 import android.graphics.drawable.Drawable;
 
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.animation.GlideAnimation;
 import com.bumptech.glide.request.target.Target;
-import com.waynell.videolist.VideoListGlideModule;
+import com.waynell.videolist.demo.VideoListGlideModule;
 
 /**
  * @author Wayne

app/src/main/java/com/waynell/videolist/target/VideoLoadTarget.java → app/src/main/java/com/waynell/videolist/demo/target/VideoLoadTarget.java

@@ -1,4 +1,4 @@
-package com.waynell.videolist.target;
+package com.waynell.videolist.demo.target;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -13,15 +13,15 @@
 import com.bumptech.glide.request.target.SizeReadyCallback;
 import com.bumptech.glide.request.target.Target;
 import com.bumptech.glide.request.target.ViewTarget;
-import com.waynell.videolist.model.VideoListItem;
-import com.waynell.videolist.ui.TextureVideoView;
+import com.waynell.videolist.demo.model.VideoListItem;
+import com.waynell.videolist.widget.TextureVideoView;
 
 import java.io.File;
 
 /**
  * @author Wayne
  */
-public class VideoLoadTarget extends ViewTarget<TextureVideoView, File> implements TextureVideoView.Callback {
+public class VideoLoadTarget extends ViewTarget<TextureVideoView, File> implements TextureVideoView.MediaPlayerCallback {
 
     private VideoListItem mItem;
     private final ImageView mCoverView;
@@ -45,7 +45,7 @@ public void bind(VideoListItem item) {
                 .diskCacheStrategy(DiskCacheStrategy.SOURCE)
                 .into(mCoverView);
 
-        view.setCallback(this);
+        view.setMediaPlayerCallback(this);
         view.stop();
     }
 

app/src/main/java/com/waynell/videolist/target/VideoProgressTarget.java → app/src/main/java/com/waynell/videolist/demo/target/VideoProgressTarget.java

@@ -1,4 +1,4 @@
-package com.waynell.videolist.target;
+package com.waynell.videolist.demo.target;
 
 import android.view.View;
 
@@ -15,8 +15,6 @@ public class VideoProgressTarget extends ProgressTarget<String, File> {
     public VideoProgressTarget(VideoLoadTarget target, CircularProgressBar progress) {
         super(target);
         this.progress = progress;
-        this.progress.setVisibility(View.INVISIBLE);
-        this.progress.setProgress(0);
     }
 
     @Override

app/src/main/java/com/waynell/videolist/target/WrappingTarget.java → app/src/main/java/com/waynell/videolist/demo/target/WrappingTarget.java

@@ -1,4 +1,4 @@
-package com.waynell.videolist.target;
+package com.waynell.videolist.demo.target;
 
 import android.graphics.drawable.Drawable;
 

app/src/main/res/layout/activity_main.xml

@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="com.waynell.videolist.MainActivity">
+    tools:context=".MainActivity">
 
     <android.support.v7.widget.RecyclerView
         android:id="@+id/recycler_view"

app/src/main/res/layout/video_list_item.xml

@@ -10,7 +10,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content">
 
-        <com.waynell.videolist.ui.TextureVideoView
+        <com.waynell.videolist.widget.TextureVideoView
             android:id="@+id/video_view"
             android:layout_width="match_parent"
             android:layout_height="300dp" />

settings.gradle

@@ -1 +1 @@
-include ':app', ':list-visibility-utils'
+include ':app', ':video-list-player'

list-visibility-utils/build.gradle → video-list-player/build.gradle

@@ -7,8 +7,6 @@ android {
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 23
-        versionCode 1
-        versionName "0.2"
     }
     buildTypes {
         release {
@@ -19,8 +17,5 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    testCompile 'junit:junit:4.12'
-    compile 'com.android.support:appcompat-v7:23.2.0'
-    compile 'com.android.support:recyclerview-v7:23.2.0'
+    compile 'com.android.support:recyclerview-v7:23.2.1'
 }

list-visibility-utils/proguard-rules.pro → video-list-player/proguard-rules.pro

@@ -1,6 +1,6 @@
 # Add project specific ProGuard rules here.
 # By default, the flags in this file are appended to flags specified
-# in d:\android_sdk/tools/proguard/proguard-android.txt
+# in D:\android-sdk-windows/tools/proguard/proguard-android.txt
 # You can edit the include path and order by changing the proguardFiles
 # directive in build.gradle.
 #

video-list-player/src/main/AndroidManifest.xml

@@ -0,0 +1,3 @@
+<manifest package="com.waynell.videolist">
+    <application />
+</manifest>

list-visibility-utils/src/main/java/com/volokh/danylo/visibility_utils/calculator/BaseItemsVisibilityCalculator.java → video-list-player/src/main/java/com/waynell/videolist/visibility/calculator/BaseItemsVisibilityCalculator.java

@@ -1,15 +1,15 @@
-package com.volokh.danylo.visibility_utils.calculator;
+package com.waynell.videolist.visibility.calculator;
 
 import android.widget.AbsListView;
 
-import com.volokh.danylo.visibility_utils.scroll.ItemsPositionGetter;
-import com.volokh.danylo.visibility_utils.scroll.ScrollDirectionDetector;
-import com.volokh.danylo.visibility_utils.utils.Config;
-import com.volokh.danylo.visibility_utils.utils.Logger;
+import com.waynell.videolist.visibility.scroll.ItemsPositionGetter;
+import com.waynell.videolist.visibility.scroll.ScrollDirectionDetector;
+import com.waynell.videolist.visibility.utils.Config;
+import com.waynell.videolist.visibility.utils.Logger;
 
 /**
  * This class encapsulates some basic logic of Visibility calculator.
- * In onScroll event it calculates Scroll direction using {@link com.volokh.danylo.visibility_utils.scroll.ScrollDirectionDetector}
+ * In onScroll event it calculates Scroll direction using {@link com.waynell.videolist.visibility.scroll.ScrollDirectionDetector}
  * and then calls appropriate methods
  */
 public abstract class BaseItemsVisibilityCalculator implements ListItemsVisibilityCalculator{

list-visibility-utils/src/main/java/com/volokh/danylo/visibility_utils/calculator/DefaultSingleItemCalculatorCallback.java → video-list-player/src/main/java/com/waynell/videolist/visibility/calculator/DefaultSingleItemCalculatorCallback.java

@@ -1,10 +1,10 @@
-package com.volokh.danylo.visibility_utils.calculator;
+package com.waynell.videolist.visibility.calculator;
 
 import android.view.View;
 
-import com.volokh.danylo.visibility_utils.items.ListItem;
-import com.volokh.danylo.visibility_utils.utils.Config;
-import com.volokh.danylo.visibility_utils.utils.Logger;
+import com.waynell.videolist.visibility.items.ListItem;
+import com.waynell.videolist.visibility.utils.Config;
+import com.waynell.videolist.visibility.utils.Logger;
 
 /**
  * Default implementation. You can override it and intercept switching between active items
@@ -14,7 +14,7 @@
 public class DefaultSingleItemCalculatorCallback implements SingleListViewItemActiveCalculator.Callback<ListItem>{
 
     private static final boolean SHOW_LOGS = Config.SHOW_LOGS;
-    private static final String TAG = com.volokh.danylo.visibility_utils.calculator.DefaultSingleItemCalculatorCallback.class.getSimpleName();
+    private static final String TAG = DefaultSingleItemCalculatorCallback.class.getSimpleName();
 
     @Override
     public void activateNewCurrentItem(ListItem newListItem, View newView, int newViewPosition) {

list-visibility-utils/src/main/java/com/volokh/danylo/visibility_utils/calculator/ListItemsVisibilityCalculator.java → video-list-player/src/main/java/com/waynell/videolist/visibility/calculator/ListItemsVisibilityCalculator.java

@@ -1,6 +1,6 @@
-package com.volokh.danylo.visibility_utils.calculator;
+package com.waynell.videolist.visibility.calculator;
 
-import com.volokh.danylo.visibility_utils.scroll.ItemsPositionGetter;
+import com.waynell.videolist.visibility.scroll.ItemsPositionGetter;
 
 /**
  * This is basic interface for Visibility calculator.

list-visibility-utils/src/main/java/com/volokh/danylo/visibility_utils/calculator/SingleListViewItemActiveCalculator.java → video-list-player/src/main/java/com/waynell/videolist/visibility/calculator/SingleListViewItemActiveCalculator.java

@@ -1,12 +1,12 @@
-package com.volokh.danylo.visibility_utils.calculator;
+package com.waynell.videolist.visibility.calculator;
 
 import android.view.View;
 
-import com.volokh.danylo.visibility_utils.items.ListItem;
-import com.volokh.danylo.visibility_utils.items.ListItemData;
-import com.volokh.danylo.visibility_utils.scroll.ItemsPositionGetter;
-import com.volokh.danylo.visibility_utils.utils.Config;
-import com.volokh.danylo.visibility_utils.utils.Logger;
+import com.waynell.videolist.visibility.items.ListItem;
+import com.waynell.videolist.visibility.items.ListItemData;
+import com.waynell.videolist.visibility.scroll.ItemsPositionGetter;
+import com.waynell.videolist.visibility.utils.Config;
+import com.waynell.videolist.visibility.utils.Logger;
 
 import java.util.List;
 

list-visibility-utils/src/main/java/com/volokh/danylo/visibility_utils/items/ListItem.java → video-list-player/src/main/java/com/waynell/videolist/visibility/items/ListItem.java

@@ -1,8 +1,8 @@
-package com.volokh.danylo.visibility_utils.items;
+package com.waynell.videolist.visibility.items;
 
 import android.view.View;
 
-import com.volokh.danylo.visibility_utils.calculator.ListItemsVisibilityCalculator;
+import com.waynell.videolist.visibility.calculator.ListItemsVisibilityCalculator;
 
 /**
  * A general interface for list items.

list-visibility-utils/src/main/java/com/volokh/danylo/visibility_utils/items/ListItemData.java → video-list-player/src/main/java/com/waynell/videolist/visibility/items/ListItemData.java

@@ -1,4 +1,4 @@
-package com.volokh.danylo.visibility_utils.items;
+package com.waynell.videolist.visibility.items;
 
 import android.view.View;
 
@@ -20,7 +20,7 @@ public View getView() {
         return mView;
     }
 
-    public com.volokh.danylo.visibility_utils.items.ListItemData fillWithData(int indexInAdapter, View view) {
+    public com.waynell.videolist.visibility.items.ListItemData fillWithData(int indexInAdapter, View view) {
         mIndexInAdapter = indexInAdapter;
         mView = view;
         return this;
@@ -56,7 +56,7 @@ public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
 
-        com.volokh.danylo.visibility_utils.items.ListItemData that = (com.volokh.danylo.visibility_utils.items.ListItemData) o;
+        com.waynell.videolist.visibility.items.ListItemData that = (com.waynell.videolist.visibility.items.ListItemData) o;
 
         if (mIndexInAdapter != null ? !mIndexInAdapter.equals(that.mIndexInAdapter) : that.mIndexInAdapter != null)
             return false;

list-visibility-utils/src/main/java/com/volokh/danylo/visibility_utils/scroll/ItemsPositionGetter.java → video-list-player/src/main/java/com/waynell/videolist/visibility/scroll/ItemsPositionGetter.java

@@ -1,9 +1,9 @@
-package com.volokh.danylo.visibility_utils.scroll;
+package com.waynell.videolist.visibility.scroll;
 
 import android.view.View;
 
 /**
- * This class is an API for {@link com.volokh.danylo.visibility_utils.calculator.ListItemsVisibilityCalculator}
+ * This class is an API for {@link com.waynell.videolist.visibility.calculator.ListItemsVisibilityCalculator}
  * Using this class is can access all the data from RecyclerView / ListView
  *
  * There is two different implementations for ListView and for RecyclerView.