diff --git a/commons/AndroidManifest.xml b/commons/AndroidManifest.xml index 82b930f24..d087de180 100644 --- a/commons/AndroidManifest.xml +++ b/commons/AndroidManifest.xml @@ -77,6 +77,7 @@ android:name=".SettingsActivity" android:label="@string/title_activity_settings" /> + + + + + + + + + + + + + + \ No newline at end of file diff --git a/commons/res/menu/fragment_contributions_list.xml b/commons/res/menu/fragment_contributions_list.xml index 0d17d06b4..b9e7d23ed 100644 --- a/commons/res/menu/fragment_contributions_list.xml +++ b/commons/res/menu/fragment_contributions_list.xml @@ -16,5 +16,10 @@ android:showAsAction="never" android:icon="@android:drawable/ic_menu_preferences" /> + + diff --git a/commons/res/values/strings.xml b/commons/res/values/strings.xml index ba2d06fd4..25ba95b5e 100644 --- a/commons/res/values/strings.xml +++ b/commons/res/values/strings.xml @@ -75,4 +75,9 @@ Usage reports Send usage reports to Wikimedia to help us improve the app Settings + About + Open Source software released under the GNU GPLv2 + Source on GitHub. Bugs at Bugzilla. + Privacy policy + About diff --git a/commons/src/main/java/org/wikimedia/commons/AboutActivity.java b/commons/src/main/java/org/wikimedia/commons/AboutActivity.java new file mode 100644 index 000000000..0c0ef0039 --- /dev/null +++ b/commons/src/main/java/org/wikimedia/commons/AboutActivity.java @@ -0,0 +1,30 @@ +package org.wikimedia.commons; + +import android.app.Activity; +import android.os.Bundle; +import android.text.method.LinkMovementMethod; +import android.widget.TextView; + +public class AboutActivity extends Activity { + private TextView versionText; + private TextView licenseText; + private TextView improveText; + private TextView privacyPolicyText; + + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_about); + + versionText = (TextView) findViewById(R.id.about_version); + licenseText = (TextView) findViewById(R.id.about_license); + improveText = (TextView) findViewById(R.id.about_improve); + privacyPolicyText = (TextView) findViewById(R.id.about_privacy_policy); + + + versionText.setText(CommonsApplication.APPLICATION_VERSION); + + licenseText.setMovementMethod(LinkMovementMethod.getInstance()); + improveText.setMovementMethod(LinkMovementMethod.getInstance()); + privacyPolicyText.setMovementMethod(LinkMovementMethod.getInstance()); + } +} \ No newline at end of file diff --git a/commons/src/main/java/org/wikimedia/commons/contributions/ContributionsListFragment.java b/commons/src/main/java/org/wikimedia/commons/contributions/ContributionsListFragment.java index 217dfa4a6..6336e4006 100644 --- a/commons/src/main/java/org/wikimedia/commons/contributions/ContributionsListFragment.java +++ b/commons/src/main/java/org/wikimedia/commons/contributions/ContributionsListFragment.java @@ -221,6 +221,10 @@ public class ContributionsListFragment extends SherlockFragment { Intent settingsIntent = new Intent(getActivity(), SettingsActivity.class); startActivity(settingsIntent); return true; + case R.id.menu_about: + Intent aboutIntent = new Intent(getActivity(), AboutActivity.class); + startActivity(aboutIntent); + return true; default: return super.onOptionsItemSelected(item); }