From c2a54969b02e051f2113cff8bf7354a2a06a785b Mon Sep 17 00:00:00 2001 From: Lyndon Date: Thu, 5 Oct 2017 13:06:42 +0200 Subject: [PATCH] Made graphical improvements --- .../page/chat/BaseChatActivity.java | 1 + .../bewoplaner/page/chat/ChatPresenter.java | 5 +- .../page/chat/SingleChatActivity.java | 10 +- .../app/src/main/res/drawable/delivered.xml | 4 +- .../src/main/res/layout/activity_login.xml | 2 +- .../main/res/layout/item_group_chat_left.xml | 128 +++++----- .../main/res/layout/item_group_chat_right.xml | 224 ++++++++++-------- .../main/res/layout/item_single_chat_left.xml | 5 +- .../res/layout/item_single_chat_right.xml | 56 +++-- .../app/src/main/res/values/colors.xml | 4 +- .../app/src/main/res/values/strings.xml | 2 +- .../app/src/main/res/values/styles.xml | 13 +- 12 files changed, 254 insertions(+), 200 deletions(-) diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/chat/BaseChatActivity.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/chat/BaseChatActivity.java index d999a85..2329b00 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/chat/BaseChatActivity.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/chat/BaseChatActivity.java @@ -465,6 +465,7 @@ abstract class BaseChatActivity extends RuntimePermissionActivity implements Cha if (mGroup == null) { return; } + NotificationManagerCompat notificationManager = NotificationManagerCompat.from(this); notificationManager.cancel((int) mGroup.id); } diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/chat/ChatPresenter.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/chat/ChatPresenter.java index 95602a5..8003d96 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/chat/ChatPresenter.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/chat/ChatPresenter.java @@ -405,6 +405,7 @@ public class ChatPresenter extends MVPAbstractPresenter storeGroupLocally(mGroupId, message); return; } + checkForEmptyMessageAndHideIt(); message.createdAt *= 1000; getView().addOneMessage(message); @@ -419,7 +420,9 @@ public class ChatPresenter extends MVPAbstractPresenter String groupIdString = String.valueOf(mGroupId); RequestBody groupIdBody = RequestBody.create(okhttp3.MultipartBody.FORM, groupIdString); - RequestBody textBody = RequestBody.create(MultipartBody.FORM, message.message); + Log.d("SENDING FILE", "Sending file with text message..."); + + RequestBody textBody = RequestBody.create(okhttp3.MultipartBody.FORM, message.message == null ? "" : message.message); mChatService.sendFile(groupIdBody, body, textBody) .compose(RxUtils.provideDefaultTransformer()) diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/chat/SingleChatActivity.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/chat/SingleChatActivity.java index cb6336f..4d726e4 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/chat/SingleChatActivity.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/chat/SingleChatActivity.java @@ -63,6 +63,7 @@ public class SingleChatActivity extends BaseChatActivity { if (!mChatPresenter.isAttached()) { mChatPresenter.attachView(this); mBaseChatAdapter.resetItemsProgress(); + if (mSystemUtils.isNetworkUnavailable()) { mCallback.loadMessagesFromDBByGroupId(mGroup.id, true); showError(R.string.error_no_internet_connection); @@ -70,6 +71,7 @@ public class SingleChatActivity extends BaseChatActivity { mCallback.fetchNewMessages(mGroup.id); } } + cancelNotification(); IntentFilter filter = new IntentFilter(Constants.NOTIFICATION_BROADCAST); registerReceiver(mReceiver, filter); @@ -89,6 +91,7 @@ public class SingleChatActivity extends BaseChatActivity { mExtraImageView.setVisibility(View.VISIBLE); mExtraImageView.setImageResource(R.drawable.call); } + if (mSystemUtils.isNetworkUnavailable()) { mCallback.loadMessagesFromDBByGroupId(mGroup.id, true); showError(R.string.error_no_internet_connection); @@ -101,8 +104,8 @@ public class SingleChatActivity extends BaseChatActivity { protected void setToolbar() { mSingleChatTitleTextView.setVisibility(View.VISIBLE); mSingleChatTitleTextView.setText(mGroup.name); - mSingleChatTitleTextView.setTextColor(ContextCompat.getColor(this, - mGroup.isEmployee(mGroup.users) ? R.color.colorHelpGroup : R.color.colorBlack)); + mSingleChatTitleTextView.setTextColor(ContextCompat.getColor(this, mGroup.isEmployee(mGroup.users) ? R.color.colorHelpGroup : R.color.colorBlack)); + if (TextUtils.isEmpty(mGroup.avatar)) { mChatImageView.setImageResource(R.drawable.avatar); } else { @@ -137,9 +140,11 @@ public class SingleChatActivity extends BaseChatActivity { @Override public void onReceive(Context context, Intent intent) { Bundle bundle = intent.getBundleExtra(Constants.MESSAGE); + if (mCallback == null) { mChatPresenter.attachView(SingleChatActivity.this); } + if (mCallback.getGroupId() == bundle.getLong(Constants.GROUP_ID)) { Message message = new Message(bundle.getString(Constants.MESSAGE_ID), bundle.getLong(Constants.GROUP_ID), @@ -156,6 +161,7 @@ public class SingleChatActivity extends BaseChatActivity { true, mUserIdPreference.get(), false); + mCallback.saveMessage(message); Bundle results = getResultExtras(true); results.putBoolean(Constants.CHAT_IS_ALREADY_OPEN, true); diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/drawable/delivered.xml b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/drawable/delivered.xml index cf8db71..b7d41bc 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/drawable/delivered.xml +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/drawable/delivered.xml @@ -1,5 +1,7 @@ - + diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/layout/activity_login.xml b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/layout/activity_login.xml index cc8ec41..37a1b91 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/layout/activity_login.xml +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/layout/activity_login.xml @@ -38,7 +38,7 @@ android:layout_width="match_parent" android:background="@color/colorWhite" android:hint="@string/login_account_number_hint" - android:inputType="text" /> + android:inputType="number" /> + android:layout_marginTop="6dp" + android:layout_marginBottom="6dp" + android:paddingLeft="40dp" + android:paddingEnd="40dp" + android:paddingRight="0dp" + android:paddingStart="0dp" + android:paddingBottom="0dp"> - + android:layout_marginLeft="5dp" + android:layout_marginStart="5dp" + android:layout_toEndOf="@id/chat_item_contact_image" + android:layout_toRightOf="@id/chat_item_contact_image" + > - + - + - + + + + + + + - \ No newline at end of file diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/layout/item_group_chat_right.xml b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/layout/item_group_chat_right.xml index 31015f1..d1eb58c 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/layout/item_group_chat_right.xml +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/layout/item_group_chat_right.xml @@ -1,121 +1,145 @@ + xmlns:custom="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + xmlns:emojicon="http://schemas.android.com/apk/res-auto" + android:layoutDirection="rtl" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="6dp" + android:layout_marginBottom="6dp" + android:paddingLeft="40dp" + android:paddingEnd="40dp" + android:paddingRight="0dp" + android:paddingStart="0dp"> - + android:layout_marginLeft="5dp" + android:layout_marginStart="5dp" + android:layout_toEndOf="@id/chat_item_contact_image" + android:layout_toRightOf="@id/chat_item_contact_image"> - + - + - + - + - + - + - + + + + + + \ No newline at end of file diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/layout/item_single_chat_left.xml b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/layout/item_single_chat_left.xml index 33c71d3..6efb286 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/layout/item_single_chat_left.xml +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/layout/item_single_chat_left.xml @@ -11,10 +11,10 @@ android:paddingTop="13dp"> + + style="@style/BaseChatItemText" + tools:text="Meine Freundin, die Maschine. Als sie mein Herz für sich gewann. Mit ihren ganzen kleinen Geschwistern, mit denen man alles machen kann." /> \ No newline at end of file diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/layout/item_single_chat_right.xml b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/layout/item_single_chat_right.xml index a4d4bd8..d274737 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/layout/item_single_chat_right.xml +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/layout/item_single_chat_right.xml @@ -11,21 +11,25 @@ android:paddingLeft="40dp" android:paddingEnd="40dp" android:paddingRight="0dp" - android:paddingStart="0dp" - android:paddingTop="13dp"> + android:paddingStart="0dp"> + + + android:layout_height="wrap_content"> + + + + + + tools:visibility="gone" /> + tools:visibility="visible" + /> + tools:text="15:23" + tools:visibility="visible" /> + android:visibility="gone" + tools:visibility="visible"/> diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/values/colors.xml b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/values/colors.xml index f8bc30f..fa37102 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/values/colors.xml +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/values/colors.xml @@ -14,7 +14,9 @@ #A0A0A0 #D0021B #9B9B9B - #00A1D1 + #00a1d1 #AAB100 #9B9B9B + #636363 + #515151 diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/values/strings.xml b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/values/strings.xml index a50f7dc..189ef06 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/values/strings.xml +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/values/strings.xml @@ -8,7 +8,7 @@ Wollen Sie sich wirklich abmelden? - Chat-code + Chat-Code Kundennummer Benutzername Passwort diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/values/styles.xml b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/values/styles.xml index ab770d5..217c60a 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/values/styles.xml +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/values/styles.xml @@ -96,19 +96,8 @@ - - - -