From 36594310f5d7e0dccb8343e50e10914168bf54d7 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Mon, 3 Sep 2018 11:26:23 +0200 Subject: [PATCH] More cleanup --- .../org/linphone/chat/ChatEventsAdapter.java | 28 ++++----- .../org/linphone/chat/ChatListFragment.java | 9 --- .../org/linphone/chat/ChatRoomsAdapter.java | 50 +++------------- .../org/linphone/chat/GroupChatFragment.java | 12 ---- .../org/linphone/chat/GroupInfoAdapter.java | 11 ---- .../org/linphone/chat/GroupInfoFragment.java | 2 - .../contacts/ContactsListAdapter.java | 58 +++++++++---------- .../contacts/ContactsListFragment.java | 2 +- .../fragments/HistoryListFragment.java | 51 ++++++++-------- 9 files changed, 72 insertions(+), 151 deletions(-) diff --git a/src/android/org/linphone/chat/ChatEventsAdapter.java b/src/android/org/linphone/chat/ChatEventsAdapter.java index e7fc32a3d..3ed0db2ce 100644 --- a/src/android/org/linphone/chat/ChatEventsAdapter.java +++ b/src/android/org/linphone/chat/ChatEventsAdapter.java @@ -81,22 +81,21 @@ public class ChatEventsAdapter extends SelectableAdapter { private Context mContext; private List mHistory; private List mParticipants; - private int itemResource; + private int mItemResource; private Bitmap mDefaultBitmap; private GroupChatFragment mFragment; private ChatMessageListenerStub mListener; - private ChatBubbleViewHolder.ClickListener clickListener; + private ChatBubbleViewHolder.ClickListener mClickListener; public ChatEventsAdapter(GroupChatFragment fragment, SelectableHelper helper, int itemResource, EventLog[] history, ArrayList participants, ChatBubbleViewHolder.ClickListener clickListener) { - super(helper); - this.mFragment=fragment; - this.mContext = mFragment.getActivity(); - this.itemResource = itemResource; + mFragment = fragment; + mContext = mFragment.getActivity(); + mItemResource = itemResource; mHistory = new ArrayList<>(Arrays.asList(history)); - this.mParticipants = participants; - this.clickListener = clickListener; + mParticipants = participants; + mClickListener = clickListener; mListener = new ChatMessageListenerStub() { @Override public void onFileTransferProgressIndication(ChatMessage message, Content content, int offset, int total) { @@ -131,8 +130,8 @@ public class ChatEventsAdapter extends SelectableAdapter { @Override public ChatBubbleViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { View v = LayoutInflater.from(parent.getContext()) - .inflate(this.itemResource, parent, false); - ChatBubbleViewHolder VH = new ChatBubbleViewHolder(this.mContext,v, clickListener); + .inflate(this.mItemResource, parent, false); + ChatBubbleViewHolder VH = new ChatBubbleViewHolder(this.mContext,v, mClickListener); //Allows onLongClick ContextMenu on bubbles mFragment.registerForContextMenu(v); @@ -157,7 +156,6 @@ public class ChatEventsAdapter extends SelectableAdapter { holder.messageSendingInProgress.setVisibility(View.GONE); holder.imdmLayout.setVisibility(View.INVISIBLE); holder.contactPicture.setImageBitmap(ContactsManager.getInstance().getDefaultAvatarBitmap()); - //Apply generic bindings if (isEditionEnabled()) { holder.delete.setOnCheckedChangeListener(null); @@ -165,8 +163,7 @@ public class ChatEventsAdapter extends SelectableAdapter { holder.delete.setTag(position); } - //If event is Chat Message - if(event.getType() == EventLog.Type.ConferenceChatMessage) { + if (event.getType() == EventLog.Type.ConferenceChatMessage) { holder.bubbleLayout.setVisibility(View.VISIBLE); final ChatMessage message = event.getChatMessage(); @@ -342,7 +339,6 @@ public class ChatEventsAdapter extends SelectableAdapter { holder.bubbleLayout.setLayoutParams(layoutParams); } else { // Event is not chat message - holder.eventLayout.setVisibility(View.VISIBLE); Address address = event.getParticipantAddress(); @@ -389,9 +385,6 @@ public class ChatEventsAdapter extends SelectableAdapter { //TODO break; } - - - } } @@ -437,7 +430,6 @@ public class ChatEventsAdapter extends SelectableAdapter { notifyDataSetChanged(); } - private void loadBitmap(String path, ImageView imageView) { if (cancelPotentialWork(path, imageView)) { if (LinphoneUtils.isExtensionImage(path)) { diff --git a/src/android/org/linphone/chat/ChatListFragment.java b/src/android/org/linphone/chat/ChatListFragment.java index aa1647fbd..9d6f7e30b 100644 --- a/src/android/org/linphone/chat/ChatListFragment.java +++ b/src/android/org/linphone/chat/ChatListFragment.java @@ -69,19 +69,16 @@ public class ChatListFragment extends Fragment implements ContactsUpdatedListene public View onCreateView(final LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { super.onCreate(savedInstanceState); - //We get back all ChatRooms from the LinphoneManager and store them mRooms = new ArrayList<>(Arrays.asList(LinphoneManager.getLc().getChatRooms())); this.mContext = getActivity().getApplicationContext(); View view = inflater.inflate(R.layout.chatlist, container, false); - //Views definition mChatRoomsList = view.findViewById(R.id.chatList); mWaitLayout = view.findViewById(R.id.waitScreen); mNewDiscussionButton = view.findViewById(R.id.new_discussion); mBackToCallButton = view.findViewById(R.id.back_in_call); - //Creation and affectation of adapter to the RecyclerView and SelectionHelper mSelectionHelper = new SelectableHelper(view, this); mChatRoomsAdapter = new ChatRoomsAdapter(mContext, R.layout.chatlist_cell, mRooms,this, mSelectionHelper); @@ -89,11 +86,9 @@ public class ChatListFragment extends Fragment implements ContactsUpdatedListene mSelectionHelper.setAdapter(mChatRoomsAdapter); mSelectionHelper.setDialogMessage(R.string.chat_room_delete_dialog); - //Initialize the LayoutManager RecyclerView.LayoutManager layoutManager = new LinearLayoutManager(mContext); mChatRoomsList.setLayoutManager(layoutManager); - //Divider between items DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(mChatRoomsList.getContext(), ((LinearLayoutManager) layoutManager).getOrientation()); dividerItemDecoration.setDrawable(getActivity().getApplicationContext().getResources().getDrawable(R.drawable.divider)); @@ -115,7 +110,6 @@ public class ChatListFragment extends Fragment implements ContactsUpdatedListene } }); - //Update ChatRoomsList on change mListener = new CoreListenerStub() { @Override public void onMessageReceived(Core lc, ChatRoom cr, ChatMessage message) { @@ -151,7 +145,6 @@ public class ChatListFragment extends Fragment implements ContactsUpdatedListene return view; } - //On a click on an item, go to the selected ChatRoom if no SelectionMode chosen, select the item if it does @Override public void onItemClicked(int position) { if (mChatRoomsAdapter.isEditionEnabled()) { @@ -165,7 +158,6 @@ public class ChatListFragment extends Fragment implements ContactsUpdatedListene @Override public boolean onItemLongClicked(int position) { if (!mChatRoomsAdapter.isEditionEnabled()) { - //Start selection mode mSelectionHelper.enterEditionMode(); } mChatRoomsAdapter.toggleSelection(position); @@ -250,7 +242,6 @@ public class ChatListFragment extends Fragment implements ContactsUpdatedListene } } - @Override public void onContactsUpdated() { if (!LinphoneActivity.isInstanciated() || LinphoneActivity.instance().getCurrentFragment() != CHAT_LIST) diff --git a/src/android/org/linphone/chat/ChatRoomsAdapter.java b/src/android/org/linphone/chat/ChatRoomsAdapter.java index f94d66328..6f6a05538 100644 --- a/src/android/org/linphone/chat/ChatRoomsAdapter.java +++ b/src/android/org/linphone/chat/ChatRoomsAdapter.java @@ -48,11 +48,9 @@ import java.util.Collections; import java.util.Comparator; import java.util.List; - public class ChatRoomsAdapter extends SelectableAdapter { public static class ChatRoomViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener, View.OnLongClickListener{ - public TextView lastMessageSenderView; public TextView lastMessageView; public TextView date; @@ -79,9 +77,8 @@ public class ChatRoomsAdapter extends SelectableAdapter 0) { contactAddress = mRoom.getParticipants()[0].getAddress(); @@ -133,20 +124,17 @@ public class ChatRoomsAdapter extends SelectableAdapter mRooms; @@ -183,7 +162,6 @@ public class ChatRoomsAdapter extends SelectableAdapter mRooms, ChatRoomViewHolder.ClickListener clickListener, SelectableHelper helper) { - super(helper); this.clickListener = clickListener; this.mRooms = mRooms; @@ -193,30 +171,19 @@ public class ChatRoomsAdapter extends SelectableAdapter mItems; private View.OnClickListener mDeleteListener; private boolean mHideAdminFeatures; private ChatRoom mChatRoom; public ImageView avatar; - - public GroupInfoAdapter(List items, boolean hideAdminFeatures, boolean isCreation) { mItems = items; mHideAdminFeatures = hideAdminFeatures || isCreation; - } @NonNull @@ -84,7 +78,6 @@ public class GroupInfoAdapter extends RecyclerView.Adapter contacts; - String[] sections; - ArrayList sectionsList; - Map map = new LinkedHashMap(); - private ViewHolder.ClickListener clickListener; + private List mContacts; + private String[] mSections; + private ArrayList mSectionsList; + private Map mMap = new LinkedHashMap(); + private ViewHolder.ClickListener mClickListener; private Context mContext; - private boolean isSearchMode; + private boolean mIsSearchMode; ContactsListAdapter(Context context, List contactsList, ViewHolder.ClickListener clickListener, SelectableHelper helper) { super(helper); - this.mContext=context; + mContext = context; updateDataSet(contactsList); - this.clickListener = clickListener; + mClickListener = clickListener; } @NonNull @Override public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.contact_cell, parent, false); - return new ViewHolder(v, clickListener); + return new ViewHolder(v, mClickListener); } @@ -122,13 +122,13 @@ public class ContactsListAdapter extends SelectableAdapter= getItemCount()) return null; - return contacts.get(position); + return mContacts.get(position); } - public void setSearchMode(boolean set){ - isSearchMode = set; + public void setmIsSearchMode(boolean set){ + mIsSearchMode = set; } public long getItemId(int position) { return position; } public void updateDataSet(List contactsList) { - contacts = contactsList; + mContacts = contactsList; - map = new LinkedHashMap(); + mMap = new LinkedHashMap(); String prevLetter = null; - for (int i = 0; i < contacts.size(); i++) { - LinphoneContact contact = contacts.get(i); + for (int i = 0; i < mContacts.size(); i++) { + LinphoneContact contact = mContacts.get(i); String fullName = contact.getFullName(); if (fullName == null || fullName.isEmpty()) { continue; @@ -180,40 +180,40 @@ public class ContactsListAdapter extends SelectableAdapter(map.keySet()); - sections = new String[sectionsList.size()]; - sectionsList.toArray(sections); + mSectionsList = new ArrayList(mMap.keySet()); + mSections = new String[mSectionsList.size()]; + mSectionsList.toArray(mSections); notifyDataSetChanged(); } @Override public Object[] getSections() { - return sections; + return mSections; } @Override public int getPositionForSection(int sectionIndex) { - if (sectionIndex >= sections.length || sectionIndex < 0) { + if (sectionIndex >= mSections.length || sectionIndex < 0) { return 0; } - return map.get(sections[sectionIndex]); + return mMap.get(mSections[sectionIndex]); } @Override public int getSectionForPosition(int position) { - if (position >= contacts.size() || position < 0) { + if (position >= mContacts.size() || position < 0) { return 0; } - LinphoneContact contact = contacts.get(position); + LinphoneContact contact = mContacts.get(position); String fullName = contact.getFullName(); if (fullName == null || fullName.isEmpty()) { return 0; } String letter = fullName.substring(0, 1).toUpperCase(Locale.getDefault()); - return sectionsList.indexOf(letter); + return mSectionsList.indexOf(letter); } } \ No newline at end of file diff --git a/src/android/org/linphone/contacts/ContactsListFragment.java b/src/android/org/linphone/contacts/ContactsListFragment.java index 017099c20..49566c9ad 100644 --- a/src/android/org/linphone/contacts/ContactsListFragment.java +++ b/src/android/org/linphone/contacts/ContactsListFragment.java @@ -188,7 +188,7 @@ public class ContactsListFragment extends Fragment implements OnItemClickListene return; } changeContactsToggle(); - mContactAdapter.setSearchMode(true); + mContactAdapter.setmIsSearchMode(true); List listContact; diff --git a/src/android/org/linphone/fragments/HistoryListFragment.java b/src/android/org/linphone/fragments/HistoryListFragment.java index af8c16fa0..a7fc88156 100644 --- a/src/android/org/linphone/fragments/HistoryListFragment.java +++ b/src/android/org/linphone/fragments/HistoryListFragment.java @@ -53,15 +53,15 @@ import java.util.List; public class HistoryListFragment extends Fragment implements OnClickListener, OnItemClickListener, CallHistoryAdapter.ViewHolder.ClickListener ,ContactsUpdatedListener,SelectableHelper.DeleteListener{ private RecyclerView historyList; private TextView noCallHistory, noMissedCallHistory; - private ImageView missedCalls, allCalls, edit, selectAll, deselectAll, delete, cancel; + private ImageView missedCalls, allCalls, edit; private View allCallsSelected, missedCallsSelected; - private LinearLayout editList, topBar; - private boolean onlyDisplayMissedCalls, isEditMode; + private boolean mOnlyDisplayMissedCalls, mIsEditMode; private List mLogs; - private CallHistoryAdapter mhistoryAdapter; - private LinearLayoutManager layoutManager; + private CallHistoryAdapter mHistoryAdapter; + private LinearLayoutManager mLayoutManager; private Context mContext; private SelectableHelper mSelectionHelper; + @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { @@ -74,11 +74,11 @@ public class HistoryListFragment extends Fragment implements OnClickListener, On historyList = (RecyclerView) view.findViewById(R.id.history_list); - layoutManager = new LinearLayoutManager(mContext); - historyList.setLayoutManager(layoutManager); + mLayoutManager = new LinearLayoutManager(mContext); + historyList.setLayoutManager(mLayoutManager); //Divider between items DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(historyList.getContext(), - layoutManager.getOrientation()); + mLayoutManager.getOrientation()); dividerItemDecoration.setDrawable(mContext.getResources().getDrawable(R.drawable.divider)); historyList.addItemDecoration(dividerItemDecoration); @@ -93,7 +93,7 @@ public class HistoryListFragment extends Fragment implements OnClickListener, On missedCallsSelected = view.findViewById(R.id.missed_calls_select); allCalls.setEnabled(false); - onlyDisplayMissedCalls = false; + mOnlyDisplayMissedCalls = false; edit = (ImageView) view.findViewById(R.id.edit); @@ -104,7 +104,6 @@ public class HistoryListFragment extends Fragment implements OnClickListener, On mLogs = Arrays.asList(LinphoneManager.getLc().getCallLogs()); } - public void displayFirstLog(){ if (mLogs != null && mLogs.size() > 0) { CallLog log = mLogs.get(0); @@ -121,7 +120,7 @@ public class HistoryListFragment extends Fragment implements OnClickListener, On } private void removeNotMissedCallsFromLogs() { - if (onlyDisplayMissedCalls) { + if (mOnlyDisplayMissedCalls) { List missedCalls = new ArrayList(); for (CallLog log : mLogs) { if (log.getStatus() == Call.Status.Missed) { @@ -135,7 +134,7 @@ public class HistoryListFragment extends Fragment implements OnClickListener, On private boolean hideHistoryListAndDisplayMessageIfEmpty() { removeNotMissedCallsFromLogs(); if (mLogs.isEmpty()) { - if (onlyDisplayMissedCalls) { + if (mOnlyDisplayMissedCalls) { noMissedCallHistory.setVisibility(View.VISIBLE); } else { noCallHistory.setVisibility(View.VISIBLE); @@ -165,9 +164,9 @@ public class HistoryListFragment extends Fragment implements OnClickListener, On mLogs = Arrays.asList(LinphoneManager.getLc().getCallLogs()); if (!hideHistoryListAndDisplayMessageIfEmpty()) { - mhistoryAdapter= new CallHistoryAdapter(getActivity().getApplicationContext(), mLogs, this, mSelectionHelper); - historyList.setAdapter(mhistoryAdapter); - mSelectionHelper.setAdapter(mhistoryAdapter); + mHistoryAdapter = new CallHistoryAdapter(getActivity().getApplicationContext(), mLogs, this, mSelectionHelper); + historyList.setAdapter(mHistoryAdapter); + mSelectionHelper.setAdapter(mHistoryAdapter); mSelectionHelper.setDialogMessage(R.string.chat_room_delete_dialog); } } @@ -197,7 +196,7 @@ public class HistoryListFragment extends Fragment implements OnClickListener, On allCallsSelected.setVisibility(View.VISIBLE); missedCallsSelected.setVisibility(View.INVISIBLE); missedCalls.setEnabled(true); - onlyDisplayMissedCalls = false; + mOnlyDisplayMissedCalls = false; refresh(); } if (id == R.id.missed_calls) { @@ -205,13 +204,13 @@ public class HistoryListFragment extends Fragment implements OnClickListener, On allCallsSelected.setVisibility(View.INVISIBLE); missedCallsSelected.setVisibility(View.VISIBLE); missedCalls.setEnabled(false); - onlyDisplayMissedCalls = true; + mOnlyDisplayMissedCalls = true; } if (!hideHistoryListAndDisplayMessageIfEmpty()) { // historyList.setChoiceMode(AbsListView.CHOICE_MODE_MULTIPLE); - mhistoryAdapter = new CallHistoryAdapter(mContext, mLogs, this ,mSelectionHelper); - historyList.setAdapter(mhistoryAdapter); - mSelectionHelper.setAdapter(mhistoryAdapter); + mHistoryAdapter = new CallHistoryAdapter(mContext, mLogs, this ,mSelectionHelper); + historyList.setAdapter(mHistoryAdapter); + mSelectionHelper.setAdapter(mHistoryAdapter); mSelectionHelper.setDialogMessage(R.string.chat_room_delete_dialog); } @@ -219,7 +218,7 @@ public class HistoryListFragment extends Fragment implements OnClickListener, On @Override public void onItemClick(AdapterView adapter, View view, int position, long id) { - if (mhistoryAdapter.isEditionEnabled()) { + if (mHistoryAdapter.isEditionEnabled()) { CallLog log = mLogs.get(position); LinphoneManager.getLc().removeCallLog(log); mLogs = Arrays.asList(LinphoneManager.getLc().getCallLogs()); @@ -228,7 +227,7 @@ public class HistoryListFragment extends Fragment implements OnClickListener, On @Override public void onDeleteSelection(Object[] objectsToDelete) { - int size = mhistoryAdapter.getSelectedItemCount(); + int size = mHistoryAdapter.getSelectedItemCount(); for(int i=0; i