Commit graph

4489 commits

Author SHA1 Message Date
Nazar-Kutz
779a09e312 Back Arrow fix (RTL) 2020-04-29 12:21:12 +03:00
max-klaus
4d498f4e10
Merge branch 'master' into create_custom_poi 2020-04-28 18:14:41 +03:00
Dima-1
ec20d7f4ae My places item height 60dp 2020-04-28 11:55:30 +03:00
Nazar-Kutz
f675b8d640 Fix RTL step 2 2020-04-28 10:52:14 +03:00
max-klaus
8e4a99a82a
Merge pull request #8830 from osmandapp/Discount_badge
Discount badge
2020-04-27 18:44:13 +03:00
veliymolfar
602670fd28 Merge remote-tracking branch 'origin/master' into configure_menu_items_fix 2020-04-27 13:45:53 +03:00
vshcherb
eccfbd1fe9
Delete sherpafy.xml 2020-04-24 13:47:38 +02:00
veliymolfar
3c0bd48945 ui fixes 2020-04-24 14:33:06 +03:00
Vitaliy
5223b1c1b3 Add description for download item 2020-04-23 19:28:48 +03:00
veliymolfar
48d76897cf Merge remote-tracking branch 'origin/master' into create_custom_poi 2020-04-23 13:20:50 +03:00
vshcherb
549933f0b6
Merge pull request #8831 from osmandapp/custom_downloads_improvements
Custom downloads improvements first part
2020-04-22 22:18:52 +02:00
Vitaliy
cf84c56243 Add view pager for images 2020-04-22 23:11:18 +03:00
Dima-1
3d731717c4 Merge branch 'master' into Discount_badge
# Conflicts:
#	OsmAnd/res/values/strings.xml
2020-04-22 22:08:55 +03:00
Dima-1
c66d5601e9 Discount badge on Choose plan 2020-04-22 22:04:00 +03:00
veliymolfar
ab599be3e1 Merge remote-tracking branch 'origin/master' into create_custom_poi
# Conflicts:
#	OsmAnd/res/values/strings.xml
2020-04-22 13:30:28 +03:00
max-klaus
0c3bc8aa87
Merge pull request #8822 from osmandapp/PaintSeekbar
Replace all SeekBars with Material Components Sliders
2020-04-22 12:39:59 +03:00
Nazar-Kutz
32ec37db0b Replace all SeekBars with Material Components Sliders 2020-04-21 16:16:27 +03:00
veliymolfar
3daa7a5406 Merge remote-tracking branch 'origin/master' into create_custom_poi 2020-04-21 11:37:19 +03:00
Vitaliy
2967b8f140 Merge branch 'master' of https://github.com/osmandapp/Osmand into custom_downloads
# Conflicts:
#	OsmAnd/res/values/strings.xml
#	OsmAnd/src/net/osmand/plus/settings/ConfigureMenuItemsFragment.java
2020-04-20 17:12:05 +03:00
Hardy
71c4c08fb1
some string typos 2020-04-18 19:26:22 +02:00
aceman444
f3aa497090
Fix typos in strings.xml. 2020-04-18 13:33:34 +02:00
veliymolfar
e317a76bf4 Merge remote-tracking branch 'origin/master' into create_custom_poi
# Conflicts:
#	OsmAnd/res/values/strings.xml
2020-04-17 17:06:44 +03:00
veliymolfar
84e743ec84 initial commit QuickSearchSubCategoriesFragment 2020-04-16 19:07:40 +03:00
Vitaliy
4ca1925ac5 Merge branch 'master' of https://github.com/osmandapp/Osmand into custom_downloads
# Conflicts:
#	OsmAnd/res/values/strings.xml
2020-04-16 18:10:19 +03:00
Dima-1
4d5dcc2246 Merge branch 'master' into Fix_2_edit_fav_icons
# Conflicts:
#	OsmAnd/res/values/strings.xml
2020-04-16 17:36:02 +03:00
Vitaliy
309da9c907 Merge branch 'master' of https://github.com/osmandapp/Osmand into Wiki
# Conflicts:
#	OsmAnd/res/values-it/strings.xml
#	OsmAnd/res/values-zh-rTW/strings.xml
2020-04-16 16:18:09 +03:00
Dima-1
a50c15a11c Fix transparency in the favorites.gpx 2020-04-16 13:58:35 +03:00
veliymolfar
7aa3948188 refactor 2020-04-15 17:10:54 +03:00
Dima-1
1e6c829bdf My places redesign 2020-04-15 12:29:17 +03:00
Vitaliy
44a4b93df1 Add downloads to ui initial commit 2020-04-14 16:23:09 +03:00
Nazar-Kutz
989417ffab Wikipedia Poi Fixes (After review) 2020-04-14 09:58:58 +03:00
veliymolfar
0f8c8d8905 reformat 2020-04-13 16:24:44 +03:00
veliymolfar
cab97f1d38 Merge remote-tracking branch 'origin/master' into configure_menu_items 2020-04-10 13:52:04 +03:00
veliymolfar
9655500ea9 slope/hillshade fixes 2020-04-10 12:54:57 +03:00
veliymolfar
28df8d4f77 Merge remote-tracking branch 'origin/master' into configure_menu_items
# Conflicts:
#	OsmAnd/src/net/osmand/plus/ContextMenuItem.java
2020-04-08 17:10:49 +03:00
vshcherb
d2b1f577c0
Merge branch 'master' into WikipediaDashboard 2020-04-08 14:59:47 +02:00
veliymolfar
4a3bb2155a Merge remote-tracking branch 'origin/master' into configure_menu_items 2020-04-08 15:58:16 +03:00
vshcherb
38d1215a8f
Merge pull request #8756 from osmandapp/select_gpx_track
Select gpx track
2020-04-08 14:55:08 +02:00
Nazar-Kutz
3d3da9ee8e Wikipedia Poi (Fixes 1) 2020-04-08 12:15:20 +03:00
Dima-1
3fa6eb2bd8 Fix sizes. 2020-04-07 16:30:27 +03:00
Dima-1
c6e8c0a7e6 Fix review. 2020-04-07 16:06:44 +03:00
veliymolfar
971db3f666 apply to all dialog / work in progress 2020-04-07 14:47:51 +03:00
Dima-1
42bb573b11 Fix tablet layout paddings in appBar, fix bearing icon background. 2020-04-06 17:12:08 +03:00
veliymolfar
e21d00af35 Merge remote-tracking branch 'origin/master' into configure_menu_items
# Conflicts:
#	OsmAnd/res/values/strings.xml
#	OsmAnd/src/net/osmand/plus/ContextMenuAdapter.java
2020-04-06 10:54:25 +03:00
Dima-1
f0fc7e1ac4 Merge branch 'master' into select_gpx_track
# Conflicts:
#	OsmAnd/res/values/strings.xml
2020-04-03 20:15:39 +03:00
Dima-1
5d1262f8de Add GPX track select dialog 2020-04-03 20:12:53 +03:00
Vitaliy
16a52a0b5d Merge branch 'master' of https://github.com/osmandapp/Osmand into import_fixes
# Conflicts:
#	OsmAnd/res/values/strings.xml
2020-04-03 17:10:36 +03:00
Vitaliy
649f7e594b Add warnings to settings items 2020-04-03 17:07:41 +03:00
Vitaliy
5522e37b13
Merge pull request #8748 from osmandapp/Fix_1_edit_fav_icons
Fix 1 edit fav icons
2020-04-03 16:51:29 +03:00
Nazar-Kutz
ffb91e735e Show SnackBar when preference change 2020-04-03 15:38:46 +03:00
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