diff --git a/Android/BewoMitarbeiterApp/app/app.iml b/Android/BewoMitarbeiterApp/app/app.iml index 15f50eb78..b3e5de63c 100644 --- a/Android/BewoMitarbeiterApp/app/app.iml +++ b/Android/BewoMitarbeiterApp/app/app.iml @@ -84,7 +84,6 @@ - diff --git a/Android/BewoMitarbeiterApp/app/src/main/AndroidManifest.xml b/Android/BewoMitarbeiterApp/app/src/main/AndroidManifest.xml index 50eb6ffc4..c9a4c68fc 100644 --- a/Android/BewoMitarbeiterApp/app/src/main/AndroidManifest.xml +++ b/Android/BewoMitarbeiterApp/app/src/main/AndroidManifest.xml @@ -16,7 +16,8 @@ android:name=".SplashScreenActivity" android:theme="@android:style/Theme.NoTitleBar" android:configChanges="orientation" - android:screenOrientation="portrait"> + android:screenOrientation="portrait" + android:launchMode="singleTop"> diff --git a/Android/BewoMitarbeiterApp/app/src/main/java/Database/DatabaseHandler.java b/Android/BewoMitarbeiterApp/app/src/main/java/Database/DatabaseHandler.java index b4e87f4d3..eb4dd7e7d 100644 --- a/Android/BewoMitarbeiterApp/app/src/main/java/Database/DatabaseHandler.java +++ b/Android/BewoMitarbeiterApp/app/src/main/java/Database/DatabaseHandler.java @@ -51,7 +51,19 @@ public class DatabaseHandler extends SQLiteOpenHelper { private static final String KEY_TEAM_MEMBER_OIDS = "teammemberoids"; private static final String KEY_TEAM_MEMBER_NAMES = "teammembernames"; private static final String KEY_VERSION = "version"; + private static final String KEY_IS_EMPLOYEE = "isemployee"; + private static final String[] CONTACTS_COLUMNS = new String[] { + KEY_ID, + KEY_KONTAKT_NAME, + KEY_PERSONOID, + KEY_PICTURE_BLOB, + KEY_IS_TEAM, + KEY_TEAM_MEMBER_OIDS, + KEY_TEAM_MEMBER_NAMES, + KEY_VERSION, + KEY_IS_EMPLOYEE + }; // ChatMessage-Tabelle private static final String KEY_ID_CHATMESSAGE = "id"; @@ -100,7 +112,8 @@ public class DatabaseHandler extends SQLiteOpenHelper { KEY_IS_TEAM + " INTEGER, " + KEY_TEAM_MEMBER_NAMES + " TEXT, " + KEY_TEAM_MEMBER_OIDS + " TEXT, " + - KEY_VERSION + " INTEGER)"; + KEY_VERSION + " INTEGER, " + + KEY_IS_EMPLOYEE + " INTEGER)"; db.execSQL(CREATE_CONTACTS_TABLE); @@ -294,6 +307,7 @@ public class DatabaseHandler extends SQLiteOpenHelper { values.put(KEY_TEAM_MEMBER_NAMES, contact.teamMemberNames); values.put(KEY_TEAM_MEMBER_OIDS, contact.teamMemberOids); values.put(KEY_VERSION, contact.getVersion()); + values.put(KEY_IS_EMPLOYEE, contact.getIsEmployee()); writableDatabase.insertOrThrow(TABLE_CONTACTS, null, values); } @@ -422,15 +436,7 @@ public class DatabaseHandler extends SQLiteOpenHelper { SQLiteDatabase readableDatabase = this.getReadableDatabase(); Cursor cursor = readableDatabase.query(TABLE_CONTACTS, - new String[]{ - KEY_ID, - KEY_KONTAKT_NAME, - KEY_PERSONOID, - KEY_PICTURE_BLOB, - KEY_IS_TEAM, - KEY_TEAM_MEMBER_NAMES, - KEY_TEAM_MEMBER_OIDS, - KEY_VERSION}, + CONTACTS_COLUMNS, KEY_ID + "=?", new String[]{String.valueOf(id)}, null,null,null,null); @@ -446,8 +452,9 @@ public class DatabaseHandler extends SQLiteOpenHelper { String teamMemberOids = cursor.getString(5); String teamMemberNames = cursor.getString(6); int contactVersion = cursor.getInt(7); + boolean isEmployee = cursor.getInt(8) == 1; - ContactListItem contact = new ContactListItem(contactId, contactName, contactPersonOid, contactPicture, contactIsTeam, teamMemberOids, teamMemberNames, contactVersion); + ContactListItem contact = new ContactListItem(contactId, contactName, contactPersonOid, contactPicture, contactIsTeam, teamMemberOids, teamMemberNames, contactVersion, isEmployee); cursor.close(); @@ -476,6 +483,7 @@ public class DatabaseHandler extends SQLiteOpenHelper { contact.teamMemberNames = cursor.getString(5); contact.teamMemberOids = cursor.getString(6); contact.setVersion(cursor.getInt(7)); + contact.setIsEmployee(cursor.getInt(8) == 1); contactList.add(contact); } while (cursor.moveToNext()); @@ -529,6 +537,7 @@ public class DatabaseHandler extends SQLiteOpenHelper { values.put(KEY_TEAM_MEMBER_NAMES, contact.teamMemberNames); values.put(KEY_TEAM_MEMBER_OIDS, contact.teamMemberOids); values.put(KEY_VERSION, contact.getVersion()); + values.put(KEY_IS_EMPLOYEE, contact.getIsEmployee()); return writableDatabase.update(TABLE_CONTACTS, values, KEY_ID + " = ?", new String[] { String.valueOf(contact.getId()) }); } @@ -574,15 +583,7 @@ public class DatabaseHandler extends SQLiteOpenHelper { SQLiteDatabase readableDatabase = this.getReadableDatabase(); Cursor cursor = readableDatabase.query(TABLE_CONTACTS, - new String[]{ - KEY_ID, - KEY_KONTAKT_NAME, - KEY_PERSONOID, - KEY_PICTURE_BLOB, - KEY_IS_TEAM, - KEY_TEAM_MEMBER_NAMES, - KEY_TEAM_MEMBER_OIDS, - KEY_VERSION}, + CONTACTS_COLUMNS, KEY_PERSONOID + "=? AND " + KEY_IS_TEAM + "=?", new String[]{String.valueOf(personOid), String.valueOf((isTeam ? 1 : 0))}, null,null,null,null); @@ -597,8 +598,9 @@ public class DatabaseHandler extends SQLiteOpenHelper { String teamMemberOids = cursor.getString(5); String teamMemberNames = cursor.getString(6); int contactVersion = cursor.getInt(7); + boolean isEmployee = cursor.getInt(8) == 1; - ContactListItem contact = new ContactListItem(contactId, contactName, contactPersonOid, contactPicture, contactIsTeam, teamMemberOids, teamMemberNames, contactVersion); + ContactListItem contact = new ContactListItem(contactId, contactName, contactPersonOid, contactPicture, contactIsTeam, teamMemberOids, teamMemberNames, contactVersion, isEmployee); cursor.close(); diff --git a/Android/BewoMitarbeiterApp/app/src/main/java/beyondsoft/bewomitarbeiterapp/ChatActivity.java b/Android/BewoMitarbeiterApp/app/src/main/java/beyondsoft/bewomitarbeiterapp/ChatActivity.java index 5a2109b55..f8786db3b 100644 --- a/Android/BewoMitarbeiterApp/app/src/main/java/beyondsoft/bewomitarbeiterapp/ChatActivity.java +++ b/Android/BewoMitarbeiterApp/app/src/main/java/beyondsoft/bewomitarbeiterapp/ChatActivity.java @@ -80,6 +80,7 @@ public class ChatActivity extends ActionBarActivity implements ConnectivityRecei protected String teamMemberOids; protected String teamMemberNames; protected boolean isTeam; + protected boolean isEmployee; private SpiceManager spiceManager = new SpiceManager(UncachedSpiceService.class); @@ -139,11 +140,12 @@ public class ChatActivity extends ActionBarActivity implements ConnectivityRecei isTeam = zielkorb.getBoolean("IsTeam"); teamMemberOids = zielkorb.getString("TeamMemberOids"); teamMemberNames = zielkorb.getString("TeamMemberNames"); + isEmployee = zielkorb.getBoolean("IsEmployee"); - ReloadChatView(recipientName, recipientPersonOid, bildArray, isTeam, teamMemberOids, teamMemberNames); + ReloadChatView(recipientName, recipientPersonOid, bildArray, isTeam, teamMemberOids, teamMemberNames, isEmployee); } - private void ReloadChatView(String contactName, int recipientOid, byte[] contactImage, boolean pIsTeam, String pTeamMemberOids, String pTeamMemberNames) { + private void ReloadChatView(String contactName, int recipientOid, byte[] contactImage, boolean pIsTeam, String pTeamMemberOids, String pTeamMemberNames, boolean pIsEmployee) { chatMessages = new ArrayList<>(); recipientPersonOid = recipientOid; @@ -151,6 +153,7 @@ public class ChatActivity extends ActionBarActivity implements ConnectivityRecei isTeam = pIsTeam; teamMemberOids = pTeamMemberOids; teamMemberNames = pTeamMemberNames; + isEmployee = pIsEmployee; ImageView status = (ImageView) mCustomView.findViewById(R.id.status); TextView titlename = (TextView) mCustomView.findViewById(R.id.PersonalName); @@ -189,7 +192,7 @@ public class ChatActivity extends ActionBarActivity implements ConnectivityRecei adapter.sort(DATE_COMPARATOR); adapter.notifyDataSetChanged(); } else { - Util.SetNotify(chatPacket.ChatName, chatPacket.ChatMessage, chatPacket.SenderPersonOid, false, null, null, getApplicationContext()); + Util.SetNotify(chatPacket.ChatName, chatPacket.ChatMessage, chatPacket.SenderPersonOid, false, null, null, chatPacket.IsEmployee, getApplicationContext()); } } }); @@ -228,7 +231,7 @@ public class ChatActivity extends ActionBarActivity implements ConnectivityRecei adapter.sort(DATE_COMPARATOR); adapter.notifyDataSetChanged(); } else { - Util.SetNotify(chatPacket.ChatName, chatPacket.ChatMessage, chatPacket.RecipientPersonOid, true, teamMemberOids, teamMemberNames, getApplicationContext()); + Util.SetNotify(chatPacket.ChatName, chatPacket.ChatMessage, chatPacket.RecipientPersonOid, true, teamMemberOids, teamMemberNames, chatPacket.IsEmployee, getApplicationContext()); } } }); @@ -311,7 +314,7 @@ public class ChatActivity extends ActionBarActivity implements ConnectivityRecei NotificationManager mNotifyMgr = (NotificationManager) getApplicationContext().getSystemService(Context.NOTIFICATION_SERVICE); - ChatEntity entity = new ChatEntity(recipientOid, isTeam); + ChatEntity entity = new ChatEntity(recipientOid, isTeam, isEmployee); if(SocketManager.notificationEntities.get(entity) != null) { mNotifyMgr.cancel(SocketManager.notificationEntities.get(entity).getNotificationId()); @@ -386,12 +389,13 @@ public class ChatActivity extends ActionBarActivity implements ConnectivityRecei boolean blahIsTeam = zielkorb.getBoolean("IsTeam"); String tMemberOids = zielkorb.getString("TeamMemberOids"); String tMemberNames = zielkorb.getString("TeamMemberNames"); + boolean blahIsEmployee = zielkorb.getBoolean("IsEmployee"); byte[] imageAsByteArray = databaseHandler.getUserImage(rpoid); Log.i("ON_NEW_INTENT", "Erzeuge neuen Intent"); - ReloadChatView(rn, rpoid, imageAsByteArray, blahIsTeam, tMemberOids, tMemberNames); + ReloadChatView(rn, rpoid, imageAsByteArray, blahIsTeam, tMemberOids, tMemberNames, blahIsEmployee); } private Bitmap GetCircleBitmap(Bitmap bitmap) { diff --git a/Android/BewoMitarbeiterApp/app/src/main/java/beyondsoft/bewomitarbeiterapp/ContactListItem.java b/Android/BewoMitarbeiterApp/app/src/main/java/beyondsoft/bewomitarbeiterapp/ContactListItem.java index 39300222a..eff0224cb 100644 --- a/Android/BewoMitarbeiterApp/app/src/main/java/beyondsoft/bewomitarbeiterapp/ContactListItem.java +++ b/Android/BewoMitarbeiterApp/app/src/main/java/beyondsoft/bewomitarbeiterapp/ContactListItem.java @@ -11,9 +11,10 @@ public class ContactListItem { private byte[] mPicture; private int mPersonOid; private int mVersion; + private boolean mIsEmployee; public boolean isTeam; - public boolean isOnline; + boolean isOnline; public String teamMemberOids; public String teamMemberNames; @@ -22,25 +23,27 @@ public class ContactListItem { public ContactListItem(){} - public ContactListItem(int id, String kontaktname, int personOid, byte[] picture, boolean isTeam, String teamMemberOids, String teamMemberNames, int version){ - this.mId = id; - this.mChatName = kontaktname; - this.mPersonOid = personOid; - this.mPicture = picture; - this.isTeam = isTeam; + public ContactListItem(int id, String kontaktname, int personOid, byte[] picture, boolean isTeam, String teamMemberOids, String teamMemberNames, int version, boolean isEmployee){ + this.mId = id; + this.mChatName = kontaktname; + this.mPersonOid = personOid; + this.mPicture = picture; + this.isTeam = isTeam; this.teamMemberNames = teamMemberNames; - this.teamMemberOids = teamMemberOids; - this.mVersion = version; + this.teamMemberOids = teamMemberOids; + this.mVersion = version; + this.mIsEmployee = isEmployee; } - public ContactListItem(String kontaktname, int personOid, boolean isTeam, String teamMemberOids, String teamMemberNames, int version){ - this.mChatName = kontaktname; - this.mPersonOid = personOid; - this.mPicture = null; - this.isTeam = isTeam; + ContactListItem(String kontaktname, int personOid, boolean isTeam, String teamMemberOids, String teamMemberNames, int version, boolean isEmployee){ + this.mChatName = kontaktname; + this.mPersonOid = personOid; + this.mPicture = null; + this.isTeam = isTeam; this.teamMemberNames = teamMemberNames; - this.teamMemberOids = teamMemberOids; - this.mVersion = version; + this.teamMemberOids = teamMemberOids; + this.mVersion = version; + this.mIsEmployee = isEmployee; } public int getId(){ @@ -90,22 +93,30 @@ public class ContactListItem { this.mVersion = mVersion; } - public String getMessagePreview() { + String getMessagePreview() { return messagePreview; } - public void setMessagePreview(String message) { + void setMessagePreview(String message) { messagePreview = message; } - public boolean getIsNewMessage2Preview() { + boolean getIsNewMessage2Preview() { return isNewMessage2Preview; } - public void setIsNewMessage2Preview(boolean isNewMessage2Preview) { + void setIsNewMessage2Preview(boolean isNewMessage2Preview) { this.isNewMessage2Preview = isNewMessage2Preview; } + public boolean getIsEmployee() { + return mIsEmployee; + } + + public void setIsEmployee(boolean newValue) { + mIsEmployee = newValue; + } + @Override public String toString() { String result = ""; @@ -120,11 +131,12 @@ public class ContactListItem { } result += "\nVersion: " + mVersion; + result += "\nIsEmployee: " + mIsEmployee; return result; } public Boolean compareToChatPerson(ChatPerson chatPerson) { - return mPersonOid == chatPerson.Oid && isTeam == chatPerson.IsTeam; + return mPersonOid == chatPerson.Oid && isTeam == chatPerson.IsTeam && mIsEmployee == chatPerson.IsEmployee; } } diff --git a/Android/BewoMitarbeiterApp/app/src/main/java/beyondsoft/bewomitarbeiterapp/KontaktAdapter.java b/Android/BewoMitarbeiterApp/app/src/main/java/beyondsoft/bewomitarbeiterapp/KontaktAdapter.java index e0d654aea..fcc154281 100644 --- a/Android/BewoMitarbeiterApp/app/src/main/java/beyondsoft/bewomitarbeiterapp/KontaktAdapter.java +++ b/Android/BewoMitarbeiterApp/app/src/main/java/beyondsoft/bewomitarbeiterapp/KontaktAdapter.java @@ -11,6 +11,8 @@ import android.graphics.PorterDuff; import android.graphics.PorterDuffXfermode; import android.graphics.Rect; import android.graphics.RectF; +import android.support.annotation.NonNull; +import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -20,6 +22,8 @@ import android.widget.TextView; import java.util.ArrayList; +import util.ImageConverter; + /** * Created by bib on 03.05.2016. */ @@ -28,14 +32,8 @@ public class KontaktAdapter extends ArrayAdapter { private final Context context; final ArrayList values; - private Bitmap bitmaping; + private Bitmap bitmaping; private ImageView imageView; - private TextView messagePreview; - private TextView minitext; - - public void setMinitext(TextView minitext) { - this.minitext = minitext; - } KontaktAdapter(Context context, ArrayList values) { super(context, R.layout.kontakt_list_chat, values); @@ -43,16 +41,17 @@ public class KontaktAdapter extends ArrayAdapter { this.values = values; } + @NonNull @Override - public View getView(int position, View convertView, ViewGroup parent) { + public View getView(int position, View convertView, @NonNull ViewGroup parent) { LayoutInflater inflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE); - View rowView = inflater.inflate(R.layout.contact_listview_item, parent, false); - TextView textView = (TextView) rowView.findViewById(R.id.label); - minitext = (TextView) rowView.findViewById(R.id.subtitle); - messagePreview = (TextView) rowView.findViewById(R.id.messagePreview); - ImageView onlinestats = (ImageView) rowView.findViewById(R.id.status); - imageView = (ImageView) rowView.findViewById(R.id.logo); + View rowView = inflater.inflate(R.layout.contact_listview_item, parent, false); + TextView textView = (TextView) rowView.findViewById(R.id.label); + TextView minitext = (TextView) rowView.findViewById(R.id.subtitle); + TextView messagePreview = (TextView) rowView.findViewById(R.id.messagePreview); + ImageView onlinestats = (ImageView) rowView.findViewById(R.id.status); + imageView = (ImageView) rowView.findViewById(R.id.logo); textView.setText(values.get(position).getChatName()); @@ -65,7 +64,7 @@ public class KontaktAdapter extends ArrayAdapter { Thread getPic; if(values.get(position).getPicture() != null) { - + Log.i("Kontakt", "PersonOid hat Bild"); byte[] imageAsByteArray = values.get(position).getPicture(); Bitmap i = BitmapFactory.decodeByteArray(imageAsByteArray, 0, imageAsByteArray.length); @@ -73,10 +72,23 @@ public class KontaktAdapter extends ArrayAdapter { getPic = new Thread(new CircleBitmapCreator(i)); getPic.start(); } else { - Bitmap bitmap = decodeSampledBitmapFromResource(inflater.getContext().getResources(), R.drawable.katze3, 100, 100);//BitmapFactory.decodeResource(inflater.getContext().getResources(), R.drawable.katze3); + ContactListItem cli = values.get(position); - getPic = new Thread(new CircleBitmapCreator(bitmap)); - getPic.start(); + int bildId = R.drawable.mitarbeiter_avatar; + String blah = "Mitarbeiter"; + + if(cli.isTeam) { + bildId = R.drawable.mitarbeiter_team_avatar; + blah = "Team"; + } else if(!cli.getIsEmployee()) { + bildId = R.drawable.klient_avatar; + blah = "Klient"; + } + + Log.i("KONTAKT_ADAPTER", "Kontakt hat KEIN Bild. Benutze Standardbild. Kontakt ist " + blah + "; Id: " + bildId); + Bitmap bitmap = decodeSampledBitmapFromResource(inflater.getContext().getResources(), bildId, 100, 100); + + imageView.setImageBitmap(ImageConverter.getRoundedCornerBitmap(bitmap, bitmap.getWidth() / 2)); } onlinestats.setImageResource((values.get(position).isOnline ? R.drawable.statusonline : R.drawable.statusoffline)); diff --git a/Android/BewoMitarbeiterApp/app/src/main/java/beyondsoft/bewomitarbeiterapp/KontaktChatActivity.java b/Android/BewoMitarbeiterApp/app/src/main/java/beyondsoft/bewomitarbeiterapp/KontaktChatActivity.java index 739c60107..7e5f1c129 100644 --- a/Android/BewoMitarbeiterApp/app/src/main/java/beyondsoft/bewomitarbeiterapp/KontaktChatActivity.java +++ b/Android/BewoMitarbeiterApp/app/src/main/java/beyondsoft/bewomitarbeiterapp/KontaktChatActivity.java @@ -91,13 +91,14 @@ public class KontaktChatActivity extends ActionBarActivity implements Connectivi bundle.putBoolean("IsTeam", selectedValue.isTeam); bundle.putString("TeamMemberOids", selectedValue.teamMemberOids); bundle.putString("TeamMemberNames", selectedValue.teamMemberNames); + bundle.putBoolean("IsEmployee", selectedValue.getIsEmployee()); Intent in = new Intent(getBaseContext(), ChatActivity.class); in.putExtras(bundle); if(selectedValue.getPicture() == null) { ByteArrayOutputStream stream = new ByteArrayOutputStream(); - Bitmap a = BitmapFactory.decodeResource(getResources(), R.drawable.katze3); + Bitmap a = BitmapFactory.decodeResource(getResources(), R.drawable.mitarbeiter_avatar); a.compress(Bitmap.CompressFormat.JPEG,0,stream); byte[] x = stream.toByteArray(); in.putExtra("Bild", x); @@ -160,7 +161,7 @@ public class KontaktChatActivity extends ActionBarActivity implements Connectivi try { switch(chatPacket.ChatDataIdentifier) { case MESSAGE: - Util.SetNotify(chatPacket.ChatName, chatPacket.ChatMessage, chatPacket.SenderPersonOid, false, null, null, getApplicationContext()); + Util.SetNotify(chatPacket.ChatName, chatPacket.ChatMessage, chatPacket.SenderPersonOid, false, null, null, chatPacket.IsEmployee, getApplicationContext()); runOnUiThread(new Runnable() { @Override @@ -185,7 +186,7 @@ public class KontaktChatActivity extends ActionBarActivity implements Connectivi case TEAM: ContactListItem cli = DatabaseHandler.getInstance(getApplicationContext()).getContactByPersonOid(chatPacket.RecipientPersonOid, true); - Util.SetNotify(chatPacket.ChatName, chatPacket.ChatMessage, chatPacket.RecipientPersonOid, true, cli.teamMemberOids, cli.teamMemberNames, getApplicationContext()); + Util.SetNotify(chatPacket.ChatName, chatPacket.ChatMessage, chatPacket.RecipientPersonOid, true, cli.teamMemberOids, cli.teamMemberNames, cli.getIsEmployee(), getApplicationContext()); runOnUiThread(new Runnable() { @Override @@ -353,12 +354,16 @@ public class KontaktChatActivity extends ActionBarActivity implements Connectivi } @Override - public void onBackPressed() - { - SocketManager.logout(); + public void onBackPressed() { +// SocketManager.logout(); +// +// Intent intent = new Intent(KontaktChatActivity.this, LoginActivity.class); +// KontaktChatActivity.this.startActivity(intent); - Intent intent = new Intent(KontaktChatActivity.this, LoginActivity.class); - KontaktChatActivity.this.startActivity(intent); + Intent i = new Intent(); + i.setAction(Intent.ACTION_MAIN); + i.addCategory(Intent.CATEGORY_HOME); + this.startActivity(i); super.onBackPressed(); } @@ -419,7 +424,7 @@ public class KontaktChatActivity extends ActionBarActivity implements Connectivi @Override public void onRequestSuccess(SoapPrimitive soapPrimitive) { if(soapPrimitive == null) { - Log.e("KONTAKT_CHAT_ACTIVITY", "Der vom Server zurückgelieferte Wert ist NULL! (Laden der Kontakte)"); + Log.e(LOGTAG, "Der vom Server zurückgelieferte Wert ist NULL! (Laden der Kontakte)"); return; } @@ -434,16 +439,22 @@ public class KontaktChatActivity extends ActionBarActivity implements Connectivi Map oid2VersionList = new HashMap<>(); for(ContactListItem item : lc) { - Log.i(LOGTAG, "Aus DB: Oid: " + item.getPersonOid() + "; Version: " + item.getVersion() + "; " + item.getChatName()); - oid2VersionList.put(new ChatEntity(item.getPersonOid(), item.isTeam), item.getVersion()); + oid2VersionList.put(new ChatEntity(item.getPersonOid(), item.isTeam, item.getIsEmployee()), item.getVersion()); + } + + for(Map.Entry entry : oid2VersionList.entrySet()) { + ChatEntity key = entry.getKey(); + Log.i(LOGTAG, "\nOid: " + key.getOid() + "\nIsTeam: " + key.getIsTeam() + "\nIsEmployee: " + key.getIsEmployee()); } for(ChatPerson cp : result) { - ContactListItem contact = new ContactListItem(cp.Name, cp.Oid, cp.IsTeam, cp.TeamMemberOids, cp.TeamMemberNames, cp.Version); + Log.i(LOGTAG, cp.Name + " " + cp.IsEmployee); + ContactListItem contact = new ContactListItem(cp.Name, cp.Oid, cp.IsTeam, cp.TeamMemberOids, cp.TeamMemberNames, cp.Version, cp.IsEmployee); - ChatEntity cliEntity = new ChatEntity(cp.Oid, cp.IsTeam); + ChatEntity cliEntity = new ChatEntity(cp.Oid, cp.IsTeam, cp.IsEmployee); if(!oid2VersionList.containsKey(cliEntity)) { + Log.i(LOGTAG, "Nicht in der Klientenliste enthalten"); databaseHandler.addContact(contact); } else if(oid2VersionList.get(cliEntity) < cp.Version) { diff --git a/Android/BewoMitarbeiterApp/app/src/main/java/beyondsoft/bewomitarbeiterapp/LoginActivity.java b/Android/BewoMitarbeiterApp/app/src/main/java/beyondsoft/bewomitarbeiterapp/LoginActivity.java index bdbfd69b7..16a99af8b 100644 --- a/Android/BewoMitarbeiterApp/app/src/main/java/beyondsoft/bewomitarbeiterapp/LoginActivity.java +++ b/Android/BewoMitarbeiterApp/app/src/main/java/beyondsoft/bewomitarbeiterapp/LoginActivity.java @@ -143,6 +143,25 @@ public class LoginActivity extends ActionBarActivity { super.onStop(); } + @Override + public void onPause() { + super.onPause(); + BeWoChatApplication.activityPaused(); + } + + @Override + protected void onResume() { + BeWoChatApplication.activityResumed(); + + if(SoapConnectionManager.User != null) { + Log.i("LOGIN", "Benutzer ist angemeldet"); + } else { + Log.i("LOGIN", "Benutzer ist NICHT angemeldet"); + } + + super.onResume(); + } + private void attemptLogin() { mTenantView.setError(null); mChatCodeView.setError(null); @@ -307,6 +326,13 @@ public class LoginActivity extends ActionBarActivity { public void doCallback() { Log.e("LOGIN_CALLBACK", "LoginCallback aufgerufen. Ist verbunden und ruft die ChatActivity nun auf."); + runOnUiThread(new Runnable() { + @Override + public void run() { + showProgress(false); + } + }); + Intent kontaktChatActivity = new Intent(LoginActivity.this, KontaktChatActivity.class); LoginActivity.this.startActivity(kontaktChatActivity); } diff --git a/Android/BewoMitarbeiterApp/app/src/main/java/beyondsoft/bewomitarbeiterapp/MainActivityMitarbeiter.java b/Android/BewoMitarbeiterApp/app/src/main/java/beyondsoft/bewomitarbeiterapp/MainActivityMitarbeiter.java index 27253332b..e65a15512 100644 --- a/Android/BewoMitarbeiterApp/app/src/main/java/beyondsoft/bewomitarbeiterapp/MainActivityMitarbeiter.java +++ b/Android/BewoMitarbeiterApp/app/src/main/java/beyondsoft/bewomitarbeiterapp/MainActivityMitarbeiter.java @@ -62,7 +62,7 @@ public class MainActivityMitarbeiter extends Activity implements ConnectivityRec public void updateUserInterface(Packet chatPacket) { switch(chatPacket.ChatDataIdentifier) { case MESSAGE: - Util.SetNotify(chatPacket.ChatName, chatPacket.ChatMessage, chatPacket.SenderPersonOid, false, null, null, getApplicationContext()); + Util.SetNotify(chatPacket.ChatName, chatPacket.ChatMessage, chatPacket.SenderPersonOid, false, null, null, chatPacket.IsEmployee, getApplicationContext()); break; @@ -101,7 +101,7 @@ public class MainActivityMitarbeiter extends Activity implements ConnectivityRec case TEAM: ContactListItem cli = DatabaseHandler.getInstance(getApplicationContext()).getContactByPersonOid(chatPacket.RecipientPersonOid, true); - Util.SetNotify(chatPacket.ChatName, chatPacket.ChatMessage, chatPacket.RecipientPersonOid, true, cli.teamMemberOids, cli.teamMemberNames, getApplicationContext()); + Util.SetNotify(chatPacket.ChatName, chatPacket.ChatMessage, chatPacket.RecipientPersonOid, true, cli.teamMemberOids, cli.teamMemberNames, cli.getIsEmployee(), getApplicationContext()); break; } } diff --git a/Android/BewoMitarbeiterApp/app/src/main/java/entities/ChatEntity.java b/Android/BewoMitarbeiterApp/app/src/main/java/entities/ChatEntity.java index a524f6ce5..ee63dd340 100644 --- a/Android/BewoMitarbeiterApp/app/src/main/java/entities/ChatEntity.java +++ b/Android/BewoMitarbeiterApp/app/src/main/java/entities/ChatEntity.java @@ -6,20 +6,24 @@ package entities; public class ChatEntity { private long oid; private boolean isTeam; + private boolean isEmployee; - public ChatEntity(long pOid, boolean pIsTeam) { + public ChatEntity(long pOid, boolean pIsTeam, boolean pIsEmployee) { oid = pOid; isTeam = pIsTeam; + isEmployee = pIsEmployee; } public long getOid() { return oid; } - public boolean isTeam() { + public boolean getIsTeam() { return isTeam; } + public boolean getIsEmployee() {return isEmployee;} + @Override public boolean equals(Object other) { if(other == null || !(other instanceof ChatEntity)) { @@ -32,13 +36,14 @@ public class ChatEntity { ChatEntity otherEntity = (ChatEntity) other; - return this.oid == otherEntity.getOid() && this.isTeam == otherEntity.isTeam(); + return this.oid == otherEntity.getOid() && this.isTeam == otherEntity.getIsTeam() && this.isEmployee == otherEntity.getIsEmployee(); } @Override public int hashCode() { int result = (int) (oid ^ (oid >>> 32)); result = 31 * result + (isTeam ? 1 : 0); + result = 31 * result + (isEmployee ? 1 : 0); return result; } } diff --git a/Android/BewoMitarbeiterApp/app/src/main/java/entities/ChatPerson.java b/Android/BewoMitarbeiterApp/app/src/main/java/entities/ChatPerson.java index c4b450d03..6e2261ff0 100644 --- a/Android/BewoMitarbeiterApp/app/src/main/java/entities/ChatPerson.java +++ b/Android/BewoMitarbeiterApp/app/src/main/java/entities/ChatPerson.java @@ -10,4 +10,5 @@ public class ChatPerson { public String TeamMemberNames; public String TeamMemberOids; public int Version; + public boolean IsEmployee; } diff --git a/Android/BewoMitarbeiterApp/app/src/main/java/soapConnection/ApplicationUser.java b/Android/BewoMitarbeiterApp/app/src/main/java/soapConnection/ApplicationUser.java index e2a83ef7a..afae4946a 100644 --- a/Android/BewoMitarbeiterApp/app/src/main/java/soapConnection/ApplicationUser.java +++ b/Android/BewoMitarbeiterApp/app/src/main/java/soapConnection/ApplicationUser.java @@ -7,6 +7,7 @@ public class ApplicationUser { private String fullName; private String username; private Long employeeOid; + private Long customerOid; private Long personOid; private String tenant; @@ -50,6 +51,10 @@ public class ApplicationUser { this.personOid = personOid; } + public boolean getIsEmployee() { + return employeeOid == 0 && customerOid > 0; + } + public ApplicationUser(String fullName, String username, Long employeeOid, Long personOid) { this.fullName = fullName; this.username = username; diff --git a/Android/BewoMitarbeiterApp/app/src/main/java/soapConnection/Packet.java b/Android/BewoMitarbeiterApp/app/src/main/java/soapConnection/Packet.java index afb72f363..6c76eb267 100644 --- a/Android/BewoMitarbeiterApp/app/src/main/java/soapConnection/Packet.java +++ b/Android/BewoMitarbeiterApp/app/src/main/java/soapConnection/Packet.java @@ -25,6 +25,7 @@ public class Packet { public boolean IsDelivered; public int ServerseitigeOid; public int ClientseitigeOid; + public boolean IsEmployee; public Packet() { ChatDataIdentifier = DataIdentifier.NULL; @@ -35,6 +36,7 @@ public class Packet { RecipientPersonOid = 0; IsDelivered = false; MessageTimeStamp = Calendar.getInstance().getTime(); + IsEmployee = SoapConnectionManager.User.getIsEmployee(); } public String getFormattedMessageTimeStamp() { @@ -44,7 +46,7 @@ public class Packet { //Aufbau Message: // die ersten fünf ";" ignorieren - // SenderOid;RecipientOid;ClientNameLength;MessageLength;ChatDataIdentifier;ServerseitigeOid;ClientseitigeOid;Tenant;[ClientName][ChatMessage][MessageTimeStamp][IsDelivered] + // SenderOid;RecipientOid;ClientNameLength;MessageLength;ChatDataIdentifier;ServerseitigeOid;ClientseitigeOid;Tenant;IsEmployee;[ClientName][ChatMessage][MessageTimeStamp][IsDelivered] //23;281;20;389;1;38;932[Tenant]; 8 Semikola @@ -61,18 +63,20 @@ public class Packet { String serverseitigeOidString = gesplittet[5]; String clientseitigeOidString = gesplittet[6]; Tenant = gesplittet[7]; + String isEmployeeString = gesplittet[8]; SenderPersonOid = Integer.parseInt(senderPersonOidString); RecipientPersonOid = Integer.parseInt(recipientPersonOidString); ServerseitigeOid = Integer.parseInt(serverseitigeOidString); ClientseitigeOid = Integer.parseInt(clientseitigeOidString); + IsEmployee = Integer.parseInt(isEmployeeString) == 1; ChatDataIdentifier = DataIdentifier.getEnumValue(Integer.parseInt(chatIdentifierString)); int chatNameLength = Integer.parseInt(chatNameLengthString); int chatMessageLength = Integer.parseInt(chatMessageLengthString); - int headerLength = senderPersonOidString.length() + recipientPersonOidString.length() + chatNameLengthString.length() + chatMessageLengthString.length() + chatIdentifierString.length() + Tenant.length() + serverseitigeOidString.length() + clientseitigeOidString.length() + 9; + int headerLength = senderPersonOidString.length() + recipientPersonOidString.length() + chatNameLengthString.length() + chatMessageLengthString.length() + chatIdentifierString.length() + Tenant.length() + serverseitigeOidString.length() + clientseitigeOidString.length() + 10; String actualMessage = message.substring(headerLength - 1); ChatName = actualMessage.substring(0, chatNameLength); @@ -82,6 +86,7 @@ public class Packet { String dateString = actualMessage.substring(chatMessageLength + chatNameLength); DateFormat df = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss", Locale.GERMAN); + try { MessageTimeStamp = df.parse(dateString); } catch (ParseException e) { @@ -94,7 +99,7 @@ public class Packet { } public byte[] getDataStream() { - String dataStreamAsString = "" + SenderPersonOid + ";" + RecipientPersonOid + ";" + ChatName.length() + ";" + ChatMessage.length()+ ";" + ChatDataIdentifier.getValue() + ";" + ServerseitigeOid + ";" + ClientseitigeOid + ";" + Tenant + ";"; + String dataStreamAsString = "" + SenderPersonOid + ";" + RecipientPersonOid + ";" + ChatName.length() + ";" + ChatMessage.length()+ ";" + ChatDataIdentifier.getValue() + ";" + ServerseitigeOid + ";" + ClientseitigeOid + ";" + Tenant + ";" + (IsEmployee ? 1 : 0) + ";"; dataStreamAsString += ChatName + ChatMessage + getFormattedMessageTimeStamp() + "" + (IsDelivered ? 1 : 0); @@ -111,7 +116,7 @@ public class Packet { return blaaah; } - public void writeToLog(String prefix) { - Log.i("PACKET_LOG", prefix + ": SenderPersonOid: " + SenderPersonOid + "\nRecipientPersonOid: " + RecipientPersonOid + "\nChatDataIdentifier: " + ChatDataIdentifier.name() + "\nChatName: " + ChatName + "\nChatMessage: " + ChatMessage + "\nTenant: " + Tenant + "\nIsDelivered: " + IsDelivered + "\nMessageTimeStamp: " + MessageTimeStamp + "\nServerseitigeOid: " + ServerseitigeOid + "\nClientseitigeOid: " + ClientseitigeOid); + private void writeToLog(String prefix) { + Log.i("PACKET_LOG", prefix + ": SenderPersonOid: " + SenderPersonOid + "\nRecipientPersonOid: " + RecipientPersonOid + "\nChatDataIdentifier: " + ChatDataIdentifier.name() + "\nChatName: " + ChatName + "\nChatMessage: " + ChatMessage + "\nTenant: " + Tenant + "\nIsDelivered: " + IsDelivered + "\nMessageTimeStamp: " + MessageTimeStamp + "\nServerseitigeOid: " + ServerseitigeOid + "\nClientseitigeOid: " + ClientseitigeOid + "\nIsEmployee: " + IsEmployee); } } diff --git a/Android/BewoMitarbeiterApp/app/src/main/java/soapConnection/SoapCalls.java b/Android/BewoMitarbeiterApp/app/src/main/java/soapConnection/SoapCalls.java index 38d8e35e3..8770df27f 100644 --- a/Android/BewoMitarbeiterApp/app/src/main/java/soapConnection/SoapCalls.java +++ b/Android/BewoMitarbeiterApp/app/src/main/java/soapConnection/SoapCalls.java @@ -12,24 +12,24 @@ public class SoapCalls { public static String KEEP_ALIVE = "KeepAlive"; //TODO: "app4.bewoplaner.de";// -// public static String DESTINATION_ADDRESS = "app4.bewoplaner.de"; -// public static int DESTINATION_PORT = 5000; -// -// public static String TOKEN_CHECK_URL = "https://" + DESTINATION_ADDRESS + "/mobil/main/checktoken?token="; -// -// public static String WEB_DOKU_URL = "https://" + DESTINATION_ADDRESS + "/mobil/login/demo"; -// -// public static String WSDL_TARGET_NAME = "bliblablubb.org/"; -// public static String SOAP_ADDRESS = "https://" + DESTINATION_ADDRESS + "/BeWoPlanerAndroid/AndroidSoapService.asmx"; - - - public static String DESTINATION_ADDRESS = "192.168.1.103"; + public static String DESTINATION_ADDRESS = "app4.bewoplaner.de"; public static int DESTINATION_PORT = 5000; - public static String TOKEN_CHECK_URL = "http://" + DESTINATION_ADDRESS + "/bewoplanermobil/main/checktoken?token="; + public static String TOKEN_CHECK_URL = "https://" + DESTINATION_ADDRESS + "/mobil/main/checktoken?token="; - public static String WEB_DOKU_URL = "http://" + DESTINATION_ADDRESS + "/bewoplanermobil/login/demo"; + public static String WEB_DOKU_URL = "https://" + DESTINATION_ADDRESS + "/mobil/login/demo"; - static String WSDL_TARGET_NAME = "bliblablubb.org/"; - static String SOAP_ADDRESS = "http://" + DESTINATION_ADDRESS + "/BeWoPlanerAndroid/AndroidSoapService.asmx"; + public static String WSDL_TARGET_NAME = "bliblablubb.org/"; + public static String SOAP_ADDRESS = "https://" + DESTINATION_ADDRESS + "/BeWoPlanerAndroid/AndroidSoapService.asmx"; + + +// public static String DESTINATION_ADDRESS = "192.168.1.103"; +// public static int DESTINATION_PORT = 5000; +// +// public static String TOKEN_CHECK_URL = "http://" + DESTINATION_ADDRESS + "/bewoplanermobil/main/checktoken?token="; +// +// public static String WEB_DOKU_URL = "http://" + DESTINATION_ADDRESS + "/bewoplanermobil/login/demo"; +// +// static String WSDL_TARGET_NAME = "bliblablubb.org/"; +// static String SOAP_ADDRESS = "http://" + DESTINATION_ADDRESS + "/BeWoPlanerAndroid/AndroidSoapService.asmx"; } diff --git a/Android/BewoMitarbeiterApp/app/src/main/java/tcpConnection/SocketManager.java b/Android/BewoMitarbeiterApp/app/src/main/java/tcpConnection/SocketManager.java index 727b9a482..b82d1b854 100644 --- a/Android/BewoMitarbeiterApp/app/src/main/java/tcpConnection/SocketManager.java +++ b/Android/BewoMitarbeiterApp/app/src/main/java/tcpConnection/SocketManager.java @@ -259,7 +259,7 @@ public class SocketManager { } if(!isAlreadyLoggedIn) { - SocketManager.onlineEntities.add(new ChatEntity(chatPacket.SenderPersonOid, false)); + SocketManager.onlineEntities.add(new ChatEntity(chatPacket.SenderPersonOid, false, chatPacket.IsEmployee)); } break; diff --git a/Android/BewoMitarbeiterApp/app/src/main/java/util/ImageConverter.java b/Android/BewoMitarbeiterApp/app/src/main/java/util/ImageConverter.java new file mode 100644 index 000000000..1381f83f7 --- /dev/null +++ b/Android/BewoMitarbeiterApp/app/src/main/java/util/ImageConverter.java @@ -0,0 +1,37 @@ +package util; + +/** + * Created by JettenM on 07.10.2016. + */ + +import android.graphics.Bitmap; +import android.graphics.Canvas; +import android.graphics.Paint; +import android.graphics.PorterDuff; +import android.graphics.PorterDuffXfermode; +import android.graphics.Rect; +import android.graphics.RectF; + + +public class ImageConverter { + public static Bitmap getRoundedCornerBitmap(Bitmap bitmap, int pixels) { + Bitmap output = Bitmap.createBitmap(bitmap.getWidth(), bitmap.getHeight(), Bitmap.Config.ARGB_8888); + Canvas canvas = new Canvas(output); + + final int color = 0xff424242; + final Paint paint = new Paint(); + final Rect rect = new Rect(0, 0, bitmap.getWidth(), bitmap.getHeight()); + final RectF rectF = new RectF(rect); + final float roundPx = pixels; + + paint.setAntiAlias(true); + canvas.drawARGB(0, 0, 0, 0); + paint.setColor(color); + canvas.drawRoundRect(rectF, roundPx, roundPx, paint); + + paint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.SRC_IN)); + canvas.drawBitmap(bitmap, rect, rect, paint); + + return output; + } +} diff --git a/Android/BewoMitarbeiterApp/app/src/main/java/util/NotificationBroadcastReceiver.java b/Android/BewoMitarbeiterApp/app/src/main/java/util/NotificationBroadcastReceiver.java index ba1f8a40d..a8ddbb783 100644 --- a/Android/BewoMitarbeiterApp/app/src/main/java/util/NotificationBroadcastReceiver.java +++ b/Android/BewoMitarbeiterApp/app/src/main/java/util/NotificationBroadcastReceiver.java @@ -21,11 +21,12 @@ public class NotificationBroadcastReceiver extends BroadcastReceiver { { Log.i("NOTIFICATION_CANCELLED", "Benachrichtigung gelöscht"); - Bundle extras = intent.getExtras(); - int recipientOid = extras.getInt("RecipientOid"); - boolean isTeam = extras.getBoolean("IsTeam"); + Bundle extras = intent.getExtras(); + int recipientOid = extras.getInt("RecipientOid"); + boolean isTeam = extras.getBoolean("IsTeam"); + boolean isEmployee = extras.getBoolean("IsEmployee"); - Util.removeMessagesCount(new ChatEntity(recipientOid, isTeam)); + Util.removeMessagesCount(new ChatEntity(recipientOid, isTeam, isEmployee)); Util.conversationsCount = 0; SocketManager.notificationEntities.clear(); diff --git a/Android/BewoMitarbeiterApp/app/src/main/java/util/Util.java b/Android/BewoMitarbeiterApp/app/src/main/java/util/Util.java index 12c12e28a..c34f58e96 100644 --- a/Android/BewoMitarbeiterApp/app/src/main/java/util/Util.java +++ b/Android/BewoMitarbeiterApp/app/src/main/java/util/Util.java @@ -52,7 +52,7 @@ public class Util { public static HashMap 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; } } diff --git a/Android/BewoMitarbeiterApp/app/src/main/res/drawable/bewo_checkbox.xml b/Android/BewoMitarbeiterApp/app/src/main/res/drawable/bewo_checkbox.xml deleted file mode 100644 index 97780be54..000000000 --- a/Android/BewoMitarbeiterApp/app/src/main/res/drawable/bewo_checkbox.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Android/BewoMitarbeiterApp/app/src/main/res/drawable/edittext.xml b/Android/BewoMitarbeiterApp/app/src/main/res/drawable/edittext.xml index d1a0a32d8..59d81bbc1 100644 --- a/Android/BewoMitarbeiterApp/app/src/main/res/drawable/edittext.xml +++ b/Android/BewoMitarbeiterApp/app/src/main/res/drawable/edittext.xml @@ -1,13 +1,16 @@ - - - - - \ No newline at end of file + + + + + + + + \ No newline at end of file diff --git a/Android/BewoMitarbeiterApp/app/src/main/res/drawable/in_msg.9.png b/Android/BewoMitarbeiterApp/app/src/main/res/drawable/in_msg.9.png new file mode 100644 index 000000000..49690a26c Binary files /dev/null and b/Android/BewoMitarbeiterApp/app/src/main/res/drawable/in_msg.9.png differ diff --git a/Android/BewoMitarbeiterApp/app/src/main/res/drawable/katyperry.jpg b/Android/BewoMitarbeiterApp/app/src/main/res/drawable/katyperry.jpg deleted file mode 100644 index 1f6e60c9d..000000000 Binary files a/Android/BewoMitarbeiterApp/app/src/main/res/drawable/katyperry.jpg and /dev/null differ diff --git a/Android/BewoMitarbeiterApp/app/src/main/res/drawable/katze3.jpg b/Android/BewoMitarbeiterApp/app/src/main/res/drawable/katze3.jpg deleted file mode 100644 index a01fccc54..000000000 Binary files a/Android/BewoMitarbeiterApp/app/src/main/res/drawable/katze3.jpg and /dev/null differ diff --git a/Android/BewoMitarbeiterApp/app/src/main/res/drawable/klient_avatar.png b/Android/BewoMitarbeiterApp/app/src/main/res/drawable/klient_avatar.png new file mode 100644 index 000000000..d6b59083e Binary files /dev/null and b/Android/BewoMitarbeiterApp/app/src/main/res/drawable/klient_avatar.png differ diff --git a/Android/BewoMitarbeiterApp/app/src/main/res/drawable/mitarbeiter_avatar.png b/Android/BewoMitarbeiterApp/app/src/main/res/drawable/mitarbeiter_avatar.png new file mode 100644 index 000000000..34a3a8bf0 Binary files /dev/null and b/Android/BewoMitarbeiterApp/app/src/main/res/drawable/mitarbeiter_avatar.png differ diff --git a/Android/BewoMitarbeiterApp/app/src/main/res/drawable/mitarbeiter_team_avatar.png b/Android/BewoMitarbeiterApp/app/src/main/res/drawable/mitarbeiter_team_avatar.png new file mode 100644 index 000000000..dac4e73e3 Binary files /dev/null and b/Android/BewoMitarbeiterApp/app/src/main/res/drawable/mitarbeiter_team_avatar.png differ diff --git a/Android/BewoMitarbeiterApp/app/src/main/res/drawable/out_msg.9.png b/Android/BewoMitarbeiterApp/app/src/main/res/drawable/out_msg.9.png new file mode 100644 index 000000000..02d61da08 Binary files /dev/null and b/Android/BewoMitarbeiterApp/app/src/main/res/drawable/out_msg.9.png differ diff --git a/Android/BewoMitarbeiterApp/app/src/main/res/layout/activity_login.xml b/Android/BewoMitarbeiterApp/app/src/main/res/layout/activity_login.xml index db4f1aa96..2890b7b30 100644 --- a/Android/BewoMitarbeiterApp/app/src/main/res/layout/activity_login.xml +++ b/Android/BewoMitarbeiterApp/app/src/main/res/layout/activity_login.xml @@ -11,19 +11,18 @@ android:background="@color/white" tools:context="beyondsoft.bewomitarbeiterapp.LoginActivity"> - + android:layout_height="match_parent">