From a2e383c5e53268bf4c94459331609d2ad6036fc8 Mon Sep 17 00:00:00 2001 From: SerpentSpirale Date: Sat, 9 Jan 2021 18:31:47 +0100 Subject: [PATCH] - Added a new option: Hide SideBar ! Requres a UI restart for now. --- .../pojavlaunch/PojavLauncherActivity.java | 23 ++++++++++++++++++ .../prefs/LauncherPreferences.java | 2 ++ .../main/res/drawable-xhdpi/hide_sidebar.png | Bin 0 -> 4178 bytes .../src/main/res/values/strings.xml | 2 ++ .../src/main/res/xml/pref_main.xml | 7 ++++++ 5 files changed, 34 insertions(+) create mode 100755 app_pojavlauncher/src/main/res/drawable-xhdpi/hide_sidebar.png 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 0000000000000000000000000000000000000000..b4d598d309e67eee4af984f0dd86b3a2b489f640 GIT binary patch literal 4178 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 F{ts%cX!-yE literal 0 HcmV?d00001 diff --git a/app_pojavlauncher/src/main/res/values/strings.xml b/app_pojavlauncher/src/main/res/values/strings.xml index f93d82628..4b7a4d79d 100644 --- a/app_pojavlauncher/src/main/res/values/strings.xml +++ b/app_pojavlauncher/src/main/res/values/strings.xml @@ -87,6 +87,8 @@ [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" /> + +