From 11bbbc3cf6d4c764c032a5e7535a2fa1b029aea5 Mon Sep 17 00:00:00 2001 From: SolDev69 Date: Thu, 7 Nov 2024 12:36:00 -0500 Subject: [PATCH] Re-add local mode accounts --- .../assets/components/arc_dns_injector/version | 2 +- .../assets/components/forge_installer/version | 2 +- .../src/main/assets/components/lwjgl3/version | 2 +- .../fragments/LocalLoginFragment.java | 3 ++- .../fragments/SelectAuthFragment.java | 4 +++- .../res/layout/fragment_select_auth_method.xml | 16 +++++++++++++++- 6 files changed, 23 insertions(+), 6 deletions(-) diff --git a/app_pojavlauncher/src/main/assets/components/arc_dns_injector/version b/app_pojavlauncher/src/main/assets/components/arc_dns_injector/version index 67353d36f5..e05dda690a 100644 --- a/app_pojavlauncher/src/main/assets/components/arc_dns_injector/version +++ b/app_pojavlauncher/src/main/assets/components/arc_dns_injector/version @@ -1 +1 @@ -1716170694497 \ No newline at end of file +1731000005209 \ No newline at end of file diff --git a/app_pojavlauncher/src/main/assets/components/forge_installer/version b/app_pojavlauncher/src/main/assets/components/forge_installer/version index f9ebf9a63a..3c06219080 100644 --- a/app_pojavlauncher/src/main/assets/components/forge_installer/version +++ b/app_pojavlauncher/src/main/assets/components/forge_installer/version @@ -1 +1 @@ -1716170694527 \ No newline at end of file +1731000005256 \ No newline at end of file diff --git a/app_pojavlauncher/src/main/assets/components/lwjgl3/version b/app_pojavlauncher/src/main/assets/components/lwjgl3/version index dd8b53ff4f..bf09493f2c 100644 --- a/app_pojavlauncher/src/main/assets/components/lwjgl3/version +++ b/app_pojavlauncher/src/main/assets/components/lwjgl3/version @@ -1 +1 @@ -1716170694562 \ No newline at end of file +1731000005291 \ No newline at end of file diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/fragments/LocalLoginFragment.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/fragments/LocalLoginFragment.java index e7c71f326b..ecfcd999cc 100644 --- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/fragments/LocalLoginFragment.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/fragments/LocalLoginFragment.java @@ -33,7 +33,8 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat if(!checkEditText()) return; ExtraCore.setValue(ExtraConstants.MOJANG_LOGIN_TODO, new String[]{ - mUsernameEditText.getText().toString(), "" }); + mUsernameEditText.getText().toString(), "" + }); Tools.swapFragment(requireActivity(), MainMenuFragment.class, MainMenuFragment.TAG, null); }); diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/fragments/SelectAuthFragment.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/fragments/SelectAuthFragment.java index 78288109f3..f440581368 100644 --- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/fragments/SelectAuthFragment.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/fragments/SelectAuthFragment.java @@ -21,7 +21,9 @@ public SelectAuthFragment(){ @Override public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { Button mMicrosoftButton = view.findViewById(R.id.button_microsoft_authentication); + Button mLocalButton = view.findViewById(R.id.button_local_authentication); mMicrosoftButton.setOnClickListener(v -> Tools.swapFragment(requireActivity(), MicrosoftLoginFragment.class, MicrosoftLoginFragment.TAG, null)); + mLocalButton.setOnClickListener(v -> Tools.swapFragment(requireActivity(), LocalLoginFragment.class, LocalLoginFragment.TAG, null)); } -} +} \ No newline at end of file diff --git a/app_pojavlauncher/src/main/res/layout/fragment_select_auth_method.xml b/app_pojavlauncher/src/main/res/layout/fragment_select_auth_method.xml index f98672f654..cfe0dba89b 100644 --- a/app_pojavlauncher/src/main/res/layout/fragment_select_auth_method.xml +++ b/app_pojavlauncher/src/main/res/layout/fragment_select_auth_method.xml @@ -28,10 +28,24 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginHorizontal="@dimen/_25sdp" - android:layout_marginTop="104dp" + android:layout_marginTop="52dp" android:text="Microsoft Account" android:textSize="@dimen/_12ssp" app:layout_constraintEnd_toEndOf="@+id/login_menu" + app:layout_constraintHorizontal_bias="0.676" + app:layout_constraintStart_toStartOf="@+id/login_menu" + app:layout_constraintTop_toTopOf="@id/login_menu" + app:layout_constraintVertical_chainStyle="packed" /> + +