Commit graph

41798 commits

Author SHA1 Message Date
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
458dfe589f Merge remote-tracking branch 'origin/sasha_pasha_branch' into sasha_pasha_branch
# Conflicts:
#	OsmAnd/res/layout/fragment_marker_show_direction_bottom_sheet_dialog.xml
2017-09-20 11:05:21 +03:00
Alexander Sytnyk
6147666878 Disable focusability on switches 2017-09-20 11:04:41 +03:00
Alexander Sytnyk
949978734b Disable focusability on switches 2017-09-20 10:54:29 +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
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
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
PavelRatushny
e8792e0e39 Merge branch 'sasha_pasha_branch' of ssh://github.com/osmandapp/Osmand into sasha_pasha_branch 2017-09-19 10:27:20 +03:00
PavelRatushny
9c21024e81 Fix item layout 2017-09-19 10:26:55 +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