From d96d1b9b05615679d66f2ff270dbba67309d3c58 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Thu, 7 Jul 2016 22:04:51 -1000 Subject: [PATCH] Refactor ripple drawables --- QKSMS/src/main/java/com/moez/QKSMS/ui/ThemeManager.java | 6 +++--- .../com/moez/QKSMS/ui/messagelist/MessageListAdapter.java | 1 + .../{button_background_transparent.xml => ripple.xml} | 0 ...on_background_transparent_light.xml => ripple_light.xml} | 0 .../{button_background_transparent.xml => ripple.xml} | 0 ...on_background_transparent_light.xml => ripple_light.xml} | 0 QKSMS/src/main/res/layout/list_item_message_in.xml | 1 - QKSMS/src/main/res/layout/list_item_message_out.xml | 1 - QKSMS/src/main/res/layout/view_compose.xml | 6 +++--- QKSMS/src/main/res/layout/widget.xml | 2 +- 10 files changed, 8 insertions(+), 9 deletions(-) rename QKSMS/src/main/res/drawable-v21/{button_background_transparent.xml => ripple.xml} (100%) rename QKSMS/src/main/res/drawable-v21/{button_background_transparent_light.xml => ripple_light.xml} (100%) rename QKSMS/src/main/res/drawable/{button_background_transparent.xml => ripple.xml} (100%) rename QKSMS/src/main/res/drawable/{button_background_transparent_light.xml => ripple_light.xml} (100%) 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 15d82deb..1fae826a 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/ThemeManager.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/ThemeManager.java @@ -292,21 +292,21 @@ public class ThemeManager { mBackgroundColor = mResources.getColor(R.color.grey_light_mega_ultra); mTextOnBackgroundPrimary = mResources.getColor(R.color.theme_light_text_primary); mtextOnBackgroundSecondary = mResources.getColor(R.color.theme_light_text_secondary); - mRippleBackgroundRes = R.drawable.button_background_transparent; + mRippleBackgroundRes = R.drawable.ripple; break; case DARK: mBackgroundColor = mResources.getColor(R.color.grey_material); mTextOnBackgroundPrimary = mResources.getColor(R.color.theme_dark_text_primary); mtextOnBackgroundSecondary = mResources.getColor(R.color.theme_dark_text_secondary); - mRippleBackgroundRes = R.drawable.button_background_transparent_light; + mRippleBackgroundRes = R.drawable.ripple_light; break; case BLACK: mBackgroundColor = mResources.getColor(R.color.black); mTextOnBackgroundPrimary = mResources.getColor(R.color.theme_dark_text_primary); mtextOnBackgroundSecondary = mResources.getColor(R.color.theme_dark_text_secondary); - mRippleBackgroundRes = R.drawable.button_background_transparent_light; + mRippleBackgroundRes = R.drawable.ripple_light; break; } 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 dee92e22..6730b902 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 @@ -166,6 +166,7 @@ public class MessageListAdapter extends RecyclerCursorAdapter { holder.mRoot.setBackgroundDrawable(ThemeManager.getRippleBackground()); + holder.mSlideShowButton.setBackgroundDrawable(ThemeManager.getRippleBackground()); holder.mMmsView.getForeground().setColorFilter(ThemeManager.getBackgroundColor(), PorterDuff.Mode.SRC_ATOP); }); diff --git a/QKSMS/src/main/res/drawable-v21/button_background_transparent.xml b/QKSMS/src/main/res/drawable-v21/ripple.xml similarity index 100% rename from QKSMS/src/main/res/drawable-v21/button_background_transparent.xml rename to QKSMS/src/main/res/drawable-v21/ripple.xml diff --git a/QKSMS/src/main/res/drawable-v21/button_background_transparent_light.xml b/QKSMS/src/main/res/drawable-v21/ripple_light.xml similarity index 100% rename from QKSMS/src/main/res/drawable-v21/button_background_transparent_light.xml rename to QKSMS/src/main/res/drawable-v21/ripple_light.xml diff --git a/QKSMS/src/main/res/drawable/button_background_transparent.xml b/QKSMS/src/main/res/drawable/ripple.xml similarity index 100% rename from QKSMS/src/main/res/drawable/button_background_transparent.xml rename to QKSMS/src/main/res/drawable/ripple.xml diff --git a/QKSMS/src/main/res/drawable/button_background_transparent_light.xml b/QKSMS/src/main/res/drawable/ripple_light.xml similarity index 100% rename from QKSMS/src/main/res/drawable/button_background_transparent_light.xml rename to QKSMS/src/main/res/drawable/ripple_light.xml 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 5d419150..35727712 100644 --- a/QKSMS/src/main/res/layout/list_item_message_in.xml +++ b/QKSMS/src/main/res/layout/list_item_message_in.xml @@ -76,7 +76,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" - android:background="@drawable/button_background_transparent" android:padding="16dp" android:src="@drawable/ic_play" android:visibility="gone" /> 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 d1013e43..8f13d321 100644 --- a/QKSMS/src/main/res/layout/list_item_message_out.xml +++ b/QKSMS/src/main/res/layout/list_item_message_out.xml @@ -76,7 +76,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" - android:background="@drawable/button_background_transparent" android:padding="16dp" android:src="@drawable/ic_play" android:visibility="gone" /> diff --git a/QKSMS/src/main/res/layout/view_compose.xml b/QKSMS/src/main/res/layout/view_compose.xml index 48fa2277..c3d57bbe 100644 --- a/QKSMS/src/main/res/layout/view_compose.xml +++ b/QKSMS/src/main/res/layout/view_compose.xml @@ -142,7 +142,7 @@ android:id="@+id/attach" android:layout_width="56dp" android:layout_height="56dp" - android:background="@drawable/button_background_transparent_light" + android:background="@drawable/ripple_light" android:padding="16dp" android:src="@drawable/ic_photo" /> @@ -150,7 +150,7 @@ android:id="@+id/camera" android:layout_width="56dp" android:layout_height="56dp" - android:background="@drawable/button_background_transparent_light" + android:background="@drawable/ripple_light" android:padding="16dp" android:src="@drawable/ic_camera" /> @@ -158,7 +158,7 @@ android:id="@+id/delay" android:layout_width="56dp" android:layout_height="56dp" - android:background="@drawable/button_background_transparent_light" + android:background="@drawable/ripple_light" android:padding="16dp" android:src="@drawable/ic_timer" /> diff --git a/QKSMS/src/main/res/layout/widget.xml b/QKSMS/src/main/res/layout/widget.xml index c069a938..bbe8731c 100644 --- a/QKSMS/src/main/res/layout/widget.xml +++ b/QKSMS/src/main/res/layout/widget.xml @@ -37,7 +37,7 @@ android:id="@+id/widget_compose" android:layout_width="56dp" android:layout_height="56dp" - android:background="@drawable/button_background_transparent" + android:background="@drawable/ripple" android:contentDescription="@string/new_message" android:padding="16dp" android:src="@drawable/ic_compose" />