Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
61115 commits 42 branches 1 tag 605 MiB
Commit graph

2981 commits

Author SHA1 Message Date
Dima-1
42bb573b11 Fix tablet layout paddings in appBar, fix bearing icon background. 2020-04-06 17:12:08 +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
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
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
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
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