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

kek

Browse Source
This commit is contained in:
Lyndon
2017-11-28 17:28:48 +01:00
parent c81c173eb6
commit f3db1090e9
5 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
BeWoPlanerChat/bewoplaner-chat-android/app/build.gradle
View File

@@ -34,8 +34,8 @@ android {
applicationId "de.beyondsoft.ownchat"
minSdkVersion 19
targetSdkVersion 26
versionCode 7
versionName "1.7"
versionCode 9
versionName "1.9"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}

9
BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/chat/BaseChatAdapter.java
View File

@@ -325,7 +325,7 @@ abstract class BaseChatAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
} else {
viewHolder.filenameTextView.setVisibility(View.GONE);
}
} else if (message.filePath.toLowerCase().endsWith(".png") || message.filePath.toLowerCase().endsWith(".jpg") || message.filePath.toLowerCase().endsWith(".gif")) {
} else {
viewHolder.donutProgress.setVisibility(View.GONE);
viewHolder.fileImageView.setVisibility(View.VISIBLE);
viewHolder.filenameTextView.setVisibility(View.GONE);
@@ -338,13 +338,6 @@ abstract class BaseChatAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
.override(500, 500)
.diskCacheStrategy(DiskCacheStrategy.ALL)
.into(viewHolder.fileImageView);
} else {
viewHolder.donutProgress.setVisibility(View.GONE);
viewHolder.fileImageView.setVisibility(View.VISIBLE);
viewHolder.filenameTextView.setVisibility(View.VISIBLE);
viewHolder.fileImageView.setImageDrawable(null);
viewHolder.fileImageView.setImageResource(R.drawable.document);
viewHolder.filenameTextView.setText(message.originalFilename);
}
if (!TextUtils.isEmpty(message.message)) {

5
BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/contacts/ContactsAdapter.java
View File

@@ -82,10 +82,12 @@ class ContactsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
setLastMessage(group, viewHolder);
int type = getItemViewType(position);
if (type == GROUP_TYPE) {
viewHolder.name.setText(group.name);
viewHolder.name.setTextColor(ContextCompat.getColor(viewHolder.name.getContext(), group.isHelpGroup() ? R.color.colorHelpGroup : R.color.colorTeamGroup));
viewHolder.avatar.setImageResource(group.isHelpGroup() ? R.drawable.avatar_help_group : R.drawable.avatar_team_group);
return;
} else if(!group.onlyEmployees) {
viewHolder.avatar.setImageResource(R.drawable.avatar_help);
@@ -134,6 +136,7 @@ class ContactsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
if (resourceId != 0) {
viewHolder.messageStatusPending.setVisibility(resourceId == -1 ? View.VISIBLE : View.GONE);
if (resourceId != -1) {
viewHolder.messageStatus.setImageResource(group.lastMessage.getStatusResourceId());
} else {
@@ -174,10 +177,12 @@ class ContactsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
@OnClick(R.id.contact_container)
void onClickContact() {
int type = getItemViewType();
if (type == GROUP_TYPE) {
mItemClickListener.onOpenGroupMessage(mGroups.get(getAdapterPosition()));
return;
}
mItemClickListener.onOpenPrivateMessage(mGroups.get(getAdapterPosition()));
}
}

3
BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/contacts/ContactsFragment.java
View File

@@ -54,8 +54,7 @@ import butterknife.ButterKnife;
/**
* Created by imarneanu on 2/13/17.
*/
public class ContactsFragment extends BaseFragment
implements ContactsView, ContactsAdapter.OnOpenClickListener, SearchView.OnQueryTextListener {
public class ContactsFragment extends BaseFragment implements ContactsView, ContactsAdapter.OnOpenClickListener, SearchView.OnQueryTextListener {
@BindView(R.id.contacts_recycler_view)
RecyclerView mContactsRecyclerView;

1
BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/contacts/ContactsPresenter.java
View File

@@ -161,6 +161,7 @@ class ContactsPresenter extends MVPAbstractPresenter<ContactsView> implements Co
if (!isAttached()) {
return;
}
/**/
getView().hideProgress();
getView().setGroups(groups);
}