mirror of
https://github.com/commons-app/apps-android-commons.git
synced 2025-10-26 12:23:58 +01:00
Merge pull request #451 from maskaravivek/credits
Add credits in about page
This commit is contained in:
commit
b64c77021b
3 changed files with 16 additions and 0 deletions
|
|
@ -1,5 +1,7 @@
|
||||||
package fr.free.nrw.commons;
|
package fr.free.nrw.commons;
|
||||||
|
|
||||||
|
import android.content.Intent;
|
||||||
|
import android.net.Uri;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.text.Html;
|
import android.text.Html;
|
||||||
import android.text.method.LinkMovementMethod;
|
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_improve) TextView improveText;
|
||||||
@BindView(R.id.about_privacy_policy) TextView privacyPolicyText;
|
@BindView(R.id.about_privacy_policy) TextView privacyPolicyText;
|
||||||
@BindView(R.id.about_uploads_to) TextView uploadsToText;
|
@BindView(R.id.about_uploads_to) TextView uploadsToText;
|
||||||
|
@BindView(R.id.about_credits) TextView creditsText;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onCreate(Bundle savedInstanceState) {
|
public void onCreate(Bundle savedInstanceState) {
|
||||||
|
|
@ -35,10 +38,12 @@ public class AboutActivity extends BaseActivity {
|
||||||
fixFormatting(licenseText, R.string.about_license);
|
fixFormatting(licenseText, R.string.about_license);
|
||||||
fixFormatting(improveText, R.string.about_improve);
|
fixFormatting(improveText, R.string.about_improve);
|
||||||
fixFormatting(privacyPolicyText, R.string.about_privacy_policy);
|
fixFormatting(privacyPolicyText, R.string.about_privacy_policy);
|
||||||
|
fixFormatting(creditsText, R.string.about_credits);
|
||||||
|
|
||||||
licenseText.setMovementMethod(LinkMovementMethod.getInstance());
|
licenseText.setMovementMethod(LinkMovementMethod.getInstance());
|
||||||
improveText.setMovementMethod(LinkMovementMethod.getInstance());
|
improveText.setMovementMethod(LinkMovementMethod.getInstance());
|
||||||
privacyPolicyText.setMovementMethod(LinkMovementMethod.getInstance());
|
privacyPolicyText.setMovementMethod(LinkMovementMethod.getInstance());
|
||||||
|
creditsText.setMovementMethod(LinkMovementMethod.getInstance());
|
||||||
}
|
}
|
||||||
|
|
||||||
private void fixFormatting(TextView textView, int resource) {
|
private void fixFormatting(TextView textView, int resource) {
|
||||||
|
|
|
||||||
|
|
@ -57,6 +57,16 @@
|
||||||
android:text="@string/about_privacy_policy"
|
android:text="@string/about_privacy_policy"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/about_credits"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginTop="16dp"
|
||||||
|
style="?android:textAppearanceSmall"
|
||||||
|
android:gravity="center"
|
||||||
|
android:text="@string/about_credits"
|
||||||
|
/>
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/about_uploads_to"
|
android:id="@+id/about_uploads_to"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
|
|
|
||||||
|
|
@ -77,6 +77,7 @@ Tap this message (or hit back) to skip this step.</string>
|
||||||
<string name="about_license">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.</string>
|
<string name="about_license">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.</string>
|
||||||
<string name="about_improve"><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.</string>
|
<string name="about_improve"><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.</string>
|
||||||
<string name="about_privacy_policy"><a href=\"https://wikimediafoundation.org/wiki/Privacy_policy\">Privacy policy</a></string>
|
<string name="about_privacy_policy"><a href=\"https://wikimediafoundation.org/wiki/Privacy_policy\">Privacy policy</a></string>
|
||||||
|
<string name="about_credits"><a href=\"https://github.com/commons-app/apps-android-commons/blob/master/CREDITS\">CREDITS</a></string>
|
||||||
<string name="title_activity_about">About</string>
|
<string name="title_activity_about">About</string>
|
||||||
<string name="menu_feedback">Send Feedback (via Email)</string>
|
<string name="menu_feedback">Send Feedback (via Email)</string>
|
||||||
<string name="no_email_client">No email client installed</string>
|
<string name="no_email_client">No email client installed</string>
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue