Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Keep scroll in chatlist when editing it + do not reload picture if not necessary

Browse source
This commit is contained in:
Sylvain Berfini 2016-08-09 11:19:31 +02:00
parent 5a122150a8
commit 159cb83af8
2 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
res/layout/chat.xml
View file

@ -128,8 +128,9 @@
<ListView <ListView
android:id="@+id/chat_message_list" android:id="@+id/chat_message_list"
android:divider="@android:color/transparent" android:divider="@android:color/transparent"
android:choiceMode="multipleChoice"
android:stackFromBottom="true" android:stackFromBottom="true"
android:transcriptMode="alwaysScroll" android:transcriptMode="normal"
android:dividerHeight="10dp" android:dividerHeight="10dp"
android:cacheColorHint="@color/transparent" android:cacheColorHint="@color/transparent"
android:layout_above="@id/remote_composing" android:layout_above="@id/remote_composing"

22
src/org/linphone/ChatFragment.java
View file

@ -85,7 +85,6 @@ import android.view.ViewGroup;
import android.view.ViewTreeObserver; import android.view.ViewTreeObserver;
import android.view.WindowManager; import android.view.WindowManager;
import android.view.inputmethod.InputMethodManager; import android.view.inputmethod.InputMethodManager;
import android.widget.AbsListView;
import android.widget.BaseAdapter; import android.widget.BaseAdapter;
import android.widget.Button; import android.widget.Button;
import android.widget.CheckBox; import android.widget.CheckBox;
@ -162,7 +161,6 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC
contactName = (TextView) view.findViewById(R.id.contact_name); contactName = (TextView) view.findViewById(R.id.contact_name);
messagesList = (ListView) view.findViewById(R.id.chat_message_list); messagesList = (ListView) view.findViewById(R.id.chat_message_list);
messagesList.setChoiceMode(AbsListView.CHOICE_MODE_MULTIPLE);
searchContactField = (EditText) view.findViewById(R.id.search_contact_field); searchContactField = (EditText) view.findViewById(R.id.search_contact_field);
resultContactsSearch = (ListView) view.findViewById(R.id.result_contacts); resultContactsSearch = (ListView) view.findViewById(R.id.result_contacts);
@ -231,7 +229,6 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC
LinphoneService.instance().removeMessageNotification(); LinphoneService.instance().removeMessageNotification();
cr.markAsRead(); cr.markAsRead();
adapter.addMessage(cr.getHistory(1)[0]); adapter.addMessage(cr.getHistory(1)[0]);
messagesList.setSelection(adapter.getCount()-1);
String externalBodyUrl = message.getExternalBodyUrl(); String externalBodyUrl = message.getExternalBodyUrl();
LinphoneContent fileTransferContent = message.getFileTransferInformation(); LinphoneContent fileTransferContent = message.getFileTransferInformation();
@ -551,7 +548,7 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC
@Override @Override
public void onClick(View v) { public void onClick(View v) {
int id = v.getId(); int id = v.getId();
if (id == R.id.back_to_call) { if (id == R.id.back_to_call) {
LinphoneActivity.instance().resetClassicMenuLayoutAndGoBackToCallIfStillRunning(); LinphoneActivity.instance().resetClassicMenuLayoutAndGoBackToCallIfStillRunning();
return; return;
@ -1015,6 +1012,7 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC
public void addMessage(LinphoneChatMessage message) { public void addMessage(LinphoneChatMessage message) {
history.add(message); history.add(message);
notifyDataSetChanged(); notifyDataSetChanged();
messagesList.setSelection(getCount() - 1);
} }
@Override @Override
@ -1037,6 +1035,7 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC
final LinphoneChatMessage message = history.get(position); final LinphoneChatMessage message = history.get(position);
View view = null; View view = null;
final ViewHolder holder; final ViewHolder holder;
boolean sameMessage = false;
if (convertView != null) { if (convertView != null) {
view = convertView; view = convertView;
@ -1047,8 +1046,13 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC
holder = new ViewHolder(view); holder = new ViewHolder(view);
view.setTag(holder); view.setTag(holder);
} }
view.setId(message.getStorageId());
holder.id = message.getStorageId(); if (holder.id == message.getStorageId()) {
sameMessage = true;
} else {
holder.id = message.getStorageId();
}
view.setId(holder.id);
registerForContextMenu(view); registerForContextMenu(view);
LinphoneChatMessage.State status = message.getStatus(); LinphoneChatMessage.State status = message.getStatus();
@ -1101,9 +1105,9 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC
if (externalBodyUrl != null || fileTransferContent != null) { if (externalBodyUrl != null || fileTransferContent != null) {
String appData = message.getAppData(); String appData = message.getAppData();
if (message.isOutgoing() && appData != null){ if (message.isOutgoing() && appData != null) {
holder.messageImage.setVisibility(View.VISIBLE); holder.messageImage.setVisibility(View.VISIBLE);
loadBitmap(appData, holder.messageImage); if (!sameMessage) loadBitmap(appData, holder.messageImage);
if (LinphoneManager.getInstance().getMessageUploadPending() != null && LinphoneManager.getInstance().getMessageUploadPending().getStorageId() == message.getStorageId()) { if (LinphoneManager.getInstance().getMessageUploadPending() != null && LinphoneManager.getInstance().getMessageUploadPending().getStorageId() == message.getStorageId()) {
holder.messageSendingInProgress.setVisibility(View.GONE); holder.messageSendingInProgress.setVisibility(View.GONE);
@ -1127,7 +1131,7 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC
LinphoneManager.removeListener(holder); LinphoneManager.removeListener(holder);
holder.fileTransferLayout.setVisibility(View.GONE); holder.fileTransferLayout.setVisibility(View.GONE);
holder.messageImage.setVisibility(View.VISIBLE); holder.messageImage.setVisibility(View.VISIBLE);
loadBitmap(appData, holder.messageImage); if (!sameMessage) loadBitmap(appData, holder.messageImage);
} }
} }
} }