From 337fda2023aed4115958e0df0b414e9a404a5022 Mon Sep 17 00:00:00 2001 From: Viktor De Pasquale Date: Mon, 13 May 2019 15:41:46 +0200 Subject: [PATCH] Removed unnecessary classes --- .../com/topjohnwu/magisk/view/Expandable.java | 40 ------------ .../magisk/view/ExpandableViewHolder.java | 65 ------------------- 2 files changed, 105 deletions(-) delete mode 100644 app/src/main/java/com/topjohnwu/magisk/view/Expandable.java delete mode 100644 app/src/main/java/com/topjohnwu/magisk/view/ExpandableViewHolder.java diff --git a/app/src/main/java/com/topjohnwu/magisk/view/Expandable.java b/app/src/main/java/com/topjohnwu/magisk/view/Expandable.java deleted file mode 100644 index 82471b66d..000000000 --- a/app/src/main/java/com/topjohnwu/magisk/view/Expandable.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.topjohnwu.magisk.view; - -public abstract class Expandable { - - private boolean mExpanded = false; - - public final boolean isExpanded() { - return mExpanded; - } - - public final void setExpanded(boolean expanded) { - mExpanded = expanded; - onSetExpanded(expanded); - } - - public final void expand() { - if (mExpanded) - return; - onExpand(); - mExpanded = true; - } - - public final void collapse() { - if (!mExpanded) - return; - onCollapse(); - mExpanded = false; - } - - protected abstract void onExpand(); - - protected abstract void onCollapse(); - - protected void onSetExpanded(boolean expanded) { - if (expanded) - onExpand(); - else - onCollapse(); - } -} diff --git a/app/src/main/java/com/topjohnwu/magisk/view/ExpandableViewHolder.java b/app/src/main/java/com/topjohnwu/magisk/view/ExpandableViewHolder.java deleted file mode 100644 index f27b96b31..000000000 --- a/app/src/main/java/com/topjohnwu/magisk/view/ExpandableViewHolder.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.topjohnwu.magisk.view; - -import android.animation.ValueAnimator; -import android.view.View; -import android.view.ViewGroup; -import android.view.ViewTreeObserver; - -public class ExpandableViewHolder extends Expandable { - - private ViewGroup expandLayout; - private ValueAnimator expandAnimator, collapseAnimator; - private int expandHeight = 0; - - public ExpandableViewHolder(ViewGroup viewGroup) { - expandLayout = viewGroup; - setExpanded(false); - expandLayout.getViewTreeObserver().addOnPreDrawListener( - new ViewTreeObserver.OnPreDrawListener() { - - @Override - public boolean onPreDraw() { - if (expandHeight == 0) { - expandLayout.measure(0, 0); - expandHeight = expandLayout.getMeasuredHeight(); - } - - expandLayout.getViewTreeObserver().removeOnPreDrawListener(this); - expandAnimator = slideAnimator(0, expandHeight); - collapseAnimator = slideAnimator(expandHeight, 0); - return true; - } - - }); - } - - @Override - protected void onExpand() { - expandLayout.setVisibility(View.VISIBLE); - expandAnimator.start(); - } - - @Override - protected void onCollapse() { - collapseAnimator.start(); - } - - @Override - protected void onSetExpanded(boolean expanded) { - ViewGroup.LayoutParams layoutParams = expandLayout.getLayoutParams(); - layoutParams.height = expanded ? expandHeight : 0; - expandLayout.setLayoutParams(layoutParams); - } - - private ValueAnimator slideAnimator(int start, int end) { - ValueAnimator animator = ValueAnimator.ofInt(start, end); - - animator.addUpdateListener(valueAnimator -> { - int value = (Integer) valueAnimator.getAnimatedValue(); - ViewGroup.LayoutParams layoutParams = expandLayout.getLayoutParams(); - layoutParams.height = value; - expandLayout.setLayoutParams(layoutParams); - }); - return animator; - } -}