Vitaliy
|
bb1aef0862
|
Merge remote-tracking branch 'origin/trip_recording' into trip_recording_graphs
# Conflicts:
# OsmAnd/src/net/osmand/plus/monitoring/MonitoringSettingsFragment.java
# OsmAnd/src/net/osmand/plus/monitoring/TripRecordingBottomFragment.java
|
2021-03-22 19:54:56 +02:00 |
|
Skalii
|
5af4e49b30
|
Merge branch 'master' into trip_recording_graphs
# Conflicts:
# OsmAnd/src/net/osmand/plus/monitoring/TripRecordingBottomFragment.java
# OsmAnd/src/net/osmand/plus/track/GpxBlockStatisticsBuilder.java
|
2021-03-22 19:53:36 +02:00 |
|
Vitaliy
|
e301eebcf9
|
Merge pull request #11201 from osmandapp/trip_recording
Redesign trip recording base dialog (added options dialog)
|
2021-03-22 19:07:16 +02:00 |
|
Skalii
|
e1da7bbadf
|
some fixes;
|
2021-03-22 19:05:51 +02:00 |
|
nazar-kutz
|
f3eb10ff88
|
remove temporally RouteLineHelper class
|
2021-03-22 17:39:21 +02:00 |
|
Vitaliy
|
8e2b5a72f0
|
Fix compilation
|
2021-03-22 17:21:26 +02:00 |
|
Vitaliy
|
96b2314e15
|
Merge branch 'master' into trip_recording_graphs
# Conflicts:
# OsmAnd/src/net/osmand/plus/monitoring/TripRecordingBottomFragment.java
# OsmAnd/src/net/osmand/plus/monitoring/TripRecordingStartingBottomFragment.java
# OsmAnd/src/net/osmand/plus/settings/fragments/BaseSettingsFragment.java
# OsmAnd/src/net/osmand/plus/track/GpxBlockStatisticsBuilder.java
|
2021-03-22 17:16:57 +02:00 |
|
Skalii
|
695a0016b9
|
lost fixes after merge;
|
2021-03-22 16:03:32 +02:00 |
|
Skalii
|
27dc55188e
|
Merge branch 'master' into trip_recording
# Conflicts:
# OsmAnd/src/net/osmand/plus/monitoring/TripRecordingBottomFragment.java
# OsmAnd/src/net/osmand/plus/monitoring/TripRecordingStartingBottomFragment.java
# OsmAnd/src/net/osmand/plus/settings/fragments/BaseSettingsFragment.java
|
2021-03-22 15:23:29 +02:00 |
|
nazar-kutz
|
9fda0edc37
|
remove duplicate code
|
2021-03-22 14:44:47 +02:00 |
|
Vitaliy
|
498b991198
|
Merge pull request #11181 from osmandapp/trip_recording_starting
Redesign trip recording start dialog
|
2021-03-22 14:41:06 +02:00 |
|
nazar-kutz
|
b034db4f39
|
After code review fixes 2
|
2021-03-22 14:40:49 +02:00 |
|
Vitaliy
|
f3c34e1060
|
Small fixes
|
2021-03-22 14:40:03 +02:00 |
|
androiddevkotlin
|
8de07a2c59
|
Second Iteration
|
2021-03-22 14:36:32 +02:00 |
|
Skalii
|
2c33128c76
|
add icon for new "show start dialog" setting
|
2021-03-22 14:02:54 +02:00 |
|
Skalii
|
0949a06f3d
|
Merge branch 'master' into trip_recording_starting_setting_show_dialog
# Conflicts:
# OsmAnd/src/net/osmand/plus/track/GpxBlockStatisticsBuilder.java
|
2021-03-22 13:51:21 +02:00 |
|
Vitaliy
|
3323d0ebb7
|
Merge branch 'master' into trip_recording_starting
|
2021-03-22 13:34:51 +02:00 |
|
Skalii
|
04be31b26f
|
remove option "always ask" from general logging interval setting;
|
2021-03-22 13:34:33 +02:00 |
|
Skalii
|
5f67fbcac6
|
add new setting - show start dialog
|
2021-03-22 13:13:04 +02:00 |
|
nazar-kutz
|
5ae37a101c
|
After code review fixes 1
|
2021-03-22 12:37:13 +02:00 |
|
Dmitry
|
4543e16b14
|
Added icon ic_action_dialog for track recording show dialog option
|
2021-03-22 12:03:10 +02:00 |
|
nazar-kutz
|
84266e5719
|
Fix route line in landscape
|
2021-03-22 11:48:59 +02:00 |
|
nazar-kutz
|
a04f7e3bec
|
Fix: selected value doesn't show above custom width slider after select "Custom" mode
|
2021-03-22 11:33:57 +02:00 |
|
Vitaliy
|
9e364a0103
|
Fix possible npe
|
2021-03-22 10:54:44 +02:00 |
|
Vitaliy
|
a8c732df4e
|
Fix multimedia files export UI
|
2021-03-22 10:52:49 +02:00 |
|
Skalii
|
913e125968
|
add static graphs
|
2021-03-22 04:40:26 +02:00 |
|
androiddevkotlin
|
ac370efcd9
|
First iteration
|
2021-03-22 01:48:00 +02:00 |
|
Vitaliy
|
83870f0f45
|
Fix unselected item icon color
|
2021-03-22 00:21:35 +02:00 |
|
Vitaliy
|
490d42f334
|
Fix last view visibility
|
2021-03-21 23:17:16 +02:00 |
|
Vitaliy
|
4117295fe8
|
Merge pull request #11179 from osmandapp/Travel-cards
Travel: Maps you need card, popular articles jumping
|
2021-03-21 20:53:35 +02:00 |
|
Vitaliy
|
47f1932ac9
|
Remove unnecessary changes and fix cards update
|
2021-03-21 20:52:57 +02:00 |
|
Vitaliy
|
b3f87c5036
|
Merge pull request #11213 from osmandapp/make_thin_track_arrow_visible
Make track arrows more visible when track line is thin
|
2021-03-21 19:31:05 +02:00 |
|
androiddevkotlin
|
984aaa36a7
|
init
|
2021-03-21 19:20:50 +02:00 |
|
cepprice
|
e058dad692
|
Don't bias arrow's position
|
2021-03-21 21:57:59 +05:00 |
|
Vitaliy
|
5fdc350f1b
|
Merge pull request #11159 from osmandapp/Plan-route-improvements
Plan route improvements
|
2021-03-21 18:08:04 +02:00 |
|
Vitaliy
|
476b486dba
|
Fix scroll to profile item
|
2021-03-21 18:06:57 +02:00 |
|
cepprice
|
170c70e42b
|
Refactor to optimize memory consumption and rendering speed
|
2021-03-21 20:54:58 +05:00 |
|
Vitaliy
|
fcd2eed652
|
Small fixes
|
2021-03-21 17:25:58 +02:00 |
|
Vitaliy
|
ca6c7f096f
|
Merge branch 'master' into Plan-route-improvements
|
2021-03-21 16:31:32 +02:00 |
|
nazar-kutz
|
95ba9cc032
|
show route line example
|
2021-03-21 15:56:54 +02:00 |
|
androiddevkotlin
|
53c817e811
|
Review
|
2021-03-21 15:39:13 +02:00 |
|
Vitaliy
|
d3b0c31bb8
|
Merge pull request #11214 from osmandapp/revert-11171-patch-1
Revert "Compute obstaclesTime before adding final segment"
|
2021-03-21 15:25:57 +02:00 |
|
Vitaliy
|
e06478d4fe
|
Revert "Compute obstaclesTime before adding final segment"
|
2021-03-21 15:25:45 +02:00 |
|
Vitaliy
|
1ee2d1cc12
|
Merge pull request #11171 from clementcontet/patch-1
Compute obstaclesTime before adding final segment
|
2021-03-21 14:58:51 +02:00 |
|
Vitaliy
|
52a725729c
|
Merge pull request #11208 from starsep/readmeExtraP
README.md: remove extra p closing tag
|
2021-03-21 14:50:32 +02:00 |
|
nazar-kutz
|
14bd85a64c
|
add ability to edit RouteLineDrawInfo and finish dialog UI
|
2021-03-21 14:44:53 +02:00 |
|
nazar-kutz
|
32e0defac0
|
add temporally helper class
|
2021-03-21 14:32:57 +02:00 |
|
nazar-kutz
|
c2b47322a6
|
Add RouteLineDrawInfo for drawing unsaved route line parameters
|
2021-03-21 14:32:18 +02:00 |
|
nazar-kutz
|
b651a18e8d
|
add settings for custom route line colors
|
2021-03-21 14:29:42 +02:00 |
|
nazar-kutz
|
ec564d35a0
|
remove duplicate code
|
2021-03-21 14:28:51 +02:00 |
|