norohind/vanilla
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

disable context menu for 'up' row

Browse Source
This commit is contained in:
Adrian Ulrich 2017-04-22 16:27:38 +02:00
parent 00268d1b36
commit 0c3e000624
2 changed files with 39 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/ch/blinkenlights/android/vanilla/FileSystemAdapter.java
View File

@ -28,9 +28,11 @@ import android.content.Intent;
import android.graphics.drawable.Drawable;
import android.os.FileObserver;
import android.util.Log;
import android.view.ContextMenu;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import java.io.File;
import java.io.FilenameFilter;
import java.io.IOException;
@ -306,7 +308,7 @@ public class FileSystemAdapter
*/
private int getImageResourceForFile(File file) {
int res = R.drawable.file_document;
if (NAME_PARENT_FOLDER.equals(file.getName())) {
if (pointsToParentFolder(file)) {
res = R.drawable.arrow_up;
} else if (file.isDirectory()) {
res = R.drawable.folder;
@ -327,6 +329,16 @@ public class FileSystemAdapter
return mLimiter == null ? new File("/") : (File)mLimiter.data;
}
/**
* Returns true if the filename of 'file' indicates that
* it points to '..'
*
* @return true if given file points to the parent folder
*/
private static boolean pointsToParentFolder(File file) {
return NAME_PARENT_FOLDER.equals(file.getName());
}
/**
* Builds a limiter from the given folder. Only files contained in the
* given folder will be shown if the limiter is set on this adapter.
@ -336,7 +348,7 @@ public class FileSystemAdapter
*/
public static Limiter buildLimiter(File file)
{
if (NAME_PARENT_FOLDER.equals(file.getName()))
if (pointsToParentFolder(file))
file = file.getParentFile().getParentFile();
String[] fields = FILE_SEPARATOR.split(file.getPath().substring(1));
return new Limiter(MediaUtils.TYPE_FILE, fields, file);
@ -393,15 +405,7 @@ public class FileSystemAdapter
intent.putExtra(LibraryAdapter.DATA_ID, holder.id);
intent.putExtra(LibraryAdapter.DATA_TITLE, ((DraggableRow)view).getTextView().getText().toString());
intent.putExtra(LibraryAdapter.DATA_EXPANDABLE, file.isDirectory());
String path;
try {
path = file.getCanonicalPath();
} catch (IOException e) {
path = file.getAbsolutePath();
Log.e("VanillaMusic", "Failed to canonicalize path", e);
}
intent.putExtra(LibraryAdapter.DATA_FILE, path);
intent.putExtra(LibraryAdapter.DATA_FILE, file.getAbsolutePath());
return intent;
}
@ -445,4 +449,19 @@ public class FileSystemAdapter
mActivity.onItemClicked(intent);
}
}
/**
* Context menu of a row: this was dispatched by LibraryPAgerAdapter
*
* @param menu the context menu to populate
* @param intent likely created by createData()
*/
public void onCreateContextMenu(ContextMenu menu, Intent intent) {
String path = intent.getStringExtra(LibraryAdapter.DATA_FILE);
boolean isParentRow = (path != null && pointsToParentFolder(new File(path)));
if (!isParentRow)
mActivity.onCreateContextMenu(menu, intent);
// else: no context menu
}
}

13
src/ch/blinkenlights/android/vanilla/LibraryPagerAdapter.java
View File

@ -851,8 +851,7 @@ public class LibraryPagerAdapter
*/
private static Intent createHeaderIntent(View header)
{
header = (View)header.getParent(); // tag is set on parent view of header
int type = (Integer)header.getTag();
int type = (Integer)((View)header.getParent()).getTag(); // tag is set on parent view of header
Intent intent = new Intent();
intent.putExtra(LibraryAdapter.DATA_ID, LibraryAdapter.HEADER_ID);
intent.putExtra(LibraryAdapter.DATA_TYPE, type);
@ -865,13 +864,19 @@ public class LibraryPagerAdapter
AdapterView.AdapterContextMenuInfo info = (AdapterView.AdapterContextMenuInfo)menuInfo;
View targetView = info.targetView;
Intent intent = info.id == LibraryAdapter.HEADER_ID ? createHeaderIntent(targetView) : mCurrentAdapter.createData(targetView);
mActivity.onCreateContextMenu(menu, intent);
int type = (Integer)((View)targetView.getParent()).getTag();
if (type == MediaUtils.TYPE_FILE) {
mFilesAdapter.onCreateContextMenu(menu, intent);
} else {
mActivity.onCreateContextMenu(menu, intent);
}
}
@Override
public void onItemClick (AdapterView<?> parent, View view, int position, long id) {
int type = (Integer)parent.getTag();
Intent intent = id == LibraryAdapter.HEADER_ID ? createHeaderIntent(view) : mCurrentAdapter.createData(view);
int type = (Integer)((View)view.getParent()).getTag();
if (type == MediaUtils.TYPE_FILE) {
mFilesAdapter.onItemClicked(intent);