From 006c14db0309eb84585d18fad29f44f12841ec80 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Thu, 7 Jul 2016 22:02:57 -1000 Subject: [PATCH] Remove all usages of old ripple application --- .../com/moez/QKSMS/common/DonationManager.java | 9 +++++++++ .../java/com/moez/QKSMS/ui/ThemeManager.java | 17 ++++++++++++++++- .../ConversationListAdapter.java | 12 +++++++----- .../ConversationListViewHolder.java | 1 - .../ui/messagelist/MessageListAdapter.java | 3 ++- .../com/moez/QKSMS/ui/search/SearchAdapter.java | 8 ++++++++ .../res/layout/dialog_color_picker_pager.xml | 2 -- QKSMS/src/main/res/layout/dialog_donate.xml | 4 ---- .../main/res/layout/list_item_conversation.xml | 1 - .../main/res/layout/list_item_message_in.xml | 1 - .../main/res/layout/list_item_message_out.xml | 1 - QKSMS/src/main/res/layout/list_item_search.xml | 1 - QKSMS/src/main/res/values/styles.xml | 5 ----- 13 files changed, 42 insertions(+), 23 deletions(-) diff --git a/QKSMS/src/main/java/com/moez/QKSMS/common/DonationManager.java b/QKSMS/src/main/java/com/moez/QKSMS/common/DonationManager.java index eb14dbb1..63c3a4da 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/common/DonationManager.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/common/DonationManager.java @@ -7,9 +7,11 @@ import android.util.Log; import android.view.View; import android.widget.Toast; import com.moez.QKSMS.R; +import com.moez.QKSMS.enums.QKPreference; import com.moez.QKSMS.external.iab.IabHelper; import com.moez.QKSMS.external.iab.IabResult; import com.moez.QKSMS.external.iab.Purchase; +import com.moez.QKSMS.ui.ThemeManager; import com.moez.QKSMS.ui.base.QKActivity; import com.moez.QKSMS.ui.dialog.QKDialog; @@ -197,6 +199,13 @@ public class DonationManager { view.findViewById(R.id.donate_10).setOnClickListener(clickListener); view.findViewById(R.id.donate_paypal).setOnClickListener(clickListener); + LiveViewManager.registerView(QKPreference.BACKGROUND, this, key -> { + view.findViewById(R.id.donate_1).setBackgroundDrawable(ThemeManager.getRippleBackground()); + view.findViewById(R.id.donate_5).setBackgroundDrawable(ThemeManager.getRippleBackground()); + view.findViewById(R.id.donate_10).setBackgroundDrawable(ThemeManager.getRippleBackground()); + view.findViewById(R.id.donate_paypal).setBackgroundDrawable(ThemeManager.getRippleBackground()); + }); + QKDialog dialog = new QKDialog() .setContext(mContext) .setCustomView(view); 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 1f14ead8..15d82deb 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/ThemeManager.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/ThemeManager.java @@ -16,6 +16,8 @@ import android.graphics.PorterDuff; import android.graphics.drawable.Drawable; import android.os.Build; import android.preference.PreferenceManager; +import android.support.annotation.ColorInt; +import android.support.annotation.DrawableRes; import android.support.v4.content.ContextCompat; import android.support.v4.view.ViewPager; import android.util.Log; @@ -373,46 +375,57 @@ public class ThemeManager { .show(); } + @ColorInt public static int getBackgroundColor() { return mBackgroundColor; } + @ColorInt public static int getTextOnColorPrimary() { return mTextOnColorPrimary; } + @ColorInt public static int getTextOnColorSecondary() { return mTextOnColorSecondary; } + @ColorInt public static int getTextOnBackgroundPrimary() { return mTextOnBackgroundPrimary; } + @ColorInt public static int getTextOnBackgroundSecondary() { return mtextOnBackgroundSecondary; } + @DrawableRes public static int getSentBubbleRes() { return mSentBubbleRes; } + @DrawableRes public static int getSentBubbleAltRes() { return mSentBubbleAltRes; } + @ColorInt public static int getSentBubbleColor() { return mSentBubbleColored ? mActiveColor : getNeutralBubbleColor(); } + @DrawableRes public static int getReceivedBubbleRes() { return mReceivedBubbleRes; } + @DrawableRes public static int getReceivedBubbleAltRes() { return mReceivedBubbleAltRes; } + @ColorInt public static int getReceivedBubbleColor() { return mReceivedBubbleColored ? mActiveColor : getNeutralBubbleColor(); } @@ -432,6 +445,7 @@ public class ThemeManager { mReceivedBubbleColored = colored; } + @ColorInt public static int getNeutralBubbleColor() { if (mTheme == null) { return 0xeeeeee; @@ -453,10 +467,12 @@ public class ThemeManager { return mResources.getDrawable(mRippleBackgroundRes); } + @ColorInt public static int getColor() { return mActiveColor; } + @ColorInt public static int getThemeColor() { return mColor; } @@ -495,7 +511,6 @@ public class ThemeManager { 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); diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/conversationlist/ConversationListAdapter.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/conversationlist/ConversationListAdapter.java index 31a2f740..5875b102 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/conversationlist/ConversationListAdapter.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/conversationlist/ConversationListAdapter.java @@ -13,14 +13,11 @@ import com.moez.QKSMS.common.utils.DateFormatter; import com.moez.QKSMS.data.Contact; import com.moez.QKSMS.data.Conversation; import com.moez.QKSMS.enums.QKPreference; -import com.moez.QKSMS.interfaces.LiveView; import com.moez.QKSMS.ui.ThemeManager; import com.moez.QKSMS.ui.base.QKActivity; import com.moez.QKSMS.ui.base.RecyclerCursorAdapter; import com.moez.QKSMS.ui.settings.SettingsFragment; -import static com.moez.QKSMS.R.id.conversation; - public class ConversationListAdapter extends RecyclerCursorAdapter { @@ -52,6 +49,10 @@ public class ConversationListAdapter extends RecyclerCursorAdapter { + holder.root.setBackgroundDrawable(ThemeManager.getRippleBackground()); + }); + return holder; } @@ -104,8 +105,9 @@ public class ConversationListAdapter extends RecyclerCursorAdapter - holder.mAvatarView.setVisibility(mContext.getBoolean(QKPreference.HIDE_AVATAR_CONVERSATIONS) ? View.GONE : View.VISIBLE)); + LiveViewManager.registerView(QKPreference.HIDE_AVATAR_CONVERSATIONS, this, key -> { + holder.mAvatarView.setVisibility(mContext.getBoolean(QKPreference.HIDE_AVATAR_CONVERSATIONS) ? View.GONE : View.VISIBLE); + }); // Date holder.dateView.setText(DateFormatter.getConversationTimestamp(mContext, conversation.getDate())); diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/conversationlist/ConversationListViewHolder.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/conversationlist/ConversationListViewHolder.java index 2e7d3712..f065c4e9 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/conversationlist/ConversationListViewHolder.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/conversationlist/ConversationListViewHolder.java @@ -11,7 +11,6 @@ import com.moez.QKSMS.R; import com.moez.QKSMS.data.Contact; import com.moez.QKSMS.data.Conversation; import com.moez.QKSMS.data.ConversationLegacy; -import com.moez.QKSMS.ui.MainActivity; import com.moez.QKSMS.ui.ThemeManager; import com.moez.QKSMS.ui.base.ClickyViewHolder; import com.moez.QKSMS.ui.base.QKActivity; diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListAdapter.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListAdapter.java index cf05dafd..dee92e22 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListAdapter.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListAdapter.java @@ -165,6 +165,7 @@ public class MessageListAdapter extends RecyclerCursorAdapter { + holder.mRoot.setBackgroundDrawable(ThemeManager.getRippleBackground()); holder.mMmsView.getForeground().setColorFilter(ThemeManager.getBackgroundColor(), PorterDuff.Mode.SRC_ATOP); }); @@ -280,7 +281,7 @@ public class MessageListAdapter extends RecyclerCursorAdapter { + view.setBackgroundDrawable(ThemeManager.getRippleBackground()); + }); + return new SearchViewHolder(mContext, view); } diff --git a/QKSMS/src/main/res/layout/dialog_color_picker_pager.xml b/QKSMS/src/main/res/layout/dialog_color_picker_pager.xml index 95eaf9b2..d5938c0a 100644 --- a/QKSMS/src/main/res/layout/dialog_color_picker_pager.xml +++ b/QKSMS/src/main/res/layout/dialog_color_picker_pager.xml @@ -15,7 +15,6 @@ android:id="@+id/tab_1" android:layout_width="wrap_content" android:layout_height="match_parent" - android:background="?android:attr/selectableItemBackground" android:gravity="center" android:paddingLeft="16dp" android:paddingRight="16dp" @@ -26,7 +25,6 @@ android:id="@+id/tab_2" android:layout_width="wrap_content" android:layout_height="match_parent" - android:background="?android:attr/selectableItemBackground" android:gravity="center" android:paddingLeft="16dp" android:paddingRight="16dp" diff --git a/QKSMS/src/main/res/layout/dialog_donate.xml b/QKSMS/src/main/res/layout/dialog_donate.xml index d3822943..1ca79dcb 100644 --- a/QKSMS/src/main/res/layout/dialog_donate.xml +++ b/QKSMS/src/main/res/layout/dialog_donate.xml @@ -30,7 +30,6 @@ android:id="@+id/donate_1" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="?android:attr/selectableItemBackground" android:orientation="vertical" android:padding="8dp"> @@ -52,7 +51,6 @@ android:id="@+id/donate_5" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="?android:attr/selectableItemBackground" android:orientation="vertical" android:padding="8dp"> @@ -74,7 +72,6 @@ android:id="@+id/donate_10" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="?android:attr/selectableItemBackground" android:orientation="vertical" android:padding="8dp"> @@ -104,7 +101,6 @@ android:id="@+id/donate_paypal" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="?android:attr/selectableItemBackground" android:orientation="vertical" android:padding="8dp"> diff --git a/QKSMS/src/main/res/layout/list_item_conversation.xml b/QKSMS/src/main/res/layout/list_item_conversation.xml index f3a9b130..8d99be80 100644 --- a/QKSMS/src/main/res/layout/list_item_conversation.xml +++ b/QKSMS/src/main/res/layout/list_item_conversation.xml @@ -7,7 +7,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:animateLayoutChanges="true" - android:background="?android:attr/selectableItemBackground" android:gravity="top" android:minHeight="72dp" android:orientation="horizontal" diff --git a/QKSMS/src/main/res/layout/list_item_message_in.xml b/QKSMS/src/main/res/layout/list_item_message_in.xml index 8ff6f43b..5d419150 100644 --- a/QKSMS/src/main/res/layout/list_item_message_in.xml +++ b/QKSMS/src/main/res/layout/list_item_message_in.xml @@ -6,7 +6,6 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="?android:attr/selectableItemBackground" android:orientation="horizontal" android:paddingTop="2dp"> diff --git a/QKSMS/src/main/res/layout/list_item_message_out.xml b/QKSMS/src/main/res/layout/list_item_message_out.xml index fea4a9bc..d1013e43 100644 --- a/QKSMS/src/main/res/layout/list_item_message_out.xml +++ b/QKSMS/src/main/res/layout/list_item_message_out.xml @@ -6,7 +6,6 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="?android:attr/selectableItemBackground" android:orientation="horizontal" android:paddingTop="2dp"> diff --git a/QKSMS/src/main/res/layout/list_item_search.xml b/QKSMS/src/main/res/layout/list_item_search.xml index 08171dac..3c4090e6 100644 --- a/QKSMS/src/main/res/layout/list_item_search.xml +++ b/QKSMS/src/main/res/layout/list_item_search.xml @@ -4,7 +4,6 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="?android:attr/selectableItemBackground" android:gravity="top" android:orientation="horizontal" android:paddingBottom="8dp" diff --git a/QKSMS/src/main/res/values/styles.xml b/QKSMS/src/main/res/values/styles.xml index 804f1746..a376f9c8 100644 --- a/QKSMS/src/main/res/values/styles.xml +++ b/QKSMS/src/main/res/values/styles.xml @@ -19,9 +19,4 @@ tertiary - -