ownSoft/BeWoPlaner
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

App: neue Chat-Bubbles, neue Avatare, neuer ImageConverter zum rundmachen der Avatare. Neuer Style

Browse Source
This commit is contained in:
staccatomamba
2016-10-07 12:40:16 +02:00
parent bbd26cca9c
commit c504e994cb
40 changed files with 383 additions and 292 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Android/BewoMitarbeiterApp/app/src/main/java/util/Util.java
View File

@@ -52,7 +52,7 @@ public class Util {
public static HashMap<ChatEntity, Integer> entity2MessagesCountRel = new HashMap<>();
//TODO: Notifications zählen. Bei Nachrichten verschiedener Unterhaltungen nur noch eine kleine Notification anzeigen mit "Sie haben x Nachrichten in y Unterhaltungen
public static void SetNotify(String username, String message, int recipientOid, boolean isTeam, String teamMemberOids, String teamMemberNames, Context packageContext) {
public static void SetNotify(String username, String message, int recipientOid, boolean isTeam, String teamMemberOids, String teamMemberNames, boolean isEmployee, Context packageContext) {
int unreadMessagesCount = entity2MessagesCountRel.size() + 1;
//TODO: unterscheiden, ob es sich um eine einzelne Benachrichtigung handelt
@@ -82,6 +82,7 @@ public class Util {
bundle.putBoolean("IsTeam", isTeam);
bundle.putString("TeamMemberOids", teamMemberOids);
bundle.putString("TeamMemberNames", teamMemberNames);
bundle.putBoolean("IsEmployee", isEmployee);
resultIntent.putExtras(bundle);
}
@@ -97,7 +98,7 @@ public class Util {
Random random = new Random();
int notificationId = 1;
ChatEntity chatEntity = new ChatEntity(recipientOid, isTeam);
ChatEntity chatEntity = new ChatEntity(recipientOid, isTeam, isEmployee);
@@ -238,7 +239,7 @@ public class Util {
public static ChatEntity getChatEntityFromOnlineEntitiesByOid(int personOid, boolean isTeam) {
for(ChatEntity item : SocketManager.onlineEntities) {
if(item.getOid() == personOid && item.isTeam() == isTeam) {
if(item.getOid() == personOid && item.getIsTeam() == isTeam) {
return item;
}
}