Skip to content

Commit 73e56b6

Browse files
committed
feat: remove duplicates from 3rd party libraries licenses, add license of the PSLab app
fixes: #2647
1 parent 2bc0c10 commit 73e56b6

File tree

4 files changed

+9
-4
lines changed

4 files changed

+9
-4
lines changed

app/build.gradle.kts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,11 @@ android {
5858
buildFeatures {
5959
buildConfig = true
6060
}
61+
aboutLibraries {
62+
excludeFields = arrayOf("generated")
63+
duplicationMode = com.mikepenz.aboutlibraries.plugin.DuplicateMode.MERGE
64+
duplicationRule = com.mikepenz.aboutlibraries.plugin.DuplicateRule.SIMPLE
65+
}
6166
}
6267

6368

app/src/main/java/io/pslab/activity/MainActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ public boolean onNavigationItemSelected(@NonNull MenuItem item) {
335335
break;
336336
case R.id.nav_third_party_libs:
337337
new LibsBuilder()
338-
.withActivityTitle(getString(R.string.third_party_libs))
338+
.withActivityTitle(getString(R.string.software_licenses))
339339
.start(MainActivity.this);
340340
break;
341341
default:

app/src/main/res/menu/activity_main_drawer.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,6 @@
6868
<item
6969
android:id="@+id/nav_third_party_libs"
7070
android:icon="@drawable/baseline_attribution_24"
71-
android:title="@string/third_party_libs" />
71+
android:title="@string/software_licenses" />
7272
</group>
7373
</menu>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1087,7 +1087,7 @@
10871087
<string name="unit_volts">\u0020V</string>
10881088
<string name="no_playback_data">No data to display</string>
10891089
<string name="privacy_policy">Privacy Policy</string>
1090-
<string name="third_party_libs">Open Source Licenses</string>
1090+
<string name="software_licenses">Software Licenses</string>
10911091
<string name="auto_scale_error">No input found</string>
10921092
<string name="auto_scale">Auto</string>
10931093
<string name="control_stop">Stop</string>
@@ -1097,7 +1097,7 @@
10971097

10981098
<string name="aboutLibraries_description_showIcon">true</string>
10991099
<string name="aboutLibraries_description_showVersion">true</string>
1100-
<string name="aboutLibraries_description_text">Below is a list of the third-party open source software libraries used in the PSLab app.</string>
1100+
<string name="aboutLibraries_description_text">The PSLab app is licensed under the Apache License 2.0.&lt;br /&gt;&lt;br /&gt;Below is a list of the third-party open source software libraries used in the PSLab app.</string>
11011101

11021102
<string name="legacy_title">Legacy Firmware Detected</string>
11031103
<string name="legacy_message">We have detected that your PSLab device is running legacy firmware. Please note that support for this firmware has ended. For the best experience and continued support, please update your device to the latest firmware version.</string>

0 commit comments

Comments
 (0)