Allow users to select preferred license for their contributions

Needs some UI love on both selection & intimation, but works otherwise

People can pick from CC BY-SA, CC BY, or CC0. The commons templates
are set using {[self}}, which I think is good enough.

GitHub: https://github.com/wikimedia/apps-android-commons/pull/14
Change-Id: Iffca6f75c63de6fbe61c4dc41b93dd5f692065a5
This commit is contained in:
YuviPanda 2013-06-18 14:16:00 +00:00 committed by Brion Vibber
parent 86a39e9d13
commit 55525bc100
11 changed files with 112 additions and 10 deletions

View file

@ -36,5 +36,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/share_license_summary"
android:id="@+id/licenseLabel" android:layout_gravity="center" android:layout_marginTop="16dp"/>
android:id="@+id/share_license_summary"
android:layout_gravity="center"
android:layout_marginTop="16dp"/>
</LinearLayout>

View file

@ -75,7 +75,10 @@
<string name="menu_retry">Menu item text prompting user to retry a failed upload.
{{Identical|Retry}}</string>
<string name="menu_abort">Menu item text prompting user to abort and delete a failed upload.</string>
<string name="share_license_summary">Text label briefly describing CC-BY-SA license.</string>
<string name="share_license_summary">Text label telling user the license of the current upload in progress. %1$s refers to appropriate display text for the chosen CC license</string>
<string name="menu_download">Menu item text prompting user to download a selected photo or media file locally.
{{Identical|Download}}</string>
<string name="license_name_cc_by_sa">CC Attribution-Sharelike License display name. Use the non-breaking space character(\u00A0) between \'CC\' and \'Attribution-Sharealike\'</string>
<string name="license_name_cc_by">CC Attribution License display name. Use the non-breaking space character(\u00A0) between \'CC\' and \'Attribution\'</string>
<string name="license_name_cc0">CC0 License display name.</string>
</resources>

View file

@ -88,7 +88,12 @@
<string name="menu_retry">Retry</string>
<string name="menu_abort">Abort</string>
<string name="share_license_summary">You agree to upload under the terms of the CC-BY-SA 3.0 license.</string>
<string name="share_license_summary">This image will be licensed under %1$s</string>
<string name="menu_download">Download</string>
<string name="preference_license">License</string>
<string name="license_name_cc_by_sa">CC\u00A0Attribution-ShareAlike</string>
<string name="license_name_cc_by">CC\u00A0Attribution</string>
<string name="license_name_cc0">CC0</string>
</resources>

View file

@ -7,5 +7,11 @@
android:summary="@string/preference_tracking_summary"
android:defaultValue="true"
/>
<ListPreference
android:key="defaultLicense"
android:title="@string/preference_license"
android:defaultValue="CC BY-SA"
/>
</PreferenceScreen>