vanitasvitae/dandelion
1
0
Fork 0
mirror of https://github.com/gsantner/dandelion synced 2025-09-09 18:29:47 +02:00
Code Issues Releases Wiki Activity

Merge license and changelog dialog on first start

Browse source
This commit is contained in:
Gregor Santner 2018-04-08 09:01:52 +02:00
parent 82ccc54436
commit d53128e5cb
No known key found for this signature in database
GPG key ID: 7E83A7834AECB009
7 changed files with 20 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/res/layout/about__fragment_license.xml
View file

@ -108,14 +108,14 @@
style="@android:style/TextAppearance.DeviceDefault.Large"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/fragment_license__license"
android:text="@string/licenses"
android:layout_marginBottom="8dp"/>
<TextView
android:textAppearance="@style/TextAppearance.AppCompat"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/fragment_license__license_text"/>
android:text="@string/copyright_license_text_official"/>
<Button
android:id="@+id/fragment_license__license_button"

0
app/src/main/res/raw/license_third_party.md → app/src/main/res/raw/licenses_3rd_party.md
View file

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

@ -46,9 +46,9 @@
<string name="fragment_license__maintainers_text">This app is currently being developed and maintained by &lt;br>&lt;br>%1$s</string>
<string name="fragment_license__contributors">Contributors</string>
<string name="fragment_license__contributors_thank_you">%1$s&lt;br>&lt;br>Thank you!</string>
<string name="fragment_license__license" translatable="false">@string/about_activity__title_about_license</string>
<string name="fragment_license__license_text" translatable="false">
Copyright © 2015-2017
<string name="licenses" translatable="false">@string/about_activity__title_about_license</string>
<string name="copyright_license_text_official" translatable="false">
Copyright © 2015-2018
\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 the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
\n
\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.