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

Made graphical improvements

Browse Source
This commit is contained in:
Lyndon
2017-10-05 13:06:42 +02:00
parent 4c9b19377e
commit c2a54969b0
12 changed files with 254 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/chat/BaseChatActivity.java
View File

@@ -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);
}

5
BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/chat/ChatPresenter.java
View File

@@ -405,6 +405,7 @@ public class ChatPresenter extends MVPAbstractPresenter<ChatView>
storeGroupLocally(mGroupId, message);
return;
}
checkForEmptyMessageAndHideIt();
message.createdAt *= 1000;
getView().addOneMessage(message);
@@ -419,7 +420,9 @@ public class ChatPresenter extends MVPAbstractPresenter<ChatView>
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())

10
BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/chat/SingleChatActivity.java
View File

@@ -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);

4
BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/drawable/delivered.xml
View File

@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="10dp" android:height="7dp" android:viewportWidth="10" android:viewportHeight="7">
<path android:pathData="M3.049,5.468L0.882,3.301L0.16,4.024L3.049,6.912L9.239,0.722L8.517,0L3.049,5.468Z" android:strokeColor="#00000000" android:fillColor="#FF5E00" android:strokeWidth="1" />
<path android:pathData="M3.049,5.468L0.882,3.301L0.16,4.024L3.049,6.912L9.239,0.722L8.517,0L3.049,5.468Z"
android:strokeColor="#00000000"
android:fillColor="#FFFFFF" android:strokeWidth="1" />
</vector>

2
BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/layout/activity_login.xml
View File

@@ -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" />
<View
android:id="@+id/login_divider2"

128
BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/layout/item_group_chat_left.xml
View File

@@ -5,74 +5,92 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="13dp">
android:layout_marginTop="6dp"
android:layout_marginBottom="6dp"
android:paddingLeft="40dp"
android:paddingEnd="40dp"
android:paddingRight="0dp"
android:paddingStart="0dp"
android:paddingBottom="0dp">
<de.hdodenhof.circleimageview.CircleImageView
android:id="@+id/chat_item_contact_image"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_marginEnd="10dp"
android:layout_marginRight="10dp"
android:contentDescription="@null"
tools:src="@drawable/avatar" />
<TextView
android:id="@+id/chat_item_time"
<RelativeLayout
style="@style/LeftChatItemRelativeLayout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_toEndOf="@+id/chat_item_contact_image"
android:layout_toRightOf="@+id/chat_item_contact_image"
android:textColor="@color/colorManatee"
android:textSize="10sp"
tools:ignore="SmallSp"
tools:text="Vlad Tamas | 15:23" />
android:layout_marginLeft="5dp"
android:layout_marginStart="5dp"
android:layout_toEndOf="@id/chat_item_contact_image"
android:layout_toRightOf="@id/chat_item_contact_image"
>
<ImageView
android:id="@+id/chat_item_file"
android:layout_width="wrap_content"
android:layout_height="90dp"
android:layout_below="@id/chat_item_time"
android:layout_marginTop="4dp"
android:layout_toEndOf="@+id/chat_item_contact_image"
android:layout_toRightOf="@+id/chat_item_contact_image"
android:adjustViewBounds="true"
android:contentDescription="@null"
android:scaleType="fitStart"
android:visibility="gone" />
<TextView
android:id="@+id/chat_item_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:textColor="@color/colorManatee"
android:textSize="10sp"
tools:ignore="SmallSp"
tools:text="Sasha Grey | 15:23" />
<TextView
android:id="@+id/chat_item_file_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/chat_item_time"
android:layout_marginTop="95dp"
android:layout_toEndOf="@+id/chat_item_contact_image"
android:layout_toRightOf="@+id/chat_item_contact_image"
android:textColor="@color/colorBlack"
android:visibility="gone" />
<ImageView
android:id="@+id/chat_item_file"
android:layout_width="wrap_content"
android:layout_height="90dp"
android:layout_below="@id/chat_item_time"
android:layout_marginTop="4dp"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:adjustViewBounds="true"
android:contentDescription="@null"
android:scaleType="fitStart"
android:visibility="gone"/>
<com.github.lzyzsd.circleprogress.DonutProgress
android:id="@+id/chat_item_progress"
android:layout_width="90dp"
android:layout_height="90dp"
android:layout_below="@id/chat_item_time"
android:layout_marginTop="4dp"
android:layout_toEndOf="@+id/chat_item_contact_image"
android:layout_toRightOf="@+id/chat_item_contact_image"
android:visibility="gone"
custom:donut_finished_color="@color/colorDefault"
custom:donut_text_color="@color/colorBlack" />
<TextView
android:id="@+id/chat_item_file_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/chat_item_time"
android:layout_marginTop="95dp"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:textColor="@color/colorBlack"
android:visibility="gone" />
<com.github.lzyzsd.circleprogress.DonutProgress
android:id="@+id/chat_item_progress"
android:layout_width="90dp"
android:layout_height="90dp"
android:layout_below="@id/chat_item_time"
android:layout_marginTop="4dp"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:visibility="gone"
custom:donut_finished_color="@color/colorDefault"
custom:donut_text_color="@color/colorBlack" />
<hani.momanii.supernova_emoji_library.Helper.EmojiconTextView
android:id="@+id/chat_item_message"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/chat_item_time"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
emojicon:emojiconSize="20sp"
style="@style/BaseChatItemText"
android:textColor="@color/colorLeftChat"
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."
/>
</RelativeLayout>
<hani.momanii.supernova_emoji_library.Helper.EmojiconTextView
android:id="@+id/chat_item_message"
style="@style/LeftChatItemText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/chat_item_time"
android:layout_toEndOf="@+id/chat_item_contact_image"
android:layout_toRightOf="@+id/chat_item_contact_image"
emojicon:emojiconSize="20sp"
tools:text="Hi Daniel! What advice could you give me on speed cooking? I’m thinking of opening a small bistro"
tools:visibility="gone" />
</RelativeLayout>

224
BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/layout/item_group_chat_right.xml
View File

@@ -1,121 +1,145 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
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:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="13dp">
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">
<de.hdodenhof.circleimageview.CircleImageView
android:id="@+id/chat_item_contact_image"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_marginLeft="10dp"
android:layout_marginStart="10dp"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_margin="0dp"
android:contentDescription="@null"
tools:src="@drawable/avatar" />
<TextView
android:id="@+id/chat_item_sending_failed"
<RelativeLayout
style="@style/RightChatItemRelativeLayout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_toLeftOf="@+id/chat_item_message_status"
android:layout_toStartOf="@+id/chat_item_message_status"
android:paddingBottom="5dp"
android:paddingLeft="5dp"
android:paddingRight="5dp"
android:text="@string/chat_item_sending_failed"
android:textColor="@color/colorHarvard"
android:textSize="10sp"
android:visibility="gone"
tools:ignore="SmallSp"
tools:visibility="visible" />
android:layout_marginLeft="5dp"
android:layout_marginStart="5dp"
android:layout_toEndOf="@id/chat_item_contact_image"
android:layout_toRightOf="@id/chat_item_contact_image">
<ProgressBar
android:id="@+id/chat_item_message_status_progress_bar"
android:layout_width="15dp"
android:layout_height="15dp"
android:layout_alignBottom="@+id/chat_item_time"
android:layout_alignTop="@+id/chat_item_time"
android:layout_marginEnd="8dp"
android:layout_marginRight="8dp"
android:layout_toLeftOf="@+id/chat_item_time"
android:layout_toStartOf="@+id/chat_item_time"
android:visibility="gone" />
<TextView
android:id="@+id/chat_item_sending_failed"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_toEndOf="@+id/chat_item_message_status"
android:layout_toRightOf="@+id/chat_item_message_status"
android:paddingBottom="5dp"
android:paddingLeft="5dp"
android:paddingRight="5dp"
android:text="@string/chat_item_sending_failed"
android:textColor="@color/colorHarvard"
android:textSize="10sp"
android:visibility="gone"
tools:ignore="SmallSp"
tools:visibility="gone" />
<ImageView
android:id="@+id/chat_item_message_status"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBottom="@+id/chat_item_time"
android:layout_alignTop="@+id/chat_item_time"
android:layout_marginEnd="8dp"
android:layout_marginRight="8dp"
android:layout_toLeftOf="@+id/chat_item_time"
android:layout_toStartOf="@+id/chat_item_time"
android:adjustViewBounds="true"
android:contentDescription="@null"
android:visibility="gone"
tools:src="@drawable/delivered" />
<ProgressBar
android:id="@+id/chat_item_message_status_progress_bar"
android:layout_width="15dp"
android:layout_height="15dp"
android:layout_alignBottom="@+id/chat_item_time"
android:layout_alignTop="@+id/chat_item_time"
android:layout_marginEnd="8dp"
android:layout_marginRight="8dp"
android:layout_toLeftOf="@+id/chat_item_time"
android:layout_toStartOf="@+id/chat_item_time"
android:visibility="gone" />
<TextView
android:id="@+id/chat_item_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_toLeftOf="@+id/chat_item_contact_image"
android:layout_toStartOf="@+id/chat_item_contact_image"
android:textColor="@color/colorManatee"
android:textSize="10sp"
tools:ignore="SmallSp"
tools:text="Me | 15:23" />
<ImageView
android:id="@+id/chat_item_message_status"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBottom="@+id/chat_item_time"
android:layout_alignTop="@+id/chat_item_time"
android:layout_marginLeft="5dp"
android:layout_marginStart="5dp"
android:layout_toEndOf="@+id/chat_item_time"
android:layout_toRightOf="@+id/chat_item_time"
android:adjustViewBounds="true"
android:contentDescription="@null"
android:visibility="gone"
tools:src="@drawable/delivered"
tools:visibility="visible" />
<ImageView
android:id="@+id/chat_item_file"
android:layout_width="wrap_content"
android:layout_height="90dp"
android:layout_below="@id/chat_item_time"
android:layout_marginTop="4dp"
android:layout_toLeftOf="@+id/chat_item_contact_image"
android:layout_toStartOf="@+id/chat_item_contact_image"
android:contentDescription="@null"
android:scaleType="fitEnd"
android:visibility="gone" />
<TextView
android:id="@+id/chat_item_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:textColor="@color/colorTimestamp"
android:textSize="10sp"
tools:ignore="SmallSp"
tools:text="Me | 15:23"
tools:visibility="visible" />
<TextView
android:id="@+id/chat_item_file_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/chat_item_time"
android:layout_marginTop="95dp"
android:layout_toLeftOf="@+id/chat_item_contact_image"
android:layout_toStartOf="@+id/chat_item_contact_image"
android:textColor="@color/colorBlack"
android:visibility="gone" />
<ImageView
android:id="@+id/chat_item_file"
android:layout_width="wrap_content"
android:layout_height="90dp"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_below="@id/chat_item_time"
android:layout_marginTop="4dp"
android:contentDescription="@null"
android:adjustViewBounds="true"
android:scaleType="fitEnd"
android:visibility="gone"
tools:visibility="visible" />
<com.github.lzyzsd.circleprogress.DonutProgress
android:id="@+id/chat_item_progress"
android:layout_width="90dp"
android:layout_height="90dp"
android:layout_below="@id/chat_item_time"
android:layout_marginTop="4dp"
android:layout_toLeftOf="@+id/chat_item_contact_image"
android:layout_toStartOf="@+id/chat_item_contact_image"
android:visibility="gone"
custom:donut_finished_color="@color/colorDefault"
custom:donut_text_color="@color/colorBlack" />
<TextView
android:id="@+id/chat_item_file_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_below="@+id/chat_item_time"
android:layout_marginTop="95dp"
android:textColor="@color/colorBlack"
android:visibility="gone" />
<hani.momanii.supernova_emoji_library.Helper.EmojiconTextView
android:id="@+id/chat_item_message"
style="@style/RightChatItemText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/chat_item_time"
android:layout_toLeftOf="@+id/chat_item_contact_image"
android:layout_toStartOf="@+id/chat_item_contact_image"
emojicon:emojiconSize="20sp"
tools:text="Hi Daniel! What advice could you give me on speed cooking? I’m thinking of opening a small bistro" />
<com.github.lzyzsd.circleprogress.DonutProgress
android:id="@+id/chat_item_progress"
android:layout_width="90dp"
android:layout_height="90dp"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_below="@id/chat_item_time"
android:layout_marginTop="4dp"
android:visibility="gone"
custom:donut_finished_color="@color/colorDefault"
custom:donut_text_color="@color/colorBlack" />
<!-- TODO: change link color! -> in styles->BaseChatItemText -->
<hani.momanii.supernova_emoji_library.Helper.EmojiconTextView
android:id="@+id/chat_item_message"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_below="@id/chat_item_file"
android:padding="0dp"
android:textColor="@color/colorWhite"
emojicon:emojiconSize="20sp"
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. www.google.com"
tools:visibility="gone"/>
</RelativeLayout>
</RelativeLayout>

5
BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/layout/item_single_chat_left.xml
View File

@@ -11,10 +11,10 @@
android:paddingTop="13dp">
<RelativeLayout
android:id="@+id/singleChatLeftContainer"
style="@style/LeftChatItemRelativeLayout"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<TextView
android:id="@+id/chat_item_time"
android:layout_width="wrap_content"
@@ -61,7 +61,8 @@
emojicon:emojiconSize="20sp"
android:textColor="@color/colorBlack"
android:layout_below="@id/chat_item_file"
tools:text="Hi Daniel! What advice could you give me on speed cooking? I'm thinking of opening a small bistro" />
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." />
</RelativeLayout>
</RelativeLayout>

56
BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/layout/item_single_chat_right.xml
View File

@@ -11,21 +11,25 @@
android:paddingLeft="40dp"
android:paddingEnd="40dp"
android:paddingRight="0dp"
android:paddingStart="0dp"
android:paddingTop="13dp">
android:paddingStart="0dp">
<RelativeLayout
android:id="@+id/singleChatRightContainer"
style="@style/RightChatItemRelativeLayout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
>
android:layout_height="wrap_content">
<TextView
android:id="@+id/chat_item_sending_failed"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_toLeftOf="@+id/chat_item_message_status"
android:layout_toStartOf="@+id/chat_item_message_status"
android:layout_toRightOf="@+id/chat_item_message_status"
android:layout_toEndOf="@+id/chat_item_message_status"
android:paddingBottom="5dp"
android:paddingLeft="5dp"
android:paddingRight="5dp"
@@ -34,7 +38,7 @@
android:textSize="10sp"
android:visibility="gone"
tools:ignore="SmallSp"
tools:visibility="visible" />
tools:visibility="gone" />
<ProgressBar
android:id="@+id/chat_item_message_status_progress_bar"
@@ -50,28 +54,31 @@
<ImageView
android:id="@+id/chat_item_message_status"
tools:src="@drawable/delivered"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBottom="@+id/chat_item_time"
android:layout_alignTop="@+id/chat_item_time"
android:layout_marginEnd="8dp"
android:layout_marginRight="8dp"
android:layout_toLeftOf="@+id/chat_item_time"
android:layout_toStartOf="@+id/chat_item_time"
android:layout_marginStart="5dp"
android:layout_marginLeft="5dp"
android:layout_toRightOf="@+id/chat_item_time"
android:layout_toEndOf="@+id/chat_item_time"
android:contentDescription="@null"
android:visibility="gone"
tools:src="@drawable/delivered" />
tools:visibility="visible"
/>
<TextView
android:id="@+id/chat_item_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentStart="true"
android:layout_alignParentLeft="true"
android:textColor="@color/colorManatee"
android:layout_alignParentStart="true"
android:textColor="@color/colorTimestamp"
android:textSize="10sp"
tools:ignore="SmallSp"
tools:text="15:23" />
tools:text="15:23"
tools:visibility="visible" />
<ImageView
android:id="@+id/chat_item_file"
@@ -84,15 +91,15 @@
android:adjustViewBounds="true"
android:contentDescription="@null"
android:scaleType="fitEnd"
android:src="@drawable/splash_one_size_fits_all"
android:visibility="gone"/>
android:visibility="gone"
tools:visibility="visible"/>
<com.github.lzyzsd.circleprogress.DonutProgress
android:id="@+id/chat_item_progress"
android:layout_width="90dp"
android:layout_height="90dp"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_below="@id/chat_item_time"
android:layout_marginTop="4dp"
android:visibility="gone"
@@ -103,8 +110,8 @@
android:id="@+id/chat_item_file_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_alignParentStart="true"
android:layout_alignParentLeft="true"
android:layout_below="@+id/chat_item_time"
android:layout_marginTop="95dp"
android:textColor="@color/colorBlack"
@@ -119,9 +126,10 @@
android:layout_below="@id/chat_item_file"
android:visibility="gone"
emojicon:emojiconSize="20sp"
tools:text="Hi Daniel! What advice could you give me on speed cooking? I'm thinking of opening a small bistro"
style="@style/BaseChatItemText"
android:textColor="@color/colorWhite"
tools:visibility="visible"
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."
tools:visibility="gone"
/>
</RelativeLayout>

4
BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/values/colors.xml
View File

@@ -14,7 +14,9 @@
<color name="colorManatee">#A0A0A0</color>
<color name="colorHarvard">#D0021B</color>
<color name="colorImpressum">#9B9B9B</color>
<color name="colorHelpGroup">#00A1D1</color>
<color name="colorHelpGroup">#00a1d1</color>
<color name="colorTeamGroup">#AAB100</color>
<color name="colorSubtitle">#9B9B9B</color>
<color name="colorTimestamp">#636363</color>
<color name="colorLeftChat">#515151</color>
</resources>

2
BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/values/strings.xml
View File

@@ -8,7 +8,7 @@
<string name="logout_confirmation">Wollen Sie sich wirklich abmelden?</string>
<!-- Login -->
<string name="login_chat_code_hint">Chat-code</string>
<string name="login_chat_code_hint">Chat-Code</string>
<string name="login_account_number_hint">Kundennummer</string>
<string name="login_username_hint">Benutzername</string>
<string name="login_password_hint">Passwort</string>

13
BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/values/styles.xml
View File

@@ -96,19 +96,8 @@
<style name="BaseChatItemText">
<item name="android:textSize">14sp</item>
<item name="android:padding">10dp</item>
<item name="android:layout_marginTop">4dp</item>
<item name="android:autoLink">all</item>
</style>
<style name="LeftChatItemText" parent="BaseChatItemText">
<item name="android:background">@drawable/chat_left</item>
<item name="android:textColor">@color/colorBlack</item>
</style>
<style name="RightChatItemText" parent="BaseChatItemText">
<item name="android:background">@drawable/chat_right</item>
<item name="android:textColor">@color/colorWhite</item>
<item name="android:textColorLink">#424242</item>
</style>
<style name="RightChatItemRelativeLayout">