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

Fix #10796

Browse source
This commit is contained in:
Victor Shcherb 2021-02-08 12:43:31 +01:00
parent 0bf7a587af
commit 23ff6a54cf
3 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
OsmAnd/src/net/osmand/plus/base/MenuBottomSheetDialogFragment.java
View file

@ -57,9 +57,6 @@ public abstract class MenuBottomSheetDialogFragment extends BottomSheetDialogFra
private LinearLayout itemsContainer; private LinearLayout itemsContainer;
private LinearLayout buttonsContainer; private LinearLayout buttonsContainer;
@StringRes
protected int dismissButtonStringRes = R.string.shared_string_cancel;
public void setUsedOnMap(boolean usedOnMap) { public void setUsedOnMap(boolean usedOnMap) {
this.usedOnMap = usedOnMap; this.usedOnMap = usedOnMap;
} }
@ -261,11 +258,7 @@ public abstract class MenuBottomSheetDialogFragment extends BottomSheetDialogFra
@StringRes @StringRes
protected int getDismissButtonTextId() { protected int getDismissButtonTextId() {
return dismissButtonStringRes; return R.string.shared_string_cancel;
}
protected void setDismissButtonTextId(@StringRes int stringRes) {
dismissButtonStringRes = stringRes;
} }
protected int getDismissButtonHeight(){ protected int getDismissButtonHeight(){

6
OsmAnd/src/net/osmand/plus/monitoring/SaveGPXBottomSheetFragment.java
View file

@ -143,6 +143,12 @@ public class SaveGPXBottomSheetFragment extends MenuBottomSheetDialogFragment {
return UiUtilities.DialogButtonType.SECONDARY; return UiUtilities.DialogButtonType.SECONDARY;
} }
@Override
protected int getDismissButtonTextId() {
return R.string.shared_string_close;
}
@Override @Override
protected int getRightBottomButtonTextId() { protected int getRightBottomButtonTextId() {
return R.string.shared_string_open_track; return R.string.shared_string_open_track;

6
OsmAnd/src/net/osmand/plus/profiles/AppModesBottomSheetDialogFragment.java
View file

@ -27,10 +27,14 @@ public abstract class AppModesBottomSheetDialogFragment<T extends AbstractProfil
@Override @Override
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setDismissButtonTextId(R.string.shared_string_close);
getData(); getData();
} }
@Override
protected int getDismissButtonTextId() {
return R.string.shared_string_close;
}
@Override @Override
public void onDismiss(DialogInterface dialog) { public void onDismiss(DialogInterface dialog) {
super.onDismiss(dialog); super.onDismiss(dialog);