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

Merge branch 'r3.6'

Browse source
This commit is contained in:
Nazar 2020-02-21 14:01:33 +02:00
commit 0b5260c1dc
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
OsmAnd/res/layout/save_gpx_dialog.xml
View file

@ -26,7 +26,7 @@
android:layout_marginStart="@dimen/bottom_sheet_content_margin"
android:gravity="center_horizontal"
android:text="@string/file_with_name_already_exists"
android:textColor="@color/marker_red"
android:textColor="@color/color_warning"
android:visibility="invisible"/>
<View
@ -36,6 +36,7 @@
android:background="?attr/dashboard_divider"/>
<RelativeLayout
android:id="@+id/button_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="@dimen/content_padding">
@ -58,6 +59,7 @@
android:layout_centerVertical="true"
android:layout_toLeftOf="@id/toggle_row_toggle"
android:layout_toStartOf="@id/toggle_row_toggle"
android:textColor="?android:textColorPrimary"
android:text="@string/show_on_map_after_saving"/>
</RelativeLayout>

8
OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
View file

@ -1157,7 +1157,15 @@ public class MeasurementToolFragment extends BaseOsmAndFragment {
final View view = UiUtilities.getInflater(mapActivity, nightMode).inflate(R.layout.save_gpx_dialog, null);
final EditText nameEt = (EditText) view.findViewById(R.id.gpx_name_et);
final TextView warningTextView = (TextView) view.findViewById(R.id.file_exists_text_view);
final View buttonView = view.findViewById(R.id.button_view);
final SwitchCompat showOnMapToggle = (SwitchCompat) view.findViewById(R.id.toggle_show_on_map);
UiUtilities.setupCompoundButton(showOnMapToggle, nightMode, UiUtilities.CompoundButtonType.GLOBAL);
buttonView.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
showOnMapToggle.setChecked(!showOnMapToggle.isChecked());
}
});
showOnMapToggle.setChecked(true);
final String suggestedName = new SimpleDateFormat("yyyy-MM-dd_HH-mm_EEE", Locale.US).format(new Date());