mirrors/nextcloud-notes-android
1
0
Fork 0
mirror of https://github.com/nextcloud/notes-android.git synced 2024-12-18 08:32:24 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix #10 (Mention Material Design Icons on About-Page)

Browse source
This commit is contained in:
Stefan Niedermann 2015-10-06 23:01:11 +02:00
parent 727c8a93f2
commit 2f7c66f744
3 changed files with 27 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
app/src/main/res/layout/activity_about.xml
View file

@ -36,18 +36,33 @@
android:text="@string/about_author"/> android:text="@string/about_author"/>
<TextView <TextView
android:id="@+id/about_icon_disclaimer_title" android:id="@+id/about_app_icon_disclaimer_title"
style="?android:attr/listSeparatorTextViewStyle" style="?android:attr/listSeparatorTextViewStyle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/about_icon_disclaimer_title"/> android:text="@string/about_app_icon_disclaimer_title"/>
<TextView <TextView
android:id="@+id/about_icon_disclaimer" android:id="@+id/about_app_icon_disclaimer"
style="?android:attr/editTextPreferenceStyle" style="?android:attr/editTextPreferenceStyle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="10dp" 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> </LinearLayout>

6
app/src/main/res/values-de/strings.xml
View file

@ -23,8 +23,10 @@
<string name="about_version">Sie benutzen aktuell <strong>v0.1.0</strong></string> <string name="about_version">Sie benutzen aktuell <strong>v0.1.0</strong></string>
<string name="about_author_title">Autor</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_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_app_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"><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 --> <!-- Settings -->

6
app/src/main/res/values/strings.xml
View file

@ -23,8 +23,10 @@
<string name="about_version">You are currently using <strong>v0.1.0</strong></string> <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_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_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_app_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"><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 --> <!-- Settings -->