From 4ebbe758e3a90a2c857b27d8464f411315698e59 Mon Sep 17 00:00:00 2001 From: FC Stegerman Date: Mon, 28 Aug 2023 01:55:47 +0200 Subject: [PATCH] About: explicitly mention contributors' copyright --- app/src/main/java/protect/card_locker/AboutActivity.java | 2 +- app/src/main/java/protect/card_locker/AboutContent.java | 4 ++++ app/src/main/res/values/strings.xml | 3 ++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/protect/card_locker/AboutActivity.java b/app/src/main/java/protect/card_locker/AboutActivity.java index 6decf1a22..5fecdc320 100644 --- a/app/src/main/java/protect/card_locker/AboutActivity.java +++ b/app/src/main/java/protect/card_locker/AboutActivity.java @@ -28,7 +28,7 @@ public class AboutActivity extends CatimaAppCompatActivity { enableToolbarBackButton(); TextView copyright = binding.creditsSub; - copyright.setText(content.getCopyright()); + copyright.setText(content.getCopyrightShort()); TextView versionHistory = binding.versionHistorySub; versionHistory.setText(content.getVersionHistory()); diff --git a/app/src/main/java/protect/card_locker/AboutContent.java b/app/src/main/java/protect/card_locker/AboutContent.java index a3edabad1..95270bf14 100644 --- a/app/src/main/java/protect/card_locker/AboutContent.java +++ b/app/src/main/java/protect/card_locker/AboutContent.java @@ -50,6 +50,10 @@ public class AboutContent { return String.format(context.getString(R.string.app_copyright_fmt), getCurrentYear()); } + public String getCopyrightShort() { + return context.getString(R.string.app_copyright_short); + } + public String getContributors() { String contributors; try { diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index b81d40ad8..8820f5c65 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -79,7 +79,8 @@ Use any app or your favorite file manager to open a file. Use another app About - Copyright © 2019–%d Sylvia van Os + Copyright © 2019–%d Sylvia van Os and contributors + Copyright © Sylvia van Os and contributors Based on Loyalty Card Keychain\ncopyright © 2016–2020 Branden Archer Copylefted libre software, licensed GPLv3+ About %s