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

Fix call view and info chat view

Browse source
This commit is contained in:
Erwan Croze 2018-06-21 15:38:17 +02:00
parent e889c23a22
commit e16c47fd73
8 changed files with 65 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
res/drawable-xhdpi/arrow_accept.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 417 B

BIN
res/drawable-xhdpi/arrow_hangup.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 437 B

After

Width:  |  Height:  |  Size: 438 B

6
res/drawable/pause.xml
View file

@ -1,8 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true"
android:drawable="@drawable/pause_small_over_selected" />
<item
android:drawable="@drawable/pause_small_default" />
<item android:state_pressed="true" android:drawable="@drawable/pause_small_over_selected"/>
<item android:drawable="@drawable/pause_small_default"/>
</selector>

11
res/layout/call.xml
View file

@ -473,13 +473,16 @@
<RelativeLayout
android:id="@+id/side_menu_content"
android:background="@color/colorH"
android:layout_marginTop="40dp"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="left">
android:layout_gravity="left"
android:layout_marginTop="30dp"
android:background="@color/colorH">
<include layout="@layout/incall_stats" android:id="@+id/incall_stats"/>
<include
android:id="@+id/incall_stats"
layout="@layout/incall_stats"
/>
</RelativeLayout>

50
res/layout/call_inactive_row.xml
View file

@ -1,46 +1,46 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:background="@color/colorA"
android:alpha="0.5"
android:layout_height="50dp"
android:layout_width="match_parent"
android:layout_margin="2dp"
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="0.5"
android:background="@color/colorM"
android:gravity="center_vertical"
android:orientation="horizontal"
android:padding="5dp">
<ImageView
android:id="@+id/contact_picture"
android:src="@drawable/avatar"
android:layout_width="40dp"
android:layout_height="40dp"/>
android:layout_height="40dp"
android:src="@drawable/avatar_big_secure1"/>
<TextView
android:id="@+id/contact_name"
<TextView
android:id="@+id/contact_name"
style="@style/font14"
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center_vertical|left"
android:maxLines="1"
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center_vertical|left"
android:paddingLeft="20dp"
android:paddingRight="10dp"/>
android:paddingLeft="20dp"
android:paddingRight="10dp"/>
<Chronometer
android:id="@+id/call_timer"
style="@style/font16"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_vertical|right"
android:paddingLeft="10dp"
android:paddingRight="20dp"
android:gravity="center_vertical|right"/>
android:paddingRight="20dp"/>
<ImageView
<ImageView
android:id="@+id/call_pause"
android:src="@drawable/pause_small_over_selected"
android:layout_width="40dp"
android:layout_height="40dp"
android:contentDescription="@string/content_description_pause"
android:layout_width="40dp"
android:layout_height="40dp"
android:gravity="center_vertical"/>
android:gravity="center_vertical"
android:src="@drawable/pause"/>
</LinearLayout>

24
res/layout/call_incoming.xml
View file

@ -121,22 +121,26 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:background="@color/colorA"
android:background="@color/colorN"
android:orientation="horizontal"
android:paddingBottom="15dp"
android:paddingLeft="15dp"
android:paddingTop="15dp"
android:paddingBottom="10dp"
android:paddingLeft="10dp"
android:paddingTop="10dp"
android:visibility="gone">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="-15dp"
android:layout_weight="1.1"
android:src="@drawable/arrow_accept"/>
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="-15dp"
android:alpha="0.6"
android:layout_weight="1.1"
android:src="@drawable/arrow_accept"/>
<ImageView
@ -144,6 +148,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:alpha="0.2"
android:layout_weight="1.1"
android:src="@drawable/arrow_accept"/>
</LinearLayout>
@ -163,9 +168,9 @@
android:layout_gravity="bottom"
android:background="@color/colorB"
android:orientation="horizontal"
android:paddingBottom="15dp"
android:paddingLeft="15dp"
android:paddingTop="15dp"
android:paddingBottom="10dp"
android:paddingLeft="10dp"
android:paddingTop="10dp"
android:visibility="gone">
<ImageView
@ -173,18 +178,23 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:alpha="0.2"
android:layout_weight="1.1"
android:src="@drawable/arrow_hangup"/>
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="-15dp"
android:alpha="0.6"
android:layout_weight="1.1"
android:src="@drawable/arrow_hangup"/>
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="-15dp"
android:layout_weight="1.1"
android:src="@drawable/arrow_hangup"/>
</LinearLayout>

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

@ -573,14 +573,14 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList
isSpeakerEnabled = false; // We need this if isSpeakerEnabled wasn't set correctly
//routeEarpiece.setImageResource(R.drawable.route_earpiece);
//routeBluetooth.setImageResource(R.drawable.route_bluetooth_selected);
routeEarpiece.setAlpha(0.5f);
routeBluetooth.setAlpha(1f);
routeEarpiece.setImageAlpha(120);
routeBluetooth.setImageAlpha(255);
return;
} else {
//routeEarpiece.setImageResource(R.drawable.route_earpiece_selected);
//routeBluetooth.setImageResource(R.drawable.route_bluetooth);
routeEarpiece.setAlpha(1f);
routeBluetooth.setAlpha(0.5f);
routeEarpiece.setImageAlpha(255);
routeBluetooth.setImageAlpha(120);
}
if (isSpeakerEnabled) {
@ -588,8 +588,8 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList
//routeSpeaker.setImageResource(R.drawable.route_speaker_selected);
//routeEarpiece.setImageResource(R.drawable.route_earpiece);
//routeBluetooth.setImageResource(R.drawable.route_bluetooth);
routeEarpiece.setAlpha(0.5f);
routeBluetooth.setAlpha(0.5f);
routeEarpiece.setImageAlpha(120);
routeBluetooth.setImageAlpha(120);
}
} catch (NullPointerException npe) {
Log.e("Bluetooth: Audio routes menu disabled on tablets for now (4)");
@ -711,8 +711,8 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList
/*routeBluetooth.setImageResource(R.drawable.route_bluetooth_selected);
routeSpeaker.setImageResource(R.drawable.route_speaker);
routeEarpiece.setImageResource(R.drawable.route_earpiece);*/
routeEarpiece.setAlpha(0.5f);
routeBluetooth.setAlpha(1f);
routeEarpiece.setImageAlpha(120);
routeBluetooth.setImageAlpha(255);
routeSpeaker.setImageResource(R.drawable.speaker_default);
}
hideOrDisplayAudioRoutes();
@ -723,8 +723,8 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList
/*routeBluetooth.setImageResource(R.drawable.route_bluetooth);
routeSpeaker.setImageResource(R.drawable.route_speaker);
routeEarpiece.setImageResource(R.drawable.route_earpiece_selected);*/
routeEarpiece.setAlpha(1f);
routeBluetooth.setAlpha(0.5f);
routeEarpiece.setImageAlpha(255);
routeBluetooth.setImageAlpha(120);
routeSpeaker.setImageResource(R.drawable.speaker_default);
hideOrDisplayAudioRoutes();
}
@ -734,8 +734,8 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList
/*routeBluetooth.setImageResource(R.drawable.route_bluetooth);
routeSpeaker.setImageResource(R.drawable.route_speaker_selected);
routeEarpiece.setImageResource(R.drawable.route_earpiece);*/
routeEarpiece.setAlpha(0.5f);
routeBluetooth.setAlpha(0.5f);
routeEarpiece.setImageAlpha(120);
routeBluetooth.setImageAlpha(120);
routeSpeaker.setImageResource(R.drawable.route_speaker_default);
hideOrDisplayAudioRoutes();
}

4
src/android/org/linphone/call/CallIncomingActivity.java
View file

@ -138,7 +138,7 @@ public class CallIncomingActivity extends LinphoneGenericActivity implements Lin
answerX = curX;
if (oldMove < -25)
begin = false;
if (curX < arrow.getWidth() && !begin) {
if (curX < acceptUnlock.getWidth()*1.5f && !begin) {
answer();
return true;
}
@ -167,7 +167,7 @@ public class CallIncomingActivity extends LinphoneGenericActivity implements Lin
curX = motionEvent.getX();
view.scrollBy((int) (declineX - curX), view.getScrollY());
declineX = curX;
if (curX > (screenWidth-arrow.getWidth()*4)) {
if (curX > (screenWidth-arrow.getWidth()*6)) {
decline();
return true;
}