[Android] res: adjust about_main font sizes and layout (centre all)

[Edward Wang]

android | branch: master | Edward Wang <edward.c.wang at compdigitec.com> | Mon Jun 25 15:29:03 2012 -0400| [eb3280fa2fb23c6acb409c487e20b044aab118ce] | committer: Edward Wang

res: adjust about_main font sizes and layout (centre all)

> http://git.videolan.org/gitweb.cgi/android.git/?a=commit;h=eb3280fa2fb23c6acb409c487e20b044aab118ce
---

 vlc-android/res/layout/about_main.xml              |   28 +++++++++++++-------
 vlc-android/res/values-fr/strings.xml              |    1 +
 vlc-android/res/values/strings.xml                 |    1 +
 .../org/videolan/vlc/gui/AboutMainFragment.java    |    3 +++
 4 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/vlc-android/res/layout/about_main.xml b/vlc-android/res/layout/about_main.xml
index d10faf1..ed6982a 100644
--- a/vlc-android/res/layout/about_main.xml
+++ b/vlc-android/res/layout/about_main.xml
@@ -31,7 +31,7 @@
                 android:layout_gravity="center_horizontal|top"
                 android:text="@string/app_name_full"
                 android:textColor="@android:color/black"
-                android:textSize="27sp" />
+                android:textSize="29sp" />
 
             <TextView
                 android:layout_width="fill_parent"
@@ -39,46 +39,56 @@
                 android:layout_gravity="center_horizontal|top"
                 android:text="@string/for_android"
                 android:textColor="@android:color/black"
-                android:textSize="18sp" />
+                android:textSize="20sp" />
         </LinearLayout>
     </LinearLayout>
 
     <TextView
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="15dp"
         android:layout_marginTop="10dp"
         android:gravity="center"
         android:text="@string/about_text"
         android:textColor="@android:color/black"
-        android:textSize="16sp" />
+        android:textSize="18sp" />
 
     <TextView
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="15dp"
+        android:layout_marginTop="30dp"
         android:gravity="center"
         android:text="@string/about_copyright"
         android:textColor="@android:color/black"
-        android:textSize="16sp" />
+        android:textSize="14sp" />
 
     <TextView
+        android:id="@+id/main_revision"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="20dp"
+        android:gravity="center"
+        android:textColor="@android:color/black"
+        android:text="@string/revision"
+        android:textSize="14sp" />
+    
+    <TextView
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="5dp"
         android:text="@string/compiled_by"
+        android:gravity="center"
         android:textColor="@android:color/black"
-        android:textSize="16sp" />
+        android:textSize="11sp" />
 
     <TextView
         android:id="@+id/main_compiled"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="5dp"
-        android:paddingLeft="32sp"
+        android:gravity="center"
         android:text="foo at bar (xxxx-xx-xx)"
         android:textColor="@android:color/black"
-        android:textSize="16sp" />
+        android:textSize="11sp" />
 
     <TextView
         android:id="@+id/main_link"
diff --git a/vlc-android/res/values-fr/strings.xml b/vlc-android/res/values-fr/strings.xml
index c192e3e..a1cd465 100644
--- a/vlc-android/res/values-fr/strings.xml
+++ b/vlc-android/res/values-fr/strings.xml
@@ -83,6 +83,7 @@
     <!-- About -->
     <string name="version">Version</string>
     <string name="licence">Licence</string>
+    <string name="revision">Révision</string>
     <string name="about">À propos</string>
     <string name="about_copyright">Copyright © 1996–2012 par l\'équipe VideoLAN.\nConsultez le onglet «Licence» pour informations relatives aux licences.</string>
     <string name="for_android">pour Android</string>
diff --git a/vlc-android/res/values/strings.xml b/vlc-android/res/values/strings.xml
index 4888071..aab0786 100644
--- a/vlc-android/res/values/strings.xml
+++ b/vlc-android/res/values/strings.xml
@@ -92,6 +92,7 @@
     <!-- About -->
     <string name="version">Version</string>
     <string name="licence">Licence</string>
+    <string name="revision">Revision</string>
     <string name="about">About</string>
     <string name="about_text">VLC media player for Android is a port of VLC, the free media player that can read from files and network streams, to the Android operating system.</string>
     <string name="about_link">
diff --git a/vlc-android/src/org/videolan/vlc/gui/AboutMainFragment.java b/vlc-android/src/org/videolan/vlc/gui/AboutMainFragment.java
index 95e2440..32a6084 100644
--- a/vlc-android/src/org/videolan/vlc/gui/AboutMainFragment.java
+++ b/vlc-android/src/org/videolan/vlc/gui/AboutMainFragment.java
@@ -43,9 +43,12 @@ public class AboutMainFragment extends Fragment {
 
         String builddate = Util.readAsset("builddate.txt", "Unknown");
         String builder = Util.readAsset("builder.txt", "unknown");
+        String revision = Util.readAsset("revision.txt", "unknown");
 
         TextView compiled = (TextView) v.findViewById(R.id.main_compiled);
         compiled.setText(builder + " (" + builddate + ")");
+        TextView textview_rev = (TextView) v.findViewById(R.id.main_revision);
+        textview_rev.setText(getResources().getString(R.string.revision) + " " + revision + " (" + builddate + ")");
 
         return v;
     }