Commit graph

3779 commits

Author SHA1 Message Date
knightshade
0a45e0cc43 Fixed typo. 2018-03-07 00:07:21 +05:30
knightshade
7c32f57c31 Fixed upload count to show correct number of pictures upload by user in beta version of app.
Fixes #1262
2018-03-06 23:05:01 +05:30
neslihanturan
41494bea5b Fix conflicts 2018-03-06 20:32:28 +03:00
neslihanturan
5b88111289 Fix conflicts 2018-03-06 19:47:18 +03:00
knightshade
7009537e8e Wraps string stored in strings.xml with CDATA to prevent PHP's SimpleXML return null when string contains other tags.
Fixes #1258
2018-03-06 08:43:30 +05:30
Vivek Maskara
51221f69c2
Merge pull request #1248 from Jatin0312/master
Fix for issue #1224 showing complete notification on click
2018-03-06 02:46:20 +05:30
Vivek Maskara
b9458bc0b6
Merge pull request #1257 from Jatin0312/patchNotif
Fixes #1250 Removed creation of multiple instances of Notification Activity
2018-03-06 02:42:44 +05:30
Jatin Rao
ff11c9d1f0 Added a white space between text and show less 2018-03-04 22:19:40 +05:30
Jatin Rao
8500abba97 Merge branch 'master' of https://github.com/commons-app/apps-android-commons 2018-03-04 22:15:13 +05:30
Jatin Rao
4ecf03d4d3 Merge branch 'master' of https://github.com/commons-app/apps-android-commons into patchNotif 2018-03-04 14:20:32 +05:30
Jatin Rao
a446b5b662 Fixes #1250 Removed creation of multiple instances of Notification activity 2018-03-04 14:20:20 +05:30
Vivek Maskara
d04f9fbe02
Merge pull request #1254 from tshradheya/1253-fix-toast-message
Fix Toast Message for add_title_toast #1253
2018-03-04 12:05:29 +05:30
Shradheya Thakre
48de0e9ca4 fix-string-message 2018-03-04 13:12:23 +08:00
Jatin Rao
6e9ea26023 Merge branch 'master' of https://github.com/commons-app/apps-android-commons 2018-03-03 19:55:23 +05:30
Jatin Rao
81147aada1 Fixes issue 1224 2018-03-03 19:55:09 +05:30
Vivek Maskara
4c3513b442
Merge pull request #1211 from tshradheya/1195-give-toast-message
Give toast when trying to upload image without giving a Title #1195
2018-03-03 19:23:10 +05:30
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
misaochan
5b481a2562 Optimize imports 2018-03-03 00:02:20 +05:30
misaochan
6d0415cad1 Clean up PlaceRenderer 2018-03-03 00:02:20 +05:30
misaochan
56d20106a3 Tidy up comments 2018-03-03 00:02:20 +05:30
misaochan
429690ae0e Add onRequestPermissionsResult to NearbyListFragment 2018-03-03 00:02:20 +05:30
misaochan
87cd8eecab Create new ContributionController before NearbyAdapterFactory is initiated 2018-03-03 00:02:20 +05:30
misaochan
863eee64dd Add onActivityResult() to NearbyListFragment and pass controller 2018-03-03 00:02:02 +05:30
misaochan
4f74aaed15 Improve debug logging in ContributionController 2018-03-03 00:01:11 +05:30
misaochan
967c9bb54b Call storeSharedPrefs 2018-03-03 00:01:11 +05:30
misaochan
94687090bd Move Dagger injection to method that is called later, to prevent NPE 2018-03-03 00:01:11 +05:30
misaochan
119c4fb782 Manual injection into PlaceRenderer constructor to allow dependency injection 2018-03-03 00:01:11 +05:30
misaochan
65b0b52b01 Finish tidying up setOnClickListeners 2018-03-03 00:00:48 +05:30
misaochan
8b533ef98d Add dagger injections and storeSharedPrefs() 2018-03-03 00:00:48 +05:30
misaochan
3d0f697f70 Finish construction of ContributionController 2018-03-03 00:00:48 +05:30
misaochan
6517a175cb Pass fragment context to PlaceRenderer.java' 2018-03-03 00:00:48 +05:30
misaochan
307a0acb5d Copy camera and gallery onClickListeners over from map 2018-03-03 00:00:48 +05:30
misaochan
eddfab9407 Fix mis-spelling of gallery 2018-03-03 00:00:48 +05:30
misaochan
5a50e63142 Add comment explaining fix 2018-03-03 00:00:48 +05:30
misaochan
1167837b9f Check that fragment is added to activity to prevent crash 2018-03-03 00:00:48 +05:30
misaochan
6cdf153bc1 Add TODO to fix IllegalStateException 2018-03-03 00:00:48 +05:30
misaochan
b2859ba874 Hopefully last cleanup 2018-03-03 00:00:36 +05:30
misaochan
676fa0e0d0 Remove unused imports 2018-03-02 23:59:47 +05:30
misaochan
ce6c95aa29 Fix whitespace 2018-03-02 23:59:22 +05:30
misaochan
821eaceb27 Further code cleanup 2018-03-02 23:59:22 +05:30
misaochan
5a0a8c6019 Clean up DirectNearbyUpload constructor 2018-03-02 23:59:22 +05:30
misaochan
82e9ffbdb8 Replace title/desc in NearbyMapFragment to fix NPE 2018-03-02 23:59:22 +05:30
misaochan
9b63a8f87d Move storeSharedPrefs to fragment that is already injected 2018-03-02 23:59:22 +05:30
misaochan
9fb82da313 Remove unnecessary getters in ShareActivity 2018-03-02 23:59:07 +05:30
misaochan
59cc07922d Retrieve title/desc via Dagger injection in SingleUploadFragment 2018-03-02 23:59:07 +05:30