PawletOS/lineageos_updater
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updater: Use popup menu instead of ActionMode

Browse Source 
Change-Id: I707682708711679a7cbe1b0058cea9b1ed003cb6
This commit is contained in:
Joey
2018-04-06 22:27:18 +02:00
parent a64eae5fc0
commit 6d24b010f7
7 changed files with 59 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
res/drawable/ic_delete.xml
View File

@@ -1,9 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FFFFFFFF"
android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM19,4h-3.5l-1,-1h-5l-1,1H5v2h14V4z"/>
</vector>

9
res/drawable/ic_save.xml
View File

@@ -1,9 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FFFFFFFF"
android:pathData="M17,3L5,3c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,7l-4,-4zM12,19c-1.66,0 -3,-1.34 -3,-3s1.34,-3 3,-3 3,1.34 3,3 -1.34,3 -3,3zM15,9L5,9L5,5h10v4z"/>
</vector>

5
res/drawable/list_item_background.xml
View File

@@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@color/background_selected" android:state_selected="true" />
<item android:drawable="@color/cardview_light_background" android:state_selected="false" />
</selector>

14
res/menu/menu_action_mode.xml
View File

@@ -3,19 +3,11 @@
xmlns:app="http://schemas.android.com/apk/res-auto"> xmlns:app="http://schemas.android.com/apk/res-auto">
<item <item
android:id="@+id/menu_export_update" android:id="@+id/menu_export_update"
android:icon="@drawable/ic_save" android:title="@string/menu_export_update" />
android:title="@string/menu_export_update"
android:visible="false"
app:showAsAction="ifRoom" />
<item <item
android:id="@+id/menu_delete_action" android:id="@+id/menu_delete_action"
android:icon="@drawable/ic_delete" android:title="@string/menu_delete_update" />
android:title="@string/menu_delete_update"
android:visible="false"
app:showAsAction="ifRoom" />
<item <item
android:id="@+id/menu_copy_url" android:id="@+id/menu_copy_url"
android:title="@string/menu_copy_url" android:title="@string/menu_copy_url" />
android:visible="false"
app:showAsAction="never" />
</menu> </menu>

2
res/values/colors.xml
View File

@@ -4,8 +4,6 @@
<color name="theme_primary_dark">#ff000000</color> <color name="theme_primary_dark">#ff000000</color>
<color name="theme_accent">#ff009688</color> <color name="theme_accent">#ff009688</color>
<color name="background_selected">#ffdddddd</color>
<color name="white">#f5f5f5</color> <color name="white">#f5f5f5</color>
<color name="ic_background">#333333</color> <color name="ic_background">#333333</color>
</resources> </resources>

6
res/values/styles.xml
View File

@@ -22,4 +22,10 @@
<style name="TextAppearanceTransparent" parent="TextAppearance.AppCompat.Widget.ActionBar.Title"> <style name="TextAppearanceTransparent" parent="TextAppearance.AppCompat.Widget.ActionBar.Title">
<item name="android:textColor">@android:color/transparent</item> <item name="android:textColor">@android:color/transparent</item>
</style> </style>
<style name="AppTheme.PopupMenuOverlapAnchor">
<item name="android:overlapAnchor">true</item>
<item name="android:dropDownVerticalOffset">8dp</item>
<item name="android:dropDownHorizontalOffset">-16dp</item>
</style>
</resources> </resources>

140
src/org/lineageos/updater/UpdatesListAdapter.java
View File

@@ -20,7 +20,10 @@ import android.content.SharedPreferences;
import android.preference.PreferenceManager; import android.preference.PreferenceManager;
import android.support.design.widget.Snackbar; import android.support.design.widget.Snackbar;
import android.support.v7.app.AlertDialog; import android.support.v7.app.AlertDialog;
import android.support.v7.view.ActionMode; import android.support.v7.view.ContextThemeWrapper;
import android.support.v7.view.menu.MenuBuilder;
import android.support.v7.view.menu.MenuPopupHelper;
import android.support.v7.widget.PopupMenu;
import android.support.v7.widget.RecyclerView; import android.support.v7.widget.RecyclerView;
import android.text.SpannableString; import android.text.SpannableString;
import android.text.format.Formatter; import android.text.format.Formatter;
@@ -28,10 +31,8 @@ import android.text.method.LinkMovementMethod;
import android.text.util.Linkify; import android.text.util.Linkify;
import android.util.Log; import android.util.Log;
import android.util.TypedValue; import android.util.TypedValue;
import android.view.Gravity;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.CheckBox; import android.widget.CheckBox;
@@ -65,7 +66,6 @@ public class UpdatesListAdapter extends RecyclerView.Adapter<UpdatesListAdapter.
private String mSelectedDownload; private String mSelectedDownload;
private Controller mUpdaterController; private Controller mUpdaterController;
private UpdatesListActivity mActivity; private UpdatesListActivity mActivity;
private ActionMode mActionMode;
private enum Action { private enum Action {
DOWNLOAD, DOWNLOAD,
@@ -118,7 +118,6 @@ public class UpdatesListAdapter extends RecyclerView.Adapter<UpdatesListAdapter.
public ViewHolder onCreateViewHolder(ViewGroup viewGroup, int i) { public ViewHolder onCreateViewHolder(ViewGroup viewGroup, int i) {
View view = LayoutInflater.from(viewGroup.getContext()) View view = LayoutInflater.from(viewGroup.getContext())
.inflate(R.layout.update_item_view, viewGroup, false); .inflate(R.layout.update_item_view, viewGroup, false);
view.setBackground(mActivity.getDrawable(R.drawable.list_item_background));
return new ViewHolder(view); return new ViewHolder(view);
} }
@@ -185,7 +184,8 @@ public class UpdatesListAdapter extends RecyclerView.Adapter<UpdatesListAdapter.
viewHolder.mProgressBar.setProgress(update.getProgress()); viewHolder.mProgressBar.setProgress(update.getProgress());
} }
viewHolder.itemView.setOnLongClickListener(getLongClickListener(update, canDelete)); viewHolder.itemView.setOnLongClickListener(getLongClickListener(update, canDelete,
viewHolder.mBuildDate));
} }
private void handleNotActiveStatus(ViewHolder viewHolder, UpdateInfo update) { private void handleNotActiveStatus(ViewHolder viewHolder, UpdateInfo update) {
@@ -197,15 +197,18 @@ public class UpdatesListAdapter extends RecyclerView.Adapter<UpdatesListAdapter.
viewHolder.mBuildVersion.setText(buildVersion); viewHolder.mBuildVersion.setText(buildVersion);
if (update.getPersistentStatus() == UpdateStatus.Persistent.VERIFIED) { if (update.getPersistentStatus() == UpdateStatus.Persistent.VERIFIED) {
viewHolder.itemView.setOnLongClickListener(getLongClickListener(update, true)); viewHolder.itemView.setOnLongClickListener(
getLongClickListener(update, true, viewHolder.mBuildDate));
setButtonAction(viewHolder.mAction, setButtonAction(viewHolder.mAction,
Utils.canInstall(update) ? Action.INSTALL : Action.DELETE, Utils.canInstall(update) ? Action.INSTALL : Action.DELETE,
update.getDownloadId(), !isBusy()); update.getDownloadId(), !isBusy());
} else if (!Utils.canInstall(update)) { } else if (!Utils.canInstall(update)) {
viewHolder.itemView.setOnLongClickListener(getLongClickListener(update, false)); viewHolder.itemView.setOnLongClickListener(
getLongClickListener(update, false, viewHolder.mBuildDate));
setButtonAction(viewHolder.mAction, Action.INFO, update.getDownloadId(), !isBusy()); setButtonAction(viewHolder.mAction, Action.INFO, update.getDownloadId(), !isBusy());
} else { } else {
viewHolder.itemView.setOnLongClickListener(getLongClickListener(update, false)); viewHolder.itemView.setOnLongClickListener(
getLongClickListener(update, false, viewHolder.mBuildDate));
setButtonAction(viewHolder.mAction, Action.DOWNLOAD, update.getDownloadId(), !isBusy()); setButtonAction(viewHolder.mAction, Action.DOWNLOAD, update.getDownloadId(), !isBusy());
} }
} }
@@ -390,7 +393,6 @@ public class UpdatesListAdapter extends RecyclerView.Adapter<UpdatesListAdapter.
button.setOnClickListener(v -> { button.setOnClickListener(v -> {
if (clickListener != null) { if (clickListener != null) {
clickListener.onClick(v); clickListener.onClick(v);
stopActionMode();
} }
}); });
} }
@@ -413,11 +415,9 @@ public class UpdatesListAdapter extends RecyclerView.Adapter<UpdatesListAdapter.
} }
private View.OnLongClickListener getLongClickListener(final UpdateInfo update, private View.OnLongClickListener getLongClickListener(final UpdateInfo update,
final boolean canDelete) { final boolean canDelete, View anchor) {
return view -> { return view -> {
if (mActionMode == null) { startActionMode(update, canDelete, anchor);
startActionMode(update, canDelete);
}
return true; return true;
}; };
} }
@@ -461,86 +461,47 @@ public class UpdatesListAdapter extends RecyclerView.Adapter<UpdatesListAdapter.
.setNegativeButton(android.R.string.cancel, null); .setNegativeButton(android.R.string.cancel, null);
} }
private void stopActionMode() { private void startActionMode(final UpdateInfo update, final boolean canDelete, View anchor) {
if (mActionMode != null) {
mActionMode.finish();
}
}
private void startActionMode(final UpdateInfo update, final boolean canDelete) {
if (mActionMode != null) {
Log.d(TAG, "Action mode already enabled");
return;
}
mSelectedDownload = update.getDownloadId(); mSelectedDownload = update.getDownloadId();
notifyItemChanged(update.getDownloadId()); notifyItemChanged(update.getDownloadId());
// Hide Action Bar not to steal the focus when using a D-pad ContextThemeWrapper wrapper = new ContextThemeWrapper(mActivity,
final boolean showActionBar; R.style.AppTheme_PopupMenuOverlapAnchor);
if (mActivity.getSupportActionBar() != null && PopupMenu popupMenu = new PopupMenu(wrapper, anchor, Gravity.NO_GRAVITY,
mActivity.getSupportActionBar().isShowing()) { R.attr.actionOverflowMenuStyle, 0);
showActionBar = true; popupMenu.inflate(R.menu.menu_action_mode);
mActivity.getSupportActionBar().hide();
} else {
showActionBar = false;
}
mActionMode = mActivity.startSupportActionMode(new ActionMode.Callback() { MenuBuilder menu = (MenuBuilder) popupMenu.getMenu();
@Override menu.findItem(R.id.menu_delete_action).setVisible(canDelete);
public boolean onCreateActionMode(ActionMode mode, Menu menu) { menu.findItem(R.id.menu_copy_url).setVisible(update.getAvailableOnline());
MenuInflater inflater = mode.getMenuInflater(); menu.findItem(R.id.menu_export_update).setVisible(
inflater.inflate(R.menu.menu_action_mode, menu); update.getPersistentStatus() == UpdateStatus.Persistent.VERIFIED);
menu.findItem(R.id.menu_delete_action).setVisible(canDelete);
menu.findItem(R.id.menu_copy_url).setVisible(update.getAvailableOnline()); popupMenu.setOnMenuItemClickListener(item -> {
menu.findItem(R.id.menu_export_update).setVisible( switch (item.getItemId()) {
update.getPersistentStatus() == UpdateStatus.Persistent.VERIFIED); case R.id.menu_delete_action:
return true; getDeleteDialog(update.getDownloadId()).show();
} return true;
case R.id.menu_copy_url:
@Override Utils.addToClipboard(mActivity,
public boolean onPrepareActionMode(ActionMode mode, Menu menu) { mActivity.getString(R.string.label_download_url),
return false; update.getDownloadUrl(),
} mActivity.getString(R.string.toast_download_url_copied));
return true;
@Override case R.id.menu_export_update:
public boolean onActionItemClicked(ActionMode mode, MenuItem item) { // TODO: start exporting once the permission has been granted
switch (item.getItemId()) { boolean hasPermission = PermissionsUtils.checkAndRequestStoragePermission(
case R.id.menu_delete_action: mActivity, 0);
getDeleteDialog(update.getDownloadId()) if (hasPermission) {
.setOnDismissListener(dialog -> mode.finish()) exportUpdate(update);
.show(); }
return true; return true;
case R.id.menu_copy_url:
Utils.addToClipboard(mActivity,
mActivity.getString(R.string.label_download_url),
update.getDownloadUrl(),
mActivity.getString(R.string.toast_download_url_copied));
mode.finish();
return true;
case R.id.menu_export_update:
// TODO: start exporting once the permission has been granted
boolean hasPermission = PermissionsUtils.checkAndRequestStoragePermission(
mActivity, 0);
if (hasPermission) {
exportUpdate(update);
}
return true;
}
return false;
}
@Override
public void onDestroyActionMode(ActionMode mode) {
mSelectedDownload = null;
mActionMode = null;
notifyItemChanged(update.getDownloadId());
if (showActionBar) {
mActivity.getSupportActionBar().show();
}
} }
return false;
}); });
MenuPopupHelper helper = new MenuPopupHelper(wrapper, menu, anchor);
helper.show();
} }
private void exportUpdate(UpdateInfo update) { private void exportUpdate(UpdateInfo update) {
@@ -553,7 +514,6 @@ public class UpdatesListAdapter extends RecyclerView.Adapter<UpdatesListAdapter.
intent.putExtra(ExportUpdateService.EXTRA_SOURCE_FILE, update.getFile()); intent.putExtra(ExportUpdateService.EXTRA_SOURCE_FILE, update.getFile());
intent.putExtra(ExportUpdateService.EXTRA_DEST_FILE, dest); intent.putExtra(ExportUpdateService.EXTRA_DEST_FILE, dest);
mActivity.startService(intent); mActivity.startService(intent);
stopActionMode();
} }
private void showInfoDialog() { private void showInfoDialog() {