X-Git-Url: http://gitweb.fperrin.net/?a=blobdiff_plain;f=res%2Flayout%2Fabout_activity.xml;h=b3ba12c209a4f89c8537eb36fa121db4b5814f3c;hb=19a1ac0da265f334adff9ab22e8af0867864cb24;hp=29e070120af3159acc727b498aef5a3c80baf1ae;hpb=63dc6ebb11356f45e95fe59069dc39649b592cfa;p=Dictionary.git

diff --git a/res/layout/about_activity.xml b/res/layout/about_activity.xml
old mode 100755
new mode 100644
index 29e0701..b3ba12c
--- a/res/layout/about_activity.xml
+++ b/res/layout/about_activity.xml
@@ -1,82 +1,108 @@
-<ScrollView android:id="@+id/ScrollView01"
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="wrap_content" 
-	android:layout_height="wrap_content">
-	
-<LinearLayout 
-	android:id="@+id/LinearLayout01"
-	android:orientation="vertical"
-	android:layout_width="fill_parent"
-	android:layout_height="wrap_content"
-	>
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" >
 
-	<LinearLayout 
-		android:id="@+id/LinearLayout02"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:layout_gravity="center_horizontal"
-		android:paddingBottom="10dip">
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical" >
 
-		<ImageView 
-			android:id="@+id/ImageView01"
-			android:layout_width="wrap_content" 
-			android:layout_height="wrap_content"
-			android:layout_gravity="center_horizontal"
-			android:background="@drawable/icon"/>
+        <TextView
+            android:id="@+id/titleText"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:drawableLeft="@drawable/icon"
+            android:textAppearance="?android:attr/textAppearanceLarge" />
 
-		<TextView 
-			android:id="@+id/title" 
-			android:text="@string/titleWithVersion"
-			android:textAppearance="?android:attr/textAppearanceLarge"
-			android:layout_width="wrap_content" 
-			android:layout_height="wrap_content"
-			android:layout_gravity="center_vertical|fill_vertical" />
-	</LinearLayout>
+        <TextView
+            android:id="@+id/textView2"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:text="Copyright 2015 Reimar Döffinger\nCopyright 2009-2013 Google Inc."
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            tools:ignore="HardcodedText" />
 
-	<TextView 
-		android:id="@+id/copyright"
-		android:text="(c) 2009" 
-		android:layout_width="wrap_content" 
-		android:layout_height="wrap_content"
-		android:layout_gravity="center_horizontal"/>
+        <TextView
+            android:id="@+id/textView3"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:text="Thad Hughes"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            tools:ignore="HardcodedText" />
 
-	<TextView 
-		android:id="@+id/author"
-		android:text="Thad Hughes" 
-		android:layout_width="wrap_content" 
-		android:layout_height="wrap_content"
-		android:layout_gravity="center_horizontal"
-		android:paddingBottom="10dip"/>
+        <TextView
+            android:id="@+id/textView4"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/contactMe"
+            android:textAppearance="?android:attr/textAppearanceSmall" />
 
-	<TextView 
-		android:id="@+id/emailMe"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content" 
-		android:text="@string/contactMe"/>
+        <TextView
+            android:id="@+id/email"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="left"
+            android:autoLink="email"
+            android:clickable="true"
+            android:text="@string/myEmail"
+            android:paddingBottom="10dip"
+            />
 
-	<TextView 
-		android:id="@+id/email" 
-		android:text="@string/myEmail"
-		android:autoLink="email"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content" 
-		android:clickable="true" 
-		android:layout_gravity="left"
-		android:paddingBottom="10dip"/>
+        <TextView
+            android:id="@+id/webPage"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/webPage" />
 
-	<TextView 
-		android:id="@+id/currentDictInfoTitle"
-		android:textAppearance="?android:attr/textAppearanceLarge"
-		android:layout_width="fill_parent" 
-		android:layout_height="wrap_content"
-		android:text="@string/currentDictInfo"/>
+        <TextView
+            android:id="@+id/webPageUrl"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="left"
+            android:autoLink="web"
+            android:clickable="true"
+            android:text="@string/webPageUrl"
+            android:paddingBottom="10dip"
+             />
 
-	<TextView 
-		android:id="@+id/currentDictInfo"
-		android:text="@string/noDictLoaded" 
-		android:layout_width="fill_parent" 
-		android:layout_height="wrap_content"/>
+         <TextView
+            android:id="@+id/textView5"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/contributionsFrom" />
 
-</LinearLayout>
+        <TextView
+            android:id="@+id/textView6"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="left"
+            android:autoLink="web"
+            android:clickable="true"
+            android:text="Dominik Köppl, Uwe Trottmann, Michael Vogel, Laura Arjona, Fabio Casciano, 'Akira"
+            android:paddingBottom="10dip"
+             />
 
-</ScrollView>
\ No newline at end of file
+        <TextView
+            android:id="@+id/license"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="left"
+            android:autoLink="web"
+            android:text="@string/license" />
+
+        <TextView
+            android:id="@+id/licenseUrl"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="left"
+            android:autoLink="web"
+            android:paddingBottom="10dip"
+            android:text="@string/licenseUrl" />
+    </LinearLayout>
+
+</ScrollView>