Dbrant has uploaded a new change for review.
https://gerrit.wikimedia.org/r/275627
Change subject: Add license information for the app itself.
......................................................................
Add license information for the app itself.
Bug: T116498
Change-Id: I6cca5d3245b288101d35ce26d661a1ffd56e9a70
---
M app/src/main/java/org/wikipedia/settings/AboutActivity.java
M app/src/main/res/layout/activity_about.xml
M app/src/main/res/values-qq/strings.xml
M app/src/main/res/values/strings.xml
4 files changed, 30 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/27/275627/1
diff --git a/app/src/main/java/org/wikipedia/settings/AboutActivity.java
b/app/src/main/java/org/wikipedia/settings/AboutActivity.java
index 034c8ab..baceb00 100644
--- a/app/src/main/java/org/wikipedia/settings/AboutActivity.java
+++ b/app/src/main/java/org/wikipedia/settings/AboutActivity.java
@@ -32,6 +32,7 @@
private ScrollView mScrollView;
@Bind(R.id.about_translators) TextView translatorsTextView;
@Bind(R.id.activity_about_libraries) TextView librariesTextView;
+ @Bind(R.id.about_app_license) TextView appLicenseTextView;
@Bind(R.id.send_feedback_text) TextView feedbackTextView;
@Bind(R.id.about_wmf) TextView wmfTextView;
@@ -45,6 +46,8 @@
RichTextUtil.removeUnderlinesFromLinks(translatorsTextView);
wmfTextView.setText(Html.fromHtml(getString(R.string.about_wmf)));
RichTextUtil.removeUnderlinesFromLinks(wmfTextView);
+
appLicenseTextView.setText(Html.fromHtml(getString(R.string.about_app_license)));
+ RichTextUtil.removeUnderlinesFromLinks(appLicenseTextView);
((TextView)
findViewById(R.id.about_version_text)).setText(BuildConfig.VERSION_NAME);
feedbackTextView.setText(Html.fromHtml(
"<a
href=\"mailto:[email protected]?subject=Android App "
diff --git a/app/src/main/res/layout/activity_about.xml
b/app/src/main/res/layout/activity_about.xml
index 49dbc65..193fb0a 100644
--- a/app/src/main/res/layout/activity_about.xml
+++ b/app/src/main/res/layout/activity_about.xml
@@ -118,6 +118,27 @@
/>
<TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ style="?android:textAppearanceSmall"
+ android:text="@string/about_app_license_heading"
+ android:layout_marginTop="8dp"
+ android:layout_marginBottom="8dp" />
+ <TextView
+ android:id="@+id/about_app_license"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ style="@style/RtlAwareTextView"
+ android:text="@string/about_app_license"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:textIsSelectable="true"
+ android:lineSpacingMultiplier="1.2"
+ android:textColor="#555"
+ android:textColorLink="?attr/link_color"
+ android:layout_marginBottom="8dp"
+ />
+
+ <TextView
android:id="@+id/send_feedback_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
diff --git a/app/src/main/res/values-qq/strings.xml
b/app/src/main/res/values-qq/strings.xml
index 5574e29..5901726 100644
--- a/app/src/main/res/values-qq/strings.xml
+++ b/app/src/main/res/values-qq/strings.xml
@@ -246,6 +246,10 @@
<string name="about_translators_translatewiki">Credit given to translatewiki
translators.
{{doc-important|Please don\'t translate the link and the site title.}}</string>
+ <string name="about_app_license_heading">Heading for section that describes
the license for the app itself.</string>
+ <string name="about_app_license">Description of the license for the app, as
well as links for finding our source code.
+
+ {{doc-important|Please don\'t translate links and link titles.}}</string>
<string name="about_wmf">Text and link specifying that this app was
developed by the Wikimedia Foundation</string>
<string name="about_activity_title">{{Identical|About}}</string>
<string name="edit_abandon_confirm">Prompt for the user to abandon any
changes that were made during editing.</string>
diff --git a/app/src/main/res/values/strings.xml
b/app/src/main/res/values/strings.xml
index f561488..acde2fb 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -178,6 +178,8 @@
<string name="about_contributors_heading">Contributors</string>
<string name="about_translators_heading">Translators</string>
<string name="about_translators_translatewiki"><![CDATA[This app was
translated by the volunteer translators at <a
href="https://translatewiki.net";>translatewiki.net</a>.]]></string>
+ <string name="about_app_license_heading">License</string>
+ <string name="about_app_license"><![CDATA[Source code available on <a
href=\"https://gerrit.wikimedia.org/r/#/admin/projects/apps/android/wikipedia\";>Gerrit</a>
and <a href=\"https://github.com/wikimedia/apps-android-wikipedia\";>GitHub</a>
under the <a
href=\"https://github.com/wikimedia/apps-android-wikipedia/blob/master/COPYING\";>Apache
2.0 License</a>. Unless otherwise specified, content is available under a <a
href=\"https://en.wikipedia.org/wiki/Wikipedia:Text_of_Creative_Commons_Attribution-ShareAlike_3.0_Unported_License\";>Creative
Commons Attribution-ShareAlike License</a>.]]></string>
<string name="about_wmf"><![CDATA[A product of the <a
href="http://wikimediafoundation.org/wiki/Home";>Wikimedia
Foundation</a>]]></string>
<string name="about_activity_title">About</string>
<string name="edit_abandon_confirm">The page has been modified. Are you
sure you want to exit without saving your changes?</string>
--
To view, visit https://gerrit.wikimedia.org/r/275627
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6cca5d3245b288101d35ce26d661a1ffd56e9a70
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
