TheCloud/Amethyst-Android
1
0
Fork 0
mirror of https://github.com/AngelAuraMC/Amethyst-Android.git synced 2025-09-17 16:47:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

Buttons are into packages now.

Browse Source
This commit is contained in:
SerpentSpirale 2021-05-28 20:17:13 +02:00 committed by SerpentSpirale
parent d1dc7ec645
commit 8a85ea819b
11 changed files with 29 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/MainActivity.java
View File

@ -10,6 +10,7 @@ import androidx.annotation.Nullable;
import com.google.android.material.navigation.NavigationView; import com.google.android.material.navigation.NavigationView;
import net.kdt.pojavlaunch.customcontrols.*; import net.kdt.pojavlaunch.customcontrols.*;
import net.kdt.pojavlaunch.customcontrols.buttons.ControlButton;
import net.kdt.pojavlaunch.prefs.*; import net.kdt.pojavlaunch.prefs.*;
import net.kdt.pojavlaunch.utils.MCOptionUtils; import net.kdt.pojavlaunch.utils.MCOptionUtils;

7
app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/ControlLayout.java
View File

@ -9,6 +9,9 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import net.kdt.pojavlaunch.*; 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 net.kdt.pojavlaunch.prefs.*;
import org.lwjgl.glfw.*; import org.lwjgl.glfw.*;
@ -268,7 +271,7 @@ public class ControlLayout extends FrameLayout
return mModifiable; return mModifiable;
} }
protected void setModified(boolean z) { public void setModified(boolean isModified) {
if (mActivity != null) mActivity.isModified = z; if (mActivity != null) mActivity.isModified = isModified;
} }
} }

5
app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/ControlButton.java → app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/buttons/ControlButton.java
View File

@ -1,4 +1,4 @@
package net.kdt.pojavlaunch.customcontrols; package net.kdt.pojavlaunch.customcontrols.buttons;
import android.content.*; import android.content.*;
import android.graphics.*; import android.graphics.*;
@ -8,6 +8,9 @@ import android.util.*;
import android.view.*; import android.view.*;
import android.view.View.*; import android.view.View.*;
import android.widget.*; 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.customcontrols.handleview.*;
import net.kdt.pojavlaunch.prefs.LauncherPreferences; import net.kdt.pojavlaunch.prefs.LauncherPreferences;
import net.kdt.pojavlaunch.*; import net.kdt.pojavlaunch.*;

9
app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/ControlDrawer.java → app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/buttons/ControlDrawer.java
View File

@ -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.MotionEvent;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import androidx.annotation.NonNull;
import net.kdt.pojavlaunch.Tools; 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; import java.util.ArrayList;

5
app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/ControlSubButton.java → app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/buttons/ControlSubButton.java
View File

@ -1,9 +1,12 @@
package net.kdt.pojavlaunch.customcontrols; package net.kdt.pojavlaunch.customcontrols.buttons;
import android.os.Handler; import android.os.Handler;
import android.os.Looper; import android.os.Looper;
import android.view.ViewGroup; import android.view.ViewGroup;
import net.kdt.pojavlaunch.customcontrols.ControlData;
import net.kdt.pojavlaunch.customcontrols.ControlLayout;
public class ControlSubButton extends ControlButton { public class ControlSubButton extends ControlButton {
public ControlDrawer parentDrawer; public ControlDrawer parentDrawer;

7
app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/handleview/ActionPopupWindow.java
View File

@ -19,10 +19,7 @@
*/ */
package net.kdt.pojavlaunch.customcontrols.handleview; package net.kdt.pojavlaunch.customcontrols.handleview;
import android.app.Dialog;
import android.content.*; import android.content.*;
import android.graphics.drawable.ColorDrawable;
import android.util.Log;
import android.view.*; import android.view.*;
import android.view.ViewGroup.*; import android.view.ViewGroup.*;
import android.widget.*; import android.widget.*;
@ -31,6 +28,10 @@ import net.kdt.pojavlaunch.*;
import android.view.View.OnClickListener; import android.view.View.OnClickListener;
import net.kdt.pojavlaunch.customcontrols.*; 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 androidx.appcompat.app.*;
import com.rarepebble.colorpicker.ColorPickerView; import com.rarepebble.colorpicker.ColorPickerView;

3
app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/handleview/EditControlButtonPopup.java
View File

@ -2,7 +2,6 @@ package net.kdt.pojavlaunch.customcontrols.handleview;
import android.app.Dialog; import android.app.Dialog;
import android.content.Context; import android.content.Context;
import android.content.DialogInterface;
import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.ColorDrawable;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
@ -18,7 +17,7 @@ import androidx.appcompat.app.AlertDialog;
import net.kdt.pojavlaunch.AndroidLWJGLKeycode; import net.kdt.pojavlaunch.AndroidLWJGLKeycode;
import net.kdt.pojavlaunch.R; 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 net.kdt.pojavlaunch.customcontrols.ControlData;
import static net.kdt.pojavlaunch.customcontrols.handleview.ActionPopupWindow.setPercentageText; import static net.kdt.pojavlaunch.customcontrols.handleview.ActionPopupWindow.setPercentageText;

14
app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/handleview/EditControlDrawerPopup.java
View File

@ -1,29 +1,17 @@
package net.kdt.pojavlaunch.customcontrols.handleview; package net.kdt.pojavlaunch.customcontrols.handleview;
import android.app.Dialog;
import android.content.Context; import android.content.Context;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.graphics.drawable.ColorDrawable;
import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.widget.ArrayAdapter; 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.Spinner;
import android.widget.TextView;
import androidx.appcompat.app.AlertDialog;
import net.kdt.pojavlaunch.R; import net.kdt.pojavlaunch.R;
import net.kdt.pojavlaunch.customcontrols.ControlData; 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.ControlDrawerData;
import net.kdt.pojavlaunch.customcontrols.ControlLayout; import net.kdt.pojavlaunch.customcontrols.ControlLayout;
import static net.kdt.pojavlaunch.customcontrols.handleview.ActionPopupWindow.setPercentageText;
public class EditControlDrawerPopup extends EditControlButtonPopup{ public class EditControlDrawerPopup extends EditControlButtonPopup{
private Spinner spinnerOrientation; private Spinner spinnerOrientation;

19
app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/handleview/EditControlSubButtonPopup.java
View File

@ -1,26 +1,9 @@
package net.kdt.pojavlaunch.customcontrols.handleview; 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.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.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;
public class EditControlSubButtonPopup extends EditControlButtonPopup{ public class EditControlSubButtonPopup extends EditControlButtonPopup{

6
app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/handleview/HandleView.java
View File

@ -22,13 +22,11 @@ package net.kdt.pojavlaunch.customcontrols.handleview;
import android.graphics.*; import android.graphics.*;
import android.graphics.drawable.*; import android.graphics.drawable.*;
import android.os.*; import android.os.*;
import android.text.*;
import android.view.*; import android.view.*;
import android.widget.*; import android.widget.*;
import android.content.*;
import java.lang.reflect.*;
import net.kdt.pojavlaunch.*; 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 public abstract class HandleView extends View implements ViewPositionListener, View.OnLongClickListener

5
app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/handleview/SelectionEndHandleView.java
View File

@ -20,10 +20,9 @@
package net.kdt.pojavlaunch.customcontrols.handleview; package net.kdt.pojavlaunch.customcontrols.handleview;
import android.graphics.drawable.*; import android.graphics.drawable.*;
import android.text.*;
import android.view.*; import android.view.*;
import android.os.*;
import net.kdt.pojavlaunch.customcontrols.*; import net.kdt.pojavlaunch.customcontrols.buttons.ControlButton;
public class SelectionEndHandleView extends HandleView public class SelectionEndHandleView extends HandleView