From 8a85ea819ba4ed612714f1727a203f8da04f24f6 Mon Sep 17 00:00:00 2001 From: SerpentSpirale Date: Fri, 28 May 2021 20:17:13 +0200 Subject: [PATCH] Buttons are into packages now. --- .../net/kdt/pojavlaunch/MainActivity.java | 1 + .../customcontrols/ControlLayout.java | 7 +++++-- .../{ => buttons}/ControlButton.java | 5 ++++- .../{ => buttons}/ControlDrawer.java | 9 ++++----- .../{ => buttons}/ControlSubButton.java | 5 ++++- .../handleview/ActionPopupWindow.java | 7 ++++--- .../handleview/EditControlButtonPopup.java | 3 +-- .../handleview/EditControlDrawerPopup.java | 14 +------------- .../handleview/EditControlSubButtonPopup.java | 19 +------------------ .../customcontrols/handleview/HandleView.java | 6 ++---- .../handleview/SelectionEndHandleView.java | 5 ++--- 11 files changed, 29 insertions(+), 52 deletions(-) rename app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/{ => buttons}/ControlButton.java (98%) rename app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/{ => buttons}/ControlDrawer.java (95%) rename app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/{ => buttons}/ControlSubButton.java (87%) diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/MainActivity.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/MainActivity.java index 6fb848679..f63c0dd98 100644 --- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/MainActivity.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/MainActivity.java @@ -10,6 +10,7 @@ import androidx.annotation.Nullable; import com.google.android.material.navigation.NavigationView; import net.kdt.pojavlaunch.customcontrols.*; +import net.kdt.pojavlaunch.customcontrols.buttons.ControlButton; import net.kdt.pojavlaunch.prefs.*; import net.kdt.pojavlaunch.utils.MCOptionUtils; diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/ControlLayout.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/ControlLayout.java index df5fdc9da..b6965bdc9 100644 --- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/ControlLayout.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/ControlLayout.java @@ -9,6 +9,9 @@ import java.util.ArrayList; import java.util.List; import net.kdt.pojavlaunch.*; +import net.kdt.pojavlaunch.customcontrols.buttons.ControlButton; +import net.kdt.pojavlaunch.customcontrols.buttons.ControlDrawer; +import net.kdt.pojavlaunch.customcontrols.buttons.ControlSubButton; import net.kdt.pojavlaunch.prefs.*; import org.lwjgl.glfw.*; @@ -268,7 +271,7 @@ public class ControlLayout extends FrameLayout return mModifiable; } - protected void setModified(boolean z) { - if (mActivity != null) mActivity.isModified = z; + public void setModified(boolean isModified) { + if (mActivity != null) mActivity.isModified = isModified; } } diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/ControlButton.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/buttons/ControlButton.java similarity index 98% rename from app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/ControlButton.java rename to app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/buttons/ControlButton.java index d29bffe25..b9f5890ed 100644 --- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/ControlButton.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/buttons/ControlButton.java @@ -1,4 +1,4 @@ -package net.kdt.pojavlaunch.customcontrols; +package net.kdt.pojavlaunch.customcontrols.buttons; import android.content.*; import android.graphics.*; @@ -8,6 +8,9 @@ import android.util.*; import android.view.*; import android.view.View.*; import android.widget.*; + +import net.kdt.pojavlaunch.customcontrols.ControlData; +import net.kdt.pojavlaunch.customcontrols.ControlLayout; import net.kdt.pojavlaunch.customcontrols.handleview.*; import net.kdt.pojavlaunch.prefs.LauncherPreferences; import net.kdt.pojavlaunch.*; diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/ControlDrawer.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/buttons/ControlDrawer.java similarity index 95% rename from app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/ControlDrawer.java rename to app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/buttons/ControlDrawer.java index ea751fcfc..6b341c33c 100644 --- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/ControlDrawer.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/buttons/ControlDrawer.java @@ -1,14 +1,13 @@ -package net.kdt.pojavlaunch.customcontrols; +package net.kdt.pojavlaunch.customcontrols.buttons; -import android.content.Context; -import android.util.Log; import android.view.MotionEvent; import android.view.View; import android.view.ViewGroup; -import androidx.annotation.NonNull; - import net.kdt.pojavlaunch.Tools; +import net.kdt.pojavlaunch.customcontrols.ControlData; +import net.kdt.pojavlaunch.customcontrols.ControlDrawerData; +import net.kdt.pojavlaunch.customcontrols.ControlLayout; import java.util.ArrayList; diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/ControlSubButton.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/buttons/ControlSubButton.java similarity index 87% rename from app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/ControlSubButton.java rename to app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/buttons/ControlSubButton.java index b09e37911..ce43c5881 100644 --- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/ControlSubButton.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/buttons/ControlSubButton.java @@ -1,9 +1,12 @@ -package net.kdt.pojavlaunch.customcontrols; +package net.kdt.pojavlaunch.customcontrols.buttons; import android.os.Handler; import android.os.Looper; import android.view.ViewGroup; +import net.kdt.pojavlaunch.customcontrols.ControlData; +import net.kdt.pojavlaunch.customcontrols.ControlLayout; + public class ControlSubButton extends ControlButton { public ControlDrawer parentDrawer; diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/handleview/ActionPopupWindow.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/handleview/ActionPopupWindow.java index 7f1b16854..5c4836cc9 100644 --- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/handleview/ActionPopupWindow.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/handleview/ActionPopupWindow.java @@ -19,10 +19,7 @@ */ package net.kdt.pojavlaunch.customcontrols.handleview; -import android.app.Dialog; import android.content.*; -import android.graphics.drawable.ColorDrawable; -import android.util.Log; import android.view.*; import android.view.ViewGroup.*; import android.widget.*; @@ -31,6 +28,10 @@ import net.kdt.pojavlaunch.*; import android.view.View.OnClickListener; import net.kdt.pojavlaunch.customcontrols.*; +import net.kdt.pojavlaunch.customcontrols.buttons.ControlButton; +import net.kdt.pojavlaunch.customcontrols.buttons.ControlDrawer; +import net.kdt.pojavlaunch.customcontrols.buttons.ControlSubButton; + import androidx.appcompat.app.*; import com.rarepebble.colorpicker.ColorPickerView; diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/handleview/EditControlButtonPopup.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/handleview/EditControlButtonPopup.java index 600eec17b..a07355f1b 100644 --- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/handleview/EditControlButtonPopup.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/handleview/EditControlButtonPopup.java @@ -2,7 +2,6 @@ package net.kdt.pojavlaunch.customcontrols.handleview; import android.app.Dialog; import android.content.Context; -import android.content.DialogInterface; import android.graphics.drawable.ColorDrawable; import android.view.LayoutInflater; import android.view.View; @@ -18,7 +17,7 @@ import androidx.appcompat.app.AlertDialog; import net.kdt.pojavlaunch.AndroidLWJGLKeycode; import net.kdt.pojavlaunch.R; -import net.kdt.pojavlaunch.customcontrols.ControlButton; +import net.kdt.pojavlaunch.customcontrols.buttons.ControlButton; import net.kdt.pojavlaunch.customcontrols.ControlData; import static net.kdt.pojavlaunch.customcontrols.handleview.ActionPopupWindow.setPercentageText; diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/handleview/EditControlDrawerPopup.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/handleview/EditControlDrawerPopup.java index 123396858..fffdc3d24 100644 --- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/handleview/EditControlDrawerPopup.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/handleview/EditControlDrawerPopup.java @@ -1,29 +1,17 @@ package net.kdt.pojavlaunch.customcontrols.handleview; -import android.app.Dialog; import android.content.Context; import android.content.DialogInterface; -import android.graphics.drawable.ColorDrawable; -import android.view.LayoutInflater; import android.view.View; import android.widget.ArrayAdapter; -import android.widget.CheckBox; -import android.widget.EditText; -import android.widget.ImageButton; -import android.widget.SeekBar; import android.widget.Spinner; -import android.widget.TextView; - -import androidx.appcompat.app.AlertDialog; import net.kdt.pojavlaunch.R; import net.kdt.pojavlaunch.customcontrols.ControlData; -import net.kdt.pojavlaunch.customcontrols.ControlDrawer; +import net.kdt.pojavlaunch.customcontrols.buttons.ControlDrawer; import net.kdt.pojavlaunch.customcontrols.ControlDrawerData; import net.kdt.pojavlaunch.customcontrols.ControlLayout; -import static net.kdt.pojavlaunch.customcontrols.handleview.ActionPopupWindow.setPercentageText; - public class EditControlDrawerPopup extends EditControlButtonPopup{ private Spinner spinnerOrientation; diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/handleview/EditControlSubButtonPopup.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/handleview/EditControlSubButtonPopup.java index 4e0022e03..e8c1f99c8 100644 --- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/handleview/EditControlSubButtonPopup.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/handleview/EditControlSubButtonPopup.java @@ -1,26 +1,9 @@ package net.kdt.pojavlaunch.customcontrols.handleview; -import android.app.Dialog; -import android.content.Context; -import android.graphics.drawable.ColorDrawable; -import android.view.LayoutInflater; import android.view.View; -import android.widget.ArrayAdapter; -import android.widget.CheckBox; -import android.widget.EditText; -import android.widget.ImageButton; -import android.widget.SeekBar; -import android.widget.Spinner; -import android.widget.TextView; -import androidx.appcompat.app.AlertDialog; - -import net.kdt.pojavlaunch.AndroidLWJGLKeycode; import net.kdt.pojavlaunch.R; -import net.kdt.pojavlaunch.customcontrols.ControlButton; -import net.kdt.pojavlaunch.customcontrols.ControlData; - -import static net.kdt.pojavlaunch.customcontrols.handleview.ActionPopupWindow.setPercentageText; +import net.kdt.pojavlaunch.customcontrols.buttons.ControlButton; public class EditControlSubButtonPopup extends EditControlButtonPopup{ diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/handleview/HandleView.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/handleview/HandleView.java index 8611f3f5e..46e122905 100644 --- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/handleview/HandleView.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/handleview/HandleView.java @@ -22,13 +22,11 @@ package net.kdt.pojavlaunch.customcontrols.handleview; import android.graphics.*; import android.graphics.drawable.*; import android.os.*; -import android.text.*; import android.view.*; import android.widget.*; -import android.content.*; -import java.lang.reflect.*; + import net.kdt.pojavlaunch.*; -import net.kdt.pojavlaunch.customcontrols.*; +import net.kdt.pojavlaunch.customcontrols.buttons.ControlButton; public abstract class HandleView extends View implements ViewPositionListener, View.OnLongClickListener diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/handleview/SelectionEndHandleView.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/handleview/SelectionEndHandleView.java index 1dd401451..eb606da4e 100644 --- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/handleview/SelectionEndHandleView.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/handleview/SelectionEndHandleView.java @@ -20,10 +20,9 @@ package net.kdt.pojavlaunch.customcontrols.handleview; import android.graphics.drawable.*; -import android.text.*; import android.view.*; -import android.os.*; -import net.kdt.pojavlaunch.customcontrols.*; + +import net.kdt.pojavlaunch.customcontrols.buttons.ControlButton; public class SelectionEndHandleView extends HandleView