Use ImageView for background that must not stretch (fix #69)

Signed-off-by: Daniele Ricci <daniele.athome@gmail.com>
kontalk · Aug 12, 2014 · 85f38f8 · 85f38f8
1 parent eda2147
commit 85f38f8
Show file tree

Hide file tree

Showing 4 changed files with 101 additions and 37 deletions.
diff --git a/app/src/main/java/org/kontalk/ui/ComposeMessageFragment.java b/app/src/main/java/org/kontalk/ui/ComposeMessageFragment.java
@@ -117,6 +117,7 @@
 import android.widget.AdapterView.AdapterContextMenuInfo;
 import android.widget.EditText;
 import android.widget.ImageButton;
+import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.TextView;
 import android.widget.TextView.OnEditorActionListener;
@@ -241,8 +242,10 @@ public void onActivityCreated(Bundle savedInstanceState) {
         // set custom background (if any)
         Drawable bg = Preferences.getConversationBackground(getActivity());
         if (bg != null) {
+            ImageView background = (ImageView) getView().findViewById(R.id.background);
             list.setCacheColorHint(Color.TRANSPARENT);
-            list.setBackgroundDrawable(bg);
+            list.setBackgroundColor(Color.TRANSPARENT);
+            background.setImageDrawable(bg);
         }
 
         mTextEntry = (EditText) getView().findViewById(R.id.text_editor);

diff --git a/app/src/main/java/org/kontalk/ui/PreferencesActivity.java b/app/src/main/java/org/kontalk/ui/PreferencesActivity.java
@@ -488,9 +488,13 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
             if (resultCode == RESULT_OK) {
                 // invalidate any previous reference
                 Preferences.setCachedCustomBackground(null);
+                // resize and cache image
+                // TODO do this in background (might take some time)
+                File image = Preferences.cacheConversationBackground(this, data.getData());
+                // save to preferences
                 SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
                 prefs.edit()
-                    .putString("pref_background_uri", data.getDataString())
+                    .putString("pref_background_uri", Uri.fromFile(image).toString())
                     .commit();
             }
         }

diff --git a/app/src/main/java/org/kontalk/util/Preferences.java b/app/src/main/java/org/kontalk/util/Preferences.java
@@ -18,7 +18,10 @@
 
 package org.kontalk.util;
 
+import java.io.File;
+import java.io.FileOutputStream;
 import java.io.InputStream;
+import java.io.OutputStream;
 
 import org.kontalk.R;
 import org.kontalk.client.EndpointServer;
@@ -35,13 +38,16 @@
 import android.database.sqlite.SQLiteOpenHelper;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
+import android.graphics.Point;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.preference.Preference;
 import android.preference.PreferenceManager;
 import android.provider.BaseColumns;
 import android.text.TextUtils;
+import android.view.Display;
+import android.view.WindowManager;
 
 
 /**
@@ -238,6 +244,48 @@ public static boolean setStatusMessage(Context context, String message) {
             .commit();
     }
 
+    /** Loads and stores a cached version of the given conversation background. */
+    public static File cacheConversationBackground(Context context, Uri uri) {
+        InputStream in = null;
+        OutputStream out = null;
+        try {
+            in = context.getContentResolver().openInputStream(uri);
+
+            Bitmap bmap = BitmapFactory.decodeStream(in, null, null);
+
+            WindowManager wm = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
+            Display display = wm.getDefaultDisplay();
+
+            Bitmap tn = ThumbnailUtils.extractThumbnail(bmap, display.getWidth(), display.getHeight());
+            bmap.recycle();
+
+            File outFile = new File(context.getFilesDir(), "background.png");
+            out = new FileOutputStream(outFile);
+            tn.compress(Bitmap.CompressFormat.PNG, 90, out);
+            tn.recycle();
+
+            return outFile;
+        }
+        catch (Exception e) {
+            // ignored
+        }
+        finally {
+            try {
+                in.close();
+            }
+            catch (Exception e) {
+                // ignored
+            }
+            try {
+                out.close();
+            }
+            catch (Exception e) {
+                // ignored
+            }
+        }
+        return null;
+    }
+
     public static Drawable getConversationBackground(Context context) {
         InputStream in = null;
         try {
@@ -246,9 +294,7 @@ public static Drawable getConversationBackground(Context context) {
                     String _customBg = getString(context, "pref_background_uri", null);
                     in = context.getContentResolver().openInputStream(Uri.parse(_customBg));
 
-                    BitmapFactory.Options opt = new BitmapFactory.Options();
-                    opt.inSampleSize = 4;
-                    Bitmap bmap = BitmapFactory.decodeStream(in, null, opt);
+                    Bitmap bmap = BitmapFactory.decodeStream(in, null, null);
                     sCustomBackground = new BitmapDrawable(context.getResources(), bmap);
                 }
                 return sCustomBackground;

diff --git a/app/src/main/res/layout/compose_message.xml b/app/src/main/res/layout/compose_message.xml
@@ -16,37 +16,48 @@
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
  -->
 
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical">
-
-    <include layout="@layout/invitation_bar"
-        android:id="@+id/invitation_bar"
-        android:visibility="gone"/>
-
-    <ListView android:id="@android:id/list"
-        style="?android:attr/listViewWhiteStyle"
-        android:background="@color/compose_message_list_background"
-        android:cacheColorHint="@color/compose_message_list_background"
-        android:divider="@null"
-        android:dividerHeight="0.0sp"
+    android:layout_height="fill_parent">
+
+    <ImageView android:id="@+id/background"
+        android:scaleType="centerCrop"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"/>
+
+    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="fill_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1.0"
-        android:drawSelectorOnTop="false"
-        android:transcriptMode="normal"
-        android:smoothScrollbar="false"
-        android:scrollbarAlwaysDrawVerticalTrack="true"
-        android:fastScrollEnabled="true"
-        android:fastScrollAlwaysVisible="true"
-        android:scrollbarStyle="insideInset"
-        android:stackFromBottom="true"
-        android:fadingEdgeLength="8dp"
-        >
-        <!-- Preview: listitem=@layout/message_list_item -->
-    </ListView>
-
-    <include layout="@layout/composer_bar"/>
-
-</LinearLayout>
+        android:layout_height="fill_parent"
+        android:orientation="vertical">
+
+        <include layout="@layout/invitation_bar"
+            android:id="@+id/invitation_bar"
+            android:visibility="gone"/>
+
+        <ListView android:id="@android:id/list"
+            style="?android:attr/listViewWhiteStyle"
+            android:background="@color/compose_message_list_background"
+            android:cacheColorHint="@color/compose_message_list_background"
+            android:divider="@null"
+            android:dividerHeight="0.0sp"
+            android:layout_width="fill_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1.0"
+            android:drawSelectorOnTop="false"
+            android:transcriptMode="normal"
+            android:smoothScrollbar="false"
+            android:scrollbarAlwaysDrawVerticalTrack="true"
+            android:fastScrollEnabled="true"
+            android:fastScrollAlwaysVisible="true"
+            android:scrollbarStyle="insideInset"
+            android:stackFromBottom="true"
+            android:fadingEdgeLength="8dp"
+            >
+            <!-- Preview: listitem=@layout/message_list_item -->
+        </ListView>
+
+        <include layout="@layout/composer_bar"/>
+
+    </LinearLayout>
+
+</RelativeLayout>