Refactor(quick settings): remove generic leading to unchecked typecast

PojavLauncherTeam · Nov 21, 2024 · 9c12611 · 9c12611
1 parent 371494c
commit 9c12611
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/app_pojavlauncher/src/main/java/com/kdt/SideDialogView.java b/app_pojavlauncher/src/main/java/com/kdt/SideDialogView.java
@@ -28,15 +28,14 @@
 /**
  * The base class for side dialog views
  * A side dialog is a dialog appearing from one side of the screen
- * @param <T> The type of the content view root
  */
-public abstract class SideDialogView<T extends View> {
+public abstract class SideDialogView {
 
     private final ViewGroup mParent;
     private final @LayoutRes int mLayoutId;
     private ViewGroup mDialogLayout;
     private DefocusableScrollView mScrollView;
-    protected T mDialogContent;
+    protected View mDialogContent;
 
     protected final int mMargin;
     private ObjectAnimator mSideDialogAnimator;
@@ -103,7 +102,7 @@ private void inflateLayout() {
         mTitleDivider = mDialogLayout.findViewById(R.id.side_dialog_title_divider);
 
         LayoutInflater.from(mParent.getContext()).inflate(mLayoutId, mScrollView, true);
-        mDialogContent = (T) mScrollView.getChildAt(0);
+        mDialogContent = mScrollView.getChildAt(0);
 
         // Attach layouts
         mParent.addView(mDialogLayout);

diff --git a/...er/src/main/java/net/kdt/pojavlaunch/customcontrols/handleview/EditControlSideDialog.java b/...er/src/main/java/net/kdt/pojavlaunch/customcontrols/handleview/EditControlSideDialog.java
@@ -40,7 +40,7 @@
 
 import java.util.List;
 
-public class EditControlSideDialog extends SideDialogView<ConstraintLayout> {
+public class EditControlSideDialog extends SideDialogView {
 
     private final Spinner[] mKeycodeSpinners = new Spinner[4];
     public boolean internalChanges = false; // True when we programmatically change stuff.
@@ -326,8 +326,8 @@ private void loadAdapter() {
     }
 
     private void setDefaultVisibilitySetting() {
-        for (int i = 0; i < mDialogContent.getChildCount(); ++i) {
-            mDialogContent.getChildAt(i).setVisibility(VISIBLE);
+        for (int i = 0; i < ((ViewGroup)mDialogContent).getChildCount(); ++i) {
+            ((ViewGroup)mDialogContent).getChildAt(i).setVisibility(VISIBLE);
         }
         for(Spinner s : mKeycodeSpinners) {
             s.setVisibility(View.INVISIBLE);

diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/prefs/QuickSettingSideDialog.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/prefs/QuickSettingSideDialog.java
@@ -29,7 +29,7 @@
  * Side dialog for quick settings that you can change in game
  * The implementation has to take action on some preference changes
  */
-public abstract class QuickSettingSideDialog extends com.kdt.SideDialogView<ConstraintLayout> {
+public abstract class QuickSettingSideDialog extends com.kdt.SideDialogView {
 
     private SharedPreferences.Editor mEditor;
     @SuppressLint("UseSwitchCompatOrMaterialCode")