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 |
|
veliymolfar
|
aece06b3da
|
three state checkbox
|
2020-02-18 16:57:12 +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 |
|
Nazar
|
73d3b77233
|
Small fixes
|
2020-02-18 13:27:43 +02:00 |
|
Nazar
|
74f0220514
|
Fix #6190 (RTL)
|
2020-02-18 13:20:08 +02:00 |
|
veliymolfar
|
6b93e03a99
|
copy of copy profiles, action, filters
|
2020-02-18 13:10:04 +02:00 |
|
veliymolfar
|
a19e6a3576
|
import custom profiles, ui fixes
|
2020-02-17 19:11:22 +02:00 |
|
veliymolfar
|
c7f2de7f22
|
import ui, duplicate quick actions, files, small fixes
|
2020-02-14 19:05:14 +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 |
|
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 |
|
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
|
a4d31c18d5
|
complex button / import layouts
|
2020-02-12 18:54:25 +02:00 |
|
Vitaliy
|
c01c979102
|
Add ability to disable plugin inside install dialog and fix UI bugs
|
2020-02-12 17:47:23 +02:00 |
|
veliymolfar
|
4d57312c47
|
import screen initial commit
|
2020-02-11 18:51:29 +02:00 |
|
Nazar
|
101589e853
|
Import Routing Profiles Fixes
|
2020-02-10 13:46:57 +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
|
2231923bca
|
remove obsolete string
|
2020-02-09 15:51:09 +01:00 |
|
veliymolfar
|
ab77ea143c
|
wip
|
2020-02-06 16:33:56 +02:00 |
|
Nazar-Kutz
|
ab97a06798
|
small fixes
|
2020-02-06 16:13:30 +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 |
|