Skip to content

Commit 89e1d83

Browse files
sarsamurmusarsamurmu
committed
Code cleanup
1 parent 3fb70fd commit 89e1d83

29 files changed

+146
-223
lines changed

‎extLibs/PreLollipopTransitions/src/main/java/com/kogitune/activitytransition/ActivityTransitionLauncher.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,5 @@ public void launch(Intent intent) {
6767

6868
intent.putExtras(createBundle());
6969
ActivityCompat.startActivity(activity, intent, createOptions());
70-
return;
7170
}
7271
}

‎extLibs/PreLollipopTransitions/src/main/java/com/kogitune/activitytransition/BuildConfigUtils.java‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,7 @@ public static Object getBuildConfigValue(Context context, String fieldName) {
2727
Class<?> clazz = Class.forName(context.getPackageName() + ".BuildConfig");
2828
Field field = clazz.getField(fieldName);
2929
return field.get(null);
30-
} catch (ClassNotFoundException e) {
31-
e.printStackTrace();
32-
} catch (NoSuchFieldException e) {
33-
e.printStackTrace();
34-
} catch (IllegalAccessException e) {
30+
} catch (ClassNotFoundException | NoSuchFieldException | IllegalAccessException e) {
3531
e.printStackTrace();
3632
}
3733
return null;

‎extLibs/PreLollipopTransitions/src/main/java/com/kogitune/activitytransition/ExitActivityTransition.java‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,7 @@ public void exit(final Activity activity) {
4242
if (interpolator == null) {
4343
interpolator = new DecelerateInterpolator();
4444
}
45-
TransitionAnimation.startExitAnimation(moveData, interpolator, () -> {
46-
activity.finishAfterTransition();
47-
return;
48-
});
45+
TransitionAnimation.startExitAnimation(moveData, interpolator, activity::finishAfterTransition);
4946
}
5047

5148
}

‎extLibs/PreLollipopTransitions/src/main/java/com/kogitune/activitytransition/core/TransitionAnimation.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,7 @@ public static void setImageToView(View toView, String imageFilePath) {
107107
}
108108

109109
private static void setImageToView(View toView, Bitmap bitmap) {
110-
if (toView instanceof ImageView) {
111-
final ImageView toImageView = (ImageView) toView;
110+
if (toView instanceof ImageView toImageView) {
112111
toImageView.setImageBitmap(bitmap);
113112
} else {
114113
ViewCompat.setBackground(toView, new BitmapDrawable(toView.getResources(), bitmap));
@@ -117,6 +116,5 @@ private static void setImageToView(View toView, Bitmap bitmap) {
117116

118117
public static void startExitAnimation(MoveData moveData, TimeInterpolator interpolator, final Runnable endAction) {
119118
endAction.run();
120-
return;
121119
}
122120
}

‎library/src/main/java/candybar/lib/activities/CandyBarWallpaperActivity.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
import android.os.Bundle;
1414
import android.os.Handler;
1515
import android.transition.Transition;
16-
import android.util.Log;
1716
import android.view.MenuItem;
1817
import android.view.View;
1918
import android.view.WindowInsets;
@@ -30,7 +29,6 @@
3029
import androidx.coordinatorlayout.widget.CoordinatorLayout;
3130
import androidx.core.app.ActivityCompat;
3231
import androidx.core.graphics.Insets;
33-
import androidx.core.view.OnApplyWindowInsetsListener;
3432
import androidx.core.view.ViewCompat;
3533
import androidx.core.view.WindowInsetsCompat;
3634
import androidx.palette.graphics.Palette;
@@ -45,8 +43,6 @@
4543
import com.danimahardhika.android.helpers.animation.AnimationHelper;
4644
import com.danimahardhika.android.helpers.core.ColorHelper;
4745
import com.danimahardhika.android.helpers.core.DrawableHelper;
48-
import com.danimahardhika.android.helpers.core.WindowHelper;
49-
import com.danimahardhika.android.helpers.core.utils.LogUtil;
5046
import com.danimahardhika.android.helpers.permission.PermissionCode;
5147
import com.kogitune.activitytransition.ActivityTransition;
5248
import com.kogitune.activitytransition.ExitActivityTransition;

‎library/src/main/java/candybar/lib/adapters/AboutAdapter.java‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -215,8 +215,7 @@ private class HeaderViewHolder extends RecyclerView.ViewHolder {
215215
subtitle.getPaddingRight(),
216216
subtitle.getPaddingBottom() + mContext.getResources().getDimensionPixelSize(R.dimen.content_margin));
217217
} else {
218-
if (recyclerView.getLayoutParams() instanceof LinearLayout.LayoutParams) {
219-
LinearLayout.LayoutParams params = (LinearLayout.LayoutParams) recyclerView.getLayoutParams();
218+
if (recyclerView.getLayoutParams() instanceof LinearLayout.LayoutParams params) {
220219
if (urls.length < 7) {
221220
params.width = LinearLayout.LayoutParams.WRAP_CONTENT;
222221
params.gravity = Gravity.CENTER_HORIZONTAL;
@@ -229,11 +228,10 @@ private class HeaderViewHolder extends RecyclerView.ViewHolder {
229228
MaterialCardView card = itemView.findViewById(R.id.card);
230229
if (CandyBarApplication.getConfiguration().getAboutStyle() == CandyBarApplication.Style.PORTRAIT_FLAT_LANDSCAPE_FLAT &&
231230
card != null) {
232-
if (card.getLayoutParams() instanceof StaggeredGridLayoutManager.LayoutParams) {
231+
if (card.getLayoutParams() instanceof StaggeredGridLayoutManager.LayoutParams params) {
233232
card.setRadius(0f);
234233
card.setUseCompatPadding(false);
235234
int margin = mContext.getResources().getDimensionPixelSize(R.dimen.card_margin);
236-
StaggeredGridLayoutManager.LayoutParams params = (StaggeredGridLayoutManager.LayoutParams) card.getLayoutParams();
237235
params.setMargins(0, 0, margin, margin);
238236
params.setMarginEnd(margin);
239237
}
@@ -276,11 +274,10 @@ private class ExtraInfoViewHolder extends RecyclerView.ViewHolder implements Vie
276274
MaterialCardView card = itemView.findViewById(R.id.card);
277275
if (CandyBarApplication.getConfiguration().getAboutStyle() == CandyBarApplication.Style.PORTRAIT_FLAT_LANDSCAPE_FLAT &&
278276
card != null) {
279-
if (card.getLayoutParams() instanceof StaggeredGridLayoutManager.LayoutParams) {
277+
if (card.getLayoutParams() instanceof StaggeredGridLayoutManager.LayoutParams params) {
280278
card.setRadius(0f);
281279
card.setUseCompatPadding(false);
282280
int margin = mContext.getResources().getDimensionPixelSize(R.dimen.card_margin);
283-
StaggeredGridLayoutManager.LayoutParams params = (StaggeredGridLayoutManager.LayoutParams) card.getLayoutParams();
284281
params.setMargins(0, 0, margin, margin);
285282
params.setMarginEnd(margin);
286283
}
@@ -384,11 +381,10 @@ private class FooterViewHolder extends RecyclerView.ViewHolder implements View.O
384381
MaterialCardView card = itemView.findViewById(R.id.card);
385382
if (CandyBarApplication.getConfiguration().getAboutStyle() == CandyBarApplication.Style.PORTRAIT_FLAT_LANDSCAPE_FLAT &&
386383
card != null) {
387-
if (card.getLayoutParams() instanceof StaggeredGridLayoutManager.LayoutParams) {
384+
if (card.getLayoutParams() instanceof StaggeredGridLayoutManager.LayoutParams params) {
388385
card.setRadius(0f);
389386
card.setUseCompatPadding(false);
390387
int margin = mContext.getResources().getDimensionPixelSize(R.dimen.card_margin);
391-
StaggeredGridLayoutManager.LayoutParams params = (StaggeredGridLayoutManager.LayoutParams) card.getLayoutParams();
392388
params.setMargins(0, 0, margin, margin);
393389
params.setMarginEnd(margin);
394390
}

‎library/src/main/java/candybar/lib/adapters/HomeAdapter.java‎

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -390,18 +390,16 @@ private class HeaderViewHolder extends RecyclerView.ViewHolder implements View.O
390390

391391
MaterialCardView card = itemView.findViewById(R.id.card);
392392
if (CandyBarApplication.getConfiguration().getHomeGrid() == CandyBarApplication.GridStyle.FLAT) {
393-
if (card.getLayoutParams() instanceof StaggeredGridLayoutManager.LayoutParams) {
393+
if (card.getLayoutParams() instanceof StaggeredGridLayoutManager.LayoutParams params) {
394394
card.setRadius(0f);
395395
card.setUseCompatPadding(false);
396396
int margin = mContext.getResources().getDimensionPixelSize(R.dimen.card_margin);
397-
StaggeredGridLayoutManager.LayoutParams params = (StaggeredGridLayoutManager.LayoutParams) card.getLayoutParams();
398397
params.setMargins(0, 0, margin, margin);
399398
params.setMarginEnd(margin);
400-
} else if (card.getLayoutParams() instanceof LinearLayout.LayoutParams) {
399+
} else if (card.getLayoutParams() instanceof LinearLayout.LayoutParams params) {
401400
card.setRadius(0f);
402401
card.setUseCompatPadding(false);
403402
int margin = mContext.getResources().getDimensionPixelSize(R.dimen.card_margin);
404-
LinearLayout.LayoutParams params = (LinearLayout.LayoutParams) card.getLayoutParams();
405403
if (mImageStyle.getType() == Home.Style.Type.LANDSCAPE ||
406404
mImageStyle.getType() == Home.Style.Type.SQUARE) {
407405
params.setMargins(margin,
@@ -654,11 +652,10 @@ private class ContentViewHolder extends RecyclerView.ViewHolder implements View.
654652

655653
MaterialCardView card = itemView.findViewById(R.id.card);
656654
if (CandyBarApplication.getConfiguration().getHomeGrid() == CandyBarApplication.GridStyle.FLAT) {
657-
if (card.getLayoutParams() instanceof StaggeredGridLayoutManager.LayoutParams) {
655+
if (card.getLayoutParams() instanceof StaggeredGridLayoutManager.LayoutParams params) {
658656
card.setRadius(0f);
659657
card.setUseCompatPadding(false);
660658
int margin = mContext.getResources().getDimensionPixelSize(R.dimen.card_margin);
661-
StaggeredGridLayoutManager.LayoutParams params = (StaggeredGridLayoutManager.LayoutParams) card.getLayoutParams();
662659
params.setMargins(0, 0, margin, margin);
663660
params.setMarginEnd(margin);
664661
}
@@ -714,13 +711,12 @@ public void onClick(View view) {
714711
put("item", "donate");
715712
}}
716713
);
717-
if (mContext instanceof CandyBarMainActivity) {
714+
if (mContext instanceof CandyBarMainActivity mainActivity) {
718715
if (CandyBarApplication.getConfiguration().getDonationLinks() != null) {
719716
DonationLinksFragment.showDonationLinksDialog(((AppCompatActivity) mContext).getSupportFragmentManager());
720717
break;
721718
}
722719

723-
CandyBarMainActivity mainActivity = (CandyBarMainActivity) mContext;
724720
mainActivity.showSupportDevelopmentDialog();
725721
}
726722
break;
@@ -783,11 +779,10 @@ private class IconRequestViewHolder extends RecyclerView.ViewHolder implements V
783779

784780
MaterialCardView card = itemView.findViewById(R.id.card);
785781
if (CandyBarApplication.getConfiguration().getHomeGrid() == CandyBarApplication.GridStyle.FLAT) {
786-
if (card.getLayoutParams() instanceof StaggeredGridLayoutManager.LayoutParams) {
782+
if (card.getLayoutParams() instanceof StaggeredGridLayoutManager.LayoutParams params) {
787783
card.setRadius(0f);
788784
card.setUseCompatPadding(false);
789785
int margin = mContext.getResources().getDimensionPixelSize(R.dimen.card_margin);
790-
StaggeredGridLayoutManager.LayoutParams params = (StaggeredGridLayoutManager.LayoutParams) card.getLayoutParams();
791786
params.setMargins(0, 0, margin, margin);
792787
params.setMarginEnd(margin);
793788
}
@@ -847,11 +842,10 @@ private class WallpapersViewHolder extends RecyclerView.ViewHolder implements Vi
847842

848843
MaterialCardView card = itemView.findViewById(R.id.card);
849844
if (CandyBarApplication.getConfiguration().getHomeGrid() == CandyBarApplication.GridStyle.FLAT) {
850-
if (card.getLayoutParams() instanceof StaggeredGridLayoutManager.LayoutParams) {
845+
if (card.getLayoutParams() instanceof StaggeredGridLayoutManager.LayoutParams params) {
851846
card.setRadius(0f);
852847
card.setUseCompatPadding(false);
853848
int margin = mContext.getResources().getDimensionPixelSize(R.dimen.card_margin);
854-
StaggeredGridLayoutManager.LayoutParams params = (StaggeredGridLayoutManager.LayoutParams) card.getLayoutParams();
855849
params.setMargins(0, 0, margin, margin);
856850
params.setMarginEnd(margin);
857851
}
@@ -907,11 +901,10 @@ private class GooglePlayDevViewHolder extends RecyclerView.ViewHolder implements
907901

908902
MaterialCardView card = itemView.findViewById(R.id.card);
909903
if (CandyBarApplication.getConfiguration().getHomeGrid() == CandyBarApplication.GridStyle.FLAT) {
910-
if (card.getLayoutParams() instanceof StaggeredGridLayoutManager.LayoutParams) {
904+
if (card.getLayoutParams() instanceof StaggeredGridLayoutManager.LayoutParams params) {
911905
card.setRadius(0f);
912906
card.setUseCompatPadding(false);
913907
int margin = mContext.getResources().getDimensionPixelSize(R.dimen.card_margin);
914-
StaggeredGridLayoutManager.LayoutParams params = (StaggeredGridLayoutManager.LayoutParams) card.getLayoutParams();
915908
params.setMargins(0, 0, margin, margin);
916909
params.setMarginEnd(margin);
917910
}

‎library/src/main/java/candybar/lib/adapters/IconsAdapter.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -193,8 +193,7 @@ public void onAttachedToRecyclerView(@NonNull RecyclerView recyclerView) {
193193
super.onAttachedToRecyclerView(recyclerView);
194194
mRecyclerView = new WeakReference<>(recyclerView);
195195
RecyclerView.LayoutManager manager = recyclerView.getLayoutManager();
196-
if (manager instanceof GridLayoutManager && getItemCount() > 0) {
197-
GridLayoutManager glm = (GridLayoutManager) manager;
196+
if (manager instanceof GridLayoutManager glm && getItemCount() > 0) {
198197
recyclerView.addOnScrollListener(new RecyclerView.OnScrollListener() {
199198
@Override
200199
public void onScrollStateChanged(@NonNull RecyclerView recyclerView, int newState) {

‎library/src/main/java/candybar/lib/adapters/LauncherAdapter.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,9 @@
1717
import com.bumptech.glide.load.engine.DiskCacheStrategy;
1818
import com.bumptech.glide.load.resource.bitmap.BitmapTransitionOptions;
1919

20-
import java.util.HashMap;
2120
import java.util.List;
2221

2322
import candybar.lib.R;
24-
import candybar.lib.applications.CandyBarApplication;
2523
import candybar.lib.helpers.LauncherHelper;
2624
import candybar.lib.items.Icon;
2725
import candybar.lib.preferences.Preferences;

‎library/src/main/java/candybar/lib/adapters/RequestAdapter.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -309,11 +309,10 @@ private class HeaderViewHolder extends RecyclerView.ViewHolder implements View.O
309309
MaterialCardView card = itemView.findViewById(R.id.card);
310310
if (CandyBarApplication.getConfiguration().getRequestStyle() == CandyBarApplication.Style.PORTRAIT_FLAT_LANDSCAPE_FLAT &&
311311
card != null) {
312-
if (card.getLayoutParams() instanceof StaggeredGridLayoutManager.LayoutParams) {
312+
if (card.getLayoutParams() instanceof StaggeredGridLayoutManager.LayoutParams params) {
313313
card.setRadius(0f);
314314
card.setUseCompatPadding(false);
315315
int margin = mContext.getResources().getDimensionPixelSize(R.dimen.card_margin);
316-
StaggeredGridLayoutManager.LayoutParams params = (StaggeredGridLayoutManager.LayoutParams) card.getLayoutParams();
317316
params.setMargins(0, 0, margin, margin);
318317
params.setMarginEnd(margin);
319318
}
@@ -400,11 +399,10 @@ private class ContentViewHolder extends RecyclerView.ViewHolder implements View.
400399
MaterialCardView card = itemView.findViewById(R.id.card);
401400
if (CandyBarApplication.getConfiguration().getRequestStyle() == CandyBarApplication.Style.PORTRAIT_FLAT_LANDSCAPE_FLAT &&
402401
card != null) {
403-
if (card.getLayoutParams() instanceof StaggeredGridLayoutManager.LayoutParams) {
402+
if (card.getLayoutParams() instanceof StaggeredGridLayoutManager.LayoutParams params) {
404403
card.setRadius(0f);
405404
card.setUseCompatPadding(false);
406405
int margin = mContext.getResources().getDimensionPixelSize(R.dimen.card_margin);
407-
StaggeredGridLayoutManager.LayoutParams params = (StaggeredGridLayoutManager.LayoutParams) card.getLayoutParams();
408406
params.setMargins(0, 0, margin, margin);
409407
params.setMarginEnd(margin);
410408
}

0 commit comments

Comments
 (0)