Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix indents

Browse source
This commit is contained in:
Alexander Sytnyk 2017-11-01 11:27:39 +02:00
parent 381ccc0315
commit 3903ed14c0
3 changed files with 16 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
OsmAnd/res/drawable/passed_icon_dark.xml
View file

@ -1,14 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<inset
android:insetRight="@dimen/context_menu_first_line_top_margin">
<shape
xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval">
<solid android:color="@color/osmand_orange"/>
</shape>
</inset>
<shape
xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval">
<solid android:color="@color/osmand_orange"/>
</shape>
</item>
<item android:drawable="@drawable/ic_action_marker_passed"/>
</layer-list>

13
OsmAnd/res/drawable/passed_icon_light.xml
View file

@ -1,14 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<inset
android:insetRight="@dimen/context_menu_first_line_top_margin">
<shape
xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval">
<solid android:color="@color/map_widget_blue"/>
</shape>
</inset>
<shape
xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval">
<solid android:color="@color/map_widget_blue"/>
</shape>
</item>
<item android:drawable="@drawable/ic_action_marker_passed"/>
</layer-list>

12
OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java
View file

@ -720,7 +720,7 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents {
Drawable leftIcon = leftTitleButtonController.getLeftIcon();
if (leftIcon != null) {
leftTitleButton.setCompoundDrawablesWithIntrinsicBounds(leftIcon, null, null, null);
leftTitleButton.setCompoundDrawablePadding(dpToPx(4f));
leftTitleButton.setCompoundDrawablePadding(dpToPx(8f));
}
if (leftTitleButtonController.needRightText) {
@ -742,7 +742,7 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents {
Drawable leftIcon = rightTitleButtonController.getLeftIcon();
rightTitleButton.setCompoundDrawablesWithIntrinsicBounds(leftIcon, null, null, null);
rightTitleButton.setCompoundDrawablePadding(dpToPx(4f));
rightTitleButton.setCompoundDrawablePadding(dpToPx(8f));
} else {
rightTitleButton.setVisibility(View.GONE);
}
@ -755,7 +755,7 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents {
Drawable leftIcon = topRightTitleButtonController.getLeftIcon();
topRightTitleButton.setCompoundDrawablesWithIntrinsicBounds(leftIcon, null, null, null);
topRightTitleButton.setCompoundDrawablePadding(dpToPx(4f));
topRightTitleButton.setCompoundDrawablePadding(dpToPx(8f));
} else {
topRightTitleButton.setVisibility(View.GONE);
}
@ -769,7 +769,7 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents {
Drawable leftIcon = leftSubtitleButtonController.getLeftIcon();
if (leftIcon != null) {
leftSubtitleButton.setCompoundDrawablesWithIntrinsicBounds(leftIcon, null, null, null);
leftSubtitleButton.setCompoundDrawablePadding(dpToPx(4f));
leftSubtitleButton.setCompoundDrawablePadding(dpToPx(8f));
}
} else {
leftSubtitleButton.setVisibility(View.GONE);
@ -802,7 +802,7 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents {
Drawable leftIcon = leftDownloadButtonController.getLeftIcon();
if (leftIcon != null) {
leftDownloadButton.setCompoundDrawablesWithIntrinsicBounds(leftIcon, null, null, null);
leftDownloadButton.setCompoundDrawablePadding(dpToPx(4f));
leftDownloadButton.setCompoundDrawablePadding(dpToPx(8f));
}
} else {
leftDownloadButton.setVisibility(View.GONE);
@ -816,7 +816,7 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents {
Drawable leftIcon = rightDownloadButtonController.getLeftIcon();
rightDownloadButton.setCompoundDrawablesWithIntrinsicBounds(leftIcon, null, null, null);
rightDownloadButton.setCompoundDrawablePadding(dpToPx(4f));
rightDownloadButton.setCompoundDrawablePadding(dpToPx(8f));
} else {
rightDownloadButton.setVisibility(View.GONE);
}