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

UI v2 Tweaks and fixes by SerpentSpirale

Browse Source
This commit is contained in:
ArtDev 2021-01-09 20:49:16 +03:00 committed by GitHub
commit f9e10ef460
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 37 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/PojavLauncherActivity.java
View File

@ -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);
}
}
}

2
app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/prefs/LauncherPreferences.java
View File

@ -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);

BIN
app_pojavlauncher/src/main/res/drawable-xhdpi/hide_sidebar.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.1 KiB

13
app_pojavlauncher/src/main/res/layout/launcher_main_v4.xml
View File

@ -24,14 +24,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintGuide_percent="0.2" />
<androidx.constraintlayout.widget.Guideline
android:id="@+id/guidelineMiddle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintGuide_percent="0.625" />
app:layout_constraintGuide_percent="0.23" />
<androidx.constraintlayout.widget.Guideline
android:id="@+id/guidelineRight"
@ -255,9 +248,9 @@
android:onClick="launchGame"
android:text="@string/main_play"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/guidelineMiddle"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="@+id/guidelineMiddle"
app:layout_constraintStart_toStartOf="@+id/guidelineLeft"
app:layout_constraintTop_toTopOf="@+id/guidelineBottom" />
<TextView

2
app_pojavlauncher/src/main/res/values/strings.xml
View File

@ -87,6 +87,8 @@
<string name="mcl_setting_subtitle_uninstalljre">[Launcher restart required] This let you re-install Java Runtime</string>
<string name="mcl_setting_title_freeform">Launch Minecraft in Freeform mode</string>
<string name="mcl_setting_subtitle_freeform">Launch Minecraft in floating window. Requires Android 7.0+</string>
<string name="mcl_setting_title_hide_sidebar">Hide Sidebar</string>
<string name="mcl_setting_subtitle_hide_sidebar">Nostalgic folks preferring the old v1 UI might like this. Gives you a more fullscreen experience.</string>
<string name="mcl_setting_title_longpresstrigger">How long will trigger after long press</string>
<string name="mcl_setting_subtitle_longpresstrigger">Change trigger time for long press in destroy block and drop item.</string>
<string name="mcl_setting_title_buttonscale">Control buttons scaling</string>

7
app_pojavlauncher/src/main/res/xml/pref_main.xml
View File

@ -26,6 +26,13 @@
android:title="@string/mcl_setting_title_freeform"
app2:icon="@drawable/freeform_opt" />
<androidx.preference.SwitchPreferenceCompat
android:defaultValue="false"
android:key="hideSidebar"
android:summary="@string/mcl_setting_subtitle_hide_sidebar"
android:title="@string/mcl_setting_title_hide_sidebar"
app2:icon="@drawable/hide_sidebar" />
<EditTextPreference
android:dialogTitle="@string/mcl_setting_title_javaargs"
android:icon="@drawable/jre_args"