Commit graph

3225 commits

Author SHA1 Message Date
Dima-1
a2bdce610b Fix arrow icon direction, expanded list divider change background. 2020-05-12 15:48:30 +03:00
Nazar-Kutz
9f4d9e74d2 Fix #8626 2020-05-12 10:15:32 +03:00
max-klaus
2b051b8da8
Merge pull request #8914 from osmandapp/configure_menu_items_fix
Configure menu items fix
2020-05-10 15:37:12 +03:00
vshcherb
9739ab6603
Merge pull request #8921 from osmandapp/Fix_discount_badge
Fix line spacing
2020-05-08 15:58:27 +02:00
Dmitry
bdabeb2169 Replace ~100 icons with vector copies 2020-05-08 16:26:07 +03:00
Dima-1
f10f771f01 Fix line spacing 2020-05-08 14:02:46 +03:00
Dima-1
6d2fadb952 Fix ic_action_favorite icon, fix myLocation icon size 2020-05-07 23:42:19 +03:00
Dmitry
958dfa0250 Replace 50 icons with vector copies 2020-05-07 18:39:12 +03:00
veliymolfar
dd95b32136 Proper sizes for Tablet layout 2020-05-07 18:02:55 +03:00
Dmitry
c6f59d9d54 Replace duplicate icon 2020-05-07 14:35:07 +03:00
Nazar-Kutz
6539a35a20 Fix #8750 2020-05-07 13:57:07 +03:00
Dima-1
e4685ac04f Merge branch 'master' into Fix_my_places_edit_fav
# Conflicts:
#	OsmAnd/res/values-large/sizes.xml
#	OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java
2020-05-06 18:26:33 +03:00
veliymolfar
b96c227ec7 Merge remote-tracking branch 'origin/master' into configure_menu_items_fix
# Conflicts:
#	OsmAnd/res/values/strings.xml
#	OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
#	OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java
2020-05-06 15:01:54 +03:00
Dima-1
99ba27a81c Merge branch 'master' into check_icon_for_tablet
# Conflicts:
#	OsmAnd/res/layout/global_preference_toolbar.xml
#	OsmAnd/res/layout/global_preferences_toolbar_with_switch.xml
#	OsmAnd/res/layout/profile_preference_toolbar.xml
#	OsmAnd/res/layout/profile_preference_toolbar_with_switch.xml
2020-05-06 13:31:08 +03:00
vshcherb
f7e7b388cc
Merge pull request #8894 from osmandapp/fix_8774
Fix_8774
2020-05-06 11:39:09 +02:00
veliymolfar
99fafc9a9d Merge remote-tracking branch 'origin/master' into configure_menu_items_fix
# Conflicts:
#	OsmAnd/res/values-hu/strings.xml
#	OsmAnd/res/values-sc/strings.xml
#	OsmAnd/res/values-uk/strings.xml
2020-05-06 10:56:03 +03:00
Dima-1
7e550e683c Merge branch 'master' into Fix_my_places_edit_fav 2020-05-05 16:42:40 +03:00
Dima-1
68637e7bda Fix Dialog to Edit FAV and GPX icons. 2020-05-05 16:41:03 +03:00
vshcherb
8a5392110e
Merge pull request #8871 from osmandapp/Fix_8861
Fix #8861 [Samsung Galaxy Tab S3] Texts are cut off
2020-05-05 15:19:29 +02:00
vshcherb
9262900335
Merge pull request #8848 from osmandapp/Rtl2
Fix RTL step 2
2020-05-05 15:18:00 +02:00
Vitaliy
9fa44b199c Fix #8774 2020-05-05 16:02:05 +03:00
Dima-1
661c33f06f Check how to properly set icon sizes for large density 2020-05-04 15:58:57 +03:00
veliymolfar
9066a33335 Merge remote-tracking branch 'origin/master' into configure_menu_items_fix
# Conflicts:
#	OsmAnd/res/values/strings.xml
2020-05-04 10:09:54 +03:00
Nazar-Kutz
3e21388e8e small fixes 2020-05-01 11:17:42 +03:00
Dima-1
3543cf9f1f Remove non used method 2020-04-30 20:17:30 +03:00
Dima-1
a5c802f632 Fix #8861 [Samsung Galaxy Tab S3] Texts are cut off 2020-04-30 18:58:42 +03:00
Nazar-Kutz
d7d08810b3 Fix "Route Preparation > Graph doesn't show numbers in slider" 2020-04-30 10:39:35 +03:00
Nazar-Kutz
779a09e312 Back Arrow fix (RTL) 2020-04-29 12:21:12 +03:00
Nazar-Kutz
8b92ec58a3 Colors refactoring 2020-04-29 09:56:28 +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
1a9fc81220 Fix content Insets (RTL) 2020-04-28 10:54:54 +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
Dima-1
dd6c7c07e0 Refactor 2020-04-24 16:07:42 +03:00
veliymolfar
3c0bd48945 ui fixes 2020-04-24 14:33:06 +03:00
Vitaliy
a16b85850b Add download progress to description screen 2020-04-23 19:45:16 +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
veliymolfar
76d56578e4 selected icon colors, refactor list item with icon 2020-04-23 12:15:16 +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
Vitaliy
c06960a4be Add basic scroll for images 2020-04-22 21:46:41 +03:00
Vitaliy
f750a7732f Download description in progress 2020-04-22 21:39:44 +03:00
veliymolfar
c35722aa3a ui changes & search implementation 2020-04-22 16:51:13 +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
ccb65e526d small fixes 2020-04-22 08:13:23 +03:00
Victor Shcherb
b0de707196 Don't generate raster icons for vector 2020-04-21 18:32:03 +02:00
Victor Shcherb
9830312cab Don't generate raster icons for vector 2020-04-21 18:28:58 +02:00
Nazar-Kutz
32ec37db0b Replace all SeekBars with Material Components Sliders 2020-04-21 16:16:27 +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
Vitaliy
38d84faa95 Custom downloads UI initial commit 2020-04-17 19:12:14 +03: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
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
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
veliymolfar
c66558654c Merge branches 'import_export_fixes' and 'master' of https://github.com/osmandapp/Osmand into import_export_fixes
 Conflicts:
	OsmAnd/res/values/strings.xml
	OsmAnd/src/net/osmand/plus/helpers/ImportHelper.java
	OsmAnd/src/net/osmand/plus/settings/ExportImportSettingsAdapter.java
	OsmAnd/src/net/osmand/plus/settings/ImportDuplicatesFragment.java
2020-03-13 16:32:18 +02:00
Dima-1
9a0a518948 Add buttons 2020-03-12 19:08:19 +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
Dima-1
b636e4e4ae Add select icon,select color,select shape UI 2020-03-11 18:53:15 +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
6a0d25beba Refactor -> use different resources instead of rotate image 2020-03-11 12:45:11 +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
Dima-1
dc002a9292 Fix round button 2020-03-10 23:50:23 +02:00
Dima-1
fb8bbe0fd1 Add parsing poi_categories.json 2020-03-10 19:19:26 +02: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
Dima-1
0f50345dff Add create group 2020-03-06 19:11:52 +02:00
veliymolfar
65d9f5f910 terrain ui work in progress 2020-03-06 18:51:04 +02:00
Dima-1
bb4848b3ab Add androidX 2020-03-06 13:01:53 +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
Dima-1
9954b345f8 Add edit category 2020-03-05 19:54:42 +02:00
veliymolfar
6e70a32756 androidx refactor 2020-03-05 13:46:36 +02:00
veliymolfar
82264be1d7 Merge branch 'master' of https://github.com/osmandapp/Osmand into slope_hillshade_ui 2020-03-05 12:05:37 +02:00
Dima-1
ef2cff6843 Separate old ui to add and new ui to edit favorites 2020-03-05 11:31:19 +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
veliymolfar
76fef0ce2c ui corrections 2020-03-05 10:56:36 +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
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
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
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
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
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
max-klaus
5f0a5c9400
Merge pull request #8577 from osmandapp/RefreshTextFieldBoxLib
Refresh TextFieldBoxes library
2020-02-28 19:39:30 +03: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
veliymolfar
9a6c9d111d complete settings screen 2020-02-28 15:21:18 +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
Nazar-Kutz
0dc6c36b99 Refresh TextFieldBoxes library 2020-02-27 16:04:18 +02:00
veliymolfar
beab9512b9 fix import list header on lower versions 2020-02-27 14:26:19 +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
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
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
edbba11ed7 refactor, fix map screen between fragments 2020-02-24 19:12:14 +02:00
Nazar
defcc284c3 RTL (fix layouts) 2020-02-24 18:37:15 +03:00
max-klaus
07671e16d9
Merge pull request #8547 from osmandapp/FixRTL
RTL (fix layouts)
2020-02-24 18:36:48 +03:00
veliymolfar
ff570d4b81 collapsing toolbar 2020-02-24 16:34:05 +02:00
Nazar
0e2ed4ee74 RTL (fix layouts) 2020-02-24 16:17:23 +02:00
max-klaus
4e5e33fd64
Merge pull request #8537 from osmandapp/FixRTL
RTL -> Fix "OsmAnd Live"
2020-02-22 17:05:32 +03:00
Nazar-Kutz
16a9c1234a Fix "OsmAnd Live" 2020-02-22 15:52:50 +02:00
veliymolfar
a28d9f84c4 expand check_box clickable area 2020-02-21 18:51:12 +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
Nazar
19a0ad7f27 Merge branch 'r3.6' 2020-02-21 15:08:44 +02:00
Nazar
0b5260c1dc Merge branch 'r3.6' 2020-02-21 14:01:33 +02:00
max-klaus
bae16acba2
Merge pull request #8528 from osmandapp/FixRTL
RTL (main fixes)
2020-02-21 14:04:59 +03:00
Nazar
2d2ef8b987 RTL (main fixes) 2020-02-21 11:46:22 +02:00
Nazar
ae2cae638b Fix text color Measurement Tool -> "show on map after saving" 2020-02-21 11:07:55 +02:00
veliymolfar
1af5cb9eaf Merge remote-tracking branch 'origin/master' into import_screen 2020-02-20 10:25:45 +02:00
Nazar
816986be7a Fix text color of purchase dialog 2020-02-19 14:52:00 +02:00
Nazar
32b4623d16 Fix text color of list items from "Builds" screen 2020-02-19 13:40:32 +02:00
Nazar
2744ca8927 Fix text color / Colors refactoring 2020-02-19 13:20:46 +02:00
veliymolfar
660a09f269 refactor 2020-02-18 17:24:43 +02:00
vshcherb
13d47b2ed5
Merge pull request #8495 from osmandapp/straight_to
settings cleaning
2020-02-18 16:19:39 +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