diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/base/QKActivity.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/base/QKActivity.java
index 9423950b..9c27e746 100644
--- a/QKSMS/src/main/java/com/moez/QKSMS/ui/base/QKActivity.java
+++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/base/QKActivity.java
@@ -102,7 +102,7 @@ public abstract class QKActivity extends ActionBarActivity {
MenuItem menuItem = menu.getItem(i);
Drawable newIcon = menuItem.getIcon();
if (newIcon != null) {
- newIcon.setColorFilter(new PorterDuffColorFilter(color, PorterDuff.Mode.MULTIPLY));
+ newIcon.setColorFilter(color, PorterDuff.Mode.SRC_ATOP);
menuItem.setIcon(newIcon);
}
}
diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListFragment.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListFragment.java
index 07f46666..4dc378e6 100644
--- a/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListFragment.java
+++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListFragment.java
@@ -53,6 +53,7 @@ import com.moez.QKSMS.LogTag;
import com.moez.QKSMS.MmsConfig;
import com.moez.QKSMS.QKSMSApp;
import com.moez.QKSMS.R;
+import com.moez.QKSMS.common.ConversationPrefsHelper;
import com.moez.QKSMS.common.DialogHelper;
import com.moez.QKSMS.common.conversationdetails.ConversationDetailsDialog;
import com.moez.QKSMS.common.utils.DrmUtils;
@@ -620,6 +621,12 @@ public class MessageListFragment extends QKContentFragment implements ActivityLa
makeCall();
return true;
+ case R.id.menu_notifications:
+ ConversationPrefsHelper conversationPrefs = new ConversationPrefsHelper(mContext, mThreadId);
+ conversationPrefs.putBoolean(SettingsFragment.NOTIFICATIONS, !conversationPrefs.getNotificationsEnabled());
+ mContext.invalidateOptionsMenu();
+ return true;
+
case R.id.menu_details:
mConversationDetailsDialog.showDetails(mConversation);
return true;
@@ -773,6 +780,12 @@ public class MessageListFragment extends QKContentFragment implements ActivityLa
inflater.inflate(R.menu.conversation, menu);
setTitle();
+ ConversationPrefsHelper conversationPrefs = new ConversationPrefsHelper(mContext, mThreadId);
+ menu.findItem(R.id.menu_notifications).setTitle(conversationPrefs.getNotificationsEnabled() ?
+ R.string.menu_notifications : R.string.menu_notifications_off);
+ menu.findItem(R.id.menu_notifications).setIcon(conversationPrefs.getNotificationsEnabled() ?
+ R.drawable.ic_notifications : R.drawable.ic_notifications_off);
+
super.onCreateOptionsMenu(menu, inflater);
}
diff --git a/QKSMS/src/main/res/drawable-xxhdpi/ic_notifications.png b/QKSMS/src/main/res/drawable-xxhdpi/ic_notifications.png
deleted file mode 100644
index 9dc1773f..00000000
Binary files a/QKSMS/src/main/res/drawable-xxhdpi/ic_notifications.png and /dev/null differ
diff --git a/QKSMS/src/main/res/drawable/ic_notifications.xml b/QKSMS/src/main/res/drawable/ic_notifications.xml
new file mode 100644
index 00000000..e3400cfc
--- /dev/null
+++ b/QKSMS/src/main/res/drawable/ic_notifications.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/QKSMS/src/main/res/drawable/ic_notifications_off.xml b/QKSMS/src/main/res/drawable/ic_notifications_off.xml
new file mode 100644
index 00000000..c00ca61d
--- /dev/null
+++ b/QKSMS/src/main/res/drawable/ic_notifications_off.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/QKSMS/src/main/res/menu/conversation.xml b/QKSMS/src/main/res/menu/conversation.xml
index bdb7bc98..dc5fb6cb 100644
--- a/QKSMS/src/main/res/menu/conversation.xml
+++ b/QKSMS/src/main/res/menu/conversation.xml
@@ -9,6 +9,12 @@
android:title="@string/menu_call"
app:showAsAction="ifRoom" />
+
+
diff --git a/QKSMS/src/main/res/values/strings.xml b/QKSMS/src/main/res/values/strings.xml
index 10c525a6..0af8fda7 100644
--- a/QKSMS/src/main/res/values/strings.xml
+++ b/QKSMS/src/main/res/values/strings.xml
@@ -650,6 +650,8 @@
Blocked
Blocked (%s new)
Messages (%s new)
+ Notifications
+ Notifications off
Notification settings
View details
Mark read