Commit graph

3019 commits

Author SHA1 Message Date
Nazar-Kutz
32ec37db0b Replace all SeekBars with Material Components Sliders 2020-04-21 16:16:27 +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
Dima-1
5f692fa00d Refactor fix dialogs theme, remove unnecessary dpToPx 2020-04-16 17:28:40 +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
max-klaus
0ae7265b27
Merge pull request #8799 from osmandapp/FinishPoiCategories
Finish POI Categories
2020-04-16 15:56:27 +03:00
Dima-1
e1bcbd208c Merge branch 'master' into select_gpx_track
# Conflicts:
#	OsmAnd/src/net/osmand/plus/helpers/GpxUiHelper.java
2020-04-15 18:44:27 +03:00
Dima-1
1e6c829bdf My places redesign 2020-04-15 12:29:17 +03:00
Nazar-Kutz
a3ce80fbe0 Finish POI Categories 2020-04-15 12:18:31 +03:00
Dima-1
0f869b81be Fix #8764 import shape, fix UI 2020-04-14 15:01:18 +03:00
Nazar-Kutz
989417ffab Wikipedia Poi Fixes (After review) 2020-04-14 09:58:58 +03:00
Dima-1
e1e3f17667 Add GPX waypoint action" Bottom Sheet 2020-04-10 18:51:39 +03:00
veliymolfar
cab97f1d38 Merge remote-tracking branch 'origin/master' into configure_menu_items 2020-04-10 13:52:04 +03:00
Vitaliy
887fca9825
Merge pull request #8775 from osmandapp/Fix_profile_appearance_scroll
Fix base profile name scroll appearance
2020-04-09 19:36:02 +03:00
Dima-1
bdaadda18d Fix base profile name scroll appearance 2020-04-09 19:31:49 +03:00
veliymolfar
836e5ade20 context actions customization 2020-04-09 15:59:11 +03:00
veliymolfar
ff43a62daa Merge remote-tracking branch 'origin/master' into configure_menu_items 2020-04-09 15:44:33 +03:00
Vitaliy
07032ca760
Merge pull request #8771 from osmandapp/export_import_fix_ui
Export import fix ui
2020-04-09 14:36:59 +03:00
Dima-1
1dd6fc22f3 Fix #8512 Bottom sheet dialogs should support multiline headings 2020-04-09 14:11:31 +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
veliymolfar
b8c776b885 ui fixes 2020-04-08 16:57:47 +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