Skip to content

Commit

Permalink
Remove unnecessary if statements
Browse files Browse the repository at this point in the history
  • Loading branch information
@sarsamurmu
sarsamurmu committed Jun 26, 2023
1 parent 76cd2e5 commit 7f448c7
Show file tree
Hide file tree
Showing 18 changed files with 83 additions and 190 deletions.
36 changes: 14 additions & 22 deletions ...LollipopTransitions/src/main/java/com/kogitune/activitytransition/ActivityTransition.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.os.Build;
import android.os.Bundle;
import android.transition.ChangeBounds;
import android.transition.ChangeImageTransform;
Expand All @@ -32,7 +31,6 @@

import androidx.core.view.ViewCompat;

import com.kogitune.activitytransition.core.MoveData;
import com.kogitune.activitytransition.core.TransitionAnimation;
import com.kogitune.activitytransition.core.TransitionData;

Expand Down Expand Up @@ -75,28 +73,22 @@ public ExitActivityTransition start(Bundle savedInstanceState) {
}

final Bundle bundle = fromIntent.getExtras();
if (Build.VERSION.SDK_INT >= 21) {
final TransitionData transitionData = new TransitionData(toView.getContext(), bundle);
if (transitionData.imageFilePath != null) {
TransitionAnimation.setImageToView(toView, transitionData.imageFilePath);
}

ViewCompat.setTransitionName(toView, toViewName);
final Window window = ((Activity) context).getWindow();
TransitionSet set = new TransitionSet();
set.addTransition(new ChangeBounds());
set.addTransition(new ChangeImageTransform());
set.setInterpolator(interpolator);

window.setSharedElementEnterTransition(set);
window.setSharedElementReturnTransition(set);

return new ExitActivityTransition(null);
final TransitionData transitionData = new TransitionData(toView.getContext(), bundle);
if (transitionData.imageFilePath != null) {
TransitionAnimation.setImageToView(toView, transitionData.imageFilePath);
}
final Context context = toView.getContext();
final MoveData moveData = TransitionAnimation.startAnimation(context, toView, bundle, savedInstanceState, duration, interpolator);

return new ExitActivityTransition(moveData);
ViewCompat.setTransitionName(toView, toViewName);
final Window window = ((Activity) context).getWindow();
TransitionSet set = new TransitionSet();
set.addTransition(new ChangeBounds());
set.addTransition(new ChangeImageTransform());
set.setInterpolator(interpolator);

window.setSharedElementEnterTransition(set);
window.setSharedElementReturnTransition(set);

return new ExitActivityTransition(null);
}

}
9 changes: 2 additions & 7 deletions ...Transitions/src/main/java/com/kogitune/activitytransition/ActivityTransitionLauncher.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
import android.app.Activity;
import android.content.Intent;
import android.graphics.Bitmap;
import android.os.Build;
import android.os.Bundle;
import android.view.View;

Expand Down Expand Up @@ -67,11 +66,7 @@ public Bundle createOptions() {
public void launch(Intent intent) {

intent.putExtras(createBundle());
if (Build.VERSION.SDK_INT >= 16) {
ActivityCompat.startActivity(activity, intent, createOptions());
return;
}
activity.startActivity(intent);
activity.overridePendingTransition(0, 0);
ActivityCompat.startActivity(activity, intent, createOptions());
return;
}
}
9 changes: 2 additions & 7 deletions ...ipopTransitions/src/main/java/com/kogitune/activitytransition/ExitActivityTransition.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@

import android.animation.TimeInterpolator;
import android.app.Activity;
import android.os.Build;
import android.view.animation.DecelerateInterpolator;

import com.kogitune.activitytransition.core.MoveData;
Expand All @@ -44,12 +43,8 @@ public void exit(final Activity activity) {
interpolator = new DecelerateInterpolator();
}
TransitionAnimation.startExitAnimation(moveData, interpolator, () -> {
if (Build.VERSION.SDK_INT >= 21) {
activity.finishAfterTransition();
return;
}
activity.finish();
activity.overridePendingTransition(0, 0);
activity.finishAfterTransition();
return;
});
}

Expand Down
19 changes: 2 additions & 17 deletions ...opTransitions/src/main/java/com/kogitune/activitytransition/core/TransitionAnimation.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.graphics.drawable.BitmapDrawable;
import android.os.Build;
import android.os.Bundle;
import android.view.View;
import android.view.ViewTreeObserver;
Expand Down Expand Up @@ -117,21 +116,7 @@ private static void setImageToView(View toView, Bitmap bitmap) {
}

public static void startExitAnimation(MoveData moveData, TimeInterpolator interpolator, final Runnable endAction) {
if (Build.VERSION.SDK_INT >= 21) {
endAction.run();
return;
}
View view = moveData.toView;
int duration = moveData.duration;
int leftDelta = moveData.leftDelta;
int topDelta = moveData.topDelta;
float widthScale = moveData.widthScale;
float heightScale = moveData.heightScale;
view.animate()
.setDuration(duration)
.scaleX(widthScale).scaleY(heightScale)
.setInterpolator(interpolator).
translationX(leftDelta).translationY(topDelta);
view.postDelayed(endAction, duration);
endAction.run();
return;
}
}
13 changes: 4 additions & 9 deletions ...ns/src/main/java/com/kogitune/activitytransition/fragment/FragmentTransitionLauncher.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
import android.app.Fragment;
import android.content.Context;
import android.graphics.Bitmap;
import android.os.Build;
import android.os.Bundle;
import android.transition.ChangeBounds;
import android.view.View;
Expand Down Expand Up @@ -54,19 +53,15 @@ public FragmentTransitionLauncher image(final Bitmap bitmap) {

public void prepare(Fragment toFragment) {
final Bundle transitionBundle = TransitionBundleFactory.createTransitionBundle(context, fromView, bitmap);
if (Build.VERSION.SDK_INT >= 21) {
toFragment.setSharedElementEnterTransition(new ChangeBounds());
toFragment.setSharedElementReturnTransition(new ChangeBounds());
}
toFragment.setSharedElementEnterTransition(new ChangeBounds());
toFragment.setSharedElementReturnTransition(new ChangeBounds());
toFragment.setArguments(transitionBundle);
}

public void prepare(androidx.fragment.app.Fragment toFragment) {
final Bundle transitionBundle = TransitionBundleFactory.createTransitionBundle(context, fromView, bitmap);
if (Build.VERSION.SDK_INT >= 21) {
toFragment.setSharedElementEnterTransition(new ChangeBounds());
toFragment.setSharedElementReturnTransition(new ChangeBounds());
}
toFragment.setSharedElementEnterTransition(new ChangeBounds());
toFragment.setSharedElementReturnTransition(new ChangeBounds());
toFragment.setArguments(transitionBundle);
}
}
30 changes: 14 additions & 16 deletions library/src/main/java/candybar/lib/activities/CandyBarMainActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -194,22 +194,20 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
initNavigationView(toolbar);
initNavigationViewHeader();

if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
getWindow().addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
getWindow().clearFlags(
WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION | WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
getWindow().setNavigationBarColor(ContextCompat.getColor(this, R.color.navigationBar));
getWindow().setStatusBarColor(ContextCompat.getColor(this, R.color.colorPrimaryDark));
mDrawerLayout.setStatusBarBackground(R.color.colorPrimaryDark);
int visibilityFlags = 0;
if (ColorHelper.isLightColor(ContextCompat.getColor(this, R.color.colorPrimaryDark)) &&
Build.VERSION.SDK_INT >= Build.VERSION_CODES.M)
visibilityFlags |= View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR;
if (ColorHelper.isLightColor(ContextCompat.getColor(this, R.color.navigationBar)) &&
Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
visibilityFlags |= View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR;
getWindow().getDecorView().setSystemUiVisibility(visibilityFlags);
}
getWindow().addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
getWindow().clearFlags(
WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION | WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
getWindow().setNavigationBarColor(ContextCompat.getColor(this, R.color.navigationBar));
getWindow().setStatusBarColor(ContextCompat.getColor(this, R.color.colorPrimaryDark));
mDrawerLayout.setStatusBarBackground(R.color.colorPrimaryDark);
int visibilityFlags = 0;
if (ColorHelper.isLightColor(ContextCompat.getColor(this, R.color.colorPrimaryDark)) &&
Build.VERSION.SDK_INT >= Build.VERSION_CODES.M)
visibilityFlags |= View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR;
if (ColorHelper.isLightColor(ContextCompat.getColor(this, R.color.navigationBar)) &&
Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
visibilityFlags |= View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR;
getWindow().getDecorView().setSystemUiVisibility(visibilityFlags);

try {
startService(new Intent(this, CandyBarService.class));
Expand Down
28 changes: 13 additions & 15 deletions library/src/main/java/candybar/lib/activities/CandyBarWallpaperActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
PorterDuff.Mode.SRC_IN);
}

if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP && savedInstanceState == null) {
if (savedInstanceState == null) {
Transition transition = getWindow().getSharedElementEnterTransition();

if (transition != null) {
Expand Down Expand Up @@ -436,22 +436,20 @@ private void resetBottomBarPadding() {
int bottom = 0;
int right = WindowHelper.getNavigationBarHeight(this);

if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
if (mBack.getLayoutParams() instanceof CoordinatorLayout.LayoutParams) {
CoordinatorLayout.LayoutParams params = (CoordinatorLayout.LayoutParams) mBack.getLayoutParams();
params.topMargin = WindowHelper.getStatusBarHeight(this);
}
if (mBack.getLayoutParams() instanceof CoordinatorLayout.LayoutParams) {
CoordinatorLayout.LayoutParams params = (CoordinatorLayout.LayoutParams) mBack.getLayoutParams();
params.topMargin = WindowHelper.getStatusBarHeight(this);
}

boolean tabletMode = getResources().getBoolean(com.danimahardhika.android.helpers.core.R.bool.android_helpers_tablet_mode);
if (tabletMode || getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT) {
bottom = right;
right = 0;
}
boolean tabletMode = getResources().getBoolean(com.danimahardhika.android.helpers.core.R.bool.android_helpers_tablet_mode);
if (tabletMode || getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT) {
bottom = right;
right = 0;
}

if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
if (isInMultiWindowMode()) {
bottom = right = 0;
}
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
if (isInMultiWindowMode()) {
bottom = right = 0;
}
}

Expand Down
13 changes: 3 additions & 10 deletions library/src/main/java/candybar/lib/adapters/AboutAdapter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
import android.content.Intent;
import android.graphics.Color;
import android.net.Uri;
import android.os.Build;
import android.text.method.LinkMovementMethod;
import android.util.Log;
import android.view.Gravity;
Expand Down Expand Up @@ -235,9 +234,7 @@ private class HeaderViewHolder extends RecyclerView.ViewHolder {
int margin = mContext.getResources().getDimensionPixelSize(R.dimen.card_margin);
StaggeredGridLayoutManager.LayoutParams params = (StaggeredGridLayoutManager.LayoutParams) card.getLayoutParams();
params.setMargins(0, 0, margin, margin);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
params.setMarginEnd(margin);
}
params.setMarginEnd(margin);
}
}

Expand Down Expand Up @@ -286,9 +283,7 @@ private class ExtraInfoViewHolder extends RecyclerView.ViewHolder implements Vie
int margin = mContext.getResources().getDimensionPixelSize(R.dimen.card_margin);
StaggeredGridLayoutManager.LayoutParams params = (StaggeredGridLayoutManager.LayoutParams) card.getLayoutParams();
params.setMargins(0, 0, margin, margin);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
params.setMarginEnd(margin);
}
params.setMarginEnd(margin);
}
}

Expand Down Expand Up @@ -396,9 +391,7 @@ private class FooterViewHolder extends RecyclerView.ViewHolder implements View.O
int margin = mContext.getResources().getDimensionPixelSize(R.dimen.card_margin);
StaggeredGridLayoutManager.LayoutParams params = (StaggeredGridLayoutManager.LayoutParams) card.getLayoutParams();
params.setMargins(0, 0, margin, margin);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
params.setMarginEnd(margin);
}
params.setMarginEnd(margin);
}
}

Expand Down
24 changes: 6 additions & 18 deletions library/src/main/java/candybar/lib/adapters/HomeAdapter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -395,9 +395,7 @@ private class HeaderViewHolder extends RecyclerView.ViewHolder implements View.O
int margin = mContext.getResources().getDimensionPixelSize(R.dimen.card_margin);
StaggeredGridLayoutManager.LayoutParams params = (StaggeredGridLayoutManager.LayoutParams) card.getLayoutParams();
params.setMargins(0, 0, margin, margin);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
params.setMarginEnd(margin);
}
params.setMarginEnd(margin);
} else if (card.getLayoutParams() instanceof LinearLayout.LayoutParams) {
card.setRadius(0f);
card.setUseCompatPadding(false);
Expand All @@ -409,9 +407,7 @@ private class HeaderViewHolder extends RecyclerView.ViewHolder implements View.O
mContext.getResources().getDimensionPixelSize(R.dimen.content_padding_reverse),
margin, margin);
}
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
params.setMarginEnd(margin);
}
params.setMarginEnd(margin);
}
}

Expand Down Expand Up @@ -663,9 +659,7 @@ private class ContentViewHolder extends RecyclerView.ViewHolder implements View.
int margin = mContext.getResources().getDimensionPixelSize(R.dimen.card_margin);
StaggeredGridLayoutManager.LayoutParams params = (StaggeredGridLayoutManager.LayoutParams) card.getLayoutParams();
params.setMargins(0, 0, margin, margin);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
params.setMarginEnd(margin);
}
params.setMarginEnd(margin);
}
}

Expand Down Expand Up @@ -794,9 +788,7 @@ private class IconRequestViewHolder extends RecyclerView.ViewHolder implements V
int margin = mContext.getResources().getDimensionPixelSize(R.dimen.card_margin);
StaggeredGridLayoutManager.LayoutParams params = (StaggeredGridLayoutManager.LayoutParams) card.getLayoutParams();
params.setMargins(0, 0, margin, margin);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
params.setMarginEnd(margin);
}
params.setMarginEnd(margin);
}
}

Expand Down Expand Up @@ -860,9 +852,7 @@ private class WallpapersViewHolder extends RecyclerView.ViewHolder implements Vi
int margin = mContext.getResources().getDimensionPixelSize(R.dimen.card_margin);
StaggeredGridLayoutManager.LayoutParams params = (StaggeredGridLayoutManager.LayoutParams) card.getLayoutParams();
params.setMargins(0, 0, margin, margin);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
params.setMarginEnd(margin);
}
params.setMarginEnd(margin);
}
}

Expand Down Expand Up @@ -922,9 +912,7 @@ private class GooglePlayDevViewHolder extends RecyclerView.ViewHolder implements
int margin = mContext.getResources().getDimensionPixelSize(R.dimen.card_margin);
StaggeredGridLayoutManager.LayoutParams params = (StaggeredGridLayoutManager.LayoutParams) card.getLayoutParams();
params.setMargins(0, 0, margin, margin);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
params.setMarginEnd(margin);
}
params.setMarginEnd(margin);
}
}

Expand Down
9 changes: 3 additions & 6 deletions library/src/main/java/candybar/lib/adapters/PresetsAdapter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
import android.content.pm.PackageManager;
import android.graphics.drawable.Drawable;
import android.net.Uri;
import android.os.Build;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
Expand Down Expand Up @@ -172,11 +171,9 @@ class ViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener
card.setCardElevation(0);
}

if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
StateListAnimator stateListAnimator = AnimatorInflater
.loadStateListAnimator(mContext, R.animator.card_lift);
card.setStateListAnimator(stateListAnimator);
}
StateListAnimator stateListAnimator = AnimatorInflater
.loadStateListAnimator(mContext, R.animator.card_lift);
card.setStateListAnimator(stateListAnimator);

if (wallpaperDrawable != null) {
((HeaderView) itemView.findViewById(R.id.wallpaper_bg)).setImageDrawable(wallpaperDrawable);
Expand Down
Loading

0 comments on commit 7f448c7

Please sign in to comment.