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

After code review fixes 1

Browse source
This commit is contained in:
nazar-kutz 2021-03-22 12:37:13 +02:00
parent 84266e5719
commit 5ae37a101c
2 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd/res/layout/route_line_color_card.xml
View file

@ -93,8 +93,6 @@
android:id="@+id/colors_card_container" android:id="@+id/colors_card_container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingRight="@dimen/content_padding"
android:paddingLeft="@dimen/content_padding"
android:paddingBottom="@dimen/content_padding_small"/> android:paddingBottom="@dimen/content_padding_small"/>
</LinearLayout> </LinearLayout>

5
OsmAnd/src/net/osmand/plus/settings/fragments/ProfileAppearanceFragment.java
View file

@ -242,8 +242,6 @@ public class ProfileAppearanceFragment extends BaseSettingsFragment implements O
findPreference(SELECT_ICON).setIconSpaceReserved(false); findPreference(SELECT_ICON).setIconSpaceReserved(false);
findPreference(SELECT_LOCATION_ICON).setIconSpaceReserved(false); findPreference(SELECT_LOCATION_ICON).setIconSpaceReserved(false);
findPreference(SELECT_NAV_ICON).setIconSpaceReserved(false); findPreference(SELECT_NAV_ICON).setIconSpaceReserved(false);
findPreference(CUSTOMIZE_ROUTE_LINE).setIcon(
getIcon(R.drawable.ic_action_route_distance, getActiveColorRes()));
if (getSelectedAppMode().equals(ApplicationMode.DEFAULT) && !isNewProfile) { if (getSelectedAppMode().equals(ApplicationMode.DEFAULT) && !isNewProfile) {
findPreference(SELECT_ICON).setVisible(false); findPreference(SELECT_ICON).setVisible(false);
findPreference(ICON_ITEMS).setVisible(false); findPreference(ICON_ITEMS).setVisible(false);
@ -735,6 +733,7 @@ public class ProfileAppearanceFragment extends BaseSettingsFragment implements O
boolean isDefaultProfile = getSelectedAppMode().equals(ApplicationMode.DEFAULT); boolean isDefaultProfile = getSelectedAppMode().equals(ApplicationMode.DEFAULT);
boolean isPublicTransport = PUBLIC_TRANSPORT_KEY.equals(changedProfile.routingProfile); boolean isPublicTransport = PUBLIC_TRANSPORT_KEY.equals(changedProfile.routingProfile);
preference.setVisible(!isDefaultProfile && !isPublicTransport); preference.setVisible(!isDefaultProfile && !isPublicTransport);
preference.setIcon(getIcon(R.drawable.ic_action_route_distance, getActiveColorRes()));
} }
} }
@ -1087,7 +1086,7 @@ public class ProfileAppearanceFragment extends BaseSettingsFragment implements O
return false; return false;
if (routeService != that.routeService) return false; if (routeService != that.routeService) return false;
if (navigationIcon != that.navigationIcon) return false; if (navigationIcon != that.navigationIcon) return false;
if (routeLineDrawInfo != that.routeLineDrawInfo) return false; if (routeLineDrawInfo != null ? !routeLineDrawInfo.equals(that.routeLineDrawInfo) : that.routeLineDrawInfo != null) return false;
return locationIcon == that.locationIcon; return locationIcon == that.locationIcon;
} }