From 0c8eacec41d6422570381c6cc5310ba52b69b77d Mon Sep 17 00:00:00 2001 From: Erwan Croze Date: Thu, 23 Aug 2018 12:19:10 +0200 Subject: [PATCH] Fix some bug --- res/layout/call.xml | 26 +++++++++++-------- res/layout/conf_call_control_row.xml | 26 ++++++++++--------- res/layout/conference_paused_row.xml | 4 +-- res/layout/dialer.xml | 6 ++--- .../linphone/activities/LinphoneActivity.java | 15 +++++++++-- .../org/linphone/call/CallActivity.java | 16 ++++++++---- .../linphone/fragments/DialerFragment.java | 6 ++--- 7 files changed, 60 insertions(+), 39 deletions(-) diff --git a/res/layout/call.xml b/res/layout/call.xml index 5ab4b4d98..928d4d840 100644 --- a/res/layout/call.xml +++ b/res/layout/call.xml @@ -47,6 +47,7 @@ android:id="@+id/action_menu" android:layout_width="match_parent" android:layout_height="50dp" + android:layout_alignParentTop="true" android:layout_marginTop="10dp"> @@ -109,8 +110,7 @@ android:id="@+id/remote_pause" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="#e6ff6600" - android:gravity="center" + android:background="#ff6600" android:visibility="gone"> + android:layout_alignParentTop="false"> @@ -134,6 +135,7 @@ android:layout_width="115dp" android:layout_height="115dp" android:layout_centerHorizontal="true" + android:layout_centerVertical="true" android:layout_gravity="center" android:src="@drawable/waiting_time"/> @@ -153,7 +155,8 @@ android:layout_width="match_parent" android:layout_height="80dp" android:layout_alignParentBottom="true" - android:layout_marginTop="-5dp" + android:layout_below="@+id/avatar_layout" + android:layout_marginTop="5dp" android:alpha="0.8" android:background="@color/colorH" android:orientation="vertical"> @@ -181,6 +184,7 @@ android:id="@+id/calls_list" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_above="@+id/active_call" android:layout_alignParentBottom="true" android:layout_gravity="bottom" android:background="@color/colorH" @@ -196,7 +200,7 @@ android:background="#e6ff6600" android:gravity="center_vertical" android:orientation="vertical" - android:visibility="gone"> + android:visibility="visible"> @@ -429,7 +433,7 @@ android:layout_weight="0.5" android:background="#aeaeae" android:contentDescription="@string/content_description_transfer" - android:padding="15dp" + android:padding="10dp" android:src="@drawable/options_transfer_call_button" android:visibility="invisible"/> @@ -472,7 +476,7 @@ android:background="#aeaeae" android:contentDescription="@string/content_description_conference" android:padding="10dp" - android:src="@drawable/options_start_conference_button" + android:src="@drawable/conference_default" android:visibility="invisible"/> diff --git a/res/layout/conf_call_control_row.xml b/res/layout/conf_call_control_row.xml index 81b3e831c..414bf4d7a 100644 --- a/res/layout/conf_call_control_row.xml +++ b/res/layout/conf_call_control_row.xml @@ -12,9 +12,10 @@ + android:layout_width="50dp" + android:layout_height="50dp" + android:layout_marginLeft="10dp" + android:src="@drawable/avatar_small_secure1"/> + android:gravity="center_vertical|right" + android:paddingLeft="20dp" + /> + android:gravity="center_vertical" + android:scaleType="fitCenter" + android:src="@drawable/conference_exit_default"/> \ No newline at end of file diff --git a/res/layout/conference_paused_row.xml b/res/layout/conference_paused_row.xml index 1b7907a50..9f48a4286 100644 --- a/res/layout/conference_paused_row.xml +++ b/res/layout/conference_paused_row.xml @@ -11,9 +11,9 @@ + android:layout_height="40dp" + android:src="@drawable/conference_default"/> + android:src="@drawable/call_start"/> diff --git a/src/android/org/linphone/activities/LinphoneActivity.java b/src/android/org/linphone/activities/LinphoneActivity.java index ffae707ce..539bf507d 100644 --- a/src/android/org/linphone/activities/LinphoneActivity.java +++ b/src/android/org/linphone/activities/LinphoneActivity.java @@ -1055,7 +1055,15 @@ public class LinphoneActivity extends LinphoneGenericActivity implements OnClick AddressType address = new AddressText(this, null); address.setDisplayedName(name); address.setText(number); - LinphoneManager.getInstance().newOutgoingCall(address); + if (isCallTransfer()) { + Core lc = LinphoneManager.getLc(); + if (lc.getCurrentCall() == null) { + return; + } + lc.transferCall(lc.getCurrentCall(), address.getText().toString()); + } else { + LinphoneManager.getInstance().newOutgoingCall(address); + } } public void startIncallActivity(Call currentCall) { @@ -1118,11 +1126,14 @@ public class LinphoneActivity extends LinphoneGenericActivity implements OnClick } private void initInCallMenuLayout(final boolean callTransfer) { + /*goToDialerFragment(); selectMenu(FragmentsAvailable.DIALER); DialerFragment dialerFragment = DialerFragment.instance(); if (dialerFragment != null) { ((DialerFragment) dialerFragment).resetLayout(callTransfer); - } + }*/ + // Obiane Spec + displayContacts(false); } public void resetClassicMenuLayoutAndGoBackToCallIfStillRunning() { diff --git a/src/android/org/linphone/call/CallActivity.java b/src/android/org/linphone/call/CallActivity.java index dba06c384..dc364294e 100644 --- a/src/android/org/linphone/call/CallActivity.java +++ b/src/android/org/linphone/call/CallActivity.java @@ -611,8 +611,11 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList } //Enabled transfer button - if(isTransferAllowed && !LinphoneManager.getLc().soundResourcesLocked()) + if(isTransferAllowed && !LinphoneManager.getLc().soundResourcesLocked()) { enabledTransferButton(true); + } else { + enabledTransferButton(false); + } //Enable conference button if(LinphoneManager.getLc().getCallsNb() > 1 && LinphoneManager.getLc().getCallsNb() > confsize && !LinphoneManager.getLc().soundResourcesLocked()) { @@ -638,7 +641,6 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList if(!isTablet()){ speaker.setEnabled(true); } - transfer.setEnabled(true); pause.setEnabled(true); dialer.setEnabled(true); } @@ -779,16 +781,20 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList private void enabledTransferButton(boolean enabled){ if(enabled) { transfer.setEnabled(true); + transfer.setAlpha(1f); } else { transfer.setEnabled(false); + transfer.setAlpha(0.4f); } } private void enabledConferenceButton(boolean enabled){ if (enabled) { conference.setEnabled(true); + conference.setAlpha(1f); } else { conference.setEnabled(false); + conference.setAlpha(0.4f); } } @@ -1042,7 +1048,7 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList displayVideoCall(false); numpad.setVisibility(View.GONE); //options.setImageResource(R.drawable.options_default); - options.setImageAlpha(125); + options.setImageAlpha(255); } }, SECONDS_BEFORE_HIDING_CONTROLS); } @@ -1093,7 +1099,7 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList //Hide options if (addCall.getVisibility() == View.VISIBLE) { //options.setImageResource(R.drawable.options_disabled); - options.setImageAlpha(125); + options.setImageAlpha(255); if (isTransferAllowed) { transfer.setVisibility(View.INVISIBLE); } @@ -1106,7 +1112,7 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList addCall.setVisibility(View.VISIBLE); conference.setVisibility(View.VISIBLE); //options.setImageResource(R.drawable.options_default); - options.setImageAlpha(255); + options.setImageAlpha(100); transfer.setEnabled(LinphoneManager.getLc().getCurrentCall() != null); } } diff --git a/src/android/org/linphone/fragments/DialerFragment.java b/src/android/org/linphone/fragments/DialerFragment.java index 640be7e67..f9cfb80c3 100644 --- a/src/android/org/linphone/fragments/DialerFragment.java +++ b/src/android/org/linphone/fragments/DialerFragment.java @@ -79,7 +79,7 @@ public class DialerFragment extends Fragment { /*if (LinphoneManager.getLcIfManagerNotDestroyedOrNull() != null && LinphoneManager.getLcIfManagerNotDestroyedOrNull().getVideoActivationPolicy().getAutomaticallyInitiate()) { mCall.setImageResource(R.drawable.call_video_start); } else {*/ - mCall.setImageResource(R.drawable.call_alt_start_selected); + mCall.setImageResource(R.drawable.call_start); //} } @@ -203,7 +203,7 @@ public class DialerFragment extends Fragment { mCall.setImageResource(R.drawable.call_transfer); mCall.setExternalClickListener(transferListener); } else { - mCall.setImageResource(R.drawable.call_alt_start_selected); + mCall.setImageResource(R.drawable.call_start); //mCall.setImageResource(R.drawable.call_add); //mCall.resetClickListener(); } @@ -215,7 +215,7 @@ public class DialerFragment extends Fragment { /*if (LinphoneManager.getLc().getVideoActivationPolicy().getAutomaticallyInitiate()) { mCall.setImageResource(R.drawable.call_video_start); } else {*/ - mCall.setImageResource(R.drawable.call_alt_start_selected); + mCall.setImageResource(R.drawable.call_start); //} mAddContact.setEnabled(false); //mAddContact.setImageResource(R.drawable.contact_add_button);