From a229a3c6b79cd0802567baa6b2e7ca90ee4f3582 Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Mon, 10 Nov 2014 14:19:56 +0100
Subject: [PATCH] Delete small about view and use proper margins for the view
 instead of hardcoded spacing causing troubles on small screens

---
 res/layout-small/about.xml | 59 --------------------------------------
 res/layout/about.xml       | 55 +++++++++++++++++++++--------------
 2 files changed, 34 insertions(+), 80 deletions(-)
 delete mode 100644 res/layout-small/about.xml

diff --git a/res/layout-small/about.xml b/res/layout-small/about.xml
deleted file mode 100644
index 2b0ed0e7d..000000000
--- a/res/layout-small/about.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="match_parent" 
-	android:layout_height="match_parent">
-    
-	<LinearLayout
-		android:layout_width="match_parent" 
-		android:layout_height="wrap_content"
-		android:orientation="vertical"
-	  	android:background="@drawable/background"
-		android:gravity="center">
-	    
-	    <ImageView
-	        android:contentDescription="@string/content_description_welcome"
-	        android:layout_width="wrap_content"
-	        android:layout_height="wrap_content"
-	        android:src="@drawable/logo_linphone_57x57" />
-	
-	    <TextView
-	        android:id="@+id/textView1"
-	        android:layout_width="wrap_content"
-	        android:layout_height="wrap_content"
-	        android:paddingTop="5dp"
-	        android:text="@string/app_name"
-	        android:textAppearance="?android:attr/textAppearanceLarge"
-	        android:textColor="@color/text_default"
-	        android:textSize="30dp"
-	        android:textStyle="bold" />
-	    
-		<TextView 
-		    android:layout_width="wrap_content"
-			android:layout_height="wrap_content" 
-			android:text="@string/about_text"
-			android:autoLink="web" 
-			android:gravity="center" 
-			android:paddingTop="50sp"
-			android:textStyle="bold" 
-			android:textColor="@color/text_contrast"
-			android:id="@+id/AboutText"/>
-
-        <Button
-            android:id="@+id/send_log"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="30sp"
-            android:text="@string/menu_send_log"
-            android:visibility="gone" />
-
-        <Button android:id="@+id/exit"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:text="@string/menu_exit"
-			android:visibility="visible"
-			android:layout_marginTop="30sp"/>
-		
-	</LinearLayout>
-	
-</ScrollView>
\ No newline at end of file
diff --git a/res/layout/about.xml b/res/layout/about.xml
index b52da3b61..2744dd9e5 100644
--- a/res/layout/about.xml
+++ b/res/layout/about.xml
@@ -5,30 +5,34 @@
 	android:orientation="vertical"
   	android:background="@drawable/background"
 	android:gravity="center">
-    
+
+    <View android:layout_weight="30" android:layout_width="0dp" android:layout_height="0dp" />
+
     <ImageView
         android:contentDescription="@string/content_description_welcome"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:src="@drawable/logo_linphone_57x57" />
 
+    <View android:layout_weight="5" android:layout_width="0dp" android:layout_height="0dp" />
+
     <TextView
         android:id="@+id/textView1"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:paddingTop="5dp"
         android:text="@string/app_name"
         android:textAppearance="?android:attr/textAppearanceLarge"
         android:textColor="@color/text_default"
         android:textSize="30dp"
         android:textStyle="bold" />
-    
-	<TextView 
+
+
+    <View android:layout_weight="50" android:layout_width="0dp" android:layout_height="0dp" />
+    <TextView
 	    android:layout_width="wrap_content"
 		android:layout_height="wrap_content" 
 		android:text="@string/about_text" 
-		android:gravity="center" 
-		android:paddingTop="50sp"
+		android:gravity="center"
 		android:textStyle="bold" 
 		android:textColor="@color/text_contrast"
 		android:id="@+id/AboutText"/>
@@ -43,19 +47,28 @@
 		android:textColor="@color/text_contrast"
 		android:id="@+id/AboutLink"/>
 
-	<Button
-	    android:id="@+id/send_log"
-	    android:layout_width="wrap_content"
-	    android:layout_height="wrap_content"
-	    android:layout_marginTop="30sp"
-	    android:text="@string/menu_send_log"
-	    android:visibility="gone" />
-	
-	<Button android:id="@+id/exit"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:text="@string/menu_exit"
-		android:visibility="visible"
-		android:layout_marginTop="30sp"/>
-	
+    <View android:layout_weight="30" android:layout_width="0dp" android:layout_height="0dp" />
+
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:gravity="center"
+        android:layout_height="wrap_content">
+        <View android:layout_weight="1" android:layout_width="0dp" android:layout_height="0dp" />
+        <Button
+            android:id="@+id/send_log"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/menu_send_log"/>
+        <View android:layout_weight="1" android:layout_width="0dp" android:layout_height="0dp" />
+        <Button android:id="@+id/exit"
+            android:layout_toRightOf="@id/send_log"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/menu_exit"
+            android:visibility="visible"/>
+        <View android:layout_weight="1" android:layout_width="0dp" android:layout_height="0dp" />
+    </LinearLayout>
+
+    <View android:layout_weight="30" android:layout_width="0dp" android:layout_height="0dp" />
+
 </LinearLayout>
\ No newline at end of file