Commit graph

10715 commits

Author SHA1 Message Date
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
PavelRatushnyi
9f3cde1b9a Fix history marker menu on rotation 2017-09-09 15:44:50 +03:00
Igor B. Poretsky
924c864ff6 Possible exception fix 2017-09-08 17:19:11 +03:00
Alexander Sytnyk
2677ca50d5 Merge remote-tracking branch 'origin/sasha_pasha_branch' into sasha_pasha_branch 2017-09-08 16:57:18 +03:00
Alexander Sytnyk
196fd7c1b5 Add some code 2017-09-08 16:57:09 +03:00
PavelRatushny
2483327330 Merge branch 'sasha_pasha_branch' of ssh://github.com/osmandapp/Osmand into sasha_pasha_branch 2017-09-08 16:56:55 +03:00
Alexander Sytnyk
d5639abfd6 Add some code 2017-09-08 16:53:31 +03:00
PavelRatushny
3b37dfa1c5 Merge branch 'sasha_pasha_branch' of ssh://github.com/osmandapp/Osmand into sasha_pasha_branch 2017-09-08 16:46:44 +03:00
PavelRatushny
57e1e1fcd9 Show info from marker in menu 2017-09-08 16:46:04 +03:00
Alexander Sytnyk
76485ca60b Fix small issue with Favorites 2017-09-08 16:41:20 +03:00
Alexander Sytnyk
fb56e39c98 Merge remote-tracking branch 'origin/sasha_pasha_branch' into sasha_pasha_branch 2017-09-08 16:13:15 +03:00
Alexander Sytnyk
a1b9e6791e Fix small issues 2017-09-08 16:12:59 +03:00
PavelRatushny
adfadc91d9 Merge branch 'sasha_pasha_branch' of ssh://github.com/osmandapp/Osmand into sasha_pasha_branch 2017-09-08 16:00:42 +03:00
PavelRatushny
a30b123b89 Add history marker menu 2017-09-08 15:59:29 +03:00
Alexander Sytnyk
c5a0536057 Change method 2017-09-08 15:29:45 +03:00
Alexander Sytnyk
63131b6abb Change some methods 2017-09-08 15:09:03 +03:00
Alexander Sytnyk
c42d8b8114 Add some code 2017-09-08 14:33:10 +03:00
PavelRatushny
2b264697ad Make show direction menu work 2017-09-08 14:13:03 +03:00
PavelRatushny
a86ea5118b Fix sorting 2017-09-08 13:23:16 +03:00
PavelRatushny
61fb2ab0ba Fix old markers 2017-09-08 13:16:18 +03:00
PavelRatushny
3dd513c1e1 Add on click listeners in show direction menu 2017-09-08 12:40:41 +03:00
Alexander Sytnyk
a5fbace332 Fix date for existing markers 2017-09-08 12:34:27 +03:00
PavelRatushny
1f9bee1fef Fix old markers headers 2017-09-08 11:48:02 +03:00
PavelRatushny
71a29cf2ce Merge branch 'sasha_pasha_branch' of ssh://github.com/osmandapp/Osmand into sasha_pasha_branch 2017-09-08 11:35:47 +03:00
PavelRatushny
bbc7ff9ea0 Fix headers 2017-09-08 11:35:29 +03:00
Alexander Sytnyk
bf9f2e1d21 Fix color 2017-09-08 11:34:41 +03:00
PavelRatushny
8016888f34 Merge branch 'sasha_pasha_branch' of ssh://github.com/osmandapp/Osmand into sasha_pasha_branch 2017-09-08 11:24:19 +03:00
PavelRatushny
09223033c7 Localize headers 2017-09-08 11:21:15 +03:00
Alexander Sytnyk
d77fc5109b Divide selected points to groups 2017-09-08 11:17:52 +03:00
PavelRatushny
7a1bbb1b7a Fix NPE in child fragments 2017-09-08 10:21:38 +03:00
PavelRatushny
a6bffe42d6 Fix displaying headers 2017-09-08 10:06:57 +03:00
PavelRatushny
3380abede2 Merge branch 'sasha_pasha_branch' of ssh://github.com/osmandapp/Osmand into sasha_pasha_branch 2017-09-08 10:04:06 +03:00
PavelRatushny
30a966af0b Fix history header 2017-09-08 10:03:42 +03:00
PavelRatushny
4ba50ff806 Rename setting 2017-09-07 18:51:04 +03:00
PavelRatushny
56bf4cd17f Merge branch 'master' of ssh://github.com/osmandapp/Osmand into sensors_innacuracy 2017-09-07 18:39:48 +03:00
Alexander Sytnyk
c93632e874 Fix issue with fragments 2017-09-07 18:36:37 +03:00
PavelRatushny
cc13112c63 Fix back to active icon 2017-09-07 18:30:47 +03:00
PavelRatushny
540d3c00ae Merge branch 'sasha_pasha_branch' of ssh://github.com/osmandapp/Osmand into sasha_pasha_branch 2017-09-07 18:17:43 +03:00
PavelRatushny
3a6d81bd52 Add sort for history 2017-09-07 18:17:08 +03:00
Alexander Sytnyk
2df51d08f1 Add functionality to "Move all to history" button 2017-09-07 17:50:55 +03:00
Alexander Sytnyk
535188de5f Fix bug 2017-09-07 15:17:11 +03:00
Alexander Sytnyk
eb89a9791d Hide snackbar after reordering markers 2017-09-07 14:14:20 +03:00
Alexander Sytnyk
cb81896166 Hide snackbar when open history tab 2017-09-07 13:20:37 +03:00
Alexander Sytnyk
b62f07a3f9 Rewrite method reverseActiveMarkersOrder with MapMarkersDbHelper 2017-09-07 11:07:55 +03:00
Alexander Sytnyk
28a4bf6d15 Change some code 2017-09-07 10:41:11 +03:00
PavelRatushny
a4c15fbb07 Merge branch 'master' of ssh://github.com/osmandapp/Osmand into sasha_pasha_branch 2017-09-06 18:46:13 +03:00
PavelRatushny
5af09ae596 Merge branch 'sasha_pasha_branch' of ssh://github.com/osmandapp/Osmand into sasha_pasha_branch 2017-09-06 18:35:30 +03:00
PavelRatushny
1097262dfe Add show direction bottom sheet dialog 2017-09-06 18:34:57 +03:00
Alexander Sytnyk
63aae18ab7 Merge remote-tracking branch 'origin/sasha_pasha_branch' into sasha_pasha_branch 2017-09-06 18:16:22 +03:00
Alexander Sytnyk
a8d90e4525 Add some changes 2017-09-06 18:16:08 +03:00
PavelRatushny
f14f575ef1 Change passed and revert buttons 2017-09-06 16:11:05 +03:00
PavelRatushny
93ad0dba87 Fix build 2017-09-06 15:49:30 +03:00
vshcherb
20c2dd9d54 Merge pull request #4409 from osmandapp/osm_live_fix
Osm live fix
2017-09-06 12:51:35 +02:00
Alexander Sytnyk
9a3573cae9 Merge remote-tracking branch 'origin/sasha_pasha_branch' into sasha_pasha_branch 2017-09-06 13:40:16 +03:00
Alexander Sytnyk
cafbf8a25f Migrate from settings to db in progress 2017-09-06 13:40:02 +03:00
PavelRatushny
fe3700a460 Change url 2017-09-06 13:30:56 +03:00
PavelRatushny
c7b994430b Show time in current timezone 2017-09-06 13:24:34 +03:00
PavelRatushny
45abba80b4 Merge branch 'master' of ssh://github.com/osmandapp/Osmand into sasha_pasha_branch 2017-09-06 12:34:37 +03:00
Alexander Sytnyk
b4e8e87901 Rename methods 2017-09-06 11:38:42 +03:00
vshcherb
780ac556da Merge pull request #4403 from osmandapp/split_interval_screen
Split interval screen
2017-09-06 10:21:17 +02:00
vshcherb
dc55d2880a Merge pull request #4407 from osmandapp/favourites_backup
Favourites backup
2017-09-06 10:18:41 +02:00
Alexander Sytnyk
c782b23cb9 Reorder initialization 2017-09-06 10:32:00 +03:00
PavelRatushny
cd805ab6f8 Add last update in osm live 2017-09-05 18:59:05 +03:00
Alexander Sytnyk
88e1a1dc4b Add MapMarkersDbHelper to OsmandApplication 2017-09-05 18:30:16 +03:00
Alexander Sytnyk
38c382eec4 Remove unnecessary field 2017-09-05 18:09:26 +03:00
Alexander Sytnyk
c073fc509a Remove unnecessary enum 2017-09-05 17:55:43 +03:00
Alexander Sytnyk
c1d0dfb383 Fix working with PointDescription 2017-09-05 17:07:45 +03:00
PavelRatushny
fe261843ca Restore favourites after reinstall 2017-09-05 15:34:16 +03:00
Alexander Sytnyk
2501657467 Add some code 2017-09-05 15:10:53 +03:00
Alexander Sytnyk
0a7e6d0db5 Add some code 2017-09-05 14:38:57 +03:00
Alexander Sytnyk
f53590ef14 Add some code 2017-09-05 14:26:31 +03:00
Alexander Sytnyk
2d7a4ac74f Reorder methods 2017-09-05 13:43:49 +03:00
Alexander Sytnyk
b02794fb1b Add some code 2017-09-05 13:38:16 +03:00
Alexander Sytnyk
2a6e03f7d7 Add some code 2017-09-05 11:00:13 +03:00
PavelRatushny
b4add50e78 Fix NPE 2017-09-05 10:28:06 +03:00
Alexander Sytnyk
f84b94d8da Change key for next marker 2017-09-05 10:23:24 +03:00
Alexander Sytnyk
bf2a7619fe Change id for marker 2017-09-05 10:20:58 +03:00
PavelRatushnyi
754427bacb Code styling 2017-09-05 03:41:43 +03:00
PavelRatushnyi
91cfaa600c Add action bar and persist split 2017-09-05 03:33:08 +03:00
Alex
802dbde613 Add some code 2017-09-04 22:58:51 +03:00
Alexander Sytnyk
d4ca2e85c6 Create MapMarkersDbHelper 2017-09-04 19:41:17 +03:00
PavelRatushny
dd292b3688 Move split interval screen to dialog fragment 2017-09-04 19:04:40 +03:00
PavelRatushny
0396aa5300 Merge branch 'master' of ssh://github.com/osmandapp/Osmand into sensors_innacuracy 2017-09-04 16:36:00 +03:00
PavelRatushny
805584b0c9 Backup favourites 2017-09-04 16:35:22 +03:00
vshcherb
4df472c67d Merge pull request #4400 from osmandapp/mapillary_tag
Fix #4378
2017-09-04 14:28:08 +02:00
PavelRatushny
ef1b44dcb1 Fix #4378 2017-09-04 14:08:58 +03:00
vshcherb
e082111712 Merge pull request #4399 from osmandapp/fix_ruler_algorithm
Fix algorithm for calculating the line between location and touch point
2017-09-04 12:07:14 +02:00
Alexander Sytnyk
4d82962584 Fix algorithm for calculating the line between location and touch point 2017-09-04 13:01:12 +03:00
vshcherb
bebbbdb1a2 Merge pull request #4396 from osmandapp/measurement_tool
Fix exiting from snap to road
2017-09-04 11:06:53 +02:00
vshcherb
c2ab9ff665 Merge pull request #4397 from osmandapp/sasha_pasha_branch
Sasha pasha branch
2017-09-04 11:06:35 +02:00
vshcherb
e333f5cb70 Merge pull request #4373 from osmandapp/aidl_gpx_recording
Add notes to aidl
2017-09-04 11:01:18 +02:00
Alexander Sytnyk
b73455177b Finish undo for active markers 2017-09-04 10:47:12 +03:00
PavelRatushny
1decb4e9fd Fix exiting from snap to road 2017-09-04 10:25:14 +03:00
PavelRatushny
d64627da07 Make preference disabled by default 2017-09-04 10:00:33 +03:00
Alex
b9243cfb59 Undo for removing active marker in progress 2017-09-01 19:05:48 +03:00
PavelRatushny
c1365ddd11 Add setting for speed 2017-09-01 18:57:36 +03:00
Alex
9aa9fb9c5e Add possibility to restore marker from history 2017-09-01 18:23:56 +03:00
Alex
7abae45ba8 Show marker on map after click on history map markers list item 2017-09-01 17:33:23 +03:00
Alex
0dcb35b8d3 Add possibility to move marker to history; add small changes 2017-09-01 17:07:52 +03:00
Alex
7bca3f2850 Add creation date to markers; add color to markers from history 2017-09-01 14:48:42 +03:00
PavelRatushny
6af23994b0 Fix boolean getter 2017-09-01 14:03:16 +03:00
PavelRatushny
fc3a6b9be4 Add navigate gpx to aidl 2017-09-01 14:02:15 +03:00
PavelRatushny
656c50be1d Fix video recording with aidl 2017-09-01 12:47:25 +03:00
PavelRatushny
3cdda4773f Fix taking photo with aidl 2017-09-01 12:31:33 +03:00
PavelRatushny
d6d520dd4d Add navigate to aidl 2017-09-01 12:13:47 +03:00
Alexander Sytnyk
403d374bb0 Add marker options menu 2017-08-31 18:09:53 +03:00
PavelRatushny
f14dfc70c8 Add notes to aidl 2017-08-31 17:37:04 +03:00
Alexander Sytnyk
cd54ad21a6 Add a display of markers from the history 2017-08-31 16:47:18 +03:00
Alexander Sytnyk
c21534e285 Add drag and drop to markers recycler view 2017-08-31 14:57:28 +03:00
Alexey
db41c2ebad Merge pull request #4361 from osmandapp/sasha_pasha_branch
Sasha pasha branch
2017-08-31 14:09:09 +03:00
PavelRatushny
4e715387df Add params for start and stop recording 2017-08-31 11:23:27 +03:00
Alexander Sytnyk
1fa4d3c835 Improve some stuff 2017-08-30 19:05:44 +03:00
PavelRatushny
c97595ccc3 Fix #4330 2017-08-30 19:00:25 +03:00
Alexander Sytnyk
ee4c1e6cb4 Fix updating UI 2017-08-30 18:35:10 +03:00
Alexey
2f8a514d4f Merge pull request #4364 from osmandapp/measurement_tool_fix
Fix exiting dialog
2017-08-30 16:41:19 +03:00
Alexey
16a1599bf3 Merge pull request #4365 from osmandapp/dead_system_exception
Fix #4332
2017-08-30 16:39:53 +03:00
Alexey
26672bc1d7 Merge pull request #4366 from osmandapp/disable_animations
Disable anim in move and zoom
2017-08-30 16:38:14 +03:00
PavelRatushny
dde7524a29 Disable anim in move and zoom 2017-08-30 16:02:07 +03:00
Alexander Sytnyk
9821decb1f Add improvements 2017-08-30 15:21:03 +03:00
PavelRatushny
3e86975ecf Fix #4332 2017-08-30 14:51:28 +03:00
PavelRatushny
56d40a6804 Fix exiting dialog 2017-08-30 14:14:07 +03:00
Alexey
ee60b8c6c6 Merge pull request #4363 from osmandapp/magnetic_compass
Move preference to general
2017-08-30 13:58:35 +03:00
PavelRatushny
6fae2753c7 Move preference to general 2017-08-30 13:55:44 +03:00
Alexey
d3a3d51a24 Merge pull request #4362 from osmandapp/gpx_track_info
Gpx track info
2017-08-30 13:52:03 +03:00
PavelRatushny
4839b5d4ba Fix #4251 2017-08-30 13:40:41 +03:00
Alexander Sytnyk
396dec1482 Move to marker on map on list item click 2017-08-30 13:11:59 +03:00
Alexander Sytnyk
7e52ff30e9 Fix layout and getting location data 2017-08-30 12:51:51 +03:00
Alexander Sytnyk
915d5d516b Add "New map markers" item to drawer; move method 2017-08-30 12:10:27 +03:00
PavelRatushny
8f9839461c Fix typo 2017-08-30 11:31:43 +03:00
Alexey
b669d2ca79 Merge pull request #4360 from osmandapp/poi_wheel
Fix #4269
2017-08-30 11:24:48 +03:00
PavelRatushny
3d9c6d0d81 Fix #4269 2017-08-30 11:10:42 +03:00
Alexey
6785421ee5 Merge pull request #4358 from osmandapp/disable_animations
Disable animations
2017-08-30 10:43:29 +03:00
Alexander Sytnyk
a64f4d1d3f Merge branch 'master' of ssh://github.com/osmandapp/Osmand into sasha_pasha_branch 2017-08-30 10:35:50 +03:00
PavelRatushny
8145555120 Fix #4321 2017-08-30 10:12:25 +03:00
Alex
46da397593 Add some code 2017-08-29 21:22:11 +03:00
Alex
103b285f15 Move method from MapMarkerDialogHelper to MapMarkersHelper; add some code for new map markers 2017-08-29 18:59:26 +03:00
PavelRatushny
a552803792 Merge branch 'master' of ssh://github.com/osmandapp/Osmand into disable_animations 2017-08-29 18:10:57 +03:00
PavelRatushny
ba50524e4d Disable animation when zooming and in context menu 2017-08-29 18:08:57 +03:00
PavelRatushny
348148cf23 Fix add to gpx track 2017-08-29 17:17:59 +03:00
vshcherb
3f9b2b67bc Merge pull request #4355 from osmandapp/disable_animations
Disable animations
2017-08-29 16:10:20 +02:00
PavelRatushny
f5379d4b47 Merge branch 'master' of ssh://github.com/osmandapp/Osmand into disable_animations 2017-08-29 16:51:45 +03:00
PavelRatushny
4e8937459a Fix animation in route info 2017-08-29 16:46:14 +03:00
PavelRatushny
36f12d7a8f Revert animation to map activity 2017-08-29 16:34:55 +03:00
PavelRatushny
8c234f64f3 Disable animations in material bottom sheet 2017-08-29 16:24:03 +03:00
Alex
489e228e3f Add toolbar 2017-08-29 16:02:12 +03:00
PavelRatushny
bea7e18357 Disable animations in osmand bottom sheet 2017-08-29 15:47:09 +03:00
PavelRatushny
387e6297e5 Disable animation in route preparation 2017-08-29 15:28:52 +03:00
PavelRatushny
c48fc51d0d Disable animation in alertdialogs 2017-08-29 15:20:45 +03:00
Alex
fde588081d Create fragments and related things for new map markers 2017-08-29 13:55:36 +03:00
PavelRatushny
d0c1acd685 Revert animation in activity transitions 2017-08-29 12:17:03 +03:00
PavelRatushny
49b04de5b3 Disable animations when disabling drawer 2017-08-29 11:32:44 +03:00
PavelRatushny
8cc454e51d Disable animation in dashboard 2017-08-29 11:13:21 +03:00
PavelRatushny
5d5542f2e0 Fix drawer and restart app 2017-08-29 11:06:05 +03:00
PavelRatushny
766d59feb1 Disable animation in drawer by tap 2017-08-29 10:54:53 +03:00
PavelRatushny
146d955431 Save snap to road 2017-08-29 10:08:13 +03:00
PavelRatushny
ed31ac41e3 Disable animations in activity transition 2017-08-28 18:06:45 +03:00
PavelRatushny
56df79a343 Merge branch 'sasha_pasha_branch' of ssh://github.com/osmandapp/Osmand into sasha_pasha_branch 2017-08-28 17:51:32 +03:00
PavelRatushny
4d1406afec Two digits in month 2017-08-28 17:50:46 +03:00
PavelRatushny
c7ebe9e979 Disable animation in drawer 2017-08-28 17:29:57 +03:00
Alexander Sytnyk
4949628533 Fix blue navigation button 2017-08-28 14:57:06 +03:00
Alexander Sytnyk
339f0fd38c Merge remote-tracking branch 'origin/sasha_pasha_branch' into sasha_pasha_branch 2017-08-28 14:35:08 +03:00
Alexander Sytnyk
9025771718 Fix clear all 2017-08-28 14:34:56 +03:00
PavelRatushny
6a78e78282 Change title 2017-08-28 14:28:06 +03:00
PavelRatushny
472fb7a94d Merge branch 'sasha_pasha_branch' of ssh://github.com/osmandapp/Osmand into sasha_pasha_branch 2017-08-28 14:27:00 +03:00
PavelRatushny
fb86e28940 Add dialog for saving and exiting 2017-08-28 14:26:23 +03:00
Alexander Sytnyk
c21290e583 Consider snap to road in showing distance 2017-08-28 14:25:46 +03:00
Alexander Sytnyk
569e10a6c7 Improve progress bar 2017-08-28 13:17:41 +03:00
Alexander Sytnyk
81ff34d3e5 Fix undo/redo for reorder command 2017-08-28 12:07:23 +03:00
PavelRatushny
ac44fcd023 Delete comments 2017-08-28 09:51:14 +03:00
Alex
154dc2b1c4 Optimise snap to road 2017-08-27 22:13:04 +03:00
Alex
77cbb79deb Do not show toast in snap to road mode 2017-08-27 20:20:42 +03:00
Alex
fcfe307ec2 Fix clear all with snap to road 2017-08-27 10:45:59 +03:00
Alex
0395e35999 Fix snap to road after changing ApplicationMode 2017-08-27 00:32:24 +03:00
Alex
f09fe36214 Add some refactoring 2017-08-27 00:16:22 +03:00
vshcherb
60bfd28830 Merge pull request #4341 from osmandapp/sasha_pasha_branch
Sasha pasha branch
2017-08-26 16:07:02 +02:00
PavelRatushnyi
2e1875373a Revert moveMapToPoint and fix moving 2017-08-26 19:36:15 +03:00
PavelRatushnyi
74f3da881b Add ele and speed to selected point menu 2017-08-26 18:40:48 +03:00
PavelRatushnyi
eaff1b8c7a Fix alt and speed 2017-08-26 18:25:03 +03:00
PavelRatushnyi
87c1029b5c Fix icons 2017-08-26 17:58:52 +03:00
PavelRatushnyi
f3319f6062 Move newGpxData to context 2017-08-26 17:44:12 +03:00
PavelRatushnyi
d11043ea79 Fix moveMapToPoint 2017-08-26 16:12:43 +03:00
PavelRatushnyi
0fe38dd006 Remove unnecessary method 2017-08-26 15:58:08 +03:00
PavelRatushnyi
c648dd2d3f Fix adding points before or after and move 2017-08-26 15:50:28 +03:00
Alexander Sytnyk
f18de8935a Add small fix 2017-08-25 18:57:24 +03:00
PavelRatushny
a94e6981d3 Fix cancel 2017-08-25 18:55:40 +03:00
PavelRatushny
7aadcc8f75 Fix points 2017-08-25 18:47:12 +03:00
PavelRatushny
bec3c71a66 Merge branch 'sasha_pasha_branch' of ssh://github.com/osmandapp/Osmand into sasha_pasha_branch 2017-08-25 17:50:56 +03:00
PavelRatushny
730bf5de8b Delete unnecessary variables 2017-08-25 17:50:38 +03:00
Alexander Sytnyk
0f28f61c74 Improve snap to road 2017-08-25 17:28:53 +03:00
PavelRatushny
242c36ba4b Merge branch 'sasha_pasha_branch' of ssh://github.com/osmandapp/Osmand into sasha_pasha_branch 2017-08-25 17:15:26 +03:00
PavelRatushny
b5f0af881b Refactor 2017-08-25 17:15:07 +03:00
Alexander Sytnyk
b47b4d8aeb Add small fixes 2017-08-25 15:34:06 +03:00
Alexander Sytnyk
fe196a0f67 Fix clear points command 2017-08-25 15:11:33 +03:00
PavelRatushny
b6893b4b46 Remove measurementsPoints 2017-08-25 14:47:42 +03:00
Alexander Sytnyk
45bb24baeb Extract commandManager to EditingContext 2017-08-25 13:25:58 +03:00
PavelRatushny
2f8b0a4b4a Fix exiting from modes 2017-08-25 13:15:25 +03:00
PavelRatushny
5e3a87de0e Merge branch 'sasha_pasha_branch' of ssh://github.com/osmandapp/Osmand into sasha_pasha_branch 2017-08-25 12:42:46 +03:00
PavelRatushny
99b3d099a2 Fix clear selections 2017-08-25 12:42:29 +03:00
Alexander Sytnyk
594b233cff Fix snap to road after screen rotating 2017-08-25 12:35:16 +03:00
PavelRatushny
4b23255899 Fix move point 2017-08-25 12:07:45 +03:00
PavelRatushny
16ada8b290 Fix drawing 2017-08-25 11:55:36 +03:00