mirrors/linphone-android
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-android.git synced 2026-01-22 14:18:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix call view

Browse source
This commit is contained in:
Erwan Croze 2019-01-15 10:55:56 +01:00
parent 74046e62ab
commit ba130ae5e9
4 changed files with 48 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
res/layout/call.xml
View file

@ -32,17 +32,17 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_gravity="top"
android:layout_gravity="bottom"
android:orientation="vertical"
android:visibility="gone">
</LinearLayout>
android:visibility="gone"></LinearLayout>
<RelativeLayout
android:id="@+id/active_call"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerHorizontal="false"
android:layout_above="@+id/calls_list"
android:layout_centerInParent="false"
android:layout_centerHorizontal="false"
android:layout_centerVertical="false"
android:visibility="visible">
@ -60,7 +60,7 @@
android:layout_alignParentLeft="true"
android:contentDescription="@string/content_description_switch_camera"
android:src="@drawable/switch_camera"
android:visibility="invisible"/>
android:visibility="invisible" />
<ImageView
android:id="@+id/encryption"
@ -78,7 +78,7 @@
android:layout_height="60dp"
android:layout_alignParentRight="true"
android:contentDescription="@string/content_description_pause"
android:src="@drawable/pause_big_default"/>
android:src="@drawable/pause_big_default" />
</RelativeLayout>
<RelativeLayout
@ -128,10 +128,10 @@
android:id="@+id/pause2"
android:layout_width="70dp"
android:layout_height="60dp"
android:layout_alignParentEnd="true"
android:layout_alignParentTop="true"
android:layout_alignParentEnd="true"
android:contentDescription="@string/content_description_pause"
android:src="@drawable/pause_big_default"/>
android:src="@drawable/pause_big_default" />
</RelativeLayout>
<ImageView
@ -141,7 +141,7 @@
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:layout_gravity="center"
android:src="@drawable/waiting_time"/>
android:src="@drawable/waiting_time" />
<TextView
style="@style/font16"
@ -150,7 +150,7 @@
android:layout_below="@+id/pause_logo"
android:layout_centerHorizontal="true"
android:layout_gravity="center"
android:text="@string/call_paused_by_remote"/>
android:text="@string/call_paused_by_remote" />
</RelativeLayout>
@ -158,8 +158,7 @@
android:id="@+id/active_call_info"
android:layout_width="match_parent"
android:layout_height="80dp"
android:layout_above="@+id/calls_list"
android:layout_alignParentBottom="false"
android:layout_alignParentBottom="true"
android:alpha="0.8"
android:background="@color/colorH"
android:orientation="vertical">
@ -181,41 +180,41 @@
android:layout_gravity="center" />
</LinearLayout>
<LinearLayout
android:id="@+id/calls_list"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_gravity="bottom"
android:background="@color/colorH"
android:orientation="vertical">
</LinearLayout>
</RelativeLayout>
<LinearLayout
android:id="@+id/calls_list"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_gravity="bottom"
android:background="@color/colorH"
android:orientation="vertical"/>
<LinearLayout
android:id="@+id/no_current_call"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:alpha="0"
android:layout_above="@+id/calls_list"
android:alpha="1"
android:background="#e6ff6600"
android:gravity="center_vertical"
android:orientation="vertical"
android:visibility="visible">
android:visibility="gone">
<ImageView
android:layout_width="115dp"
android:layout_height="115dp"
android:layout_gravity="center"
android:src="@drawable/waiting_time"
android:visibility="gone"/>
android:visibility="visible" />
<TextView
style="@style/font16"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="@string/no_current_call"/>
android:text="@string/no_current_call" />
</LinearLayout>
</RelativeLayout>

24
res/layout/call_inactive_row.xml
View file

@ -1,19 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_margin="2dp"
android:alpha="0.5"
android:background="@color/colorM"
android:gravity="center_vertical"
android:orientation="horizontal"
android:padding="5dp">
android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_margin="2dp"
android:alpha="1"
android:background="@color/colorM"
android:gravity="center_vertical"
android:orientation="horizontal"
android:padding="5dp">
<ImageView
android:id="@+id/contact_picture"
android:layout_width="40dp"
android:layout_height="40dp"
android:src="@drawable/avatar_big_secure1"/>
android:src="@drawable/avatar_big_secure1" />
<TextView
android:id="@+id/contact_name"
@ -24,7 +24,7 @@
android:maxLines="1"
android:paddingLeft="20dp"
android:paddingRight="10dp"
android:textColor="#aeaeae"/>
android:textColor="#aeaeae" />
<Chronometer
android:id="@+id/call_timer"
@ -34,7 +34,7 @@
android:paddingLeft="10dp"
android:paddingRight="20dp"
android:textColor="#ff5e00"
android:textSize="13.3sp"/>
android:textSize="13.3sp" />
<ImageView
android:id="@+id/call_pause"
@ -42,6 +42,6 @@
android:layout_height="40dp"
android:contentDescription="@string/content_description_pause"
android:gravity="center_vertical"
android:src="@drawable/pause"/>
android:src="@drawable/pause" />
</LinearLayout>

7
src/android/org/linphone/LinphoneManager.java
View file

@ -1041,8 +1041,13 @@ public class LinphoneManager implements CoreListener, SensorEventListener, Accou
private Vibrator mVibrator;
public void onNewSubscriptionRequested(Core lc, Friend lf, String url) {}
@Override
public void onNotifyPresenceReceived(Core lc, Friend lf) {
ContactsManager.getInstance().refreshSipContact(lf);
//ContactsManager.getInstance().refreshSipContact(lf);
if (ContactsManager.getInstance() != null) {
ContactsManager.getInstance().fetchContactsAsync();
}
}
@Override

7
src/android/org/linphone/call/CallActivity.java
View file

@ -886,13 +886,13 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList
}
private void displayNoCurrentCall(boolean display){
/*if(!display) {
if(!display) {
mActiveCallHeader.setVisibility(View.VISIBLE);
mNoCurrentCall.setVisibility(View.GONE);
} else {
mActiveCallHeader.setVisibility(View.GONE);
mNoCurrentCall.setVisibility(View.VISIBLE);
}*/
}
}
private void displayCallPaused(boolean display){
@ -1676,6 +1676,9 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList
}
displayPausedCalls(resources, call, index);
index++;
} else if (call.getState() == State.Paused) {
displayPausedCalls(resources, call, index);
index++;
} else {
displayCurrentCall(call);
}