Commit graph

533 commits

Author SHA1 Message Date
Marcin Kwaśniak
4f76f1b642 Avoid jargon and slang, change for default, de and pl (#2874) (#2876)
* Avoid jargon and slang, change for default, de and pl (#2874)

* Revert "Avoid jargon and slang, change for default, de and pl (#2874)"

This reverts commit 174efe0309.

* check_category_success_title text changed to: Category check requested

* check_category_failure_title new text
2019-04-13 19:34:39 +10:00
Ashish Kumar
08a555c095 Merge 2.10 with master & Fixed merge conflicts (#2844) 2019-04-04 03:09:54 +10:00
Silky Priya
874e761691 Add information icons to explan peer review activity (#2783) 2019-03-29 23:06:20 +00:00
Vanshika Arora
c1a941eaae Modified scroll behaviour of review activity (#2732) 2019-03-25 23:39:44 +00:00
Job Getabu
c7d48e6e29 wording fix for issue#2441 (#2745) 2019-03-25 18:54:55 +09:00
MarcoAurelio
a04920596e strings: fix typos on internet_downloaded (#2736) 2019-03-25 16:50:40 +09:00
Vanshika Arora
239f74942f Fix #2692: Missing description in upload warning (#2697) 2019-03-23 15:21:27 +00:00
Silky Priya
a32ba452ec Include previous Wikimedia hackathon (2018) task, peer review, to codebase (#2602)
* Add new activity to manifest

* Create review activity layout base

* Add a new menu item to drawer for peer review

* Add a top menu with randomizer icon to review activity

* Add strings for review button

* Add activity to ActivityBuilderModule for injection

* Add a new drawer item to start review acitivty

* Create base of the Review Activity

* Add fragment pager

* Add new fragment for injection

* Create a fragment pager layout

* Wikimedia hackathon 2018 (#1533)

* First draft of fn to get random recent image

* Use log entries for requests to beta, try to connect refresh button

FIXME: runs http request on main thread, breaks

* Tweak button connection

* Add ReviewController class

* Fix fragments

* Wmhack2018 (#1534)

* tiny fixes

* Load pictures into activities

* Re-use same class for all review fragments (#1537)

And try to add pager indicator

* [WIP] category check

* [WIP] add on-click actions to ReviewActivity

* [WIP] add SendThankTask

* Make it beautiful

* Add some category stuff back in to review (#1538)

* Use standalone category extraction code in MediaDataExtractor

* Add categories to category review page

* Change category question text sizes

* Call randomizer whenever the activity is ready

* Add progressbar

* [WIP] add DeleteTask.askReasonAndExecute

* Fix refresh button string

* Typo: "nominate *for* deletion"

* Add formatting to categories and put them in the same textView

* Pass context and adapters as parameters to controller

* Add actions to controller

* Make everyting work

* Add another fragment to thank

* Fix npe

* Add missing execute method

* Some codes

* Add a funy text

* More random recent image selection (#1542)

time-based randomness is biased - if someone uploaded 100 images in
hour, one week ago, and I select a random point in time, their last
image is way more likely to come up than anything else.

With this, there is still bias towards choosing one of the last N
in any burst of uploads (where N is the number of recent changes
fetched) but it's a bit better than before.

* Create Revision class

* Add meaningluf strings

* Error handling for review image/category fetch (#1543)

* Add information layout for username and filename

* Use Single to get firstRevision

* try to add username and filename

* Ensure caption is shown on every review fragment

* Fix build

* Fixes missing import

* Change button text,show current category, add skip image button

* Modify texts, fix night mode issues

* Positive Wording

* fix landscape issue

* Add checkbox popup,rewording

* Spelling Correction

* Fix merge

* Remove commented out code, use lambda

* Simplify toolbar include
2019-03-21 15:05:23 +03:00
Madhur Gupta
d72bd446fe Added information dialog to Statistics #2599 (#2683) 2019-03-20 14:12:20 +03:00
Shubham Pinjwani
31c688860d Fix #1850: Show media talk page in media details (#2560) 2019-03-17 17:11:34 +00:00
Adam Jones
3b7b6f91a2
Fix #2203: Require number of uploads not to have decimal (#2615) 2019-03-17 16:54:55 +00:00
Shridhar Goel
0b25730a18 Fix #2194: Updated Nearby ⓘ icon to include 'Search this area' feature (#2198) 2019-03-17 16:23:11 +00:00
Brenda Jerop
8e8558ae6d Fix #2017: Explore shows featured images and mobile uploads (#2551) 2019-03-17 10:32:24 +00:00
Adam Jones
11c013b195 Fix #2605: Wording of no notification message (#2606) 2019-03-16 12:01:53 +05:30
Shubham Pinjwani
cbf625d3f9 Add #2241: Add long-press to delete specific search (#2275) 2019-03-15 22:06:05 +00:00
srinivas1729
0c2ae1df18 Fix #2139: Now showing "Upload your media" text properly (#2539)
* "Upload your media..." text was being shown while contributions were
  still being loaded. Fixed things to show after load is finished and no
  contributions are present. Also updated text string since UI now uses
  FAB button for uploads (no camera/gallery) icons any more.
* Removed waitingMessage in ContributionsListFragment and from layout
  since its never VISIBLE, only GONE.
2019-03-06 00:36:08 +05:30
Christian Fotteler
def0d3da43 Fixes Lego Messages in strings.xml for "uploaded_by_myself" and changes the message generation in "ReasonBuilder.java". Adds translations for "uploaded_by_myself"-String in English, German, French, Spanish and Dutch. (#2532) 2019-03-05 23:21:41 +05:30
Vivek Maskara
80557a02df
Fix string resource value (#2513)
Fixes #2512
2019-02-25 15:16:35 +05:30
Vanshika Arora
3a822d3c30 Added IPTC reader (#2383)
* graddle changes

* readfbmd class

* jar files

* added icafe

* gradle changes

* ReadFBMD

* recent commit

* commit changes

* commit changes

* fixed code quality issues

* optimised imports

* changes for  reviews

* not instantiating class

* removed irrelevant code

* added documentation

* modified test cases

* commit changes

* modified variable

* modified variable

* javadoc

* test changes

* removed .log file

* Show warning dialog for FBMD
2019-02-24 23:16:22 +05:30
Zhao Gang
00b95ea9cf Remove unused string values(Fixed #2448) (#2484)
These string values are not used in layouts and java files. So just
remove them.
2019-02-22 20:02:55 +05:30
Zhao Gang
9882d24651 Clean up placeholders in media detail fragment fields(Fixed #2471) (#2500)
Remove placeholders and let these descriptions only shown in Android
Studio layout preview. Use plain text in tools:text attributes so
relative string values can also be removed and ease the translation work.
2019-02-22 11:13:31 +05:30
Amir E. Aharoni
fa7585bf94 Add a space before parentheses (#2490) 2019-02-20 20:16:27 +05:30
Vanshika Arora
635047ded2 Fixed issue #2291 (#2292)
* Fixed issue #2291

* resolved codacy issue

* settings

* removed unwanted commemts
2019-02-13 21:08:24 +05:30
Vivek Maskara
73bb0c52c9 Show wikidata edits done through the app (#2431)
* Show wikidata edits done through the app

* Minor changes based on code review
2019-02-13 05:58:22 +13:00
Shubham Pinjwani
a9629c6f99 Added option in the action bar menu to view archived notifications (#2422)
* changed layout and implemented archived notificaitons feature

* set different texts for toolbar,menu option and no notification text in archived

* modified the startup intent for NotificationsActivity

* disabled swipe on archived

* commit

* fixed navigation drawer on notification activity

* handled on back pressed

* updated strings.xml

* removed TODO

* some minor changes

* set progress bar visibility

* some code quality changes

* commit

* some code quality changes

* removing unused import statements
2019-02-10 16:10:08 +05:30
Vivek Maskara
52ab39381e Add module for file picker for camera and gallery uploads (#2375)
* Use easy image for image picker

* Do not use harcoded mime type

* Use uploadable file for image uploads

* Add picker files in filepicker module

* Remove redundant checks for file

* Make usage of file extensions consistent

* Add javadocs

* Fix tests

* Enable image upload using bookmark activity

* Fix multiple uploads

* Fix external image uploads

* Fix chooser intents

* Fix image quality checks

* Segregate internal and external upload intents

* Invoke all error messages from one place

* Minor changes

* Fix tests

* Add image processing service tests
2019-02-03 22:40:31 +02:00
Vanshika Arora
1b62ac4d2d Code to retrive unknown notification and UI (#2340)
* request change, changed notification icon

* Completed task 1 of the work

* commit changes

* commit changes

* updated notification class

* before notification id

* gradle reverted

* Minor changes to mark notifications as read

* commit changes

* delete on swipe

* notification count

* sipe to delete

* changes

* worked on changes requested

* commit changes

* Fix notification count

* reviewed changes

* round icon, swipe with icon

* Fix pending NPE issues with notifications

* final commit

* graddle changes

* removed changes for testing
2019-02-02 19:21:58 +05:30
Vivek Maskara
e389a95592 Fix log file not being attached (#2316)
* Fix log file not being attached

* Add filter for email clients
2019-01-24 18:21:07 +10:00
Vivek Maskara
e773a82206 Handle null URI while uploading picture (#2262)
* Handle null URI while uploading picture

* Modify cache method to never return null path

* Fix tests
2019-01-04 18:21:55 +10:00
vanshikaarora
e69c03cf83 fixed issue #2154 for achievements activity (#2087)
* fixed issue #2065 for achievements activity

* updates for issue #2154

* removed unwanted comments and undo gradle changes

* added strings to strings.xml

* changes made after reviews

* review changes

* build issues resolved

* Undo changes in gradle properties
2019-01-03 21:25:13 +05:30
Kaartic Sivaraam
ed51d8b871 Rephrase misleading statement shown when skipping login (#2249)
* Rephrase misleading statement shown when skipping login

The previous statement was misleading as it could also
mean that the user could never upload pictures if he
skips login. This not the case because after skipping
the login he could login again if he wants to upload
pictures.

Clarify it by using a statement which states that he
would have to login in future in case he wants to
upload pictures.

* Rephrase with a better statement

The old statement doesn't read so well.
Rephrase it with a  better statement.
2019-01-04 00:07:45 +10:00
Vivek Maskara
be98a56ba0 Improve text for receiving shared images (#2266) 2019-01-04 00:05:00 +10:00
Vivek Maskara
a48a09a785 Use dexter for requesting storage permissions (#2258)
* Use dexter for requesting storage permissions

* minor changes

* Fix minor issue
2019-01-02 18:11:19 +02:00
Hariharan
8e967a3698 UploadController: Added support for using author names. Fixes #1707. (#1856)
* UploadController: Added support for using author names. Fixes #1707.

* Minor PR tidy-up

* Reword preference item

* Null check to pass startUpload test
2018-12-21 12:52:59 +02:00
Vivek Maskara
f3b450e020 Merge 2.9 release with master (#2174)
* Fix memory leak due to wikidata edit listener (#2048)

* Fix bookmark crash fix (#2047)

* Fix bookmark crash fix

* Fix check for bookmark creator

* Bug fix #2042 (#2056)

* Bug fix #2042
* Added a snack with retry when api in AA fails
* Increased connection timeouts in okhttpclient builder

* added missing string resource

* Bugfix/duplicate categories (#2080)

* Increased timeout to 60 seconds

* Bug fix #1550
* filter duplicate categories

* Fix crash because of inactive fragment UI (#2046)

* Fix crash because of inactive fragment UI

* Add java docs

* Add information icon action Fiixes #2055 2.9.0: the 'i' icon in nearby doesn't do anything (#2057)

* Localisation updates from https://translatewiki.net.

* Remove unused mediawiki api dependency (#1991)

* Categories with pipe suffix (#1873)

* Bug fix issue #1826
Changes made :
-Certain category names used to show suffixed with strings prefixed with pipe '|'. Removed everything after the pipe. As per the discussion on the thread, its safe to remove everything after the pipe, including the pipe

* review suggested changes
*Code formatting
*Extracted out the index of pipe in a variable
*Added issue link in comments

* Remove libraries section from README (#1988)

* Remove libraries section from README

* Add wiki link to "libraries used" to README

* Localisation updates from https://translatewiki.net.

* Localisation updates from https://translatewiki.net.

* Use alert dialog instead of popup window, for nearby information

* Revert irrelevant changes, sorry
2018-12-19 18:59:49 +02:00
Josephine Lim
21edcb7cbe
Retry failed uploads - #1556 Allow users to easily re-upload failed uploads... (#2112)
* Add cancel and retry buttons on layout contribution

* Make sure your retry logic works

* Add cancel method too

* Add javadocs and remove debug logs

* Remove two unused methods

* Remove old and unused retry buttons as we do for their functions

* Check internet connection before button function, since function requires internet connection

* Remove unused variable

* Display possible solution for badtoken error

* Fix string
2018-12-20 02:56:00 +10:00
Zhao Gang
db38174eb4 Fix #2156: Add plural support for share_license_summary string (#2161) 2018-12-18 17:29:11 +00:00
sp2710
11e5c3c01a Defined SearchActivity tab names into strings.xml file(#2136) (#2137)
* Defined SearchActivity tab names into strings.xml file(#2136)
2018-12-17 11:08:04 +00:00
sp2710
102b2d7e56 Fix #2134: Remove formatting characters from upload_problem strings (#2135) 2018-12-17 00:40:24 +00:00
neslihanturan
47f10cb6c8 Fix string 2018-12-16 15:47:36 +03:00
neslihanturan
718ad3a12c Fixes #945 Check image coordinates for direct Nearby uploads in locations that the user is not currently in (#2099)
* Add getGeolocation method to geolocation from file path

* Add geolocation check to receiveDirect method checks, means it will be checked durimg nearby direct uploads

* Create method body for geolocation and nearby place coordinate comparaison, this method will be filled on consequent commits

* Add a method to find location missmatch

* app/src/main/java/fr/free/nrw/commons/utils/ImageUtils.java

* Add if check to upload activity to detect pictures with wrong location, and save it to shared prefs

* Do not edit wikidata item if picture has wrong location info

* Add one more bitwise operand to possible warning reasons for wrong location case

* Add a bitwise variable for wrong locatio case

* Share nearby place location just like wikidataEntityId, so that we can compare

* Implement check image geolocation is different method by comparing nearby location and file EXIF geolocation

* Add Javadocs

* Remove logs

* Fix all taken on wrong phrases as taken at

* Fix typo on logs

* Simplify if logic

* Fix string issues
2018-12-16 22:26:44 +10:00
Ashish Kumar
1b01c6517f Show campaigns (#2113)
* Show campaigns
* Added a ui util class SwipableCardView which passes the onSwipe event to its children
* NearbyCardView & CampaignView extend SwipableCardView
* Fetch campaigns in ContributionsFragment
* Added an option to enable disable campaign in Settings/Preferences

* synced strings with master

* removed duplicate initialsation of CampaignPresenter
2018-12-15 02:55:53 +10:00
neslihanturan
ce4a0c1194 Display possible solution for badtoken error 2018-12-14 18:03:26 +03:00
neslihanturan
2569bb45f7 Check internet connection before button function, since function requires internet connection 2018-12-13 20:22:20 +03:00
Shridhar Goel
2175ba2d89 Fix #2104 by removing delete recent searches button when list is empty (#2105)
* Fix #2104 by removing delete recent searches button when list is empty
* Changed text to 'No recent searches' when the list is empty
2018-12-13 13:04:29 +00:00
neslihanturan
677e0099af Search this area (#2051)
* Recognize user is moving on the map and show a button

* Use variable from strings xml instead of hardcoded string

* Change search this area button location in xml file

* Add location util file to convert mapbox LatLng to commons Latlng and viceversa

* Populate places around searched area

* Update narby map according to new points came from searched area

* Add searchThisAreaMode boolean to stop nearby map updated when we try to search nearby areas.

* Lock auto nearby operations during serch this area mode, with a more modular method and decrease code repetition

* Add an if clausse to prevent multiple refresh view calls, while map is moving

* Disable map gestures during search this area operation, re-eable them on operation is done

* Add progress bar during search this area operation

* Make sure you locked the map during search nearby map process

* Implement recenter map view button

* Fix logic problem and make sure you refreshed the view on coming back to previous position

* Use custom refresh method instead

* Use latest updated location from location manager isntead

* Update ListFragment accordingly too

* Do not update camera target according to bottom sheet status or do not follow users location with camera, if search this area mode is on

* Add javadocs, sorry forgotten previously

* Remove unused method

* Threat both or search this area and regular search in same way

* Make sure distances are correct

* Seperate cutom location updates and current location updates from each other to continue other operations

* Remove all logs, and make sure search this are button is not visible for no reason while around of current location is already loaded

* Notify load attractions from location method about search status, current location of custom location

* Make sure we calculate searched area and display search this area button when we are out of 3/4 of total searched area
2018-12-06 03:06:50 +10:00
maskara
4a2cdb70b9 Merge branch '2.9-release' 2018-11-27 22:38:20 +05:30
neslihanturan
d62a7586e0 Fixes #2001 New main UI - progress bar in Nearby card view sometimes runs forever. (#2021)
* Localisation updates from https://translatewiki.net.

* Remove unused mediawiki api dependency (#1991)

* Categories with pipe suffix (#1873)

* Bug fix issue #1826
Changes made :
-Certain category names used to show suffixed with strings prefixed with pipe '|'. Removed everything after the pipe. As per the discussion on the thread, its safe to remove everything after the pipe, including the pipe

* review suggested changes
*Code formatting
*Extracted out the index of pipe in a variable
*Added issue link in comments

* Remove libraries section from README (#1988)

* Remove libraries section from README

* Add wiki link to "libraries used" to README

* Localisation updates from https://translatewiki.net.

* Localisation updates from https://translatewiki.net.

* Display nearby notification only if it is loaded

* Cover don't ask again checkbox is selected posibility

* Clean commented out codes

* Add strings to string.xml

* Add unable to display text to strings xml

* Fix nearby card permission explanation string

* Add never ask again checkbox to dialogbox

* Add action to never display checkbox

* Implement a setting on settings page, to be able to enable this setting later

* Revert unnecessary changes
2018-11-26 03:47:41 +10:00
Vivek Maskara
2bcc8c10b6
Merge branch 'master' into addedReasonList 2018-11-20 21:16:51 +05:30
Vivek Maskara
f607c1c14d Multiple uploads with over haul (#1968)
* Added new upload activity that receives shared files from the gallery.  Cards show and hide, plus titles are correct.  Displayed thumbnails for the shared images

* Better handling of the view paging plus error handling for required fields.

* Code cleanup to make things more readable.

* Extracted a model from the category search fragment that can possibly be shared with the new upload activity.

* Added category selection to the combined upload screen.

* Cleanup before the home-stretch on the GUI.

* Adding license selection.

* Fixed build warnings + cleanup

* Start to support the dark theme.

* Work in progress to add quality checking.

* Fixing merge.

* GPSExtractor: optimized away the EXifInterface object

* Implemented submit functionality, temporarily fixed jacoco crash by disabling DUMMY UploadView object.

* Implemented uploading of categories along with the picture. The category screen now displays GPS and recent categories when nothing is searched.

* Implemented caching of files. Did some work on picture quality detection.

* Implemented too dark picture detection.

* Added a side card for zoom and map buttons along with pretty animations for stuff.

* Added duplicate image on commons checking and fixed files not getting proper file extensions in several places.

* Added support for map button and switched in-app upload buttons to UploadActivity

* Pretty pretty animations!

* Implemented zoom functionality for th background image. Just pinching on the image works instead of requiring buttons.

* Added multi-language descriptions with categories by region.

* Reimplemented the duplicate title checker and implemented a check against putting the same language twice in the description.

* Javadocs for Description and UploadPresenter, plus some general cleanup.

* Small code changes.

* Implemented login checks for the Upload screen.

* Implement receiving data from Nearby.

* Feature/permissions library (#1855)

* Added permission for Dexter, the runtime permission handling library

* [Preparing fir issue #1773] Added a utility function which would take the user to app settings screen where he could manually give us the required permission

* Added an alert dialog with positive and negative callback [Preparing fir issue #1773]

* Improvements in the way External Storage Permission is handled in MultipleShareActivity[Bug fix #1697]
1. Used dexter to handle the external storage permission
2. Behaviour changes : When user tries to share(uppload) images to commons via MultipleShareActivity, following decision tree is followed
	a. If the app has permission for external storage, normal upload operation is followed
	b. If the app does not has the permission for external storage, dexter is used to ask for the same
	c. If the user gives us the required permission, normal upload flow is proceeded
	d. If the doesnot gives us the required permission a rationale dialog is shown with the appropriate message to let him know why we need the permission
	e. If he presses okay, steps a-c are followed and if he presses cancel, we close the app.
	f. If while asking for permission, the user chooses never ask again, then next time he tries to upload an image via MSA, the rational dialog follows the app setting screen where he could manually give us the required permission and the onActivityResult of same is handled

* Added a Constants class to handle request and result codes from one place and other related constants common to the all app elements

* replaced hardcoded strings ok and cancel in DialogUtil to string resources

* init permission rationale dialog in activities onCreate

* Code formatting, updated access modifiers wherever required, added javadocs for new methods created

* *shifted constants to app class
*Added JavaDocs in PermissionUtils

* removed class REQUEST_CODES from CommonsApplication and instead put the enclosing constants in the App class itself

* Made Codacy happy.

* Abstarcted permission acquisition into new class DexterPermissionObtainer

* Fixed Nearby upload detection

* Migrated bad picture detection from AsyncTask to RxJava.

* Removed ShareActivity and related dead code

* Removed dead or duplicate code from FileProcessor

* Added info button to title EditText

* Fixed the add description button not disappearing.
Added "Starting Upload" toast.
Added link to the license on final screen.
Made it so that the map button is hidden when image lacks gps coords.

* Support in app multiple uploads

* Minor changes to fix build

* Changes to fix pending issues with upload flow

* Fix display of similar image fragment

* When uploading several files at once the date is missing #1854 (#2)

* Bug fix issue #1854
* updated ContributionsDao to save create date, which it was not doing currently [it was instead saving current date]
* UploadItem accepts are dateCreated param
* Added a function in UploadModel, getFileCreatedDate which tries to fetched the file creaction date from all possible content providers.

* Fix pending issues in upload flow

* Make multiple uploads work for Google Photos

* Fix default state for upload activity

* Fix keyboard state for license screen

* Fix descriptions for uploads

* wip

* Fix language spinner
2018-11-19 17:00:32 +05:30