From d7fc04495775ff96a02576fcaddeb714d8c1f332 Mon Sep 17 00:00:00 2001
From: Margaux Clerc <margaux.clerc@belledonne-communications.com>
Date: Thu, 15 Oct 2015 11:32:13 +0200
Subject: [PATCH] Update ui

---
 res/layout/about.xml                          | 35 ++++----
 res/layout/accept_call_update_dialog.xml      | 36 ---------
 res/layout/accounts.xml                       |  6 +-
 .../AcceptCallUpdateDialogFragment.java       | 80 -------------------
 4 files changed, 19 insertions(+), 138 deletions(-)
 delete mode 100644 res/layout/accept_call_update_dialog.xml
 delete mode 100644 src/org/linphone/AcceptCallUpdateDialogFragment.java

diff --git a/res/layout/about.xml b/res/layout/about.xml
index 3b60fe32b..f0f4853a9 100644
--- a/res/layout/about.xml
+++ b/res/layout/about.xml
@@ -2,44 +2,39 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical"
-	android:layout_margin="10dp"
     android:background="@color/colorH"
+    android:orientation="vertical"
     android:gravity="center">
 
     <ImageView
-        android:contentDescription="@string/content_description_welcome"
+        android:src="@drawable/linphone_orange"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-		android:padding="10dp"
-        android:src="@drawable/linphone_orange" />
+		android:padding="10dp" />
 
     <TextView
-		android:layout_margin="10dp"
-        android:id="@+id/textView1"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
         android:text="@string/app_name"
-        android:textSize="30dp" />
+        style="@style/font5"
+		android:layout_margin="10dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
 
     <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:id="@+id/AboutText"
         android:text="@string/about_text"
+        style="@style/font9"
         android:gravity="center"
-        android:textStyle="bold"
-        android:textColor="@color/colorB"
-        android:id="@+id/AboutText"/>
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
 
     <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:id="@+id/AboutLink"
         android:text="@string/about_link"
         android:autoLink="web"
+        style="@style/font9"
         android:gravity="center"
-        android:textStyle="bold"
-		android:textColor="@color/colorB"
-        android:id="@+id/AboutLink"/>
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
 
 	<LinearLayout
 		android:orientation="horizontal"
diff --git a/res/layout/accept_call_update_dialog.xml b/res/layout/accept_call_update_dialog.xml
deleted file mode 100644
index cede720a5..000000000
--- a/res/layout/accept_call_update_dialog.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content" 
-    android:layout_height="wrap_content"
-    android:layout_gravity="center" 
-    android:gravity="center"
-    android:orientation="vertical">
-
-    <TextView
-        android:text="@string/call_update_desc"
-        android:layout_width="wrap_content" 
-        android:layout_height="wrap_content" />
-      
-    <LinearLayout 
-        android:gravity="center"
-	    android:layout_width="match_parent" 
-	    android:layout_height="wrap_content" 
-    	android:orientation="horizontal">
-        
-    	<Button
-		    android:layout_width="match_parent" 
-		    android:layout_height="wrap_content" 
-		    android:layout_weight="1"
-		    android:text="@string/call_update_yes"
-		    android:id="@+id/yes" />
-    	
-    	<Button
-		    android:layout_width="match_parent" 
-		    android:layout_height="wrap_content" 
-		    android:layout_weight="1"
-		    android:text="@string/call_update_no"
-		    android:id="@+id/no" />
-        
-    </LinearLayout>
-    
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/accounts.xml b/res/layout/accounts.xml
index a9d27bb05..509a1adcc 100644
--- a/res/layout/accounts.xml
+++ b/res/layout/accounts.xml
@@ -2,22 +2,24 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="match_parent"
 	android:background="@color/colorG"
-	android:layout_height="30dp"
+	android:layout_height="40dp"
 	android:gravity="center">
 
 	<TextView
 		android:id="@+id/address"
 		style="@style/font13"
 		android:paddingLeft="10dp"
+		android:gravity="center_vertical"
 		android:layout_width="wrap_content"
 		android:layout_height="match_parent"/>
 
 	<ImageView
 		android:id="@+id/statusLed"
+		android:src="@drawable/status_available"
 		android:layout_width="25dp"
 		android:layout_height="25dp"
-		android:src="@drawable/status_available"
 		android:padding="5dp"
+		android:layout_centerVertical="true"
 		android:layout_alignParentRight="true"/>
 
 </RelativeLayout>
diff --git a/src/org/linphone/AcceptCallUpdateDialogFragment.java b/src/org/linphone/AcceptCallUpdateDialogFragment.java
deleted file mode 100644
index 4843d2a02..000000000
--- a/src/org/linphone/AcceptCallUpdateDialogFragment.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
-AcceptCallUpdateDialogFragment.java
-Copyright (C) 2014  Belledonne Communications, Grenoble, France
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-*/
-package org.linphone;
-
-import org.linphone.mediastream.Log;
-
-import android.annotation.SuppressLint;
-import android.content.DialogInterface;
-import android.os.Bundle;
-import android.app.DialogFragment;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.View.OnClickListener;
-import android.widget.Button;
-
-
-
-@SuppressLint("ValidFragment")
-public class AcceptCallUpdateDialogFragment extends DialogFragment {
-
-    public AcceptCallUpdateDialogFragment() {
-        // Empty constructor required for DialogFragment
-    }
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        View view = inflater.inflate(R.layout.accept_call_update_dialog, container);
-
-        getDialog().setTitle(R.string.call_update_title);
-        
-        Button yes = (Button) view.findViewById(R.id.yes);
-        yes.setOnClickListener(new OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				if (InCallActivity.isInstanciated()) {
-			    	Log.d("Call Update Accepted");
-			    	InCallActivity.instance().acceptCallUpdate(true);
-				}
-		    	dismiss();
-			}
-		});
-        
-        Button no = (Button) view.findViewById(R.id.no);
-        no.setOnClickListener(new OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				if (InCallActivity.isInstanciated()) {
-					Log.d("Call Update Denied");
-			    	InCallActivity.instance().acceptCallUpdate(false);
-				}
-		    	dismiss();
-			}
-		});
-        
-        return view;
-    }
-    
-    @Override
-    public void onCancel(DialogInterface dialog) {
-    	super.onCancel(dialog);
-    	InCallActivity.instance().acceptCallUpdate(false);
-    }
-}
\ No newline at end of file