From cb14535ab7da0b8c80c08c5e0f01c82963f0948d Mon Sep 17 00:00:00 2001
From: Margaux Clerc <margaux.clerc@belledonne-communications.com>
Date: Thu, 11 Feb 2016 16:44:50 +0100
Subject: [PATCH] Rework About fragment

---
 res/layout/about.xml                   | 161 +++++++++++++++++--------
 res/values-fr/strings.xml              |  15 +--
 res/values/strings.xml                 |  14 +--
 res/values/styles.xml                  |  13 ++
 src/org/linphone/AboutFragment.java    |   6 +-
 src/org/linphone/LinphoneActivity.java |  27 +++--
 6 files changed, 157 insertions(+), 79 deletions(-)

diff --git a/res/layout/about.xml b/res/layout/about.xml
index 8ef477f60..cdd6e01c1 100644
--- a/res/layout/about.xml
+++ b/res/layout/about.xml
@@ -39,63 +39,120 @@
             android:padding="15dp"/>
     </LinearLayout>
 
-    <ImageView
-        android:src="@drawable/linphone_logo_orange"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-		android:padding="10dp" />
-
-    <TextView
-        android:text="@string/app_name"
-        style="@style/font5"
-        android:layout_gravity="center"
-		android:layout_margin="10dp"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"/>
-
-    <TextView
-        android:id="@+id/about_text"
-        android:text="@string/about_text"
-        style="@style/font9"
-        android:layout_gravity="center"
+    <LinearLayout
+        android:background="@color/colorC"
+        android:orientation="vertical"
+        android:padding="10dp"
         android:gravity="center"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"/>
-
-    <TextView
-        android:id="@+id/about_link"
-        android:text="@string/about_link"
-        android:autoLink="web"
-        style="@style/font9"
-        android:layout_gravity="center"
-        android:gravity="center"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"/>
-
-	<LinearLayout
-		android:orientation="horizontal"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
         android:layout_gravity="center">
 
-		<Button
-       		android:id="@+id/send_log"
-			android:background="@drawable/button_background"
-			android:padding="10dp"
-			android:layout_margin="5dp"
-        	android:layout_width="match_parent"
-        	android:layout_height="wrap_content"
-       		android:text="@string/menu_send_log"/>
+        <ImageView
+            android:src="@drawable/splashscreen"
+            android:layout_width="wrap_content"
+            android:layout_height="80dp"
+            android:layout_gravity="center"/>
 
-		<Button
-            android:id="@+id/reset_log"
-			android:background="@drawable/button_background"
-			android:padding="10dp"
-			android:layout_margin="5dp"
+        <TextView
+            android:text="@string/app_name"
+            style="@style/font22"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/menu_reset_log"/>
-	</LinearLayout>
+            android:layout_marginTop="10dp"
+            android:layout_gravity="center"/>
+
+        <TextView
+            android:text="@string/app_description"
+            style="@style/font2"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"/>
+
+        <TextView
+            android:id="@+id/about_android_version"
+            android:text="@string/about_version"
+            style="@style/font12"
+            android:paddingTop="20dp"
+            android:layout_gravity="center"
+            android:gravity="center"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
+
+        <TextView
+            android:id="@+id/about_liblinphone_version"
+            android:text="@string/about_liblinphone_version"
+            style="@style/font12"
+            android:layout_gravity="center"
+            android:gravity="center"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:background="@color/colorH"
+        android:orientation="vertical"
+        android:padding="10dp"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:layout_gravity="center">
+
+        <TextView
+            android:id="@+id/about_link"
+            android:text="@string/about_link"
+            android:autoLink="web"
+            style="@style/font2"
+            android:textColorLink="@color/colorA"
+            android:paddingTop="20dp"
+            android:layout_gravity="center"
+            android:gravity="center"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
+
+        <TextView
+            android:id="@+id/about_text"
+            android:text="@string/about_text"
+            style="@style/font23"
+            android:layout_gravity="center"
+            android:gravity="center"
+            android:paddingTop="10dp"
+            android:paddingBottom="20dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
+
+        <View
+            android:background="@color/colorE"
+            android:layout_width="match_parent"
+            android:layout_height="1dp"/>
+
+        <LinearLayout
+            android:orientation="horizontal"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center">
+
+            <Button
+                android:id="@+id/send_log"
+                android:background="@drawable/button_background"
+                android:padding="10dp"
+                android:layout_margin="5dp"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/menu_send_log"/>
+
+            <Button
+                android:id="@+id/reset_log"
+                android:background="@drawable/button_background"
+                android:padding="10dp"
+                android:layout_margin="5dp"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/menu_reset_log"/>
+
+        </LinearLayout>
+    </LinearLayout>
 
 </LinearLayout>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index ca2b2002e..79eb09055 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -8,8 +8,11 @@
   <string name="wait_dialog_text">Démarrage</string>
   <string name="notification_registered">%s enregistré</string>
   <string name="notification_register_failure">%s n\'a pas pu s\'enregistrer</string>
-  <string name="about_text">Linphone %s SIP (RFC 3261) sous licence GNU Public License V2</string>
-  <string name="about_link">http://www.linphone.org\n\nInstructions\nhttp://www.linphone.org/user-guide.html\n\n© 2016 Belledonne Communications</string>
+  <string name="about_version">Linphone Android %s</string>
+  <string name="about_liblinphone_version">Linphone Core %s</string>
+  <string name="about_text">GNU General Public License V2\n © 2010-2016 Belledonne Communications</string>
+  <string name="about_link">www.linphone.org</string>
+
   <string name="sync_account_type">org.linphone</string>
   <string name="sync_account_name">contacts linphone</string>
   <string name="sync_mimetype">vnd.android.cursor.item/org.linphone.profile</string>
@@ -122,11 +125,9 @@ Lorsque cela est fait, cliquez sur le bouton pour continuer.</string>
   <string name="status_error">Enregistrement échoué</string>
   <string name="voicemail_unread">messages non lus</string>
   <!--Side Menu-->
-  <string-array name="side_menu_item">
-    <item>Assistant</item>
-    <item>Paramètres</item>
-    <item>À Propos</item>
-  </string-array>
+  <string name="menu_assistant">Assistant</string>
+  <string name="menu_settings">Paramètres</string>
+  <string name="menu_about">À Propos</string>
   <string name="quit">Quitter</string>
   <!--Call-->
   <string name="incoming_call">appel entrant</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index fc2fc5058..aa8b535f3 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -9,8 +9,10 @@
 	<string name="wait_dialog_text">Starting up</string>
 	<string name="notification_registered">%s registered</string>
 	<string name="notification_register_failure">%s failed to register</string>
-	<string name="about_text">Linphone %s SIP (RFC 3261) compatible phone under GNU Public License V2</string>
-	<string name="about_link">http://www.linphone.org\n\nInstructions\nhttp://www.linphone.org/user-guide.html\n\n© 2016 Belledonne Communications</string>
+	<string name="about_version">Linphone Android %s</string>
+	<string name="about_liblinphone_version">Linphone Core %s</string>
+	<string name="about_text">GNU General Public License V2\n © 2010-2016 Belledonne Communications</string>
+	<string name="about_link">www.linphone.org</string>
 
 	<string name="sync_account_name">linphone contacts</string>
 
@@ -132,11 +134,9 @@
 	<string name="voicemail_unread"> unread messages</string>
 
 	<!-- Side Menu -->
-	<string-array name="side_menu_item">
-		<item>Assistant</item>
-		<item>Settings</item>
-		<item>About</item>
-	</string-array>
+	<string name="menu_assistant">Assistant</string>
+	<string name="menu_settings">Settings</string>
+	<string name="menu_about">About</string>
 	<string name="quit">Quit</string>
 
 	<!-- Call -->
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 8fda0630a..97f52a5d5 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -121,4 +121,17 @@
 		<item name="android:textSize">50sp</item>
 	</style>
 
+	<style name="font22" parent="@android:style/TextAppearance.Large">
+		<item name="android:textColor">@color/colorH</item>
+		<item name="android:textAllCaps">true</item>
+		<item name="android:textStyle">bold</item>
+		<item name="android:textSize">25sp</item>
+	</style>
+
+	<style name="font23" parent="@android:style/TextAppearance.Medium">
+		<item name="android:textColor">@color/colorD</item>
+		<item name="android:textSize">18sp</item>
+		<item name="android:textStyle">italic</item>
+	</style>
+
 </resources>
\ No newline at end of file
diff --git a/src/org/linphone/AboutFragment.java b/src/org/linphone/AboutFragment.java
index a647db88b..764c32bf8 100644
--- a/src/org/linphone/AboutFragment.java
+++ b/src/org/linphone/AboutFragment.java
@@ -43,9 +43,11 @@ public class AboutFragment extends Fragment implements OnClickListener {
 	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 		View view = inflater.inflate(R.layout.about, container, false);
 
-		TextView aboutText = (TextView) view.findViewById(R.id.about_text);
+		TextView aboutVersion = (TextView) view.findViewById(R.id.about_android_version);
+		TextView aboutLiblinphoneVersion = (TextView) view.findViewById(R.id.about_liblinphone_version);
+		aboutLiblinphoneVersion.setText(String.format(getString(R.string.about_liblinphone_version), LinphoneManager.getLc().getVersion()));
 		try {
-			aboutText.setText(String.format(getString(R.string.about_text), getActivity().getPackageManager().getPackageInfo(getActivity().getPackageName(), 0).versionName));
+			aboutVersion.setText(String.format(getString(R.string.about_version), getActivity().getPackageManager().getPackageInfo(getActivity().getPackageName(), 0).versionName));
 		} catch (NameNotFoundException e) {
 			Log.e(e, "cannot get version name");
 		}
diff --git a/src/org/linphone/LinphoneActivity.java b/src/org/linphone/LinphoneActivity.java
index 108f0eb47..6b40500e2 100644
--- a/src/org/linphone/LinphoneActivity.java
+++ b/src/org/linphone/LinphoneActivity.java
@@ -655,14 +655,19 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 					changeCurrentFragment(FragmentsAvailable.CHAT, extras);
 				}
 			} else {
-				Bundle extras = new Bundle();
-				extras.putString("SipUri", sipUri);
-				if (lAddress.getDisplayName() != null) {
-					extras.putString("DisplayName", displayName);
-					extras.putString("PictureUri", pictureUri);
-					extras.putString("ThumbnailUri", thumbnailUri);
+				if(isTablet()){
+					changeCurrentFragment(FragmentsAvailable.CHAT_LIST, null);
+					displayChat(sipUri);
+				} else {
+					Bundle extras = new Bundle();
+					extras.putString("SipUri", sipUri);
+					if (lAddress.getDisplayName() != null) {
+						extras.putString("DisplayName", displayName);
+						extras.putString("PictureUri", pictureUri);
+						extras.putString("ThumbnailUri", thumbnailUri);
+					}
+					changeCurrentFragment(FragmentsAvailable.CHAT, extras);
 				}
-				changeCurrentFragment(FragmentsAvailable.CHAT, extras);
 			}
 
 			if (messageListFragment != null && messageListFragment.isVisible()) {
@@ -1295,7 +1300,7 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 
 	public void initSideMenu() {
 		sideMenu = (DrawerLayout) findViewById(R.id.side_menu);
-		sideMenuItems = getResources().getStringArray(R.array.side_menu_item);
+		sideMenuItems = new String[]{getResources().getString(R.string.menu_assistant),getResources().getString(R.string.menu_settings),getResources().getString(R.string.menu_about)};
 		sideMenuContent = (RelativeLayout) findViewById(R.id.side_menu_content);
 		sideMenuItemList = (ListView)findViewById(R.id.item_list);
 		menu = (ImageView) findViewById(R.id.side_menu_button);
@@ -1304,13 +1309,13 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 		sideMenuItemList.setOnItemClickListener(new AdapterView.OnItemClickListener() {
 			@Override
 			public void onItemClick(AdapterView<?> adapterView, View view, int i, long l) {
-				if(sideMenuItemList.getAdapter().getItem(i).toString().equals("Settings")){
+				if(sideMenuItemList.getAdapter().getItem(i).toString().equals(getString(R.string.menu_settings))){
 					LinphoneActivity.instance().displaySettings();
 				}
-				if(sideMenuItemList.getAdapter().getItem(i).toString().equals("About")){
+				if(sideMenuItemList.getAdapter().getItem(i).toString().equals(getString(R.string.menu_about))){
 					LinphoneActivity.instance().displayAbout();
 				}
-				if(sideMenuItemList.getAdapter().getItem(i).toString().equals("Assistant")){
+				if(sideMenuItemList.getAdapter().getItem(i).toString().equals(getString(R.string.menu_assistant))){
 					LinphoneActivity.instance().displayAssistant();
 				}
 				openOrCloseSideMenu(false);