From 109e86b3885dd2564aae94cb9803fe364b95a358 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@madoka.volgo-balt.ru>
Date: Mon, 5 Jun 2017 11:48:26 +0300
Subject: [PATCH] move glide-related stuff to a separate package

---
 org.fox.ttrss/src/main/AndroidManifest.xml                     | 2 +-
 .../src/main/java/org/fox/ttrss/HeadlinesFragment.java         | 3 +--
 .../fox/ttrss/{util => glide}/OkHttpProgressGlideModule.java   | 2 +-
 .../java/org/fox/ttrss/{util => glide}/ProgressTarget.java     | 2 +-
 .../java/org/fox/ttrss/{util => glide}/WrappingTarget.java     | 2 +-
 5 files changed, 5 insertions(+), 6 deletions(-)
 rename org.fox.ttrss/src/main/java/org/fox/ttrss/{util => glide}/OkHttpProgressGlideModule.java (99%)
 rename org.fox.ttrss/src/main/java/org/fox/ttrss/{util => glide}/ProgressTarget.java (99%)
 rename org.fox.ttrss/src/main/java/org/fox/ttrss/{util => glide}/WrappingTarget.java (98%)

diff --git a/org.fox.ttrss/src/main/AndroidManifest.xml b/org.fox.ttrss/src/main/AndroidManifest.xml
index 8036550a..d7b91e98 100755
--- a/org.fox.ttrss/src/main/AndroidManifest.xml
+++ b/org.fox.ttrss/src/main/AndroidManifest.xml
@@ -22,7 +22,7 @@
 
         <!-- <meta-data android:name="com.bumptech.glide.integration.okhttp3.OkHttpGlideModule"
             tools:node="remove" /> -->
-        <meta-data android:name="org.fox.ttrss.util.OkHttpProgressGlideModule"
+        <meta-data android:name="org.fox.ttrss.glide.OkHttpProgressGlideModule"
             android:value="GlideModule" />
 
         <activity
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java
index f2172051..c0967651 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java
@@ -65,7 +65,6 @@ import com.bumptech.glide.load.engine.DiskCacheStrategy;
 import com.bumptech.glide.load.resource.drawable.GlideDrawable;
 import com.bumptech.glide.request.RequestListener;
 import com.bumptech.glide.request.target.GlideDrawableImageViewTarget;
-import com.bumptech.glide.request.target.ImageViewTarget;
 import com.bumptech.glide.request.target.Target;
 import com.google.gson.JsonElement;
 import com.shamanland.fab.FloatingActionButton;
@@ -76,7 +75,7 @@ import org.fox.ttrss.types.ArticleList;
 import org.fox.ttrss.types.Feed;
 import org.fox.ttrss.util.HeaderViewRecyclerAdapter;
 import org.fox.ttrss.util.HeadlinesRequest;
-import org.fox.ttrss.util.ProgressTarget;
+import org.fox.ttrss.glide.ProgressTarget;
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/util/OkHttpProgressGlideModule.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/glide/OkHttpProgressGlideModule.java
similarity index 99%
rename from org.fox.ttrss/src/main/java/org/fox/ttrss/util/OkHttpProgressGlideModule.java
rename to org.fox.ttrss/src/main/java/org/fox/ttrss/glide/OkHttpProgressGlideModule.java
index b333807e..1a7c6786 100644
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/util/OkHttpProgressGlideModule.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/glide/OkHttpProgressGlideModule.java
@@ -1,4 +1,4 @@
-package org.fox.ttrss.util;
+package org.fox.ttrss.glide;
 
 import java.io.*;
 import java.util.*;
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/util/ProgressTarget.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/glide/ProgressTarget.java
similarity index 99%
rename from org.fox.ttrss/src/main/java/org/fox/ttrss/util/ProgressTarget.java
rename to org.fox.ttrss/src/main/java/org/fox/ttrss/glide/ProgressTarget.java
index df02865c..977d1954 100644
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/util/ProgressTarget.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/glide/ProgressTarget.java
@@ -1,4 +1,4 @@
-package org.fox.ttrss.util;
+package org.fox.ttrss.glide;
 
 
 import android.graphics.drawable.Drawable;
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/util/WrappingTarget.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/glide/WrappingTarget.java
similarity index 98%
rename from org.fox.ttrss/src/main/java/org/fox/ttrss/util/WrappingTarget.java
rename to org.fox.ttrss/src/main/java/org/fox/ttrss/glide/WrappingTarget.java
index 5dcfa7ec..90990e16 100644
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/util/WrappingTarget.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/glide/WrappingTarget.java
@@ -1,4 +1,4 @@
-package org.fox.ttrss.util;
+package org.fox.ttrss.glide;
 
 import android.graphics.drawable.Drawable;
 import android.support.annotation.NonNull;