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

Remove utm and olc formats

Browse source
This commit is contained in:
PavelRatushny 2017-09-29 11:52:16 +03:00
parent 6d5625c306
commit aa3b896092
2 changed files with 0 additions and 116 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

76
OsmAnd/res/layout/marker_coordinate_formats.xml
View file

@ -120,80 +120,4 @@
android:focusable="false"/>
</LinearLayout>
<LinearLayout
android:id="@+id/utm_row"
android:layout_width="match_parent"
android:layout_height="@dimen/bottom_sheet_list_item_height"
android:background="?attr/selectableItemBackground"
android:gravity="center_vertical"
android:minHeight="@dimen/bottom_sheet_list_item_height"
android:paddingEnd="@dimen/bottom_sheet_content_padding"
android:paddingLeft="@dimen/bottom_sheet_content_padding"
android:paddingRight="@dimen/bottom_sheet_content_padding"
android:paddingStart="@dimen/bottom_sheet_content_padding">
<ImageView
android:id="@+id/utm_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/bottom_sheet_icon_margin"
android:layout_marginRight="@dimen/bottom_sheet_icon_margin"
tools:src="@drawable/ic_action_coordinates_latitude"/>
<TextView
android:id="@+id/utm_text"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:maxLines="1"
android:textAppearance="@style/TextAppearance.ListItemTitle"
tools:text="UTM"/>
<RadioButton
android:id="@+id/utm_radio_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@null"
android:clickable="false"
android:focusable="false"/>
</LinearLayout>
<LinearLayout
android:id="@+id/olc_row"
android:layout_width="match_parent"
android:layout_height="@dimen/bottom_sheet_list_item_height"
android:background="?attr/selectableItemBackground"
android:gravity="center_vertical"
android:minHeight="@dimen/bottom_sheet_list_item_height"
android:paddingEnd="@dimen/bottom_sheet_content_padding"
android:paddingLeft="@dimen/bottom_sheet_content_padding"
android:paddingRight="@dimen/bottom_sheet_content_padding"
android:paddingStart="@dimen/bottom_sheet_content_padding">
<ImageView
android:id="@+id/olc_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/bottom_sheet_icon_margin"
android:layout_marginRight="@dimen/bottom_sheet_icon_margin"
tools:src="@drawable/ic_action_coordinates_latitude"/>
<TextView
android:id="@+id/olc_text"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:maxLines="1"
android:textAppearance="@style/TextAppearance.ListItemTitle"
tools:text="OLC"/>
<RadioButton
android:id="@+id/olc_radio_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@null"
android:clickable="false"
android:focusable="false"/>
</LinearLayout>
</LinearLayout>

40
OsmAnd/src/net/osmand/plus/mapmarkers/CoordinateInputBottomSheetDialogFragment.java
View file

@ -106,28 +106,6 @@ public class CoordinateInputBottomSheetDialogFragment extends BottomSheetDialogF
}
secondsText.setText(PointDescription.formatToHumanString(getContext(), PointDescription.FORMAT_SECONDS));
ImageView utmIcon = (ImageView) mainView.findViewById(R.id.utm_icon);
TextView utmText = (TextView) mainView.findViewById(R.id.utm_text);
if (coordinateFormat == PointDescription.UTM_FORMAT) {
utmIcon.setImageDrawable(getIcon(R.drawable.ic_action_coordinates_latitude, R.color.dashboard_blue));
utmText.setTextColor(ContextCompat.getColor(mapActivity, R.color.dashboard_blue));
((RadioButton) mainView.findViewById(R.id.utm_radio_button)).setChecked(true);
} else {
utmIcon.setImageDrawable(getContentIcon(R.drawable.ic_action_coordinates_latitude));
}
utmText.setText(PointDescription.formatToHumanString(getContext(), PointDescription.UTM_FORMAT));
ImageView olcIcon = (ImageView) mainView.findViewById(R.id.olc_icon);
TextView olcText = (TextView) mainView.findViewById(R.id.olc_text);
if (coordinateFormat == PointDescription.OLC_FORMAT) {
olcIcon.setImageDrawable(getIcon(R.drawable.ic_action_coordinates_latitude, R.color.dashboard_blue));
olcText.setTextColor(ContextCompat.getColor(mapActivity, R.color.dashboard_blue));
((RadioButton) mainView.findViewById(R.id.olc_radio_button)).setChecked(true);
} else {
olcIcon.setImageDrawable(getContentIcon(R.drawable.ic_action_coordinates_latitude));
}
olcText.setText(PointDescription.formatToHumanString(getContext(), PointDescription.OLC_FORMAT));
if (coordinateFormat != -1) {
((CompoundButton) mainView.findViewById(R.id.use_system_keyboard_switch)).setChecked(!useOsmandKeyboard);
((ImageView) mainView.findViewById(R.id.use_system_keyboard_icon)).setImageDrawable(getContentIcon(R.drawable.ic_action_keyboard));
@ -158,12 +136,6 @@ public class CoordinateInputBottomSheetDialogFragment extends BottomSheetDialogF
case R.id.seconds_row:
coordinateFormat = PointDescription.FORMAT_SECONDS;
break;
case R.id.utm_row:
coordinateFormat = PointDescription.UTM_FORMAT;
break;
case R.id.olc_row:
coordinateFormat = PointDescription.OLC_FORMAT;
break;
default:
throw new IllegalArgumentException("Unsupported format");
}
@ -180,8 +152,6 @@ public class CoordinateInputBottomSheetDialogFragment extends BottomSheetDialogF
mainView.findViewById(R.id.degrees_row).setOnClickListener(formatChangeListener);
mainView.findViewById(R.id.minutes_row).setOnClickListener(formatChangeListener);
mainView.findViewById(R.id.seconds_row).setOnClickListener(formatChangeListener);
mainView.findViewById(R.id.utm_row).setOnClickListener(formatChangeListener);
mainView.findViewById(R.id.olc_row).setOnClickListener(formatChangeListener);
mainView.findViewById(R.id.cancel_row).setOnClickListener(new View.OnClickListener() {
@Override
@ -276,16 +246,6 @@ public class CoordinateInputBottomSheetDialogFragment extends BottomSheetDialogF
((ImageView) mainView.findViewById(R.id.seconds_icon)).setImageDrawable((getIcon(R.drawable.ic_action_coordinates_latitude, iconColor)));
((RadioButton) mainView.findViewById(R.id.seconds_radio_button)).setChecked(check);
break;
case PointDescription.UTM_FORMAT:
((TextView) mainView.findViewById(R.id.utm_text)).setTextColor(textColor);
((ImageView) mainView.findViewById(R.id.utm_icon)).setImageDrawable((getIcon(R.drawable.ic_action_coordinates_latitude, iconColor)));
((RadioButton) mainView.findViewById(R.id.utm_radio_button)).setChecked(check);
break;
case PointDescription.OLC_FORMAT:
((TextView) mainView.findViewById(R.id.olc_text)).setTextColor(textColor);
((ImageView) mainView.findViewById(R.id.olc_icon)).setImageDrawable((getIcon(R.drawable.ic_action_coordinates_latitude, iconColor)));
((RadioButton) mainView.findViewById(R.id.olc_radio_button)).setChecked(check);
break;
}
}