diff --git a/CREDITS b/CREDITS index ccd98e7d5..4e6b6ed8b 100644 --- a/CREDITS +++ b/CREDITS @@ -16,3 +16,4 @@ their contribution to the product. * Yusuke Matsubara * Tobias Schönberg * Brian MacIntosh +* Veyndan Stuart diff --git a/app/src/main/java/fr/free/nrw/commons/Media.java b/app/src/main/java/fr/free/nrw/commons/Media.java index f417f10b1..366844a27 100644 --- a/app/src/main/java/fr/free/nrw/commons/Media.java +++ b/app/src/main/java/fr/free/nrw/commons/Media.java @@ -230,7 +230,7 @@ public class Media implements Parcelable { } public Media(Parcel in) { - localUri = (Uri)in.readParcelable(Uri.class.getClassLoader()); + localUri = in.readParcelable(Uri.class.getClassLoader()); imageUrl = in.readString(); filename = in.readString(); description = in.readString(); diff --git a/app/src/main/java/fr/free/nrw/commons/Prefs.java b/app/src/main/java/fr/free/nrw/commons/Prefs.java index b8d494b95..0bb01aea0 100644 --- a/app/src/main/java/fr/free/nrw/commons/Prefs.java +++ b/app/src/main/java/fr/free/nrw/commons/Prefs.java @@ -7,8 +7,10 @@ public class Prefs { public static final String DEFAULT_LICENSE = "defaultLicense"; public static class Licenses { - public static final String CC_BY_SA = "CC BY-SA"; - public static final String CC_BY = "CC BY"; + public static final String CC_BY_SA_3 = "CC BY-SA"; + public static final String CC_BY_3 = "CC BY"; + public static final String CC_BY_SA_4 = "CC BY-SA 4.0"; + public static final String CC_BY_4 = "CC BY 4.0"; public static final String CC0 = "CC0"; } } diff --git a/app/src/main/java/fr/free/nrw/commons/SettingsActivity.java b/app/src/main/java/fr/free/nrw/commons/SettingsActivity.java index 38f655500..933d39bbd 100644 --- a/app/src/main/java/fr/free/nrw/commons/SettingsActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/SettingsActivity.java @@ -28,12 +28,16 @@ public class SettingsActivity extends PreferenceActivity implements SharedPrefer licensePreference.setEntries(new String[]{ getString(R.string.license_name_cc0), getString(R.string.license_name_cc_by), - getString(R.string.license_name_cc_by_sa) + getString(R.string.license_name_cc_by_four), + getString(R.string.license_name_cc_by_sa), + getString(R.string.license_name_cc_by_sa_four) }); licensePreference.setEntryValues(new String[]{ Prefs.Licenses.CC0, - Prefs.Licenses.CC_BY, - Prefs.Licenses.CC_BY_SA + Prefs.Licenses.CC_BY_3, + Prefs.Licenses.CC_BY_4, + Prefs.Licenses.CC_BY_SA_3, + Prefs.Licenses.CC_BY_SA_4 }); licensePreference.setSummary(getString(Utils.licenseNameFor(licensePreference.getValue()))); diff --git a/app/src/main/java/fr/free/nrw/commons/Utils.java b/app/src/main/java/fr/free/nrw/commons/Utils.java index 1463d20c7..f07d5c8bd 100644 --- a/app/src/main/java/fr/free/nrw/commons/Utils.java +++ b/app/src/main/java/fr/free/nrw/commons/Utils.java @@ -205,10 +205,14 @@ public class Utils { } public static String licenseTemplateFor(String license) { - if(license.equals(Prefs.Licenses.CC_BY)) { + if(license.equals(Prefs.Licenses.CC_BY_3)) { return "{{self|cc-by-3.0}}"; - } else if(license.equals(Prefs.Licenses.CC_BY_SA)) { + } else if(license.equals(Prefs.Licenses.CC_BY_4)) { + return "{{self|cc-by-4.0}}"; + } else if(license.equals(Prefs.Licenses.CC_BY_SA_3)) { return "{{self|cc-by-sa-3.0}}"; + } else if(license.equals(Prefs.Licenses.CC_BY_SA_4)) { + return "{{self|cc-by-sa-4.0}}"; } else if(license.equals(Prefs.Licenses.CC0)) { return "{{self|cc-zero}}"; } @@ -216,10 +220,14 @@ public class Utils { } public static int licenseNameFor(String license) { - if(license.equals(Prefs.Licenses.CC_BY)) { + if(license.equals(Prefs.Licenses.CC_BY_3)) { return R.string.license_name_cc_by; - } else if(license.equals(Prefs.Licenses.CC_BY_SA)) { + } else if(license.equals(Prefs.Licenses.CC_BY_4)) { + return R.string.license_name_cc_by_four; + } else if(license.equals(Prefs.Licenses.CC_BY_SA_3)) { return R.string.license_name_cc_by_sa; + } else if(license.equals(Prefs.Licenses.CC_BY_SA_4)) { + return R.string.license_name_cc_by_sa_four; } else if(license.equals(Prefs.Licenses.CC0)) { return R.string.license_name_cc0; } @@ -227,11 +235,16 @@ public class Utils { } public static String licenseUrlFor(String license) { - if(license.equals(Prefs.Licenses.CC_BY)) { + if(license.equals(Prefs.Licenses.CC_BY_3)) { return "https://creativecommons.org/licenses/by/3.0/"; - } else if(license.equals(Prefs.Licenses.CC_BY_SA)) { + } else if(license.equals(Prefs.Licenses.CC_BY_4)) { + return "https://creativecommons.org/licenses/by/4.0/"; + } else if(license.equals(Prefs.Licenses.CC_BY_SA_3)) { return "https://creativecommons.org/licenses/by-sa/3.0/"; - } else if(license.equals(Prefs.Licenses.CC0)) { + } else if(license.equals(Prefs.Licenses.CC_BY_SA_4)) { + return "https://creativecommons.org/licenses/by-sa/4.0/"; + } + else if(license.equals(Prefs.Licenses.CC0)) { return "https://creativecommons.org/publicdomain/zero/1.0/"; } throw new RuntimeException("Unrecognized license value"); diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/Contribution.java b/app/src/main/java/fr/free/nrw/commons/contributions/Contribution.java index 83b3068a0..3d9776129 100644 --- a/app/src/main/java/fr/free/nrw/commons/contributions/Contribution.java +++ b/app/src/main/java/fr/free/nrw/commons/contributions/Contribution.java @@ -85,7 +85,7 @@ public class Contribution extends Media { public Contribution(Parcel in) { super(in); - contentUri = (Uri)in.readParcelable(Uri.class.getClassLoader()); + contentUri = in.readParcelable(Uri.class.getClassLoader()); source = in.readString(); timestamp = (Date) in.readSerializable(); state = in.readInt(); @@ -369,7 +369,7 @@ public class Contribution extends Media { db.execSQL("ALTER TABLE " + TABLE_NAME + " ADD COLUMN height INTEGER;"); db.execSQL("UPDATE " + TABLE_NAME + " SET height = 0"); db.execSQL("ALTER TABLE " + TABLE_NAME + " ADD COLUMN license STRING;"); - db.execSQL("UPDATE " + TABLE_NAME + " SET license='" + Prefs.Licenses.CC_BY_SA + "';"); + db.execSQL("UPDATE " + TABLE_NAME + " SET license='" + Prefs.Licenses.CC_BY_SA_3 + "';"); from++; onUpdate(db, from, to); return; diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionController.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionController.java index dc45c64d1..6581e7381 100644 --- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionController.java +++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionController.java @@ -98,7 +98,7 @@ public class ContributionController { public void loadState(Bundle savedInstanceState) { if(savedInstanceState != null) { - lastGeneratedCaptureURI = (Uri) savedInstanceState.getParcelable("lastGeneratedCaptureURI"); + lastGeneratedCaptureURI = savedInstanceState.getParcelable("lastGeneratedCaptureURI"); } } diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListAdapter.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListAdapter.java index 53aba32b9..3a6aa72c3 100644 --- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListAdapter.java +++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListAdapter.java @@ -48,7 +48,7 @@ class ContributionsListAdapter extends CursorAdapter { if(views.url == null || !views.url.equals(actualUrl)) { if(actualUrl.startsWith("http")) { - MediaWikiImageView mwImageView = (MediaWikiImageView)views.imageView; + MediaWikiImageView mwImageView = views.imageView; mwImageView.setMedia(contribution, ((CommonsApplication) activity.getApplicationContext()).getImageLoader()); // FIXME: For transparent images } else { @@ -65,7 +65,7 @@ class ContributionsListAdapter extends CursorAdapter { @Override public void onLoadingFailed(String imageUri, View view, FailReason failReason) { super.onLoadingFailed(imageUri, view, failReason); - MediaWikiImageView mwImageView = (MediaWikiImageView)views.imageView; + MediaWikiImageView mwImageView = views.imageView; mwImageView.setMedia(contribution, ((CommonsApplication) activity.getApplicationContext()).getImageLoader()); } }); diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyListFragment.java b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyListFragment.java index 1471a51c2..b5664ef67 100644 --- a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyListFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyListFragment.java @@ -199,7 +199,7 @@ public class NearbyListFragment extends ListFragment implements TaskListener { @Override public View getView(int position, View convertView, ViewGroup parent) { // Get the data item for this position - Place place = (Place) getItem(position); + Place place = getItem(position); Log.d(TAG, "Place " + place.name); // Check if an existing view is being reused, otherwise inflate the view diff --git a/app/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java b/app/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java index 483fa1228..3247f8123 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java @@ -229,7 +229,7 @@ public class ShareActivity Intent intent = getIntent(); if(intent.getAction().equals(Intent.ACTION_SEND)) { - mediaUri = (Uri) intent.getParcelableExtra(Intent.EXTRA_STREAM); + mediaUri = intent.getParcelableExtra(Intent.EXTRA_STREAM); if(intent.hasExtra(UploadService.EXTRA_SOURCE)) { source = intent.getStringExtra(UploadService.EXTRA_SOURCE); } else { diff --git a/app/src/main/java/fr/free/nrw/commons/upload/SingleUploadFragment.java b/app/src/main/java/fr/free/nrw/commons/upload/SingleUploadFragment.java index 4b7cb24ee..64a969933 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/SingleUploadFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/upload/SingleUploadFragment.java @@ -94,9 +94,11 @@ public class SingleUploadFragment extends Fragment { 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)); + licenseItems.add(getString(R.string.license_name_cc_by_four)); + licenseItems.add(getString(R.string.license_name_cc_by_sa_four)); final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getActivity()); - final String license = prefs.getString(Prefs.DEFAULT_LICENSE, Prefs.Licenses.CC_BY_SA); + final String license = prefs.getString(Prefs.DEFAULT_LICENSE, Prefs.Licenses.CC_BY_SA_3); Log.d("Single Upload fragment", license); @@ -112,13 +114,17 @@ public class SingleUploadFragment extends Fragment { 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 + String license = Prefs.Licenses.CC_BY_SA_3; // 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; + license = Prefs.Licenses.CC_BY_3; } else if(getString(R.string.license_name_cc_by_sa).equals(licenseName)) { - license = Prefs.Licenses.CC_BY_SA; + license = Prefs.Licenses.CC_BY_SA_3; + } else if(getString(R.string.license_name_cc_by_four).equals(licenseName)) { + license = Prefs.Licenses.CC_BY_4; + } else if(getString(R.string.license_name_cc_by_sa_four).equals(licenseName)) { + license = Prefs.Licenses.CC_BY_SA_4; } setLicenseSummary(license); diff --git a/app/src/main/java/fr/free/nrw/commons/upload/UploadController.java b/app/src/main/java/fr/free/nrw/commons/upload/UploadController.java index 21ac2ac87..629e43881 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/UploadController.java +++ b/app/src/main/java/fr/free/nrw/commons/upload/UploadController.java @@ -93,7 +93,7 @@ public class UploadController { contribution.setDescription(""); } - String license = prefs.getString(Prefs.DEFAULT_LICENSE, Prefs.Licenses.CC_BY_SA); + String license = prefs.getString(Prefs.DEFAULT_LICENSE, Prefs.Licenses.CC_BY_SA_3); contribution.setLicense(license); //FIXME: Add permission request here. Only executeAsyncTask if permission has been granted diff --git a/app/src/main/res/drawable-hdpi/ic_action_search.png b/app/src/main/res/drawable-hdpi/ic_action_search.png deleted file mode 100644 index 67de12dec..000000000 Binary files a/app/src/main/res/drawable-hdpi/ic_action_search.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_action_search.png b/app/src/main/res/drawable-mdpi/ic_action_search.png deleted file mode 100644 index 134d5490b..000000000 Binary files a/app/src/main/res/drawable-mdpi/ic_action_search.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_action_search.png b/app/src/main/res/drawable-xhdpi/ic_action_search.png deleted file mode 100644 index d699c6b37..000000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_action_search.png and /dev/null differ diff --git a/app/src/main/res/drawable/action_bar_translucent.xml b/app/src/main/res/drawable/action_bar_translucent.xml deleted file mode 100644 index 1bd39b6dc..000000000 --- a/app/src/main/res/drawable/action_bar_translucent.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/actionbar_top_shadow.xml b/app/src/main/res/drawable/actionbar_top_shadow.xml deleted file mode 100644 index 70d1f48c5..000000000 --- a/app/src/main/res/drawable/actionbar_top_shadow.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/media_info_shadow.xml b/app/src/main/res/drawable/media_info_shadow.xml deleted file mode 100644 index 576f0d24e..000000000 --- a/app/src/main/res/drawable/media_info_shadow.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/share_overlay_background_gradient.xml b/app/src/main/res/drawable/share_overlay_background_gradient.xml deleted file mode 100644 index 7a03efd38..000000000 --- a/app/src/main/res/drawable/share_overlay_background_gradient.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 91a9f6fe6..5f3837f85 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -8,95 +8,76 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:layout_gravity="center" + android:layout_margin="16dp" android:gravity="center" android:orientation="vertical" > - - - - - - - + - + - + - + - - - - - - -