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

Merge branch 'v3_openjdk' of https://github.com/PojavLauncherTeam/PojavLauncher into v3_openjdk

Browse Source
This commit is contained in:
khanhduytran0 2020-12-11 05:33:13 +07:00
commit b3107c70fd
34 changed files with 179 additions and 172 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/build.gradle
View File

@ -61,14 +61,14 @@ dependencies {
implementation 'javax.annotation:javax.annotation-api:1.3.2' implementation 'javax.annotation:javax.annotation-api:1.3.2'
implementation 'commons-codec:commons-codec:1.14' implementation 'commons-codec:commons-codec:1.14'
implementation 'com.wu-man:android-bsf-api:3.1.3' implementation 'com.wu-man:android-bsf-api:3.1.3'
implementation 'com.android.support:support-v4:26.0.0' implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation 'com.android.support:preference-v7:26.0.0' implementation 'androidx.preference:preference:1.0.0'
implementation 'com.android.support:appcompat-v7:26.0.0' implementation 'androidx.appcompat:appcompat:1.0.0'
implementation 'com.android.support:preference-v14:26.0.0' implementation 'androidx.legacy:legacy-preference-v14:1.0.0'
implementation 'com.android.support:design:26.0.0' implementation 'com.google.android.material:material:1.0.0'
implementation 'com.android.support:support-annotations:26.0.0' implementation 'androidx.annotation:annotation:1.0.0'
// implementation 'androidx.browser:browser:1.0.0' // implementation 'androidx.browser:browser:1.0.0'
implementation 'com.android.support:customtabs:25.2.0' implementation 'androidx.browser:browser:1.0.0'
// implementation 'com.intuit.sdp:sdp-android:1.0.5' // implementation 'com.intuit.sdp:sdp-android:1.0.5'
// implementation 'com.intuit.ssp:ssp-android:1.0.5' // implementation 'com.intuit.ssp:ssp-android:1.0.5'

86
app/src/main/java/android/support/design/widget/VerticalTabLayout.java
View File

@ -16,14 +16,15 @@
package android.support.design.widget; package android.support.design.widget;
import static android.support.annotation.RestrictTo.Scope.LIBRARY_GROUP; import static androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP;
import static android.support.v4.view.ViewPager.SCROLL_STATE_DRAGGING; import static androidx.viewpager.widget.ViewPager.SCROLL_STATE_DRAGGING;
import static android.support.v4.view.ViewPager.SCROLL_STATE_IDLE; import static androidx.viewpager.widget.ViewPager.SCROLL_STATE_IDLE;
import static android.support.v4.view.ViewPager.SCROLL_STATE_SETTLING; import static androidx.viewpager.widget.ViewPager.SCROLL_STATE_SETTLING;
import android.animation.Animator; import android.animation.Animator;
import android.animation.AnimatorListenerAdapter; import android.animation.AnimatorListenerAdapter;
import android.animation.ValueAnimator; import android.animation.ValueAnimator;
import android.annotation.SuppressLint;
import android.content.Context; import android.content.Context;
import android.content.res.ColorStateList; import android.content.res.ColorStateList;
import android.content.res.Resources; import android.content.res.Resources;
@ -33,26 +34,29 @@ import android.graphics.Canvas;
import android.graphics.Paint; import android.graphics.Paint;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.os.Build; import android.os.Build;
import android.support.annotation.ColorInt; import androidx.annotation.ColorInt;
import android.support.annotation.DrawableRes; import androidx.annotation.DrawableRes;
import android.support.annotation.IntDef; import androidx.annotation.IntDef;
import android.support.annotation.LayoutRes; import androidx.annotation.LayoutRes;
import android.support.annotation.NonNull; import androidx.annotation.NonNull;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import android.support.annotation.RestrictTo; import androidx.annotation.RestrictTo;
import android.support.annotation.StringRes; import androidx.annotation.StringRes;
import android.support.design.R; import com.google.android.material.R;
import android.support.design.widget.*;
import android.support.v4.util.Pools; import androidx.core.util.Pools;
import android.support.v4.view.GravityCompat; import androidx.core.view.GravityCompat;
import android.support.v4.view.PagerAdapter; import androidx.fragment.app.Fragment;
import android.support.v4.view.PointerIconCompat; import androidx.fragment.app.FragmentManager;
import android.support.v4.view.ViewCompat; import androidx.fragment.app.FragmentPagerAdapter;
import android.support.v4.view.ViewPager; import androidx.viewpager.widget.PagerAdapter;
import android.support.v4.widget.TextViewCompat; import androidx.core.view.PointerIconCompat;
import android.support.v7.app.ActionBar; import androidx.core.view.ViewCompat;
import android.support.v7.content.res.AppCompatResources; import androidx.viewpager.widget.ViewPager;
import android.support.v7.widget.TooltipCompat; import androidx.core.widget.TextViewCompat;
import androidx.appcompat.app.ActionBar;
import androidx.appcompat.content.res.AppCompatResources;
import androidx.appcompat.widget.TooltipCompat;
import android.text.Layout; import android.text.Layout;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.AttributeSet; import android.util.AttributeSet;
@ -76,7 +80,11 @@ import java.lang.ref.WeakReference;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Iterator; import java.util.Iterator;
import java.util.*; import java.util.*;
import android.support.v4.app.*; import androidx.core.app.*;
import com.google.android.material.animation.AnimationUtils;
import com.google.android.material.tabs.TabItem;
import com.google.android.material.tabs.TabLayout;
/** /**
* VerticalTabLayout provides a vertical layout to display tabs. * VerticalTabLayout provides a vertical layout to display tabs.
@ -114,7 +122,7 @@ import android.support.v4.app.*;
* *
* <h3>ViewPager integration</h3> * <h3>ViewPager integration</h3>
* <p> * <p>
* If you're using a {@link android.support.v4.view.ViewPager} together * If you're using a {@link ViewPager} together
* with this layout, you can call {@link #setupWithViewPager(ViewPager)} to link the two together. * with this layout, you can call {@link #setupWithViewPager(ViewPager)} to link the two together.
* This layout will be automatically populated from the {@link PagerAdapter}'s page titles.</p> * This layout will be automatically populated from the {@link PagerAdapter}'s page titles.</p>
* *
@ -299,7 +307,7 @@ public class VerticalTabLayout extends LinearLayout {
public VerticalTabLayout(Context context, AttributeSet attrs, int defStyleAttr) { public VerticalTabLayout(Context context, AttributeSet attrs, int defStyleAttr) {
super(context, attrs, defStyleAttr); super(context, attrs, defStyleAttr);
ThemeUtils.checkAppCompatTheme(context); //ndroidx.appcompat.widget.ThemeUtils.checkAppCompatTheme(context);
setOrientation(VERTICAL); setOrientation(VERTICAL);
@ -340,12 +348,12 @@ public class VerticalTabLayout extends LinearLayout {
// Text colors/sizes come from the text appearance first // Text colors/sizes come from the text appearance first
final TypedArray ta = context.obtainStyledAttributes(mTabTextAppearance, final TypedArray ta = context.obtainStyledAttributes(mTabTextAppearance,
android.support.v7.appcompat.R.styleable.TextAppearance); androidx.appcompat.R.styleable.TextAppearance);
try { try {
mTabTextSize = ta.getDimensionPixelSize( mTabTextSize = ta.getDimensionPixelSize(
android.support.v7.appcompat.R.styleable.TextAppearance_android_textSize, 0); androidx.appcompat.R.styleable.TextAppearance_android_textSize, 0);
mTabTextColors = ta.getColorStateList( mTabTextColors = ta.getColorStateList(
android.support.v7.appcompat.R.styleable.TextAppearance_android_textColor); androidx.appcompat.R.styleable.TextAppearance_android_textColor);
} finally { } finally {
ta.recycle(); ta.recycle();
} }
@ -406,7 +414,7 @@ public class VerticalTabLayout extends LinearLayout {
/** /**
* Set the scroll position of the tabs. This is useful for when the tabs are being displayed as * Set the scroll position of the tabs. This is useful for when the tabs are being displayed as
* part of a scrolling container such as {@link android.support.v4.view.ViewPager}. * part of a scrolling container such as {@link ViewPager}.
* <p> * <p>
* Calling this method does not update the selected tab, it is only used for drawing purposes. * Calling this method does not update the selected tab, it is only used for drawing purposes.
* *
@ -518,15 +526,16 @@ public class VerticalTabLayout extends LinearLayout {
} }
private void addTabFromItemView(@NonNull TabItem item) { private void addTabFromItemView(@NonNull TabItem item) {
final Tab tab = newTab(); final Tab tab = newTab();
if (item.mText != null) { if (item.text != null) {
tab.setText(item.mText); tab.setText(item.text);
} }
if (item.mIcon != null) { if (item.icon != null) {
tab.setIcon(item.mIcon); tab.setIcon(item.icon);
} }
if (item.mCustomLayout != 0) { if (item.customLayout != 0) {
tab.setCustomView(item.mCustomLayout); tab.setCustomView(item.customLayout);
} }
if (!TextUtils.isEmpty(item.getContentDescription())) { if (!TextUtils.isEmpty(item.getContentDescription())) {
tab.setContentDescription(item.getContentDescription()); tab.setContentDescription(item.getContentDescription());
@ -696,7 +705,7 @@ public class VerticalTabLayout extends LinearLayout {
* <li>{@link #MODE_SCROLLABLE}: Scrollable tabs display a subset of tabs at any given moment, * <li>{@link #MODE_SCROLLABLE}: Scrollable tabs display a subset of tabs at any given moment,
* and can contain longer tab labels and a larger number of tabs. They are best used for * and can contain longer tab labels and a larger number of tabs. They are best used for
* browsing contexts in touch interfaces when users don’t need to directly compare the tab * browsing contexts in touch interfaces when users don’t need to directly compare the tab
* labels. This mode is commonly used with a {@link android.support.v4.view.ViewPager}.</li> * labels. This mode is commonly used with a {@link ViewPager}.</li>
* </ul> * </ul>
* *
* @param mode one of {@link #MODE_FIXED} or {@link #MODE_SCROLLABLE}. * @param mode one of {@link #MODE_FIXED} or {@link #MODE_SCROLLABLE}.
@ -2056,6 +2065,7 @@ public class VerticalTabLayout extends LinearLayout {
animator.setDuration(duration); animator.setDuration(duration);
animator.setFloatValues(0, 1); animator.setFloatValues(0, 1);
animator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() { animator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
@SuppressLint("RestrictedApi")
@Override @Override
public void onAnimationUpdate(ValueAnimator animator) { public void onAnimationUpdate(ValueAnimator animator) {
final float fraction = animator.getAnimatedFraction(); final float fraction = animator.getAnimatedFraction();

6
app/src/main/java/com/kdt/mcgui/app/MineActivity.java
View File

@ -2,13 +2,10 @@ package com.kdt.mcgui.app;
import android.content.pm.*; import android.content.pm.*;
import android.os.*; import android.os.*;
import android.support.v7.app.*; import androidx.appcompat.app.*;
import android.view.*; import android.view.*;
import android.widget.*; import android.widget.*;
import net.kdt.pojavlaunch.*; import net.kdt.pojavlaunch.*;
import java.util.*;
import android.content.*;
import com.kdt.mcgui.*;
public class MineActivity extends BaseActivity implements View.OnClickListener public class MineActivity extends BaseActivity implements View.OnClickListener
{ {
@ -22,6 +19,7 @@ public class MineActivity extends BaseActivity implements View.OnClickListener
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
this.onCreate(savedInstanceState, true); this.onCreate(savedInstanceState, true);
} }

7
app/src/main/java/com/kdt/mcgui/app/MinePrefActivity.java
View File

@ -1,10 +1,13 @@
package com.kdt.mcgui.app; package com.kdt.mcgui.app;
import android.support.v7.app.*; import androidx.appcompat.app.*;
import android.os.*; import android.os.*;
import android.support.v4.app.*; import androidx.core.app.*;
import android.widget.*; import android.widget.*;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentTransaction;
public class MinePrefActivity extends MineActivity public class MinePrefActivity extends MineActivity
{ {
@Override @Override

4
app/src/main/java/com/kdt/mcgui/pref/MineSeekBarPref.java
View File

@ -19,13 +19,11 @@ package com.kdt.mcgui.pref;
import android.content.*; import android.content.*;
import android.content.res.*; import android.content.res.*;
import android.os.*; import android.os.*;
import android.support.v7.preference.*; import androidx.preference.*;
import android.util.*; import android.util.*;
import android.view.*; import android.view.*;
import android.view.View.*;
import android.widget.*; import android.widget.*;
import android.widget.SeekBar.*; import android.widget.SeekBar.*;
import net.kdt.pojavlaunch.*;
import android.view.View.BaseSavedState; import android.view.View.BaseSavedState;
import net.kdt.pojavlaunch.R; import net.kdt.pojavlaunch.R;

2
app/src/main/java/com/kdt/pickafile/FileListView.java
View File

@ -1,6 +1,6 @@
package com.kdt.pickafile; package com.kdt.pickafile;
import android.support.v7.app.*; import androidx.appcompat.app.*;
import android.content.*; import android.content.*;
import android.util.*; import android.util.*;
import android.view.*; import android.view.*;

2
app/src/main/java/net/kdt/pojavlaunch/BaseActivity.java
View File

@ -2,7 +2,7 @@ package net.kdt.pojavlaunch;
import android.content.*; import android.content.*;
import android.os.*; import android.os.*;
import android.support.v7.app.*; import androidx.appcompat.app.*;
import net.kdt.pojavlaunch.utils.*; import net.kdt.pojavlaunch.utils.*;
public class BaseActivity extends AppCompatActivity public class BaseActivity extends AppCompatActivity

14
app/src/main/java/net/kdt/pojavlaunch/BaseLauncherActivity.java
View File

@ -2,7 +2,7 @@ package net.kdt.pojavlaunch;
import android.app.*; import android.app.*;
import android.content.*; import android.content.*;
import android.support.v7.app.*; import androidx.appcompat.app.*;
import android.text.*; import android.text.*;
import android.view.*; import android.view.*;
import android.widget.*; import android.widget.*;
@ -12,7 +12,7 @@ import net.kdt.pojavlaunch.fragments.*;
import net.kdt.pojavlaunch.prefs.*; import net.kdt.pojavlaunch.prefs.*;
import net.kdt.pojavlaunch.tasks.*; import net.kdt.pojavlaunch.tasks.*;
import android.support.v7.app.AlertDialog; import androidx.appcompat.app.AlertDialog;
public abstract class BaseLauncherActivity extends BaseActivity { public abstract class BaseLauncherActivity extends BaseActivity {
public Button mPlayButton; public Button mPlayButton;
@ -160,23 +160,26 @@ public abstract class BaseLauncherActivity extends BaseActivity {
@Override @Override
protected void onPostResume() { protected void onPostResume() {
super.onPostResume(); super.onPostResume();
System.out.println("call to onPostResume");
Tools.updateWindowSize(this); Tools.updateWindowSize(this);
System.out.println("call to onPostResume; E");
} }
@Override @Override
protected void onResume(){ protected void onResume(){
super.onResume(); super.onResume();
System.out.println("call to onResume");
final int uiOptions = View.SYSTEM_UI_FLAG_HIDE_NAVIGATION; final int uiOptions = View.SYSTEM_UI_FLAG_HIDE_NAVIGATION;
final View decorView = getWindow().getDecorView(); final View decorView = getWindow().getDecorView();
decorView.setSystemUiVisibility(uiOptions); decorView.setSystemUiVisibility(uiOptions);
System.out.println("call to onResume; E");
} }
@Override @Override
protected void onResumeFragments() { protected void onResumeFragments() {
super.onResumeFragments(); super.onResumeFragments();
new RefreshVersionListTask(this).execute(); new RefreshVersionListTask(this).execute();
System.out.println("call to onResumeFragments");
try{ try{
final ProgressDialog barrier = new ProgressDialog(this); final ProgressDialog barrier = new ProgressDialog(this);
barrier.setMessage(getString(R.string.global_waiting)); barrier.setMessage(getString(R.string.global_waiting));
@ -219,11 +222,12 @@ public abstract class BaseLauncherActivity extends BaseActivity {
if(CrashFragment.isNewCrash(lastCrashFile) || !mCrashView.getLastCrash().isEmpty()){ if(CrashFragment.isNewCrash(lastCrashFile) || !mCrashView.getLastCrash().isEmpty()){
mCrashView.resetCrashLog = false; mCrashView.resetCrashLog = false;
selectTabPage(2); selectTabPage(2);
} else throw new Exception(); } /*else throw new Exception();*/
} catch(Throwable e) { } catch(Throwable e) {
e.printStackTrace(); e.printStackTrace();
// selectTabPage(tabLayout.getSelectedTabPosition()); // selectTabPage(tabLayout.getSelectedTabPosition());
} }
System.out.println("call to onResumeFragments; E");
} }
// Catching touch exception // Catching touch exception

10
app/src/main/java/net/kdt/pojavlaunch/BaseMainActivity.java
View File

@ -4,18 +4,22 @@ import android.app.*;
import android.content.*; import android.content.*;
import android.graphics.*; import android.graphics.*;
import android.os.*; import android.os.*;
import android.support.design.widget.*;
import android.support.v4.widget.*; import androidx.core.widget.*;
import android.util.*; import android.util.*;
import android.view.*; import android.view.*;
import android.view.View.*; import android.view.View.*;
import android.view.inputmethod.*; import android.view.inputmethod.*;
import android.widget.*; import android.widget.*;
import androidx.drawerlayout.widget.DrawerLayout;
import com.google.android.material.navigation.NavigationView;
import com.kdt.pointer.*; import com.kdt.pointer.*;
import java.io.*; import java.io.*;
import java.lang.reflect.*; import java.lang.reflect.*;
import java.util.*; import java.util.*;
import net.kdt.pojavlaunch.customcontrols.*;
import net.kdt.pojavlaunch.prefs.*; import net.kdt.pojavlaunch.prefs.*;
import net.kdt.pojavlaunch.utils.*; import net.kdt.pojavlaunch.utils.*;
import org.lwjgl.glfw.*; import org.lwjgl.glfw.*;

15
app/src/main/java/net/kdt/pojavlaunch/CustomControlsActivity.java
View File

@ -2,16 +2,19 @@ package net.kdt.pojavlaunch;
import android.content.*; import android.content.*;
import android.os.*; import android.os.*;
import android.support.design.widget.*;
import android.support.v4.widget.*; import androidx.core.widget.*;
import android.support.v7.app.*; import androidx.appcompat.app.*;
import android.support.v7.preference.*; import androidx.preference.*;
import android.view.*; import android.view.*;
import android.widget.*; import android.widget.*;
import com.google.gson.*;
import androidx.drawerlayout.widget.DrawerLayout;
import com.google.android.material.navigation.NavigationView;
import com.kdt.pickafile.*; import com.kdt.pickafile.*;
import java.io.*; import java.io.*;
import net.kdt.pojavlaunch.*;
import net.kdt.pojavlaunch.prefs.*; import net.kdt.pojavlaunch.prefs.*;
import net.kdt.pojavlaunch.customcontrols.*; import net.kdt.pojavlaunch.customcontrols.*;

2
app/src/main/java/net/kdt/pojavlaunch/CustomTabs.java
View File

@ -2,7 +2,7 @@ package net.kdt.pojavlaunch;
import android.content.*; import android.content.*;
import android.net.*; import android.net.*;
import android.support.customtabs.*; import androidx.browser.customtabs.*;
// import androidx.browser.customtabs.*; // import androidx.browser.customtabs.*;
public class CustomTabs { public class CustomTabs {

4
app/src/main/java/net/kdt/pojavlaunch/FatalErrorActivity.java
View File

@ -3,9 +3,9 @@ package net.kdt.pojavlaunch;
import android.app.*; import android.app.*;
import android.content.*; import android.content.*;
import android.os.*; import android.os.*;
import android.support.v7.app.*; import androidx.appcompat.app.*;
import android.util.*; import android.util.*;
import android.support.v7.app.AlertDialog; import androidx.appcompat.app.AlertDialog;
public class FatalErrorActivity extends BaseActivity public class FatalErrorActivity extends BaseActivity
{ {

3
app/src/main/java/net/kdt/pojavlaunch/JavaGUILauncherActivity.java
View File

@ -2,7 +2,7 @@ package net.kdt.pojavlaunch;
import android.graphics.*; import android.graphics.*;
import android.os.*; import android.os.*;
import android.support.v7.app.*; import androidx.appcompat.app.*;
import android.util.*; import android.util.*;
import android.view.*; import android.view.*;
import android.widget.*; import android.widget.*;
@ -12,7 +12,6 @@ import net.kdt.pojavlaunch.installers.*;
import net.kdt.pojavlaunch.utils.*; import net.kdt.pojavlaunch.utils.*;
import org.lwjgl.glfw.*; import org.lwjgl.glfw.*;
import android.content.*; import android.content.*;
import android.system.*;
public class JavaGUILauncherActivity extends LoggableActivity { public class JavaGUILauncherActivity extends LoggableActivity {
private AWTCanvasView mTextureView; private AWTCanvasView mTextureView;

2
app/src/main/java/net/kdt/pojavlaunch/LoggableActivity.java
View File

@ -1,6 +1,6 @@
package net.kdt.pojavlaunch; package net.kdt.pojavlaunch;
import android.support.v7.app.*; import androidx.appcompat.app.*;
public abstract class LoggableActivity extends BaseActivity { public abstract class LoggableActivity extends BaseActivity {
public void appendToLog(String text) { public void appendToLog(String text) {

34
app/src/main/java/net/kdt/pojavlaunch/MCLauncherActivity.java
View File

@ -1,35 +1,25 @@
package net.kdt.pojavlaunch; package net.kdt.pojavlaunch;
import android.content.*;
import android.graphics.*;
import android.os.*; import android.os.*;
import android.support.design.widget.*;
import android.support.v4.app.*; import androidx.core.app.*;
import android.support.v4.view.*; import androidx.core.view.*;
import android.support.v7.app.*; import androidx.appcompat.app.*;
import android.text.*;
import android.util.*;
import android.view.*; import android.view.*;
import android.widget.*; import android.widget.*;
import android.widget.AdapterView.*;
import com.google.gson.*; import com.google.android.material.tabs.TabLayout;
import com.kdt.pickafile.*;
import java.io.*; import java.io.*;
import java.nio.charset.*;
import java.util.*; import java.util.*;
import net.kdt.pojavlaunch.*;
import net.kdt.pojavlaunch.fragments.*; import net.kdt.pojavlaunch.fragments.*;
import net.kdt.pojavlaunch.prefs.*;
import net.kdt.pojavlaunch.utils.*;
import net.kdt.pojavlaunch.value.*;
import org.lwjgl.glfw.*; import org.lwjgl.glfw.*;
import android.support.v7.app.AlertDialog; import androidx.appcompat.app.AlertDialog;
import android.support.v4.app.Fragment; import androidx.viewpager.widget.ViewPager;
import android.support.v4.app.FragmentManager;
import android.app.*;
import org.apache.commons.io.*;
import net.kdt.pojavlaunch.tasks.*;
import android.support.design.widget.VerticalTabLayout.*; import android.support.design.widget.VerticalTabLayout.*;

6
app/src/main/java/net/kdt/pojavlaunch/PojavApplication.java
View File

@ -5,13 +5,13 @@ import android.content.*;
import android.content.pm.*; import android.content.pm.*;
import android.content.res.*; import android.content.res.*;
import android.os.*; import android.os.*;
import android.support.v4.app.*; import androidx.core.app.*;
import android.support.v7.preference.*; import androidx.preference.*;
import android.util.*; import android.util.*;
import java.io.*; import java.io.*;
import java.text.*; import java.text.*;
import java.util.*; import java.util.*;
import net.kdt.pojavlaunch.prefs.*;
import net.kdt.pojavlaunch.utils.*; import net.kdt.pojavlaunch.utils.*;
public class PojavApplication extends Application public class PojavApplication extends Application

24
app/src/main/java/net/kdt/pojavlaunch/PojavLauncherActivity.java
View File

@ -1,33 +1,25 @@
package net.kdt.pojavlaunch; package net.kdt.pojavlaunch;
import android.app.*;
import android.content.*;
import android.graphics.*;
import android.os.*; import android.os.*;
import android.support.design.widget.*; import android.support.design.widget.*;
import android.support.design.widget.VerticalTabLayout.*; import android.support.design.widget.VerticalTabLayout.*;
import android.support.v4.view.*; import androidx.core.view.*;
import android.support.v7.app.*; import androidx.appcompat.app.*;
import android.text.*;
import android.util.*; import android.util.*;
import android.view.*; import android.view.*;
import android.widget.*; import android.widget.*;
import android.widget.AdapterView.*;
import com.google.gson.*;
import com.kdt.pickafile.*;
import java.io.*; import java.io.*;
import java.nio.charset.*;
import java.util.*; import java.util.*;
import net.kdt.pojavlaunch.*;
import net.kdt.pojavlaunch.fragments.*; import net.kdt.pojavlaunch.fragments.*;
import net.kdt.pojavlaunch.prefs.*; import net.kdt.pojavlaunch.prefs.*;
import net.kdt.pojavlaunch.utils.*;
import net.kdt.pojavlaunch.value.*;
import org.apache.commons.io.*;
import org.lwjgl.glfw.*; import org.lwjgl.glfw.*;
import android.support.v7.app.AlertDialog; import androidx.appcompat.app.AlertDialog;
import net.kdt.pojavlaunch.tasks.*; import androidx.viewpager.widget.ViewPager;
//import android.support.v7.view.menu.*; //import android.support.v7.view.menu.*;
//import net.zhuoweizhang.boardwalk.downloader.*; //import net.zhuoweizhang.boardwalk.downloader.*;

9
app/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java
View File

@ -6,10 +6,11 @@ import android.content.pm.*;
import android.content.res.*; import android.content.res.*;
import android.net.*; import android.net.*;
import android.os.*; import android.os.*;
import android.support.annotation.*;
import android.support.v4.app.*; import androidx.annotation.NonNull;
import android.support.v4.content.*; import androidx.core.app.*;
import android.support.v7.app.*; import androidx.core.content.*;
import androidx.appcompat.app.*;
import android.system.*; import android.system.*;
import android.text.*; import android.text.*;
import android.text.style.*; import android.text.style.*;

7
app/src/main/java/net/kdt/pojavlaunch/customcontrols/handleview/ActionPopupWindow.java
View File

@ -21,17 +21,14 @@ package net.kdt.pojavlaunch.customcontrols.handleview;
import android.content.*; import android.content.*;
import android.view.*; import android.view.*;
import android.view.View.*;
import android.view.ViewGroup.*; import android.view.ViewGroup.*;
import android.widget.*; import android.widget.*;
import java.lang.reflect.*;
import net.kdt.pojavlaunch.*; import net.kdt.pojavlaunch.*;
import android.view.View.OnClickListener; import android.view.View.OnClickListener;
import net.kdt.pojavlaunch.customcontrols.*; import net.kdt.pojavlaunch.customcontrols.*;
import android.support.v7.app.*; import androidx.appcompat.app.*;
import android.content.res.*;
import net.objecthunter.exp4j.*;
public class ActionPopupWindow extends PinnedPopupWindow implements OnClickListener { public class ActionPopupWindow extends PinnedPopupWindow implements OnClickListener {
private TextView mEditTextView; private TextView mEditTextView;

11
app/src/main/java/net/kdt/pojavlaunch/fragments/ConsoleFragment.java
View File

@ -1,15 +1,18 @@
package net.kdt.pojavlaunch.fragments; package net.kdt.pojavlaunch.fragments;
import android.os.*; import android.os.*;
import android.support.annotation.*;
import android.support.v4.app.*; import androidx.annotation.Nullable;
import androidx.core.app.*;
import android.view.*; import android.view.*;
import android.widget.*; import android.widget.*;
import java.io.*;
import net.kdt.pojavlaunch.*; import net.kdt.pojavlaunch.*;
import android.util.*;
import android.graphics.*; import android.graphics.*;
import androidx.fragment.app.Fragment;
public class ConsoleFragment extends Fragment public class ConsoleFragment extends Fragment
{ {
public TextView consoleView; public TextView consoleView;

12
app/src/main/java/net/kdt/pojavlaunch/fragments/CrashFragment.java
View File

@ -1,16 +1,18 @@
package net.kdt.pojavlaunch.fragments; package net.kdt.pojavlaunch.fragments;
import android.os.*; import android.os.*;
import android.support.annotation.*;
import android.support.v4.app.*; import androidx.annotation.Nullable;
import androidx.core.app.*;
import android.view.*; import android.view.*;
import android.widget.*; import android.widget.*;
import java.io.*; import java.io.*;
import net.kdt.pojavlaunch.*; import net.kdt.pojavlaunch.*;
import android.util.*;
import android.graphics.*; import android.graphics.*;
import android.content.*;
import android.support.v4.os.*; import androidx.core.os.*;
import androidx.fragment.app.Fragment;
public class CrashFragment extends Fragment public class CrashFragment extends Fragment
{ {

4
app/src/main/java/net/kdt/pojavlaunch/fragments/LauncherFragment.java
View File

@ -1,8 +1,8 @@
package net.kdt.pojavlaunch.fragments; package net.kdt.pojavlaunch.fragments;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import android.support.v4.app.Fragment; import androidx.fragment.app.Fragment;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.view.LayoutInflater; import android.view.LayoutInflater;

5
app/src/main/java/net/kdt/pojavlaunch/prefs/LauncherPreferenceFragment.java
View File

@ -1,9 +1,8 @@
package net.kdt.pojavlaunch.prefs; package net.kdt.pojavlaunch.prefs;
import android.os.*; import android.os.*;
import android.support.v4.app.*; import androidx.core.app.*;
import android.support.v7.preference.*; import androidx.preference.*;
import net.kdt.pojavlaunch.*;
import net.kdt.pojavlaunch.R; import net.kdt.pojavlaunch.R;
import android.content.*; import android.content.*;

4
app/src/main/java/net/kdt/pojavlaunch/prefs/UninstallJREDialogPreference.java
View File

@ -1,8 +1,8 @@
package net.kdt.pojavlaunch.prefs; package net.kdt.pojavlaunch.prefs;
import android.content.*; import android.content.*;
import android.support.v7.app.*; import androidx.appcompat.app.*;
import android.support.v7.preference.*; import androidx.preference.*;
import android.util.*; import android.util.*;
import android.widget.*; import android.widget.*;
import java.io.*; import java.io.*;

6
app/src/main/java/net/kdt/pojavlaunch/tasks/RefreshVersionListTask.java
View File

@ -1,18 +1,18 @@
package net.kdt.pojavlaunch.tasks; package net.kdt.pojavlaunch.tasks;
import android.os.*; import android.os.*;
import android.support.v7.widget.*; import androidx.appcompat.widget.*;
import android.view.*; import android.view.*;
import android.widget.*; import android.widget.*;
import android.widget.AdapterView.*; import android.widget.AdapterView.*;
import com.google.gson.*;
import java.io.*; import java.io.*;
import java.util.*; import java.util.*;
import net.kdt.pojavlaunch.*; import net.kdt.pojavlaunch.*;
import net.kdt.pojavlaunch.prefs.*; import net.kdt.pojavlaunch.prefs.*;
import net.kdt.pojavlaunch.utils.*; import net.kdt.pojavlaunch.utils.*;
import android.support.v7.widget.PopupMenu; import androidx.appcompat.widget.PopupMenu;
public class RefreshVersionListTask extends AsyncTask<Void, Void, ArrayList<String>> public class RefreshVersionListTask extends AsyncTask<Void, Void, ArrayList<String>>
{ {

4
app/src/main/java/net/kdt/pojavlaunch/utils/JREUtils.java
View File

@ -2,9 +2,11 @@ package net.kdt.pojavlaunch.utils;
import android.app.*; import android.app.*;
import android.content.*; import android.content.*;
import android.support.annotation.*;
import android.system.*; import android.system.*;
import android.util.*; import android.util.*;
import androidx.annotation.Nullable;
import com.oracle.dalvik.*; import com.oracle.dalvik.*;
import java.io.*; import java.io.*;
import java.util.*; import java.util.*;

2
app/src/main/java/net/kdt/pojavlaunch/utils/LocaleUtils.java
View File

@ -2,7 +2,7 @@ package net.kdt.pojavlaunch.utils;
import android.content.*; import android.content.*;
import android.content.res.*; import android.content.res.*;
import android.support.v7.preference.*; import androidx.preference.*;
import java.util.*; import java.util.*;
import net.kdt.pojavlaunch.prefs.*; import net.kdt.pojavlaunch.prefs.*;

6
app/src/main/res/layout/control_mapping.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<android.support.v4.widget.DrawerLayout <androidx.drawerlayout.widget.DrawerLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_height="match_parent" android:layout_height="match_parent"
@ -26,7 +26,7 @@
</RelativeLayout> </RelativeLayout>
<android.support.design.widget.NavigationView <com.google.android.material.navigation.NavigationView
android:layout_width="200dp" android:layout_width="200dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_gravity="right" android:layout_gravity="right"
@ -34,5 +34,5 @@
app:menu="@menu/menu_customctrl" app:menu="@menu/menu_customctrl"
android:id="@+id/customctrl_navigation_view"/> android:id="@+id/customctrl_navigation_view"/>
</android.support.v4.widget.DrawerLayout> </androidx.drawerlayout.widget.DrawerLayout>

4
app/src/main/res/layout/launcher_main.xml
View File

@ -18,12 +18,12 @@
android:layout_weight="1.0" android:layout_weight="1.0"
android:orientation="vertical"> android:orientation="vertical">
<android.support.design.widget.TabLayout <com.google.android.material.tabs.TabLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:id="@+id/launchermainTabLayout"/> android:id="@+id/launchermainTabLayout"/>
<android.support.v4.view.ViewPager <androidx.viewpager.widget.ViewPager
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_weight="1" android:layout_weight="1"

2
app/src/main/res/layout/launcher_main_v3.xml
View File

@ -59,7 +59,7 @@
android:orientation="vertical" android:orientation="vertical"
android:layout_weight="1.0"> android:layout_weight="1.0">
<android.support.v4.view.ViewPager <androidx.viewpager.widget.ViewPager
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:id="@+id/launchermainTabPager" android:id="@+id/launchermainTabPager"

6
app/src/main/res/layout/main_with_customctrl.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<android.support.v4.widget.DrawerLayout <androidx.drawerlayout.widget.DrawerLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_height="match_parent" android:layout_height="match_parent"
@ -102,7 +102,7 @@
</FrameLayout> </FrameLayout>
<android.support.design.widget.NavigationView <com.google.android.material.navigation.NavigationView
android:layout_width="200dp" android:layout_width="200dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_gravity="right" android:layout_gravity="right"
@ -110,5 +110,5 @@
app:menu="@menu/menu_runopt" app:menu="@menu/menu_runopt"
android:id="@+id/main_navigation_view"/> android:id="@+id/main_navigation_view"/>
</android.support.v4.widget.DrawerLayout> </androidx.drawerlayout.widget.DrawerLayout>

32
app/src/main/res/xml/pref_main.xml
View File

@ -1,21 +1,21 @@
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="utf-8" ?>
<android.support.v7.preference.PreferenceScreen <androidx.preference.PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.chom/apk/res-auto"> xmlns:app="http://schemas.android.chom/apk/res-auto">
<android.support.v7.preference.PreferenceCategory <androidx.preference.PreferenceCategory
android:title="@string/mcl_setting_category_general"> android:title="@string/mcl_setting_category_general">
<net.kdt.pojavlaunch.prefs.UninstallJREDialogPreference <net.kdt.pojavlaunch.prefs.UninstallJREDialogPreference
android:title="@string/mcl_setting_title_uninstalljre" android:title="@string/mcl_setting_title_uninstalljre"
android:summary="@string/mcl_setting_subtitle_uninstalljre" /> android:summary="@string/mcl_setting_subtitle_uninstalljre" />
<android.support.v7.preference.SeekBarPreference <androidx.preference.SeekBarPreference
android:key="timeLongPressTrigger" android:key="timeLongPressTrigger"
android:title="@string/mcl_setting_title_longpresstrigger" android:title="@string/mcl_setting_title_longpresstrigger"
android:summary="@string/mcl_setting_subtitle_longpresstrigger" /> android:summary="@string/mcl_setting_subtitle_longpresstrigger" />
<android.support.v7.preference.SwitchPreferenceCompat <androidx.preference.SwitchPreferenceCompat
android:defaultValue="false" android:defaultValue="false"
android:key="freeform" android:key="freeform"
android:title="@string/mcl_setting_title_freeform" android:title="@string/mcl_setting_title_freeform"
@ -28,46 +28,46 @@
android:dialogTitle="@string/mcl_setting_title_javaargs" android:dialogTitle="@string/mcl_setting_title_javaargs"
android:singleLine="true"/> android:singleLine="true"/>
</android.support.v7.preference.PreferenceCategory> </androidx.preference.PreferenceCategory>
<android.support.v7.preference.PreferenceCategory <androidx.preference.PreferenceCategory
android:title="@string/mcl_setting_category_scaling"> android:title="@string/mcl_setting_category_scaling">
<android.support.v7.preference.SeekBarPreference <androidx.preference.SeekBarPreference
android:key="buttonscale" android:key="buttonscale"
android:title="@string/mcl_setting_title_buttonscale" android:title="@string/mcl_setting_title_buttonscale"
android:summary="@string/mcl_setting_subtitle_buttonscale" /> android:summary="@string/mcl_setting_subtitle_buttonscale" />
<android.support.v7.preference.SeekBarPreference <androidx.preference.SeekBarPreference
android:key="mousescale" android:key="mousescale"
android:title="@string/mcl_setting_title_mousescale" android:title="@string/mcl_setting_title_mousescale"
android:summary="@string/mcl_setting_subtitle_mousescale" /> android:summary="@string/mcl_setting_subtitle_mousescale" />
</android.support.v7.preference.PreferenceCategory> </androidx.preference.PreferenceCategory>
<android.support.v7.preference.PreferenceCategory <androidx.preference.PreferenceCategory
android:title="@string/mcl_setting_category_veroption"> android:title="@string/mcl_setting_category_veroption">
<android.support.v7.preference.CheckBoxPreference <androidx.preference.CheckBoxPreference
android:defaultValue="true" android:defaultValue="true"
android:key="vertype_release" android:key="vertype_release"
android:title="@string/mcl_setting_veroption_release" /> android:title="@string/mcl_setting_veroption_release" />
<android.support.v7.preference.CheckBoxPreference <androidx.preference.CheckBoxPreference
android:defaultValue="false" android:defaultValue="false"
android:key="vertype_snapshot" android:key="vertype_snapshot"
android:title="@string/mcl_setting_veroption_snapshot" /> android:title="@string/mcl_setting_veroption_snapshot" />
<android.support.v7.preference.CheckBoxPreference <androidx.preference.CheckBoxPreference
android:defaultValue="false" android:defaultValue="false"
android:key="vertype_oldalpha" android:key="vertype_oldalpha"
android:title="@string/mcl_setting_veroption_oldalpha" /> android:title="@string/mcl_setting_veroption_oldalpha" />
<android.support.v7.preference.CheckBoxPreference <androidx.preference.CheckBoxPreference
android:defaultValue="false" android:defaultValue="false"
android:key="vertype_oldbeta" android:key="vertype_oldbeta"
android:title="@string/mcl_setting_veroption_oldbeta" /> android:title="@string/mcl_setting_veroption_oldbeta" />
</android.support.v7.preference.PreferenceCategory> </androidx.preference.PreferenceCategory>
</android.support.v7.preference.PreferenceScreen> </androidx.preference.PreferenceScreen>

2
gradle.properties Normal file
View File

@ -0,0 +1,2 @@
android.enableJetifier=true
android.useAndroidX=true

0
scripts/languagelist_updater.sh Normal file → Executable file
View File