Commit graph

69050 commits

Author SHA1 Message Date
androiddevkotlin
80adbc698a Fix conflicts 2021-03-06 22:46:35 +02:00
androiddevkotlin
802d063142 Merge branch 'master' into fix-alignment
# Conflicts:
#	OsmAnd/src/net/osmand/plus/widgets/FlowLayout.java
2021-03-06 22:42:38 +02:00
androiddevkotlin
acf8571ab3 Fix icon alignment in landscape orientation 2021-03-06 22:40:27 +02:00
Vitaliy
fa38d19aff
Merge pull request #10993 from osmandapp/fix-alignment
Fix element's alignment: icons and colors
2021-03-06 21:21:33 +02:00
Vitaliy
7cca699fdb Small fix for flow layout spacing 2021-03-06 21:20:36 +02:00
Vitaliy
0cd3428437 Merge branch 'master' into fix-alignment 2021-03-06 20:46:12 +02:00
Skalii
9c9acaed4d fix npe after rotate screen 2021-03-06 18:52:13 +02:00
Skalii
7a5ffdeeb6 fix using new icon refresh 2021-03-06 17:56:10 +02:00
Skalii
9e12512d51 Merge branch 'master' into osmand_live
# Conflicts:
#	OsmAnd/res/values/strings.xml
#	OsmAnd/src/net/osmand/plus/settings/bottomsheets/BooleanPreferenceBottomSheet.java
2021-03-06 17:52:26 +02:00
Skalii
ab65c9b1c9 all changes in redesign OsmAnd Live 2021-03-06 17:46:20 +02:00
Vitaliy
69318daf79
Merge pull request #11068 from osmandapp/FixOnlineEngineTypes
Provide description of stateless OnlineRoutingEngine objects
2021-03-06 16:00:23 +02:00
Vitaliy
c83445eabb
Merge pull request #11070 from osmandapp/profile_fix_npe
Fix NPE
2021-03-06 15:59:39 +02:00
Vitaliy
eeef038034 Merge branch 'master' into profile_fix_npe
# Conflicts:
#	OsmAnd/src/net/osmand/plus/settings/fragments/ProfileAppearanceFragment.java
2021-03-06 15:57:17 +02:00
Vitaliy
10ca9b94b1
Merge pull request #11077 from osmandapp/NPE-ProfileAppearanceFragment
NullPointExcepionFix ProfileAppearanceFragment
2021-03-06 15:47:07 +02:00
Vitaliy
09fbe4fb37 Small fix for custom color 2021-03-06 15:45:58 +02:00
androiddevkotlin
53e284d843 NullPointExcepionFix 2021-03-06 13:51:03 +02:00
vshcherb
1625a05a27
Merge pull request #11075 from osmandapp/Tminor
Add minor stop 10281
2021-03-06 13:34:28 +02:00
alex-osm
5c48c1026e
Merge pull request #11064 from osmandapp/billing_library_3
Billing library 3
2021-03-06 14:25:18 +03:00
max-klaus
136542f0dd Fix billing bugs 2021-03-06 14:22:22 +03:00
cepprice
908033e0a9 Finish UI of Track appearance context menu 2021-03-06 15:03:26 +05:00
Kseniia
5520f7fb75 Add minor stop 10281 2021-03-06 09:52:51 +02:00
nazar-kutz
37d8a9eee8 small refactoring 2021-03-06 02:12:54 +02:00
nazar-kutz
37d795cf7b improve the readability of the algorithm for checking that one region is inside another 2021-03-06 01:55:08 +02:00
androiddevkotlin
56af6bf622 Fix conflicts 2021-03-06 01:35:12 +02:00
androiddevkotlin
1b38cc0abe Merge branch 'master' into fix-alignment
# Conflicts:
#	OsmAnd/src/net/osmand/plus/settings/fragments/ProfileAppearanceFragment.java
#	OsmAnd/src/net/osmand/plus/track/ColorsCard.java
2021-03-06 01:14:57 +02:00
androiddevkotlin
d4c6e92a34 Refactor, ability to use additional spacing with auto = true 2021-03-06 00:56:37 +02:00
nazar-kutz
6affa0c432 Fix #11023 (draft) 2021-03-05 22:52:15 +02:00
nazar-kutz
a6b0b08ece Fix track width card 2021-03-05 20:13:13 +02:00
nazar-kutz
6883bf722b Track Appearance: adjust track on map when header clicked 2021-03-05 20:10:40 +02:00
nazar-kutz
df95dbec7f Show grey circle only around a color that does not contrast well with the background 2021-03-05 20:08:26 +02:00
nazar-kutz
e1d1edee43 remove zeros from time formatting 2021-03-05 20:05:05 +02:00
nazar-kutz
1c5d01f391 Split interval: UI fixes 2021-03-05 20:03:04 +02:00
vshcherb
d230a323ce
Merge pull request #11043 from osmandapp/Tstop
Add minor stop 10281
2021-03-05 19:18:31 +02:00
cepprice
06077bd353 Fix NPE 2021-03-05 22:13:14 +05:00
cepprice
8c029663b7 Fix typo 2021-03-05 21:30:55 +05:00
cepprice
6efb6f27b3 Small refactoring 2021-03-05 21:27:58 +05:00
cepprice
82f2138c07 Small renaming 2021-03-05 20:48:00 +05:00
cepprice
83bd81eea7 Remove Osmand code from class 2021-03-05 20:27:49 +05:00
nazar-kutz
d47a19eff8 Provide description of stateless objects in the constructor of OnlineRoutingEngine 2021-03-05 14:54:01 +02:00
alex-osm
42e4b17054
Merge pull request #11035 from osmandapp/AddVisibleGpxToHistory
Add visible GPX to history
2021-03-05 14:41:29 +03:00
nazar-kutz
64b3fc351f Merge branch 'master' into AddVisibleGpxToHistory
# Conflicts:
#	OsmAnd/src/net/osmand/plus/track/TrackMenuFragment.java
2021-03-05 12:45:12 +02:00
nazar-kutz
0d39173b8b add ObjectType.GPX_TRACK 2021-03-05 12:38:38 +02:00
cepprice
9da63447c1 Small fix 2021-03-05 10:17:35 +05:00
cepprice
4ac46d74e8 Fix NPE 2021-03-04 23:51:08 +05:00
cepprice
6bf313c32e Change data flow due to deprecated method 2021-03-04 21:06:22 +05:00
Vitaliy
203734d7d3
Merge pull request #11060 from osmandapp/coordinate-widget
Coordinate widget
2021-03-04 15:08:46 +02:00
androiddevkotlin
08cd0db152 Minor fix 2021-03-04 15:07:31 +02:00
Kseniia
9a44cd70e6 Add minor stop 10281 2021-03-04 14:15:33 +02:00
Kseniia
368b2ff8f9 Add minor stop 10281 2021-03-04 12:55:32 +02:00
androiddevkotlin
cf8346187f Review 2021-03-04 10:49:46 +02:00