Merge pull request #648 from veeti/tweaks-and-polish

Assorted tweaks and polish

res/drawable/clickable_card.xml

@@ -2,7 +2,7 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_pressed="true">
         <shape>
-            <solid android:color="@color/card_background_active" />
+            <solid android:color="@color/touch_highlight" />
         </shape>
         <bitmap android:src="@drawable/card" />
     </item>

res/drawable/contact_photo_background.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true">
+        <shape android:shape="oval">
+            <solid android:color="@color/touch_highlight" />
+        </shape>
+    </item>
+
+    <item android:drawable="@android:color/transparent" />
+</selector>

res/drawable/emoji_toggle_background.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_pressed="true"
-          android:drawable="@android:color/transparent" />
-
-    <item android:state_focused="true"
-          android:drawable="@android:color/transparent" />
-
-    <item android:drawable="@android:color/transparent" />
-
-</selector>

res/drawable/send_button_background.xml

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <!-- pressed -->
-    <item android:state_pressed="true" >
-        <shape>
-            <solid android:color="#FF33B5E5" />
-        </shape>
-    </item>
-
-    <!-- focused -->
-    <item android:state_focused="true" >
-        <shape>
-            <solid android:color="#FF33B5E5" />
-        </shape>
-    </item>
-
-    <!-- default -->
-    <item>
-        <shape>
-            <solid android:color="#00ffffff" />
-        </shape>
-    </item>
-
-</selector>

res/drawable/touch_highlight_background.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true" android:drawable="@color/touch_highlight" />
+    <item android:drawable="@android:color/transparent" />
+</selector>

res/layout/conversation_activity.xml

@@ -82,7 +82,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="fill_parent"
                         android:layout_gravity="center_vertical"
-                        android:background="@drawable/emoji_toggle_background"
+                        android:background="@drawable/touch_highlight_background"
                         android:padding="10dp"/>
 
                 <EditText
@@ -108,7 +108,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="fill_parent"
                     android:layout_gravity="center_vertical"
-                    android:background="@drawable/send_button_background"
+                    android:background="@drawable/touch_highlight_background"
                     android:contentDescription="@string/conversation_activity__send"
                     android:nextFocusLeft="@+id/embedded_text_editor"
                     android:padding="12dp"

res/layout/conversation_item_received.xml

@@ -26,7 +26,9 @@
         android:layout_marginRight="0dp"
         android:orientation="horizontal">
 
-        <ImageView android:id="@+id/contact_photo"
+        <org.thoughtcrime.securesms.components.ForegroundImageView
+            android:id="@+id/contact_photo"
+            android:foreground="@drawable/contact_photo_background"
             android:layout_width="40dp"
             android:layout_height="40dp"
             android:layout_marginRight="10dp"

res/layout/conversation_list_item_view.xml

@@ -15,14 +15,16 @@
                  android:paddingRight="10dp"
                  android:visibility="visible">
 
-	    <ImageView android:id="@+id/contact_photo_image"
-	               android:layout_width="60dp"
-	               android:layout_height="60dp"
-	               android:cropToPadding="true"
-	               android:scaleType="centerCrop"
-	               android:visibility="gone"
-                   android:contentDescription="Contact Photo Image"
-                   android:layout_marginLeft="0dp" />
+        <org.thoughtcrime.securesms.components.ForegroundImageView
+            android:id="@+id/contact_photo_image"
+            android:foreground="@drawable/contact_photo_background"
+            android:layout_width="60dp"
+            android:layout_height="60dp"
+            android:cropToPadding="true"
+            android:scaleType="centerCrop"
+            android:visibility="gone"
+            android:contentDescription="Contact Photo Image"
+            android:layout_marginLeft="0dp" />
     </FrameLayout>
 
     <TextView android:id="@+id/from"

res/values-v19/colors.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="card_background_active">#99bebebe</color>
+    <color name="touch_highlight">#10000000</color>
 </resources>

res/values/attrs.xml

@@ -58,4 +58,10 @@
     <attr name="menu_group_icon" format="reference" />
     <attr name="menu_split_icon" format="reference" />
     <attr name="menu_accept_icon" format="reference" />
+
+    <declare-styleable name="ForegroundImageView">
+        <attr name="android:foreground" />
+        <attr name="android:foregroundInsidePadding" />
+        <attr name="android:foregroundGravity" />
+    </declare-styleable>
 </resources>

res/values/colors.xml

@@ -11,7 +11,7 @@
 
     <color name="textsecure_holo_blue_light">#ff33b5e5</color>
 
-    <color name="card_background_active">#9933b5e5</color>
+    <color name="touch_highlight">#400099cc</color>
 
     <color name="conversation_item_sent_background_dark">#ff284e0a</color>
     <color name="conversation_item_sent_background_light">#ff64a926</color>

res/values/strings.xml

@@ -90,8 +90,8 @@
 
     <!-- ConversationFragment -->
     <string name="ConversationFragment_message_details">Message details</string>
-    <string name="ConversationFragment_sender_s_transport_s_sent_received_s">Transport: %1$s\nSent/Received:%2$s</string>
-    <string name="ConversationFragment_sender_s_transport_s_sent_s_received_s">Sender: %1$s\nTransport: %2$s\nSent: %3$s\nReceived:%4$s</string>
+    <string name="ConversationFragment_sender_s_transport_s_sent_received_s">Transport: %1$s\nSent/Received: %2$s</string>
+    <string name="ConversationFragment_sender_s_transport_s_sent_s_received_s">Sender: %1$s\nTransport: %2$s\nSent: %3$s\nReceived: %4$s</string>
 	<string name="ConversationFragment_confirm_message_delete">Confirm Message Delete</string>
 	<string name="ConversationFragment_are_you_sure_you_want_to_permanently_delete_this_message">Are you sure that you want to permanently delete this message?</string>
 

src/org/thoughtcrime/securesms/ConversationListFragment.java

@@ -107,6 +107,11 @@ public class ConversationListFragment extends SherlockListFragment
       } else {
         ConversationListAdapter adapter = (ConversationListAdapter)getListAdapter();
         adapter.toggleThreadInBatchSet(headerView.getThreadId());
+
+        if (adapter.getBatchSelections().size() == 0) {
+          actionMode.finish();
+        }
+
         adapter.notifyDataSetChanged();
       }
     }

src/org/thoughtcrime/securesms/components/ForegroundImageView.java

@@ -0,0 +1,221 @@
+/*
+ * Copyright (C) 2006 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.thoughtcrime.securesms.components;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.Canvas;
+import android.graphics.Rect;
+import android.graphics.drawable.Drawable;
+import android.util.AttributeSet;
+import android.view.Gravity;
+import android.widget.ImageView;
+
+import org.thoughtcrime.securesms.R;
+
+/**
+ * https://gist.github.com/chrisbanes/9091754
+ */
+public class ForegroundImageView extends ImageView {
+
+  private Drawable mForeground;
+
+  private final Rect mSelfBounds = new Rect();
+  private final Rect mOverlayBounds = new Rect();
+
+  private int mForegroundGravity = Gravity.FILL;
+
+  protected boolean mForegroundInPadding = true;
+
+  boolean mForegroundBoundsChanged = false;
+
+  public ForegroundImageView(Context context) {
+    super(context);
+  }
+
+  public ForegroundImageView(Context context, AttributeSet attrs) {
+    this(context, attrs, 0);
+  }
+
+  public ForegroundImageView(Context context, AttributeSet attrs, int defStyle) {
+    super(context, attrs, defStyle);
+
+    TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.ForegroundImageView,
+      defStyle, 0);
+
+    mForegroundGravity = a.getInt(
+      R.styleable.ForegroundImageView_android_foregroundGravity, mForegroundGravity);
+
+    final Drawable d = a.getDrawable(R.styleable.ForegroundImageView_android_foreground);
+    if (d != null) {
+      setForeground(d);
+    }
+
+    mForegroundInPadding = a.getBoolean(
+      R.styleable.ForegroundImageView_android_foregroundInsidePadding, true);
+
+    a.recycle();
+  }
+
+  /**
+   * Describes how the foreground is positioned.
+   *
+   * @return foreground gravity.
+   *
+   * @see #setForegroundGravity(int)
+   */
+  public int getForegroundGravity() {
+    return mForegroundGravity;
+  }
+
+  /**
+   * Describes how the foreground is positioned. Defaults to START and TOP.
+   *
+   * @param foregroundGravity See {@link android.view.Gravity}
+   *
+   * @see #getForegroundGravity()
+   */
+  public void setForegroundGravity(int foregroundGravity) {
+    if (mForegroundGravity != foregroundGravity) {
+      if ((foregroundGravity & Gravity.RELATIVE_HORIZONTAL_GRAVITY_MASK) == 0) {
+        foregroundGravity |= Gravity.START;
+      }
+
+      if ((foregroundGravity & Gravity.VERTICAL_GRAVITY_MASK) == 0) {
+        foregroundGravity |= Gravity.TOP;
+      }
+
+      mForegroundGravity = foregroundGravity;
+
+
+      if (mForegroundGravity == Gravity.FILL && mForeground != null) {
+        Rect padding = new Rect();
+        mForeground.getPadding(padding);
+      }
+
+      requestLayout();
+    }
+  }
+
+  @Override
+  protected boolean verifyDrawable(Drawable who) {
+    return super.verifyDrawable(who) || (who == mForeground);
+  }
+
+  @Override
+  public void jumpDrawablesToCurrentState() {
+    super.jumpDrawablesToCurrentState();
+    if (mForeground != null) mForeground.jumpToCurrentState();
+  }
+
+  @Override
+  protected void drawableStateChanged() {
+    super.drawableStateChanged();
+    if (mForeground != null && mForeground.isStateful()) {
+      mForeground.setState(getDrawableState());
+    }
+  }
+
+  /**
+   * Supply a Drawable that is to be rendered on top of all of the child
+   * views in the frame layout.  Any padding in the Drawable will be taken
+   * into account by ensuring that the children are inset to be placed
+   * inside of the padding area.
+   *
+   * @param drawable The Drawable to be drawn on top of the children.
+   */
+  public void setForeground(Drawable drawable) {
+    if (mForeground != drawable) {
+      if (mForeground != null) {
+        mForeground.setCallback(null);
+        unscheduleDrawable(mForeground);
+      }
+
+      mForeground = drawable;
+
+      if (drawable != null) {
+        setWillNotDraw(false);
+        drawable.setCallback(this);
+        if (drawable.isStateful()) {
+          drawable.setState(getDrawableState());
+        }
+        if (mForegroundGravity == Gravity.FILL) {
+          Rect padding = new Rect();
+          drawable.getPadding(padding);
+        }
+      }  else {
+        setWillNotDraw(true);
+      }
+      requestLayout();
+      invalidate();
+    }
+  }
+
+  /**
+   * Returns the drawable used as the foreground of this FrameLayout. The
+   * foreground drawable, if non-null, is always drawn on top of the children.
+   *
+   * @return A Drawable or null if no foreground was set.
+   */
+  public Drawable getForeground() {
+    return mForeground;
+  }
+
+  @Override
+  protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
+    super.onLayout(changed, left, top, right, bottom);
+    mForegroundBoundsChanged = changed;
+  }
+
+  @Override
+  protected void onSizeChanged(int w, int h, int oldw, int oldh) {
+    super.onSizeChanged(w, h, oldw, oldh);
+    mForegroundBoundsChanged = true;
+  }
+
+  @Override
+  public void draw(Canvas canvas) {
+    super.draw(canvas);
+
+    if (mForeground != null) {
+      final Drawable foreground = mForeground;
+
+      if (mForegroundBoundsChanged) {
+        mForegroundBoundsChanged = false;
+        final Rect selfBounds = mSelfBounds;
+        final Rect overlayBounds = mOverlayBounds;
+
+        final int w = getRight() - getLeft();
+        final int h = getBottom() - getTop();
+
+        if (mForegroundInPadding) {
+          selfBounds.set(0, 0, w, h);
+        } else {
+          selfBounds.set(getPaddingLeft(), getPaddingTop(),
+            w - getPaddingRight(), h - getPaddingBottom());
+        }
+
+        Gravity.apply(mForegroundGravity, foreground.getIntrinsicWidth(),
+          foreground.getIntrinsicHeight(), selfBounds, overlayBounds);
+        foreground.setBounds(overlayBounds);
+      }
+
+      foreground.draw(canvas);
+    }
+  }
+
+}