Commit graph

41919 commits

Author SHA1 Message Date
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
Alexander Sytnyk
6657cf496c Merge remote-tracking branch 'origin/sasha_pasha_branch' into sasha_pasha_branch 2017-09-26 13:52:48 +03:00
PavelRatushny
0e4b16d9ca Fix displaying show passed in groups 2017-09-26 13:43:56 +03:00
Alexander Sytnyk
0ead1e054a Merge remote-tracking branch 'origin/sasha_pasha_branch' into sasha_pasha_branch 2017-09-26 13:15:38 +03:00
PavelRatushny
d852ec728e Fix sorting 2017-09-26 13:15:05 +03:00
Alexander Sytnyk
bc4d329d87 Format xml 2017-09-26 13:08:15 +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
3efe77e760 Fix coordinates input keyboard 2017-09-26 10:31:25 +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
18d6e9142c Add text input box library 2017-09-25 16:55:29 +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
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
PavelRatushny
ae186fa66b Make views in groups clickable 2017-09-22 19:01:16 +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
089d747763 Replace option button with text 2017-09-22 17:31:28 +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