Move BitmapUtils and GLESUtils to utils

Signed-off-by: Jorge Ruesga <jorge@ruesga.com>

20 files changed, 30 insertions, 29 deletions

diff --git a/src/org/cyanogenmod/wallpapers/photophase/Colors.java b/src/org/cyanogenmod/wallpapers/photophase/Colors.java
index f422498..925e058 100644
--- a/src/org/cyanogenmod/wallpapers/photophase/Colors.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/Colors.java
@@ -19,7 +19,7 @@ package org.cyanogenmod.wallpapers.photophase;
 import android.content.Context;
 import android.content.res.Resources;
 
-import org.cyanogenmod.wallpapers.photophase.GLESUtil.GLColor;
+import org.cyanogenmod.wallpapers.photophase.utils.GLESUtil.GLColor;
 import org.cyanogenmod.wallpapers.photophase.preferences.PreferencesProvider.Preferences;
 
 /**
diff --git a/src/org/cyanogenmod/wallpapers/photophase/PhotoFrame.java b/src/org/cyanogenmod/wallpapers/photophase/PhotoFrame.java
index 5083d69..29af55f 100644
--- a/src/org/cyanogenmod/wallpapers/photophase/PhotoFrame.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/PhotoFrame.java
@@ -19,8 +19,9 @@ package org.cyanogenmod.wallpapers.photophase;
 import android.content.Context;
 import android.opengl.GLES20;
 
-import org.cyanogenmod.wallpapers.photophase.GLESUtil.GLColor;
-import org.cyanogenmod.wallpapers.photophase.GLESUtil.GLESTextureInfo;
+import org.cyanogenmod.wallpapers.photophase.utils.GLESUtil;
+import org.cyanogenmod.wallpapers.photophase.utils.GLESUtil.GLColor;
+import org.cyanogenmod.wallpapers.photophase.utils.GLESUtil.GLESTextureInfo;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
diff --git a/src/org/cyanogenmod/wallpapers/photophase/PhotoPhaseRenderer.java b/src/org/cyanogenmod/wallpapers/photophase/PhotoPhaseRenderer.java
index ffc4d22..f36deb7 100644
--- a/src/org/cyanogenmod/wallpapers/photophase/PhotoPhaseRenderer.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/PhotoPhaseRenderer.java
@@ -36,7 +36,8 @@ import android.opengl.Matrix;
 import android.os.Handler;
 import android.util.Log;
 
-import org.cyanogenmod.wallpapers.photophase.GLESUtil.GLColor;
+import org.cyanogenmod.wallpapers.photophase.utils.GLESUtil;
+import org.cyanogenmod.wallpapers.photophase.utils.GLESUtil.GLColor;
 import org.cyanogenmod.wallpapers.photophase.preferences.PreferencesProvider;
 import org.cyanogenmod.wallpapers.photophase.preferences.PreferencesProvider.Preferences;
 import org.cyanogenmod.wallpapers.photophase.preferences.TouchAction;
diff --git a/src/org/cyanogenmod/wallpapers/photophase/PhotoPhaseWallpaperWorld.java b/src/org/cyanogenmod/wallpapers/photophase/PhotoPhaseWallpaperWorld.java
index cfd4ab2..3e88fd6 100644
--- a/src/org/cyanogenmod/wallpapers/photophase/PhotoPhaseWallpaperWorld.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/PhotoPhaseWallpaperWorld.java
@@ -23,7 +23,7 @@ import android.graphics.PointF;
 import android.graphics.RectF;
 import android.util.Log;
 
-import org.cyanogenmod.wallpapers.photophase.GLESUtil.GLESTextureInfo;
+import org.cyanogenmod.wallpapers.photophase.utils.GLESUtil.GLESTextureInfo;
 import org.cyanogenmod.wallpapers.photophase.model.Disposition;
 import org.cyanogenmod.wallpapers.photophase.preferences.PreferencesProvider.Preferences;
 import org.cyanogenmod.wallpapers.photophase.transitions.Transition;
diff --git a/src/org/cyanogenmod/wallpapers/photophase/TextureManager.java b/src/org/cyanogenmod/wallpapers/photophase/TextureManager.java
index 61a9a64..b8e881c 100644
--- a/src/org/cyanogenmod/wallpapers/photophase/TextureManager.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/TextureManager.java
@@ -24,7 +24,8 @@ import android.util.Log;
 import android.widget.Toast;
 
 import org.cyanogenmod.wallpapers.photophase.FixedQueue.EmptyQueueException;
-import org.cyanogenmod.wallpapers.photophase.GLESUtil.GLESTextureInfo;
+import org.cyanogenmod.wallpapers.photophase.utils.GLESUtil;
+import org.cyanogenmod.wallpapers.photophase.utils.GLESUtil.GLESTextureInfo;
 import org.cyanogenmod.wallpapers.photophase.MediaPictureDiscoverer.OnMediaPictureDiscoveredListener;
 import org.cyanogenmod.wallpapers.photophase.effects.Effects;
 
diff --git a/src/org/cyanogenmod/wallpapers/photophase/TextureRequestor.java b/src/org/cyanogenmod/wallpapers/photophase/TextureRequestor.java
index 59e8593..a60d10d 100644
--- a/src/org/cyanogenmod/wallpapers/photophase/TextureRequestor.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/TextureRequestor.java
@@ -16,7 +16,7 @@
 
 package org.cyanogenmod.wallpapers.photophase;
 
-import org.cyanogenmod.wallpapers.photophase.GLESUtil.GLESTextureInfo;
+import org.cyanogenmod.wallpapers.photophase.utils.GLESUtil.GLESTextureInfo;
 
 /**
  * An interface that defines an object as able to request textures.
diff --git a/src/org/cyanogenmod/wallpapers/photophase/preferences/GeneralPreferenceFragment.java b/src/org/cyanogenmod/wallpapers/photophase/preferences/GeneralPreferenceFragment.java
index bde38eb..08b8fd6 100644
--- a/src/org/cyanogenmod/wallpapers/photophase/preferences/GeneralPreferenceFragment.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/preferences/GeneralPreferenceFragment.java
@@ -28,7 +28,7 @@ import android.preference.PreferenceFragment;
 import android.util.Log;
 
 import org.cyanogenmod.wallpapers.photophase.Colors;
-import org.cyanogenmod.wallpapers.photophase.GLESUtil.GLColor;
+import org.cyanogenmod.wallpapers.photophase.utils.GLESUtil.GLColor;
 import org.cyanogenmod.wallpapers.photophase.R;
 import org.cyanogenmod.wallpapers.photophase.preferences.PreferencesProvider.Preferences;
 import org.cyanogenmod.wallpapers.photophase.preferences.SeekBarProgressPreference.OnDisplayProgress;
diff --git a/src/org/cyanogenmod/wallpapers/photophase/preferences/PreferencesProvider.java b/src/org/cyanogenmod/wallpapers/photophase/preferences/PreferencesProvider.java
index c3f0736..615c3df 100644
--- a/src/org/cyanogenmod/wallpapers/photophase/preferences/PreferencesProvider.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/preferences/PreferencesProvider.java
@@ -20,7 +20,7 @@ import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
 
-import org.cyanogenmod.wallpapers.photophase.GLESUtil.GLColor;
+import org.cyanogenmod.wallpapers.photophase.utils.GLESUtil.GLColor;
 import org.cyanogenmod.wallpapers.photophase.effects.Effects.EFFECTS;
 import org.cyanogenmod.wallpapers.photophase.model.Disposition;
 import org.cyanogenmod.wallpapers.photophase.transitions.Transitions.TRANSITIONS;
diff --git a/src/org/cyanogenmod/wallpapers/photophase/shapes/ColorShape.java b/src/org/cyanogenmod/wallpapers/photophase/shapes/ColorShape.java
index fdf440a..20b5fa4 100644
--- a/src/org/cyanogenmod/wallpapers/photophase/shapes/ColorShape.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/shapes/ColorShape.java
@@ -19,8 +19,8 @@ package org.cyanogenmod.wallpapers.photophase.shapes;
 import android.content.Context;
 import android.opengl.GLES20;
 
-import org.cyanogenmod.wallpapers.photophase.GLESUtil;
-import org.cyanogenmod.wallpapers.photophase.GLESUtil.GLColor;
+import org.cyanogenmod.wallpapers.photophase.utils.GLESUtil;
+import org.cyanogenmod.wallpapers.photophase.utils.GLESUtil.GLColor;
 import org.cyanogenmod.wallpapers.photophase.R;
 
 import java.nio.ByteBuffer;
diff --git a/src/org/cyanogenmod/wallpapers/photophase/shapes/OopsShape.java b/src/org/cyanogenmod/wallpapers/photophase/shapes/OopsShape.java
index 7b50921..43e8022 100644
--- a/src/org/cyanogenmod/wallpapers/photophase/shapes/OopsShape.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/shapes/OopsShape.java
@@ -26,9 +26,9 @@ import android.graphics.Typeface;
 import android.opengl.GLES20;
 
 import org.cyanogenmod.wallpapers.photophase.Colors;
-import org.cyanogenmod.wallpapers.photophase.GLESUtil;
-import org.cyanogenmod.wallpapers.photophase.GLESUtil.GLColor;
-import org.cyanogenmod.wallpapers.photophase.GLESUtil.GLESTextureInfo;
+import org.cyanogenmod.wallpapers.photophase.utils.GLESUtil;
+import org.cyanogenmod.wallpapers.photophase.utils.GLESUtil.GLColor;
+import org.cyanogenmod.wallpapers.photophase.utils.GLESUtil.GLESTextureInfo;
 import org.cyanogenmod.wallpapers.photophase.R;
 
 import java.nio.ByteBuffer;
diff --git a/src/org/cyanogenmod/wallpapers/photophase/tasks/AsyncPictureLoaderTask.java b/src/org/cyanogenmod/wallpapers/photophase/tasks/AsyncPictureLoaderTask.java
index 9668d22..bc07b17 100644
--- a/src/org/cyanogenmod/wallpapers/photophase/tasks/AsyncPictureLoaderTask.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/tasks/AsyncPictureLoaderTask.java
@@ -23,7 +23,7 @@ import android.graphics.drawable.Drawable;
 import android.os.AsyncTask;
 import android.widget.ImageView;
 
-import org.cyanogenmod.wallpapers.photophase.BitmapUtils;
+import org.cyanogenmod.wallpapers.photophase.utils.BitmapUtils;
 
 import java.io.File;
 
diff --git a/src/org/cyanogenmod/wallpapers/photophase/transitions/FlipTransition.java b/src/org/cyanogenmod/wallpapers/photophase/transitions/FlipTransition.java
index 4c9842c..43dbee4 100644
--- a/src/org/cyanogenmod/wallpapers/photophase/transitions/FlipTransition.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/transitions/FlipTransition.java
@@ -22,7 +22,7 @@ import android.opengl.GLException;
 import android.opengl.Matrix;
 import android.os.SystemClock;
 
-import org.cyanogenmod.wallpapers.photophase.GLESUtil;
+import org.cyanogenmod.wallpapers.photophase.utils.GLESUtil;
 import org.cyanogenmod.wallpapers.photophase.PhotoFrame;
 import org.cyanogenmod.wallpapers.photophase.R;
 import org.cyanogenmod.wallpapers.photophase.TextureManager;
diff --git a/src/org/cyanogenmod/wallpapers/photophase/transitions/NullTransition.java b/src/org/cyanogenmod/wallpapers/photophase/transitions/NullTransition.java
index 8686dd9..24344d6 100644
--- a/src/org/cyanogenmod/wallpapers/photophase/transitions/NullTransition.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/transitions/NullTransition.java
@@ -20,7 +20,7 @@ import android.content.Context;
 import android.opengl.GLES20;
 import android.opengl.GLException;
 
-import org.cyanogenmod.wallpapers.photophase.GLESUtil;
+import org.cyanogenmod.wallpapers.photophase.utils.GLESUtil;
 import org.cyanogenmod.wallpapers.photophase.PhotoFrame;
 import org.cyanogenmod.wallpapers.photophase.R;
 import org.cyanogenmod.wallpapers.photophase.TextureManager;
diff --git a/src/org/cyanogenmod/wallpapers/photophase/transitions/Transition.java b/src/org/cyanogenmod/wallpapers/photophase/transitions/Transition.java
index 82a8eea..da8b1b0 100644
--- a/src/org/cyanogenmod/wallpapers/photophase/transitions/Transition.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/transitions/Transition.java
@@ -19,7 +19,7 @@ package org.cyanogenmod.wallpapers.photophase.transitions;
 import android.content.Context;
 import android.opengl.GLES20;
 
-import org.cyanogenmod.wallpapers.photophase.GLESUtil;
+import org.cyanogenmod.wallpapers.photophase.utils.GLESUtil;
 import org.cyanogenmod.wallpapers.photophase.PhotoFrame;
 import org.cyanogenmod.wallpapers.photophase.TextureManager;
 import org.cyanogenmod.wallpapers.photophase.transitions.Transitions.TRANSITIONS;
diff --git a/src/org/cyanogenmod/wallpapers/photophase/transitions/TranslateTransition.java b/src/org/cyanogenmod/wallpapers/photophase/transitions/TranslateTransition.java
index 2fc94ed..b05dd71 100644
--- a/src/org/cyanogenmod/wallpapers/photophase/transitions/TranslateTransition.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/transitions/TranslateTransition.java
@@ -22,7 +22,7 @@ import android.opengl.GLException;
 import android.opengl.Matrix;
 import android.os.SystemClock;
 
-import org.cyanogenmod.wallpapers.photophase.GLESUtil;
+import org.cyanogenmod.wallpapers.photophase.utils.GLESUtil;
 import org.cyanogenmod.wallpapers.photophase.PhotoFrame;
 import org.cyanogenmod.wallpapers.photophase.R;
 import org.cyanogenmod.wallpapers.photophase.TextureManager;
diff --git a/src/org/cyanogenmod/wallpapers/photophase/BitmapUtils.java b/src/org/cyanogenmod/wallpapers/photophase/utils/BitmapUtils.java
index b79db7b..fb49c72 100644
--- a/src/org/cyanogenmod/wallpapers/photophase/BitmapUtils.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/utils/BitmapUtils.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.cyanogenmod.wallpapers.photophase;
+package org.cyanogenmod.wallpapers.photophase.utils;
 
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
diff --git a/src/org/cyanogenmod/wallpapers/photophase/GLESUtil.java b/src/org/cyanogenmod/wallpapers/photophase/utils/GLESUtil.java
index 17b6602..7f0cbbc 100644
--- a/src/org/cyanogenmod/wallpapers/photophase/GLESUtil.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/utils/GLESUtil.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.cyanogenmod.wallpapers.photophase;
+package org.cyanogenmod.wallpapers.photophase.utils;
 
 import android.content.Context;
 import android.content.res.Resources;
diff --git a/src/org/cyanogenmod/wallpapers/photophase/utils/Utils.java b/src/org/cyanogenmod/wallpapers/photophase/utils/Utils.java
index 4b7af7c..bcf6b2a 100644
--- a/src/org/cyanogenmod/wallpapers/photophase/utils/Utils.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/utils/Utils.java
@@ -39,8 +39,6 @@ public class Utils {
         return dp * (metrics.densityDpi / 160f);
     }
 
-
-
     /**
      * Method that converts a rect from a vertex data
      *
diff --git a/src/org/cyanogenmod/wallpapers/photophase/widgets/AlbumPictures.java b/src/org/cyanogenmod/wallpapers/photophase/widgets/AlbumPictures.java
index 8efc16d..8e9d0ef 100644
--- a/src/org/cyanogenmod/wallpapers/photophase/widgets/AlbumPictures.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/widgets/AlbumPictures.java
@@ -68,12 +68,12 @@ public class AlbumPictures extends RelativeLayout
 
     private Handler mHandler;
 
-    private PicturesView mScroller;
-    private LinearLayout mHolder;
+    /*package*/ PicturesView mScroller;
+    /*package*/ LinearLayout mHolder;
     private View mBackButton;
     private View mOverflowButton;
 
-    private Album mAlbum;
+    /*package*/ Album mAlbum;
 
     /**
      * Constructor of <code>AlbumPictures</code>.
@@ -304,7 +304,7 @@ public class AlbumPictures extends RelativeLayout
      * @param picture The path of the picture
      * @param selected If the picture is selected
      */
-    private View createPicture(LayoutInflater inflater, String picture, boolean selected) {
+    /*package*/ View createPicture(LayoutInflater inflater, String picture, boolean selected) {
         final View v = inflater.inflate(R.layout.picture_item, mHolder, false);
         v.setTag(picture);
         v.setSelected(selected);
@@ -318,7 +318,7 @@ public class AlbumPictures extends RelativeLayout
      * @param picture The picture to check
      * @return boolean whether the picture is selected
      */
-    private boolean isPictureSelected(String picture) {
+    /*package*/ boolean isPictureSelected(String picture) {
         for (String item : mAlbum.getSelectedItems()) {
             if (item.compareTo(picture) == 0) {
                 return true;
diff --git a/src/org/cyanogenmod/wallpapers/photophase/widgets/PicturesView.java b/src/org/cyanogenmod/wallpapers/photophase/widgets/PicturesView.java
index 9408a9d..0744751 100644
--- a/src/org/cyanogenmod/wallpapers/photophase/widgets/PicturesView.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/widgets/PicturesView.java
@@ -142,7 +142,7 @@ public class PicturesView extends HorizontalScrollView {
     /**
      * Method that load in background all visible and pending pictures
      */
-    private void requestLoadOfPendingPictures() {
+    /*package*/ void requestLoadOfPendingPictures() {
         // Get the visible rect
         Rect r = new Rect();
         getHitRect(r);