Commit graph

69201 commits

Author SHA1 Message Date
Dima-1
4d78fc77de fix replace getNonConditionalTag 2021-03-25 09:52:18 +02:00
Vitaliy
513cce6304
Merge pull request #11223 from osmandapp/trip_recording_starting_setting_show_dialog
Redesign trip recording start dialog (added setting show dialog)
2021-03-22 22:50:22 +02:00
Skalii
3bc071c986 some fixes; 2021-03-22 22:35:34 +02:00
Skalii
28d6dd0e4a small fixes; 2021-03-22 22:05:10 +02:00
Skalii
1c140011ab Merge branch 'master' into trip_recording_starting_setting_show_dialog 2021-03-22 22:01:05 +02:00
Vitaliy
334d7a11e1
Merge pull request #11220 from osmandapp/trip_recording_graphs
Redesign trip recording base dialog (added graphs)
2021-03-22 21:55:04 +02:00
Skalii
6daf750591 small fixes; 2021-03-22 21:52:10 +02:00
Skalii
1d66be6f4b some fixes; 2021-03-22 21:38:39 +02:00
Skalii
6f03c5ac25 Merge remote-tracking branch 'origin/trip_recording_graphs' into trip_recording_graphs
# Conflicts:
#	OsmAnd/src/net/osmand/plus/track/GpxBlockStatisticsBuilder.java
2021-03-22 20:59:51 +02:00
Victor Shcherb
35d72bdbaa Fix #10968 2021-03-22 19:57:42 +01:00
Hosted Weblate
8dbe502907
Merge branch 'origin/master' into Weblate. 2021-03-22 18:59:53 +01:00
Ldm Public
6193387459
Translated using Weblate (French)
Currently translated at 100.0% (271 of 271 strings)

Translation: OsmAnd/Telegram
Translate-URL: https://hosted.weblate.org/projects/osmand/telegram/fr/
2021-03-22 18:59:52 +01:00
Michalis
aed05f43e0
Translated using Weblate (Greek)
Currently translated at 19.5% (53 of 271 strings)

Translation: OsmAnd/Telegram
Translate-URL: https://hosted.weblate.org/projects/osmand/telegram/el/
2021-03-22 18:59:51 +01:00
Gilbert Lowel
bd1846683d
Translated using Weblate (Dutch)
Currently translated at 98.4% (3627 of 3685 strings)
2021-03-22 18:59:51 +01:00
Liu Tao
2651fdfa4a
Translated using Weblate (Chinese (Simplified))
Currently translated at 19.6% (766 of 3894 strings)
2021-03-22 18:59:51 +01:00
Shjosan
2d6ea304b2
Translated using Weblate (Swedish)
Currently translated at 85.4% (3329 of 3894 strings)
2021-03-22 18:59:50 +01:00
ovl-1
f8bac862d1
Translated using Weblate (Norwegian Bokmål)
Currently translated at 42.4% (1654 of 3894 strings)
2021-03-22 18:59:42 +01:00
iman
8444e83484
Translated using Weblate (Persian)
Currently translated at 36.7% (1430 of 3894 strings)
2021-03-22 18:59:38 +01:00
letypequividelespoubelles
a903353acb
Translated using Weblate (French)
Currently translated at 99.8% (3888 of 3894 strings)
2021-03-22 18:59:37 +01:00
ovl-1
bcc6eff895
Translated using Weblate (Norwegian Bokmål)
Currently translated at 60.8% (2243 of 3685 strings)
2021-03-22 18:59:36 +01:00
Michalis
8195de78f0
Translated using Weblate (Greek)
Currently translated at 91.2% (3363 of 3685 strings)
2021-03-22 18:59:35 +01:00
Evgenii Martynenko
fe5219f296
Translated using Weblate (Russian)
Currently translated at 100.0% (3685 of 3685 strings)
2021-03-22 18:59:34 +01:00
letypequividelespoubelles
7c5b425e5a
Translated using Weblate (French)
Currently translated at 100.0% (3685 of 3685 strings)
2021-03-22 18:59:33 +01:00
Hinagiku Zeppeki
ca83e57932
Translated using Weblate (Japanese)
Currently translated at 95.3% (3515 of 3685 strings)
2021-03-22 18:59:33 +01:00
letypequividelespoubelles
7aa5e4e1a6
Translated using Weblate (French)
Currently translated at 100.0% (271 of 271 strings)

Translation: OsmAnd/Telegram
Translate-URL: https://hosted.weblate.org/projects/osmand/telegram/fr/
2021-03-22 18:59:16 +01:00
Vitaliy
508613cf19 Merge branch 'master' into trip_recording_graphs 2021-03-22 19:56:32 +02:00
Vitaliy
ee4beb8c45 Fix compilation 2021-03-22 19:56:27 +02:00
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
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
Vitaliy
498b991198
Merge pull request #11181 from osmandapp/trip_recording_starting
Redesign trip recording start dialog
2021-03-22 14:41:06 +02:00
Vitaliy
f3c34e1060 Small fixes 2021-03-22 14:40:03 +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
Dmitry
4543e16b14 Added icon ic_action_dialog for track recording show dialog option 2021-03-22 12:03:10 +02:00
Skalii
913e125968 add static graphs 2021-03-22 04:40:26 +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
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