From e16c47fd737246b1b5ac2d5ee969d1bb7b7cbd8b Mon Sep 17 00:00:00 2001 From: Erwan Croze Date: Thu, 21 Jun 2018 15:38:17 +0200 Subject: [PATCH] Fix call view and info chat view --- res/drawable-xhdpi/arrow_accept.png | Bin 2137 -> 417 bytes res/drawable-xhdpi/arrow_hangup.png | Bin 437 -> 438 bytes res/drawable/pause.xml | 6 +-- res/layout/call.xml | 11 ++-- res/layout/call_inactive_row.xml | 50 +++++++++--------- res/layout/call_incoming.xml | 24 ++++++--- .../org/linphone/call/CallActivity.java | 24 ++++----- .../linphone/call/CallIncomingActivity.java | 4 +- 8 files changed, 65 insertions(+), 54 deletions(-) diff --git a/res/drawable-xhdpi/arrow_accept.png b/res/drawable-xhdpi/arrow_accept.png index 97958ebb4acfc7fcb24206c2938c6b0e9de5364d..63db1a4983a9a148ba239d11f3fa0f68b08c93e2 100644 GIT binary patch literal 417 zcmeAS@N?(olHy`uVBq!ia0vp^=0Kdq!3HEHPM^#NQfx`y?k)`fL2$v|<&%LToCO|{ z#Xud`L734=V|E1t1EZs-i(^Q|t+zLA^;!Z&8XkV;^}cYsBPgA9n!?A)9>*3aN(FbG z;*pB_y@9)xHDiU!k<|+({-~RzZ}@KJ_gw$4D&NJP-|KK;JbgfGgUHDQ=>yX7w#?d* z3DF1G?RTGNxc!Hf?ZX67wt^6&Hxqv8HF(W1NZgyieyD|0SZ$4Rj*<_MU%H_-5hQR; z&`ea#CnEnwhFqfg0SB;3Yu@`FAh|H^+hS@U#j=UpXC`tVYWd6iW(Q*#yUsKoW!X2< z-=_$P2{v~uNc$EMdbRrG4u&?~<3%z{uNS>P*Inx(YN38$r9&eVE0;*b{iR?=4r3n+ zmxx9|*n!nN2W-Jo8UYIqY&p<)pq@_#C=>8tO~ZAN4vh`06_*%nx-Vrju1jT`=hl|h o@Oq+Zf_MdETw~!!>6+;If9sOu=Y=nM1PoyYPgg&ebxsLQ0OstRfdBvi literal 2137 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 - - + + diff --git a/res/layout/call.xml b/res/layout/call.xml index 45924e332..5b537d9b2 100644 --- a/res/layout/call.xml +++ b/res/layout/call.xml @@ -473,13 +473,16 @@ + android:layout_gravity="left" + android:layout_marginTop="30dp" + android:background="@color/colorH"> - + diff --git a/res/layout/call_inactive_row.xml b/res/layout/call_inactive_row.xml index e1cb2818a..68886febf 100644 --- a/res/layout/call_inactive_row.xml +++ b/res/layout/call_inactive_row.xml @@ -1,46 +1,46 @@ + 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_height="40dp" + android:src="@drawable/avatar_big_secure1"/> - + android:paddingLeft="20dp" + android:paddingRight="10dp"/> + android:paddingRight="20dp"/> - + android:gravity="center_vertical" + android:src="@drawable/pause"/> \ No newline at end of file diff --git a/res/layout/call_incoming.xml b/res/layout/call_incoming.xml index 00e5cc6a4..afa89d476 100644 --- a/res/layout/call_incoming.xml +++ b/res/layout/call_incoming.xml @@ -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"> @@ -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"> diff --git a/src/android/org/linphone/call/CallActivity.java b/src/android/org/linphone/call/CallActivity.java index 921e69f71..db8ff67c2 100644 --- a/src/android/org/linphone/call/CallActivity.java +++ b/src/android/org/linphone/call/CallActivity.java @@ -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(); } diff --git a/src/android/org/linphone/call/CallIncomingActivity.java b/src/android/org/linphone/call/CallIncomingActivity.java index 593750c3b..8dcfbe18f 100644 --- a/src/android/org/linphone/call/CallIncomingActivity.java +++ b/src/android/org/linphone/call/CallIncomingActivity.java @@ -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; }