diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/CustomControlsActivity.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/CustomControlsActivity.java index b7c6c9607..d97bedb21 100644 --- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/CustomControlsActivity.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/CustomControlsActivity.java @@ -22,14 +22,14 @@ import com.kdt.pickafile.FileSelectedListener; import net.kdt.pojavlaunch.customcontrols.ControlData; import net.kdt.pojavlaunch.customcontrols.ControlDrawerData; import net.kdt.pojavlaunch.customcontrols.ControlLayout; -import net.kdt.pojavlaunch.customcontrols.Exitable; +import net.kdt.pojavlaunch.customcontrols.EditorExitable; import net.kdt.pojavlaunch.prefs.LauncherPreferences; import java.io.File; import java.io.IOException; -public class CustomControlsActivity extends BaseActivity implements Exitable { +public class CustomControlsActivity extends BaseActivity implements EditorExitable { private DrawerLayout mDrawerLayout; private ListView mDrawerNavigationView; private ControlLayout mControlLayout; @@ -109,7 +109,7 @@ public class CustomControlsActivity extends BaseActivity implements Exitable { } - public static void save(final ControlLayout layout, final Exitable exitListener) { + public static void save(final ControlLayout layout, final EditorExitable exitListener) { final Context ctx = layout.getContext(); final EditText edit = new EditText(ctx); edit.setSingleLine(); @@ -136,9 +136,9 @@ public class CustomControlsActivity extends BaseActivity implements Exitable { private final AlertDialog mDialog; private final EditText mEditText; private final ControlLayout mLayout; - private final Exitable mListener; + private final EditorExitable mListener; - public OnClickExitListener(AlertDialog mDialog, EditText mEditText, ControlLayout mLayout, Exitable mListener) { + public OnClickExitListener(AlertDialog mDialog, EditText mEditText, ControlLayout mLayout, EditorExitable mListener) { this.mDialog = mDialog; this.mEditText = mEditText; this.mLayout = mLayout; @@ -163,7 +163,7 @@ public class CustomControlsActivity extends BaseActivity implements Exitable { } } - public static void showExitDialog(Context context, Exitable exitListener) { + public static void showExitDialog(Context context, EditorExitable exitListener) { AlertDialog.Builder builder = new AlertDialog.Builder(context); builder.setTitle(R.string.customctrl_editor_exit_title); builder.setMessage(R.string.customctrl_editor_exit_msg); 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 0170ffe85..fe3be6452 100644 --- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/MainActivity.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/MainActivity.java @@ -46,7 +46,7 @@ import net.kdt.pojavlaunch.customcontrols.ControlData; import net.kdt.pojavlaunch.customcontrols.ControlDrawerData; import net.kdt.pojavlaunch.customcontrols.ControlLayout; import net.kdt.pojavlaunch.customcontrols.CustomControls; -import net.kdt.pojavlaunch.customcontrols.Exitable; +import net.kdt.pojavlaunch.customcontrols.EditorExitable; import net.kdt.pojavlaunch.customcontrols.keyboard.LwjglCharSender; import net.kdt.pojavlaunch.customcontrols.keyboard.TouchCharInput; import net.kdt.pojavlaunch.prefs.LauncherPreferences; @@ -62,7 +62,7 @@ import org.lwjgl.glfw.CallbackBridge; import java.io.File; import java.io.IOException; -public class MainActivity extends BaseActivity implements ControlButtonMenuListener, Exitable { +public class MainActivity extends BaseActivity implements ControlButtonMenuListener, EditorExitable { public static volatile ClipboardManager GLOBAL_CLIPBOARD; public static final String INTENT_MINECRAFT_VERSION = "intent_version"; 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 f0ebc0f9f..a5c6d9981 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 @@ -408,11 +408,11 @@ public class ControlLayout extends FrameLayout { return mGameSurface; } - public void askToExit(Exitable exitable) { + public void askToExit(EditorExitable editorExitable) { if(mIsModified) { - CustomControlsActivity.save(this, exitable); + CustomControlsActivity.save(this, editorExitable); }else{ - CustomControlsActivity.showExitDialog(getContext(), exitable); + CustomControlsActivity.showExitDialog(getContext(), editorExitable); } } } diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/Exitable.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/EditorExitable.java similarity index 67% rename from app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/Exitable.java rename to app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/EditorExitable.java index c70ae484a..f977f6358 100644 --- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/Exitable.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/EditorExitable.java @@ -1,5 +1,5 @@ package net.kdt.pojavlaunch.customcontrols; -public interface Exitable { +public interface EditorExitable { void exitEditor(); }