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

Code changes\n- Rename com.kdt.mojangauth to net.kdt.pojavlaunch.authenticator.mojang\n- A compile fix

Browse Source
This commit is contained in:
khanhduytran0 2020-12-23 16:03:00 +07:00
parent 3ff44f863f
commit 2260e05c99
17 changed files with 30 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,8 +4,8 @@ import android.app.*;
import android.content.*;
import android.util.*;
import android.view.*;
import com.kdt.mojangauth.*;
import java.io.*;
import net.kdt.pojavlaunch.authenticator.mojang.*;
public class MCProfile
{

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

@ -71,7 +71,8 @@ public class PojavLauncherActivity extends BaseLauncherActivity
viewPageAdapter.addFragment(new LauncherFragment(), R.drawable.ic_menu_news, getString(R.string.mcl_tab_news));
viewPageAdapter.addFragment(mConsoleView, R.drawable.ic_menu_java, getString(R.string.mcl_tab_console));
viewPageAdapter.addFragment(mCrashView, 0, getString(R.string.mcl_tab_crash));
viewPageAdapter.addFragment(new LauncherPreferenceFragment(), R.drawable.ic_menu_settings, getString(R.string.mcl_option_settings));
viewPageAdapter.addFragment(new LauncherPreferenceFragment(), R.drawable.ic_menu_settings,
getString(R.string.mcl_option_settings));
viewPager.setAdapter(viewPageAdapter);
// tabLayout.setTabMode(VerticalTabLayout.MODE_SCROLLABLE);
@ -134,7 +135,8 @@ public class PojavLauncherActivity extends BaseLauncherActivity
if (tempProfile != null && position == 0) {
PojavProfile.setCurrentProfile(PojavLauncherActivity.this, tempProfile);
} else {
PojavProfile.setCurrentProfile(PojavLauncherActivity.this, Tools.DIR_ACCOUNT_NEW + "/" + accountList.get(position + (tempProfile != null ? 1 : 0)) + ".json");
PojavProfile.setCurrentProfile(PojavLauncherActivity.this,
Tools.DIR_ACCOUNT_NEW + "/" + accountList.get(position + (tempProfile != null ? 1 : 0)) + ".json");
}
pickAccount();
}
@ -189,8 +191,10 @@ public class PojavLauncherActivity extends BaseLauncherActivity
protected float updateWidthHeight() {
float leftRightWidth = (float) CallbackBridge.windowWidth / 100f * 32f;
float mPlayButtonWidth = CallbackBridge.windowWidth - leftRightWidth * 2f;
LinearLayout.LayoutParams leftRightParams = new LinearLayout.LayoutParams((int) leftRightWidth, (int) Tools.dpToPx(CallbackBridge.windowHeight / 9));
LinearLayout.LayoutParams mPlayButtonParams = new LinearLayout.LayoutParams((int) mPlayButtonWidth, (int) Tools.dpToPx(CallbackBridge.windowHeight / 9));
LinearLayout.LayoutParams leftRightParams = new LinearLayout.LayoutParams((int) leftRightWidth,
(int) Tools.dpToPx(CallbackBridge.windowHeight / 9));
LinearLayout.LayoutParams mPlayButtonParams = new LinearLayout.LayoutParams((int) mPlayButtonWidth,
(int) Tools.dpToPx(CallbackBridge.windowHeight / 9));
leftView.setLayoutParams(leftRightParams);
rightView.setLayoutParams(leftRightParams);
mPlayButton.setLayoutParams(mPlayButtonParams);
@ -220,7 +224,8 @@ public class PojavLauncherActivity extends BaseLauncherActivity
}
public void statusIsLaunching(boolean isLaunching) {
LinearLayout.LayoutParams reparam = new LinearLayout.LayoutParams((int) updateWidthHeight(), LinearLayout.LayoutParams.WRAP_CONTENT);
LinearLayout.LayoutParams reparam = new LinearLayout.LayoutParams((int) updateWidthHeight(),
LinearLayout.LayoutParams.WRAP_CONTENT);
ViewGroup.MarginLayoutParams lmainTabParam = (ViewGroup.MarginLayoutParams) fullTab.getLayoutParams();
int launchVisibility = isLaunching ? View.VISIBLE : View.GONE;
mLaunchProgress.setVisibility(launchVisibility);

3
app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java
View File

@ -18,11 +18,11 @@ import android.util.*;
import android.view.*;
import android.widget.*;
import android.widget.CompoundButton.*;
import com.kdt.mojangauth.*;
import com.kdt.pickafile.*;
import java.io.*;
import java.util.*;
import net.kdt.pojavlaunch.authenticator.microsoft.*;
import net.kdt.pojavlaunch.authenticator.mojang.*;
import net.kdt.pojavlaunch.customcontrols.*;
import net.kdt.pojavlaunch.prefs.*;
import net.kdt.pojavlaunch.utils.*;
@ -688,7 +688,6 @@ public class PojavLoginActivity extends BaseActivity
builder.setPositiveButton(android.R.string.cancel, null);
builder.setTitle(this.getString(R.string.login_select_account));
builder.setMessage(R.string.hint_select_account);
builder.setSingleChoiceItems(listAdapter, 0, new DialogInterface.OnClickListener(){
@Override
public void onClick(final DialogInterface di, final int selectedIndex) {

4
app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/authenticator/microsoft/MicrosoftAuthTask.java
View File

@ -4,13 +4,13 @@ import android.app.*;
import android.content.*;
import android.os.*;
import android.util.*;
import com.kdt.mojangauth.*;
import com.kdt.mojangauth.yggdrasil.*;
import java.net.*;
import java.text.*;
import java.util.*;
import net.kdt.pojavlaunch.*;
import net.kdt.pojavlaunch.authenticator.mojang.*;
import net.kdt.pojavlaunch.authenticator.microsoft.*;
import org.json.*;
import java.text.ParseException;

4
app_pojavlauncher/src/main/java/com/kdt/mojangauth/InvalidateTokenTask.java → app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/InvalidateTokenTask.java
View File

@ -1,8 +1,8 @@
package com.kdt.mojangauth;
package net.kdt.pojavlaunch.authenticator.mojang;
import android.content.*;
import android.os.*;
import com.kdt.mojangauth.yggdrasil.*;
import net.kdt.pojavlaunch.authenticator.mojang.yggdrasil.*;
import java.io.*;
import java.util.*;
import net.kdt.pojavlaunch.*;

2
app_pojavlauncher/src/main/java/com/kdt/mojangauth/LoginListener.java → app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/LoginListener.java
View File

@ -1,4 +1,4 @@
package com.kdt.mojangauth;
package net.kdt.pojavlaunch.authenticator.mojang;
public interface LoginListener
{

4
app_pojavlauncher/src/main/java/com/kdt/mojangauth/LoginTask.java → app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/LoginTask.java
View File

@ -1,7 +1,7 @@
package com.kdt.mojangauth;
package net.kdt.pojavlaunch.authenticator.mojang;
import android.os.*;
import com.kdt.mojangauth.yggdrasil.*;
import net.kdt.pojavlaunch.authenticator.mojang.yggdrasil.*;
import java.io.*;
import java.util.*;
import net.kdt.pojavlaunch.*;

2
app_pojavlauncher/src/main/java/com/kdt/mojangauth/RefreshListener.java → app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/RefreshListener.java
View File

@ -1,4 +1,4 @@
package com.kdt.mojangauth;
package net.kdt.pojavlaunch.authenticator.mojang;
import net.kdt.pojavlaunch.*;
import net.kdt.pojavlaunch.value.*;

4
app_pojavlauncher/src/main/java/com/kdt/mojangauth/RefreshTokenTask.java → app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/RefreshTokenTask.java
View File

@ -1,11 +1,11 @@
package com.kdt.mojangauth;
package net.kdt.pojavlaunch.authenticator.mojang;
import android.content.*;
import android.os.*;
import com.google.gson.*;
import java.util.*;
import net.kdt.pojavlaunch.*;
import com.kdt.mojangauth.yggdrasil.*;
import net.kdt.pojavlaunch.authenticator.mojang.yggdrasil.*;
import android.app.*;
import net.kdt.pojavlaunch.value.*;

2
app_pojavlauncher/src/main/java/com/kdt/mojangauth/yggdrasil/AuthenticateRequest.java → app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/yggdrasil/AuthenticateRequest.java
View File

@ -1,4 +1,4 @@
package com.kdt.mojangauth.yggdrasil;
package net.kdt.pojavlaunch.authenticator.mojang.yggdrasil.*;
import java.util.UUID;

2
app_pojavlauncher/src/main/java/com/kdt/mojangauth/yggdrasil/AuthenticateResponse.java → app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/yggdrasil/AuthenticateResponse.java
View File

@ -1,4 +1,4 @@
package com.kdt.mojangauth.yggdrasil;
package net.kdt.pojavlaunch.authenticator.mojang.yggdrasil.*;
import java.util.UUID;

2
app_pojavlauncher/src/main/java/com/kdt/mojangauth/yggdrasil/ErrorResponse.java → app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/yggdrasil/ErrorResponse.java
View File

@ -1,4 +1,4 @@
package com.kdt.mojangauth.yggdrasil;
package net.kdt.pojavlaunch.authenticator.mojang.yggdrasil.*;
public class ErrorResponse {
public String cause;

2
app_pojavlauncher/src/main/java/com/kdt/mojangauth/yggdrasil/NetworkResponse.java → app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/yggdrasil/NetworkResponse.java
View File

@ -1,4 +1,4 @@
package com.kdt.mojangauth.yggdrasil;
package net.kdt.pojavlaunch.authenticator.mojang.yggdrasil.*;
import java.util.*;

2
app_pojavlauncher/src/main/java/com/kdt/mojangauth/yggdrasil/Profile.java → app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/yggdrasil/Profile.java
View File

@ -1,4 +1,4 @@
package com.kdt.mojangauth.yggdrasil;
package net.kdt.pojavlaunch.authenticator.mojang.yggdrasil.*;
public class Profile {
public String id;

2
app_pojavlauncher/src/main/java/com/kdt/mojangauth/yggdrasil/RefreshRequest.java → app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/yggdrasil/RefreshRequest.java
View File

@ -1,4 +1,4 @@
package com.kdt.mojangauth.yggdrasil;
package net.kdt.pojavlaunch.authenticator.mojang.yggdrasil.*;
import java.util.UUID;

2
app_pojavlauncher/src/main/java/com/kdt/mojangauth/yggdrasil/RefreshResponse.java → app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/yggdrasil/RefreshResponse.java
View File

@ -1,4 +1,4 @@
package com.kdt.mojangauth.yggdrasil;
package net.kdt.pojavlaunch.authenticator.mojang.yggdrasil.*;
import java.util.UUID;

2
app_pojavlauncher/src/main/java/com/kdt/mojangauth/yggdrasil/YggdrasilAuthenticator.java → app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/yggdrasil/YggdrasilAuthenticator.java
View File

@ -1,4 +1,4 @@
package com.kdt.mojangauth.yggdrasil;
package net.kdt.pojavlaunch.authenticator.mojang.yggdrasil.*;
import android.util.*;
import java.io.*;