Skip to content

Commit f039a4e

Browse files
committed
Update license attributions
1 parent d82aedc commit f039a4e

File tree

2 files changed

+46
-57
lines changed

2 files changed

+46
-57
lines changed

app/src/main/res/layout/fragment_about.xml

Lines changed: 13 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,14 @@
8686
app:name="@string/licenses_name_aospsupport"
8787
app:notice="@string/licenses_notice_aospsupport" />
8888

89+
<de.stephanlindauer.criticalmaps.views.LicensePanelView
90+
android:id="@+id/about_license_material_components"
91+
style="@style/about_license_panel"
92+
app:copyright="@string/licenses_copyright_material_components"
93+
app:link="@string/licenses_link_material_components"
94+
app:name="@string/licenses_name_material_components"
95+
app:notice="@string/licenses_notice_material_components" />
96+
8997
<de.stephanlindauer.criticalmaps.views.LicensePanelView
9098
android:id="@+id/about_license_axt"
9199
style="@style/about_license_panel"
@@ -94,14 +102,6 @@
94102
app:name="@string/licenses_name_axt"
95103
app:notice="@string/licenses_notice_axt" />
96104

97-
<de.stephanlindauer.criticalmaps.views.LicensePanelView
98-
android:id="@+id/about_license_butterknife"
99-
style="@style/about_license_panel"
100-
app:copyright="@string/licenses_copyright_butterknife"
101-
app:link="@string/licenses_link_butterknife"
102-
app:name="@string/licenses_name_butterknife"
103-
app:notice="@string/licenses_notice_butterknife" />
104-
105105
<de.stephanlindauer.criticalmaps.views.LicensePanelView
106106
android:id="@+id/about_license_dagger2"
107107
style="@style/about_license_panel"
@@ -127,20 +127,12 @@
127127
app:notice="@string/licenses_notice_okhttp" />
128128

129129
<de.stephanlindauer.criticalmaps.views.LicensePanelView
130-
android:id="@+id/about_license_osmdroid"
131-
style="@style/about_license_panel"
132-
app:copyright="@string/licenses_copyright_osmdroid"
133-
app:link="@string/licenses_link_osmdroid"
134-
app:name="@string/licenses_name_osmdroid"
135-
app:notice="@string/licenses_notice_osmdroid" />
136-
137-
<de.stephanlindauer.criticalmaps.views.LicensePanelView
138-
android:id="@+id/about_license_osmbonuspack"
130+
android:id="@+id/about_license_maplibre"
139131
style="@style/about_license_panel"
140-
app:copyright="@string/licenses_copyright_osmbonuspack"
141-
app:link="@string/licenses_link_osmbonuspack"
142-
app:name="@string/licenses_name_osmbonuspack"
143-
app:notice="@string/licenses_notice_osmbonuspack" />
132+
app:copyright="@string/licenses_copyright_maplibre"
133+
app:link="@string/licenses_link_maplibre"
134+
app:name="@string/licenses_name_maplibre"
135+
app:notice="@string/licenses_notice_maplibre" />
144136

145137
<de.stephanlindauer.criticalmaps.views.LicensePanelView
146138
android:id="@+id/about_license_picasso"

app/src/main/res/values/licenses.xml

Lines changed: 33 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
<resources xmlns:tools="http://schemas.android.com/tools">
33

44
<!-- AOSP Support Libraries -->
5-
<string name="licenses_name_aospsupport" translatable="false">AOSP Support Libraries</string>
5+
<string name="licenses_name_aospsupport" translatable="false">Android Jetpack</string>
66
<string name="licenses_link_aospsupport" translatable="false">https://android.googlesource.com/platform/frameworks/support</string>
7-
<string name="licenses_copyright_aospsupport" translatable="false">Copyright 2014 The Android Open Source Project</string>
7+
<string name="licenses_copyright_aospsupport" translatable="false">Copyright 2019 The Android Open Source Project</string>
88
<string name="licenses_notice_aospsupport" translatable="false" tools:ignore="TypographyOther">
9-
Copyright (C) 2014 The Android Open Source Project\n
9+
Copyright (C) 2019 The Android Open Source Project\n
1010
\n
1111
Licensed under the Apache License, Version 2.0 (the "License");\n
1212
you may not use this file except in compliance with the License.\n
@@ -22,12 +22,12 @@
2222
</string>
2323

2424

25-
<!-- AXT -->
26-
<string name="licenses_name_axt" translatable="false">AXT</string>
27-
<string name="licenses_link_axt" translatable="false">https://github.com/ligi/AXT</string>
28-
<string name="licenses_copyright_axt" translatable="false">Copyright 2013 ligi</string>
29-
<string name="licenses_notice_axt" translatable="false">
30-
Copyright 2013 ligi\n
25+
<!-- AOSP Support Libraries -->
26+
<string name="licenses_name_material_components" translatable="false">Material Components for Android</string>
27+
<string name="licenses_link_material_components" translatable="false">https://github.com/material-components/material-components-android</string>
28+
<string name="licenses_copyright_material_components" translatable="false">Copyright 2019 The Android Open Source Project</string>
29+
<string name="licenses_notice_material_components" translatable="false" tools:ignore="TypographyOther">
30+
Copyright (C) 2019 The Android Open Source Project\n
3131
\n
3232
Licensed under the Apache License, Version 2.0 (the "License");\n
3333
you may not use this file except in compliance with the License.\n
@@ -43,12 +43,12 @@
4343
</string>
4444

4545

46-
<!-- Butterknife -->
47-
<string name="licenses_name_butterknife" translatable="false">Butterknife</string>
48-
<string name="licenses_link_butterknife" translatable="false">https://github.com/JakeWharton/butterknife</string>
49-
<string name="licenses_copyright_butterknife" translatable="false">Copyright 2013 Jake Wharton</string>
50-
<string name="licenses_notice_butterknife" translatable="false">
51-
Copyright 2013 Jake Wharton\n
46+
<!-- AXT -->
47+
<string name="licenses_name_axt" translatable="false">AXT</string>
48+
<string name="licenses_link_axt" translatable="false">https://github.com/ligi/AXT</string>
49+
<string name="licenses_copyright_axt" translatable="false">Copyright 2013 ligi</string>
50+
<string name="licenses_notice_axt" translatable="false">
51+
Copyright 2013 ligi\n
5252
\n
5353
Licensed under the Apache License, Version 2.0 (the "License");\n
5454
you may not use this file except in compliance with the License.\n
@@ -67,9 +67,9 @@
6767
<!-- Dagger 2 -->
6868
<string name="licenses_name_dagger2" translatable="false">Dagger 2</string>
6969
<string name="licenses_link_dagger2" translatable="false">https://github.com/google/dagger</string>
70-
<string name="licenses_copyright_dagger2" translatable="false">Copyright 2012 The Dagger Authors</string>
70+
<string name="licenses_copyright_dagger2" translatable="false">Copyright 2017 The Dagger Authors</string>
7171
<string name="licenses_notice_dagger2" translatable="false">
72-
Copyright 2012 The Dagger Authors\n
72+
Copyright 2017 The Dagger Authors\n
7373
\n
7474
Licensed under the Apache License, Version 2.0 (the "License");\n
7575
you may not use this file except in compliance with the License.\n
@@ -109,9 +109,9 @@
109109
<!-- OkHttp -->
110110
<string name="licenses_name_okhttp" translatable="false">OkHttp</string>
111111
<string name="licenses_link_okhttp" translatable="false">https://github.com/square/okhttp</string>
112-
<string name="licenses_copyright_okhttp" translatable="false">Copyright 2014 Square, Inc.</string>
112+
<string name="licenses_copyright_okhttp" translatable="false">Copyright 2019 Square, Inc.</string>
113113
<string name="licenses_notice_okhttp" translatable="false">
114-
Copyright 2014 Square, Inc.\n
114+
Copyright 2019 Square, Inc.\n
115115
\n
116116
Licensed under the Apache License, Version 2.0 (the "License");\n
117117
you may not use this file except in compliance with the License.\n
@@ -127,25 +127,22 @@
127127
</string>
128128

129129

130-
<!-- osmdroid -->
131-
<string name="licenses_name_osmdroid" translatable="false">osmdroid</string>
132-
<string name="licenses_link_osmdroid" translatable="false">https://github.com/osmdroid/osmdroid</string>
133-
<string name="licenses_copyright_osmdroid" translatable="false">Copyright osmdroid</string>
134-
<string name="licenses_notice_osmdroid" translatable="false">
135-
Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>
136-
</string>
137-
138-
139-
<!-- OSMBonusPack -->
140-
<string name="licenses_name_osmbonuspack" translatable="false">OSMBonusPack</string>
141-
<string name="licenses_link_osmbonuspack" translatable="false">https://github.com/MKergall/osmbonuspack</string>
142-
<string name="licenses_copyright_osmbonuspack" translatable="false">Copyright OSMBonusPack</string>
143-
<string name="licenses_notice_osmbonuspack" translatable="false">
144-
The components inside this GitHub project are under LGPL licence, with an important simplification: The constraints described in Section 5.d and 5.e of the <a href="https://github.com/MKergall/osmbonuspack/blob/master/LICENSE.md">LGPL LICENCE</a> are DISCARDED.\n
130+
<!-- MapLibre -->
131+
<string name="licenses_name_maplibre" translatable="false">MabLibre Native</string>
132+
<string name="licenses_link_maplibre" translatable="false">https://github.com/maplibre/maplibre-native</string>
133+
<string name="licenses_copyright_maplibre" translatable="false">Copyright (c) 2021 MapLibre contributors\nCopyright (c) 2018-2021 MapTiler.com\nCopyright (c) 2014-2020 Mapbox</string>
134+
<string name="licenses_notice_maplibre" translatable="false">
135+
BSD 2-Clause License\n
136+
\n
137+
Copyright (c) 2021 MapLibre contributors\n
138+
Copyright (c) 2018-2021 MapTiler.com\n
139+
Copyright (c) 2014-2020 Mapbox\n
145140
\n
146-
This means that you are allowed to convey a Combined Work without providing the user any way to recombine or relink the application, and without providing any shared library mechanism.\n
141+
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:\n
142+
- Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.\n
143+
- Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.\n
147144
\n
148-
In other terms, you are allowed to include the OSMBonusPack library in your Android application, without making your application open source.\n
145+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
149146
</string>
150147

151148

0 commit comments

Comments
 (0)