mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-26 20:33:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fixes #323: Provide explicit selection of licenses when uploading image

Browse source
This commit is contained in:
maskara 2017-03-05 05:36:35 +05:30
parent 74f9775771
commit 7bca88bf39
2 changed files with 65 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

63
app/src/main/java/fr/free/nrw/commons/upload/SingleUploadFragment.java
View file

@ -6,6 +6,7 @@ import android.content.Intent;
import android.content.SharedPreferences;
import android.net.Uri;
import android.os.Bundle;
import android.preference.ListPreference;
import android.preference.PreferenceManager;
import android.support.v4.app.Fragment;
import android.text.Editable;
@ -19,10 +20,16 @@ import android.view.MotionEvent;
import android.view.View;
import android.view.ViewGroup;
import android.view.inputmethod.InputMethodManager;
import android.widget.AdapterView;
import android.widget.ArrayAdapter;
import android.widget.Button;
import android.widget.EditText;
import android.widget.Spinner;
import android.widget.TextView;
import java.util.ArrayList;
import java.util.List;
import fr.free.nrw.commons.Prefs;
import fr.free.nrw.commons.R;
import fr.free.nrw.commons.Utils;
@ -36,6 +43,7 @@ public class SingleUploadFragment extends Fragment {
private EditText titleEdit;
private EditText descEdit;
private TextView licenseSummaryView;
private Spinner licenseSpinner;
private OnUploadActionInitiated uploadActionInitiatedHandler;
@ -79,6 +87,51 @@ public class SingleUploadFragment extends Fragment {
titleEdit = (EditText)rootView.findViewById(R.id.titleEdit);
descEdit = (EditText)rootView.findViewById(R.id.descEdit);
Button titleDescButton = (Button) rootView.findViewById(R.id.titleDescButton);
licenseSpinner = (Spinner) rootView.findViewById(R.id.licenseSpinner);
licenseSummaryView = (TextView)rootView.findViewById(R.id.share_license_summary);
ArrayList<String> licenseItems = new ArrayList<>();
licenseItems.add(getString(R.string.license_name_cc0));
licenseItems.add(getString(R.string.license_name_cc_by));
licenseItems.add(getString(R.string.license_name_cc_by_sa));
final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getActivity());
final String license = prefs.getString(Prefs.DEFAULT_LICENSE, Prefs.Licenses.CC_BY_SA);
Log.d("Single Upload fragment", license);
ArrayAdapter<String> adapter = new ArrayAdapter<>(getActivity(), android.R.layout.simple_spinner_dropdown_item, licenseItems);
licenseSpinner.setAdapter(adapter);
int position = licenseItems.indexOf(getString(Utils.licenseNameFor(license)));
Log.d("Single Upload fragment", "Position:"+position+" "+getString(Utils.licenseNameFor(license)));
licenseSpinner.setSelection(position);
licenseSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
@Override
public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
String licenseName = parent.getItemAtPosition(position).toString();
String license = Prefs.Licenses.CC_BY_SA; // default value
if(getString(R.string.license_name_cc0).equals(licenseName)) {
license = Prefs.Licenses.CC0;
} else if(getString(R.string.license_name_cc_by).equals(licenseName)) {
license = Prefs.Licenses.CC_BY;
} else if(getString(R.string.license_name_cc_by_sa).equals(licenseName)) {
license = Prefs.Licenses.CC_BY_SA;
}
setLicenseSummary(license);
SharedPreferences.Editor editor = prefs.edit();
editor.putString(Prefs.DEFAULT_LICENSE, license);
editor.commit();
}
@Override
public void onNothingSelected(AdapterView<?> parent) {
}
});
titleDescButton.setOnClickListener(new View.OnClickListener()
{
@ -96,8 +149,6 @@ public class SingleUploadFragment extends Fragment {
}
});
licenseSummaryView = (TextView)rootView.findViewById(R.id.share_license_summary);
TextWatcher uploadEnabler = new TextWatcher() {
@Override
public void beforeTextChanged(CharSequence charSequence, int i, int i2, int i3) { }
@ -115,9 +166,7 @@ public class SingleUploadFragment extends Fragment {
titleEdit.addTextChangedListener(uploadEnabler);
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getActivity());
final String license = prefs.getString(Prefs.DEFAULT_LICENSE, Prefs.Licenses.CC_BY_SA);
licenseSummaryView.setText(getString(R.string.share_license_summary, getString(Utils.licenseNameFor(license))));
setLicenseSummary(license);
// Open license page on touch
licenseSummaryView.setOnTouchListener(new View.OnTouchListener() {
@ -138,6 +187,10 @@ public class SingleUploadFragment extends Fragment {
return rootView;
}
private void setLicenseSummary(String license) {
licenseSummaryView.setText(getString(R.string.share_license_summary, getString(Utils.licenseNameFor(license))));
}
@Override
public void onAttach(Activity activity) {
super.onAttach(activity);

7
app/src/main/res/layout/fragment_single_upload.xml
View file

@ -32,6 +32,13 @@
android:imeOptions="flagNoExtractUi"
/>
<Spinner
android:id="@+id/licenseSpinner"
android:layout_width="match_parent"
android:layout_height="wrap_content"
>
</Spinner>
<Button
android:text="@string/use_previous"
android:background="#90000000"