Commit graph

10715 commits

Author SHA1 Message Date
Alexander Sytnyk
09678d4d7a Merge branch 'master' of ssh://github.com/osmandapp/Osmand into sasha_pasha_branch 2017-10-02 10:41:50 +03:00
vshcherb
87e1942ed4 Merge pull request #4501 from osmandapp/gpx_current_track
Fix #4328
2017-10-01 23:35:44 +02:00
Alexey
e256d51be9 Merge pull request #4505 from osmandapp/support_library_fix
Increase support library and build tools versions
2017-10-01 13:37:00 +03:00
PavelRatushnyi
d46604361f Fix copy paste 2017-10-01 13:16:43 +03:00
Victor Shcherb
4a1360237a Use OSM Live for routing 2017-10-01 11:39:01 +02:00
vshcherb
c9f7621592 Merge pull request #4497 from osmandapp/fix_tts_waypoints
Fix #4483
2017-10-01 11:33:36 +02:00
vshcherb
2db96c08bf Merge pull request #4500 from osmandapp/osm_changeset
Fix #4185
2017-10-01 11:30:00 +02:00
PavelRatushnyi
f0838c6f08 Increase support library and build tools versions 2017-09-30 18:24:28 +03:00
PavelRatushnyi
0418b84022 Markers groups styling 2017-09-30 16:34:56 +03:00
PavelRatushnyi
aa7353dd09 Fix groups when move all to history 2017-09-30 16:13:14 +03:00
PavelRatushnyi
19f91cf13d Do not open keyboard in save as track dialog 2017-09-30 15:43:53 +03:00
PavelRatushnyi
5921e1f9ca Fix #4296 2017-09-30 15:24:55 +03:00
PavelRatushnyi
ad5186b391 Fix #4185 2017-09-30 10:55:14 +03:00
PavelRatushnyi
fe8a2fa9b4 Fix #4328 2017-09-30 09:53:31 +03:00
PavelRatushnyi
50fcf38f00 Fix topbar 2017-09-29 21:02:21 +03:00
PavelRatushnyi
8416a61014 Merge branch 'master' of ssh://github.com/osmandapp/Osmand into context_menu_hide 2017-09-29 20:52:36 +03:00
PavelRatushny
07314d6e49 Fix #4417 2017-09-29 18:58:48 +03:00
Alexander Sytnyk
32986f1b64 Add reverse order functionality 2017-09-29 18:47:30 +03:00
Alexander Sytnyk
089e410ca6 Add sort by menu; add small fixes in UI 2017-09-29 18:29:14 +03:00
Alexey
38f1204733 Merge pull request #4498 from osmandapp/sasha_pasha_branch
Save selections in DB
2017-09-29 17:10:55 +03:00
Alexey
0b3b6a1c3c Merge pull request #4496 from osmandapp/marker_poi
Fix #4494
2017-09-29 17:01:02 +03:00
Alexander Sytnyk
2b14185b09 Save selections in DB 2017-09-29 16:58:44 +03:00
PavelRatushny
b2a7723ae3 Fix finding name for marker 2017-09-29 16:53:46 +03:00
PavelRatushny
343ca3ee11 Add check for string is not address not found 2017-09-29 16:50:47 +03:00
PavelRatushny
2877f89d0e Fix copy paste 2017-09-29 16:23:32 +03:00
PavelRatushny
e79065adb0 Fix #4483 2017-09-29 15:51:15 +03:00
Alexander Sytnyk
64f39675b0 Use lastStaleKnownLocation with map markers 2017-09-29 15:41:54 +03:00
PavelRatushny
9e6a0ede96 Fix #4494 2017-09-29 14:49:17 +03:00
Alexander Sytnyk
ddd1f914b5 Add default mode 2017-09-29 14:44:39 +03:00
Alexander Sytnyk
e871dc064d Add displaying the count of selected markers; extract variables 2017-09-29 14:29:22 +03:00
PavelRatushny
9dc47fe3ff Fix #4494 2017-09-29 14:09:33 +03:00
Alexander Sytnyk
978d5316de The height of the fragment is half the height of the screen 2017-09-29 13:34:27 +03:00
Alexander Sytnyk
b41c6c8068 Add calculation of time and distance 2017-09-29 13:04:30 +03:00
Alexander Sytnyk
04a7d84933 Fix background in dark map theme 2017-09-29 12:10:32 +03:00
Alexander Sytnyk
fdbd1c32b7 Show zoom and location buttons with opened markers list in plan route mode 2017-09-29 12:01:33 +03:00
PavelRatushny
f3e535198c Fix max symbols count 2017-09-29 11:54:53 +03:00
PavelRatushny
aa3b896092 Remove utm and olc formats 2017-09-29 11:52:16 +03:00
PavelRatushny
6d5625c306 Merge branch 'sasha_pasha_branch' of ssh://github.com/osmandapp/Osmand into sasha_pasha_branch 2017-09-28 19:04:33 +03:00
PavelRatushny
27c204643d Add option menu and keyboard styling 2017-09-28 19:02:56 +03:00
Alexander Sytnyk
dad003d8d3 Change rendering line attributes 2017-09-28 18:11:29 +03:00
Alexander Sytnyk
d22c799325 Draw lines to location in onPrepareBufferImage 2017-09-28 16:59:14 +03:00
PavelRatushny
e92ecfa26f Merge branch 'sasha_pasha_branch' of ssh://github.com/osmandapp/Osmand into sasha_pasha_branch 2017-09-28 15:36:12 +03:00
PavelRatushny
e72d419e9a Add support for different coordinate formats 2017-09-28 15:35:36 +03:00
Alexander Sytnyk
ca92958259 Add functionality to use location item 2017-09-28 15:18:31 +03:00
Alexander Sytnyk
20a99ac9c6 Replace Use My Location card with location item 2017-09-28 14:54:20 +03:00
Alexander Sytnyk
ee943cbf4f Disable context menu in plan route mode 2017-09-28 13:12:41 +03:00
Alexander Sytnyk
7c8e39d0eb Add displaying of selected markers 2017-09-28 12:36:41 +03:00
PavelRatushnyi
48e051e859 Add coordinate format dialog 2017-09-28 12:02:43 +03:00
PavelRatushnyi
6bb5aa6ae2 Create background for keyboard item 2017-09-28 11:17:14 +03:00
PavelRatushnyi
78085e71e2 Merge branch 'sasha_pasha_branch' of ssh://github.com/osmandapp/Osmand into sasha_pasha_branch 2017-09-28 10:44:42 +03:00
sonora
d5f09cc053 string improvements 2017-09-28 07:06:35 +02:00
PavelRatushny
b0da4038d2 Merge branch 'sasha_pasha_branch' of ssh://github.com/osmandapp/Osmand into sasha_pasha_branch 2017-09-27 19:50:59 +03:00
PavelRatushny
d61cb1946d Make keyboard clickable 2017-09-27 19:50:33 +03:00
Alexander Sytnyk
ae01e250a9 Add on click listeners 2017-09-27 18:07:03 +03:00
Alexander Sytnyk
9b7664448e Hide quick actions button in Plan Route mode; open markers list by default; fix small bug 2017-09-27 17:14:50 +03:00
Alexander Sytnyk
dc2233e261 Add UseLocationCard to markers list; add small fixes 2017-09-27 15:13:08 +03:00
PavelRatushny
d974e28c13 Merge branch 'sasha_pasha_branch' of ssh://github.com/osmandapp/Osmand into sasha_pasha_branch 2017-09-27 14:54:51 +03:00
PavelRatushny
439830a7f5 Fix crash in groups 2017-09-27 14:54:24 +03:00
Alexey
330980dc2e Merge pull request #4490 from osmandapp/sasha_pasha_branch
Sasha pasha branch
2017-09-27 12:49:25 +03:00
PavelRatushny
71338c4809 Merge branch 'sasha_pasha_branch' of ssh://github.com/osmandapp/Osmand into sasha_pasha_branch 2017-09-26 19:20:26 +03:00
PavelRatushny
d8c16f784d Fix coordinate layout 2017-09-26 19:19:48 +03:00
Alexander Sytnyk
8f36889cd0 Add dividers 2017-09-26 18:29:36 +03:00
PavelRatushny
3297dc90e4 Merge branch 'sasha_pasha_branch' of ssh://github.com/osmandapp/Osmand into sasha_pasha_branch 2017-09-26 18:06:56 +03:00
PavelRatushny
707e124ab4 Do not update compass when swipe 2017-09-26 18:06:32 +03:00
Alexander Sytnyk
2762f406de Add distance to list item 2017-09-26 18:03:47 +03:00
PavelRatushny
309daae774 Merge branch 'sasha_pasha_branch' of ssh://github.com/osmandapp/Osmand into sasha_pasha_branch 2017-09-26 17:59:02 +03:00
PavelRatushny
4dbcfa7718 Show snackbar when moving to history in groups 2017-09-26 17:41:49 +03:00
Alexander Sytnyk
b813ba4df4 Add functionality to select/deselect all button 2017-09-26 17:35:39 +03:00
PavelRatushny
91ffdfea51 Fix swipe direction 2017-09-26 17:03:29 +03:00
PavelRatushny
352fe32b4a Resolve conflicts 2017-09-26 17:02:45 +03:00
PavelRatushny
f50a4f07d6 Fix swipes 2017-09-26 16:49:52 +03:00
Alexander Sytnyk
a91946f873 Add adapter and related stuff 2017-09-26 16:07:36 +03:00
Alexander Sytnyk
c47e5c226d Merge remote-tracking branch 'origin/sasha_pasha_branch' into sasha_pasha_branch 2017-09-26 13:55:29 +03:00
Alexander Sytnyk
1227590650 Add items to the layout 2017-09-26 13:55:14 +03:00
PavelRatushny
c786cd7440 Fix history icons 2017-09-26 13:53:48 +03:00
PavelRatushny
0e4b16d9ca Fix displaying show passed in groups 2017-09-26 13:43:56 +03:00
PavelRatushny
d852ec728e Fix sorting 2017-09-26 13:15:05 +03:00
PavelRatushny
e580a0d193 Merge branch 'sasha_pasha_branch' of ssh://github.com/osmandapp/Osmand into sasha_pasha_branch 2017-09-26 12:44:55 +03:00
PavelRatushny
3cba30c63f Fix resource not found 2017-09-26 12:44:29 +03:00
Alexander Sytnyk
48d6be18f2 Add test text 2017-09-26 12:39:49 +03:00
PavelRatushny
cdc85b903e Fix dublicate markers in groups 2017-09-26 12:29:25 +03:00
Alexander Sytnyk
b6a90eb774 Fix markers import 2017-09-26 12:12:45 +03:00
Alexander Sytnyk
09345faefc Add marker to first place; fix random colors 2017-09-26 11:20:55 +03:00
PavelRatushny
db948d924a Merge branch 'sasha_pasha_branch' of ssh://github.com/osmandapp/Osmand into sasha_pasha_branch 2017-09-26 10:22:43 +03:00
PavelRatushny
ecc35ace89 Fix markers database 2017-09-26 10:22:07 +03:00
Alexander Sytnyk
4dc734e4b3 Add Plan Route fragment and related stuff; fix some small bugs 2017-09-25 19:48:55 +03:00
PavelRatushny
83fd9df764 Add coordinate input screen 2017-09-25 19:20:47 +03:00
PavelRatushny
ef2f9cf76c Merge branch 'sasha_pasha_branch' of ssh://github.com/osmandapp/Osmand into sasha_pasha_branch 2017-09-25 16:56:00 +03:00
PavelRatushny
dbfd5bb288 Add save as track dialog 2017-09-25 16:54:32 +03:00
Alexander Sytnyk
ab59a8cc2c Do not update compass when scrolling or drag and drop 2017-09-25 11:50:36 +03:00
Alexander Meshcheryakov
f8e798a0c1 All 2xx responses as success in Online Tracking
Any http response code 2xx indicates success.

Actually we should expect that server replies with "201 Created" after storing proposed data point.

Alleviates #4472
2017-09-24 21:08:45 +03:00
PavelRatushnyi
fe195a238d Add check before display date 2017-09-24 11:13:04 +03:00
PavelRatushnyi
bcc8192cf6 Display marker date in groups 2017-09-24 11:01:27 +03:00
PavelRatushnyi
b7ee350791 Fix history icons 2017-09-24 10:22:59 +03:00
Alex
b35446d026 Fix drawing distance between location and marker after map rotation 2017-09-22 19:46:28 +03:00
Alex
06d4ea1cc5 Fix drawing distance between finger and location after map rotation 2017-09-22 19:23:13 +03:00
Alex
b3ab14863d Merge remote-tracking branch 'origin/sasha_pasha_branch' into sasha_pasha_branch 2017-09-22 19:13:55 +03:00
Alex
fee84d47a7 Fix drawing distance between two fingers after map rotation 2017-09-22 19:13:18 +03:00
PaulStets
a7496f1a17 Fixed issue #4427 2017-09-22 19:02:41 +03:00
PavelRatushny
ae186fa66b Make views in groups clickable 2017-09-22 19:01:16 +03:00
PaulStets
eb88381831 Fixed issue #4427 2017-09-22 18:49:28 +03:00
PaulStets
72807105b9 Fixed issue #4427 2017-09-22 18:47:01 +03:00
PavelRatushny
6a30233464 Merge branch 'sasha_pasha_branch' of ssh://github.com/osmandapp/Osmand into sasha_pasha_branch 2017-09-22 18:42:33 +03:00
PavelRatushny
325c7a387f Do not show disabled markers on map 2017-09-22 18:41:45 +03:00
Alex
b0bc772450 Change text size and offset 2017-09-22 18:27:55 +03:00
PavelRatushny
c3931c7145 Fix show direction menu 2017-09-22 18:16:23 +03:00
PavelRatushny
901f1aefb5 Change history markers icon 2017-09-22 17:40:10 +03:00
PavelRatushny
96cdaad5bc Merge branch 'sasha_pasha_branch' of ssh://github.com/osmandapp/Osmand into sasha_pasha_branch 2017-09-22 17:06:43 +03:00
PavelRatushny
05f9ae23d7 Change icons in swipes 2017-09-22 17:02:39 +03:00
Alex
a1937e19a8 Merge remote-tracking branch 'origin/sasha_pasha_branch' into sasha_pasha_branch 2017-09-22 17:01:35 +03:00
Alex
820f1c2e38 Draw distance with line in ruler move 2017-09-22 17:01:20 +03:00
PavelRatushny
9ddecb34ce Change swipes in list and groups 2017-09-22 16:57:15 +03:00
PavelRatushny
3ba25cb95f Fix night theme 2017-09-22 16:33:30 +03:00
PavelRatushny
c52c7eb1a9 Fix divider in history 2017-09-22 15:37:52 +03:00
PavelRatushny
caccd76c15 Merge branch 'sasha_pasha_branch' of ssh://github.com/osmandapp/Osmand into sasha_pasha_branch 2017-09-22 15:30:01 +03:00
PavelRatushny
ae2ef2a107 Show snackbar when activate marker from history 2017-09-22 15:29:35 +03:00
Alex
ddff4a72cf Merge remote-tracking branch 'origin/sasha_pasha_branch' into sasha_pasha_branch 2017-09-22 15:29:08 +03:00
Alex
d389ce030b FIx line color 2017-09-22 15:28:52 +03:00
PavelRatushny
546c6c18a8 Capitalize first letter in month 2017-09-22 15:17:43 +03:00
PavelRatushny
6e2e61bd2e Merge branch 'sasha_pasha_branch' of ssh://github.com/osmandapp/Osmand into sasha_pasha_branch 2017-09-22 14:52:13 +03:00
PavelRatushny
2cf935f635 Styling 2017-09-22 14:51:50 +03:00
Alex
d77b1fff96 Change logic for drawing distance 2017-09-22 14:01:54 +03:00
Alex
3dd6f2ef02 Add address search after moving marker 2017-09-22 11:50:34 +03:00
Alex
b76bdc515d Change the condition 2017-09-22 11:27:18 +03:00
Alex
eb68fbe73d Fix calculatePath() 2017-09-22 10:43:51 +03:00
Alex
14908992e4 Fix issues with path; rename variables again 2017-09-21 22:52:28 +03:00
Alex
931fe968dd Revert changes in calculatePath() 2017-09-21 22:27:42 +03:00
Alexey Kulish
9989e2f987 Fix #4462 2017-09-21 19:20:25 +03:00
Alexander Sytnyk
f886b035c0 Merge remote-tracking branch 'origin/sasha_pasha_branch' into sasha_pasha_branch 2017-09-21 19:10:23 +03:00
Alexander Sytnyk
4e6af32c2d Rename variables 2017-09-21 19:10:09 +03:00
PavelRatushny
25bdac43f5 Fix order by menu 2017-09-21 19:04:42 +03:00
PavelRatushny
75cc6162b7 Fix swipe in groups 2017-09-21 18:47:33 +03:00
PavelRatushny
e5bb69053b Add swipes with snackbar in list 2017-09-21 18:28:23 +03:00
Alexey Kulish
c5cb54cef2 Fix #4428 2017-09-21 17:50:01 +03:00
PavelRatushny
88c882d47d Merge branch 'sasha_pasha_branch' of ssh://github.com/osmandapp/Osmand into sasha_pasha_branch 2017-09-21 17:29:24 +03:00
PavelRatushny
41bf5e3abf Add swipes with snackbar in groups 2017-09-21 17:28:59 +03:00
Alexander Sytnyk
e141400eb4 Draw distance between marker and location; reset path in calculatePath() 2017-09-21 16:47:26 +03:00
PavelRatushny
a689841497 Fix map markers database upgrade 2017-09-21 15:17:09 +03:00
PavelRatushny
a9e539e339 Remove group when syncGroup is removed 2017-09-21 15:00:37 +03:00
PavelRatushny
fdd2c80244 Show snackbar when toggle switch in groups 2017-09-21 14:53:08 +03:00
Alexander Sytnyk
91170823ae Fix icons color 2017-09-21 13:22:39 +03:00
Alexander Sytnyk
51ce8a52e6 Merge branch 'master' of ssh://github.com/osmandapp/Osmand into sasha_pasha_branch 2017-09-21 13:09:55 +03:00
PavelRatushnyi
f2a719265b Remove disabled groups on startup 2017-09-21 12:53:48 +03:00
Alexey Kulish
4dfbdb5622 Fix #4284, #4250 2017-09-21 11:58:41 +03:00
Alexey
61e0e6801e Merge pull request #4460 from osmandapp/sasha_pasha_branch
Sasha pasha branch
2017-09-21 10:56:15 +03:00
PavelRatushnyi
a5e0a5120e Add disabling groups 2017-09-21 09:47:49 +03:00
PavelRatushnyi
d2cb331beb Add switch to disable groups 2017-09-21 09:10:38 +03:00
PavelRatushnyi
787e4a6eb8 Change type icon color 2017-09-21 08:59:23 +03:00
PavelRatushnyi
29aca30b2e Styling 2017-09-21 08:50:48 +03:00
PavelRatushnyi
426dcdce85 Revert spaces in groups 2017-09-21 08:41:43 +03:00
Victor Shcherb
41d7333300 Fix #4212 2017-09-21 00:19:33 +02:00
PavelRatushnyi
67272ce744 Merge branch 'sasha_pasha_branch' of ssh://github.com/osmandapp/Osmand into sasha_pasha_branch 2017-09-20 21:53:55 +03:00
PavelRatushnyi
ea639ea08c Refactor groups and highlight items in groups 2017-09-20 21:53:33 +03:00
Alexander Sytnyk
e29953acde Always give random color to markers 2017-09-20 18:58:21 +03:00
Alexander Sytnyk
53c64d553b Draw a line to marker with marker color 2017-09-20 18:48:28 +03:00
Alexander Sytnyk
cf6265201c Do not close the menu after changing the switch state 2017-09-20 18:27:14 +03:00
Alexander Sytnyk
1c9388a2c1 Change logic for getting location 2017-09-20 18:12:07 +03:00
Alexander Sytnyk
9df2319b30 Save current location for 15 minutes 2017-09-20 16:19:42 +03:00
PavelRatushnyi
927ae5345e Merge branch 'sasha_pasha_branch' of ssh://github.com/osmandapp/Osmand into sasha_pasha_branch 2017-09-20 14:08:48 +03:00
PavelRatushnyi
01a40b6779 Paint group icon with group color 2017-09-20 14:08:29 +03:00
Alexander Sytnyk
accb0c7b93 Do not draw lines without my location 2017-09-20 14:00:17 +03:00
PavelRatushnyi
a893fbe6cd Merge branch 'sasha_pasha_branch' of ssh://github.com/osmandapp/Osmand into sasha_pasha_branch 2017-09-20 13:51:13 +03:00
PavelRatushnyi
9b2eb3a415 Fix NPE when getting sync group type 2017-09-20 13:50:50 +03:00
Alexander Sytnyk
9ad449ea2c Merge remote-tracking branch 'origin/sasha_pasha_branch' into sasha_pasha_branch 2017-09-20 13:48:32 +03:00
Alexander Sytnyk
3fd4f89c1d Fix arrows direction when my location is on 2017-09-20 13:48:14 +03:00
PavelRatushnyi
1ae780fa07 Fix space with tab in groups fragment 2017-09-20 13:43:09 +03:00
PavelRatushnyi
0eccab559c Merge branch 'sasha_pasha_branch' of ssh://github.com/osmandapp/Osmand into sasha_pasha_branch 2017-09-20 13:37:51 +03:00
PavelRatushnyi
a25b282df7 Fix updating groups in adapter 2017-09-20 13:37:29 +03:00
Alexander Sytnyk
297b9fc087 Disable arrows and lines by default 2017-09-20 13:35:50 +03:00
Alexander Sytnyk
58831f0cf8 Add annotation 2017-09-20 13:33:30 +03:00
PavelRatushnyi
8220891701 Fix space with tab 2017-09-20 13:27:03 +03:00
PavelRatushnyi
689c661496 Merge branch 'sasha_pasha_branch' of ssh://github.com/osmandapp/Osmand into sasha_pasha_branch 2017-09-20 13:13:53 +03:00
PavelRatushnyi
d212fc24d3 Fix ui for groups 2017-09-20 13:13:20 +03:00
Alexander Sytnyk
dd2a1ed279 Fix colors for menu item icons in dark theme 2017-09-20 13:09:52 +03:00
Alexander Sytnyk
4595991aed Fix some colors for the night mode 2017-09-20 12:36:39 +03:00
PavelRatushnyi
cbe5c3c20f Replace concat with plus 2017-09-20 12:35:04 +03:00
PavelRatushnyi
2443b60263 Merge branch 'sasha_pasha_branch' of ssh://github.com/osmandapp/Osmand into sasha_pasha_branch 2017-09-20 12:28:48 +03:00
PavelRatushnyi
99a11a0987 Replace group with history markers in button 2017-09-20 12:27:48 +03:00
Alexander Sytnyk
a03cc63616 Extract default color from loop 2017-09-20 10:43:04 +03:00
Alexander Sytnyk
4b3318d197 Merge remote-tracking branch 'origin/sasha_pasha_branch' into sasha_pasha_branch 2017-09-19 19:01:22 +03:00
Alexander Sytnyk
35cbe8ec8a Do not draw the line outside the screen 2017-09-19 19:01:12 +03:00
PavelRatushny
877e5e8446 Refactor groups adapter 2017-09-19 19:00:43 +03:00
PavelRatushny
77b4f070e9 Merge branch 'sasha_pasha_branch' of ssh://github.com/osmandapp/Osmand into sasha_pasha_branch 2017-09-19 18:41:13 +03:00
PavelRatushny
a574a66ea8 Create group header 2017-09-19 18:40:53 +03:00
PaulStets
5182a723b1 Fixed issue #4447 2017-09-19 18:10:45 +03:00
Alexander Sytnyk
b5f826f886 Add settings and items to menu 2017-09-19 17:56:03 +03:00
Alexander Sytnyk
316cd51776 Change logic for drawing arrows to the first two markers; add drawing of the lines to the first two markers 2017-09-19 16:33:09 +03:00
PavelRatushny
368695c566 Add to and revert from history in groups 2017-09-19 16:19:52 +03:00
PaulStets
1e72f7f5e3 Fixed issue #4447 2017-09-19 16:18:33 +03:00
PaulStets
2f43745cad Fixed issue #4447 2017-09-19 16:16:28 +03:00
PaulStets
db5d79fa2d Fixed issue #4447 2017-09-19 16:02:38 +03:00
PavelRatushny
8bcaca8893 Merge branch 'sasha_pasha_branch' of ssh://github.com/osmandapp/Osmand into sasha_pasha_branch 2017-09-19 13:57:49 +03:00
PavelRatushny
79f2cedc21 Show history in groups 2017-09-19 13:57:24 +03:00
Alexander Sytnyk
b2b9204d4e Merge remote-tracking branch 'origin/sasha_pasha_branch' into sasha_pasha_branch 2017-09-19 13:40:28 +03:00
Alexander Sytnyk
8e93cc3e96 Add gpx waypoints color syncing; change some logic in gpx points selection 2017-09-19 13:39:22 +03:00
PavelRatushny
bd8040420b Refactor groups 2017-09-19 11:57:23 +03:00
Alex
57fe954b77 Calculate array with colors only one time; rename variable 2017-09-19 08:56:16 +03:00
Alex
38f689eb28 Fix hardcode 2017-09-18 21:19:39 +03:00
Alex
cb42be9d38 Merge remote-tracking branch 'origin/sasha_pasha_branch' into sasha_pasha_branch 2017-09-18 20:11:14 +03:00
Alex
9649a30546 Change colors 2017-09-18 20:11:03 +03:00
PavelRatushny
565de1a651 Merge branch 'sasha_pasha_branch' of ssh://github.com/osmandapp/Osmand into sasha_pasha_branch 2017-09-18 19:49:03 +03:00
PavelRatushny
c0899229c0 Create ui for groups 2017-09-18 19:48:30 +03:00
Alex
79fd144eb5 Change algorithm for finding the nearest color 2017-09-18 19:41:36 +03:00
Alex
ee763cfadd Add color syncing 2017-09-18 18:24:56 +03:00
Alexander Sytnyk
74b7b6546c Merge remote-tracking branch 'origin/sasha_pasha_branch' into sasha_pasha_branch 2017-09-18 13:08:42 +03:00
Alexander Sytnyk
a5de781e65 Add syncing gpx after change "show on map" and after deleting waypoint 2017-09-18 13:08:25 +03:00
Alexey
08e055243c Merge branch 'master' into sasha_pasha_branch 2017-09-18 13:03:39 +03:00
Alexander Sytnyk
48b123096b Fix syncAllGroups method; rename items in MapMarkersOrderByMode enum 2017-09-18 12:53:12 +03:00
Alexander Sytnyk
a5f53bfcb1 Extract trimExtension to AndroidUtils; add syncing gpx where needed 2017-09-18 11:58:45 +03:00
Alexander Sytnyk
dab8c1511d Add gpx-sync to methods 2017-09-18 11:03:16 +03:00
vshcherb
2a7e5741d3 Merge pull request #4418 from osmandapp/PaulsBranch
Improved search for OSM Live
2017-09-18 09:23:13 +02:00
PaulStets
be0edb63c7 Further fixes 2017-09-17 12:08:21 +03:00
PaulStets
883ea72620 Fixed deleted POI being displayed in Configure map - POI 2017-09-16 18:38:27 +03:00
PaulStets
da07e7cf2d Fixes according to review 2017-09-16 14:24:58 +03:00
PaulStets
07bd4e7121 Fixed deleted POI search 2017-09-16 13:21:36 +03:00
Alexander Sytnyk
6399c38bd9 Add sync for GPXFile 2017-09-15 18:49:49 +03:00
PavelRatushny
28971b8c6b Show order by in action bar only in active fragment 2017-09-15 16:56:11 +03:00
PavelRatushny
466eea73ab Add sort when changing order by mode 2017-09-15 16:48:17 +03:00
Alexander Sytnyk
8430f9d5fb Add "Remove from Map Markers" item to EditFavoriteGroupDialog 2017-09-15 16:18:30 +03:00
Alexander Sytnyk
0f66f0595f Merge branch 'master' of ssh://github.com/osmandapp/Osmand into sasha_pasha_branch 2017-09-15 15:45:39 +03:00
Alexander Sytnyk
2151ea5ed7 Replace ArrayList with unmodifiableList 2017-09-15 15:30:38 +03:00
PavelRatushny
cf2017b275 Add possibility to change order by mode 2017-09-15 15:11:21 +03:00
Alexander Sytnyk
c71f11523e Replace methods with direct access 2017-09-15 14:57:07 +03:00
Alexander Sytnyk
95070998ee Add new methods; rename old methods 2017-09-15 14:52:17 +03:00
PavelRatushny
877ee34fbe Resolve conflicts 2017-09-15 13:35:45 +03:00
Alexander Sytnyk
48764345d8 Merge branch 'master' of ssh://github.com/osmandapp/Osmand into edit_gpxfile 2017-09-15 13:32:39 +03:00
Alexander Sytnyk
688435f87b Fix table mismatches between different versions of the database 2017-09-15 13:26:37 +03:00
PavelRatushny
7f7589a673 Merge branch 'sasha_pasha_branch' of ssh://github.com/osmandapp/Osmand into sasha_pasha_branch 2017-09-15 12:34:13 +03:00
PavelRatushny
a35774dd58 Add order by menu 2017-09-15 12:33:45 +03:00
Alexander Sytnyk
437922293e Extract methods from GPXFile to GpxSelectionHelper 2017-09-15 12:33:38 +03:00
PavelRatushny
07d56a7316 Resolve conflicts 2017-09-15 11:56:43 +03:00
Alexander Sytnyk
605671142a Merge branch 'master' of ssh://github.com/osmandapp/Osmand into edit_gpxfile 2017-09-15 11:47:36 +03:00
Alexander Sytnyk
b49f51d6ea Add null check; clear onUpgrade 2017-09-15 10:53:16 +03:00
PavelRatushny
81516bad55 Merge branch 'master' of ssh://github.com/osmandapp/Osmand into sasha_pasha_branch 2017-09-15 10:29:28 +03:00
PavelRatushny
a1d94e8d20 Remove visibility methods from view holder 2017-09-15 10:27:44 +03:00
PavelRatushny
8eb57b6712 Fix space between icons 2017-09-15 10:17:25 +03:00
Alexander Sytnyk
71abe29c27 Convert points to private field; replace direct access with methods 2017-09-14 19:00:37 +03:00
PavelRatushny
8243477eea Disable highlight items when show direction disabled 2017-09-14 19:00:02 +03:00
PavelRatushny
618f6f59e6 Fix reorder color 2017-09-14 18:37:10 +03:00
PavelRatushny
5caf65e840 Add snackbar for move all to history 2017-09-14 18:32:20 +03:00
PavelRatushny
c25febe9eb Change snack bar action color 2017-09-14 17:51:54 +03:00
PavelRatushny
0e5d09eb82 Merge branch 'sasha_pasha_branch' of ssh://github.com/osmandapp/Osmand into sasha_pasha_branch 2017-09-14 17:37:16 +03:00
PavelRatushny
1328261c50 Fix shadow when doing undo 2017-09-14 17:36:44 +03:00
Alexander Sytnyk
c05b64ec41 Add small fix 2017-09-14 17:36:11 +03:00
Alexander Sytnyk
299d9f4e75 Remove unnecessary comment 2017-09-14 17:02:39 +03:00
Alexander Sytnyk
7ab38e525f Hide markers with favorites 2017-09-14 15:12:53 +03:00
PavelRatushny
8defa928b2 Merge branch 'sasha_pasha_branch' of ssh://github.com/osmandapp/Osmand into sasha_pasha_branch 2017-09-14 14:50:49 +03:00
PavelRatushny
a1ccfd34da Change snackbar strings 2017-09-14 14:50:28 +03:00
Alexander Sytnyk
29a4b67e43 Add sync after changing favorite group name 2017-09-14 14:33:27 +03:00
PavelRatushny
f2492c4923 Fix divider 2017-09-14 14:13:58 +03:00
PavelRatushny
82b0a08ff4 Fix space before second row 2017-09-14 14:05:34 +03:00
PavelRatushnyi
d2caee7c0f Merge branch 'sasha_pasha_branch' of ssh://github.com/osmandapp/Osmand into sasha_pasha_branch 2017-09-14 12:03:09 +03:00
PavelRatushnyi
e3a9622ad1 Add shadow to active markers 2017-09-14 12:02:38 +03:00
Alex
00caf48eea Fix small issues 2017-09-14 11:51:52 +03:00
PavelRatushnyi
ff46f49509 Fix history fragment 2017-09-14 10:44:36 +03:00
PavelRatushnyi
11eb486144 Add groups tab 2017-09-14 09:58:35 +03:00
Alexander Sytnyk
d4acaad187 Add sync 2017-09-13 19:42:05 +03:00
PavelRatushny
f207abb2c1 Remove loading library 2017-09-13 19:00:44 +03:00
PavelRatushny
14b70827f1 Styling 2017-09-13 18:16:24 +03:00
PavelRatushny
f211b18a6c Add shadow 2017-09-13 16:41:31 +03:00
PavelRatushny
e21014a9dc Add undo for swipe in history 2017-09-13 15:37:42 +03:00
PavelRatushny
56ebb8b33c Fix highlight first two items 2017-09-13 14:49:49 +03:00
PavelRatushny
6b3d4db019 Fix hiding icon 2017-09-13 14:39:10 +03:00
PavelRatushny
6d57ac5a8c Highlight selected item in show direction menu 2017-09-13 12:49:16 +03:00
PavelRatushny
ab180a6976 Highlight styling 2017-09-13 10:47:15 +03:00
PavelRatushny
7aeb2e175e Remove unnecessary files to highlight 2017-09-13 10:08:22 +03:00
PavelRatushny
904168403b Remove unnecessary code to highlight 2017-09-13 10:07:22 +03:00
PavelRatushny
0f953b7548 Fix highlight reorder 2017-09-13 10:02:52 +03:00
PavelRatushny
17c0c62b2a Merge branch 'sasha_pasha_branch' of ssh://github.com/osmandapp/Osmand into sasha_pasha_branch 2017-09-12 18:44:07 +03:00
PavelRatushny
9e088e6575 Change reorder highlight 2017-09-12 18:43:51 +03:00
Alexander Sytnyk
3f5420e423 Change adding markers from gpx track 2017-09-12 16:55:33 +03:00
Alexander Sytnyk
30a1c5fcca Change adding markers from favorites 2017-09-12 15:54:17 +03:00
Alexander Sytnyk
d61b2a9e82 Add some changes 2017-09-12 13:36:35 +03:00
Alexander Sytnyk
9e050f207c Add method call 2017-09-12 11:59:14 +03:00
Alexander Sytnyk
63aa93ca11 Improve method 2017-09-12 10:42:39 +03:00
vshcherb
2b0f264851 Merge pull request #4420 from osmandapp/measurement_tool_fix
Fix #4411
2017-09-11 19:36:20 +03:00
PavelRatushny
ca1986f3dc Merge branch 'sasha_pasha_branch' of ssh://github.com/osmandapp/Osmand into sasha_pasha_branch 2017-09-11 19:27:11 +03:00
PavelRatushny
dbe9d66e8d Highlight first two items in active 2017-09-11 19:26:51 +03:00
Alexander Sytnyk
62e0f852b0 Merge remote-tracking branch 'origin/sasha_pasha_branch' into sasha_pasha_branch 2017-09-11 19:16:02 +03:00
Alexander Sytnyk
962d732aa6 Add fixes and improvements 2017-09-11 19:15:49 +03:00
PavelRatushny
10f3918f7f Swipe styling 2017-09-11 16:00:22 +03:00
PavelRatushny
78bec6ec55 Hide icon when swiping 2017-09-11 15:49:04 +03:00
PavelRatushny
afc32a880e Remove old markers from drawer 2017-09-11 15:09:00 +03:00
PavelRatushny
701db4df63 Add build route 2017-09-11 15:01:16 +03:00
Alexey Kulish
1631a373b6 Fix mapillary webgl support 2017-09-11 14:56:01 +03:00
PavelRatushny
f5859e5019 Save markers to gpx 2017-09-11 14:45:05 +03:00
PavelRatushny
2b8ade482a Add text to swipe 2017-09-11 14:32:31 +03:00
PavelRatushny
3b20016b3a Merge branch 'sasha_pasha_branch' of ssh://github.com/osmandapp/Osmand into sasha_pasha_branch 2017-09-11 13:19:43 +03:00
PavelRatushny
56a6a8b81f Fix paints 2017-09-11 13:18:55 +03:00
Alexander Sytnyk
be41613c8c Delete marker with deleting favorite; fix small issues 2017-09-11 13:17:13 +03:00
PavelRatushny
b8c1d89025 Add swipe to history 2017-09-11 13:04:40 +03:00
PavelRatushny
aa64fcd47a Add delete action to history menu 2017-09-11 10:31:01 +03:00
PavelRatushnyi
1810e5fcbf Fix recycler view positions 2017-09-11 00:58:45 +03:00
PavelRatushnyi
b88bed8e01 Improve create headers algorithm 2017-09-11 00:44:49 +03:00
Alex
f166ecf436 Increase MapMarkers_DB_VERSION 2017-09-10 00:10:55 +03:00
PavelRatushnyi
68c565bdef Fix #4411 2017-09-09 21:20:06 +03:00
PavelRatushnyi
5df52cd5ed Backup markers 2017-09-09 20:57:44 +03:00
PavelRatushnyi
fbcf727a25 Fix headers in history 2017-09-09 20:30:05 +03:00
PavelRatushnyi
276a03735c Format date 2017-09-09 19:08:24 +03:00
PavelRatushnyi
2bb38e3122 Make history marker menu work 2017-09-09 16:24:55 +03:00