1922 commits

Author	SHA1	Message	Date
neslihanturan	2afc14eb20	Merge pull request #1341 from wailbabou/directNearbyUploadsNew ... Change android:backgroundTint to app:backgroundTint onFAB to prevent crash	2018-03-20 13:23:39 +02:00
mac	5744d6836a	pushing only FAB fix for nearbyActivity	2018-03-20 11:57:30 +01:00
neslihanturan	4c192e48e0	Merge pull request #1319 from misaochan/category-suggestions-new ... Category suggestions for direct nearby uploads	2018-03-19 13:10:03 +02:00
Josephine Lim	499591d0ca	Merge pull request #1320 from commons-app/changeCurrentLocationMarkerIcon ... Change current location marker icon	2018-03-19 20:15:11 +10:00
Josephine Lim	753cfab770	Merge pull request #1324 from commons-app/fixCornerButtonBug ... Fix corner FABs visibility bug	2018-03-19 20:14:42 +10:00
misaochan	eaed36555c	Remove TODO	2018-03-18 20:45:51 +10:00
misaochan	a2db562476	Switch Commons categories to the end of the query to prevent cases with >1 cat from messing up wikipedia and commons articles	2018-03-18 20:44:49 +10:00
misaochan	b600f51564	Fix newlines	2018-03-18 20:07:56 +10:00
misaochan	29ccd5826c	Remove FIXMEs in PlaceRenderer	2018-03-18 19:21:34 +10:00
misaochan	d6e848b32e	Remove comment from UploadController.java	2018-03-18 19:17:02 +10:00
misaochan	666b7a0843	Set if-else block for direct Cats in CategorizationFragment	2018-03-18 19:16:31 +10:00
misaochan	819ec795bd	Add check for empty direct categories	2018-03-18 18:51:17 +10:00
misaochan	efa7820fe4	Comment out UploadController.java line to test with Prod categories	2018-03-18 18:35:50 +10:00
misaochan	2249284ded	Really put directCats on top this time	2018-03-18 18:33:26 +10:00
misaochan	d0908abc4a	Put directCats on top of other categories	2018-03-18 18:32:15 +10:00
misaochan	eb4646df4b	Tidy up CategorizationFragment	2018-03-18 18:28:44 +10:00
misaochan	d2b0ffc69d	Add directPrefs injection and obtain CategoryItem for direct cats	2018-03-18 18:26:13 +10:00
misaochan	945aa35864	Add TODO for concat	2018-03-18 18:12:18 +10:00
misaochan	787425b8e7	Change ImageUtil log to verbose to prevent logcat spam	2018-03-18 17:51:07 +10:00
misaochan	a0ecf1ff47	Switch to ApplicationlessInjection in PlaceRenderer.java	2018-03-18 17:50:31 +10:00
neslihanturan	56fb147e1a	Fix corner FABs bug	2018-03-17 12:39:25 +03:00
neslihanturan	e7eb89ec43	Remove unnecesarry file	2018-03-16 18:53:49 +03:00
neslihanturan	0e11a00025	Change current location marker icon	2018-03-16 18:48:15 +03:00
misaochan	efdfa38725	Add FIXME for injector()	2018-03-16 20:48:30 +10:00
misaochan	2099a99e4f	Add Dagger injector to render()	2018-03-16 20:36:57 +10:00
misaochan	c1f451258c	Add FIXME to PlaceRenderer	2018-03-16 20:25:22 +10:00
misaochan	5e828d4541	Save categories in PlaceRenderer and SingleUploadFragment	2018-03-16 20:01:52 +10:00
misaochan	8133ba1d23	Strip string for categories and add them to a Place	2018-03-16 20:00:23 +10:00
misaochan	2c6b6f9bea	Add TODO for category suggestions	2018-03-16 19:49:48 +10:00
misaochan	e2b54c0478	Add categories to Wikidata query	2018-03-16 19:48:09 +10:00
neslihanturan	0d40ebc4eb	Fix improper zooming level on bottom sheet is expanded	2018-03-15 21:40:12 +03:00
neslihanturan	aeaafa465f	Fix conflicts	2018-03-15 00:14:24 +03:00
neslihanturan	75f27a332f	Fix zooming issue	2018-03-14 00:59:08 +03:00
neslihanturan	3288fb05a4	Revert "Re-use current zoom level on camera updates" ... This reverts commit 34579ca125.	2018-03-13 23:58:57 +03:00
neslihanturan	d7a8989871	Revert "Revert "Fix wrong anotations, but tests are still broken"" ... This reverts commit f7f4a72540.	2018-03-13 23:58:22 +03:00
neslihanturan	f7f4a72540	Revert "Fix wrong anotations, but tests are still broken" ... This reverts commit aa61a0673f.	2018-03-13 23:55:13 +03:00
neslihanturan	34579ca125	Re-use current zoom level on camera updates	2018-03-13 21:46:09 +03:00
neslihanturan	aa61a0673f	Fix wrong anotations, but tests are still broken	2018-03-09 14:14:41 +03:00
neslihanturan	c9fdeeb1fe	Add accidentally reverted part	2018-03-07 23:32:24 +03:00
neslihanturan	a617b09af8	Remove refresh button and its actions	2018-03-07 23:08:18 +03:00
neslihanturan	c140d3c34a	Remove swipe to refresh	2018-03-07 22:57:41 +03:00
neslihanturan	c82108f22e	Remove landscape mode .xml of NearbyActivity to prevent swipe layout crash	2018-03-07 19:21:19 +03:00
neslihanturan	41494bea5b	Fix conflicts	2018-03-06 20:32:28 +03:00
neslihanturan	5b88111289	Fix conflicts	2018-03-06 19:47:18 +03:00
neslihanturan	faeebc9caf	Cleanup	2018-03-03 01:03:00 +03:00
neslihanturan	0cbbcad525	Make marker visible even if bottom sheet is open	2018-03-03 00:25:10 +03:00
maskara	123c4adbfd	Minor changes to make things work	2018-03-03 00:30:44 +05:30
misaochan	280d00e42e	Fix whitespace	2018-03-03 00:02:20 +05:30
misaochan	fec005304e	Tidy up DirectUpload - overloaded constructor not necessary	2018-03-03 00:02:20 +05:30
misaochan	3f7e22058a	Fix whitespace	2018-03-03 00:02:20 +05:30