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

small fix

Browse source
This commit is contained in:
Skalii 2021-02-22 13:43:53 +02:00
parent f12cbd0aea
commit f981d4a4bb
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd/src/net/osmand/plus/measurementtool/SaveAsNewTrackBottomSheetDialogFragment.java
View file

@ -145,7 +145,7 @@ public class SaveAsNewTrackBottomSheetDialogFragment extends MenuBottomSheetDial
if (activity != null) {
File dest = getFile(app, folderName, fileName);
MoveGpxFileBottomSheet.showInstance(activity.getSupportFragmentManager(),
SaveAsNewTrackBottomSheetDialogFragment.this, dest.getAbsolutePath(), usedOnMap);
SaveAsNewTrackBottomSheetDialogFragment.this, dest.getAbsolutePath(), usedOnMap, true);
}
}
});

2
OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java
View file

@ -780,7 +780,7 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment implement
private void moveGpx(final GpxInfo info) {
FragmentActivity activity = getActivity();
if (activity != null) {
MoveGpxFileBottomSheet.showInstance(activity.getSupportFragmentManager(), this, info.file.getAbsolutePath(), false);
MoveGpxFileBottomSheet.showInstance(activity.getSupportFragmentManager(), this, info.file.getAbsolutePath(), false, false);
}
}

10
OsmAnd/src/net/osmand/plus/myplaces/MoveGpxFileBottomSheet.java
View file

@ -21,7 +21,6 @@ import net.osmand.plus.base.bottomsheetmenu.BottomSheetItemWithDescription;
import net.osmand.plus.base.bottomsheetmenu.SimpleBottomSheetItem;
import net.osmand.plus.base.bottomsheetmenu.simpleitems.DividerItem;
import net.osmand.plus.helpers.AndroidUiHelper;
import net.osmand.plus.measurementtool.SaveAsNewTrackBottomSheetDialogFragment;
import net.osmand.plus.myplaces.AddNewTrackFolderBottomSheet.OnTrackFolderAddListener;
import net.osmand.util.Algorithms;
@ -42,6 +41,7 @@ public class MoveGpxFileBottomSheet extends MenuBottomSheetDialogFragment implem
private OsmandApplication app;
private String filePath;
private boolean showAllFolders = false;
@Override
public void createMenuItems(Bundle savedInstanceState) {
@ -87,10 +87,9 @@ public class MoveGpxFileBottomSheet extends MenuBottomSheetDialogFragment implem
dividerItem.setMargins(0, 0, 0, 0);
items.add(dividerItem);
boolean isSaveAsNewFragment = getTargetFragment() instanceof SaveAsNewTrackBottomSheetDialogFragment;
final List<File> dirs = new ArrayList<>();
collectDirs(app.getAppPath(IndexConstants.GPX_INDEX_DIR), dirs, isSaveAsNewFragment ? null : fileDir);
if (isSaveAsNewFragment || !Algorithms.objectEquals(fileDir, app.getAppPath(IndexConstants.GPX_INDEX_DIR))) {
collectDirs(app.getAppPath(IndexConstants.GPX_INDEX_DIR), dirs, showAllFolders ? null : fileDir);
if (showAllFolders || !Algorithms.objectEquals(fileDir, app.getAppPath(IndexConstants.GPX_INDEX_DIR))) {
dirs.add(0, app.getAppPath(IndexConstants.GPX_INDEX_DIR));
}
String gpxDir = app.getAppPath(IndexConstants.GPX_INDEX_DIR).getPath();
@ -165,12 +164,13 @@ public class MoveGpxFileBottomSheet extends MenuBottomSheetDialogFragment implem
}
public static void showInstance(@NonNull FragmentManager fragmentManager, @Nullable Fragment target,
@NonNull String filePath, boolean usedOnMap) {
@NonNull String filePath, boolean usedOnMap, boolean showAllFolders) {
try {
if (!fragmentManager.isStateSaved() && fragmentManager.findFragmentByTag(MoveGpxFileBottomSheet.TAG) == null) {
MoveGpxFileBottomSheet fragment = new MoveGpxFileBottomSheet();
fragment.filePath = filePath;
fragment.setUsedOnMap(usedOnMap);
fragment.showAllFolders = showAllFolders;
fragment.setTargetFragment(target, 0);
fragment.show(fragmentManager, MoveGpxFileBottomSheet.TAG);
}

2
OsmAnd/src/net/osmand/plus/track/TrackMenuFragment.java
View file

@ -791,7 +791,7 @@ public class TrackMenuFragment extends ContextMenuScrollFragment implements Card
FileUtils.renameFile(mapActivity, new File(gpxFile.path), this, true);
} else if (buttonIndex == CHANGE_FOLDER_BUTTON_INDEX) {
FragmentManager fragmentManager = mapActivity.getSupportFragmentManager();
MoveGpxFileBottomSheet.showInstance(fragmentManager, this, gpxFile.path, true);
MoveGpxFileBottomSheet.showInstance(fragmentManager, this, gpxFile.path, true, false);
} else if (buttonIndex == DELETE_BUTTON_INDEX) {
String fileName = Algorithms.getFileWithoutDirs(gpxFile.path);