From 6b1484efe662a4205fbaf8005f96964356c860cf Mon Sep 17 00:00:00 2001 From: maskara Date: Tue, 21 Mar 2017 01:22:04 +0530 Subject: [PATCH] Add credits in about page --- .../main/java/fr/free/nrw/commons/AboutActivity.java | 5 +++++ app/src/main/res/layout/activity_about.xml | 10 ++++++++++ app/src/main/res/values/strings.xml | 1 + 3 files changed, 16 insertions(+) diff --git a/app/src/main/java/fr/free/nrw/commons/AboutActivity.java b/app/src/main/java/fr/free/nrw/commons/AboutActivity.java index 81d0b3efb..f4134a6f0 100644 --- a/app/src/main/java/fr/free/nrw/commons/AboutActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/AboutActivity.java @@ -1,5 +1,7 @@ package fr.free.nrw.commons; +import android.content.Intent; +import android.net.Uri; import android.os.Bundle; import android.text.Html; import android.text.method.LinkMovementMethod; @@ -16,6 +18,7 @@ public class AboutActivity extends BaseActivity { @BindView(R.id.about_improve) TextView improveText; @BindView(R.id.about_privacy_policy) TextView privacyPolicyText; @BindView(R.id.about_uploads_to) TextView uploadsToText; + @BindView(R.id.about_credits) TextView creditsText; @Override public void onCreate(Bundle savedInstanceState) { @@ -32,10 +35,12 @@ public class AboutActivity extends BaseActivity { fixFormatting(licenseText, R.string.about_license); fixFormatting(improveText, R.string.about_improve); fixFormatting(privacyPolicyText, R.string.about_privacy_policy); + fixFormatting(creditsText, R.string.about_credits); licenseText.setMovementMethod(LinkMovementMethod.getInstance()); improveText.setMovementMethod(LinkMovementMethod.getInstance()); privacyPolicyText.setMovementMethod(LinkMovementMethod.getInstance()); + creditsText.setMovementMethod(LinkMovementMethod.getInstance()); } private void fixFormatting(TextView textView, int resource) { diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml index 715210023..03534619e 100644 --- a/app/src/main/res/layout/activity_about.xml +++ b/app/src/main/res/layout/activity_about.xml @@ -57,6 +57,16 @@ android:text="@string/about_privacy_policy" /> + + Open Source software released under the <a href=\"https://github.com/wikimedia/apps-android-commons/blob/master/COPYING\">Apache License v2</a>. Wikimedia Commons and its logo are trademarks of the Wikimedia Foundation and are used with the permission of the Wikimedia Foundation. We are not endorsed by or affiliated with the Wikimedia Foundation. <a href=\"https://github.com/commons-app/apps-android-commons\">Source</a> and <a href=\"https://commons-app.github.io/\">website</a> on GitHub. Create a new <a href=\"https://github.com/commons-app/apps-android-commons/issues\">GitHub issue</a> for bug reports and suggestions. <a href=\"https://wikimediafoundation.org/wiki/Privacy_policy\">Privacy policy</a> + <a href=\"https://github.com/commons-app/apps-android-commons/blob/master/CREDITS\">CREDITS</a> About Send Feedback (via Email) No email client installed