Fix UI discrepencies
This commit is contained in:
parent
908b14da5b
commit
332aca3469
8 changed files with 24 additions and 4 deletions
Binary file not shown.
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 1.8 KiB |
BIN
OsmAnd/res/drawable-hdpi/widget_parking.png
Normal file
BIN
OsmAnd/res/drawable-hdpi/widget_parking.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 1.8 KiB |
Binary file not shown.
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 1.8 KiB |
BIN
OsmAnd/res/drawable-large/widget_parking.png
Normal file
BIN
OsmAnd/res/drawable-large/widget_parking.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 1.8 KiB |
|
@ -18,11 +18,16 @@
|
||||||
android:textAppearance="?android:attr/textAppearanceMedium"
|
android:textAppearance="?android:attr/textAppearanceMedium"
|
||||||
android:textColor="@color/color_black" android:layout_weight="1"/>
|
android:textColor="@color/color_black" android:layout_weight="1"/>
|
||||||
|
|
||||||
|
<LinearLayout android:layout_width="wrap_content"
|
||||||
|
android:layout_height="fill_parent">
|
||||||
|
|
||||||
<CheckBox
|
<CheckBox
|
||||||
android:id="@+id/check_item"
|
android:id="@+id/check_item"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
android:button="@drawable/ic_btn_wocheckbox"
|
||||||
android:focusable="false"
|
android:focusable="false"
|
||||||
android:button="@drawable/ic_btn_wocheckbox" />
|
android:gravity="center_vertical" />
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
|
@ -19,6 +19,7 @@
|
||||||
\n\t* better UI finish (icons)
|
\n\t* better UI finish (icons)
|
||||||
\n\t* lots of bug fixes
|
\n\t* lots of bug fixes
|
||||||
</string>
|
</string>
|
||||||
|
<string name="map_widget_monitoring_services">Monitoring services</string>
|
||||||
<string name="no_route">No route</string>
|
<string name="no_route">No route</string>
|
||||||
<string name="delete_target_point">Remove target point</string>
|
<string name="delete_target_point">Remove target point</string>
|
||||||
<string name="target_point">Target point %1$s</string>
|
<string name="target_point">Target point %1$s</string>
|
||||||
|
|
|
@ -104,7 +104,7 @@ public class ParkingPositionPlugin extends OsmandPlugin {
|
||||||
if (mapInfoLayer != null) {
|
if (mapInfoLayer != null) {
|
||||||
parkingPlaceControl = createParkingPlaceInfoControl(activity, mapInfoLayer.getPaintText(), mapInfoLayer.getPaintSubText());
|
parkingPlaceControl = createParkingPlaceInfoControl(activity, mapInfoLayer.getPaintText(), mapInfoLayer.getPaintSubText());
|
||||||
mapInfoLayer.getMapInfoControls().registerSideWidget(parkingPlaceControl,
|
mapInfoLayer.getMapInfoControls().registerSideWidget(parkingPlaceControl,
|
||||||
R.drawable.list_activities_poi_parking, R.string.map_widget_parking, "parking", false,
|
R.drawable.widget_parking, R.string.map_widget_parking, "parking", false,
|
||||||
EnumSet.allOf(ApplicationMode.class), EnumSet.noneOf(ApplicationMode.class), 8);
|
EnumSet.allOf(ApplicationMode.class), EnumSet.noneOf(ApplicationMode.class), 8);
|
||||||
mapInfoLayer.recreateControls();
|
mapInfoLayer.recreateControls();
|
||||||
}
|
}
|
||||||
|
|
|
@ -258,6 +258,8 @@ public class MapInfoLayer extends OsmandMapLayer {
|
||||||
mapInfoControls.registerTopWidget(lockView, R.drawable.lock_enabled, R.string.bg_service_screen_lock, "bgService", MapInfoControls.LEFT_CONTROL, exceptCar, 15);
|
mapInfoControls.registerTopWidget(lockView, R.drawable.lock_enabled, R.string.bg_service_screen_lock, "bgService", MapInfoControls.LEFT_CONTROL, exceptCar, 15);
|
||||||
backToLocation = createBackToLocation(map);
|
backToLocation = createBackToLocation(map);
|
||||||
mapInfoControls.registerTopWidget(backToLocation, R.drawable.default_location, R.string.map_widget_back_to_loc, "back_to_location", MapInfoControls.RIGHT_CONTROL, all, 5);
|
mapInfoControls.registerTopWidget(backToLocation, R.drawable.default_location, R.string.map_widget_back_to_loc, "back_to_location", MapInfoControls.RIGHT_CONTROL, all, 5);
|
||||||
|
mapInfoControls.registerTopWidget(createMonitoring(map), R.drawable.monitoring, R.string.map_widget_monitoring_services, "monitorign_services", MapInfoControls.LEFT_CONTROL, all, 12);
|
||||||
|
|
||||||
View globus = createGlobus();
|
View globus = createGlobus();
|
||||||
mapInfoControls.registerTopWidget(globus, R.drawable.globus, R.string.map_widget_map_select, "progress", MapInfoControls.RIGHT_CONTROL, none, 15);
|
mapInfoControls.registerTopWidget(globus, R.drawable.globus, R.string.map_widget_map_select, "progress", MapInfoControls.RIGHT_CONTROL, none, 15);
|
||||||
|
|
||||||
|
@ -563,7 +565,7 @@ public class MapInfoLayer extends OsmandMapLayer {
|
||||||
final boolean selecteable = mi.selecteable();
|
final boolean selecteable = mi.selecteable();
|
||||||
ch.setOnCheckedChangeListener(null);
|
ch.setOnCheckedChangeListener(null);
|
||||||
if(!mi.selecteable()) {
|
if(!mi.selecteable()) {
|
||||||
ch.setVisibility(View.INVISIBLE);
|
ch.setVisibility(View.GONE);
|
||||||
} else {
|
} else {
|
||||||
boolean check = mi.visibleCollapsed(mode) || mi.visible(mode);
|
boolean check = mi.visibleCollapsed(mode) || mi.visible(mode);
|
||||||
ch.setChecked(check);
|
ch.setChecked(check);
|
||||||
|
@ -726,6 +728,18 @@ public class MapInfoLayer extends OsmandMapLayer {
|
||||||
return backToLocation;
|
return backToLocation;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private ImageView createMonitoring(final MapActivity map){
|
||||||
|
ImageView monitoring = new ImageView(view.getContext());
|
||||||
|
monitoring.setImageDrawable(map.getResources().getDrawable(R.drawable.monitoring));
|
||||||
|
monitoring.setOnClickListener(new View.OnClickListener() {
|
||||||
|
@Override
|
||||||
|
public void onClick(View v) {
|
||||||
|
map.backToLocationImpl();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
return monitoring;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
private ImageViewControl createCompassView(final MapActivity map){
|
private ImageViewControl createCompassView(final MapActivity map){
|
||||||
final Drawable compass = map.getResources().getDrawable(R.drawable.compass);
|
final Drawable compass = map.getResources().getDrawable(R.drawable.compass);
|
||||||
|
|
Loading…
Reference in a new issue