From 61b66f0f095e07dcf3e184ea5e122e9f7a7c10f1 Mon Sep 17 00:00:00 2001 From: George Kankava Date: Thu, 10 Mar 2016 13:27:20 +0400 Subject: [PATCH 01/22] squid:S1213 - The members of an interface declaration or class should appear in a pre-defined order --- .../com/moez/QKSMS/common/google/BlobCache.java | 8 +++++--- .../com/moez/QKSMS/common/google/DraftCache.java | 12 ++++++------ .../com/moez/QKSMS/common/google/SimpleCache.java | 13 ++++++------- .../java/com/moez/QKSMS/common/google/UriImage.java | 3 +-- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/QKSMS/src/main/java/com/moez/QKSMS/common/google/BlobCache.java b/QKSMS/src/main/java/com/moez/QKSMS/common/google/BlobCache.java index 793bd117..b50253c0 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/common/google/BlobCache.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/common/google/BlobCache.java @@ -123,6 +123,11 @@ public class BlobCache implements Closeable { private byte[] mBlobHeader = new byte[BLOB_HEADER_SIZE]; private Adler32 mAdler32 = new Adler32(); + private int mSlotOffset; + private int mFileOffset; + + private LookupRequest mLookupRequest = new LookupRequest(); + // Creates the cache. Three files will be created: // path + ".idx", path + ".0", and path + ".1" // The ".0" file and the ".1" file each stores data for a region. Each of @@ -407,7 +412,6 @@ public class BlobCache implements Closeable { // This method is for one-off lookup. For repeated lookup, use the version // accepting LookupRequest to avoid repeated memory allocation. - private LookupRequest mLookupRequest = new LookupRequest(); public byte[] lookup(long key) throws IOException { mLookupRequest.key = key; mLookupRequest.buffer = null; @@ -531,8 +535,6 @@ public class BlobCache implements Closeable { // insertion. // If the lookup is successful, the file offset is also saved in // mFileOffset. - private int mSlotOffset; - private int mFileOffset; private boolean lookupInternal(long key, int hashStart) { int slot = (int) (key % mMaxEntries); if (slot < 0) slot += mMaxEntries; diff --git a/QKSMS/src/main/java/com/moez/QKSMS/common/google/DraftCache.java b/QKSMS/src/main/java/com/moez/QKSMS/common/google/DraftCache.java index 250b6029..832575af 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/common/google/DraftCache.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/common/google/DraftCache.java @@ -35,6 +35,12 @@ package com.moez.QKSMS.common.google; public class DraftCache { private static final String TAG = "Mms/draft"; + static final String[] DRAFT_PROJECTION = new String[] { + Conversations.THREAD_ID // 0 + }; + + static final int COLUMN_DRAFT_THREAD_ID = 0; + private static DraftCache sInstance; private final Context mContext; @@ -61,12 +67,6 @@ public class DraftCache { refresh(); } - static final String[] DRAFT_PROJECTION = new String[] { - Conversations.THREAD_ID // 0 - }; - - static final int COLUMN_DRAFT_THREAD_ID = 0; - /** To be called whenever the draft state might have changed. * Dispatches work to a thread and returns immediately. */ diff --git a/QKSMS/src/main/java/com/moez/QKSMS/common/google/SimpleCache.java b/QKSMS/src/main/java/com/moez/QKSMS/common/google/SimpleCache.java index a98a2182..b624667b 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/common/google/SimpleCache.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/common/google/SimpleCache.java @@ -29,6 +29,8 @@ import java.util.LinkedHashMap; * from Peter Balwin and books app. */ public class SimpleCache { + private final SoftReferenceMap mSoftReferences; + private final HardReferenceMap mHardReferences; /** * A simple LRU cache to prevent the number of {@link java.util.Map.Entry} instances @@ -66,13 +68,6 @@ public class SimpleCache { } } - private static V unwrap(SoftReference ref) { - return ref != null ? ref.get() : null; - } - - private final SoftReferenceMap mSoftReferences; - private final HardReferenceMap mHardReferences; - /** * Constructor. * @@ -95,6 +90,10 @@ public class SimpleCache { } } + private static V unwrap(SoftReference ref) { + return ref != null ? ref.get() : null; + } + /** * See {@link java.util.Map#get(Object)}. */ diff --git a/QKSMS/src/main/java/com/moez/QKSMS/common/google/UriImage.java b/QKSMS/src/main/java/com/moez/QKSMS/common/google/UriImage.java index 38e2297e..d7d71d22 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/common/google/UriImage.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/common/google/UriImage.java @@ -47,6 +47,7 @@ import java.io.IOException; import java.io.InputStream; public class UriImage { + private static final int NUMBER_OF_RESIZE_ATTEMPTS = 4; private static final String TAG = "Mms/image"; private static final boolean DEBUG = false; private static final boolean LOCAL_LOGV = false; @@ -259,8 +260,6 @@ public class UriImage { return part; } - private static final int NUMBER_OF_RESIZE_ATTEMPTS = 4; - /** * Resize and recompress the image such that it fits the given limits. The resulting byte * array contains an image in JPEG format, regardless of the original image's content type. From 2838ab284b18d682e5bf4bae5e39d8c8a16cdaaa Mon Sep 17 00:00:00 2001 From: George Kankava Date: Sat, 2 Jul 2016 09:46:12 +0400 Subject: [PATCH 02/22] squid:ModifiersOrderCheck - Modifiers should be declared in the correct order --- .../java/android/net/DhcpInfoInternal.java | 4 +- .../android/net/IConnectivityManager.java | 2 +- .../android/net/INetworkPolicyListener.java | 2 +- .../android/net/INetworkPolicyManager.java | 2 +- .../java/android/net/LinkCapabilities.java | 20 ++++----- .../android/mms/pdu_alt/PduComposer.java | 34 +++++++-------- .../android/mms/pdu_alt/PduPersister.java | 2 +- .../moez/QKSMS/common/google/Recycler.java | 42 +++++++++---------- .../com/moez/QKSMS/external/iab/Base64.java | 20 ++++----- 9 files changed, 64 insertions(+), 64 deletions(-) diff --git a/QKSMS/src/main/java/android/net/DhcpInfoInternal.java b/QKSMS/src/main/java/android/net/DhcpInfoInternal.java index 8e4e6da5..fbeb38e3 100644 --- a/QKSMS/src/main/java/android/net/DhcpInfoInternal.java +++ b/QKSMS/src/main/java/android/net/DhcpInfoInternal.java @@ -33,9 +33,9 @@ import java.util.Collections; * @hide */ public class DhcpInfoInternal { - private final static String TAG = "DhcpInfoInternal"; + private static final String TAG = "DhcpInfoInternal"; - private final static boolean LOCAL_LOGV = false; + private static final boolean LOCAL_LOGV = false; public String ipAddress; public int prefixLength; diff --git a/QKSMS/src/main/java/android/net/IConnectivityManager.java b/QKSMS/src/main/java/android/net/IConnectivityManager.java index 7203366a..906c2fb4 100644 --- a/QKSMS/src/main/java/android/net/IConnectivityManager.java +++ b/QKSMS/src/main/java/android/net/IConnectivityManager.java @@ -15,7 +15,7 @@ public interface IConnectivityManager extends android.os.IInterface { /** * Local-side IPC implementation stub class. */ - public static abstract class Stub extends android.os.Binder implements android.net.IConnectivityManager { + public abstract static class Stub extends android.os.Binder implements android.net.IConnectivityManager { private static final String DESCRIPTOR = "android.net.IConnectivityManager"; /** diff --git a/QKSMS/src/main/java/android/net/INetworkPolicyListener.java b/QKSMS/src/main/java/android/net/INetworkPolicyListener.java index a8b331e1..1e98ae57 100644 --- a/QKSMS/src/main/java/android/net/INetworkPolicyListener.java +++ b/QKSMS/src/main/java/android/net/INetworkPolicyListener.java @@ -11,7 +11,7 @@ public interface INetworkPolicyListener extends android.os.IInterface { /** * Local-side IPC implementation stub class. */ - public static abstract class Stub extends android.os.Binder implements android.net.INetworkPolicyListener { + public abstract static class Stub extends android.os.Binder implements android.net.INetworkPolicyListener { private static final String DESCRIPTOR = "android.net.INetworkPolicyListener"; /** diff --git a/QKSMS/src/main/java/android/net/INetworkPolicyManager.java b/QKSMS/src/main/java/android/net/INetworkPolicyManager.java index 06134524..09dd0fce 100644 --- a/QKSMS/src/main/java/android/net/INetworkPolicyManager.java +++ b/QKSMS/src/main/java/android/net/INetworkPolicyManager.java @@ -13,7 +13,7 @@ public interface INetworkPolicyManager extends android.os.IInterface { /** * Local-side IPC implementation stub class. */ - public static abstract class Stub extends android.os.Binder implements android.net.INetworkPolicyManager { + public abstract static class Stub extends android.os.Binder implements android.net.INetworkPolicyManager { private static final String DESCRIPTOR = "android.net.INetworkPolicyManager"; /** diff --git a/QKSMS/src/main/java/android/net/LinkCapabilities.java b/QKSMS/src/main/java/android/net/LinkCapabilities.java index c4e20cb9..ad17464e 100644 --- a/QKSMS/src/main/java/android/net/LinkCapabilities.java +++ b/QKSMS/src/main/java/android/net/LinkCapabilities.java @@ -65,28 +65,28 @@ public class LinkCapabilities implements Parcelable { * * @see ConnectivityManager */ - public final static int RO_NETWORK_TYPE = 1; + public static final int RO_NETWORK_TYPE = 1; /** * Desired minimum forward link (download) bandwidth for the * in kilobits per second (kbps). Values should be strings such * "50", "100", "1500", etc. */ - public final static int RW_DESIRED_FWD_BW = 2; + public static final int RW_DESIRED_FWD_BW = 2; /** * Required minimum forward link (download) bandwidth, in * per second (kbps), below which the socket cannot function. * Values should be strings such as "50", "100", "1500", etc. */ - public final static int RW_REQUIRED_FWD_BW = 3; + public static final int RW_REQUIRED_FWD_BW = 3; /** * Available forward link (download) bandwidth for the socket. * This value is in kilobits per second (kbps). * Values will be strings such as "50", "100", "1500", etc. */ - public final static int RO_AVAILABLE_FWD_BW = 4; + public static final int RO_AVAILABLE_FWD_BW = 4; /** * Desired minimum reverse link (upload) bandwidth for the socket @@ -95,7 +95,7 @@ public class LinkCapabilities implements Parcelable { *

* This key is set via the needs map. */ - public final static int RW_DESIRED_REV_BW = 5; + public static final int RW_DESIRED_REV_BW = 5; /** * Required minimum reverse link (upload) bandwidth, in kilobits @@ -103,21 +103,21 @@ public class LinkCapabilities implements Parcelable { * If a rate is not specified, the default rate of kbps will be * Values should be strings such as "50", "100", "1500", etc. */ - public final static int RW_REQUIRED_REV_BW = 6; + public static final int RW_REQUIRED_REV_BW = 6; /** * Available reverse link (upload) bandwidth for the socket. * This value is in kilobits per second (kbps). * Values will be strings such as "50", "100", "1500", etc. */ - public final static int RO_AVAILABLE_REV_BW = 7; + public static final int RO_AVAILABLE_REV_BW = 7; /** * Maximum latency for the socket, in milliseconds, above which * socket cannot function. * Values should be strings such as "50", "300", "500", etc. */ - public final static int RW_MAX_ALLOWED_LATENCY = 8; + public static final int RW_MAX_ALLOWED_LATENCY = 8; /** * Interface that the socket is bound to. This can be a virtual @@ -125,7 +125,7 @@ public class LinkCapabilities implements Parcelable { * (e.g. wlan0 or rmnet0). * Values will be strings such as "wlan0", "rmnet0" */ - public final static int RO_BOUND_INTERFACE = 9; + public static final int RO_BOUND_INTERFACE = 9; /** * Physical interface that the socket is routed on. @@ -134,7 +134,7 @@ public class LinkCapabilities implements Parcelable { * if seamless mobility is supported. * Values will be strings such as "wlan0", "rmnet0" */ - public final static int RO_PHYSICAL_INTERFACE = 10; + public static final int RO_PHYSICAL_INTERFACE = 10; } /** diff --git a/QKSMS/src/main/java/com/google/android/mms/pdu_alt/PduComposer.java b/QKSMS/src/main/java/com/google/android/mms/pdu_alt/PduComposer.java index 54b94985..d41da8ec 100644 --- a/QKSMS/src/main/java/com/google/android/mms/pdu_alt/PduComposer.java +++ b/QKSMS/src/main/java/com/google/android/mms/pdu_alt/PduComposer.java @@ -34,11 +34,11 @@ public class PduComposer { /** * Address type. */ - static private final int PDU_PHONE_NUMBER_ADDRESS_TYPE = 1; - static private final int PDU_EMAIL_ADDRESS_TYPE = 2; - static private final int PDU_IPV4_ADDRESS_TYPE = 3; - static private final int PDU_IPV6_ADDRESS_TYPE = 4; - static private final int PDU_UNKNOWN_ADDRESS_TYPE = 5; + private static final int PDU_PHONE_NUMBER_ADDRESS_TYPE = 1; + private static final int PDU_EMAIL_ADDRESS_TYPE = 2; + private static final int PDU_IPV4_ADDRESS_TYPE = 3; + private static final int PDU_IPV6_ADDRESS_TYPE = 4; + private static final int PDU_UNKNOWN_ADDRESS_TYPE = 5; /** * Address regular expression string. @@ -63,25 +63,25 @@ public class PduComposer { /** * Error values. */ - static private final int PDU_COMPOSE_SUCCESS = 0; - static private final int PDU_COMPOSE_CONTENT_ERROR = 1; - static private final int PDU_COMPOSE_FIELD_NOT_SET = 2; - static private final int PDU_COMPOSE_FIELD_NOT_SUPPORTED = 3; + private static final int PDU_COMPOSE_SUCCESS = 0; + private static final int PDU_COMPOSE_CONTENT_ERROR = 1; + private static final int PDU_COMPOSE_FIELD_NOT_SET = 2; + private static final int PDU_COMPOSE_FIELD_NOT_SUPPORTED = 3; /** * WAP values defined in WSP spec. */ - static private final int QUOTED_STRING_FLAG = 34; - static private final int END_STRING_FLAG = 0; - static private final int LENGTH_QUOTE = 31; - static private final int TEXT_MAX = 127; - static private final int SHORT_INTEGER_MAX = 127; - static private final int LONG_INTEGER_LENGTH_MAX = 8; + private static final int QUOTED_STRING_FLAG = 34; + private static final int END_STRING_FLAG = 0; + private static final int LENGTH_QUOTE = 31; + private static final int TEXT_MAX = 127; + private static final int SHORT_INTEGER_MAX = 127; + private static final int LONG_INTEGER_LENGTH_MAX = 8; /** * Block size when read data from InputStream. */ - static private final int PDU_COMPOSER_BLOCK_SIZE = 1024; + private static final int PDU_COMPOSER_BLOCK_SIZE = 1024; private static final String TAG = "PduComposer"; /** @@ -1029,7 +1029,7 @@ public class PduComposer { /** * Record current message informations. */ - static private class LengthRecordNode { + private static class LengthRecordNode { ByteArrayOutputStream currentMessage = null; public int currentPosition = 0; diff --git a/QKSMS/src/main/java/com/google/android/mms/pdu_alt/PduPersister.java b/QKSMS/src/main/java/com/google/android/mms/pdu_alt/PduPersister.java index f11d67ad..9b048881 100644 --- a/QKSMS/src/main/java/com/google/android/mms/pdu_alt/PduPersister.java +++ b/QKSMS/src/main/java/com/google/android/mms/pdu_alt/PduPersister.java @@ -903,7 +903,7 @@ public class PduPersister { * Here shall be "video" or "audio" or "images" * the index of the content in given table */ - static public String convertUriToPath(Context context, Uri uri) { + public static String convertUriToPath(Context context, Uri uri) { String path = null; if (null != uri) { String scheme = uri.getScheme(); diff --git a/QKSMS/src/main/java/com/moez/QKSMS/common/google/Recycler.java b/QKSMS/src/main/java/com/moez/QKSMS/common/google/Recycler.java index 682cf776..c34132db 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/common/google/Recycler.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/common/google/Recycler.java @@ -104,9 +104,9 @@ public abstract class Recycler { return /*prefs.getBoolean(MessagingPreferenceActivity.AUTO_DELETE, DEFAULT_AUTO_DELETE)*/ false; } - abstract public int getMessageLimit(Context context); + public abstract int getMessageLimit(Context context); - abstract public void setMessageLimit(Context context, int limit); + public abstract void setMessageLimit(Context context, int limit); public int getMessageMinLimit() { return MmsConfig.getMinMessageCountPerThread(); @@ -116,15 +116,15 @@ public abstract class Recycler { return MmsConfig.getMaxMessageCountPerThread(); } - abstract protected long getThreadId(Cursor cursor); + protected abstract long getThreadId(Cursor cursor); - abstract protected Cursor getAllThreads(Context context); + protected abstract Cursor getAllThreads(Context context); - abstract protected void deleteMessagesForThread(Context context, long threadId, int keep); + protected abstract void deleteMessagesForThread(Context context, long threadId, int keep); - abstract protected void dumpMessage(Cursor cursor, Context context); + protected abstract void dumpMessage(Cursor cursor, Context context); - abstract protected boolean anyThreadOverLimit(Context context); + protected abstract boolean anyThreadOverLimit(Context context); public static class SmsRecycler extends Recycler { private static final String[] ALL_SMS_THREADS_PROJECTION = { @@ -135,7 +135,7 @@ public abstract class Recycler { private static final int ID = 0; private static final int MESSAGE_COUNT = 1; - static private final String[] SMS_MESSAGE_PROJECTION = new String[] { + private static final String[] SMS_MESSAGE_PROJECTION = new String[] { BaseColumns._ID, Conversations.THREAD_ID, Sms.ADDRESS, @@ -148,14 +148,14 @@ public abstract class Recycler { // The indexes of the default columns which must be consistent // with above PROJECTION. - static private final int COLUMN_ID = 0; - static private final int COLUMN_THREAD_ID = 1; - static private final int COLUMN_SMS_ADDRESS = 2; - static private final int COLUMN_SMS_BODY = 3; - static private final int COLUMN_SMS_DATE = 4; - static private final int COLUMN_SMS_READ = 5; - static private final int COLUMN_SMS_TYPE = 6; - static private final int COLUMN_SMS_STATUS = 7; + private static final int COLUMN_ID = 0; + private static final int COLUMN_THREAD_ID = 1; + private static final int COLUMN_SMS_ADDRESS = 2; + private static final int COLUMN_SMS_BODY = 3; + private static final int COLUMN_SMS_DATE = 4; + private static final int COLUMN_SMS_READ = 5; + private static final int COLUMN_SMS_TYPE = 6; + private static final int COLUMN_SMS_STATUS = 7; private final String MAX_SMS_MESSAGES_PER_THREAD = "MaxSmsMessagesPerThread"; @@ -283,7 +283,7 @@ public abstract class Recycler { private static final int ID = 0; private static final int MESSAGE_COUNT = 1; - static private final String[] MMS_MESSAGE_PROJECTION = new String[] { + private static final String[] MMS_MESSAGE_PROJECTION = new String[] { BaseColumns._ID, Conversations.THREAD_ID, Mms.DATE, @@ -291,10 +291,10 @@ public abstract class Recycler { // The indexes of the default columns which must be consistent // with above PROJECTION. - static private final int COLUMN_ID = 0; - static private final int COLUMN_THREAD_ID = 1; - static private final int COLUMN_MMS_DATE = 2; - static private final int COLUMN_MMS_READ = 3; + private static final int COLUMN_ID = 0; + private static final int COLUMN_THREAD_ID = 1; + private static final int COLUMN_MMS_DATE = 2; + private static final int COLUMN_MMS_READ = 3; private final String MAX_MMS_MESSAGES_PER_THREAD = "MaxMmsMessagesPerThread"; diff --git a/QKSMS/src/main/java/com/moez/QKSMS/external/iab/Base64.java b/QKSMS/src/main/java/com/moez/QKSMS/external/iab/Base64.java index 73a315f7..c5352f21 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/external/iab/Base64.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/external/iab/Base64.java @@ -40,21 +40,21 @@ package com.moez.QKSMS.external.iab; */ public class Base64 { /** Specify encoding (value is {@code true}). */ - public final static boolean ENCODE = true; + public static final boolean ENCODE = true; /** Specify decoding (value is {@code false}). */ - public final static boolean DECODE = false; + public static final boolean DECODE = false; /** The equals sign (=) as a byte. */ - private final static byte EQUALS_SIGN = (byte) '='; + private static final byte EQUALS_SIGN = (byte) '='; /** The new line character (\n) as a byte. */ - private final static byte NEW_LINE = (byte) '\n'; + private static final byte NEW_LINE = (byte) '\n'; /** * The 64 valid Base64 values. */ - private final static byte[] ALPHABET = + private static final byte[] ALPHABET = {(byte) 'A', (byte) 'B', (byte) 'C', (byte) 'D', (byte) 'E', (byte) 'F', (byte) 'G', (byte) 'H', (byte) 'I', (byte) 'J', (byte) 'K', (byte) 'L', (byte) 'M', (byte) 'N', (byte) 'O', (byte) 'P', @@ -72,7 +72,7 @@ public class Base64 { /** * The 64 valid web safe Base64 values. */ - private final static byte[] WEBSAFE_ALPHABET = + private static final byte[] WEBSAFE_ALPHABET = {(byte) 'A', (byte) 'B', (byte) 'C', (byte) 'D', (byte) 'E', (byte) 'F', (byte) 'G', (byte) 'H', (byte) 'I', (byte) 'J', (byte) 'K', (byte) 'L', (byte) 'M', (byte) 'N', (byte) 'O', (byte) 'P', @@ -91,7 +91,7 @@ public class Base64 { * Translates a Base64 value to either its 6-bit reconstruction value * or a negative number indicating some other meaning. **/ - private final static byte[] DECODABET = {-9, -9, -9, -9, -9, -9, -9, -9, -9, // Decimal 0 - 8 + private static final byte[] DECODABET = {-9, -9, -9, -9, -9, -9, -9, -9, -9, // Decimal 0 - 8 -5, -5, // Whitespace: Tab and Linefeed -9, -9, // Decimal 11 - 12 -5, // Whitespace: Carriage Return @@ -125,7 +125,7 @@ public class Base64 { }; /** The web safe decodabet */ - private final static byte[] WEBSAFE_DECODABET = + private static final byte[] WEBSAFE_DECODABET = {-9, -9, -9, -9, -9, -9, -9, -9, -9, // Decimal 0 - 8 -5, -5, // Whitespace: Tab and Linefeed -9, -9, // Decimal 11 - 12 @@ -161,9 +161,9 @@ public class Base64 { }; // Indicates white space in encoding - private final static byte WHITE_SPACE_ENC = -5; + private static final byte WHITE_SPACE_ENC = -5; // Indicates equals sign in encoding - private final static byte EQUALS_SIGN_ENC = -1; + private static final byte EQUALS_SIGN_ENC = -1; /** Defeats instantiation. */ private Base64() { From eb58734fea575dc0431dafcded875ac7eb42b5eb Mon Sep 17 00:00:00 2001 From: George Kankava Date: Sat, 2 Jul 2016 10:16:50 +0400 Subject: [PATCH 03/22] squid:S1161 - '@Override' annotation should be used on any method overriding (since Java 5) or implementing (since Java 6) another one --- .../java/com/moez/QKSMS/model/SlideModel.java | 23 +++++++++++++++++++ .../com/moez/QKSMS/model/SlideshowModel.java | 22 ++++++++++++++++++ 2 files changed, 45 insertions(+) diff --git a/QKSMS/src/main/java/com/moez/QKSMS/model/SlideModel.java b/QKSMS/src/main/java/com/moez/QKSMS/model/SlideModel.java index 7b580132..bcea5e28 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/model/SlideModel.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/model/SlideModel.java @@ -279,16 +279,19 @@ public class SlideModel extends Model implements List, EventListener * @throws ContentRestrictionException when can not add this object. * */ + @Override public boolean add(MediaModel object) { internalAdd(object); notifyModelChanged(true); return true; } + @Override public boolean addAll(Collection collection) { throw new UnsupportedOperationException("Operation not supported."); } + @Override public void clear() { if (mMedia.size() > 0) { for (MediaModel media : mMedia) { @@ -312,22 +315,27 @@ public class SlideModel extends Model implements List, EventListener } } + @Override public boolean contains(Object object) { return mMedia.contains(object); } + @Override public boolean containsAll(Collection collection) { return mMedia.containsAll(collection); } + @Override public boolean isEmpty() { return mMedia.isEmpty(); } + @Override public Iterator iterator() { return mMedia.iterator(); } + @Override public boolean remove(Object object) { if ((object != null) && (object instanceof MediaModel) && internalRemove(object)) { @@ -337,35 +345,43 @@ public class SlideModel extends Model implements List, EventListener return false; } + @Override public boolean removeAll(Collection collection) { throw new UnsupportedOperationException("Operation not supported."); } + @Override public boolean retainAll(Collection collection) { throw new UnsupportedOperationException("Operation not supported."); } + @Override public int size() { return mMedia.size(); } + @Override public Object[] toArray() { return mMedia.toArray(); } + @Override public T[] toArray(T[] array) { return mMedia.toArray(array); } + @Override public void add(int location, MediaModel object) { throw new UnsupportedOperationException("Operation not supported."); } + @Override public boolean addAll(int location, Collection collection) { throw new UnsupportedOperationException("Operation not supported."); } + @Override public MediaModel get(int location) { if (mMedia.size() == 0) { return null; @@ -374,22 +390,27 @@ public class SlideModel extends Model implements List, EventListener return mMedia.get(location); } + @Override public int indexOf(Object object) { return mMedia.indexOf(object); } + @Override public int lastIndexOf(Object object) { return mMedia.lastIndexOf(object); } + @Override public ListIterator listIterator() { return mMedia.listIterator(); } + @Override public ListIterator listIterator(int location) { return mMedia.listIterator(location); } + @Override public MediaModel remove(int location) { MediaModel media = mMedia.get(location); if ((media != null) && internalRemove(media)) { @@ -398,10 +419,12 @@ public class SlideModel extends Model implements List, EventListener return media; } + @Override public MediaModel set(int location, MediaModel object) { throw new UnsupportedOperationException("Operation not supported."); } + @Override public List subList(int start, int end) { return mMedia.subList(start, end); } diff --git a/QKSMS/src/main/java/com/moez/QKSMS/model/SlideshowModel.java b/QKSMS/src/main/java/com/moez/QKSMS/model/SlideshowModel.java index 88cb3512..1e6142b5 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/model/SlideshowModel.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/model/SlideshowModel.java @@ -406,6 +406,7 @@ public class SlideshowModel extends Model // // Implement List interface. // + @Override public boolean add(SlideModel object) { int increaseSize = object.getSlideSize(); checkMessageSize(increaseSize); @@ -422,10 +423,12 @@ public class SlideshowModel extends Model return false; } + @Override public boolean addAll(Collection collection) { throw new UnsupportedOperationException("Operation not supported."); } + @Override public void clear() { if (mSlides.size() > 0) { for (SlideModel slide : mSlides) { @@ -440,22 +443,27 @@ public class SlideshowModel extends Model } } + @Override public boolean contains(Object object) { return mSlides.contains(object); } + @Override public boolean containsAll(Collection collection) { return mSlides.containsAll(collection); } + @Override public boolean isEmpty() { return mSlides.isEmpty(); } + @Override public Iterator iterator() { return mSlides.iterator(); } + @Override public boolean remove(Object object) { if ((object != null) && mSlides.remove(object)) { SlideModel slide = (SlideModel) object; @@ -467,26 +475,32 @@ public class SlideshowModel extends Model return false; } + @Override public boolean removeAll(Collection collection) { throw new UnsupportedOperationException("Operation not supported."); } + @Override public boolean retainAll(Collection collection) { throw new UnsupportedOperationException("Operation not supported."); } + @Override public int size() { return mSlides.size(); } + @Override public Object[] toArray() { return mSlides.toArray(); } + @Override public T[] toArray(T[] array) { return mSlides.toArray(array); } + @Override public void add(int location, SlideModel object) { if (object != null) { int increaseSize = object.getSlideSize(); @@ -502,31 +516,38 @@ public class SlideshowModel extends Model } } + @Override public boolean addAll(int location, Collection collection) { throw new UnsupportedOperationException("Operation not supported."); } + @Override public SlideModel get(int location) { return (location >= 0 && location < mSlides.size()) ? mSlides.get(location) : null; } + @Override public int indexOf(Object object) { return mSlides.indexOf(object); } + @Override public int lastIndexOf(Object object) { return mSlides.lastIndexOf(object); } + @Override public ListIterator listIterator() { return mSlides.listIterator(); } + @Override public ListIterator listIterator(int location) { return mSlides.listIterator(location); } + @Override public SlideModel remove(int location) { SlideModel slide = mSlides.remove(location); if (slide != null) { @@ -537,6 +558,7 @@ public class SlideshowModel extends Model return slide; } + @Override public SlideModel set(int location, SlideModel object) { SlideModel slide = mSlides.get(location); if (null != object) { From 5cc975522ef1a33e22c887c5d5eb2c8220692c7c Mon Sep 17 00:00:00 2001 From: George Kankava Date: Sat, 2 Jul 2016 10:36:39 +0400 Subject: [PATCH 04/22] squid:S1155 - Collection.isEmpty() should be used to test for emptiness --- QKSMS/src/main/java/android/net/DhcpInfoInternal.java | 2 +- .../java/com/android/mms/dom/smil/ElementTimeImpl.java | 4 ++-- .../com/android/mms/transaction/TransactionService.java | 6 +++--- .../java/com/moez/QKSMS/common/google/DraftCache.java | 2 +- QKSMS/src/main/java/com/moez/QKSMS/data/Contact.java | 6 +++--- QKSMS/src/main/java/com/moez/QKSMS/exif/ExifData.java | 8 ++++---- .../src/main/java/com/moez/QKSMS/exif/ExifInterface.java | 2 +- .../main/java/com/moez/QKSMS/external/iab/IabHelper.java | 2 +- QKSMS/src/main/java/com/moez/QKSMS/model/MediaModel.java | 2 +- .../com/moez/QKSMS/ui/delivery/DeliveryReportHelper.java | 2 +- .../com/moez/QKSMS/ui/dialog/mms/MMSSetupFragment.java | 2 +- 11 files changed, 19 insertions(+), 19 deletions(-) diff --git a/QKSMS/src/main/java/android/net/DhcpInfoInternal.java b/QKSMS/src/main/java/android/net/DhcpInfoInternal.java index 8e4e6da5..69fea1b2 100644 --- a/QKSMS/src/main/java/android/net/DhcpInfoInternal.java +++ b/QKSMS/src/main/java/android/net/DhcpInfoInternal.java @@ -140,7 +140,7 @@ public class DhcpInfoInternal { dns2 = orig.dns2; } - if (mRoutes.size() == 0) { + if (mRoutes.isEmpty()) { for (RouteInfo route : orig.getRoutes()) { addRoute(route); } diff --git a/QKSMS/src/main/java/com/android/mms/dom/smil/ElementTimeImpl.java b/QKSMS/src/main/java/com/android/mms/dom/smil/ElementTimeImpl.java index a3443cd8..d3e11305 100644 --- a/QKSMS/src/main/java/com/android/mms/dom/smil/ElementTimeImpl.java +++ b/QKSMS/src/main/java/com/android/mms/dom/smil/ElementTimeImpl.java @@ -81,7 +81,7 @@ public abstract class ElementTimeImpl implements ElementTime { // Ignore badly formatted times } } - if (beginTimeList.size() == 0) { + if (beginTimeList.isEmpty()) { /* * What is the right default value? * @@ -139,7 +139,7 @@ public abstract class ElementTimeImpl implements ElementTime { } // "end" time is not specified - if (endTimeList.size() == 0) { + if (endTimeList.isEmpty()) { // Get duration float duration = getDur(); diff --git a/QKSMS/src/main/java/com/android/mms/transaction/TransactionService.java b/QKSMS/src/main/java/com/android/mms/transaction/TransactionService.java index 699348cf..aba3ab71 100644 --- a/QKSMS/src/main/java/com/android/mms/transaction/TransactionService.java +++ b/QKSMS/src/main/java/com/android/mms/transaction/TransactionService.java @@ -473,7 +473,7 @@ public class TransactionService extends Service implements Observer { try { synchronized (mProcessing) { mProcessing.remove(transaction); - if (mPending.size() > 0) { + if (!mPending.isEmpty()) { if (LOCAL_LOGV) Log.v(TAG, "update: handle next pending transaction..."); Message msg = mServiceHandler.obtainMessage( EVENT_HANDLE_NEXT_PENDING_TRANSACTION, @@ -799,7 +799,7 @@ public class TransactionService extends Service implements Observer { public void markAllPendingTransactionsAsFailed() { synchronized (mProcessing) { - while (mPending.size() != 0) { + while (!mPending.isEmpty()) { Transaction transaction = mPending.remove(0); transaction.mTransactionState.setState(TransactionState.FAILED); if (transaction instanceof SendTransaction) { @@ -824,7 +824,7 @@ public class TransactionService extends Service implements Observer { int numProcessTransaction; synchronized (mProcessing) { - if (mPending.size() != 0) { + if (!mPending.isEmpty()) { transaction = mPending.remove(0); } numProcessTransaction = mProcessing.size(); diff --git a/QKSMS/src/main/java/com/moez/QKSMS/common/google/DraftCache.java b/QKSMS/src/main/java/com/moez/QKSMS/common/google/DraftCache.java index 832575af..2c49b653 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/common/google/DraftCache.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/common/google/DraftCache.java @@ -131,7 +131,7 @@ public class DraftCache { // If nobody's interested in finding out about changes, // just bail out early. synchronized (mChangeListenersLock) { - if (mChangeListeners.size() < 1) { + if (mChangeListeners.isEmpty()) { return; } } diff --git a/QKSMS/src/main/java/com/moez/QKSMS/data/Contact.java b/QKSMS/src/main/java/com/moez/QKSMS/data/Contact.java index 2686a569..4d447f4e 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/data/Contact.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/data/Contact.java @@ -503,14 +503,14 @@ public class Contact { while (true) { Runnable r = null; synchronized (mThingsToLoad) { - if (mThingsToLoad.size() == 0) { + if (mThingsToLoad.isEmpty()) { try { mThingsToLoad.wait(); } catch (InterruptedException ex) { break; // Exception sent by Contact.init() to stop Runnable } } - if (mThingsToLoad.size() > 0) { + if (!mThingsToLoad.isEmpty()) { r = mThingsToLoad.remove(0); } } @@ -1175,7 +1175,7 @@ public class Contact { } } } - if (candidates.size() == 0) { + if (candidates.isEmpty()) { mContactsHash.remove(key); } } diff --git a/QKSMS/src/main/java/com/moez/QKSMS/exif/ExifData.java b/QKSMS/src/main/java/com/moez/QKSMS/exif/ExifData.java index 6a8eb851..3e7c1c45 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/exif/ExifData.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/exif/ExifData.java @@ -110,7 +110,7 @@ class ExifData { * Returns true if this header contains uncompressed strip. */ protected boolean hasUncompressedStrip() { - return mStripBytes.size() != 0; + return !mStripBytes.isEmpty(); } /** @@ -264,7 +264,7 @@ class ExifData { } } } - if (ret.size() == 0) { + if (ret.isEmpty()) { return null; } return ret; @@ -287,7 +287,7 @@ class ExifData { for (ExifTag t : tags) { ret.add(t); } - if (ret.size() == 0) { + if (ret.isEmpty()) { return null; } return ret; @@ -307,7 +307,7 @@ class ExifData { } } } - if (ret.size() == 0) { + if (ret.isEmpty()) { return null; } return ret; diff --git a/QKSMS/src/main/java/com/moez/QKSMS/exif/ExifInterface.java b/QKSMS/src/main/java/com/moez/QKSMS/exif/ExifInterface.java index b2f09621..6c7c6159 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/exif/ExifInterface.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/exif/ExifInterface.java @@ -2348,7 +2348,7 @@ public class ExifInterface { l.add(ifds[i]); } } - if (l.size() <= 0) { + if (l.isEmpty()) { return null; } int[] ret = new int[l.size()]; diff --git a/QKSMS/src/main/java/com/moez/QKSMS/external/iab/IabHelper.java b/QKSMS/src/main/java/com/moez/QKSMS/external/iab/IabHelper.java index 41df69fb..b2f01221 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/external/iab/IabHelper.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/external/iab/IabHelper.java @@ -921,7 +921,7 @@ public class IabHelper { } } - if (skuList.size() == 0) { + if (skuList.isEmpty()) { logDebug("queryPrices: nothing to do because there are no SKUs."); return BILLING_RESPONSE_RESULT_OK; } diff --git a/QKSMS/src/main/java/com/moez/QKSMS/model/MediaModel.java b/QKSMS/src/main/java/com/moez/QKSMS/model/MediaModel.java index cad605e3..d97edc23 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/model/MediaModel.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/model/MediaModel.java @@ -282,7 +282,7 @@ public abstract class MediaModel extends Model implements EventListener { } public MediaAction getCurrentAction() { - if (0 == mMediaActions.size()) { + if (mMediaActions.isEmpty()) { return MediaAction.NO_ACTIVE_ACTION; } return mMediaActions.remove(0); diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/delivery/DeliveryReportHelper.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/delivery/DeliveryReportHelper.java index 7bbab4e1..d2e10596 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/delivery/DeliveryReportHelper.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/delivery/DeliveryReportHelper.java @@ -208,7 +208,7 @@ public class DeliveryReportHelper { return null; } - if (reportReqs.size() == 0) { + if (reportReqs.isEmpty()) { return null; } diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/dialog/mms/MMSSetupFragment.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/dialog/mms/MMSSetupFragment.java index 9b7fd721..4a73eb25 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/dialog/mms/MMSSetupFragment.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/dialog/mms/MMSSetupFragment.java @@ -207,7 +207,7 @@ public class MMSSetupFragment extends QKFragment implements DialogFragmentListen } private void showConfigurationDialog() { - if (mAPNs.size() == 0) { + if (mAPNs.isEmpty()) { // Give the user a support channel and further instructions if automatic // configuration failed. launchDialog(NO_CONFIGURATIONS_FOUND); From 465ed31fb979ffde29853189fb5cbe113461e66c Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Sun, 3 Jul 2016 22:35:25 -0400 Subject: [PATCH 05/22] Updated travis --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index ea0f94b1..c41f5a98 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,5 @@ language: android +sudo: false android: components: From d441dbb246e4cc16f5ad1ef179aedb4c6f57f77b Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Sun, 3 Jul 2016 23:26:15 -0400 Subject: [PATCH 06/22] Updated links in README --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index c5554327..776c6798 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ # QKSMS -[![Join the chat at https://gitter.im/qklabs/qksms](https://badges.gitter.im/qklabs/qksms.svg)](https://gitter.im/qklabs/qksms?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) +[![Join the chat at https://gitter.im/moezbhatti/qksms](https://badges.gitter.im/moezbhatti/qksms.svg)](https://gitter.im/moezbhatti/qksms?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![ZenHub] (https://raw.githubusercontent.com/ZenHubIO/support/master/zenhub-badge.png)] (https://zenhub.io) -[![Build Status](https://travis-ci.org/qklabs/qksms.svg?branch=master)](https://travis-ci.org/qklabs/qksms) +[![Build Status](https://travis-ci.org/moezbhatti/qksms.svg?branch=master)](https://travis-ci.org/moezbhatti/qksms) QKSMS is an open source replacement to the [stock messaging app](https://github.com/android/platform_packages_apps_mms) on Android. It is currently available on the Google Play Store. @@ -53,7 +53,7 @@ Any new code written should follow these guidelines. # Bug Reports / Feature Requests -We track issues and feature requests using GitHub issues. You can view existing issues and create your own here: https://github.com/qklabs/qksms/issues +We track issues and feature requests using GitHub issues. You can view existing issues and create your own here: https://github.com/moezbhatti/qksms/issues ### How to help @@ -94,7 +94,7 @@ The conversation isn't marked as read. #### Helping reproduce bugs Reproducing a bug is important, since if we can't reproduce an issue then it's hard to figure out what's going wrong, and we can't know that we've fixed it. -You can see bugs which need "repro steps" [here](https://github.com/qklabs/qksms/issues?q=is%3Aopen+is%3Aissue+label%3Aneeds-repro). If you see any bugs that you know how to reproduce (see above for example repro steps), then make a comment with the steps and we'll track the bug down! +You can see bugs which need "repro steps" [here](https://github.com/moezbhatti/qksms/issues?q=is%3Aopen+is%3Aissue+label%3Aneeds-repro). If you see any bugs that you know how to reproduce (see above for example repro steps), then make a comment with the steps and we'll track the bug down! #### Making enhancement requests There are no rules for enhancement requests. Your ideas are all awesome. Although we may not implement every suggestion, we love brainstorming with you and hearing your feedback. From 34efcf34fad5dc8fd4f3620849a786417ad308f6 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Tue, 5 Jul 2016 00:16:42 -0400 Subject: [PATCH 07/22] #534 --- QKSMS/src/main/AndroidManifest.xml | 17 ----------------- .../QKSMS/service/HeadlessSmsSendService.java | 12 ------------ 2 files changed, 29 deletions(-) delete mode 100644 QKSMS/src/main/java/com/moez/QKSMS/service/HeadlessSmsSendService.java diff --git a/QKSMS/src/main/AndroidManifest.xml b/QKSMS/src/main/AndroidManifest.xml index 2706bbc3..1b0ff619 100644 --- a/QKSMS/src/main/AndroidManifest.xml +++ b/QKSMS/src/main/AndroidManifest.xml @@ -462,23 +462,6 @@ - - - - - - - - - - - - - - diff --git a/QKSMS/src/main/java/com/moez/QKSMS/service/HeadlessSmsSendService.java b/QKSMS/src/main/java/com/moez/QKSMS/service/HeadlessSmsSendService.java deleted file mode 100644 index 2bd6eafc..00000000 --- a/QKSMS/src/main/java/com/moez/QKSMS/service/HeadlessSmsSendService.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.moez.QKSMS.service; - -import android.app.Service; -import android.content.Intent; -import android.os.IBinder; - -public class HeadlessSmsSendService extends Service { - @Override - public IBinder onBind(Intent intent) { - return null; - } -} From bcc9777b8ab2bb3db851da230b7346acba209e39 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Tue, 5 Jul 2016 00:21:37 -0400 Subject: [PATCH 08/22] Revert "#534" This reverts commit 34efcf34fad5dc8fd4f3620849a786417ad308f6. Caused issues with QK being the default SMS app --- QKSMS/src/main/AndroidManifest.xml | 17 +++++++++++++++++ .../QKSMS/service/HeadlessSmsSendService.java | 12 ++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 QKSMS/src/main/java/com/moez/QKSMS/service/HeadlessSmsSendService.java diff --git a/QKSMS/src/main/AndroidManifest.xml b/QKSMS/src/main/AndroidManifest.xml index 1b0ff619..2706bbc3 100644 --- a/QKSMS/src/main/AndroidManifest.xml +++ b/QKSMS/src/main/AndroidManifest.xml @@ -462,6 +462,23 @@ + + + + + + + + + + + + + + diff --git a/QKSMS/src/main/java/com/moez/QKSMS/service/HeadlessSmsSendService.java b/QKSMS/src/main/java/com/moez/QKSMS/service/HeadlessSmsSendService.java new file mode 100644 index 00000000..2bd6eafc --- /dev/null +++ b/QKSMS/src/main/java/com/moez/QKSMS/service/HeadlessSmsSendService.java @@ -0,0 +1,12 @@ +package com.moez.QKSMS.service; + +import android.app.Service; +import android.content.Intent; +import android.os.IBinder; + +public class HeadlessSmsSendService extends Service { + @Override + public IBinder onBind(Intent intent) { + return null; + } +} From dcf9cfd74d8c9a309dd9791128e569a1c3dd3fa9 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Tue, 5 Jul 2016 00:44:32 -0400 Subject: [PATCH 09/22] Implemented SMSSendService --- .../QKSMS/service/HeadlessSmsSendService.java | 47 +++++++++++++++++-- build.gradle | 2 +- 2 files changed, 43 insertions(+), 6 deletions(-) diff --git a/QKSMS/src/main/java/com/moez/QKSMS/service/HeadlessSmsSendService.java b/QKSMS/src/main/java/com/moez/QKSMS/service/HeadlessSmsSendService.java index 2bd6eafc..213ce11d 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/service/HeadlessSmsSendService.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/service/HeadlessSmsSendService.java @@ -1,12 +1,49 @@ package com.moez.QKSMS.service; -import android.app.Service; +import android.app.IntentService; import android.content.Intent; -import android.os.IBinder; +import android.net.Uri; +import android.os.Bundle; +import android.telephony.TelephonyManager; +import android.text.TextUtils; +import com.moez.QKSMS.mmssms.Message; +import com.moez.QKSMS.mmssms.Transaction; +import com.moez.QKSMS.transaction.NotificationManager; +import com.moez.QKSMS.transaction.SmsHelper; + +import static com.moez.QKSMS.data.Conversation.getRecipients; + +public class HeadlessSmsSendService extends IntentService { + private static final String TAG = "HeadlessSmsSendService"; + + public HeadlessSmsSendService() { + super(TAG); + } -public class HeadlessSmsSendService extends Service { @Override - public IBinder onBind(Intent intent) { - return null; + protected void onHandleIntent(Intent intent) { + String action = intent.getAction(); + if (!TelephonyManager.ACTION_RESPOND_VIA_MESSAGE.equals(action)) { + return; + } + + Bundle extras = intent.getExtras(); + if (extras != null) { + String body = extras.getString(Intent.EXTRA_TEXT); + Uri intentUri = intent.getData(); + String recipients = getRecipients(intentUri); + + if (!TextUtils.isEmpty(recipients) && !TextUtils.isEmpty(body)) { + String[] destinations = TextUtils.split(recipients, ";"); + + Transaction sendTransaction = new Transaction(this, SmsHelper.getSendSettings(this)); + + Message message = new Message(body, destinations); + message.setType(Message.TYPE_SMSMMS); + + sendTransaction.sendNewMessage(message, Transaction.NO_THREAD_ID); + NotificationManager.update(this); + } + } } } diff --git a/build.gradle b/build.gradle index 29049ffa..0edb821f 100644 --- a/build.gradle +++ b/build.gradle @@ -3,6 +3,6 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.0-alpha3' + classpath 'com.android.tools.build:gradle:2.1.2' } } From 09a8b3864ec5f8d00b24a3d13acf8cba80398eb1 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Thu, 7 Jul 2016 13:57:03 -0400 Subject: [PATCH 10/22] Respect system preference for 24 hour time --- .../com/moez/QKSMS/common/utils/DateFormatterTest.java | 10 ---------- .../com/moez/QKSMS/common/utils/DateFormatter.java | 6 +----- .../main/java/com/moez/QKSMS/enums/QKPreference.java | 1 - .../com/moez/QKSMS/ui/settings/SettingsFragment.java | 1 - .../com/moez/QKSMS/ui/settings/TimePickerFragment.java | 2 +- QKSMS/src/main/res/values/strings.xml | 2 -- QKSMS/src/main/res/xml/settings_appearance.xml | 7 ------- 7 files changed, 2 insertions(+), 27 deletions(-) diff --git a/QKSMS/src/androidTest/java/com/moez/QKSMS/common/utils/DateFormatterTest.java b/QKSMS/src/androidTest/java/com/moez/QKSMS/common/utils/DateFormatterTest.java index 6fc42a99..47f9213a 100644 --- a/QKSMS/src/androidTest/java/com/moez/QKSMS/common/utils/DateFormatterTest.java +++ b/QKSMS/src/androidTest/java/com/moez/QKSMS/common/utils/DateFormatterTest.java @@ -1,9 +1,6 @@ package com.moez.QKSMS.common.utils; -import android.content.SharedPreferences; -import android.preference.PreferenceManager; import android.test.AndroidTestCase; -import com.moez.QKSMS.ui.settings.SettingsFragment; import java.text.SimpleDateFormat; @@ -12,13 +9,6 @@ public class DateFormatterTest extends AndroidTestCase { super.setUp(); } - public void test24Hours() { - SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext()); - prefs.edit().putBoolean(SettingsFragment.TIMESTAMPS_24H, true).apply(); - assertTrue(DateFormatter.accountFor24HourTime(getContext(), new SimpleDateFormat("h:mm a")).equals(new SimpleDateFormat("H:mm"))); - prefs.edit().putBoolean(SettingsFragment.TIMESTAMPS_24H, false).apply(); - } - public void testDateSymbolsAPI(){ assertEquals(new SimpleDateFormat("H:mm a").toPattern(), "H:mm a"); } diff --git a/QKSMS/src/main/java/com/moez/QKSMS/common/utils/DateFormatter.java b/QKSMS/src/main/java/com/moez/QKSMS/common/utils/DateFormatter.java index 43619e7e..0d240d7d 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/common/utils/DateFormatter.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/common/utils/DateFormatter.java @@ -1,13 +1,10 @@ package com.moez.QKSMS.common.utils; import android.content.Context; -import android.content.SharedPreferences; -import android.preference.PreferenceManager; import android.text.format.DateFormat; import android.text.format.DateUtils; import com.moez.QKSMS.QKSMSApp; import com.moez.QKSMS.R; -import com.moez.QKSMS.ui.settings.SettingsFragment; import java.text.ParseException; import java.text.SimpleDateFormat; @@ -48,8 +45,7 @@ public abstract class DateFormatter { } public static SimpleDateFormat accountFor24HourTime(Context context, SimpleDateFormat input) { //pass in 12 hour time. If needed, change to 24 hr. - SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); - boolean isUsing24HourTime = prefs.getBoolean(SettingsFragment.TIMESTAMPS_24H, DateFormat.is24HourFormat(context)); + boolean isUsing24HourTime = DateFormat.is24HourFormat(context); if (isUsing24HourTime) { return new SimpleDateFormat(input.toPattern().replace('h', 'H').replaceAll(" a", "")); diff --git a/QKSMS/src/main/java/com/moez/QKSMS/enums/QKPreference.java b/QKSMS/src/main/java/com/moez/QKSMS/enums/QKPreference.java index 8c4c0601..c18de55c 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/enums/QKPreference.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/enums/QKPreference.java @@ -33,7 +33,6 @@ public enum QKPreference { HIDE_AVATAR_RECEIVED("pref_key_hide_avatar_received", false), MESSAGE_COUNT("pref_key_message_count", false), - TIMESTAMPS_24H("pref_key_24h", false), // General DELAYED_MESSAGING("pref_key_delayed", false), diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/settings/SettingsFragment.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/settings/SettingsFragment.java index 13eb28e3..b6ecd335 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/settings/SettingsFragment.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/settings/SettingsFragment.java @@ -116,7 +116,6 @@ public class SettingsFragment extends PreferenceFragment implements Preference.O public static final String SPLIT_COUNTER = "pref_key_split_counter"; public static final String LONG_AS_MMS = "pref_key_long_as_mms"; public static final String LONG_AS_MMS_AFTER = "pref_key_long_as_mms_after"; - public static final String TIMESTAMPS_24H = "pref_key_24h"; public static final String NOTIFICATIONS = "pref_key_notifications"; public static final String NOTIFICATION_LED = "pref_key_led"; public static final String NOTIFICATION_LED_COLOR = "pref_key_theme_led"; diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/settings/TimePickerFragment.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/settings/TimePickerFragment.java index 3d38215d..66373d10 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/settings/TimePickerFragment.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/settings/TimePickerFragment.java @@ -55,7 +55,7 @@ public class TimePickerFragment extends DialogFragment implements TimePickerDial int hour = c.get(Calendar.HOUR_OF_DAY); int minute = c.get(Calendar.MINUTE); - boolean isUsing24HourTime = mPrefs.getBoolean(SettingsFragment.TIMESTAMPS_24H, DateFormat.is24HourFormat(getActivity())); + boolean isUsing24HourTime = DateFormat.is24HourFormat(getActivity()); return new TimePickerDialog(getActivity(), this, hour, minute, isUsing24HourTime); } diff --git a/QKSMS/src/main/res/values/strings.xml b/QKSMS/src/main/res/values/strings.xml index b60fddf2..a2fb7162 100644 --- a/QKSMS/src/main/res/values/strings.xml +++ b/QKSMS/src/main/res/values/strings.xml @@ -197,8 +197,6 @@ Send long messages as MMS instead of splitting them Send long as MMS after Send long messages as MMS when they exceed the length of a number of messages - 24h time - Display timestamps in 24-hour format Show return button Show return key on keyboard instead of Emoji button Text diff --git a/QKSMS/src/main/res/xml/settings_appearance.xml b/QKSMS/src/main/res/xml/settings_appearance.xml index f99286db..7e38b1c6 100644 --- a/QKSMS/src/main/res/xml/settings_appearance.xml +++ b/QKSMS/src/main/res/xml/settings_appearance.xml @@ -135,12 +135,5 @@ android:summary="@string/pref_message_count_summary" android:title="@string/pref_message_count" android:widgetLayout="@layout/view_switch" /> - \ No newline at end of file From 84a96126ae598612006458aafa0d312aa7fd5659 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Thu, 7 Jul 2016 14:16:31 -0400 Subject: [PATCH 11/22] Fixed rotation support --- QKSMS/src/main/AndroidManifest.xml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/QKSMS/src/main/AndroidManifest.xml b/QKSMS/src/main/AndroidManifest.xml index 2706bbc3..40d400f7 100644 --- a/QKSMS/src/main/AndroidManifest.xml +++ b/QKSMS/src/main/AndroidManifest.xml @@ -69,6 +69,7 @@ android:icon="@mipmap/ic_launcher_teal" android:label="@string/app_name" android:logo="@color/transparent" + android:screenOrientation="user" android:windowSoftInputMode="adjustResize"> @@ -92,16 +93,20 @@ - + Date: Thu, 7 Jul 2016 17:32:24 -0400 Subject: [PATCH 12/22] Created custom RGB picker --- .../java/com/moez/QKSMS/ui/ThemeManager.java | 122 ++++++++++++------ .../com/moez/QKSMS/ui/dialog/QKDialog.java | 6 +- QKSMS/src/main/res/drawable/seek_thumb.xml | 12 ++ .../res/layout/dialog_color_picker_rgb.xml | 119 +++++++++++++++++ 4 files changed, 217 insertions(+), 42 deletions(-) create mode 100644 QKSMS/src/main/res/drawable/seek_thumb.xml create mode 100644 QKSMS/src/main/res/layout/dialog_color_picker_rgb.xml diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/ThemeManager.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/ThemeManager.java index f9778643..b57ffb49 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/ThemeManager.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/ThemeManager.java @@ -11,26 +11,32 @@ import android.content.Intent; import android.content.SharedPreferences; import android.content.pm.PackageManager; import android.content.res.Resources; +import android.graphics.Color; +import android.graphics.PorterDuff; import android.graphics.drawable.Drawable; import android.os.Build; import android.preference.PreferenceManager; +import android.support.v4.content.ContextCompat; import android.util.Log; -import android.view.Gravity; +import android.view.LayoutInflater; +import android.view.View; import android.view.animation.DecelerateInterpolator; import android.widget.LinearLayout; +import android.widget.SeekBar; +import butterknife.Bind; +import butterknife.ButterKnife; import com.moez.QKSMS.R; import com.moez.QKSMS.common.AnalyticsManager; import com.moez.QKSMS.common.CIELChEvaluator; import com.moez.QKSMS.common.ConversationPrefsHelper; import com.moez.QKSMS.common.LiveViewManager; -import com.moez.QKSMS.enums.QKPreference; import com.moez.QKSMS.common.utils.ColorUtils; +import com.moez.QKSMS.enums.QKPreference; import com.moez.QKSMS.receiver.IconColorReceiver; import com.moez.QKSMS.ui.base.QKActivity; import com.moez.QKSMS.ui.dialog.QKDialog; import com.moez.QKSMS.ui.settings.SettingsFragment; import com.moez.QKSMS.ui.view.QKTextView; -import com.moez.QKSMS.ui.view.colorpicker.ColorPickerPalette; import com.moez.QKSMS.ui.widget.WidgetProvider; public class ThemeManager { @@ -461,53 +467,72 @@ public class ThemeManager { } public static void showColorPickerDialog(final QKActivity context) { - final QKDialog dialog = new QKDialog(); - - ColorPickerPalette palette = new ColorPickerPalette(context); - palette.setGravity(Gravity.CENTER); - palette.init(19, 4, color -> { - palette.init(getSwatch(color).length, 4, color2 -> { - setColor(context, color2); - dialog.dismiss(); - }); - - palette.drawPalette(getSwatch(color), mColor); - }); - - palette.drawPalette(PALETTE, getSwatchColor(mColor)); - - dialog.setContext(context) - .setTitle(R.string.pref_theme) - .setCustomView(palette) - .setNegativeButton(R.string.cancel, null); - - dialog.show(); + showColorPicker(context, v -> setColor(context, getColor())); } public static void showColorPickerDialogForConversation(final QKActivity context, ConversationPrefsHelper prefs) { + showColorPicker(context, v -> { + prefs.putString(QKPreference.THEME.getKey(), "" + getColor()); + LiveViewManager.refreshViews(QKPreference.CONVERSATION_THEME); + }); + } + + private static void showColorPicker(QKActivity context, View.OnClickListener saveListener) { final QKDialog dialog = new QKDialog(); - ColorPickerPalette palette = new ColorPickerPalette(context); - palette.setGravity(Gravity.CENTER); - palette.init(19, 4, color -> { - palette.init(getSwatch(color).length, 4, color2 -> { - prefs.putString(QKPreference.THEME.getKey(), "" + color2); - setActiveColor(color2); - LiveViewManager.refreshViews(QKPreference.CONVERSATION_THEME); - dialog.dismiss(); - }); + View view = LayoutInflater.from(mContext).inflate(R.layout.dialog_color_picker_rgb, null, false); + ColorPickerViewHolder holder = new ColorPickerViewHolder(view); - palette.drawPalette(getSwatch(color), prefs.getColor()); + SeekBar.OnSeekBarChangeListener seekListener = new SeekBar.OnSeekBarChangeListener() { + @Override + public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) { + int color = ThemeManager.getColor(); + color = Color.rgb(seekBar == holder.mRed ? progress : Color.red(color), + seekBar == holder.mGreen ? progress : Color.green(color), + seekBar == holder.mBlue ? progress : Color.blue(color)); + + if (seekBar == holder.mRed) holder.mRedValue.setText(String.valueOf(progress)); + if (seekBar == holder.mGreen) holder.mGreenValue.setText(String.valueOf(progress)); + if (seekBar == holder.mBlue) holder.mBlueValue.setText(String.valueOf(progress)); + + ThemeManager.setActiveColor(color); + } + + @Override + public void onStartTrackingTouch(SeekBar seekBar) { + } + + @Override + public void onStopTrackingTouch(SeekBar seekBar) { + } + }; + + Drawable thumbRed = ContextCompat.getDrawable(mContext, R.drawable.seek_thumb); + Drawable thumbGreen = ContextCompat.getDrawable(mContext, R.drawable.seek_thumb); + Drawable thumbBlue = ContextCompat.getDrawable(mContext, R.drawable.seek_thumb); + LiveViewManager.registerView(QKPreference.THEME, holder.mPreview, key -> { + holder.mPreview.setBackgroundColor(ThemeManager.getColor()); + holder.mRed.getProgressDrawable().setColorFilter(ThemeManager.getColor(), PorterDuff.Mode.MULTIPLY); + holder.mGreen.getProgressDrawable().setColorFilter(ThemeManager.getColor(), PorterDuff.Mode.MULTIPLY); + holder.mBlue.getProgressDrawable().setColorFilter(ThemeManager.getColor(), PorterDuff.Mode.MULTIPLY); }); - palette.drawPalette(PALETTE, getSwatchColor(prefs.getColor())); + holder.mRed.setThumb(thumbRed); + holder.mRed.setOnSeekBarChangeListener(seekListener); + holder.mGreen.setThumb(thumbGreen); + holder.mGreen.setOnSeekBarChangeListener(seekListener); + holder.mBlue.setThumb(thumbBlue); + holder.mBlue.setOnSeekBarChangeListener(seekListener); + + holder.mRed.setProgress(Color.red(ThemeManager.getColor())); + holder.mGreen.setProgress(Color.green(ThemeManager.getColor())); + holder.mBlue.setProgress(Color.blue(ThemeManager.getColor())); dialog.setContext(context) - .setTitle(R.string.pref_theme) - .setCustomView(palette) - .setNegativeButton(R.string.cancel, null); - - dialog.show(); + .setCustomView(view) + .setNegativeButton(R.string.cancel, v -> ThemeManager.setActiveColor(ThemeManager.getThemeColor())) + .setPositiveButton(R.string.save, saveListener) + .show(); } @TargetApi(Build.VERSION_CODES.LOLLIPOP) @@ -548,7 +573,7 @@ public class ThemeManager { getColorString(color) ); - int colorFrom = mColor; + int colorFrom = mActiveColor; mColor = color; mActiveColor = color; @@ -635,4 +660,19 @@ public class ThemeManager { return PALETTE; } + + static class ColorPickerViewHolder { + @Bind(R.id.preview) View mPreview; + @Bind(R.id.red) SeekBar mRed; + @Bind(R.id.red_value) QKTextView mRedValue; + @Bind(R.id.green) SeekBar mGreen; + @Bind(R.id.green_value) QKTextView mGreenValue; + @Bind(R.id.blue) SeekBar mBlue; + @Bind(R.id.blue_value) QKTextView mBlueValue; + + public ColorPickerViewHolder(View view) { + ButterKnife.bind(this, view); + } + + } } diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/dialog/QKDialog.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/dialog/QKDialog.java index 465258ae..24c97785 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/dialog/QKDialog.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/dialog/QKDialog.java @@ -24,7 +24,9 @@ import android.widget.LinearLayout; import android.widget.ListView; import android.widget.ScrollView; import com.moez.QKSMS.R; +import com.moez.QKSMS.common.LiveViewManager; import com.moez.QKSMS.common.utils.Units; +import com.moez.QKSMS.enums.QKPreference; import com.moez.QKSMS.ui.ThemeManager; import com.moez.QKSMS.ui.base.QKActivity; import com.moez.QKSMS.ui.view.QKTextView; @@ -130,8 +132,10 @@ public class QKDialog extends DialogFragment { mPositiveButtonView = (QKTextView) view.findViewById(R.id.buttonPositive); mPositiveButtonView.setVisibility(View.VISIBLE); mPositiveButtonView.setText(mPositiveButtonText); - mPositiveButtonView.setTextColor(ThemeManager.getColor()); mPositiveButtonView.setOnClickListener(mPositiveButtonClickListener); + LiveViewManager.registerView(QKPreference.THEME, mPositiveButtonView, key -> { + mPositiveButtonView.setTextColor(ThemeManager.getColor()); + }); } if (mNeutralButtonEnabled) { diff --git a/QKSMS/src/main/res/drawable/seek_thumb.xml b/QKSMS/src/main/res/drawable/seek_thumb.xml new file mode 100644 index 00000000..4c0c4293 --- /dev/null +++ b/QKSMS/src/main/res/drawable/seek_thumb.xml @@ -0,0 +1,12 @@ + + + + + + + + + + \ No newline at end of file diff --git a/QKSMS/src/main/res/layout/dialog_color_picker_rgb.xml b/QKSMS/src/main/res/layout/dialog_color_picker_rgb.xml new file mode 100644 index 00000000..ee6c59d7 --- /dev/null +++ b/QKSMS/src/main/res/layout/dialog_color_picker_rgb.xml @@ -0,0 +1,119 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 7e701af4c7446cb0fe734978ec1c7b07f89b1e3e Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Thu, 7 Jul 2016 17:46:58 -0400 Subject: [PATCH 13/22] Optimize CIECLhEvaluator and ThemeManager.setActiveColor --- .../main/java/com/moez/QKSMS/common/CIELChEvaluator.java | 9 +++++++++ QKSMS/src/main/java/com/moez/QKSMS/ui/ThemeManager.java | 6 ++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/QKSMS/src/main/java/com/moez/QKSMS/common/CIELChEvaluator.java b/QKSMS/src/main/java/com/moez/QKSMS/common/CIELChEvaluator.java index 746dab1a..b487db1d 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/common/CIELChEvaluator.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/common/CIELChEvaluator.java @@ -18,7 +18,13 @@ public class CIELChEvaluator implements TypeEvaluator { private final ColorCIELCh mStartColor; private final ColorCIELCh mEndColor; + private final int mStartInt; + private final int mEndInt; + public CIELChEvaluator(int startColor, int endColor) { + mStartInt = startColor; + mEndInt = endColor; + mStartColor = convertRgbToCIELCH(startColor); mEndColor = convertRgbToCIELCH(endColor); } @@ -29,6 +35,9 @@ public class CIELChEvaluator implements TypeEvaluator { @Override public Integer evaluate(float fraction, Integer ignored, Integer ignored2) { + if (mStartInt == mEndInt) { + return mStartInt; + } // CIELCH to CIELAB double L = mStartColor.L * (1 - fraction) + mEndColor.L * fraction; diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/ThemeManager.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/ThemeManager.java index b57ffb49..731d611c 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/ThemeManager.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/ThemeManager.java @@ -621,8 +621,10 @@ public class ThemeManager { } public static void setActiveColor(int color) { - mActiveColor = color; - LiveViewManager.refreshViews(QKPreference.THEME); + if (mActiveColor != color) { + mActiveColor = color; + LiveViewManager.refreshViews(QKPreference.THEME); + } } private static boolean isColorDarkEnough(int color) { From 9084f6ce92d3dc671a6adcbe1ada8f9570c5621e Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Thu, 7 Jul 2016 22:24:04 -0400 Subject: [PATCH 14/22] Palette and RGB both show in pager --- .../java/com/moez/QKSMS/ui/ThemeManager.java | 40 ++++++++++- .../ui/dialog/ColorPickerPagerAdapter.java | 57 ++++++++++++++++ .../res/layout/dialog_color_picker_pager.xml | 67 +++++++++++++++++++ QKSMS/src/main/res/values/strings.xml | 2 + 4 files changed, 165 insertions(+), 1 deletion(-) create mode 100644 QKSMS/src/main/java/com/moez/QKSMS/ui/dialog/ColorPickerPagerAdapter.java create mode 100644 QKSMS/src/main/res/layout/dialog_color_picker_pager.xml diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/ThemeManager.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/ThemeManager.java index 731d611c..fbac5b06 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/ThemeManager.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/ThemeManager.java @@ -17,6 +17,7 @@ import android.graphics.drawable.Drawable; import android.os.Build; import android.preference.PreferenceManager; import android.support.v4.content.ContextCompat; +import android.support.v4.view.ViewPager; import android.util.Log; import android.view.LayoutInflater; import android.view.View; @@ -34,9 +35,11 @@ import com.moez.QKSMS.common.utils.ColorUtils; import com.moez.QKSMS.enums.QKPreference; import com.moez.QKSMS.receiver.IconColorReceiver; import com.moez.QKSMS.ui.base.QKActivity; +import com.moez.QKSMS.ui.dialog.ColorPickerPagerAdapter; import com.moez.QKSMS.ui.dialog.QKDialog; import com.moez.QKSMS.ui.settings.SettingsFragment; import com.moez.QKSMS.ui.view.QKTextView; +import com.moez.QKSMS.ui.view.colorpicker.ColorPickerPalette; import com.moez.QKSMS.ui.widget.WidgetProvider; public class ThemeManager { @@ -480,9 +483,35 @@ public class ThemeManager { private static void showColorPicker(QKActivity context, View.OnClickListener saveListener) { final QKDialog dialog = new QKDialog(); - View view = LayoutInflater.from(mContext).inflate(R.layout.dialog_color_picker_rgb, null, false); + View view = LayoutInflater.from(mContext).inflate(R.layout.dialog_color_picker_pager, null, false); ColorPickerViewHolder holder = new ColorPickerViewHolder(view); + holder.mTab1.setOnClickListener(v -> holder.mPager.setCurrentItem(0)); + holder.mTab2.setOnClickListener(v -> holder.mPager.setCurrentItem(1)); + + ColorPickerPagerAdapter adapter = new ColorPickerPagerAdapter(context); + holder.mPager.setAdapter(adapter); + holder.mPager.setOffscreenPageLimit(1); + holder.mPager.addOnPageChangeListener(new ViewPager.SimpleOnPageChangeListener() { + @SuppressWarnings("ResourceAsColor") + @Override + public void onPageSelected(int position) { + super.onPageSelected(position); + holder.mTab1.setTextColor(position == 0 ? getColor() : getTextOnBackgroundPrimary()); + holder.mTab2.setTextColor(position == 1 ? getColor() : getTextOnBackgroundPrimary()); + } + }); + + holder.mPalette.init(19, 4, color -> { + holder.mPalette.init(getSwatch(color).length, 4, color2 -> { + setColor(context, color2); + dialog.dismiss(); + }); + holder.mPalette.drawPalette(getSwatch(color), mColor); + }); + holder.mPalette.drawPalette(PALETTE, getSwatchColor(mColor)); + + SeekBar.OnSeekBarChangeListener seekListener = new SeekBar.OnSeekBarChangeListener() { @Override public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) { @@ -515,6 +544,11 @@ public class ThemeManager { holder.mRed.getProgressDrawable().setColorFilter(ThemeManager.getColor(), PorterDuff.Mode.MULTIPLY); holder.mGreen.getProgressDrawable().setColorFilter(ThemeManager.getColor(), PorterDuff.Mode.MULTIPLY); holder.mBlue.getProgressDrawable().setColorFilter(ThemeManager.getColor(), PorterDuff.Mode.MULTIPLY); + if (holder.mPager.getCurrentItem() == 0) { + holder.mTab1.setTextColor(getColor()); + } else { + holder.mTab2.setTextColor(getColor()); + } }); holder.mRed.setThumb(thumbRed); @@ -664,6 +698,10 @@ public class ThemeManager { } static class ColorPickerViewHolder { + @Bind(R.id.tab_1) QKTextView mTab1; + @Bind(R.id.tab_2) QKTextView mTab2; + @Bind(R.id.pager) ViewPager mPager; + @Bind(R.id.palette_view) ColorPickerPalette mPalette; @Bind(R.id.preview) View mPreview; @Bind(R.id.red) SeekBar mRed; @Bind(R.id.red_value) QKTextView mRedValue; diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/dialog/ColorPickerPagerAdapter.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/dialog/ColorPickerPagerAdapter.java new file mode 100644 index 00000000..0eacfa77 --- /dev/null +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/dialog/ColorPickerPagerAdapter.java @@ -0,0 +1,57 @@ +package com.moez.QKSMS.ui.dialog; + +import android.support.v4.view.PagerAdapter; +import android.view.View; +import android.view.ViewGroup; +import com.moez.QKSMS.R; +import com.moez.QKSMS.ui.base.QKActivity; + +public class ColorPickerPagerAdapter extends PagerAdapter { + + private QKActivity mContext; + + public ColorPickerPagerAdapter(QKActivity context) { + mContext = context; + } + + public Object instantiateItem(ViewGroup collection, int position) { + int resId = 0; + switch (position) { + case 0: + resId = R.id.palette; + break; + + case 1: + resId = R.id.rgb; + break; + } + + return collection.findViewById(resId); + } + + @Override + public CharSequence getPageTitle(int position) { + int resId = 0; + switch (position) { + case 0: + resId = R.string.title_palette; + break; + + case 1: + resId = R.string.title_rgb; + break; + } + + return mContext.getString(resId); + } + + @Override + public int getCount() { + return 2; + } + + @Override + public boolean isViewFromObject(View arg0, Object arg1) { + return arg0 == ((View) arg1); + } +} diff --git a/QKSMS/src/main/res/layout/dialog_color_picker_pager.xml b/QKSMS/src/main/res/layout/dialog_color_picker_pager.xml new file mode 100644 index 00000000..95eaf9b2 --- /dev/null +++ b/QKSMS/src/main/res/layout/dialog_color_picker_pager.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/QKSMS/src/main/res/values/strings.xml b/QKSMS/src/main/res/values/strings.xml index a2fb7162..f90aed90 100644 --- a/QKSMS/src/main/res/values/strings.xml +++ b/QKSMS/src/main/res/values/strings.xml @@ -313,6 +313,8 @@ Block number Unblock number %s selected + Palette + RGB Enter code + Hex New message From c7dd045f799569ab5fb804164445227acff57348 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Fri, 8 Jul 2016 11:18:05 -1000 Subject: [PATCH 22/22] Optimizations for hex color view --- QKSMS/src/main/java/com/moez/QKSMS/ui/ThemeManager.java | 7 +++++-- .../src/main/java/com/moez/QKSMS/ui/view/QKEditText.java | 9 ++++++++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/ThemeManager.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/ThemeManager.java index b565ddfd..26485bfa 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/ThemeManager.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/ThemeManager.java @@ -553,7 +553,10 @@ public class ThemeManager { setActiveColor(color); String colorString = Integer.toHexString(color); + holder.mHex.setTextChangedListenerEnabled(false); holder.mHex.setText(colorString.substring(colorString.length() > 6 ? colorString.length() - 6 : 0)); + holder.mHex.setTextChangedListenerEnabled(true); + holder.mError.setVisibility(View.INVISIBLE); } @Override @@ -606,7 +609,7 @@ public class ThemeManager { return false; }); holder.mHex.setTextChangedListener(s -> { - try { + if (s.length() == 6) { int color = Color.parseColor("#" + s.toString()); holder.mError.setVisibility(View.INVISIBLE); if (color != getColor()) { @@ -614,7 +617,7 @@ public class ThemeManager { holder.mGreen.setProgress(Color.green(color)); holder.mBlue.setProgress(Color.blue(color)); } - } catch (IllegalArgumentException e) { + } else { holder.mError.setVisibility(View.VISIBLE); } }); diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/view/QKEditText.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/view/QKEditText.java index aed937c4..3bc8c1c5 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/view/QKEditText.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/view/QKEditText.java @@ -21,6 +21,7 @@ public class QKEditText extends android.widget.EditText { } private Context mContext; + private boolean mTextChangedListenerEnabled = true; public QKEditText(Context context) { super(context); @@ -77,6 +78,10 @@ public class QKEditText extends android.widget.EditText { super.setText(text, type); } + public void setTextChangedListenerEnabled(boolean textChangedListenerEnabled) { + mTextChangedListenerEnabled = textChangedListenerEnabled; + } + public void setTextChangedListener(final TextChangedListener listener) { if (listener != null) { addTextChangedListener(new TextWatcher() { @@ -91,7 +96,9 @@ public class QKEditText extends android.widget.EditText { @Override public void afterTextChanged(Editable s) { - listener.onTextChanged(s); + if (mTextChangedListenerEnabled) { + listener.onTextChanged(s); + } } }); }