vanitasvitae/dandelion
1
0
Fork 0
mirror of https://github.com/gsantner/dandelion synced 2024-11-25 13:52:08 +01:00
Code Issues Releases Wiki Activity

Update notification&message icon to visualize current state

Browse source
This commit is contained in:
Gregor Santner 2016-08-07 03:42:20 +02:00
parent 4b9bbdb5d7
commit a5d9f05700
2 changed files with 22 additions and 75 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

74
app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java
View file

@ -121,8 +121,6 @@ public class MainActivity extends AppCompatActivity
private App app; private App app;
private String podDomain; private String podDomain;
private Menu menu; private Menu menu;
private int notificationCount = 0;
private int conversationCount = 0;
private ValueCallback<Uri[]> mFilePathCallback; private ValueCallback<Uri[]> mFilePathCallback;
private String mCameraPhotoPath; private String mCameraPhotoPath;
private WebSettings webSettings; private WebSettings webSettings;
@ -603,14 +601,14 @@ public class MainActivity extends AppCompatActivity
this.menu = menu; this.menu = menu;
MenuItem itemNotification = menu.findItem(R.id.action_notifications); MenuItem itemNotification = menu.findItem(R.id.action_notifications);
if (itemNotification != null) { if (itemNotification != null) {
if (notificationCount > 0) { if (podUserProfile.getNotificationCount() > 0) {
itemNotification.setIcon(R.drawable.ic_notifications_colored_48px); itemNotification.setIcon(R.drawable.ic_notifications_colored_48px);
} else { } else {
itemNotification.setIcon(R.drawable.ic_notifications_white_48px); itemNotification.setIcon(R.drawable.ic_notifications_white_48px);
} }
MenuItem itemConversation = menu.findItem(R.id.action_conversations); MenuItem itemConversation = menu.findItem(R.id.action_conversations);
if (conversationCount > 0) { if (podUserProfile.getUnreadMessagesCount() > 0) {
itemConversation.setIcon(R.drawable.ic_email_colored_48px); itemConversation.setIcon(R.drawable.ic_email_colored_48px);
} else { } else {
itemConversation.setIcon(R.drawable.ic_mail_white_48px); itemConversation.setIcon(R.drawable.ic_mail_white_48px);
@ -920,26 +918,6 @@ public class MainActivity extends AppCompatActivity
// TODO: Move from Javascript interface // TODO: Move from Javascript interface
@Override @Override
public void onNotificationCountChanged(int notificationCount) { public void onNotificationCountChanged(int notificationCount) {
}
// TODO: Move from Javascript interface
@Override
public void onUnreadMessageCountChanged(int unreadMessageCount) {
}
private class JavaScriptInterface {
@JavascriptInterface
public void setNotificationCount(final String webMessage) {
uiHandler.post(new Runnable() {
@Override
public void run() {
if (menu == null) {
return;
}
notificationCount = Integer.valueOf(webMessage);
MenuItem item = menu.findItem(R.id.action_notifications); MenuItem item = menu.findItem(R.id.action_notifications);
if (item != null) { if (item != null) {
@ -951,45 +929,31 @@ public class MainActivity extends AppCompatActivity
item.setIcon(R.drawable.ic_notifications_white_48px); item.setIcon(R.drawable.ic_notifications_white_48px);
} }
} }
}
});
} }
// TODO: Move from Javascript interface
@Override
public void onUnreadMessageCountChanged(int unreadMessageCount) {
MenuItem item = menu.findItem(R.id.action_conversations);
if (item != null) {
if (unreadMessageCount > 0) {
item.setIcon(R.drawable.ic_email_colored_48px);
if (!snackbarNewNotification.isShown() && !webView.getUrl().equals("https://" + podDomain + "/conversations"))
snackbarNewNotification.show();
} else {
item.setIcon(R.drawable.ic_mail_white_48px);
}
}
}
private class JavaScriptInterface {
@JavascriptInterface @JavascriptInterface
public void setUserProfile(final String webMessage) throws JSONException { public void setUserProfile(final String webMessage) throws JSONException {
if (podUserProfile.isRefreshNeeded()) { if (podUserProfile.isRefreshNeeded()) {
podUserProfile.parseJson(webMessage); podUserProfile.parseJson(webMessage);
} }
} }
@JavascriptInterface
public void setConversationCount(final String webMessage) {
uiHandler.post(new Runnable() {
@Override
public void run() {
if (menu == null) {
return;
}
conversationCount = Integer.valueOf(webMessage);
MenuItem item = menu.findItem(R.id.action_conversations);
if (item != null) {
if (conversationCount > 0) {
item.setIcon(R.drawable.ic_email_colored_48px);
if (!snackbarNewNotification.isShown() && !webView.getUrl().equals("https://" + podDomain + "/notifications"))
snackbarNewNotification.show();
} else {
item.setIcon(R.drawable.ic_mail_white_48px);
}
}
}
});
}
} }
@SuppressWarnings("StatementWithEmptyBody") @SuppressWarnings("StatementWithEmptyBody")

17
app/src/main/java/com/github/dfa/diaspora_android/util/Helpers.java
View file

@ -67,23 +67,6 @@ public class Helpers {
"})();"); "})();");
} }
public static void getNotificationCount(final WebView wv) {
wv.loadUrl("javascript: ( function() {" +
"if (document.getElementById('notification')) {" +
" var count = document.getElementById('notification').innerHTML;" +
" AndroidBridge.setNotificationCount(count.replace(/(\\r\\n|\\n|\\r)/gm, \"\"));" +
" } else {" +
" AndroidBridge.setNotificationCount('0');" +
" }" +
" if (document.getElementById('conversation')) {" +
" var count = document.getElementById('conversation').innerHTML;" +
" AndroidBridge.setConversationCount(count.replace(/(\\r\\n|\\n|\\r)/gm, \"\"));" +
" } else {" +
" AndroidBridge.setConversationCount('0');" +
" }" +
"})();");
}
public static void getUserProfile(final WebView wv) { public static void getUserProfile(final WebView wv) {
// aspects":[{"id":124934,"name":"Friends","selected":true},{"id":124937,"name":"Liked me","selected":false},{"id":124938,"name":"Follow","selected":false},{"id":128327,"name":"Nur ich","selected":false}] // aspects":[{"id":124934,"name":"Friends","selected":true},{"id":124937,"name":"Liked me","selected":false},{"id":124938,"name":"Follow","selected":false},{"id":128327,"name":"Nur ich","selected":false}]
wv.loadUrl("javascript: ( function() {" + wv.loadUrl("javascript: ( function() {" +