Commit graph

4489 commits

Author SHA1 Message Date
Dima-1
1273a7b146 Merge branch 'master' into Fix_1_edit_fav_icons
# Conflicts:
#	OsmAnd/res/values/strings.xml
2020-04-02 15:24:39 +03:00
Dima-1
e2ee35da66 Fix context menu after screen rotation, fix description hide. 2020-04-02 15:22:34 +03:00
max-klaus
1b8623a699
Merge pull request #8745 from osmandapp/Fix_1_edit_fav_icons
Fix 1 edit fav icons
2020-04-01 17:57:22 +03:00
veliymolfar
07cc37f791 wip 2020-04-01 17:00:15 +03:00
Dima-1
22c0b9b04d Fix last used category, black color, GPX icon shape 2020-04-01 10:29:29 +03:00
veliymolfar
d3cf8b2729 drawer configure / work in progress 2020-04-01 10:24:44 +03:00
veliymolfar
44d5975ad8 Merge remote-tracking branch 'origin/master' into profile_branding
# Conflicts:
#	OsmAnd/res/values/strings.xml
#	OsmAnd/src/net/osmand/plus/activities/MapActivity.java
2020-03-31 18:55:18 +03:00
Vitaliy
ecf7c29dcd Merge branch 'master' of https://github.com/osmandapp/Osmand into custom_plugins
# Conflicts:
#	OsmAnd/res/values/strings.xml
2020-03-31 13:48:42 +03:00
Nazar-Kutz
7b268cd9d9 Add Wikipedia POI separate screen and logic 2020-03-31 12:41:49 +03:00
Dmitry
a1e8d6871f Merge branch 'master' of https://github.com/osmandapp/Osmand 2020-03-31 11:29:05 +03:00
Dmitry
b01e67013a Add two icons for App profiles: Snowmobile and Ski Touring 2020-03-31 11:29:00 +03:00
Dima-1
da0f697fc0 Add octagon 2020-03-30 19:07:42 +03:00
vshcherb
6e33e20bc4
Merge pull request #8729 from osmandapp/Fix_1_edit_fav_icons
Fix UI, fix rtl, fix icon size
2020-03-30 11:47:46 +02:00
Dima-1
ffb50f1c78 Fix UI, fix rtl, fix icon size 2020-03-30 12:42:54 +03:00
veliymolfar
dce09ac232 Merge remote-tracking branch 'origin/master' into profile_branding
# Conflicts:
#	OsmAnd/res/values/strings.xml
2020-03-30 11:23:56 +03:00
Vitaliy
88d4365e86 Merge branch 'master' of https://github.com/osmandapp/Osmand into custom_plugins
# Conflicts:
#	OsmAnd/res/values/strings.xml
2020-03-30 10:43:31 +03:00
Dmitry
52b40b075d Change color for outdated location for the day map 2020-03-28 21:17:31 +02:00
max-klaus
a47a27ac81 Fix #8725 2020-03-28 22:10:27 +03:00
veliymolfar
a8553f6ffe terrain ui fixes 2020-03-26 19:03:42 +02:00
Vitaliy
eb9e15cd6e Merge branch 'master' of https://github.com/osmandapp/Osmand into custom_plugins
# Conflicts:
#	OsmAnd/src/net/osmand/plus/quickaction/QuickActionRegistry.java
2020-03-26 16:40:03 +02:00
veliymolfar
20314bd594 Merge remote-tracking branch 'origin/master' into fix_export_import
# Conflicts:
#	OsmAnd/res/values/strings.xml
2020-03-26 11:22:06 +02:00
Vitaliy
b774ccc51d Merge branch 'master' of https://github.com/osmandapp/Osmand into custom_plugins
# Conflicts:
#	OsmAnd/res/values/strings.xml
#	OsmAnd/src/net/osmand/plus/srtmplugin/SRTMPlugin.java
2020-03-26 11:09:53 +02:00
max-klaus
67a9205157
Merge branch 'master' into FIx_8032_Customize_fav_icons_tmp 2020-03-25 20:59:00 +03:00
veliymolfar
de7de14ba7 Merge branch 'master' of https://github.com/osmandapp/Osmand into profile_branding
 Conflicts:
	OsmAnd/res/values/sizes.xml
	OsmAnd/res/values/strings.xml
2020-03-25 18:14:09 +02:00
veliymolfar
eff1c23734 initial commit 2020-03-25 18:13:17 +02:00
veliymolfar
a365488da4 refactor 2020-03-24 12:53:15 +02:00
Dima-1
59e4284d00 Add gpx wptpt editor 2020-03-24 12:14:33 +02:00
veliymolfar
0e490905cc Merge branch 'master' of https://github.com/osmandapp/Osmand into fix_export_import
 Conflicts:
	OsmAnd/res/values/strings.xml
2020-03-23 17:42:39 +02:00
veliymolfar
94693bc53d refactor 2020-03-23 16:22:07 +02:00
veliymolfar
958d9e24df decrease line spacing multiplier 2020-03-23 16:15:15 +02:00
veliymolfar
b9ba5c926c Merge branches 'master' and 'slope_hillshade_ui' of https://github.com/osmandapp/Osmand into slope_hillshade_ui
 Conflicts:
	OsmAnd/res/values/strings.xml
	OsmAnd/src/net/osmand/plus/quickaction/QuickActionFactory.java
	OsmAnd/src/net/osmand/plus/quickaction/QuickActionRegistry.java
	OsmAnd/src/net/osmand/plus/quickaction/actions/HillshadeAction.java
	OsmAnd/src/net/osmand/plus/quickaction/actions/TerrainAction.java
	OsmAnd/src/net/osmand/plus/srtmplugin/HillshadeAction.java
2020-03-23 15:52:57 +02:00
veliymolfar
7cfa03732b refactor / Hillshade action to Terrain 2020-03-23 14:04:29 +02:00
Vitaliy
3e81b5926e Merge branch 'master' into custom_plugins
# Conflicts:
#	OsmAnd/res/values/strings.xml
#	OsmAnd/src/net/osmand/plus/OsmandPlugin.java
#	OsmAnd/src/net/osmand/plus/SettingsHelper.java
#	OsmAnd/src/net/osmand/plus/quickaction/QuickActionRegistry.java
#	OsmAnd/src/net/osmand/plus/settings/ExportProfileBottomSheet.java
2020-03-23 13:41:47 +02:00
Dima-1
6d773bfb36 Fix dark theme 2020-03-23 11:00:04 +02:00
veliymolfar
db2fa7f99b ui fixes / fix import duplicates profiles 2020-03-20 18:55:36 +02:00
Vitaliy
a2c5624930 Add string resource 2020-03-19 18:13:20 +02:00
Nazar-Kutz
5d1bd56dd9 Change Settings UI -> Distance to recalculate 2020-03-19 15:20:18 +02:00
Dmitry
941cdac065 Change description in Rearange search categories screen 2020-03-19 13:34:25 +02:00
sonora
9c6f2e5e94 Introduce shared_string_appearance 2020-03-17 09:55:57 +01:00
Dima-1
0ff96f333b Fix color. Add replace and delete. 2020-03-17 09:03:37 +02:00
veliymolfar
8dac325964 Merge remote-tracking branch 'origin/master' into slope_hillshade_ui
# Conflicts:
#	OsmAnd/res/values/strings.xml
2020-03-13 17:13:50 +02:00
veliymolfar
4d025d8d64 Merge branches 'master' and 'prepare_importing_finish' of https://github.com/osmandapp/Osmand into prepare_importing_finish
 Conflicts:
	OsmAnd/src/net/osmand/plus/helpers/ImportHelper.java
2020-03-13 13:52:26 +02:00
veliymolfar
9331442a29 Add slope data to Downloads / slopes visualization 2020-03-12 18:59:53 +02:00
veliymolfar
d361f78f1f Merge branch 'master' of https://github.com/osmandapp/Osmand into slope_hillshade_ui 2020-03-12 10:25:48 +02:00
xmd5a
6f8d043612 Add phrases 2020-03-12 10:51:06 +03:00
max-klaus
4e7687371c Remove duplicate string 2020-03-11 21:49:40 +03:00
max-klaus
6cdc6a8fb8 Revert "remove duplicate string"
This reverts commit 94594b81c2.
2020-03-11 21:47:16 +03:00
veliymolfar
94594b81c2 remove duplicate string 2020-03-11 18:13:53 +02:00
veliymolfar
b5659fe8b2 Merge branches 'master' and 'prepare_importing_finish' of https://github.com/osmandapp/Osmand into prepare_importing_finish
 Conflicts:
	OsmAnd/src/net/osmand/plus/settings/ImportDuplicatesFragment.java
2020-03-11 16:12:47 +02:00
Nazar-Kutz
e2b0ace021 Merge branch 'r3.6'
# Conflicts:
#	OsmAnd/build.gradle
#	OsmAnd/res/layout/fragment_import.xml
#	OsmAnd/res/layout/fragment_import_duplicates.xml
#	OsmAnd/res/layout/list_menu_item_native.xml
#	OsmAnd/res/values/strings.xml
#	OsmAnd/src/net/osmand/plus/UiUtilities.java
#	OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/GpxItemMenuBuilder.java
#	OsmAnd/src/net/osmand/plus/mapmarkers/MapMarkersDialogFragment.java
#	OsmAnd/src/net/osmand/plus/mapmarkers/adapters/MapMarkersActiveAdapter.java
#	OsmAnd/src/net/osmand/plus/mapmarkers/adapters/MapMarkersHistoryAdapter.java
#	OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java
#	OsmAnd/src/net/osmand/plus/widgets/OsmandTextFieldBoxes.java
2020-03-11 12:08:04 +02:00
max-klaus
9931e88073
Revert "Merge 'r3.6' to 'master' (Fix conflicts)" 2020-03-11 11:28:43 +03:00
xmd5a
cfeef5e8c8 Add phrases 2020-03-10 14:51:05 +03:00
veliymolfar
e5d399b12f Merge branches 'master' and 'prepare_importing_finish' of https://github.com/osmandapp/Osmand into prepare_importing_finish
 Conflicts:
	OsmAnd/res/values/strings.xml
	OsmAnd/src/net/osmand/plus/SettingsHelper.java
2020-03-10 13:48:29 +02:00
Nazar-Kutz
60ee95d93c Merge 'r3.6' to 'master' 2020-03-10 12:03:41 +02:00
veliymolfar
65d9f5f910 terrain ui work in progress 2020-03-06 18:51:04 +02:00
veliymolfar
5d2bfca53e Merge remote-tracking branch 'origin/master' into slope_hillshade_ui 2020-03-06 17:43:39 +02:00
Yaron Shahrabani
aaa917693d
Typo fix
prexif -> prefix
2020-03-06 16:50:08 +02:00
veliymolfar
ca9e8eea2c Merge remote-tracking branch 'origin/master' into slope_hillshade_ui
# Conflicts:
#	OsmAnd/res/values/strings.xml
2020-03-06 11:55:42 +02:00
Dima-1
c670aa2d8b Merge branch 'master' into FIx_8032_Customize_fav_icons_tmp
# Conflicts:
#	OsmAnd/res/values/strings.xml
#	OsmAnd/src/net/osmand/data/FavouritePoint.java
2020-03-06 11:28:40 +02:00
veliymolfar
91f9268abf terrain ui, update material version, field box 2020-03-05 19:59:00 +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
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
Dima-1
97f2f749e2 Add name and description 2020-03-04 19:08:42 +02:00
veliymolfar
24625ca410 terrain ui initial commit 2020-03-04 19:07:41 +02:00
Nazar-Kutz
83be8db17a Delete 'setLayoutDirection' method. Use style attribute instead 2020-03-04 13:19:54 +02:00
veliymolfar
e95da9cb61 terrain screen strings 2020-03-04 12:22:19 +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
xmd5a
bd880f088e Add phrases 2020-03-04 11:04:12 +03:00
Vitaliy
ca742998dc Update restore and reset dialog UI 2020-03-03 21:45:43 +02:00
Dima-1
dcdca35a4f Merge branch 'master' into FIx_8032_Customize_fav_icons_tmp
# Conflicts:
#	OsmAnd/res/layout/favorites_list_item.xml
2020-03-03 14:14:15 +02:00
veliymolfar
0849d736b9 change subtitle "items added:" 2020-03-03 10:49:56 +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
Vitaliy
145faf5168 Add import rendering files 2020-03-02 15:39:58 +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
veliymolfar
9a6c9d111d complete settings screen 2020-02-28 15:21:18 +02:00
veliymolfar
6afde41f19 complete settings screen 2020-02-28 11:14:57 +02:00
Vitaliy
ceb0a5ab88 Change clear data dialog 2020-02-27 13:44:59 +02:00
veliymolfar
72971f3e13 import complete screen 2020-02-27 13:11:18 +02:00
veliymolfar
5b9c9245fd initial commit 2020-02-26 18:31:06 +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
veliymolfar
fb428c931b refactor duplicateItems 2020-02-25 11:05:27 +02:00
Vitaliy
c9086f78f4 Backup created profile 2020-02-24 17:34:00 +02:00
veliymolfar
ff570d4b81 collapsing toolbar 2020-02-24 16:34:05 +02:00
veliymolfar
321aa96846 avoid roads, refactor, corrections 2020-02-21 18:03:28 +02:00
Dima-1
d4b43304cd Fix IU favorite icon size 2020-02-21 17:28:49 +02:00
veliymolfar
e3c9cce6b1 Merge remote-tracking branch 'origin/master' into import_screen 2020-02-20 14:02:46 +02:00
veliymolfar
1af5cb9eaf Merge remote-tracking branch 'origin/master' into import_screen 2020-02-20 10:25:45 +02:00
Vitaliy
018cc182c0 Remove unnecessary preference 2020-02-19 18:54:32 +02:00
Vitaliy
04bd798880 Change profile description 2020-02-19 18:47:17 +02:00
veliymolfar
5256ac14b2 refactor & corrections 2020-02-19 17:48:29 +02:00
vshcherb
13d47b2ed5
Merge pull request #8495 from osmandapp/straight_to
settings cleaning
2020-02-18 16:19:39 +01:00
vshcherb
e34d27b169
Update strings.xml 2020-02-18 16:18:55 +01:00
veliymolfar
e90ff36dc2 Merge remote-tracking branch 'origin/master' into import_screen
# Conflicts:
#	OsmAnd/res/values/strings.xml
#	OsmAnd/src/net/osmand/plus/helpers/ImportHelper.java
2020-02-18 17:00:16 +02:00
veliymolfar
b5f5e0e916 copy of copy base profiles, ui fixes 2020-02-18 16:15:24 +02:00
MadWasp79
ffc52efb41 settings cleaning
added angle preference
2020-02-18 15:37:26 +02:00
xmd5a
02d034a723 Update phrases 2020-02-18 14:05:28 +03:00
Victor Shcherb
b3466bcf69 Merge branch 'straight_to'
Conflicts:
	OsmAnd/res/values/strings.xml
	OsmAnd/src/net/osmand/plus/settings/RouteParametersFragment.java
2020-02-17 20:14:45 +01:00
Victor Shcherb
49f901998d Clean up 2020-02-17 18:22:30 +01:00
max-klaus
8cf98181da Added AV widget customization to configure screen 2020-02-17 19:22:35 +03:00
Vitaliy
00237eabda Change notification preference description 2020-02-17 11:16:57 +02:00
Vitaliy
acf6d7b91e Fix #4635 2020-02-16 19:31:42 +02:00
veliymolfar
c7f2de7f22 import ui, duplicate quick actions, files, small fixes 2020-02-14 19:05:14 +02:00
MadWasp79
a577b25b86 fix settings 2020-02-14 17:52:35 +02:00
veliymolfar
0470f93284 Merge remote-tracking branch 'origin/master' into import_screen
# Conflicts:
#	OsmAnd/res/values/strings.xml
2020-02-14 11:23:42 +02:00
MadWasp79
6844c25945 Merge branch 'master' into straight_to
# Conflicts:
#	OsmAnd/res/values/strings.xml
2020-02-14 11:19:44 +02:00
MadWasp79
1578f4c91c settings change 2020-02-14 11:16:06 +02:00
Nazar-Kutz
b499043a2d Fix Manage Profiles bugs 2020-02-13 19:53:01 +02:00
veliymolfar
784cb45667 Merge remote-tracking branch 'origin/master' into import_screen
# Conflicts:
#	OsmAnd/res/values/strings.xml
#	OsmAnd/src/net/osmand/plus/SQLiteTileSource.java
2020-02-13 19:03:08 +02:00
veliymolfar
3f753c5677 import ui, duplicate quick actions 2020-02-13 18:49:31 +02:00
vshcherb
5b0177285b
Merge branch 'master' into exp_imp_profile_with_features 2020-02-13 15:57:12 +01:00
MadWasp79
597a3518fe Merge branch 'master' into straight_to
# Conflicts:
#	OsmAnd/res/values/strings.xml
2020-02-13 16:47:43 +02:00
vshcherb
8cee733641
Merge pull request #8452 from verdulo/master
fixed untranslated string "Antarctica" | riparis netradukeblan tekston "Antarctica"
2020-02-13 15:42:43 +01:00
vshcherb
ad41588386
Merge pull request #8450 from osmandapp/plugins_prefs_fixes
Plugins prefs fixes
2020-02-13 15:40:01 +01:00
MadWasp79
38e935fb96 fix settings formatting
calculate pointToReturn on track.
2020-02-13 16:37:13 +02:00
Vitaliy
e7aa7b5aac Add disable plugin dialog 2020-02-13 13:19:36 +02:00
veliymolfar
44ccddc3dc Merge remote-tracking branch 'origin/exp_imp_profile_with_features' into import_screen
# Conflicts:
#	OsmAnd/src/net/osmand/plus/SQLiteTileSource.java
2020-02-13 10:20:15 +02:00
veliymolfar
60ed62e022 Merge remote-tracking branch 'origin/master' into import_screen 2020-02-13 10:12:08 +02:00
verdulo
a96f687c04
Update strings.xml 2020-02-13 00:07:51 +01:00
MadWasp79
6069ee0a38 Merge branch 'master' into straight_to 2020-02-12 22:05:04 +02:00
MadWasp79
989f118fb6 add setting for min recaclulation distance for Straight line routing 2020-02-12 21:43:20 +02:00
Victor Shcherb
b98d76fd25 Fix #7654 Add destination: Sort Favorites #7654 2020-02-12 19:18:22 +01:00
Vitaliy
73eed6b5a8 Combine menu titles from string resources 2020-02-12 19:54:54 +02:00
veliymolfar
a4d31c18d5 complex button / import layouts 2020-02-12 18:54:25 +02:00
veliymolfar
03dcb4facd Merge remote-tracking branch 'origin/master' into import_screen 2020-02-12 16:36:39 +02:00
vshcherb
6b0595f6a0
Merge branch 'master' into straight_to 2020-02-11 19:28:14 +01:00
veliymolfar
4d57312c47 import screen initial commit 2020-02-11 18:51:29 +02:00
Dima-1
ebc25edaed Fix #7694 dismiss the recorded track without saving. 2020-02-11 15:17:26 +02:00
MadWasp79
39e6132d83 Merge branch 'master' into straight_to 2020-02-11 13:02:27 +02:00
MadWasp79
b39612f985 Merge branch 'master' into straight_to 2020-02-11 11:18:37 +02:00
Dmitry
4b2f0cf266 Added information about new release 3.6 2020-02-10 16:16:35 +02:00
Dima-1
4f33c0d70e Fix #7747 Add "Copy coordinates" into Share dialog. 2020-02-10 11:41:38 +02:00
veliymolfar
99a64eaa7b Merge remote-tracking branch 'origin/master' into exp_imp_profile_with_features 2020-02-10 10:31:38 +02:00
sonora
fd69895d89 Remove obsolete string 2020-02-09 15:53:01 +01:00
Nazar-Kutz
5be515409c small fixes p.2 2020-02-06 16:19:38 +02:00
Nazar-Kutz
ab97a06798 small fixes 2020-02-06 16:13:30 +02:00
Nazar-Kutz
3b4174cc9f remove incorrect string translations 2020-02-06 16:07:17 +02:00
Nazar-Kutz
0d14e5dc57 Fix Configure POI Search categories 2020-02-06 15:47:50 +02:00
Nazar-Kutz
0c14de0e23 Fix #8034 (Option: for keep screen on or not) 2020-02-06 10:24:35 +02:00
veliymolfar
5f4285fe26 Merge remote-tracking branch 'origin/master' into exp_imp_profile_with_features 2020-02-05 17:12:59 +02:00
xmd5a
75594c5168 Fix https://github.com/osmandapp/Osmand/issues/8336 (change organic phrase) 2020-02-05 16:24:55 +03:00
max-klaus
20a8c3be65
Merge pull request #8385 from osmandapp/prefs_screens_improvements
Plugin preferences improvements
2020-02-04 21:11:36 +03:00
Dmitry
9c452924a8 Navbar color: black in light and dark 2020-02-04 18:37:06 +02:00
Dmitry
d3462c5f6d Text colors for Navigation bar 2020-02-04 17:22:25 +02:00
veliymolfar
531abc8e98 Merge remote-tracking branch 'origin/master' into exp_imp_profile_with_features 2020-02-04 12:02:35 +02:00
Vitaliy
d463f715f5 Merge branch 'master' of https://github.com/osmandapp/Osmand into prefs_screens_improvements
# Conflicts:
#	OsmAnd/res/values/strings.xml
2020-02-04 09:26:21 +02:00
Vitaliy
871717daac Add pref warning for system accessibility pref 2020-02-03 17:36:50 +02:00
Victor Shcherb
1249987391 Rename translation 2020-02-03 15:36:25 +01:00