aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/main/res/layout/activity_about.xml46
-rw-r--r--src/main/res/values/strings.xml9
2 files changed, 38 insertions, 17 deletions
diff --git a/src/main/res/layout/activity_about.xml b/src/main/res/layout/activity_about.xml
index 2d9f9a691..ac5bafbdb 100644
--- a/src/main/res/layout/activity_about.xml
+++ b/src/main/res/layout/activity_about.xml
@@ -5,18 +5,36 @@
android:layout_width="fill_parent"
android:layout_height="fill_parent">
- <TextView
- android:text="@string/pref_about_message"
- android:autoLink="web"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:linksClickable="true"
- android:layout_marginLeft="@dimen/activity_horizontal_margin"
- android:layout_marginRight="@dimen/activity_horizontal_margin"
- android:layout_marginTop="@dimen/activity_vertical_margin"
- android:paddingBottom="@dimen/activity_vertical_margin"
- android:textColor="@color/black87"
- android:textSize="?attr/TextSizeBody"
- android:typeface="monospace"
- android:fontFamily="monospace" />
+
+ <RelativeLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
+
+ <TextView
+ android:id="@+id/aboutmessage"
+ android:text="@string/pref_about_message"
+ android:layout_below="@+id/logo"
+ android:autoLink="web"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:linksClickable="true"
+ android:layout_marginLeft="@dimen/activity_horizontal_margin"
+ android:layout_marginRight="@dimen/activity_horizontal_margin"
+ android:layout_marginTop="@dimen/activity_vertical_margin"
+ android:paddingBottom="@dimen/activity_vertical_margin"
+ android:textColor="@color/black87"
+ android:textSize="?attr/TextSizeBody"
+ android:typeface="monospace"
+ android:fontFamily="monospace" />
+
+ <ImageView
+ android:id="@+id/logo"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:padding="8dp"
+ android:src="@drawable/main_logo"
+ android:layout_alignParentTop="true"
+ android:layout_centerHorizontal="true" />
+ </RelativeLayout>
+
</ScrollView>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 4ac341344..50c8005fe 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -273,10 +273,10 @@
<string name="pref_dont_save_encrypted">Don’t save encrypted messages</string>
<string name="pref_dont_save_encrypted_summary">Warning: This could lead to message loss</string>
<string name="pref_expert_options">Expert settings</string>
- <string name="title_activity_about">About Pix-Art Messenger</string>
+ <string name="title_activity_about">About</string>
<string name="pref_about_conversations_summary">Build and licensing information</string>
- <string name="pref_about_message" translatable="false">Pix-Art Messenger
- \n\nCopyright © 2014-2016 Christian Schneppe
+ <string name="pref_about_message" translatable="false"><b>Pix-Art Messenger</b>
+ \n\nCopyright © 2014-2017 Christian Schneppe
\n\nhttp://jabber.pix-art.de
\n\nThis program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -308,6 +308,7 @@
\n\nhttps://github.com/jdamcd/android-crop\n(Apache License, Version 2.0)
\n\nhttps://github.com/jaydeepw/audio-wife\n(The MIT License (MIT))
\n\nhttps://github.com/google/gson\n(Apache License, Version 2.0)
+ \n\nhttps://github.com/google/gcm\n(Apache License, Version 2.0)
\n\nhttp://hc.apache.org/httpcomponents-client\n(Apache License, Version 2.0)
\n\nhttp://hc.apache.org/httpcomponents-core\n(Apache License, Version 2.0)
\n\nhttps://github.com/bumptech/glide\n(BSD, The MIT License (MIT) and Apache License, Version 2.0)
@@ -317,6 +318,8 @@
\n\nhttps://github.com/googlesamples/easypermissions\n(Apache License, Version 2.0)
\n\nhttps://github.com/blazsolar/FlowLayout\n(Apache License, Version 2.0)
\n\nhttps://github.com/ankushsachdeva/emojicon\n(Apache License, Version 2.0)
+ \n\nhttps://github.com/ypresto/android-transcoder\n(Apache License, Version 2.0)
+ \n\nhttp://www.eclipse.org/jetty/\n(Apache License, Version 2.0 and Eclipse Public License 1.0)
</string>
<string name="title_pref_quiet_hours">Quiet Hours</string>
<string name="title_pref_quiet_hours_start_time">Start time</string>