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

Switches OsmAnd to selected mode on pressing Map/Screen config from Edit Profile screen

Browse source 
Text tweaks
This commit is contained in:
madwasp79 2019-05-07 12:09:08 +03:00
parent 2e1817d210
commit adc45b7783
2 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -46,7 +46,7 @@
android:layout_marginLeft="@dimen/list_content_padding"
android:layout_marginRight="@dimen/list_content_padding"
android:layout_weight="1"
app:labelText="Name">
app:labelText="Profile Name">
<studio.carbonylgroup.textfieldboxes.ExtendedEditText
android:id="@+id/profile_name_et"
@ -103,7 +103,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:labelText="Type">
app:labelText="Navigation Type">
<studio.carbonylgroup.textfieldboxes.ExtendedEditText
android:id="@+id/navigation_type_et"

16
OsmAnd/src/net/osmand/plus/profiles/EditProfileFragment.java
View file

@ -147,8 +147,8 @@ public class EditProfileFragment extends BaseOsmAndFragment {
isDataChanged = true;
title = String
.format("Custom %s", getResources().getString(profile.parent.getStringResource()));
profileNameEt.setText(title);
profileNameEt.selectAll();
// profileNameEt.setText(title);
//profileNameEt.selectAll();
startIconId = profile.getParent().getSmallIconDark();
profile.setIconId(startIconId);
} else if (profile.getKey() != -1) {
@ -296,6 +296,8 @@ public class EditProfileFragment extends BaseOsmAndFragment {
if (isDataChanged) {
needSaveDialog();
} else {
getSettings().APPLICATION_MODE.set(mode);
Intent i = new Intent(getActivity(), MapActivity.class);
i.putExtra(OPEN_CONFIG_ON_MAP, MAP_CONFIG);
i.putExtra(SELECTED_PROFILE, profile.getStringKey());
@ -310,6 +312,7 @@ public class EditProfileFragment extends BaseOsmAndFragment {
if (isDataChanged) {
needSaveDialog();
} else {
getSettings().APPLICATION_MODE.set(mode);
Intent i = new Intent(getActivity(), MapActivity.class);
i.putExtra(OPEN_CONFIG_ON_MAP, SCREEN_CONFIG);
i.putExtra(SELECTED_PROFILE, profile.getStringKey());
@ -324,6 +327,7 @@ public class EditProfileFragment extends BaseOsmAndFragment {
if (isDataChanged) {
needSaveDialog();
} else {
getSettings().APPLICATION_MODE.set(mode);
Intent i = new Intent(getActivity(), SettingsNavigationActivity.class);
i.putExtra(OPEN_CONFIG_ON_MAP, NAV_CONFIG);
i.putExtra(SELECTED_PROFILE, profile.getStringKey());
@ -344,9 +348,10 @@ public class EditProfileFragment extends BaseOsmAndFragment {
saveButton.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View v) {
if (saveNewProfile()) {
getActivity().onBackPressed();
}
saveNewProfile();
// if (saveNewProfile()) {
// getActivity().onBackPressed();
// }
}
});
@ -455,6 +460,7 @@ public class EditProfileFragment extends BaseOsmAndFragment {
ApplicationMode mode = builder.customReg();
ApplicationMode.saveCustomModeToSettings(getSettings());
this.mode = mode;
StringBuilder vls = new StringBuilder(ApplicationMode.DEFAULT.getStringKey() + ",");
Set<ApplicationMode> availableAppModes = new LinkedHashSet<>(