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

Put code for call history in the same place

Browse source
This commit is contained in:
Sylvain Berfini 2018-11-22 16:08:59 +01:00
parent a9035665d4
commit c913577f93
4 changed files with 18 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/org/linphone/LinphoneActivity.java
View file

@ -101,8 +101,8 @@ import org.linphone.settings.AccountPreferencesFragment;
import org.linphone.fragments.DialerFragment; import org.linphone.fragments.DialerFragment;
import org.linphone.fragments.EmptyFragment; import org.linphone.fragments.EmptyFragment;
import org.linphone.fragments.FragmentsAvailable; import org.linphone.fragments.FragmentsAvailable;
import org.linphone.fragments.HistoryDetailFragment; import org.linphone.history.HistoryDetailFragment;
import org.linphone.fragments.HistoryListFragment; import org.linphone.history.HistoryListFragment;
import org.linphone.settings.SettingsFragment; import org.linphone.settings.SettingsFragment;
import org.linphone.fragments.StatusFragment; import org.linphone.fragments.StatusFragment;
import org.linphone.mediastream.Log; import org.linphone.mediastream.Log;

14
app/src/main/java/org/linphone/call/CallHistoryAdapter.java → app/src/main/java/org/linphone/history/HistoryAdapter.java
View file

@ -1,7 +1,7 @@
package org.linphone.call; package org.linphone.history;
/* /*
CallHistoryAdapter.java HistoryAdapter.java
Copyright (C) 2018 Belledonne Communications, Grenoble, France Copyright (C) 2018 Belledonne Communications, Grenoble, France
This program is free software; you can redistribute it and/or This program is free software; you can redistribute it and/or
@ -48,7 +48,7 @@ import java.text.SimpleDateFormat;
import java.util.Calendar; import java.util.Calendar;
import java.util.List; import java.util.List;
public class CallHistoryAdapter extends SelectableAdapter<CallHistoryAdapter.ViewHolder> { public class HistoryAdapter extends SelectableAdapter<HistoryAdapter.ViewHolder> {
public static class ViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener, public static class ViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener,
View.OnLongClickListener { View.OnLongClickListener {
public TextView contact; public TextView contact;
@ -59,9 +59,9 @@ public class CallHistoryAdapter extends SelectableAdapter<CallHistoryAdapter.Vie
public RelativeLayout CallContact; public RelativeLayout CallContact;
public LinearLayout separator; public LinearLayout separator;
public TextView separatorText; public TextView separatorText;
private CallHistoryAdapter.ViewHolder.ClickListener mListener; private HistoryAdapter.ViewHolder.ClickListener mListener;
public ViewHolder(View view, CallHistoryAdapter.ViewHolder.ClickListener listener) { public ViewHolder(View view, HistoryAdapter.ViewHolder.ClickListener listener) {
super(view); super(view);
contact = view.findViewById(R.id.sip_uri); contact = view.findViewById(R.id.sip_uri);
detail = view.findViewById(R.id.detail); detail = view.findViewById(R.id.detail);
@ -100,9 +100,9 @@ public class CallHistoryAdapter extends SelectableAdapter<CallHistoryAdapter.Vie
private List<CallLog> mLogs; private List<CallLog> mLogs;
private Context mContext; private Context mContext;
private CallHistoryAdapter.ViewHolder.ClickListener clickListener; private HistoryAdapter.ViewHolder.ClickListener clickListener;
public CallHistoryAdapter(Context aContext, List<CallLog> logs, CallHistoryAdapter.ViewHolder.ClickListener listener, SelectableHelper helper) { public HistoryAdapter(Context aContext, List<CallLog> logs, HistoryAdapter.ViewHolder.ClickListener listener, SelectableHelper helper) {
super(helper); super(helper);
this.mLogs = logs; this.mLogs = logs;
this.mContext = aContext; this.mContext = aContext;

3
app/src/main/java/org/linphone/fragments/HistoryDetailFragment.java → app/src/main/java/org/linphone/history/HistoryDetailFragment.java
View file

@ -1,4 +1,4 @@
package org.linphone.fragments; package org.linphone.history;
/* /*
HistoryDetailFragment.java HistoryDetailFragment.java
@ -31,6 +31,7 @@ import android.widget.RelativeLayout;
import android.widget.TextView; import android.widget.TextView;
import org.linphone.LinphoneManager; import org.linphone.LinphoneManager;
import org.linphone.fragments.FragmentsAvailable;
import org.linphone.settings.LinphonePreferences; import org.linphone.settings.LinphonePreferences;
import org.linphone.utils.ImageUtils; import org.linphone.utils.ImageUtils;
import org.linphone.utils.LinphoneUtils; import org.linphone.utils.LinphoneUtils;

14
app/src/main/java/org/linphone/fragments/HistoryListFragment.java → app/src/main/java/org/linphone/history/HistoryListFragment.java
View file

@ -1,4 +1,4 @@
package org.linphone.fragments; package org.linphone.history;
/* /*
HistoryListFragment.java HistoryListFragment.java
@ -37,7 +37,7 @@ import android.widget.TextView;
import org.linphone.LinphoneManager; import org.linphone.LinphoneManager;
import org.linphone.R; import org.linphone.R;
import org.linphone.LinphoneActivity; import org.linphone.LinphoneActivity;
import org.linphone.call.CallHistoryAdapter; import org.linphone.fragments.FragmentsAvailable;
import org.linphone.contacts.ContactsManager; import org.linphone.contacts.ContactsManager;
import org.linphone.contacts.ContactsUpdatedListener; import org.linphone.contacts.ContactsUpdatedListener;
import org.linphone.core.Address; import org.linphone.core.Address;
@ -49,14 +49,14 @@ import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
public class HistoryListFragment extends Fragment implements OnClickListener, OnItemClickListener, CallHistoryAdapter.ViewHolder.ClickListener, ContactsUpdatedListener, SelectableHelper.DeleteListener { public class HistoryListFragment extends Fragment implements OnClickListener, OnItemClickListener, HistoryAdapter.ViewHolder.ClickListener, ContactsUpdatedListener, SelectableHelper.DeleteListener {
private RecyclerView historyList; private RecyclerView historyList;
private TextView noCallHistory, noMissedCallHistory; private TextView noCallHistory, noMissedCallHistory;
private ImageView missedCalls, allCalls; private ImageView missedCalls, allCalls;
private View allCallsSelected, missedCallsSelected; private View allCallsSelected, missedCallsSelected;
private boolean mOnlyDisplayMissedCalls; private boolean mOnlyDisplayMissedCalls;
private List<CallLog> mLogs; private List<CallLog> mLogs;
private CallHistoryAdapter mHistoryAdapter; private HistoryAdapter mHistoryAdapter;
private LinearLayoutManager mLayoutManager; private LinearLayoutManager mLayoutManager;
private Context mContext; private Context mContext;
private SelectableHelper mSelectionHelper; private SelectableHelper mSelectionHelper;
@ -156,7 +156,7 @@ public class HistoryListFragment extends Fragment implements OnClickListener, On
mLogs = Arrays.asList(LinphoneManager.getLc().getCallLogs()); mLogs = Arrays.asList(LinphoneManager.getLc().getCallLogs());
hideHistoryListAndDisplayMessageIfEmpty(); hideHistoryListAndDisplayMessageIfEmpty();
mHistoryAdapter = new CallHistoryAdapter(getActivity().getApplicationContext(), mLogs, this, mSelectionHelper); mHistoryAdapter = new HistoryAdapter(getActivity().getApplicationContext(), mLogs, this, mSelectionHelper);
historyList.setAdapter(mHistoryAdapter); historyList.setAdapter(mHistoryAdapter);
mSelectionHelper.setAdapter(mHistoryAdapter); mSelectionHelper.setAdapter(mHistoryAdapter);
mSelectionHelper.setDialogMessage(R.string.chat_room_delete_dialog); mSelectionHelper.setDialogMessage(R.string.chat_room_delete_dialog);
@ -172,7 +172,7 @@ public class HistoryListFragment extends Fragment implements OnClickListener, On
public void onContactsUpdated() { public void onContactsUpdated() {
if (!LinphoneActivity.isInstanciated() || LinphoneActivity.instance().getCurrentFragment() != FragmentsAvailable.HISTORY_LIST) if (!LinphoneActivity.isInstanciated() || LinphoneActivity.instance().getCurrentFragment() != FragmentsAvailable.HISTORY_LIST)
return; return;
CallHistoryAdapter adapter = (CallHistoryAdapter) historyList.getAdapter(); HistoryAdapter adapter = (HistoryAdapter) historyList.getAdapter();
if (adapter != null) { if (adapter != null) {
adapter.notifyDataSetChanged(); adapter.notifyDataSetChanged();
} }
@ -198,7 +198,7 @@ public class HistoryListFragment extends Fragment implements OnClickListener, On
mOnlyDisplayMissedCalls = true; mOnlyDisplayMissedCalls = true;
} }
hideHistoryListAndDisplayMessageIfEmpty(); hideHistoryListAndDisplayMessageIfEmpty();
mHistoryAdapter = new CallHistoryAdapter(mContext, mLogs, this, mSelectionHelper); mHistoryAdapter = new HistoryAdapter(mContext, mLogs, this, mSelectionHelper);
historyList.setAdapter(mHistoryAdapter); historyList.setAdapter(mHistoryAdapter);
mSelectionHelper.setAdapter(mHistoryAdapter); mSelectionHelper.setAdapter(mHistoryAdapter);
mSelectionHelper.setDialogMessage(R.string.chat_room_delete_dialog); mSelectionHelper.setDialogMessage(R.string.chat_room_delete_dialog);