From fa0f35f4e0781c9b15b39f49a2ebd63bd6961e28 Mon Sep 17 00:00:00 2001
From: Margaux Clerc <margaux.clerc@belledonne-communications.com>
Date: Thu, 15 Oct 2015 18:52:14 +0200
Subject: [PATCH] fix numpad and incoming/outgoing view

---
 res/layout/{incall.xml => call.xml} | 209 ++++++++++++++++++----------
 res/layout/call_incoming.xml        |   9 +-
 res/layout/call_outgoing.xml        |   9 +-
 src/org/linphone/CallActivity.java  |   3 +-
 4 files changed, 143 insertions(+), 87 deletions(-)
 rename res/layout/{incall.xml => call.xml} (71%)

diff --git a/res/layout/incall.xml b/res/layout/call.xml
similarity index 71%
rename from res/layout/incall.xml
rename to res/layout/call.xml
index 69383729c..f9e332a7c 100644
--- a/res/layout/incall.xml
+++ b/res/layout/call.xml
@@ -11,18 +11,29 @@
 		android:layout_width="match_parent"
 		android:layout_height="40dp"
 		tools:layout="@layout/status" />
+
+
+	<android.support.v4.widget.DrawerLayout
+		android:id="@+id/call_stats"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:layout_below="@id/status">
+
+	<RelativeLayout
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:layout_below="@id/status">
+
+	<LinearLayout
+		android:id="@+id/fragmentContainer"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:orientation="horizontal" />
     
     <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-		android:layout_below="@id/status"
-		android:layout_above="@id/menu">
-
-        <LinearLayout
-            android:id="@+id/fragmentContainer"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="horizontal" />
+		android:layout_above="@+id/menu">
 
 			<LinearLayout
 				android:id="@+id/conferenceCalls"
@@ -37,49 +48,96 @@
 			<RelativeLayout
 				android:id="@+id/activeCallHeader"
 				android:layout_width="match_parent"
-				android:layout_height="match_parent"
-				android:gravity="center_vertical"
-				android:layout_gravity="center_vertical"
+				android:layout_height="wrap_content"
 				android:visibility="visible">
 
-				<ImageView
-					android:id="@+id/contactPicture"
-					android:src="@drawable/avatar"
-					android:layout_width="200dp"
-					android:layout_height="200dp"
+				<LinearLayout
+					android:id="@+id/call_header_description"
+					android:layout_width="match_parent"
+					android:layout_height="80dp"
 					android:layout_centerHorizontal="true"
-					android:paddingBottom="10dp"/>
+					android:orientation="vertical"
+					android:background="@color/colorH"
+					android:alpha="0.8">
 
-				<TextView
-					android:id="@+id/contactNameOrNumber"
-					style="@style/font5"
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:paddingTop="10dp"
-					android:layout_below="@id/contactPicture"
-					android:layout_centerHorizontal="true"/>
+					<TextView
+						android:id="@+id/contactNameOrNumber"
+						style="@style/font5"
+						android:layout_width="wrap_content"
+						android:layout_height="wrap_content"
+						android:paddingTop="5dp"
+						android:layout_alignParentTop="true"
+						android:layout_gravity="center"/>
+
+					<Chronometer
+						android:id="@+id/callTimer"
+						style="@style/font2"
+						android:layout_width="wrap_content"
+						android:layout_height="wrap_content"
+						android:layout_below="@id/contactNameOrNumber"
+						android:layout_gravity="center"/>
+					</LinearLayout>
 
-				<Chronometer
-					android:id="@+id/callTimer"
-					style="@style/font2"
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:layout_below="@id/contactNameOrNumber"
-					android:layout_centerHorizontal="true"/>
 
 				<ImageView
 					android:id="@+id/pause"
 					android:contentDescription="@string/content_description_pause"
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
+					android:layout_width="80dp"
+					android:layout_height="80dp"
+					android:padding="10dp"
 					android:src="@drawable/pause_big_default"
-					android:layout_marginRight="20dp"
-					android:layout_above="@+id/contactNameOrNumber"
-					android:layout_toRightOf="@+id/contactPicture"
-					android:layout_toEndOf="@+id/contactPicture"/>
+					android:layout_below="@+id/call_header_description"
+					android:layout_alignParentRight="true"/>
 
+				<RelativeLayout
+					android:id="@+id/avatar_layout"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:layout_below="@id/call_header_description"
+					android:gravity="center">
+
+					<ImageView
+						android:id="@+id/contact_picture"
+						android:src="@drawable/avatar"
+						android:contentDescription="@string/content_description_contact_picture"
+						android:layout_width="200dp"
+						android:layout_height="match_parent"
+						android:adjustViewBounds="true"/>
+
+					<ImageView
+						android:id="@+id/mask"
+						android:src="@drawable/avatar_mask_border"
+						android:contentDescription="@string/content_description_contact_picture"
+						android:layout_width="200dp"
+						android:layout_height="match_parent"
+						android:adjustViewBounds="true"/>
+
+				</RelativeLayout>
+
+				<ImageView
+					android:id="@+id/switchCamera"
+					android:layout_width="80dp"
+					android:layout_height="80dp"
+					android:padding="10dp"
+					android:contentDescription="@string/content_description_switch_camera"
+					android:visibility="invisible"
+					android:src="@drawable/switch_camera"
+					android:layout_below="@+id/call_header_description"
+					android:layout_alignParentLeft="true"
+					android:layout_alignParentStart="true"/>
 			</RelativeLayout>
 
+		<LinearLayout
+			android:id="@+id/calls"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_below="@id/activeCallHeader"
+			android:layout_alignParentBottom="true"
+			android:background="@color/colorH"
+			android:layout_gravity="bottom"
+			android:orientation="vertical">
+		</LinearLayout>
+
 		<LinearLayout
 			android:id="@+id/noCurrentCall"
 			android:layout_width="match_parent"
@@ -103,38 +161,17 @@
 				android:layout_gravity="center"/>
 		</LinearLayout>
 
-
-		<LinearLayout
-			android:id="@+id/calls"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:layout_below="@id/activeCallHeader"
-			android:layout_alignParentBottom="true"
-			android:background="@color/colorH"
-			android:layout_gravity="bottom"
-			android:orientation="vertical">
-		</LinearLayout>
-
 	</FrameLayout>
 
-    <ImageView
-        android:id="@+id/switchCamera"
-        android:layout_width="80dp"
-        android:layout_height="80dp"
-        android:layout_alignParentLeft="true"
-		android:padding="10dp"
-        android:contentDescription="@string/content_description_switch_camera"
-        android:layout_marginTop="40dp"
-        android:visibility="invisible"
-        android:src="@drawable/switch_camera" />
-
-    <org.linphone.ui.Numpad
+	<org.linphone.ui.Numpad
         android:contentDescription="@string/content_description_numpad"
         android:id="@+id/numpad"
         android:background="@color/colorF"
-        android:layout_width="match_parent"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:visibility="gone"
+		android:layout_margin="10dp"
+		android:layout_above="@id/menu"
         android:layout_centerHorizontal="true"
         android:layout_centerVertical="true"/>
 
@@ -154,12 +191,13 @@
             <RelativeLayout   
                 android:layout_width="match_parent"
 	            android:layout_height="match_parent"
-				android:padding="25dp"
+				android:background="@drawable/button_background"
 	            android:layout_weight="1">
 	            
            	<ImageView
 	            android:id="@+id/video"
 	           	android:src="@drawable/camera_default"
+				android:padding="25dp"
 				android:background="@drawable/button_background"
 	            android:layout_width="match_parent"
 				android:layout_height="match_parent"/>
@@ -271,12 +309,12 @@
 			android:visibility="invisible"
 			android:layout_weight="0.5"/>
 
-		<TextView
+		<ImageView
 			android:id="@+id/routeBluetooth"
+			android:src="@drawable/route_bluetooth"
+			android:background="@drawable/button_background"
+			android:padding="20dp"
 			android:visibility="invisible"
-			android:text="@string/button_bluetooth"
-			android:gravity="center"
-			android:textColor="@drawable/text_incall_button_color"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:layout_weight="0.5" />
@@ -312,13 +350,15 @@
 			android:visibility="invisible"
 			android:layout_weight="0.5"/>
 
-		<TextView
-			android:id="@+id/routeReceiver"
+		<ImageView
+			android:id="@+id/routeEarpiece"
+			android:src="@drawable/route_earpiece"
+			android:background="@drawable/button_background"
+			android:padding="20dp"
 			android:visibility="invisible"
-			android:gravity="center"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:layout_weight="0.5" />
+			android:layout_weight="0.5"/>
 
 		<ImageView
 			android:id="@+id/transfer"
@@ -350,14 +390,15 @@
 			android:visibility="invisible"
 			android:layout_weight="0.5"/>
 
-		<TextView
+		<ImageView
 			android:id="@+id/routeSpeaker"
+			android:src="@drawable/route_speaker"
+			android:background="@drawable/button_background"
 			android:visibility="invisible"
-			android:gravity="center"
-			android:paddingTop="40dp"
+			android:padding="20dp"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:layout_weight="0.5" />
+			android:layout_weight="0.5"/>
 
 		<ImageView
 			android:id="@+id/conference"
@@ -371,5 +412,21 @@
 
 	</LinearLayout>
 
+		</RelativeLayout>
+
+		<RelativeLayout
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			android:id="@+id/side_menu_content"
+			android:layout_gravity="left"
+			android:background="@color/colorH">
+
+			<include layout="@layout/incall_stats" android:id="@+id/incall_stats"/>
+
+		</RelativeLayout>
+
+
+
+</android.support.v4.widget.DrawerLayout>
 
 </RelativeLayout>
diff --git a/res/layout/call_incoming.xml b/res/layout/call_incoming.xml
index b84081afa..e4d3c3273 100644
--- a/res/layout/call_incoming.xml
+++ b/res/layout/call_incoming.xml
@@ -40,23 +40,22 @@
 
 		<TextView
 			android:id="@+id/contact_name"
+			style="@style/font5"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:layout_alignParentTop="true"
-			android:textAlignment="center"
 			android:layout_centerHorizontal="true"
-			android:padding="5dp"
-			style="@style/font5"/>
+			android:paddingTop="5dp"/>
 
 		<TextView
 			android:id="@+id/contact_number"
+			style="@style/font2"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			style="@style/font2"
 			android:layout_below="@id/contact_name"
 			android:layout_gravity="center"
 			android:layout_centerHorizontal="true"
-			android:padding="5dp"/>
+			android:paddingBottom="10dp"/>
 
 		<RelativeLayout
 			android:id="@+id/avatar_layout"
diff --git a/res/layout/call_outgoing.xml b/res/layout/call_outgoing.xml
index 1a69a6029..4e3ba3eb5 100644
--- a/res/layout/call_outgoing.xml
+++ b/res/layout/call_outgoing.xml
@@ -40,23 +40,22 @@
 
 		<TextView
 			android:id="@+id/contact_name"
+			style="@style/font5"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:layout_alignParentTop="true"
-			android:textAlignment="center"
 			android:layout_centerHorizontal="true"
-			android:padding="5dp"
-			style="@style/font5"/>
+			android:paddingTop="5dp"/>
 
 		<TextView
 			android:id="@+id/contact_number"
+			style="@style/font2"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			style="@style/font2"
 			android:layout_below="@id/contact_name"
 			android:layout_gravity="center"
 			android:layout_centerHorizontal="true"
-			android:padding="5dp"/>
+			android:paddingBottom="10dp"/>
 
 		<RelativeLayout
 			android:id="@+id/avatar_layout"
diff --git a/src/org/linphone/CallActivity.java b/src/org/linphone/CallActivity.java
index 141f68d5e..afc3619b0 100644
--- a/src/org/linphone/CallActivity.java
+++ b/src/org/linphone/CallActivity.java
@@ -118,7 +118,7 @@ public class CallActivity extends Activity implements OnClickListener {
 		instance = this;
 
 		getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON | WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED);
-		setContentView(R.layout.incall);
+		setContentView(R.layout.call);
 
 		isTransferAllowed = getApplicationContext().getResources().getBoolean(R.bool.allow_transfers);
 
@@ -320,6 +320,7 @@ public class CallActivity extends Activity implements OnClickListener {
 		dialer.setOnClickListener(this);
 
 		numpad = (Numpad) findViewById(R.id.numpad);
+		numpad.getBackground().setAlpha(240);
 
 		//Others