Module fragment with menu; remove and disable buttons

This commit is contained in:
dvdandroid
2016-08-21 16:08:45 +02:00
committed by topjohnwu
parent f5e53cd60f
commit 31b552ab51
20 changed files with 163 additions and 176 deletions

View File

@ -1,5 +1,7 @@
package com.topjohnwu.magisk.model;
import com.topjohnwu.magisk.ui.utils.Utils;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileReader;
@ -8,6 +10,10 @@ public class Module {
private final boolean isValid;
private final boolean isCache;
private File mRemoveFile;
private File mDisableFile;
private File mPropFile;
private String mName;
@ -18,9 +24,11 @@ public class Module {
this.isCache = file.getPath().contains("cache");
this.isValid = new File(file + "/module.prop").exists();
if (isValid) {
mPropFile = new File(file + "/module.prop");
}
if (!isValid) return;
mPropFile = new File(file + "/module.prop");
mRemoveFile = new File(file + "/remove");
mDisableFile = new File(file + "/disable");
}
public boolean isValid() {
@ -43,6 +51,14 @@ public class Module {
return mDescription;
}
public void createRemoveFile() {
Utils.executeCommand("echo \"\" > " + mRemoveFile.getPath());
}
public void createDisableFile() {
Utils.executeCommand("echo \"\" > " + mDisableFile.getPath());
}
public void parse() throws Exception {
BufferedReader reader = new BufferedReader(new FileReader(mPropFile));
String line;

View File

@ -0,0 +1,9 @@
package com.topjohnwu.magisk.rv;
import android.view.View;
public interface ItemClickListener {
void onItemClick(View view, int position);
}

View File

@ -4,6 +4,7 @@ import android.support.v7.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.TextView;
import com.topjohnwu.magisk.R;
@ -17,37 +18,34 @@ import butterknife.ButterKnife;
public class ModulesAdapter extends RecyclerView.Adapter<ModulesAdapter.ViewHolder> {
private final List<Module> mList;
private final ItemClickListener mListener;
public ModulesAdapter(List<Module> mList) {
this.mList = mList;
public ModulesAdapter(List<Module> list, ItemClickListener listener) {
this.mList = list;
this.mListener = listener;
}
@Override
public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.row, parent, false);
/*FIXME
final ViewHolder viewHolder = new ViewHolder(view);
view.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
listener.onItemClick(viewHolder.getAdapterPosition());
}
});*/
return new ViewHolder(view);
}
@Override
public void onBindViewHolder(ViewHolder holder, int position) {
public void onBindViewHolder(final ViewHolder holder, int position) {
Module module = mList.get(position);
holder.title.setText(module.getName());
holder.versionName.setText(module.getVersion());
holder.description.setText(module.getDescription());
//FIXME
//holder.cache.setText("" + module.isCache());
holder.overflowButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
mListener.onItemClick(holder.overflowButton, holder.getAdapterPosition());
}
});
}
@Override
@ -60,7 +58,7 @@ public class ModulesAdapter extends RecyclerView.Adapter<ModulesAdapter.ViewHold
@BindView(R.id.title) TextView title;
@BindView(R.id.version_name) TextView versionName;
@BindView(R.id.description) TextView description;
//@BindView(R.id.cache) TextView cache;
@BindView(R.id.overflow) ImageView overflowButton;
public ViewHolder(View itemView) {
super(itemView);

View File

@ -1,21 +1,27 @@
package com.topjohnwu.magisk.ui;
import android.app.ProgressDialog;
import android.os.AsyncTask;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.design.widget.Snackbar;
import android.support.v7.widget.PopupMenu;
import android.support.v7.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ProgressBar;
import com.topjohnwu.magisk.R;
import com.topjohnwu.magisk.model.Module;
import com.topjohnwu.magisk.rv.ItemClickListener;
import com.topjohnwu.magisk.rv.ModulesAdapter;
import com.topjohnwu.magisk.ui.utils.Utils;
import java.io.File;
import java.io.FileFilter;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.List;
@ -28,31 +34,64 @@ public class ModulesFragment extends android.support.v4.app.Fragment {
private static final String MAGISK_CACHE_PATH = "/cache/magisk";
@BindView(R.id.recyclerView) RecyclerView recyclerView;
@BindView(R.id.progressBar) ProgressBar progressBar;
private List<Module> listModules = new ArrayList<>();
private ItemClickListener moduleActions = new ItemClickListener() {
@Override
public void onItemClick(final View view, final int position) {
PopupMenu popup = new PopupMenu(getContext(), view);
try {
Field[] fields = popup.getClass().getDeclaredFields();
for (Field field : fields) {
if ("mPopup".equals(field.getName())) {
field.setAccessible(true);
Object menuPopupHelper = field.get(popup);
Class<?> classPopupHelper = Class.forName(menuPopupHelper.getClass().getName());
Method setForceIcons = classPopupHelper.getMethod("setForceShowIcon", boolean.class);
setForceIcons.invoke(menuPopupHelper, true);
break;
}
}
} catch (Exception ignored) {
}
popup.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
@Override
public boolean onMenuItemClick(MenuItem item) {
switch (item.getItemId()) {
case R.id.remove:
listModules.get(position).createRemoveFile();
Snackbar.make(view, R.string.remove_file_created, Snackbar.LENGTH_SHORT).show();
break;
case R.id.disable:
listModules.get(position).createDisableFile();
Snackbar.make(view, R.string.disable_file_created, Snackbar.LENGTH_SHORT).show();
break;
}
return false;
}
});
popup.inflate(R.menu.module_popup);
popup.show();
}
};
@Nullable
@Override
public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
View v = inflater.inflate(R.layout.modules_fragment, container, false);
ButterKnife.bind(this, v);
View view = inflater.inflate(R.layout.modules_fragment, container, false);
ButterKnife.bind(this, view);
new CheckFolders().execute();
return v;
return view;
}
private class CheckFolders extends AsyncTask<Void, Integer, Boolean> {
private ProgressDialog progress;
@Override
protected void onPreExecute() {
super.onPreExecute();
progress = ProgressDialog.show(getContext(), null, getString(R.string.loading), true, false);
}
@Override
protected Boolean doInBackground(Void... voids) {
File[] magisk = new File(MAGISK_PATH).listFiles(new FileFilter() {
@ -104,9 +143,9 @@ public class ModulesFragment extends android.support.v4.app.Fragment {
protected void onPostExecute(Boolean result) {
super.onPostExecute(result);
progress.dismiss();
progressBar.setVisibility(View.GONE);
recyclerView.setAdapter(new ModulesAdapter(listModules));
recyclerView.setAdapter(new ModulesAdapter(listModules, moduleActions));
}
}