Commit graph

3000 commits

Author SHA1 Message Date
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
veliymolfar
065f281f92 initial rearrange menu items implementation 2020-04-02 20:23:48 +03:00
Dima-1
e2ee35da66 Fix context menu after screen rotation, fix description hide. 2020-04-02 15:22:34 +03:00
Vitaliy
50577f3f32 Remove nav drawer footer 2020-04-01 19:46:02 +03:00
veliymolfar
07cc37f791 wip 2020-04-01 17:00:15 +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
Nazar-Kutz
7b268cd9d9 Add Wikipedia POI separate screen and logic 2020-03-31 12:41:49 +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
vshcherb
d983309242
Merge pull request #8718 from osmandapp/fix_slope_hillshade_ui
Fix slope hillshade ui
2020-03-27 18:49:20 +01:00
Dima-1
d2f05625f6 Fix UI, fix count gpx points in category 2020-03-27 16:37:56 +02:00
veliymolfar
89339321b9 fix shadow / fix jump while switch on 2020-03-27 15:55:23 +02:00
Dima-1
4606435167 Fix get poi_category from resource, fix UI 2020-03-26 23:15:42 +02:00
veliymolfar
a8553f6ffe terrain ui fixes 2020-03-26 19:03:42 +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
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
197de55fc5 fix progress bar 2020-03-23 18:18:08 +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
76d5af9cc7 fix progress bar 2020-03-23 17:38:49 +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
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
Dima-1
8beac5824f Select icon group. Update icon in the text field 2020-03-20 14:42:36 +02:00
Nazar-Kutz
5d1bd56dd9 Change Settings UI -> Distance to recalculate 2020-03-19 15:20:18 +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
0ed85b1cb6 empty state fix 2020-03-16 18:08:32 +02:00
veliymolfar
960a178bc4 Merge branches 'master' and 'slope_hillshade_ui' of https://github.com/osmandapp/Osmand into slope_hillshade_ui 2020-03-16 17:54:32 +02:00
veliymolfar
bf4125be43 zoom visibility 2020-03-16 16:20:43 +02:00
Dima-1
663af18f67 Name icon color change 2020-03-15 23:12:28 +02:00
veliymolfar
14f7716ec1 slope legend image / download interface in TerrainFragment 2020-03-13 18:44:21 +02:00
veliymolfar
5580a4fcda drawer over fragment fix / fix list padding on import complete screen 2020-03-13 18:33:12 +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