diff --git a/app/build.gradle b/app/build.gradle index 5d37f8f54..bba94c683 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ dependencies { implementation 'info.debatty:java-string-similarity:0.24' implementation 'com.borjabravo:readmoretextview:2.1.0' implementation 'com.android.support.constraint:constraint-layout:1.0.2' - implementation ('com.mapbox.mapboxsdk:mapbox-android-sdk:5.4.1@aar'){ - transitive=true + implementation('com.mapbox.mapboxsdk:mapbox-android-sdk:5.4.1@aar') { + transitive = true } implementation "com.github.deano2390:MaterialShowcaseView:1.2.0" @@ -116,7 +116,8 @@ android { buildTypes { release { - minifyEnabled false // See https://stackoverflow.com/questions/40232404/google-play-apk-and-android-studio-apk-usb-debug-behaving-differently - proguard.cfg modification alone insufficient. + minifyEnabled false + // See https://stackoverflow.com/questions/40232404/google-play-apk-and-android-studio-apk-usb-debug-behaving-differently - proguard.cfg modification alone insufficient. proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' } debug { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 17f6770d2..f41cf677c 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,3 +1,4 @@ + @@ -14,7 +15,7 @@ - + @@ -23,81 +24,81 @@ android:name=".CommonsApplication" android:icon="@drawable/ic_launcher" android:label="@string/app_name" - android:theme="@style/LightAppTheme" - android:supportsRtl="true" > - - + android:supportsRtl="true" + android:theme="@style/LightAppTheme"> + - - - - + - - + + - + + - - - - - - - - + + + + + + + + - + - + @@ -142,21 +143,18 @@ android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/provider_paths" /> - - - - + \ No newline at end of file diff --git a/app/src/main/java/fr/free/nrw/commons/Achievements.java b/app/src/main/java/fr/free/nrw/commons/Achievements.java new file mode 100644 index 000000000..d16b384a6 --- /dev/null +++ b/app/src/main/java/fr/free/nrw/commons/Achievements.java @@ -0,0 +1,20 @@ +package fr.free.nrw.commons; + +import android.support.v7.app.AppCompatActivity; +import android.os.Bundle; +import android.view.Menu; +import android.view.MenuInflater; +import android.view.View; +import android.widget.ImageView; + +public class Achievements extends AppCompatActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_achievements); + + + } + +} diff --git a/app/src/main/res/drawable/featured.xml b/app/src/main/res/drawable/featured.xml new file mode 100644 index 000000000..e971c3446 --- /dev/null +++ b/app/src/main/res/drawable/featured.xml @@ -0,0 +1,1069 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_thanks.xml b/app/src/main/res/drawable/ic_thanks.xml new file mode 100644 index 000000000..480b45c1b --- /dev/null +++ b/app/src/main/res/drawable/ic_thanks.xml @@ -0,0 +1,4 @@ + + + diff --git a/app/src/main/res/layout/activity_achievements.xml b/app/src/main/res/layout/activity_achievements.xml new file mode 100644 index 000000000..4841bda38 --- /dev/null +++ b/app/src/main/res/layout/activity_achievements.xml @@ -0,0 +1,96 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 6e30baa10..398b010b3 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,287 +1,292 @@ - Appearance - General - Feedback - Location - Commons - • - Settings - Username - Password - Log in to your Commons Beta account - Log in - Forgot Password? - Sign up - Logging in - Please wait… - Login success! - Login failed! - File not found. Please try another file. - Authentication failed! - Upload started! - %1$s uploaded! - Tap to view your upload - Starting %1$s upload - %1$s uploading - Finishing uploading %1$s - Uploading %1$s failed - Tap to view - - %1$d file uploading - %1$d files uploading - - My Recent Uploads - Queued - Failed - %1$d%% complete - Uploading - From Gallery - Take photo - Nearby - My uploads - Share - View in Browser - Title - Please provide a title for this file - Description - Unable to login - network failure - Unable to login - please check your username - Unable to login - please check your password - Too many unsuccessful attempts. Please try again in a few minutes. - Sorry, this user has been blocked on Commons - You must provide your two factor authentication code. - Login failed - Upload - Name this set - Modifications - Upload - Search categories - Save - Refresh - List - GPS is disabled in your device. Would you like to enable it? - Enable GPS - No uploads yet - - - @string/contributions_subtitle_zero - %1$d upload - %1$d uploads - - - Starting %1$d upload - Starting %1$d uploads - - - %1$d upload - %1$d uploads - - No categories matching %1$s found - Add categories to make your images more discoverable on Wikimedia Commons.\nStart typing to add categories. - Categories - Settings - Sign Up - Featured Images - About - The Wikimedia Commons app is an open-source app created and maintained by grantees and volunteers of the Wikimedia community. The Wikimedia Foundation is not involved in the creation, development, or maintenance of the app. - Wikimedia Commons - Create a new <a href=\"https://github.com/commons-app/apps-android-commons/issues\">GitHub issue</a> for bug reports and suggestions. - Privacy policy]]> - Credits]]> - About - Send Feedback (via Email) - No email client installed - Recently used categories - Waiting for first sync… - You have not yet uploaded any photos. - Retry - Cancel - This image will be licensed under %1$s - By submitting this picture, I declare that this is my own work, that it does not contain copyrighted material or selfies, and otherwise adheres to <a href=\"https://commons.wikimedia.org/wiki/Commons:Policies_and_guidelines\">Wikimedia Commons policies</a>. - Download - Default License - Use previous title/description - Automatically get current location - Retrieve current location to offer category suggestions if image is not geotagged - Night mode - Use dark theme - Attribution-ShareAlike 4.0 - Attribution 4.0 - Attribution-ShareAlike 3.0 - Attribution 3.0 - CC0 - CC BY-SA 3.0 - CC BY-SA 3.0 (Austria) - CC BY-SA 3.0 (Germany) - CC BY-SA 3.0 (Estonia) - CC BY-SA 3.0 (Spain) - CC BY-SA 3.0 (Croatia) - CC BY-SA 3.0 (Luxembourg) - CC BY-SA 3.0 (Netherlands) - CC BY-SA 3.0 (Norway) - CC BY-SA 3.0 (Poland) - CC BY-SA 3.0 (Romania) - CC BY 3.0 - CC BY-SA 4.0 - CC BY 4.0 - CC Zero - Wikimedia Commons hosts most of the images that are used in Wikipedia. - Your images help educate people around the world! - Please upload pictures that are taken or created entirely by yourself: - Natural objects (flowers, animals, mountains)\n• Useful objects (bicycles, train stations)\n• Famous people (your mayor, Olympic athletes you met) - Natural objects (flowers, animals, mountains) - Useful objects (bicycles, train stations) - Famous people (your mayor, Olympic athletes you met) - Please do NOT upload: - - Selfies or pictures of your friends\n- Pictures you downloaded from the Internet\n- Screenshots of proprietary apps - Selfies or pictures of your friends - Pictures you downloaded from the Internet - Screenshots of proprietary apps - Example upload: - - Title: Sydney Opera House\n- Description: Sydney Opera House as viewed from across the bay\n- Categories: Sydney Opera House from the west, Sydney Opera House remote views - Title: Sydney Opera House - Description: Sydney Opera House as viewed from across the bay - Categories: Sydney Opera House from the west, Sydney Opera House remote views - Contribute your images. Help Wikipedia articles come to life! - Images on Wikipedia come from Wikimedia Commons. - Your images help educate people around the world. - Avoid copyrighted materials you found from the Internet as well as images of posters, book covers, etc. - You think you got it? - Yes! - More Information - Categories - Loading… - None selected - No description - Unknown license - Refresh - Required permission: Read external storage. App cannot access your gallery without this. - Required permission: Write external storage. App cannot access your camera without this. - Optional permission: Get current location for category suggestions - OK - Nearby Places - No nearby places found - Warning - This file already exists on Commons. Are you sure you want to proceed? - Yes - No - Title - Title of the media - Description - Description of the media goes here. This can potentially be fairly long, and will need to wrap across multiple lines. We hope it looks nice though. - Author - Featured image author user name goes here. - Uploaded date - License - Coordinates - None provided - Become a Beta Tester - Opt-in to our beta channel on Google Play and get early access to new features and bug fixes - https://play.google.com/apps/testing/fr.free.nrw.commons - mapbox://styles/mapbox/traffic-day-v2 - mapbox://styles/mapbox/traffic-night-v2 - pk.eyJ1IjoibWFza2FyYXZpdmVrIiwiYSI6ImNqMmxvdzFjMTAwMHYzM283ZWM3eW5tcDAifQ.ib5SZ9EVjwJe6GSKve0bcg - 2FA Code - My Recent Upload Limit - Maximum Limit - Unable to display more than 500 - Set Recent Upload Limit - Two factor authentication is currently not supported. - Do you really want to logout? - Commons Logo - Commons Website - Commons Facebook Page - Commons Github Source Code - Background Image - Media Image Failed - No Image Found - Upload Image - Mount Zao - Llamas - Rainbow Bridge - Tulip - No Selfies - Proprietary Image - Welcome Wikipedia - Welcome Copyright - Sydney Opera House - Cancel - Open - Close - Home - Upload - Nearby - About - Settings - Feedback - Logout - Tutorial - Notifications - Featured - Nearby places cannot be displayed without location permissions - no description found - Commons file page - Wikidata item - Wikipedia article - Error while caching pictures - A unique descriptive title for the file, which will serve as a filename. You may use plain language with spaces. Do not include the file extension - Please describe the media as much as possible: Where was it taken? What does it show? What is the context? Please describe the objects or persons. Reveal information that can not be easily guessed, for instance the time of day if it is a landscape. If the media shows something unusual, please explain what makes it unusual. - This picture is too dark, are you sure you want to upload it? Wikimedia Commons is only for pictures with encyclopedic value. - This picture is blurry, are you sure you want to upload it? Wikimedia Commons is only for pictures with encyclopedic value. - Give permission - Use external storage - Save pictures taken with the in-app camera on your device - Login to your account - Send log file - Send log file to developers via email - No web browser found to open URL - Error! URL not found - Nominate for Deletion - This image has been nominated for deletion. - See webpage for details - View in Browser + Appearance + General + Feedback + Location + Commons + • + Settings + Username + Password + Log in to your Commons Beta account + Log in + Forgot Password? + Sign up + Logging in + Please wait… + Login success! + Login failed! + File not found. Please try another file. + Authentication failed! + Upload started! + %1$s uploaded! + Tap to view your upload + Starting %1$s upload + %1$s uploading + Finishing uploading %1$s + Uploading %1$s failed + Tap to view + + %1$d file uploading + %1$d files uploading + + My Recent Uploads + Queued + Failed + %1$d%% complete + Uploading + From Gallery + Take photo + Nearby + My uploads + Share + View in Browser + Title + Please provide a title for this file + Description + Unable to login - network failure + Unable to login - please check your username + Unable to login - please check your password + Too many unsuccessful attempts. Please try again in a few minutes. + Sorry, this user has been blocked on Commons + You must provide your two factor authentication code. + Login failed + Upload + Name this set + Modifications + Upload + Search categories + Save + Refresh + List + GPS is disabled in your device. Would you like to enable it? + Enable GPS + No uploads yet + + + @string/contributions_subtitle_zero + %1$d upload + %1$d uploads + + + Starting %1$d upload + Starting %1$d uploads + + + %1$d upload + %1$d uploads + + No categories matching %1$s found + Add categories to make your images more discoverable on Wikimedia Commons.\nStart typing to add categories. + Categories + Settings + Sign Up + Featured Images + About + The Wikimedia Commons app is an open-source app created and maintained by grantees and volunteers of the Wikimedia community. The Wikimedia Foundation is not involved in the creation, development, or maintenance of the app. + Wikimedia Commons + Create a new <a href=\"https://github.com/commons-app/apps-android-commons/issues\">GitHub issue</a> for bug reports and suggestions. + Privacy policy]]> + Credits]]> + About + Send Feedback (via Email) + No email client installed + Recently used categories + Waiting for first sync… + You have not yet uploaded any photos. + Retry + Cancel + This image will be licensed under %1$s + By submitting this picture, I declare that this is my own work, that it does not contain copyrighted material or selfies, and otherwise adheres to <a href=\"https://commons.wikimedia.org/wiki/Commons:Policies_and_guidelines\">Wikimedia Commons policies</a>. + Download + Default License + Use previous title/description + Automatically get current location + Retrieve current location to offer category suggestions if image is not geotagged + Night mode + Use dark theme + Attribution-ShareAlike 4.0 + Attribution 4.0 + Attribution-ShareAlike 3.0 + Attribution 3.0 + CC0 + CC BY-SA 3.0 + CC BY-SA 3.0 (Austria) + CC BY-SA 3.0 (Germany) + CC BY-SA 3.0 (Estonia) + CC BY-SA 3.0 (Spain) + CC BY-SA 3.0 (Croatia) + CC BY-SA 3.0 (Luxembourg) + CC BY-SA 3.0 (Netherlands) + CC BY-SA 3.0 (Norway) + CC BY-SA 3.0 (Poland) + CC BY-SA 3.0 (Romania) + CC BY 3.0 + CC BY-SA 4.0 + CC BY 4.0 + CC Zero + Wikimedia Commons hosts most of the images that are used in Wikipedia. + Your images help educate people around the world! + Please upload pictures that are taken or created entirely by yourself: + Natural objects (flowers, animals, mountains)\n• Useful objects (bicycles, train stations)\n• Famous people (your mayor, Olympic athletes you met) + Natural objects (flowers, animals, mountains) + Useful objects (bicycles, train stations) + Famous people (your mayor, Olympic athletes you met) + Please do NOT upload: + - Selfies or pictures of your friends\n- Pictures you downloaded from the Internet\n- Screenshots of proprietary apps + Selfies or pictures of your friends + Pictures you downloaded from the Internet + Screenshots of proprietary apps + Example upload: + - Title: Sydney Opera House\n- Description: Sydney Opera House as viewed from across the bay\n- Categories: Sydney Opera House from the west, Sydney Opera House remote views + Title: Sydney Opera House + Description: Sydney Opera House as viewed from across the bay + Categories: Sydney Opera House from the west, Sydney Opera House remote views + Contribute your images. Help Wikipedia articles come to life! + Images on Wikipedia come from Wikimedia Commons. + Your images help educate people around the world. + Avoid copyrighted materials you found from the Internet as well as images of posters, book covers, etc. + You think you got it? + Yes! + More Information + Categories + Loading… + None selected + No description + Unknown license + Refresh + Required permission: Read external storage. App cannot access your gallery without this. + Required permission: Write external storage. App cannot access your camera without this. + Optional permission: Get current location for category suggestions + OK + Nearby Places + No nearby places found + Warning + This file already exists on Commons. Are you sure you want to proceed? + Yes + No + Title + Title of the media + Description + Description of the media goes here. This can potentially be fairly long, and will need to wrap across multiple lines. We hope it looks nice though. + Author + Featured image author user name goes here. + Uploaded date + License + Coordinates + None provided + Become a Beta Tester + Opt-in to our beta channel on Google Play and get early access to new features and bug fixes + https://play.google.com/apps/testing/fr.free.nrw.commons + mapbox://styles/mapbox/traffic-day-v2 + mapbox://styles/mapbox/traffic-night-v2 + pk.eyJ1IjoibWFza2FyYXZpdmVrIiwiYSI6ImNqMmxvdzFjMTAwMHYzM283ZWM3eW5tcDAifQ.ib5SZ9EVjwJe6GSKve0bcg + 2FA Code + My Recent Upload Limit + Maximum Limit + Unable to display more than 500 + Set Recent Upload Limit + Two factor authentication is currently not supported. + Do you really want to logout? + Commons Logo + Commons Website + Commons Facebook Page + Commons Github Source Code + Background Image + Media Image Failed + No Image Found + Upload Image + Mount Zao + Llamas + Rainbow Bridge + Tulip + No Selfies + Proprietary Image + Welcome Wikipedia + Welcome Copyright + Sydney Opera House + Cancel + Open + Close + Home + Upload + Nearby + About + Settings + Feedback + Logout + Tutorial + Notifications + Featured + Nearby places cannot be displayed without location permissions + no description found + Commons file page + Wikidata item + Wikipedia article + Error while caching pictures + A unique descriptive title for the file, which will serve as a filename. You may use plain language with spaces. Do not include the file extension + Please describe the media as much as possible: Where was it taken? What does it show? What is the context? Please describe the objects or persons. Reveal information that can not be easily guessed, for instance the time of day if it is a landscape. If the media shows something unusual, please explain what makes it unusual. + This picture is too dark, are you sure you want to upload it? Wikimedia Commons is only for pictures with encyclopedic value. + This picture is blurry, are you sure you want to upload it? Wikimedia Commons is only for pictures with encyclopedic value. + Give permission + Use external storage + Save pictures taken with the in-app camera on your device + Login to your account + Send log file + Send log file to developers via email + No web browser found to open URL + Error! URL not found + Nominate for Deletion + This image has been nominated for deletion. + See webpage for details + View in Browser - Location has not changed. - Location not available. - Permission required to display a list of nearby places - GET DIRECTIONS - READ ARTICLE + Location has not changed. + Location not available. + Permission required to display a list of nearby places + GET DIRECTIONS + READ ARTICLE - Welcome to Wikimedia Commons, %1$s! We\'re glad you\'re here. - %1$s left a message on your talk page - Thank you for making an edit - %1$s mentioned you on %2$s. - Toggle view - DIRECTIONS - WIKIDATA - WIKIPEDIA - COMMONS - Rate us]]> - FAQ]]> - Skip Tutorial - Internet unavailable - Internet available - Error fetching notifications - No notifications found - Translate]]> - Languages - Select the language that you would like to submit translations for - Proceed - Cancel - Retry + Welcome to Wikimedia Commons, %1$s! We\'re glad you\'re here. + %1$s left a message on your talk page + Thank you for making an edit + %1$s mentioned you on %2$s. + Toggle view + DIRECTIONS + WIKIDATA + WIKIPEDIA + COMMONS + Rate us]]> + FAQ]]> + Skip Tutorial + Internet unavailable + Internet available + Error fetching notifications + No notifications found + Translate]]> + Languages + Select the language that you would like to submit translations for + Proceed + Cancel + Retry - Got it! - These are the places near you that need pictures to illustrate their Wikipedia articles - Tapping this button brings up a list of these places - You can upload a picture for any place from your gallery or camera + Got it! + These are the places near you that need pictures to illustrate their Wikipedia articles + Tapping this button brings up a list of these places + You can upload a picture for any place from your gallery or camera - No images found! - Error occurred while loading images. - Uploaded by: %1$s + No images found! + Error occurred while loading images. + Uploaded by: %1$s - Share App - Coordinates were not specified during image selection - Error fetching nearby places. + Share App + Coordinates were not specified during image selection + Error fetching nearby places. + + Achievements + STATISTICS + Thanks Received + Featured Images