From 641a32cbfa8b2cbffd896f3e0b621cd6c91f93f5 Mon Sep 17 00:00:00 2001
From: Margaux Clerc <margaux.clerc@belledonne-communications.com>
Date: Tue, 25 Aug 2015 17:22:32 +0200
Subject: [PATCH] Rename/Delete/add assets

---
 ... => resizable_confirm_delete_button.9.png} | Bin
 res/drawable/back.xml                         |   8 -
 res/drawable/background.xml                   |   8 -
 res/drawable/button_background.xml            |  10 +
 res/drawable/{video_off.xml => camera.xml}    |   0
 res/drawable/camera_disabled.xml              |   5 +
 res/drawable/cancel.xml                       |   9 -
 res/layout-sw720dp-land/main.xml              | 177 ------------------
 res/layout-sw720dp-land/settings.xml          |  16 --
 res/layout/active_call_image_row.xml          |  17 --
 res/layout/contact_add_row.xml                |  27 ---
 res/layout/dialog.xml                         |  47 +++++
 res/layout/menu_settings_button.xml           |  29 ---
 .../{incoming_alt.xml => outgoing_call.xml}   |  55 +++---
 14 files changed, 92 insertions(+), 316 deletions(-)
 rename res/drawable-xhdpi/{resizable_confirm_delete_button.png => resizable_confirm_delete_button.9.png} (100%)
 delete mode 100644 res/drawable/back.xml
 delete mode 100644 res/drawable/background.xml
 create mode 100644 res/drawable/button_background.xml
 rename res/drawable/{video_off.xml => camera.xml} (100%)
 create mode 100644 res/drawable/camera_disabled.xml
 delete mode 100644 res/drawable/cancel.xml
 delete mode 100644 res/layout-sw720dp-land/main.xml
 delete mode 100644 res/layout-sw720dp-land/settings.xml
 delete mode 100644 res/layout/active_call_image_row.xml
 delete mode 100644 res/layout/contact_add_row.xml
 create mode 100644 res/layout/dialog.xml
 delete mode 100644 res/layout/menu_settings_button.xml
 rename res/layout/{incoming_alt.xml => outgoing_call.xml} (72%)

diff --git a/res/drawable-xhdpi/resizable_confirm_delete_button.png b/res/drawable-xhdpi/resizable_confirm_delete_button.9.png
similarity index 100%
rename from res/drawable-xhdpi/resizable_confirm_delete_button.png
rename to res/drawable-xhdpi/resizable_confirm_delete_button.9.png
diff --git a/res/drawable/back.xml b/res/drawable/back.xml
deleted file mode 100644
index 10c0e21d2..000000000
--- a/res/drawable/back.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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/back_over" />
-    <item
-         android:drawable="@drawable/back_default" />
-</selector>
-
diff --git a/res/drawable/background.xml b/res/drawable/background.xml
deleted file mode 100644
index eefecb76b..000000000
--- a/res/drawable/background.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-		android:shape="rectangle">
-        <gradient
-                android:endColor="#FFB1BDC4"
-                android:startColor="#FFE4EDF2"
-                android:angle="90"/>
-</shape>
\ No newline at end of file
diff --git a/res/drawable/button_background.xml b/res/drawable/button_background.xml
new file mode 100644
index 000000000..2a0ff0c72
--- /dev/null
+++ b/res/drawable/button_background.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:state_pressed="true"
+		  android:drawable="@color/colorE" />
+	<item android:state_enabled="false"
+		  android:drawable="@color/colorF" />
+	<item
+		android:drawable="@color/colorF" />
+</selector>
+
diff --git a/res/drawable/video_off.xml b/res/drawable/camera.xml
similarity index 100%
rename from res/drawable/video_off.xml
rename to res/drawable/camera.xml
diff --git a/res/drawable/camera_disabled.xml b/res/drawable/camera_disabled.xml
new file mode 100644
index 000000000..b7ee981f7
--- /dev/null
+++ b/res/drawable/camera_disabled.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<bitmap
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:src="@drawable/camera_default"
+	android:alpha="0.2" />
diff --git a/res/drawable/cancel.xml b/res/drawable/cancel.xml
deleted file mode 100644
index a22bb497e..000000000
--- a/res/drawable/cancel.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?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/back_over" />
-    <item android:state_enabled="false" 
-        android:drawable="@drawable/back_disabled" />
-    <item
-         android:drawable="@drawable/back_default" />
-</selector>
\ No newline at end of file
diff --git a/res/layout-sw720dp-land/main.xml b/res/layout-sw720dp-land/main.xml
deleted file mode 100644
index 8f2c76b69..000000000
--- a/res/layout-sw720dp-land/main.xml
+++ /dev/null
@@ -1,177 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/landscape_background">
-    
-    <ImageView 
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:adjustViewBounds="true"
-        android:layout_centerInParent="true"
-        android:src="@drawable/background_logo"/>
-
-    <!-- Hack to adjust perfectly on every screen the bottom of the fragment with the curved menu -->
-    <LinearLayout
-	    android:id="@+id/mark"
-	    android:background="@color/menu_button_background"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:gravity="bottom"
-        android:orientation="horizontal">
-    
-		<ImageView
-		    android:contentDescription="@string/content_description_mark"
-		    android:layout_width="match_parent"
-		    android:layout_height="wrap_content"
-		    android:layout_weight="0.2"
-		    android:scaleType="fitEnd"
-		    android:src="@drawable/mark"
-		    android:visibility="invisible" />
-		
-		<ImageView
-		    android:contentDescription="@string/content_description_mark"
-		    android:layout_width="match_parent"
-		    android:layout_height="wrap_content"
-		    android:layout_weight="0.2"
-		    android:scaleType="fitEnd"
-		    android:src="@drawable/mark"
-		    android:visibility="invisible" />
-		
-		<ImageView
-		    android:contentDescription="@string/content_description_mark"
-		    android:layout_width="match_parent"
-		    android:layout_height="wrap_content"
-		    android:layout_weight="0.24"
-		    android:scaleType="fitEnd"
-		    android:src="@drawable/mark"
-		    android:visibility="invisible" />
-		
-		<ImageView
-		    android:contentDescription="@string/content_description_mark"
-		    android:layout_width="match_parent"
-		    android:layout_height="wrap_content"
-		    android:layout_weight="0.2"
-		    android:scaleType="fitEnd"
-		    android:src="@drawable/mark"
-		    android:visibility="invisible" />
-		
-		<ImageView
-		    android:contentDescription="@string/content_description_mark"
-		    android:layout_width="match_parent"
-		    android:layout_height="wrap_content"
-		    android:layout_weight="0.2"
-		    android:scaleType="fitEnd"
-		    android:src="@drawable/mark"
-		    android:visibility="invisible" />
-        
-    </LinearLayout>
-    
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_above="@id/mark"
-        android:layout_alignParentTop="true" >
-
-        <LinearLayout
-            android:baselineAligned="false"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="horizontal"
-            android:paddingTop="40dp">
-        
-	        <LinearLayout
-	            android:orientation="horizontal"
-	            android:id="@+id/fragmentContainer"
-	            android:layout_width="match_parent"
-	            android:layout_height="match_parent"
-	            android:layout_weight="0.67" />
-	        
-	        <LinearLayout
-	            android:orientation="horizontal"
-	            android:id="@+id/fragmentContainer2"
-	            android:visibility="gone"
-	            android:layout_width="match_parent"
-	            android:layout_height="match_parent"
-	            android:layout_weight="0.33"
-	            android:paddingBottom="10dp" />
-        
-        </LinearLayout>
-
-        <fragment
-            android:id="@+id/status"
-            android:name="org.linphone.StatusFragment"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            tools:layout="@layout/status" />
-        
-    </FrameLayout>
-
-    <LinearLayout
-        android:id="@+id/menu"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:orientation="horizontal">
-
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="0.2">
-
-            <include layout="@layout/menu_history_button" />
-
-            <TextView
-                android:id="@+id/missedCalls"
-                android:layout_width="25dp"
-                android:layout_height="25dp"
-                android:layout_alignParentRight="true"
-                android:layout_alignParentTop="true"
-                android:background="@drawable/missed_calls_bg"
-                android:gravity="center"
-                android:textSize="20dp"
-                android:visibility="gone" />
-        </RelativeLayout>
-
-        <include layout="@layout/menu_contact_button" />
-        
-        <ImageView
-            android:id="@+id/dialer"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_weight="0.245"
-            android:adjustViewBounds="true"
-            android:contentDescription="@string/content_description_dialer"
-            android:scaleType="fitXY"
-            android:src="@drawable/dialer" />
-
-
-        <RelativeLayout
-            android:id="@+id/completeChat"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="0.2">
-
-            <include layout="@layout/menu_chat_button" />
-
-            <TextView
-                android:id="@+id/missedChats"
-                android:layout_width="25dp"
-                android:layout_height="25dp"
-                android:layout_alignParentRight="true"
-                android:layout_alignParentTop="true"
-                android:background="@drawable/missed_calls_bg"
-                android:gravity="center"
-                android:textSize="20dp"
-                android:visibility="gone" />
-            
-        </RelativeLayout>
-
-        <include layout="@layout/menu_settings_button" />
-
-        
-    </LinearLayout>
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout-sw720dp-land/settings.xml b/res/layout-sw720dp-land/settings.xml
deleted file mode 100644
index b6b4694a1..000000000
--- a/res/layout-sw720dp-land/settings.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/topLayout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@android:color/black">
-
-    <ListView
-	    android:id="@+id/list"
-	    android:layout_width="match_parent" 
-	    android:layout_height="match_parent"
-	    android:drawSelectorOnTop="false"
-	    android:cacheColorHint="@color/transparent"
-	    android:scrollbarAlwaysDrawVerticalTrack="true" />
-    
-</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/active_call_image_row.xml b/res/layout/active_call_image_row.xml
deleted file mode 100644
index 969f74fdd..000000000
--- a/res/layout/active_call_image_row.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<TableRow xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="match_parent"
-	android:layout_height="75dp"
-	android:layout_margin="2dp"
-	android:gravity="center"
-	android:orientation="horizontal"
-	android:padding="10dp">
-	
-	<ImageView
-	    android:id="@+id/contactPicture"
-	    android:layout_width="match_parent"
-	    android:layout_height="wrap_content"
-    	android:gravity="center_horizontal|top"
-	    android:src="@drawable/avatar" />
-	    
-</TableRow>
\ No newline at end of file
diff --git a/res/layout/contact_add_row.xml b/res/layout/contact_add_row.xml
deleted file mode 100644
index 565724c0a..000000000
--- a/res/layout/contact_add_row.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<TableRow xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="match_parent"
-	android:layout_height="wrap_content"
-	android:layout_margin="2dp"
-	android:gravity="center_vertical"
-	android:padding="10dp">
-
-	<EditText
-        android:textCursorDrawable="@null"
-        android:id="@+id/numoraddr"
-        android:layout_width="329dp"
-        android:layout_height="wrap_content"
-        android:textColor="@android:color/black"
-        android:background="@drawable/resizable_textfield"
-        android:inputType="textEmailAddress"/>
-
-	<ImageView
-		android:contentDescription="@string/content_description_add"
-		android:id="@+id/add"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:src="@drawable/add_field_default"
-		android:paddingLeft="5dp"
-		android:gravity="right" />
-
-</TableRow>
\ No newline at end of file
diff --git a/res/layout/dialog.xml b/res/layout/dialog.xml
new file mode 100644
index 000000000..7ceba4ddc
--- /dev/null
+++ b/res/layout/dialog.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:orientation="vertical"
+  android:layout_width="fill_parent"
+  android:layout_height="match_parent"
+  android:gravity="center">
+
+	<TextView
+		android:id="@+id/customText"
+		style="@style/font14"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:gravity="center"
+		android:padding="20dp"/>
+
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_gravity="center"
+		android:gravity="center"
+		android:orientation="horizontal">
+
+		<Button
+			android:id="@+id/cancel"
+			android:text="@string/cancel"
+			android:background="@drawable/resizable_cancel_button"
+			style="@style/font8"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_margin="10dp"
+			android:padding="10dp"/>
+
+		<Button
+			android:id="@+id/delete"
+			android:text="@string/delete"
+			android:background="@drawable/resizable_confirm_delete_button"
+			style="@style/font15"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_margin="10dp"
+			android:padding="10dp"/>
+
+		</LinearLayout>
+
+
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/menu_settings_button.xml b/res/layout/menu_settings_button.xml
deleted file mode 100644
index a672d50c2..000000000
--- a/res/layout/menu_settings_button.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-	android:id="@+id/settings"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_weight="1"
-    android:layout_width="0dp"
-    android:layout_height="wrap_content"
-	android:adjustViewBounds="true">
-    
-    <ImageView
-        android:id="@+id/image"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:adjustViewBounds="true"
-		android:src="@drawable/settings" />
-
-    <TextView
-        android:contentDescription="@string/content_description_settings"
-        android:id="@+id/text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerHorizontal="true"
-        android:layout_alignBottom="@id/image"
-        android:paddingBottom="10dp"
-        android:textColor="@drawable/text_color"
-        android:text="@string/button_settings"
-        android:textSize="12sp" />
-    
-</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/incoming_alt.xml b/res/layout/outgoing_call.xml
similarity index 72%
rename from res/layout/incoming_alt.xml
rename to res/layout/outgoing_call.xml
index 924f312d4..226d0eeea 100644
--- a/res/layout/incoming_alt.xml
+++ b/res/layout/outgoing_call.xml
@@ -3,7 +3,7 @@
 				android:id="@+id/topLayout"
 				android:layout_width="match_parent"
 				android:layout_height="match_parent"
-				android:background="@color/background">
+				android:background="@color/colorH">
 
 	<include layout="@layout/status"  android:id="@+id/statusBar" />
 
@@ -15,12 +15,10 @@
 		android:background="@color/colorF">
 
 		<TextView
-			android:textAppearance="?android:attr/textAppearanceLarge"
-			android:textColor="@color/colorA"
 			android:layout_width="match_parent"
 			android:layout_height="match_parent"
-			android:text="@string/incoming"
-			android:textAllCaps="true"
+			style="@style/font1"
+			android:text="@string/outgoing_call"
 			android:paddingLeft="10dp"
 			android:gravity="center"/>
 
@@ -33,24 +31,21 @@
 		android:orientation="vertical"
 		android:layout_above="@id/menu">
 
-
 		<LinearLayout
 			android:id="@+id/incoming_caller_profile"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:gravity="center_horizontal"
 			android:orientation="vertical"
-			android:paddingTop="10dp"
-			android:weightSum="1">
+			android:paddingTop="10dp">
 
 			<ImageView
 				android:id="@+id/incoming_picture"
-				android:layout_width="259dp"
-				android:layout_height="207dp"
+				android:layout_width="300dp"
+				android:layout_height="300dp"
 				android:src="@drawable/avatar"
 				android:paddingBottom="10dp"
-				android:layout_marginTop="10dp"
-				android:layout_weight="1.30"/>
+				android:layout_marginTop="10dp"/>
 
 			<TextView
 				android:id="@+id/incoming_caller_name"
@@ -58,17 +53,14 @@
 				android:layout_height="wrap_content"
 				android:layout_gravity="center"
 				android:textAlignment="center"
-				android:layout_marginBottom="20dp"
-				android:textColor="@android:color/black"
-				android:textSize="28sp" />
+				style="@style/font5"/>
 
 			<TextView
 				android:id="@+id/incoming_caller_number"
 				android:layout_width="wrap_content"
-				android:layout_height="40dp"
-				android:textColor="@android:color/black"
-				android:textSize="28sp"
-				android:layout_gravity="center_horizontal"/>
+				android:layout_height="wrap_content"
+				style="@style/font2"
+				android:layout_gravity="center"/>
 
 
 		</LinearLayout>
@@ -85,33 +77,46 @@
 	<LinearLayout
 		android:id="@+id/menu"
 		android:layout_width="match_parent"
-		android:layout_height="80dp"
+		android:layout_height="70dp"
 		android:layout_alignParentBottom="true"
 		android:layout_alignParentLeft="true"
 		android:orientation="horizontal" >
 
 		<ImageView
-			android:id="@+id/accept"
+			android:id="@+id/micro"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:layout_weight="1"
-			android:background="@color/colorD"
+			android:background="@color/colorF"
 			android:adjustViewBounds="true"
 			android:contentDescription="@string/content_description_pause"
 			android:scaleType="center"
-			android:src="@drawable/call_audio_start" />
+			android:src="@drawable/micro_default" />
 
 		<ImageView
-			android:id="@+id/decline"
+			android:id="@+id/speaker"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:layout_weight="1"
-			android:background="@color/footer_select"
+			android:background="@color/colorF"
+			android:adjustViewBounds="true"
+			android:contentDescription="@string/content_description_pause"
+			android:scaleType="center"
+			android:src="@drawable/speaker_default" />
+
+		<ImageView
+			android:id="@+id/hangUp"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_weight="0.7"
+			android:background="@drawable/call"
 			android:adjustViewBounds="true"
 			android:contentDescription="@string/content_description_pause"
 			android:scaleType="center"
 			android:src="@drawable/call_hangup" />
 
+
+
 	</LinearLayout>
 
 </RelativeLayout>