Mirrors/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-06-12 05:07:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

UI improvements, cleanup

Browse Source
This commit is contained in:
dvdandroid
2016-08-23 12:39:36 +02:00
parent 56f10e238b
commit 0f103d5853
12 changed files with 68 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/com/topjohnwu/magisk/BaseModuleFragment.java
View File

@ -10,7 +10,6 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.CheckBox;
import com.topjohnwu.magisk.R;
import com.topjohnwu.magisk.module.Module;
import com.topjohnwu.magisk.rv.ItemClickListener;
import com.topjohnwu.magisk.rv.ModulesAdapter;
@ -33,6 +32,7 @@ public abstract class BaseModuleFragment extends Fragment {
recyclerView.setAdapter(new ModulesAdapter(listModules(), new ItemClickListener() {
@Override
public void onItemClick(View view, int position) {
// On Checkbox change listener
CheckBox chbox = (CheckBox) view;
if (!chbox.isChecked()) {
@ -46,9 +46,19 @@ public abstract class BaseModuleFragment extends Fragment {
}, new ItemClickListener() {
@Override
public void onItemClick(View view, int position) {
// On delete button click listener
listModules().get(position).createRemoveFile();
Snackbar.make(view, R.string.remove_file_created, Snackbar.LENGTH_SHORT).show();
}
}, new ItemClickListener() {
@Override
public void onItemClick(View view, int position) {
// On undelete button click listener
listModules().get(position).deleteRemoveFile();
Snackbar.make(view, R.string.remove_file_deleted, Snackbar.LENGTH_SHORT).show();
}
}));
return view;
}

3
app/src/main/java/com/topjohnwu/magisk/ModulesFragment.java
View File

@ -141,8 +141,7 @@ public class ModulesFragment extends Fragment {
private class TabsAdapter extends FragmentPagerAdapter {
String[] tabTitles = new String[]{
"Modules", "Cache Modules"
// TODO stringify
getString(R.string.modules), getString(R.string.cache_modules)
};
public TabsAdapter(FragmentManager fm) {

7
app/src/main/java/com/topjohnwu/magisk/RootFragment.java
View File

@ -1,7 +0,0 @@
package com.topjohnwu.magisk;
import android.support.v4.app.Fragment;
public class RootFragment extends Fragment {
}

4
app/src/main/java/com/topjohnwu/magisk/WelcomeActivity.java
View File

@ -122,10 +122,6 @@ public class WelcomeActivity extends AppCompatActivity implements NavigationView
setTitle(R.string.magisk);
navFragment = new MagiskFragment();
break;
case R.id.root:
setTitle(R.string.root);
navFragment = new RootFragment();
break;
case R.id.modules:
setTitle(R.string.modules);
navFragment = new ModulesFragment();

30
app/src/main/java/com/topjohnwu/magisk/rv/ModulesAdapter.java
View File

@ -23,11 +23,13 @@ public class ModulesAdapter extends RecyclerView.Adapter<ModulesAdapter.ViewHold
private final List<Module> mList;
private final ItemClickListener chboxListener;
private final ItemClickListener deleteBtnListener;
private final ItemClickListener unDeleteBtnListener;
public ModulesAdapter(List<Module> list, ItemClickListener chboxListener, ItemClickListener deleteBtnListener) {
public ModulesAdapter(List<Module> list, ItemClickListener chboxListener, ItemClickListener deleteBtnListener, ItemClickListener undeleteBtnListener) {
this.mList = list;
this.chboxListener = chboxListener;
this.deleteBtnListener = deleteBtnListener;
this.unDeleteBtnListener = undeleteBtnListener;
}
@Override
@ -56,21 +58,27 @@ public class ModulesAdapter extends RecyclerView.Adapter<ModulesAdapter.ViewHold
holder.delete.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
deleteBtnListener.onItemClick(holder.delete, holder.getAdapterPosition());
holder.warning.setVisibility(module.willBeRemoved() ? View.VISIBLE : View.GONE);
}
});
holder.delete.setOnLongClickListener(new View.OnLongClickListener() {
@Override
public boolean onLongClick(View view) {
module.deleteRemoveFile();
holder.warning.setVisibility(module.willBeRemoved() ? View.VISIBLE : View.GONE);
if (module.willBeRemoved()) {
unDeleteBtnListener.onItemClick(holder.delete, holder.getAdapterPosition());
} else {
deleteBtnListener.onItemClick(holder.delete, holder.getAdapterPosition());
}
return true;
updateDeleteButton(holder, module);
}
});
updateDeleteButton(holder, module);
}
private void updateDeleteButton(ViewHolder holder, Module module) {
holder.warning.setVisibility(module.willBeRemoved() ? View.VISIBLE : View.GONE);
if (module.willBeRemoved()) {
holder.delete.setImageResource(R.drawable.ic_undelete);
} else {
holder.delete.setImageResource(R.drawable.ic_delete);
}
}
@Override