diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/PojavLauncherActivity.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/PojavLauncherActivity.java index abfc21f95..bbca0dabc 100644 --- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/PojavLauncherActivity.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/PojavLauncherActivity.java @@ -16,6 +16,8 @@ import android.widget.Spinner; import android.widget.TextView; import android.widget.Toast; +import androidx.constraintlayout.widget.ConstraintLayout; +import androidx.constraintlayout.widget.Guideline; import androidx.viewpager.widget.ViewPager; import net.kdt.pojavlaunch.fragments.ConsoleFragment; @@ -28,6 +30,8 @@ import java.io.File; import java.util.ArrayList; import java.util.List; +import static net.kdt.pojavlaunch.prefs.LauncherPreferences.PREF_HIDE_SIDEBAR; + public class PojavLauncherActivity extends BaseLauncherActivity { @@ -199,6 +203,7 @@ public class PojavLauncherActivity extends BaseLauncherActivity statusIsLaunching(false); initTabs(0); + restoreOldLook(PREF_HIDE_SIDEBAR); } @@ -265,5 +270,23 @@ public class PojavLauncherActivity extends BaseLauncherActivity }, 500); } + private void restoreOldLook(boolean oldLookState){ + if(oldLookState){ + //UI v1 Style + //Hide the sidebar + Guideline guideLine = findViewById(R.id.guidelineLeft); + ConstraintLayout.LayoutParams params = (ConstraintLayout.LayoutParams) guideLine.getLayoutParams(); + params.guidePercent = 0; // 0%, range: 0 <-> 1 + guideLine.setLayoutParams(params); + + //Remove the selected Tab + selected.setVisibility(View.GONE); + + //Enlarge the button, but just a bit. + params = (ConstraintLayout.LayoutParams) mPlayButton.getLayoutParams(); + params.width = (int)(params.width*1.80); + mPlayButton.setLayoutParams(params); + } + } } diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/prefs/LauncherPreferences.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/prefs/LauncherPreferences.java index c314447bb..4b597f43f 100644 --- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/prefs/LauncherPreferences.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/prefs/LauncherPreferences.java @@ -12,6 +12,7 @@ public class LauncherPreferences public static boolean PREF_VERTYPE_OLDALPHA = false; public static boolean PREF_VERTYPE_OLDBETA = false; public static boolean PREF_FREEFORM = false; + public static boolean PREF_HIDE_SIDEBAR = false; public static float PREF_BUTTONSIZE = 100f; public static float PREF_MOUSESCALE = 100f; public static int PREF_LONGPRESS_TRIGGER = 500; @@ -24,6 +25,7 @@ public class LauncherPreferences PREF_BUTTONSIZE = DEFAULT_PREF.getInt("buttonscale", 100); PREF_MOUSESCALE = DEFAULT_PREF.getInt("mousescale", 100); PREF_FREEFORM = DEFAULT_PREF.getBoolean("freeform", false); + PREF_HIDE_SIDEBAR = DEFAULT_PREF.getBoolean("hideSidebar", false); PREF_VERTYPE_RELEASE = DEFAULT_PREF.getBoolean("vertype_release", true); PREF_VERTYPE_SNAPSHOT = DEFAULT_PREF.getBoolean("vertype_snapshot", false); PREF_VERTYPE_OLDALPHA = DEFAULT_PREF.getBoolean("vertype_oldalpha", false); diff --git a/app_pojavlauncher/src/main/res/drawable-xhdpi/hide_sidebar.png b/app_pojavlauncher/src/main/res/drawable-xhdpi/hide_sidebar.png new file mode 100755 index 000000000..b4d598d30 Binary files /dev/null and b/app_pojavlauncher/src/main/res/drawable-xhdpi/hide_sidebar.png differ diff --git a/app_pojavlauncher/src/main/res/layout/launcher_main_v4.xml b/app_pojavlauncher/src/main/res/layout/launcher_main_v4.xml index a4a83fcef..9ce8fb621 100644 --- a/app_pojavlauncher/src/main/res/layout/launcher_main_v4.xml +++ b/app_pojavlauncher/src/main/res/layout/launcher_main_v4.xml @@ -24,14 +24,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:orientation="vertical" - app:layout_constraintGuide_percent="0.2" /> - - + app:layout_constraintGuide_percent="0.23" /> [Launcher restart required] This let you re-install Java Runtime Launch Minecraft in Freeform mode Launch Minecraft in floating window. Requires Android 7.0+ + Hide Sidebar + Nostalgic folks preferring the old v1 UI might like this. Gives you a more fullscreen experience. How long will trigger after long press Change trigger time for long press in destroy block and drop item. Control buttons scaling diff --git a/app_pojavlauncher/src/main/res/xml/pref_main.xml b/app_pojavlauncher/src/main/res/xml/pref_main.xml index 389a77fe1..1e955686c 100644 --- a/app_pojavlauncher/src/main/res/xml/pref_main.xml +++ b/app_pojavlauncher/src/main/res/xml/pref_main.xml @@ -26,6 +26,13 @@ android:title="@string/mcl_setting_title_freeform" app2:icon="@drawable/freeform_opt" /> + +