diff --git a/app_pojavlauncher/build.gradle b/app_pojavlauncher/build.gradle index a9f8ca1af8..669e0019ed 100644 --- a/app_pojavlauncher/build.gradle +++ b/app_pojavlauncher/build.gradle @@ -112,7 +112,7 @@ android { } defaultConfig { - applicationId "net.kdt.pojavlaunch" + applicationId "soldev.solcraftlauncher" minSdkVersion 21 targetSdkVersion 33 versionCode getDateSeconds() @@ -128,9 +128,9 @@ android { shrinkResources false proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' signingConfig signingConfigs.customDebug - resValue 'string', 'application_package', 'net.kdt.pojavlaunch.sol.debug' - resValue 'string', 'storageProviderAuthorities', 'net.kdt.pojavlaunch.scoped.gamefolder.debug' - resValue 'string', 'shareProviderAuthority', 'net.kdt.pojavlaunch.scoped.controlfolder.debug' + resValue 'string', 'application_package', 'soldev.solcraftlauncher.debug' + resValue 'string', 'storageProviderAuthorities', 'soldev.solcraftlauncher.scoped.gamefolder.debug' + resValue 'string', 'shareProviderAuthority', 'soldev.solcraftlauncher.scoped.controlfolder.debug' } proguard { initWith debug 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 deleted file mode 100644 index 2ef74ea851..0000000000 --- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/fragments/LocalLoginFragment.java +++ /dev/null @@ -1,53 +0,0 @@ -package net.kdt.pojavlaunch.fragments; - -import android.os.Bundle; -import android.view.View; -import android.widget.EditText; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.fragment.app.Fragment; - -import net.kdt.pojavlaunch.R; -import net.kdt.pojavlaunch.Tools; -import net.kdt.pojavlaunch.extra.ExtraConstants; -import net.kdt.pojavlaunch.extra.ExtraCore; - -import java.io.File; - -public class LocalLoginFragment extends Fragment { - public static final String TAG = "LOCAL_LOGIN_FRAGMENT"; - - private EditText mUsernameEditText; - - public LocalLoginFragment(){ - super(R.layout.fragment_local_login); - } - - @Override - public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { - mUsernameEditText = view.findViewById(R.id.login_edit_email); - view.findViewById(R.id.login_button).setOnClickListener(v -> { - if(!checkEditText()) return; - - ExtraCore.setValue(ExtraConstants.MOJANG_LOGIN_TODO, new String[]{ - mUsernameEditText.getText().toString(), "" }); - - Tools.swapFragment(requireActivity(), MainMenuFragment.class, MainMenuFragment.TAG, null); - }); - } - - - /** @return Whether the mail (and password) text are eligible to make an auth request */ - private boolean checkEditText(){ - - String text = mUsernameEditText.getText().toString(); - - return !(text.isEmpty() - || text.length() < 3 - || text.length() > 16 - || !text.matches("\\w+") - || new File(Tools.DIR_ACCOUNT_NEW + "/" + text + ".json").exists() - ); - } -}