diff --git a/OsmAnd/project.properties b/OsmAnd/project.properties index d0ba12ed4b..a19f136385 100644 --- a/OsmAnd/project.properties +++ b/OsmAnd/project.properties @@ -13,3 +13,4 @@ split.density=false target=android-21 dex.force.jumbo=true android.library.reference.1=../appcompat +android.library.reference.2=../eclipse-compile/fab diff --git a/OsmAnd/res/drawable-hdpi/warnings_limit.png b/OsmAnd/res/drawable-hdpi/warnings_limit.png new file mode 100755 index 0000000000..c8db2c42f6 Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/warnings_limit.png differ diff --git a/OsmAnd/res/drawable-mdpi/warnings_limit.png b/OsmAnd/res/drawable-mdpi/warnings_limit.png new file mode 100755 index 0000000000..b1a14e37ce Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/warnings_limit.png differ diff --git a/OsmAnd/res/drawable-xhdpi/warnings_limit.png b/OsmAnd/res/drawable-xhdpi/warnings_limit.png new file mode 100755 index 0000000000..981b445cb5 Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/warnings_limit.png differ diff --git a/OsmAnd/res/drawable-xxhdpi/warnings_limit.png b/OsmAnd/res/drawable-xxhdpi/warnings_limit.png new file mode 100755 index 0000000000..75e8858934 Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/warnings_limit.png differ diff --git a/OsmAnd/res/drawable/btn_circle.xml b/OsmAnd/res/drawable/btn_circle.xml new file mode 100644 index 0000000000..2090295c75 --- /dev/null +++ b/OsmAnd/res/drawable/btn_circle.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/OsmAnd/res/drawable/btn_circle_blue.xml b/OsmAnd/res/drawable/btn_circle_blue.xml new file mode 100644 index 0000000000..34a59dea72 --- /dev/null +++ b/OsmAnd/res/drawable/btn_circle_blue.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/OsmAnd/res/drawable/btn_circle_trans.xml b/OsmAnd/res/drawable/btn_circle_trans.xml new file mode 100644 index 0000000000..e7018e90b8 --- /dev/null +++ b/OsmAnd/res/drawable/btn_circle_trans.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/OsmAnd/res/drawable/btn_circle_transparent.xml b/OsmAnd/res/drawable/btn_circle_transparent.xml new file mode 100644 index 0000000000..7fccfc9f24 --- /dev/null +++ b/OsmAnd/res/drawable/btn_circle_transparent.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/OsmAnd/res/drawable/btn_flat.xml b/OsmAnd/res/drawable/btn_flat.xml new file mode 100644 index 0000000000..01dad73153 --- /dev/null +++ b/OsmAnd/res/drawable/btn_flat.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/OsmAnd/res/drawable/btn_flat_night.xml b/OsmAnd/res/drawable/btn_flat_night.xml new file mode 100644 index 0000000000..bbf270e69b --- /dev/null +++ b/OsmAnd/res/drawable/btn_flat_night.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/OsmAnd/res/drawable/btn_flat_trans.xml b/OsmAnd/res/drawable/btn_flat_trans.xml new file mode 100644 index 0000000000..331c6c033c --- /dev/null +++ b/OsmAnd/res/drawable/btn_flat_trans.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/OsmAnd/res/drawable/btn_inset_circle.xml b/OsmAnd/res/drawable/btn_inset_circle.xml new file mode 100644 index 0000000000..722a79f782 --- /dev/null +++ b/OsmAnd/res/drawable/btn_inset_circle.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/OsmAnd/res/drawable/btn_inset_circle_night.xml b/OsmAnd/res/drawable/btn_inset_circle_night.xml new file mode 100644 index 0000000000..dcc355f6e9 --- /dev/null +++ b/OsmAnd/res/drawable/btn_inset_circle_night.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/OsmAnd/res/drawable/btn_inset_circle_trans.xml b/OsmAnd/res/drawable/btn_inset_circle_trans.xml new file mode 100644 index 0000000000..c5456783aa --- /dev/null +++ b/OsmAnd/res/drawable/btn_inset_circle_trans.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/OsmAnd/res/drawable/btn_left_round.xml b/OsmAnd/res/drawable/btn_left_round.xml new file mode 100644 index 0000000000..be66a3477f --- /dev/null +++ b/OsmAnd/res/drawable/btn_left_round.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/OsmAnd/res/drawable/btn_left_round_night.xml b/OsmAnd/res/drawable/btn_left_round_night.xml new file mode 100644 index 0000000000..7315a889fb --- /dev/null +++ b/OsmAnd/res/drawable/btn_left_round_night.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/OsmAnd/res/drawable/btn_left_round_trans.xml b/OsmAnd/res/drawable/btn_left_round_trans.xml new file mode 100644 index 0000000000..9bdcdad3a8 --- /dev/null +++ b/OsmAnd/res/drawable/btn_left_round_trans.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/OsmAnd/res/drawable/btn_right_round.xml b/OsmAnd/res/drawable/btn_right_round.xml new file mode 100644 index 0000000000..843840c380 --- /dev/null +++ b/OsmAnd/res/drawable/btn_right_round.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/OsmAnd/res/drawable/btn_right_round_night.xml b/OsmAnd/res/drawable/btn_right_round_night.xml new file mode 100644 index 0000000000..5ad2fbe093 --- /dev/null +++ b/OsmAnd/res/drawable/btn_right_round_night.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/OsmAnd/res/drawable/btn_right_round_trans.xml b/OsmAnd/res/drawable/btn_right_round_trans.xml new file mode 100644 index 0000000000..4ecd18b23c --- /dev/null +++ b/OsmAnd/res/drawable/btn_right_round_trans.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/OsmAnd/res/drawable/btn_round.xml b/OsmAnd/res/drawable/btn_round.xml new file mode 100644 index 0000000000..6b2158c0b7 --- /dev/null +++ b/OsmAnd/res/drawable/btn_round.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/OsmAnd/res/drawable/btn_round_night.xml b/OsmAnd/res/drawable/btn_round_night.xml new file mode 100644 index 0000000000..c8fbd85119 --- /dev/null +++ b/OsmAnd/res/drawable/btn_round_night.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/OsmAnd/res/drawable/btn_round_trans.xml b/OsmAnd/res/drawable/btn_round_trans.xml new file mode 100644 index 0000000000..24682aaa11 --- /dev/null +++ b/OsmAnd/res/drawable/btn_round_trans.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/OsmAnd/res/drawable/roundedbutton.xml b/OsmAnd/res/drawable/roundedbutton.xml deleted file mode 100644 index 326556d040..0000000000 --- a/OsmAnd/res/drawable/roundedbutton.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/OsmAnd/res/layout-land/dashboard_over_map.xml b/OsmAnd/res/layout-land/dashboard_over_map.xml index 22329472c6..70ebe50980 100644 --- a/OsmAnd/res/layout-land/dashboard_over_map.xml +++ b/OsmAnd/res/layout-land/dashboard_over_map.xml @@ -48,7 +48,7 @@ diff --git a/OsmAnd/res/layout/main.xml b/OsmAnd/res/layout/main.xml index 73eaf225bb..e9838a62bc 100644 --- a/OsmAnd/res/layout/main.xml +++ b/OsmAnd/res/layout/main.xml @@ -1,64 +1,60 @@ - + - + - + - + - + - + - + + + + + - - - - + \ No newline at end of file diff --git a/OsmAnd/res/layout/map_hud_bottom.xml b/OsmAnd/res/layout/map_hud_bottom.xml new file mode 100644 index 0000000000..9d9ef0f888 --- /dev/null +++ b/OsmAnd/res/layout/map_hud_bottom.xml @@ -0,0 +1,253 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/OsmAnd/res/layout/map_hud_top.xml b/OsmAnd/res/layout/map_hud_top.xml new file mode 100644 index 0000000000..871e03c95a --- /dev/null +++ b/OsmAnd/res/layout/map_hud_top.xml @@ -0,0 +1,239 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/OsmAnd/res/layout/map_hud_widget.xml b/OsmAnd/res/layout/map_hud_widget.xml new file mode 100644 index 0000000000..03aba49dd5 --- /dev/null +++ b/OsmAnd/res/layout/map_hud_widget.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/OsmAnd/res/layout/map_view_on_dashboard.xml b/OsmAnd/res/layout/map_view_on_dashboard.xml index bf041c1e3e..53a1fed990 100644 --- a/OsmAnd/res/layout/map_view_on_dashboard.xml +++ b/OsmAnd/res/layout/map_view_on_dashboard.xml @@ -4,20 +4,21 @@ android:layout_height="fill_parent" > + android:background="@drawable/btn_inset_circle" + android:src="@drawable/ic_action_remove_light" />