atagotech
diff --git a/‎README.md‎
Lines changed: 14 additions & 5 deletions b/‎README.md‎
Lines changed: 14 additions & 5 deletions
diff --git a/‎library/build.gradle‎
Lines changed: 1 addition & 1 deletion b/‎library/build.gradle‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎library/src/main/java/com/danikula/videocache/HttpProxyCacheServer.java‎
Lines changed: 14 additions & 0 deletions b/‎library/src/main/java/com/danikula/videocache/HttpProxyCacheServer.java‎
Lines changed: 14 additions & 0 deletions
diff --git a/‎sample/build.gradle‎
Lines changed: 2 additions & 2 deletions b/‎sample/build.gradle‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎sample/src/main/java/com/danikula/videocache/sample/VideoFragment.java‎
Lines changed: 15 additions & 0 deletions b/‎sample/src/main/java/com/danikula/videocache/sample/VideoFragment.java‎
Lines changed: 15 additions & 0 deletions
diff --git a/‎sample/src/main/res/drawable-hdpi/ic_cloud_done.png‎
379 Bytes b/‎sample/src/main/res/drawable-hdpi/ic_cloud_done.png‎
379 Bytes
diff --git a/‎sample/src/main/res/drawable-hdpi/ic_cloud_download.png‎
353 Bytes b/‎sample/src/main/res/drawable-hdpi/ic_cloud_download.png‎
353 Bytes
diff --git a/‎sample/src/main/res/drawable-mdpi/ic_cloud_done.png‎
265 Bytes b/‎sample/src/main/res/drawable-mdpi/ic_cloud_done.png‎
265 Bytes
diff --git a/‎sample/src/main/res/drawable-mdpi/ic_cloud_download.png‎
242 Bytes b/‎sample/src/main/res/drawable-mdpi/ic_cloud_download.png‎
242 Bytes
diff --git a/‎sample/src/main/res/drawable-xhdpi/ic_cloud_done.png‎
449 Bytes b/‎sample/src/main/res/drawable-xhdpi/ic_cloud_done.png‎
449 Bytes
@@ -14,14 +14,14 @@ Because there is no sense to download video a lot of times while streaming!
 
 Note `AndroidVideoCache` works only with **direct urls** to media file, it  [**doesn't support**](https://github.com/danikula/AndroidVideoCache/issues/19) any streaming technology like DASH, SmoothStreaming, HLS.  
 
-## How to use?
+## Get started
 Just add dependency (`AndroidVideoCache` is available in jcenter):
 ```
 repositories {
     jcenter()
 }
 dependencies {
-    compile 'com.danikula:videocache:2.3.4'
+    compile 'com.danikula:videocache:2.4.0'
 }
 ```
 
@@ -64,7 +64,8 @@ public class App extends Application {
 or use [simple factory](http://pastebin.com/s2fafSYS).
 More preferable way is use some dependency injector like [Dagger](http://square.github.io/dagger/).
 
-## Configuration
+## Recipes
+### Disk cache limit
 By default `HttpProxyCacheServer` uses 512Mb for caching files. You can change this value:
 
 ```java
@@ -83,9 +84,17 @@ private HttpProxyCacheServer newProxy() {
             .maxCacheFilesCount(20)
             .build();
 }
-``` 
+```
+
+### Listen caching progress
+Use `HttpProxyCacheServer.registerCacheListener(CacheListener listener)` method to set listener with callback `onCacheAvailable(File cacheFile, String url, int percentsAvailable)` to be aware of caching progress. Do not forget to to unsubscribe listener with help of `HttpProxyCacheServer.unregisterCacheListener(CacheListener listener)` method to avoid memory leaks.
+
+Use `HttpProxyCacheServer.isCached(String url)` method to check was url's content fully cached to file or not.
+
+See `sample` app for more details.
 
-See `sample` app for details.
+### Sample
+See `sample` app.
 
 ## Whats new
 See Release Notes [here](https://github.com/danikula/AndroidVideoCache/releases)
 
@@ -29,7 +29,7 @@ publish {
     userOrg = 'alexeydanilov'
     groupId = 'com.danikula'
     artifactId = 'videocache'
-    publishVersion = '2.3.4'
+    publishVersion = '2.4.0'
     description = 'Cache support for android VideoView'
     website = 'https://github.com/danikula/AndroidVideoCache'
 }
@@ -173,6 +173,20 @@ public void unregisterCacheListener(CacheListener cacheListener) {
         }
     }
 
+    /**
+     * Checks is cache contains fully cached file for particular url.
+     *
+     * @param url an url cache file will be checked for.
+     * @return {@code true} if cache contains fully cached file for passed in parameters url.
+     */
+    public boolean isCached(String url) {
+        checkNotNull(url, "Url can't be null!");
+        File cacheDir = config.cacheRoot;
+        String fileName = config.fileNameGenerator.generate(url);
+        File cacheFile = new File(cacheDir, fileName);
+        return cacheFile.exists();
+    }
+
     public void shutdown() {
         Log.i(LOG_TAG, "Shutdown proxy server");
 
 
@@ -19,7 +19,7 @@ android {
     buildToolsVersion '24'
 
     defaultConfig {
-        applicationId "com.danikula.videocache.sample"
+        applicationId 'com.danikula.videocache.sample'
         minSdkVersion 15
         targetSdkVersion 23
         versionCode 1
@@ -38,7 +38,7 @@ dependencies {
 //    compile project(':library')
     compile 'com.android.support:support-v4:23.1.0'
     compile 'org.androidannotations:androidannotations-api:3.3.2'
-    compile 'com.danikula:videocache:2.3.3'
+    compile 'com.danikula:videocache:2.4.0'
     compile 'com.viewpagerindicator:library:2.4.2-SNAPSHOT@aar'
     apt 'org.androidannotations:androidannotations:3.3.2'
 }
@@ -5,6 +5,7 @@
 import android.os.Message;
 import android.support.v4.app.Fragment;
 import android.util.Log;
+import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.VideoView;
 
@@ -27,6 +28,7 @@ public class VideoFragment extends Fragment implements CacheListener {
     @FragmentArg String url;
     @FragmentArg String cachePath;
 
+    @ViewById ImageView cacheStatusImageView;
     @ViewById VideoView videoView;
     @ViewById ProgressBar progressBar;
 
@@ -45,9 +47,16 @@ public static Fragment build(String url, String cachePath) {
 
     @AfterViews
     void afterViewInjected() {
+        checkCachedState();
         startVideo();
     }
 
+    private void checkCachedState() {
+        HttpProxyCacheServer proxy = App.getProxy(getActivity());
+        boolean fullyCached = proxy.isCached(url);
+        setCachedState(fullyCached);
+    }
+
     private void startVideo() {
         HttpProxyCacheServer proxy = App.getProxy(getActivity());
         proxy.registerCacheListener(this, url);
@@ -78,6 +87,7 @@ public void onDestroy() {
     @Override
     public void onCacheAvailable(File file, String url, int percentsAvailable) {
         progressBar.setSecondaryProgress(percentsAvailable);
+        setCachedState(percentsAvailable == 100);
         Log.d(LOG_TAG, String.format("onCacheAvailable. percents: %d, file: %s, url: %s", percentsAvailable, file, url));
     }
 
@@ -92,6 +102,11 @@ void seekVideo() {
         videoView.seekTo(videoPosition);
     }
 
+    private void setCachedState(boolean cached) {
+        int statusIconId = cached ? R.drawable.ic_cloud_done : R.drawable.ic_cloud_download;
+        cacheStatusImageView.setImageResource(statusIconId);
+    }
+
     private final class VideoProgressUpdater extends Handler {
 
         public void start() {
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ publish {`
`29`	`29`	`userOrg = 'alexeydanilov'`
`30`	`30`	`groupId = 'com.danikula'`
`31`	`31`	`artifactId = 'videocache'`
`32`		`- publishVersion = '2.3.4'`
	`32`	`+ publishVersion = '2.4.0'`
`33`	`33`	`description = 'Cache support for android VideoView'`
`34`	`34`	`website = 'https://github.com/danikula/AndroidVideoCache'`
`35`	`35`	`}`