diff --git a/app/build.gradle b/app/build.gradle index 2107abca5..35ea52948 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -24,7 +24,7 @@ android { minSdkVersion 19 targetSdkVersion 26 versionCode 156235 - versionName "3.2.0t6_6405b_20200930" + versionName "3.2.0t6_6405b_20201003" multiDexEnabled true //important ndk { diff --git a/app/src/main/java/net/kdt/pojavlaunch/MCLauncherActivity.java b/app/src/main/java/net/kdt/pojavlaunch/MCLauncherActivity.java index 34d5fc4b3..3875e3c5a 100644 --- a/app/src/main/java/net/kdt/pojavlaunch/MCLauncherActivity.java +++ b/app/src/main/java/net/kdt/pojavlaunch/MCLauncherActivity.java @@ -27,6 +27,7 @@ import org.lwjgl.glfw.*; import android.app.AlertDialog; import android.support.v4.app.Fragment; import android.support.v4.app.FragmentManager; +import android.support.v4.view.*; //import android.support.v7.view.menu.*; //import net.zhuoweizhang.boardwalk.downloader.*; @@ -34,8 +35,13 @@ public class MCLauncherActivity extends AppCompatActivity { //private FragmentTabHost mTabHost; private LinearLayout fullTab; + /* private PojavLauncherViewPager viewPager; private VerticalTabLayout tabLayout; + */ + + private ViewPager viewPager; + private TabLayout tabLayout; private TextView tvVersion, tvUsernameView; private Spinner versionSelector; @@ -95,8 +101,8 @@ public class MCLauncherActivity extends AppCompatActivity } private void viewInit() { - setContentView(R.layout.launcher_main_v3); - // setContentView(R.layout.launcher_main); + // setContentView(R.layout.launcher_main_v3); + setContentView(R.layout.launcher_main); fullTab = findViewById(R.id.launchermainFragmentTabView); tabLayout = findViewById(R.id.launchermainTabLayout);