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

Ease chat room selection in edition mode

Browse source
This commit is contained in:
Sylvain Berfini 2018-03-08 12:50:24 +01:00
parent cd62894df1
commit 7657660730
3 changed files with 19 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/android/org/linphone/chat/ChatListFragment.java
View file

@ -34,6 +34,7 @@ import android.widget.TextView;
import org.linphone.contacts.ContactsManager; import org.linphone.contacts.ContactsManager;
import org.linphone.core.ChatRoomListenerStub; import org.linphone.core.ChatRoomListenerStub;
import org.linphone.core.EventLog; import org.linphone.core.EventLog;
import org.linphone.mediastream.Log;
import org.linphone.ui.ListSelectionHelper; import org.linphone.ui.ListSelectionHelper;
import org.linphone.contacts.ContactsUpdatedListener; import org.linphone.contacts.ContactsUpdatedListener;
import org.linphone.fragments.FragmentsAvailable; import org.linphone.fragments.FragmentsAvailable;
@ -49,12 +50,11 @@ import java.io.File;
import static org.linphone.fragments.FragmentsAvailable.CHAT_LIST; import static org.linphone.fragments.FragmentsAvailable.CHAT_LIST;
public class ChatListFragment extends Fragment implements OnItemClickListener, ContactsUpdatedListener, ListSelectionHelper.DeleteListener { public class ChatListFragment extends Fragment implements ContactsUpdatedListener, ListSelectionHelper.DeleteListener {
private LayoutInflater mInflater; private LayoutInflater mInflater;
private ListView mChatRoomsList; private ListView mChatRoomsList;
private TextView mNoChatHistory; private TextView mNoChatHistory;
private ImageView mNewDiscussionButton, mBackToCallButton; private ImageView mNewDiscussionButton, mBackToCallButton;
private boolean isEditMode = false;
private ChatRoomsAdapter mChatRoomsAdapter; private ChatRoomsAdapter mChatRoomsAdapter;
private CoreListenerStub mListener; private CoreListenerStub mListener;
private ListSelectionHelper mSelectionHelper; private ListSelectionHelper mSelectionHelper;
@ -77,7 +77,6 @@ public class ChatListFragment extends Fragment implements OnItemClickListener, C
mChatRoomsList = view.findViewById(R.id.chatList); mChatRoomsList = view.findViewById(R.id.chatList);
mChatRoomsList.setAdapter(mChatRoomsAdapter); mChatRoomsList.setAdapter(mChatRoomsAdapter);
mChatRoomsList.setOnItemClickListener(this);
mNoChatHistory = view.findViewById(R.id.noChatHistory); mNoChatHistory = view.findViewById(R.id.noChatHistory);
mNoChatHistory.setVisibility(View.GONE); mNoChatHistory.setVisibility(View.GONE);
@ -211,15 +210,6 @@ public class ChatListFragment extends Fragment implements OnItemClickListener, C
adapter.notifyDataSetInvalidated(); adapter.notifyDataSetInvalidated();
} }
} }
@Override
public void onItemClick(AdapterView<?> adapter, View view, int position, long id) {
ChatRoom chatRoom = (ChatRoom) mChatRoomsList.getAdapter().getItem(position);
if (LinphoneActivity.isInstanciated() && !isEditMode) {
LinphoneActivity.instance().goToChat(chatRoom.getPeerAddress().asString());
}
}
} }

16
src/android/org/linphone/chat/ChatRoomsAdapter.java
View file

@ -136,7 +136,7 @@ public class ChatRoomsAdapter extends ListSelectionAdapter {
} }
@Override @Override
public View getView(int position, View convertView, ViewGroup viewGroup) { public View getView(final int position, View convertView, ViewGroup viewGroup) {
View view; View view;
ChatRoomViewHolder holder; ChatRoomViewHolder holder;
@ -226,6 +226,13 @@ public class ChatRoomsAdapter extends ListSelectionAdapter {
} }
if (isEditionEnabled()) { if (isEditionEnabled()) {
view.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
ChatRoomViewHolder holder = (ChatRoomViewHolder)v.getTag();
holder.delete.setChecked(!holder.delete.isChecked());
}
});
holder.unreadMessages.setVisibility(View.GONE); holder.unreadMessages.setVisibility(View.GONE);
holder.delete.setOnCheckedChangeListener(null); holder.delete.setOnCheckedChangeListener(null);
holder.delete.setVisibility(View.VISIBLE); holder.delete.setVisibility(View.VISIBLE);
@ -233,6 +240,13 @@ public class ChatRoomsAdapter extends ListSelectionAdapter {
holder.delete.setTag(position); holder.delete.setTag(position);
holder.delete.setOnCheckedChangeListener(getDeleteListener()); holder.delete.setOnCheckedChangeListener(getDeleteListener());
} else { } else {
view.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
ChatRoom chatRoom = mRooms.get(position);
LinphoneActivity.instance().goToChat(chatRoom.getPeerAddress().asString());
}
});
holder.delete.setVisibility(isEditionEnabled() ? View.VISIBLE : View.GONE); holder.delete.setVisibility(isEditionEnabled() ? View.VISIBLE : View.GONE);
} }
return view; return view;

2
src/android/org/linphone/ui/ListSelectionAdapter.java
View file

@ -22,6 +22,8 @@ package org.linphone.ui;
import android.widget.BaseAdapter; import android.widget.BaseAdapter;
import android.widget.CompoundButton; import android.widget.CompoundButton;
import org.linphone.mediastream.Log;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;