From 2f7c66f74402f33b38156850b6aca986231dea6c Mon Sep 17 00:00:00 2001
From: Stefan Niedermann <stefan.niedermann@googlemail.com>
Date: Tue, 6 Oct 2015 23:01:11 +0200
Subject: [PATCH] Fix #10 (Mention Material Design Icons on About-Page)

---
 app/src/main/res/layout/activity_about.xml | 23 ++++++++++++++++++----
 app/src/main/res/values-de/strings.xml     |  6 ++++--
 app/src/main/res/values/strings.xml        |  6 ++++--
 3 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
index 31bfe772..504b3ca3 100644
--- a/app/src/main/res/layout/activity_about.xml
+++ b/app/src/main/res/layout/activity_about.xml
@@ -36,18 +36,33 @@
         android:text="@string/about_author"/>
 
     <TextView
-        android:id="@+id/about_icon_disclaimer_title"
+        android:id="@+id/about_app_icon_disclaimer_title"
         style="?android:attr/listSeparatorTextViewStyle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="@string/about_icon_disclaimer_title"/>
+        android:text="@string/about_app_icon_disclaimer_title"/>
 
     <TextView
-        android:id="@+id/about_icon_disclaimer"
+        android:id="@+id/about_app_icon_disclaimer"
         style="?android:attr/editTextPreferenceStyle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:padding="10dp"
-        android:text="@string/about_icon_disclaimer"/>
+        android:text="@string/about_app_icon_disclaimer"/>
+
+    <TextView
+        android:id="@+id/about_icons_disclaimer_title"
+        style="?android:attr/listSeparatorTextViewStyle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/about_icons_disclaimer_title"/>
+
+    <TextView
+        android:id="@+id/about_icons_disclaimer"
+        style="?android:attr/editTextPreferenceStyle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="10dp"
+        android:text="@string/about_icons_disclaimer"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index d2b73943..308fe014 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -23,8 +23,10 @@
 	<string name="about_version">Sie benutzen aktuell <strong>v0.1.0</strong></string>
 	<string name="about_author_title">Autor</string>
 	<string name="about_author">Diese Android-App wird entwickelt von <a href="http://www.niedermann.it/">Niedermann IT-Dienstleistungen</a></string>
-	<string name="about_icon_disclaimer_title">App-Icon</string>
-    <string name="about_icon_disclaimer"><p>Ursprüngliches Icon wurde erstellt von <a href="http://www.freepik.com" title="Freepik">Freepik</a> auf <a href="http://www.flaticon.com/free-icon/ceo-copyrighting_15475" title="Flaticon">www.flaticon.com</a></p></string>
+    <string name="about_app_icon_disclaimer_title">App-Icon</string>
+    <string name="about_app_icon_disclaimer"><p>Ursprüngliches Icon wurde erstellt von <a href="http://www.freepik.com" title="Freepik">Freepik</a> auf <a href="http://www.flaticon.com/free-icon/ceo-copyrighting_15475" title="Flaticon">www.flaticon.com</a></p></string>
+    <string name="about_icons_disclaimer_title">Icons</string>
+    <string name="about_icons_disclaimer"><p>Alle weiteren Icons, die in dieser App verwendet werden, sind <a href="https://materialdesignicons.com/" title="Link to Website">Material Design Icons</a> von Google Inc. und unter einer Creative Commons License lizensiert.</p></string>
 
     <!-- Settings -->
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 39710c49..9e00c082 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -23,8 +23,10 @@
 	<string name="about_version">You are currently using <strong>v0.1.0</strong></string>
 	<string name="about_author_title">Author</string>
 	<string name="about_author">This Android-Application is developed and presented by <a href="http://www.niedermann.it/">Niedermann IT-Dienstleistungen</a></string>
-	<string name="about_icon_disclaimer_title">App-Icon</string>
-    <string name="about_icon_disclaimer"><p>Original icon made by <a href="http://www.freepik.com" title="Freepik">Freepik</a> from <a href="http://www.flaticon.com/free-icon/ceo-copyrighting_15475" title="Flaticon">www.flaticon.com</a></p></string>
+    <string name="about_app_icon_disclaimer_title">App-Icon</string>
+    <string name="about_app_icon_disclaimer"><p>Original icon made by <a href="http://www.freepik.com" title="Freepik">Freepik</a> from <a href="http://www.flaticon.com/free-icon/ceo-copyrighting_15475" title="Flaticon">www.flaticon.com</a></p></string>
+    <string name="about_icons_disclaimer_title">Icons</string>
+    <string name="about_icons_disclaimer"><p>All further icons used by this app are <a href="https://materialdesignicons.com/" title="Link to Website">Material Design Icons</a> made by Google Inc. and licensed under a Creative Commons License.</p></string>
 
     <!-- Settings -->