Skip to content

GitLab

Commit f812b683 authored by Edward Wang's avatar Edward Wang
Browse files

Move authors to the main screen instead of the licence screen

parent 5abc8fdb
Hide whitespace changes
Inline Side-by-side
Showing with 101 additions and 88 deletions
vlc-android/assets/licence.htm
View file @ f812b683
......@@ -13,8 +13,6 @@
<div>
<h2>Licence</h2>
<p>VLC for Android is licensed under the <a href="#gpl">GNU General Public License, version 3 or later</a> (herein referred to as GPL).</p>
<h2>Authors</h2>
<p>S&eacute;bastien Toque, Rafa&euml;l Carr&eacute;, Jean-Baptiste Kempf, Edward Wang, Michael Merg, Ludovic Fauvet, Adrien Maglo, R&eacute;mi Duraffort, Dominique Martinet, Jean-Philippe Andr&eacute;, Martin Storsj&ouml;, Alexandre Perraud, Hugo Beauz&eacute;e-Luyssen, Felix Paul K&uuml;hne, John Mooring, Pavol Rusnak, Rohit Yadav, Tanguy Pruvot, Thomas Clavier, Asad Mehmood, Christoph Miebach, David Carr&eacute;, Garret Kelly, Philipp Dreimann, Walter Heck, wowdd1</p>
<h2>Sources</h2>
<p>The sources to this application can be retrieved at <a href="http://git.videolan.org/?p=vlc-ports/android.git;a=tree;h=!COMMITID!">http://git.videolan.org/?p=vlc-ports/android.git;a=tree;h=!COMMITID!</a>.</p>
<h2>Libraries</h2>
......
vlc-android/res/layout/about_main.xml
View file @ f812b683
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/about_bg"
android:orientation="vertical"
android:paddingBottom="15dp"
android:paddingLeft="5dp"
android:paddingRight="5dp"
android:paddingTop="15dp" >
android:layout_height="match_parent" >
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal" >
<ImageView
android:layout_width="80dp"
android:layout_height="fill_parent"
android:contentDescription="@string/info"
android:src="@drawable/icon" />
android:background="@drawable/about_bg"
android:orientation="vertical"
android:paddingBottom="15dp"
android:paddingLeft="5dp"
android:paddingRight="5dp"
android:paddingTop="15dp" >
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="match_parent"
android:orientation="vertical" >
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal" >
<TextView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal|top"
android:text="@string/app_name_full"
android:textColor="@android:color/black"
android:textSize="29sp" />
<ImageView
android:layout_width="80dp"
android:layout_height="fill_parent"
android:contentDescription="@string/info"
android:src="@drawable/icon" />
<TextView
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal|top"
android:text="@string/for_android"
android:textColor="@android:color/black"
android:textSize="20sp" />
android:layout_height="match_parent"
android:orientation="vertical" >
<TextView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal|top"
android:text="@string/app_name_full"
android:textColor="@android:color/black"
android:textSize="29sp" />
<TextView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal|top"
android:text="@string/for_android"
android:textColor="@android:color/black"
android:textSize="20sp" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
<TextView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:gravity="center"
android:text="@string/about_text"
android:textColor="@android:color/black"
android:textSize="18sp" />
<TextView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:gravity="center"
android:text="@string/about_text"
android:textColor="@android:color/black"
android:textSize="18sp" />
<TextView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginTop="30dp"
android:gravity="center"
android:text="@string/about_copyright"
android:textColor="@android:color/black"
android:textSize="14sp" />
<TextView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginTop="30dp"
android:gravity="center"
android:text="@string/about_copyright"
android:textColor="@android:color/black"
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="11sp" />
<TextView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:gravity="center"
android:text="@string/authors"
android:textColor="@android:color/black"
android:textSize="12sp" />
<TextView
android:id="@+id/main_compiled"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:gravity="center"
android:text="foo@bar (xxxx-xx-xx)"
android:textColor="@android:color/black"
android:textSize="11sp" />
<TextView
android:id="@+id/main_revision"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:gravity="center"
android:text="@string/revision"
android:textColor="@android:color/black"
android:textSize="14sp" />
<TextView
android:id="@+id/main_link"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:gravity="center"
android:text="@string/about_link"
android:textColor="@android:color/black"
android:textSize="16sp"
android:autoLink="web" />
<TextView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:gravity="center"
android:text="@string/compiled_by"
android:textColor="@android:color/black"
android:textSize="11sp" />
<TextView
android:id="@+id/main_compiled"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:gravity="center"
android:text="foo@bar (xxxx-xx-xx)"
android:textColor="@android:color/black"
android:textSize="11sp" />
<TextView
android:id="@+id/main_link"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:autoLink="web"
android:gravity="center"
android:text="@string/about_link"
android:textColor="@android:color/black"
android:textSize="16sp" />
</LinearLayout>
</LinearLayout>
\ No newline at end of file
</ScrollView>
\ No newline at end of file
vlc-android/res/values/strings.xml
View file @ f812b683
......@@ -100,6 +100,7 @@
<string name="about_copyright">Copyright &#169; 1996&#8211;2012 by VideoLAN.\nSee the \'Licence\' tab for licensing information.</string>
<string name="for_android">for Android</string>
<string name="compiled_by">This version of VLC is compiled by:</string>
<string name="authors" translatable="false">Sébastien&#160;Toque, Rafaël&#160;Carré, Jean-Baptiste&#160;Kempf, Edward&#160;Wang, Michael&#160;Merg, Ludovic&#160;Fauvet, Adrien&#160;Maglo, Rémi&#160;Duraffort, Dominique&#160;Martinet, Jean-Philippe&#160;André, Martin&#160;Storsjö, Alexandre&#160;Perraud, Hugo&#160;Beauzée-Luyssen, Felix&#160;Paul&#160;Kühne, John Mooring, Pavol Rusnak, Rohit Yadav, Tanguy Pruvot, Thomas Clavier, Asad Mehmood, Christoph Miebach, David Carré, Garret Kelly, Philipp Dreimann, Walter Heck</string>
<!-- Preferences -->
<string name="preferences">Preferences</string>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment