diff --git a/Clover/app/src/main/java/org/floens/chan/ui/adapter/DrawerAdapter.java b/Clover/app/src/main/java/org/floens/chan/ui/adapter/DrawerAdapter.java index af9052d9..3aea838d 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/adapter/DrawerAdapter.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/adapter/DrawerAdapter.java @@ -52,7 +52,7 @@ import static org.floens.chan.utils.AndroidUtils.sp; public class DrawerAdapter extends RecyclerView.Adapter { public enum HeaderAction { - SETTINGS, CLEAR, CLEAR_ALL + CLEAR, CLEAR_ALL } private static final int PIN_OFFSET = 3; @@ -146,7 +146,6 @@ public class DrawerAdapter extends RecyclerView.Adapter HeaderHolder headerHolder = (HeaderHolder) holder; headerHolder.text.setText(R.string.drawer_pinned); theme().clearDrawable.apply(headerHolder.clear); - theme().settingsDrawable.apply(headerHolder.settings); break; case TYPE_PIN: @@ -331,7 +330,7 @@ public class DrawerAdapter extends RecyclerView.Adapter public boolean onLongClick(View v) { int pos = getAdapterPosition() - PIN_OFFSET; if (pos >= 0 && pos < pins.size()) { - callback.onPinLongClocked(pins.get(pos)); + callback.onPinLongClicked(pins.get(pos)); } return true; @@ -353,7 +352,6 @@ public class DrawerAdapter extends RecyclerView.Adapter public class HeaderHolder extends RecyclerView.ViewHolder { private TextView text; private ImageView clear; - private ImageView settings; private HeaderHolder(View itemView) { super(itemView); @@ -374,14 +372,6 @@ public class DrawerAdapter extends RecyclerView.Adapter return true; } }); - settings = itemView.findViewById(R.id.settings); - setRoundItemBackground(settings); - settings.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - callback.onHeaderClicked(HeaderHolder.this, HeaderAction.SETTINGS); - } - }); } } @@ -450,7 +440,7 @@ public class DrawerAdapter extends RecyclerView.Adapter void onPinRemoved(Pin pin); - void onPinLongClocked(Pin pin); + void onPinLongClicked(Pin pin); void openSites(); diff --git a/Clover/app/src/main/java/org/floens/chan/ui/controller/DrawerController.java b/Clover/app/src/main/java/org/floens/chan/ui/controller/DrawerController.java index 9307ecc2..ffde7060 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/controller/DrawerController.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/controller/DrawerController.java @@ -30,7 +30,6 @@ import android.view.Gravity; import android.view.View; import android.widget.EditText; import android.widget.FrameLayout; -import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; @@ -151,9 +150,7 @@ public class DrawerController extends Controller implements DrawerAdapter.Callba @Override public void onHeaderClicked(DrawerAdapter.HeaderHolder holder, DrawerAdapter.HeaderAction headerAction) { - if (headerAction == DrawerAdapter.HeaderAction.SETTINGS) { - openController(new WatchSettingsController(context)); - } else if (headerAction == DrawerAdapter.HeaderAction.CLEAR || headerAction == DrawerAdapter.HeaderAction.CLEAR_ALL) { + if (headerAction == DrawerAdapter.HeaderAction.CLEAR || headerAction == DrawerAdapter.HeaderAction.CLEAR_ALL) { boolean all = headerAction == DrawerAdapter.HeaderAction.CLEAR_ALL || !ChanSettings.watchEnabled.get(); final List pins = watchManager.clearPins(all); if (!pins.isEmpty()) { @@ -193,7 +190,7 @@ public class DrawerController extends Controller implements DrawerAdapter.Callba } @Override - public void onPinLongClocked(final Pin pin) { + public void onPinLongClicked(final Pin pin) { LinearLayout wrap = new LinearLayout(context); wrap.setPadding(dp(16), dp(16), dp(16), 0); final EditText text = new EditText(context); diff --git a/Clover/app/src/main/res/layout/cell_header.xml b/Clover/app/src/main/res/layout/cell_header.xml index 2e9db536..952c2256 100644 --- a/Clover/app/src/main/res/layout/cell_header.xml +++ b/Clover/app/src/main/res/layout/cell_header.xml @@ -44,15 +44,4 @@ along with this program. If not, see . android:scaleType="center" tools:ignore="ContentDescription" /> - -