Commit graph

54623 commits

Author SHA1 Message Date
veliymolfar
6e70a32756 androidx refactor 2020-03-05 13:46:36 +02:00
veliymolfar
3f9dc40380 imports conflicts 2020-03-05 11:34:06 +02:00
veliymolfar
bb9858e577 Merge remote-tracking branch 'origin/master' into prepare_importing_finish
# Conflicts:
#	OsmAnd/res/layout/fragment_import.xml
#	OsmAnd/res/layout/fragment_import_duplicates.xml
#	OsmAnd/res/values/strings.xml
#	OsmAnd/src/net/osmand/plus/UiUtilities.java
#	OsmAnd/src/net/osmand/plus/settings/ImportDuplicatesFragment.java
#	OsmAnd/src/net/osmand/plus/settings/ImportSettingsFragment.java
2020-03-05 11:02:45 +02:00
Vitaliy
a3006a5127 Fix compilation 2020-03-05 11:01:29 +02:00
Vitaliy
c921377c2a Merge branch 'master' into restore_custom_modes
# Conflicts:
#	OsmAnd/src/net/osmand/plus/settings/ProfileAppearanceFragment.java
2020-03-05 11:00:37 +02:00
max-klaus
65dbf039d1
Merge pull request #8620 from osmandapp/android_x_migration
AndroidX migration
2020-03-05 11:49:17 +03:00
vshcherb
5ef2459416
Merge pull request #8607 from osmandapp/Fix_zoom_button_context_menu
Fix zoom buttons overlap to context menu when cutout exist
2020-03-04 18:43:38 +01:00
Vitaliy
7a183fa539 Fix compilation 2020-03-04 17:07:56 +02:00
Vitaliy
b0bf5ae1c3 Update to latest stable versions 2020-03-04 16:34:13 +02:00
Vitaliy
3558a1df9a Merge branch 'master' of https://github.com/osmandapp/Osmand into android_x_migration 2020-03-04 16:18:46 +02:00
Vitaliy
fcd6974482 Migration to AndroidX 2020-03-04 16:12:06 +02:00
Nazar-Kutz
ca435b4f3a Layout fixes (return padding instead margin) 2020-03-04 14:50:55 +02:00
Vitaliy
77ebf1cdf3 Update support library version 2020-03-04 14:28:12 +02:00
Hosted Weblate
e8af93db6f
Merge branch 'origin/master' into Weblate. 2020-03-04 12:38:29 +01:00
Phil Georgiev
e9eddff408
Translated using Weblate (Bulgarian)
Currently translated at 10.5% (398 of 3772 strings)
2020-03-04 12:38:22 +01:00
Ajeje Brazorf
23e17fd6c9
Translated using Weblate (Sardinian)
Currently translated at 99.2% (3184 of 3207 strings)
2020-03-04 12:38:13 +01:00
Matej U
f6b692df89
Translated using Weblate (Slovenian)
Currently translated at 80.0% (2566 of 3207 strings)
2020-03-04 12:38:11 +01:00
Ldm Public
2ec0382b43
Translated using Weblate (French)
Currently translated at 100.0% (3207 of 3207 strings)
2020-03-04 12:38:08 +01:00
Softmap
c7d4af2be8
Translated using Weblate (Arabic)
Currently translated at 99.9% (3206 of 3207 strings)
2020-03-04 12:38:08 +01:00
Xuacu Saturio
e5daffe67b
Translated using Weblate (Asturian)
Currently translated at 37.7% (1212 of 3207 strings)
2020-03-04 12:38:06 +01:00
Tymofij Lytvynenko
96c60f340b
Translated using Weblate (Ukrainian)
Currently translated at 100.0% (3207 of 3207 strings)
2020-03-04 12:38:06 +01:00
Phil Georgiev
c3b7322e72
Translated using Weblate (Bulgarian)
Currently translated at 45.5% (1462 of 3207 strings)
2020-03-04 12:38:04 +01:00
Verdulo
3f5878d2ff
Translated using Weblate (Esperanto)
Currently translated at 100.0% (3207 of 3207 strings)
2020-03-04 12:37:40 +01:00
Eduardo Addad de Oliveira
00026bf5a9
Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (3207 of 3207 strings)
2020-03-04 12:37:39 +01:00
Nazar-Kutz
83be8db17a Delete 'setLayoutDirection' method. Use style attribute instead 2020-03-04 13:19:54 +02:00
Vitaliy
cdbdf4a78b Show progress dialog after screen rotation 2020-03-04 12:38:50 +02:00
Dima-1
edf4022c18 Fix zoom buttons padding 2020-03-04 12:05:15 +02:00
veliymolfar
2ceb6821c9 fix drawer above import screen 2020-03-04 11:41:07 +02:00
veliymolfar
fb2643b98a refactor 2020-03-04 10:30:05 +02:00
xmd5a
30d9e5ea55 Fix 2020-03-04 11:26:40 +03:00
veliymolfar
3951393834 refactor 2020-03-04 10:20:55 +02:00
xmd5a
f648eaa7b6 Add phrases 2020-03-04 11:20:41 +03:00
Nazar-Kutz
1f187e218a Small fixes 2020-03-04 10:18:24 +02:00
Nazar-Kutz
5447289720 Small refactoring
Delete useless methods
2020-03-04 10:15:33 +02:00
xmd5a
bd880f088e Add phrases 2020-03-04 11:04:12 +03:00
Vitaliy
6262c8ca71 Add ability to check exported profile files 2020-03-03 22:19:51 +02:00
Vitaliy
ca742998dc Update restore and reset dialog UI 2020-03-03 21:45:43 +02:00
veliymolfar
7e7f5ed34b colorize selected items icons 2020-03-03 17:28:13 +02:00
veliymolfar
429e4ca6cf add map sources icon 2020-03-03 16:55:44 +02:00
veliymolfar
b55cfed7a2 fix smooth scroll on duplicates screen 2020-03-03 16:46:04 +02:00
veliymolfar
dbe6a560c2 fix routing and render icons in duplicates 2020-03-03 16:23:51 +02:00
veliymolfar
4ffbeaacb2 fix list padding 2020-03-03 16:10:59 +02:00
Nazar-Kutz
22ea47b722 Fix RTL (LTR) layouts and code problems 2020-03-03 15:24:21 +02:00
veliymolfar
1688e42cf2 fix last item visibility in long list 2020-03-03 15:11:54 +02:00
veliymolfar
0535b3a401 Merge remote-tracking branch 'origin/prepare_importing_finish' into import_export_fixes
# Conflicts:
#	OsmAnd/res/values/strings.xml
2020-03-03 13:52:04 +02:00
Dima-1
9f60edce0d Fix zoom buttons overlap to context menu when cutout exist 2020-03-03 11:41:11 +02:00
veliymolfar
0849d736b9 change subtitle "items added:" 2020-03-03 10:49:56 +02:00
Hosted Weblate
ce26755ee7
Merge branch 'origin/master' into Weblate. 2020-03-03 09:33:01 +01:00
Softmap
c833293e95
Translated using Weblate (Arabic)
Currently translated at 43.0% (1625 of 3772 strings)
2020-03-03 09:32:58 +01:00
nasr pen
2f8c20a91b
Translated using Weblate (Arabic)
Currently translated at 100.0% (3206 of 3206 strings)
2020-03-03 09:32:54 +01:00
Softmap
8d69526cc6
Translated using Weblate (Arabic)
Currently translated at 100.0% (3206 of 3206 strings)
2020-03-03 09:32:53 +01:00
jan madsen
db71be8f9e
Translated using Weblate (Danish)
Currently translated at 89.0% (2854 of 3206 strings)
2020-03-03 09:32:50 +01:00
veliymolfar
baa4c87c8d poi types opens categories tab 2020-03-02 18:50:51 +02:00
veliymolfar
50a4cb244d refactor / corrections 2020-03-02 18:36:11 +02:00
veliymolfar
59352429ac refactor 2020-03-02 17:45:29 +02:00
Vitaliy
56eda77a2c Fix compilation 2020-03-02 17:39:19 +02:00
veliymolfar
67655b7496 refactor 2020-03-02 17:38:06 +02:00
veliymolfar
ec6386628c refactor 2020-03-02 17:22:00 +02:00
Vitaliy
fc29ed3651 Merge branch 'master' into restore_custom_modes
# Conflicts:
#	OsmAnd/res/values/strings.xml
#	OsmAnd/src/net/osmand/plus/helpers/ImportHelper.java
2020-03-02 17:14:42 +02:00
veliymolfar
3a869940b2 change screen orientation support 2020-03-02 16:56:17 +02:00
max-klaus
1a259302ee
Merge pull request #8602 from osmandapp/import_rendering_files
Import rendering files
2020-03-02 17:41:26 +03:00
max-klaus
ba0ec98659
Merge pull request #8601 from osmandapp/Fix_8556_waypoint_save_button
Fix #8556 regression:GPX waypoint dialog does not show Save button
2020-03-02 17:39:20 +03:00
max-klaus
b192fc7cd9 Fix quick action string 2 2020-03-02 17:34:00 +03:00
max-klaus
364b6e42b5 Fix quick action string 2020-03-02 17:29:08 +03:00
Vitaliy
145faf5168 Add import rendering files 2020-03-02 15:39:58 +02:00
Dima-1
574297d70b Fix #8556 regression:GPX waypoint dialog does not show Save button 2020-03-02 15:33:30 +02:00
Dmitry
6f91ec72a4 Add recources for Speed Camera dialogs 2020-03-02 13:00:40 +02:00
vshcherb
0675e262b3
Merge branch 'master' into Fix_7763_gpx_track_selection 2020-03-02 11:38:36 +01:00
vshcherb
1598a6d5d3
Merge pull request #8552 from osmandapp/Fix_6669_save_button
Fix 6669 OSM Editing screen: show Save button above keyboard.
2020-03-02 11:35:34 +01:00
Vitaliy
2a225f8659 Import backup profile settings items 2020-03-02 12:10:15 +02:00
xmd5a
acd5fda0dc Fix ru string 2020-03-02 12:13:12 +03:00
max-klaus
bbf7173b68
Merge pull request #8597 from osmandapp/Fix_8513_icons_color_bug
Fix #8513 General settings: icons color bug
2020-03-02 11:29:58 +03:00
Hosted Weblate
0f7058c86b
Merge branch 'origin/master' into Weblate. 2020-03-02 09:17:25 +01:00
ace shadow
a4605dbf4f
Translated using Weblate (Slovak)
Currently translated at 93.5% (3530 of 3772 strings)
2020-03-02 09:17:22 +01:00
Ammuu5
7a362721af
Translated using Weblate (Finnish)
Currently translated at 29.7% (1122 of 3772 strings)
2020-03-02 09:17:18 +01:00
jan madsen
451b60ddab
Translated using Weblate (Danish)
Currently translated at 99.6% (3759 of 3772 strings)
2020-03-02 09:17:03 +01:00
Jeff Huang
dbc41b5c05
Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (3206 of 3206 strings)
2020-03-02 09:17:02 +01:00
ace shadow
b56a6a9342
Translated using Weblate (Slovak)
Currently translated at 100.0% (3206 of 3206 strings)
2020-03-02 09:17:01 +01:00
Ammuu5
759cc29c93
Translated using Weblate (Finnish)
Currently translated at 65.8% (2112 of 3206 strings)
2020-03-02 09:16:55 +01:00
iman
d83efde444
Translated using Weblate (Persian)
Currently translated at 99.7% (3198 of 3206 strings)
2020-03-02 09:16:46 +01:00
Softmap
2722133484
Translated using Weblate (Arabic)
Currently translated at 100.0% (3206 of 3206 strings)
2020-03-02 09:16:42 +01:00
Manuel Tassi
07efd5ee25
Translated using Weblate (Italian)
Currently translated at 90.5% (2903 of 3206 strings)
2020-03-02 09:16:42 +01:00
Yaron Shahrabani
81e8a57fe3
Translated using Weblate (Hebrew)
Currently translated at 94.3% (3024 of 3206 strings)
2020-03-02 09:16:39 +01:00
Marko
3a8f299fe1
Translated using Weblate (Croatian)
Currently translated at 28.3% (910 of 3206 strings)
2020-03-02 09:16:38 +01:00
josep constanti
a07f05f72d
Translated using Weblate (Catalan)
Currently translated at 89.7% (2877 of 3206 strings)
2020-03-02 09:16:33 +01:00
jan madsen
2067fd10f3
Translated using Weblate (Danish)
Currently translated at 89.0% (2854 of 3206 strings)
2020-03-02 09:16:28 +01:00
nasr pen
adf48301ab
Translated using Weblate (Arabic)
Currently translated at 100.0% (3206 of 3206 strings)
2020-03-02 09:16:20 +01:00
veliymolfar
607cb35da7 Merge remote-tracking branch 'origin/master' into prepare_importing_finish 2020-03-02 10:08:20 +02:00
vshcherb
aaf47beab7
Update strings.xml 2020-02-29 22:37:33 +01:00
iman
de1911b269
Translated using Weblate (Persian)
Currently translated at 34.3% (1294 of 3772 strings)
2020-02-29 17:36:10 +01:00
Osoitz
8a2f38f652
Translated using Weblate (Basque)
Currently translated at 100.0% (3772 of 3772 strings)
2020-02-29 17:36:08 +01:00
Boyuan Yang
33d1429903
Translated using Weblate (Chinese (Simplified))
Currently translated at 63.0% (2020 of 3206 strings)
2020-02-29 17:35:22 +01:00
ace shadow
9060630435
Translated using Weblate (Slovak)
Currently translated at 98.0% (3144 of 3206 strings)
2020-02-29 17:35:21 +01:00
nasr pen
87fece2070
Translated using Weblate (Arabic)
Currently translated at 99.9% (3204 of 3206 strings)
2020-02-29 17:35:13 +01:00
Softmap
284f309b9b
Translated using Weblate (Arabic)
Currently translated at 99.9% (3204 of 3206 strings)
2020-02-29 17:35:13 +01:00
Yaron Shahrabani
e364a29bbc
Translated using Weblate (Hebrew)
Currently translated at 94.2% (3022 of 3206 strings)
2020-02-29 17:35:12 +01:00
Evgenii Martynenko
0d6fb657e0
Translated using Weblate (Russian)
Currently translated at 94.2% (3021 of 3206 strings)
2020-02-29 17:35:09 +01:00
Osoitz
f9a2fa31d8
Translated using Weblate (Basque)
Currently translated at 100.0% (3206 of 3206 strings)
2020-02-29 17:34:52 +01:00
Eduardo Addad de Oliveira
efb8eb0e4f
Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (3206 of 3206 strings)
2020-02-29 17:34:24 +01:00
Iváns
335b661e86
Translated using Weblate (Galician)
Currently translated at 100.0% (3206 of 3206 strings)
2020-02-29 17:34:23 +01:00
Hosted Weblate
71f5a9ecb9
Merge branch 'origin/master' into Weblate. 2020-02-28 20:43:45 +01:00
WaldiS
81cc0f1f83
Translated using Weblate (Polish)
Currently translated at 99.9% (3770 of 3772 strings)
2020-02-28 20:43:38 +01:00
Franco
ad9d76df44
Translated using Weblate (Spanish (Argentina))
Currently translated at 100.0% (3206 of 3206 strings)
2020-02-28 20:43:37 +01:00
Ajeje Brazorf
cea2988083
Translated using Weblate (Sardinian)
Currently translated at 99.1% (3180 of 3206 strings)
2020-02-28 20:43:36 +01:00
iman
303f39e6ab
Translated using Weblate (Persian)
Currently translated at 99.7% (3198 of 3206 strings)
2020-02-28 20:43:35 +01:00
Ldm Public
b47d632643
Translated using Weblate (French)
Currently translated at 100.0% (3206 of 3206 strings)
2020-02-28 20:43:35 +01:00
Franco
127ba712f0
Translated using Weblate (Spanish)
Currently translated at 94.6% (3035 of 3206 strings)
2020-02-28 20:43:34 +01:00
WaldiS
56ce5d18a7
Translated using Weblate (Polish)
Currently translated at 99.6% (3194 of 3206 strings)
2020-02-28 20:43:33 +01:00
Tymofij Lytvynenko
a7e49f3df6
Translated using Weblate (Ukrainian)
Currently translated at 100.0% (3206 of 3206 strings)
2020-02-28 20:43:31 +01:00
Verdulo
d764d0c0b1
Translated using Weblate (Esperanto)
Currently translated at 100.0% (3206 of 3206 strings)
2020-02-28 20:43:30 +01:00
nautilusx
d2a973be8d
Translated using Weblate (German)
Currently translated at 100.0% (3206 of 3206 strings)
2020-02-28 20:43:29 +01:00
Oğuz Ersen
aa827dd3f9
Translated using Weblate (Turkish)
Currently translated at 100.0% (3206 of 3206 strings)
2020-02-28 20:43:29 +01:00
max-klaus
5f0a5c9400
Merge pull request #8577 from osmandapp/RefreshTextFieldBoxLib
Refresh TextFieldBoxes library
2020-02-28 19:39:30 +03:00
Nazar-Kutz
c87177782a Remove unnecessary code 2020-02-28 18:36:39 +02:00
Nazar-Kutz
ead1fa4c4b Fix "Master Profile" is not clickable 2020-02-28 18:27:57 +02:00
veliymolfar
d9626e216b prepare importing finish 2020-02-28 17:52:49 +02:00
veliymolfar
4a75987051 Merge branch 'master' of https://github.com/osmandapp/Osmand into prepare_importing_finish
 Conflicts:
	OsmAnd/res/layout/fragment_import.xml
	OsmAnd/res/layout/fragment_import_duplicates.xml
2020-02-28 16:17:23 +02:00
veliymolfar
29aa173949 import ui fix 2020-02-28 16:14:07 +02:00
veliymolfar
0497fa172d import ui fix 2020-02-28 16:12:52 +02:00
Victor Shcherb
4e4c3396ea Merge branch 'master' of github.com:osmandapp/Osmand 2020-02-28 16:03:07 +02:00
Victor Shcherb
810cdbd750 Fix #8524 2020-02-28 16:03:02 +02:00
Vitaliy
5c0f88b37a Remove unnecessary boolean flags 2020-02-28 15:30:24 +02:00
veliymolfar
9a6c9d111d complete settings screen 2020-02-28 15:21:18 +02:00
Vitaliy
f7a6be3a18 Fix free plugins availability
(cherry picked from commit 4e55ebfcd3)
2020-02-28 14:10:44 +02:00
Vitaliy
4e55ebfcd3 Fix free plugins availability 2020-02-28 13:15:10 +02:00
veliymolfar
d64684fbff Merge remote-tracking branch 'origin/master' into prepare_importing_finish
# Conflicts:
#	OsmAnd/src/net/osmand/plus/settings/ImportSettingsFragment.java
2020-02-28 11:48:51 +02:00
veliymolfar
5fa28b3def fix import list header on lower versions 2020-02-28 11:21:28 +02:00
veliymolfar
6afde41f19 complete settings screen 2020-02-28 11:14:57 +02:00
Vitaliy
d791e9eb5d Fix possible npe 2020-02-28 10:20:44 +02:00
Dmitry
85ce88db3d Added Wikimedia logo 2020-02-27 16:27:09 +02:00
Nazar-Kutz
0dc6c36b99 Refresh TextFieldBoxes library 2020-02-27 16:04:18 +02:00
veliymolfar
4fdde97796 Merge branch 'master' of https://github.com/osmandapp/Osmand into prepare_importing_finish 2020-02-27 15:34:06 +02:00
max-klaus
2b0d556a0d
Merge pull request #8575 from osmandapp/fix_import_list
fix import list header on lower versions
2020-02-27 15:35:08 +03:00
veliymolfar
beab9512b9 fix import list header on lower versions 2020-02-27 14:26:19 +02:00
Vitaliy
ceb0a5ab88 Change clear data dialog 2020-02-27 13:44:59 +02:00
Hardy
90dc1a4ba8 Confirmation dialog for 'Clear recorded data'
(cherry picked from commit f5886ee577)
2020-02-27 13:39:09 +02:00
veliymolfar
72971f3e13 import complete screen 2020-02-27 13:11:18 +02:00
Hosted Weblate
624e21f9ba
Merge branch 'origin/master' into Weblate. 2020-02-27 11:34:54 +01:00
Franco
e0b5f0c736
Translated using Weblate (Spanish (American))
Currently translated at 100.0% (3772 of 3772 strings)
2020-02-27 11:34:46 +01:00
Franco
74e737fb81
Translated using Weblate (Spanish (Argentina))
Currently translated at 100.0% (3772 of 3772 strings)
2020-02-27 11:34:45 +01:00
ace shadow
aeea4b49f9
Translated using Weblate (Slovak)
Currently translated at 93.3% (3520 of 3772 strings)
2020-02-27 11:34:44 +01:00
Zmicer Turok
ea65eb29f7
Translated using Weblate (Belarusian)
Currently translated at 95.9% (3618 of 3772 strings)
2020-02-27 11:34:43 +01:00
Ashiqur Rahman Ashik
bc979cd6fa
Translated using Weblate (Bengali)
Currently translated at 1.9% (74 of 3772 strings)
2020-02-27 11:34:34 +01:00
Franco
4851b5fe2d
Translated using Weblate (Spanish (American))
Currently translated at 100.0% (3206 of 3206 strings)
2020-02-27 11:34:25 +01:00
Franco
3a7d087196
Translated using Weblate (Spanish (Argentina))
Currently translated at 100.0% (3206 of 3206 strings)
2020-02-27 11:34:21 +01:00
ace shadow
a8c76d3269
Translated using Weblate (Slovak)
Currently translated at 93.8% (3008 of 3206 strings)
2020-02-27 11:34:20 +01:00
Branko Kokanovic
f285f6afa4
Translated using Weblate (Serbian)
Currently translated at 100.0% (3206 of 3206 strings)
2020-02-27 11:34:08 +01:00
iman
807d6a5f6d
Translated using Weblate (Persian)
Currently translated at 99.7% (3198 of 3206 strings)
2020-02-27 11:34:03 +01:00
Softmap
a3553571a5
Translated using Weblate (Arabic)
Currently translated at 100.0% (3206 of 3206 strings)
2020-02-27 11:33:59 +01:00
Pavel Kotrč
54ba258c45
Translated using Weblate (Czech)
Currently translated at 80.9% (2595 of 3206 strings)
2020-02-27 11:33:58 +01:00
josep constanti
0f9152dcd4
Translated using Weblate (Catalan)
Currently translated at 88.1% (2826 of 3206 strings)
2020-02-27 11:33:57 +01:00
Tymofij Lytvynenko
cbc2e2d395
Translated using Weblate (Ukrainian)
Currently translated at 100.0% (3206 of 3206 strings)
2020-02-27 11:33:46 +01:00
Zmicer Turok
43b7ee7255
Translated using Weblate (Belarusian)
Currently translated at 97.6% (3131 of 3206 strings)
2020-02-27 11:33:36 +01:00
Ashiqur Rahman Ashik
529cc9c6d6
Translated using Weblate (Bengali)
Currently translated at 0.3% (11 of 3206 strings)
2020-02-27 11:33:17 +01:00
Georgios
953c1d4ff5
Translated using Weblate (Greek)
Currently translated at 99.7% (3197 of 3206 strings)
2020-02-27 11:33:12 +01:00
Guntis Ozols
b0b7be67b7
Translated using Weblate (Latvian)
Currently translated at 68.7% (2205 of 3206 strings)
2020-02-27 11:32:49 +01:00
veliymolfar
5b9c9245fd initial commit 2020-02-26 18:31:06 +02:00
Vitaliy
24103182e7 Fix possible npe
(cherry picked from commit 5c5c1e3af8)
2020-02-26 18:05:32 +02:00
Vitaliy
783b023e75 Fix IllegalStateException
(cherry picked from commit b1624162bf)
2020-02-26 18:05:30 +02:00
Vitaliy
00ef735807 Fix several possible npe
(cherry picked from commit 09f735eec9)
2020-02-26 18:05:28 +02:00
vshcherb
eeeda95f2c
Merge pull request #8569 from osmandapp/minor_fixes
Minor fixes
2020-02-26 17:59:06 +02:00
Vitaliy
5c5c1e3af8 Fix possible npe 2020-02-26 17:08:09 +02:00
Vitaliy
b1624162bf Fix IllegalStateException 2020-02-26 17:05:20 +02:00
Vitaliy
09f735eec9 Fix several possible npe 2020-02-26 17:04:31 +02:00
vshcherb
5b2bca4a7d
Merge pull request #8563 from osmandapp/8224_custom_PT_fix
fix custom routing for PT #8224
2020-02-26 11:37:00 +01:00
Victor Shcherb
3d8110c696 Merge strings from 3.6 2020-02-26 12:34:42 +02:00
Vitaliy
5a6540b10b Merge branch 'master' into restore_custom_modes
# Conflicts:
#	OsmAnd/src/net/osmand/plus/SettingsHelper.java
2020-02-26 11:06:50 +02:00
Vitaliy
f6e533d66e Add restore for custom profiles 2020-02-26 10:47:25 +02:00
max-klaus
a16276ab9c Merge branch 'r3.6' 2020-02-25 19:50:06 +03:00
max-klaus
c3cbbe799a
Merge pull request #8558 from osmandapp/avoid_roads_export_import
import fix
2020-02-25 19:42:19 +03:00
Vitaliy
9d857a9f98 Ui fixes 2020-02-25 18:34:26 +02:00
MadWasp79
9790a408c6 fix custom routing for PT #8224 2020-02-25 18:30:39 +02:00
veliymolfar
0eecb08a4a refactor, fix null items list 2020-02-25 18:19:25 +02:00
veliymolfar
1d98082fac import fix 2020-02-25 16:56:16 +02:00
Dmitry
e6613ddb12 Added favorites icons backgrounds for high zoom levels 2020-02-25 16:51:17 +02:00
vshcherb
a5873ada7c
Merge pull request #8554 from osmandapp/enable_speed_setting
add speed setting to brouter and direct to
2020-02-25 15:13:55 +01:00
vshcherb
9cc1611b59
Update VehicleParametersFragment.java 2020-02-25 16:13:43 +02:00
Vitaliy
90651bd290 Remove unnecessary changes
(cherry picked from commit 8194d599c5)
2020-02-25 15:11:09 +02:00
Vitaliy
e8541e7103 Fix dateFormat for different threads
(cherry picked from commit a60584d0d4)
2020-02-25 15:11:08 +02:00
Vitaliy
af95ad96b6 Remove unnecessary changes
(cherry picked from commit 6e22858749)
2020-02-25 15:11:06 +02:00
Vitaliy
318ffc541f Add check for general track
(cherry picked from commit 10c4e06aa1)
2020-02-25 15:11:02 +02:00
Vitaliy
2eb9b7d143 Fix possible npe
(cherry picked from commit 71c0167b19)
2020-02-25 15:10:57 +02:00
max-klaus
0a1d9e03a8
Merge pull request #8555 from osmandapp/small_fixes
Fix dateFormat error for different threads
2020-02-25 16:08:40 +03:00
Vitaliy
8194d599c5 Remove unnecessary changes 2020-02-25 15:07:22 +02:00
Dima-1
19f29564f1 Fix #8513 General settings: icons color bug 2020-02-25 14:19:44 +02:00
MadWasp79
2d87bdc06e add speed setting to brouter and direct to 2020-02-25 14:15:18 +02:00
Vitaliy
a60584d0d4 Fix dateFormat for different threads 2020-02-25 14:14:45 +02:00
max-klaus
d29e839ed9 Merge branch 'r3.6' 2020-02-25 14:31:34 +03:00
veliymolfar
ae7fd7710a refactor & app bar shadow 2020-02-25 13:23:42 +02:00
veliymolfar
dd35175ae4 refactor import layout 2020-02-25 12:48:20 +02:00
Dima-1
c02d1be6f6 Fix formatting 2020-02-25 12:15:01 +02:00
Vitaliy
6e22858749 Remove unnecessary changes 2020-02-25 12:12:54 +02:00
Vitaliy
10c4e06aa1 Add check for general track 2020-02-25 12:07:01 +02:00
veliymolfar
38919196f0 settingsImporter refactor 2020-02-25 12:00:51 +02:00
Dima-1
df8b6cc27a Merge branch 'master' into Fix_6669_save_button
# Conflicts:
#	OsmAnd/res/layout/fragment_edit_poi.xml
2020-02-25 11:48:52 +02:00
Dima-1
f14b39e8ad Fix #6669 OSM Editing screen: show Save button above keyboard. 2020-02-25 11:44:45 +02:00
Dmitriy Ruban
03fd123419
Merge branch 'r3.6' into avoid_roads_export_import 2020-02-25 11:20:07 +02:00
veliymolfar
123274a614 strings sc conflict 2020-02-25 11:15:48 +02:00
Vitaliy
71c0167b19 Fix possible npe 2020-02-25 11:09:33 +02:00
veliymolfar
fb428c931b refactor duplicateItems 2020-02-25 11:05:27 +02:00