Merge pull request #10 from Manabu-GT/develop

Develop

Author: Manabu-GT

app/build.gradle

@@ -33,8 +33,8 @@ android {
         applicationId "com.ms_square.android.design.overlay"
         minSdkVersion project.ANDROID_BUILD_MIN_SDK_VERSION
         targetSdkVersion project.ANDROID_BUILD_TARGET_SDK_VERSION
-        versionCode 2
-        versionName "1.0.1"
+        versionCode 3
+        versionName "1.0.2"
     }
 
     signingConfigs {

app/libs/android-ColorPickerPreference

@@ -6,6 +6,9 @@
     <!-- To overlay view above all the application UIs -->
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
 
+    <!-- Looks this is needed to read Google+ photos -->
+    <uses-permission android:name="com.google.android.apps.photos.permission.GOOGLE_PHOTOS"/>
+
     <application
         android:name=".app.DesignOverlayApplication"
         android:allowBackup="true"
@@ -24,9 +27,6 @@
             </intent-filter>
         </activity>
 
-        <!-- to remove sample activity from the library -->
-        <activity android:name="net.margaritov.preference.colorpicker.Test" tools:node="remove"/>
-
         <service android:name=".service.DesignOverlayService" />
 
     </application>

app/src/main/AndroidManifest.xml

@@ -4,21 +4,22 @@
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.preference.ListPreference;
 import android.preference.Preference;
 import android.preference.PreferenceFragment;
 import android.preference.PreferenceManager;
+import android.util.TypedValue;
 import android.widget.Toast;
 
 import com.ms.square.android.util.AppUtil;
 import com.ms.square.android.util.ToastMaster;
 import com.ms_square.android.design.overlay.BuildConfig;
 import com.ms_square.android.design.overlay.R;
 import com.ms_square.android.design.overlay.task.SafeAsyncTask;
+import com.ms_square.android.design.overlay.util.ImageUtil;
 import com.ms_square.android.design.overlay.util.PrefUtil;
 import com.ms_square.android.design.overlay.view.ImagePreference;
 
@@ -36,6 +37,8 @@ public class SettingsFragment extends PreferenceFragment implements Preference.O
 
     private ImagePreference mImagePreference;
 
+    private int mImageSize;
+
     public static SettingsFragment newInstance() {
         SettingsFragment fragment = new SettingsFragment();
         //Bundle args = new Bundle();
@@ -56,6 +59,11 @@ public void onCreate(Bundle savedInstanceState) {
 
         mAppContext = getActivity().getApplicationContext();
 
+        // get listPreferredItemHeight value in pixel and set it to mImageSize
+        TypedValue value = new TypedValue();
+        getActivity().getTheme().resolveAttribute(android.R.attr.listPreferredItemHeight, value, true);
+        mImageSize = (int) value.getDimension(getResources().getDisplayMetrics());
+
         mImagePreference = (ImagePreference) findPreference(PrefUtil.PREF_DESIGN_IMAGE_URI);
         mImagePreference.setOnPreferenceClickListener(this);
         // load image if already set
@@ -113,7 +121,7 @@ protected Bitmap onRun(Uri... params) {
                 InputStream stream = null;
                 try {
                     stream = mAppContext.getContentResolver().openInputStream(params[0]);
-                    bitmap = BitmapFactory.decodeStream(stream);
+                    bitmap = ImageUtil.decodeSampledBitmapFromStream(stream, mImageSize, mImageSize);
                 } catch (FileNotFoundException fe) {
                     Timber.w("File was not found:" + fe);
                 } finally {

app/src/main/java/com/ms_square/android/design/overlay/fragment/SettingsFragment.java

@@ -0,0 +1,60 @@
+package com.ms_square.android.design.overlay.util;
+
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+
+import java.io.BufferedInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+import timber.log.Timber;
+
+public class ImageUtil {
+
+    public static int calculateInSampleSize(BitmapFactory.Options options, int reqWidth, int reqHeight) {
+
+        // Raw height and width of image
+        final int height = options.outHeight;
+        final int width = options.outWidth;
+        int inSampleSize = 1;
+
+        if (height > reqHeight || width > reqWidth) {
+
+            final int halfHeight = height / 2;
+            final int halfWidth = width / 2;
+
+            // Calculate the largest inSampleSize value that is a power of 2 and keeps both
+            // height and width larger than the requested height and width.
+            while ((halfHeight / inSampleSize) > reqHeight
+                    && (halfWidth / inSampleSize) > reqWidth) {
+                inSampleSize *= 2;
+            }
+        }
+
+        return inSampleSize;
+    }
+
+    public static Bitmap decodeSampledBitmapFromStream(InputStream inputStream,
+                                                         int reqWidth, int reqHeight) {
+        final BufferedInputStream bufferedInputStream = new BufferedInputStream(inputStream);
+        bufferedInputStream.mark(Integer.MAX_VALUE);
+
+        // First decode with inJustDecodeBounds = true to check dimensions
+        final BitmapFactory.Options options = new BitmapFactory.Options();
+        options.inJustDecodeBounds = true;
+        BitmapFactory.decodeStream(bufferedInputStream, null, options);
+
+        // Calculate inSampleSize
+        options.inSampleSize = calculateInSampleSize(options, reqWidth, reqHeight);
+
+        try {
+            bufferedInputStream.reset();
+        } catch (IOException e) {
+            Timber.w("Could not reposition the stream:" + e);
+        }
+
+        // Decode bitmap with inSampleSize set
+        options.inJustDecodeBounds = false;
+        return BitmapFactory.decodeStream(bufferedInputStream, null, options);
+    }
+}

app/src/main/java/com/ms_square/android/design/overlay/util/ImageUtil.java

@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.0.0'
+        classpath 'com.android.tools.build:gradle:1.1.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -21,11 +21,11 @@ allprojects {
 
 // http://www.gradle.org/docs/current/dsl/org.gradle.api.plugins.ExtraPropertiesExtension.html
 project.ext {
-    ANDROID_BUILD_SDK_VERSION = 21
-    ANDROID_BUILD_TOOLS_VERSION = "21.1.2"
+    ANDROID_BUILD_SDK_VERSION = 22
+    ANDROID_BUILD_TOOLS_VERSION = "22"
 
     ANDROID_BUILD_MIN_SDK_VERSION = 14
-    ANDROID_BUILD_TARGET_SDK_VERSION = 21
+    ANDROID_BUILD_TARGET_SDK_VERSION = 22
 
     // Google Stuffs
     supportPackageVersion = "21.0.3"