From c24f514ca1c556e527c7c52408e728ee22b7488b Mon Sep 17 00:00:00 2001
From: SerpentSpirale <serpentspirale@gmail.com>
Date: Fri, 8 Jan 2021 21:49:55 +0100
Subject: [PATCH 01/13] - Updated build.gradle

---
 app_pojavlauncher/build.gradle | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/app_pojavlauncher/build.gradle b/app_pojavlauncher/build.gradle
index 624ed587c..6df90ba1e 100644
--- a/app_pojavlauncher/build.gradle
+++ b/app_pojavlauncher/build.gradle
@@ -68,11 +68,14 @@ dependencies {
     // implementation 'com.wu-man:android-bsf-api:3.1.3'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'androidx.preference:preference:1.1.1'
-    implementation 'androidx.appcompat:appcompat:1.0.0'
+    implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'androidx.legacy:legacy-preference-v14:1.0.0'
-    implementation 'com.google.android.material:material:1.0.0'
-    implementation 'androidx.annotation:annotation:1.0.0'
-    implementation 'androidx.browser:browser:1.0.0'
+    implementation 'com.google.android.material:material:1.2.1'
+    implementation 'androidx.annotation:annotation:1.1.0'
+    implementation 'androidx.browser:browser:1.3.0'
+
+    implementation "androidx.constraintlayout:constraintlayout:2.0.4"
+
     
     // implementation 'com.intuit.sdp:sdp-android:1.0.5'
     // implementation 'com.intuit.ssp:ssp-android:1.0.5'

From 7f5d41964103f30a6fbcb96c35ae841353108711 Mon Sep 17 00:00:00 2001
From: SerpentSpirale <serpentspirale@gmail.com>
Date: Fri, 8 Jan 2021 21:50:39 +0100
Subject: [PATCH 02/13] - Created revamped layout from the v2.

---
 .../src/main/res/layout/launcher_main_v4.xml  | 323 ++++++++++++++++++
 1 file changed, 323 insertions(+)
 create mode 100644 app_pojavlauncher/src/main/res/layout/launcher_main_v4.xml

diff --git a/app_pojavlauncher/src/main/res/layout/launcher_main_v4.xml b/app_pojavlauncher/src/main/res/layout/launcher_main_v4.xml
new file mode 100644
index 000000000..5bbacf44e
--- /dev/null
+++ b/app_pojavlauncher/src/main/res/layout/launcher_main_v4.xml
@@ -0,0 +1,323 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/guidelineBottom"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        app:layout_constraintGuide_percent="0.8" />
+
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/guidelineBottom2"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        app:layout_constraintGuide_percent="0.9" />
+
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/guidelineLeft"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        app:layout_constraintGuide_percent="0.25" />
+
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/guidelineMiddle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        app:layout_constraintGuide_percent="0.625" />
+
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/guidelineRight"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        app:layout_constraintGuide_percent="0.86" />
+
+    <Spinner
+        android:id="@+id/launchermain_spinner_account"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:paddingStart="5dp"
+        android:paddingEnd="5dp"
+        android:spinnerMode="dropdown"
+
+        app:layout_constraintEnd_toStartOf="@+id/guidelineLeft"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/launchermain_text_accountstatus"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:paddingStart="8dp"
+        android:paddingEnd="8dp"
+        android:text="Connected"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/launchermain_spinner_account" />
+
+    <Button
+        android:id="@+id/btnTab1"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:background="?attr/selectableItemBackground"
+        android:clickable="true"
+
+        android:drawableStart="@drawable/ic_menu_news"
+        android:focusable="true"
+        android:gravity="center"
+        android:onClick="onTabClicked"
+
+        android:paddingStart="12dp"
+        android:paddingTop="10dp"
+        android:paddingEnd="0dp"
+        android:paddingBottom="10dp"
+        android:text="@string/mcl_tab_news"
+        android:textAlignment="center"
+        android:textAllCaps="true"
+        android:textColor="#FFFFFF"
+        android:textSize="16sp"
+
+
+        app:layout_constraintEnd_toStartOf="@+id/guidelineLeft"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/launchermain_text_accountstatus" />
+
+
+    <Button
+        android:id="@+id/btnTab2"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+
+        android:paddingStart="12dp"
+        android:paddingEnd="0dp"
+        android:paddingTop="10dp"
+        android:paddingBottom="10dp"
+
+        android:background="?attr/selectableItemBackground"
+        android:clickable="true"
+
+        android:drawableStart="@drawable/ic_menu_java"
+        android:focusable="true"
+        android:gravity="center"
+        android:onClick="onTabClicked"
+        android:text="@string/mcl_tab_console"
+        android:textAlignment="center"
+        android:textAllCaps="true"
+        android:textColor="#FFFFFF"
+        android:textSize="16sp"
+
+
+        app:layout_constraintEnd_toStartOf="@+id/guidelineLeft"
+        app:layout_constraintHorizontal_bias="1.0"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/btnTab1" />
+
+    <Button
+        android:id="@+id/btnTab3"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+
+        android:paddingStart="12dp"
+        android:paddingEnd="0dp"
+        android:paddingTop="10dp"
+        android:paddingBottom="10dp"
+
+        android:background="?attr/selectableItemBackground"
+        android:clickable="true"
+
+        android:drawableStart="@drawable/ic_menu_warning"
+        android:focusable="true"
+        android:gravity="center"
+        android:onClick="onTabClicked"
+        android:text="@string/mcl_tab_crash"
+        android:textAlignment="center"
+        android:textAllCaps="true"
+        android:textColor="#FFFFFF"
+        android:textSize="16sp"
+
+
+        app:layout_constraintEnd_toStartOf="@+id/guidelineLeft"
+        app:layout_constraintHorizontal_bias="1.0"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/btnTab2" />
+
+    <Button
+        android:id="@+id/btnTab4"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+
+        android:background="?attr/selectableItemBackground"
+        android:clickable="true"
+        android:drawableStart="@drawable/ic_menu_settings"
+
+        android:focusable="true"
+        android:gravity="center"
+
+        android:onClick="onTabClicked"
+        android:paddingStart="12dp"
+        android:paddingTop="10dp"
+        android:paddingEnd="0dp"
+        android:paddingBottom="10dp"
+        android:text="@string/mcl_option_settings"
+        android:textAlignment="center"
+        android:textAllCaps="true"
+        android:textColor="#FFFFFF"
+
+
+        android:textSize="16sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/guidelineLeft"
+        app:layout_constraintHorizontal_bias="1.0"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/guidelineBottom" />
+
+    <androidx.viewpager.widget.ViewPager
+        android:id="@+id/launchermainTabPager"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:background="#272727"
+        app:layout_constraintBottom_toTopOf="@+id/guidelineBottom"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="@+id/guidelineLeft"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <ProgressBar
+        android:id="@+id/progressDownloadBar"
+        style="?android:attr/progressBarStyleHorizontal"
+        android:layout_width="0dp"
+        android:layout_height="10dp"
+        android:visibility="gone"
+        app:layout_constraintBottom_toTopOf="@+id/progressDownloadText"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="@+id/guidelineLeft"
+        tools:visibility="visible" />
+
+    <TextView
+        android:id="@+id/progressDownloadText"
+        android:layout_width="0dp"
+        android:layout_height="20dp"
+        android:background="#303030"
+        android:gravity="center_horizontal"
+        android:text="@string/global_waiting"
+        android:visibility="gone"
+        app:layout_constraintBottom_toTopOf="@+id/guidelineBottom"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="@+id/guidelineLeft"
+        tools:visibility="visible" />
+
+    <TextView
+        android:id="@+id/lMTVVer"
+        android:layout_width="wrap_content"
+        android:layout_height="0dp"
+        android:gravity="center"
+        android:paddingStart="5dp"
+        android:paddingEnd="5dp"
+        android:text="@string/main_version"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:textSize="12sp"
+        app:layout_constraintBottom_toTopOf="@+id/guidelineBottom2"
+        app:layout_constraintStart_toStartOf="@+id/guidelineLeft"
+        app:layout_constraintTop_toTopOf="@+id/guidelineBottom" />
+
+
+    <Spinner
+        android:id="@+id/launchermain_spinner_version"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toTopOf="@+id/guidelineBottom2"
+        app:layout_constraintEnd_toStartOf="@+id/launchermainPlayButton"
+        app:layout_constraintStart_toEndOf="@+id/lMTVVer"
+        app:layout_constraintTop_toTopOf="@+id/guidelineBottom" />
+
+    <Button
+        style="?android:attr/buttonBarButtonStyle"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:onClick="launcherMenu"
+        android:text="@string/main_options"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/launchermainPlayButton"
+        app:layout_constraintStart_toStartOf="@+id/guidelineLeft"
+        app:layout_constraintTop_toTopOf="@+id/guidelineBottom2" />
+
+    <com.kdt.mcgui.MineButton
+        android:id="@+id/launchermainPlayButton"
+        android:layout_width="160dp"
+        android:layout_height="0dp"
+        android:layout_alignParentBottom="true"
+        android:onClick="launchGame"
+        android:text="@string/main_play"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/guidelineMiddle"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toStartOf="@+id/guidelineMiddle"
+        app:layout_constraintTop_toTopOf="@+id/guidelineBottom" />
+
+    <TextView
+        android:id="@+id/launchermain_text_welcome"
+        android:layout_width="wrap_content"
+        android:layout_height="20dp"
+        android:gravity="center"
+        android:text="@string/main_welcome"
+        android:textSize="12sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/launchermainPlayButton"
+        app:layout_constraintTop_toTopOf="@+id/guidelineBottom" />
+
+    <TextView
+        android:id="@+id/launcherMainVersionView"
+        android:layout_width="wrap_content"
+        android:layout_height="20dp"
+        android:gravity="center"
+        android:text="@string/global_waiting"
+        android:textSize="12sp"
+        app:layout_constraintEnd_toEndOf="@+id/launchermain_text_welcome"
+        app:layout_constraintStart_toStartOf="@+id/launchermain_text_welcome"
+        app:layout_constraintTop_toBottomOf="@+id/launchermain_text_welcome" />
+
+    <Button
+        android:id="@+id/infoDevBtn"
+        style="?android:attr/buttonBarButtonStyle"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:onClick="mcaccSwitchUser"
+        android:text="@string/main_infodev"
+        android:textSize="12sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/guidelineRight"
+        app:layout_constraintStart_toEndOf="@+id/launchermainPlayButton"
+        app:layout_constraintTop_toTopOf="@+id/guidelineBottom2" />
+
+    <Button
+        android:id="@+id/switchUserBtn"
+        style="?android:attr/buttonBarButtonStyle"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:onClick="mcaccLogout"
+        android:text="@string/main_switchuser"
+        android:textSize="12sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="@+id/guidelineRight"
+        app:layout_constraintTop_toTopOf="@+id/guidelineBottom2" />
+
+    <View
+        android:id="@+id/viewTabSelected"
+        android:layout_width="5dp"
+        android:layout_height="30dp"
+
+        android:background="@android:color/white"
+
+        app:layout_constraintBottom_toBottomOf="@+id/btnTab1"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/launchermain_text_accountstatus" />
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From c453815e8052541d2d83e79d778a1fab7f301727 Mon Sep 17 00:00:00 2001
From: SerpentSpirale <serpentspirale@gmail.com>
Date: Fri, 8 Jan 2021 21:50:52 +0100
Subject: [PATCH 03/13] - Removed all traces of the UI V1 in the code, the
 PojavLauncherActivity now uses the revamped layout. - Started to revamp the
 select account UI as well

---
 .../kdt/pojavlaunch/BaseLauncherActivity.java |   7 +-
 .../kdt/pojavlaunch/MCLauncherActivity.java   | 170 --------------
 .../pojavlaunch/PojavLauncherActivity.java    | 167 +++++++-------
 .../kdt/pojavlaunch/PojavLoginActivity.java   | 151 ++++++-------
 .../net/kdt/pojavlaunch/PojavProfile.java     |   6 +-
 .../pojavlaunch/PojavV2ActivityManager.java   |  37 ----
 .../src/main/res/layout/launcher_main.xml     | 174 ---------------
 .../src/main/res/layout/launcher_main_v3.xml  | 209 ------------------
 .../res/layout/simple_account_list_holder.xml |  42 ++++
 .../res/layout/simple_account_list_item.xml   |  39 ++++
 .../src/main/res/values/headings_array.xml    |   1 -
 11 files changed, 246 insertions(+), 757 deletions(-)
 delete mode 100644 app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/MCLauncherActivity.java
 delete mode 100644 app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/PojavV2ActivityManager.java
 delete mode 100644 app_pojavlauncher/src/main/res/layout/launcher_main.xml
 delete mode 100644 app_pojavlauncher/src/main/res/layout/launcher_main_v3.xml
 create mode 100644 app_pojavlauncher/src/main/res/layout/simple_account_list_holder.xml
 create mode 100644 app_pojavlauncher/src/main/res/layout/simple_account_list_item.xml

diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/BaseLauncherActivity.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/BaseLauncherActivity.java
index 28ad8ab70..b40682dce 100644
--- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/BaseLauncherActivity.java
+++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/BaseLauncherActivity.java
@@ -75,10 +75,7 @@ public abstract class BaseLauncherActivity extends BaseActivity {
                         case 2: // Custom controls
                             startActivity(new Intent(BaseLauncherActivity.this, CustomControlsActivity.class));
                             break;
-                        case 3: // Settings
-                            startActivity(new Intent(BaseLauncherActivity.this, LauncherPreferenceActivity.class));
-                            break;
-                        case 4: { // About
+                        case 3: { // About
                                 final AlertDialog.Builder aboutB = new AlertDialog.Builder(BaseLauncherActivity.this);
                                 aboutB.setTitle(R.string.mcl_option_about);
                                 try {
@@ -224,6 +221,7 @@ public abstract class BaseLauncherActivity extends BaseActivity {
             if(CrashFragment.isNewCrash(lastCrashFile) || !mCrashView.getLastCrash().isEmpty()){
                 mCrashView.resetCrashLog = false;
                 selectTabPage(2);
+
             } /*else throw new Exception();*/
         } catch(Throwable e) {
             e.printStackTrace();
@@ -239,5 +237,4 @@ public abstract class BaseLauncherActivity extends BaseActivity {
     }
 
     protected abstract void selectTabPage(int pageIndex);
-    protected abstract float updateWidthHeight();
 }
diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/MCLauncherActivity.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/MCLauncherActivity.java
deleted file mode 100644
index 285013665..000000000
--- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/MCLauncherActivity.java
+++ /dev/null
@@ -1,170 +0,0 @@
-package net.kdt.pojavlaunch;
-
-import android.os.*;
-
-import androidx.core.app.*;
-import androidx.core.view.*;
-import androidx.appcompat.app.*;
-
-import android.view.*;
-import android.widget.*;
-
-import com.google.android.material.tabs.TabLayout;
-
-import java.io.*;
-import java.util.*;
-
-import net.kdt.pojavlaunch.fragments.*;
-
-import org.lwjgl.glfw.*;
-
-import androidx.appcompat.app.AlertDialog;
-import androidx.viewpager.widget.ViewPager;
-
-import android.support.design.widget.VerticalTabLayout.*;
-
-//import android.support.v7.view.menu.*;
-//import net.zhuoweizhang.boardwalk.downloader.*;
-
-public class MCLauncherActivity extends BaseLauncherActivity
-{
-    //private FragmentTabHost mTabHost;
-    private LinearLayout fullTab;
-    /*
-     private PojavLauncherViewPager viewPager;
-     private VerticalTabLayout tabLayout;
-     */
-
-    private ViewPager viewPager;
-    private TabLayout tabLayout;
-
-    private TextView tvUsernameView;
-    private ViewPagerAdapter viewPageAdapter;
-
-    private Button switchUsrBtn, logoutBtn; // MineButtons
-    private ViewGroup leftView, rightView;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        if (BuildConfig.DEBUG) {
-            Toast.makeText(this, "Launcher process id: " + android.os.Process.myPid(), Toast.LENGTH_LONG).show();
-        }
-        setContentView(R.layout.launcher_main);
-
-        fullTab = findViewById(R.id.launchermainFragmentTabView);
-        tabLayout = findViewById(R.id.launchermainTabLayout);
-        viewPager = findViewById(R.id.launchermainTabPager);
-
-        mConsoleView = new ConsoleFragment();
-        mCrashView = new CrashFragment();
-
-        viewPageAdapter = new ViewPagerAdapter(getSupportFragmentManager());
-
-        viewPageAdapter.addFragment(new LauncherFragment(), 0, getStr(R.string.mcl_tab_news));
-        viewPageAdapter.addFragment(mConsoleView, 0, getStr(R.string.mcl_tab_console));
-        viewPageAdapter.addFragment(mCrashView, 0, getStr(R.string.mcl_tab_crash));
-
-        viewPager.setAdapter(viewPageAdapter);
-        tabLayout.setupWithViewPager(viewPager);
-
-        tvUsernameView = (TextView) findViewById(R.id.launchermain_text_welcome);
-        mTextVersion = (TextView) findViewById(R.id.launcherMainVersionView);
-
-        try {
-            mProfile = PojavProfile.getCurrentProfileContent(this);
-
-            tvUsernameView.setText(getString(R.string.main_welcome, mProfile.username));
-        } catch(Exception e) {
-            Tools.showError(this, e);
-        }
-        
-        //showProfileInfo();
-
-        List<String> versions = new ArrayList<String>();
-        final File fVers = new File(Tools.DIR_HOME_VERSION);
-
-        try {
-            if (fVers.listFiles().length < 1) {
-                throw new Exception(getStr(R.string.error_no_version));
-            }
-
-            for (File fVer : fVers.listFiles()) {
-                if (fVer.isDirectory())
-                    versions.add(fVer.getName());
-            }
-        } catch (Exception e) {
-            versions.add(getStr(R.string.global_error) + ":");
-            versions.add(e.getMessage());
-
-        } finally {
-            mAvailableVersions = versions.toArray(new String[0]);
-        }
-
-        //availableVersions;
-
-        ArrayAdapter<String> adapter = new ArrayAdapter<String>(this, android.R.layout.simple_spinner_item, mAvailableVersions);
-        adapter.setDropDownViewResource(android.R.layout.simple_list_item_single_choice);
-        mVersionSelector = (Spinner) findViewById(R.id.launcherMainSelectVersion);
-        mVersionSelector.setAdapter(adapter);
-
-        mLaunchProgress = (ProgressBar) findViewById(R.id.progressDownloadBar);
-        mLaunchTextStatus = (TextView) findViewById(R.id.progressDownloadText);
-        LinearLayout exitLayout = (LinearLayout) findViewById(R.id.launcherMainExitbtns);
-        switchUsrBtn = (Button) exitLayout.getChildAt(0);
-        logoutBtn = (Button) exitLayout.getChildAt(1);
-
-        leftView = (LinearLayout) findViewById(R.id.launcherMainLeftLayout);
-        mPlayButton = (Button) findViewById(R.id.launcherMainPlayButton);
-        rightView = (ViewGroup) findViewById(R.id.launcherMainRightLayout);
-
-        statusIsLaunching(false);
-    }
-    // DEBUG
-    //new android.support.design.widget.NavigationView(this);
-
-    private String getStr(int id, Object... val) {
-        if (val != null && val.length > 0) {
-            return getResources().getString(id, val);
-        } else {
-            return getResources().getString(id);
-        }
-    }
-    
-    @Override
-    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));
-        leftView.setLayoutParams(leftRightParams);
-        rightView.setLayoutParams(leftRightParams);
-        mPlayButton.setLayoutParams(mPlayButtonParams);
-
-        return leftRightWidth;
-    }
-
-    @Override
-    protected void selectTabPage(int pageIndex) {
-        if (tabLayout.getSelectedTabPosition() != pageIndex) {
-            tabLayout.setScrollPosition(pageIndex,0f,true);
-            viewPager.setCurrentItem(pageIndex);
-        }
-    }
-
-    public void statusIsLaunching(boolean isLaunching) {
-        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);
-        mLaunchTextStatus.setVisibility(launchVisibility);
-        lmainTabParam.bottomMargin = reparam.height;
-        leftView.setLayoutParams(reparam);
-
-        switchUsrBtn.setEnabled(!isLaunching);
-        logoutBtn.setEnabled(!isLaunching);
-        mVersionSelector.setEnabled(!isLaunching);
-        canBack = !isLaunching;
-    }
-}
diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/PojavLauncherActivity.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/PojavLauncherActivity.java
index aea6bb355..ea5767745 100644
--- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/PojavLauncherActivity.java
+++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/PojavLauncherActivity.java
@@ -1,86 +1,96 @@
 package net.kdt.pojavlaunch;
 
-import android.os.*;
-import android.support.design.widget.*;
-import android.support.design.widget.VerticalTabLayout.*;
-import androidx.core.view.*;
-import androidx.appcompat.app.*;
+import android.animation.ValueAnimator;
+import android.graphics.Color;
+import android.graphics.Typeface;
+import android.os.Bundle;
+import android.support.design.widget.VerticalTabLayout.ViewPagerAdapter;
+import android.view.View;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+import android.widget.Button;
+import android.widget.ProgressBar;
+import android.widget.Spinner;
+import android.widget.TextView;
+import android.widget.Toast;
 
-import android.util.*;
-import android.view.*;
-import android.widget.*;
-
-import java.io.*;
-import java.util.*;
-
-import net.kdt.pojavlaunch.fragments.*;
-import net.kdt.pojavlaunch.prefs.*;
-
-import org.lwjgl.glfw.*;
-
-import androidx.appcompat.app.AlertDialog;
 import androidx.viewpager.widget.ViewPager;
-import net.kdt.pojavlaunch.value.*;
-//import android.support.v7.view.menu.*;
-//import net.zhuoweizhang.boardwalk.downloader.*;
+
+import net.kdt.pojavlaunch.fragments.ConsoleFragment;
+import net.kdt.pojavlaunch.fragments.CrashFragment;
+import net.kdt.pojavlaunch.fragments.LauncherFragment;
+import net.kdt.pojavlaunch.prefs.LauncherPreferenceFragment;
+import net.kdt.pojavlaunch.value.MinecraftAccount;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
 
 public class PojavLauncherActivity extends BaseLauncherActivity
 {
-    //private FragmentTabHost mTabHost;
-    private LinearLayout fullTab, leftTab;
-    /*
-     private PojavLauncherViewPager viewPager;
-     private VerticalTabLayout tabLayout;
-     */
 
     private ViewPager viewPager;
-    private VerticalTabLayout tabLayout;
 
     private TextView tvUsernameView;
     private Spinner accountSelector;
     private ViewPagerAdapter viewPageAdapter;
+    private final Button[] Tabs = new Button[4];
+    private View selected;
 
     private Button switchUsrBtn, logoutBtn; // MineButtons
-    private ViewGroup leftView, rightView;
+
+    public PojavLauncherActivity() {
+    }
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        setContentView(R.layout.launcher_main_v4);
+
 
         if (BuildConfig.DEBUG) {
             Toast.makeText(this, "Launcher process id: " + android.os.Process.myPid(), Toast.LENGTH_LONG).show();
         }
-        
-        setContentView(R.layout.launcher_main_v3);
-        // setContentView(R.layout.launcher_main);
 
-        leftTab = findViewById(R.id.launchermain_layout_leftmenu);
-        leftTab.setLayoutParams(new LinearLayout.LayoutParams(
-            CallbackBridge.windowWidth / 4,
-            LinearLayout.LayoutParams.MATCH_PARENT));
-        
-        fullTab = findViewById(R.id.launchermain_layout_viewpager);
-        tabLayout = findViewById(R.id.launchermainTabLayout);
+
         viewPager = findViewById(R.id.launchermainTabPager);
+        selected = findViewById(R.id.viewTabSelected);
 
         mConsoleView = new ConsoleFragment();
         mCrashView = new CrashFragment();
 
         viewPageAdapter = new ViewPagerAdapter(getSupportFragmentManager());
-        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(new LauncherFragment(), 0, getString(R.string.mcl_tab_news));
+        viewPageAdapter.addFragment(mConsoleView, 0, 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(), 0, getString(R.string.mcl_option_settings));
+
+        viewPager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
+            @Override
+            public void onPageSelected(int position) {
+                setTabActive(position);
+            }
+
+            @Override
+            public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
+
+            }
+
+            @Override
+            public void onPageScrollStateChanged(int state) {
+
+            }
+        });
         viewPager.setAdapter(viewPageAdapter);
-        // tabLayout.setTabMode(VerticalTabLayout.MODE_SCROLLABLE);
-        tabLayout.setupWithViewPager(viewPager);
-        tabLayout.setLastTabAsBottom();
 
         tvUsernameView = (TextView) findViewById(R.id.launchermain_text_welcome);
         mTextVersion = (TextView) findViewById(R.id.launcherMainVersionView);
 
+        Tabs[0] = findViewById(R.id.btnTab1);
+        Tabs[1] = findViewById(R.id.btnTab2);
+        Tabs[2] = findViewById(R.id.btnTab3);
+        Tabs[3] = findViewById(R.id.btnTab4);
+
         pickAccount();
         
 /*
@@ -128,6 +138,7 @@ public class PojavLauncherActivity extends BaseLauncherActivity
                 }
             }
         }
+
         accountSelector.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener(){
             @Override
             public void onItemSelected(AdapterView<?> p1, View p2, int position, long p4) {
@@ -167,7 +178,6 @@ public class PojavLauncherActivity extends BaseLauncherActivity
         }
 
         //mAvailableVersions;
-
         ArrayAdapter<String> adapterVer = new ArrayAdapter<String>(this, android.R.layout.simple_spinner_item, mAvailableVersions);
         adapterVer.setDropDownViewResource(android.R.layout.simple_list_item_single_choice);
         mVersionSelector = (Spinner) findViewById(R.id.launchermain_spinner_version);
@@ -175,40 +185,21 @@ public class PojavLauncherActivity extends BaseLauncherActivity
 
         mLaunchProgress = (ProgressBar) findViewById(R.id.progressDownloadBar);
         mLaunchTextStatus = (TextView) findViewById(R.id.progressDownloadText);
-        LinearLayout exitLayout = (LinearLayout) findViewById(R.id.launcherMainExitbtns);
-        switchUsrBtn = (Button) exitLayout.getChildAt(0);
-        logoutBtn = (Button) exitLayout.getChildAt(1);
+        switchUsrBtn = (Button) findViewById(R.id.infoDevBtn);
+        logoutBtn = (Button) findViewById(R.id.switchUserBtn);
 
-        leftView = (LinearLayout) findViewById(R.id.launcherMainLeftLayout);
-        mPlayButton = (Button) findViewById(R.id.launcherMainPlayButton);
-        rightView = (ViewGroup) findViewById(R.id.launcherMainRightLayout);
+        mPlayButton = (Button) findViewById(R.id.launchermainPlayButton);
 
         statusIsLaunching(false);
     }
 
-    @Override
-    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));
-        leftView.setLayoutParams(leftRightParams);
-        rightView.setLayoutParams(leftRightParams);
-        mPlayButton.setLayoutParams(mPlayButtonParams);
-
-        return leftRightWidth;
-    }
 
     @Override
     protected void selectTabPage(int pageIndex){
-        if (tabLayout.getSelectedTabPosition() != pageIndex) {
-            tabLayout.setScrollPosition(pageIndex,0f,true);
-            viewPager.setCurrentItem(pageIndex);
-        }
+        viewPager.setCurrentItem(pageIndex);
+        setTabActive(pageIndex);
     }
-    
+
     private void pickAccount() {
         try {
             mProfile = PojavProfile.getCurrentProfileContent(this);
@@ -221,19 +212,39 @@ public class PojavLauncherActivity extends BaseLauncherActivity
     }
 
     public void statusIsLaunching(boolean isLaunching) {
-        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);
         mLaunchTextStatus.setVisibility(launchVisibility);
-        lmainTabParam.bottomMargin = reparam.height;
-        leftView.setLayoutParams(reparam);
 
         switchUsrBtn.setEnabled(!isLaunching);
         logoutBtn.setEnabled(!isLaunching);
         mVersionSelector.setEnabled(!isLaunching);
         canBack = !isLaunching;
     }
+
+    public void onTabClicked(View view) {
+        for(int i=0; i<Tabs.length;i++){
+            if(view.getId() == Tabs[i].getId()) {
+                selectTabPage(i);
+                return;
+            }
+        }
+    }
+
+    private void setTabActive(int index){
+        for (Button tab : Tabs) {
+            tab.setTypeface(null, Typeface.NORMAL);
+            tab.setTextColor(Color.rgb(220,220,220)); //Slightly less bright white.
+        }
+        Tabs[index].setTypeface(Tabs[index].getTypeface(), Typeface.BOLD);
+        Tabs[index].setTextColor(Color.WHITE);
+
+        //Animating the white bar on the left
+        ValueAnimator animation = ValueAnimator.ofFloat(selected.getY(), Tabs[index].getY()+(Tabs[index].getHeight()-selected.getHeight())/2f);
+        animation.setDuration(250);
+        animation.addUpdateListener(animation1 -> selected.setY((float) animation1.getAnimatedValue()));
+        animation.start();
+    }
+
 }
 
diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java
index b00a5e119..1ef949e65 100644
--- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java
+++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java
@@ -1,9 +1,12 @@
 package net.kdt.pojavlaunch;
 
 import android.*;
+import android.app.Dialog;
 import android.content.*;
 import android.content.pm.*;
 import android.content.res.*;
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
 import android.net.*;
 import android.os.*;
 
@@ -666,94 +669,82 @@ public class PojavLoginActivity extends BaseActivity
     }
     
     public void loginSavedAcc(View view) {
-        AlertDialog.Builder builder = new AlertDialog.Builder(this);
+        final Dialog accountDialog = new Dialog(PojavLoginActivity.this);
 
-        if (Tools.ENABLE_DEV_FEATURES) {
-            builder.setNegativeButton("Toggle UI v2", new DialogInterface.OnClickListener(){
+        accountDialog.setContentView(R.layout.simple_account_list_holder);
+        accountDialog.getWindow().setLayout(800,500);
+
+        LinearLayout accountListLayout = accountDialog.findViewById(R.id.accountListLayout);
+        LayoutInflater inflater = (LayoutInflater) this.getSystemService(LAYOUT_INFLATER_SERVICE);
 
-                    @Override
-                    public void onClick(DialogInterface p1, int p2)
-                    {
-                        int ver = PojavV2ActivityManager.getLauncherRemakeInt(PojavLoginActivity.this) == 0 ? 1 : 0;
-                        PojavV2ActivityManager.setLauncherRemakeVer(PojavLoginActivity.this, ver);
-                        Toast.makeText(PojavLoginActivity.this, "Changed to use v" + (ver + 1), Toast.LENGTH_SHORT).show();
-                    }
-                });
-        }
-        
-        final ArrayAdapter<String> listAdapter = new ArrayAdapter<String>(this, android.R.layout.simple_list_item_1);
         for (String s : new File(Tools.DIR_ACCOUNT_NEW).list()) {
-            listAdapter.add(s.substring(0, s.length() - 5));
-        }
-        
-        builder.setPositiveButton(android.R.string.cancel, null);
-        builder.setTitle(this.getString(R.string.login_select_account));
-        builder.setSingleChoiceItems(listAdapter, 0, new DialogInterface.OnClickListener(){
+            View child = inflater.inflate(R.layout.simple_account_list_item, null);
+            TextView accountName = child.findViewById(R.id.accountName);
+            ImageButton removeButton = child.findViewById(R.id.removeBtn);
+
+            accountName.setText(s.substring(0, s.length() - 5));
+
+            accountListLayout.addView(child);
+
+            accountName.setOnClickListener(new View.OnClickListener() {
+                final String selectedAccName = accountName.getText().toString();
                 @Override
-                public void onClick(final DialogInterface di, final int selectedIndex) {
-                    PopupMenu popup = new PopupMenu(PojavLoginActivity.this, getViewFromList(selectedIndex, ((AlertDialog) di).getListView()));
-                    popup.inflate(R.menu.menu_options_account);
-                    popup.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
+                public void onClick(View v) {
+                    try {
+                        RefreshListener authListener = new RefreshListener(){
                             @Override
-                            public boolean onMenuItemClick(MenuItem item) {
-                                final String selectedAccName = listAdapter.getItem(selectedIndex);
-                                switch (item.getItemId()) {
-                                    case R.id.menu_account_select:
-                                        try {
-                                            RefreshListener authListener = new RefreshListener(){
-                                                @Override
-                                                public void onFailed(Throwable e) {
-                                                    Tools.showError(PojavLoginActivity.this, e);
-                                                }
-
-                                                @Override
-                                                public void onSuccess(MinecraftAccount out) {
-                                                    di.dismiss();
-                                                    mProfile = out;
-                                                    playProfile(true);
-                                                }
-                                            };
-                                            
-                                            MinecraftAccount acc = MinecraftAccount.load(selectedAccName);
-                                            if (acc.isMicrosoft){
-                                                new MicrosoftAuthTask(PojavLoginActivity.this, authListener)
-                                                    .execute("true", acc.msaRefreshToken);
-                                            } else if (acc.accessToken.length() >= 5) {
-                                                PojavProfile.updateTokens(PojavLoginActivity.this, selectedAccName, authListener);
-                                            } else {
-                                                di.dismiss();
-                                                PojavProfile.launch(PojavLoginActivity.this, selectedAccName);
-                                            }
-                                        } catch (Exception e) {
-                                            Tools.showError(PojavLoginActivity.this, e);
-                                        }
-                                        break;
-                                    
-                                    case R.id.menu_account_remove:
-                                        AlertDialog.Builder builder2 = new AlertDialog.Builder(PojavLoginActivity.this);
-                                        builder2.setTitle(selectedAccName);
-                                        builder2.setMessage(R.string.warning_remove_account);
-                                        builder2.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener(){
-
-                                                @Override
-                                                public void onClick(DialogInterface p1, int p2) {
-                                                    new InvalidateTokenTask(PojavLoginActivity.this)
-                                                        .execute(selectedAccName);
-                                                    listAdapter.remove(selectedAccName);
-                                                    listAdapter.notifyDataSetChanged();
-                                                }
-                                            });
-                                        builder2.setNegativeButton(android.R.string.cancel, null);
-                                        builder2.show();
-                                        break;
-                                }
-                                return true;
+                            public void onFailed(Throwable e) {
+                                Tools.showError(PojavLoginActivity.this, e);
                             }
-                        });
-                    popup.show();
+
+                            @Override
+                            public void onSuccess(MinecraftAccount out) {
+                                accountDialog.dismiss();
+                                mProfile = out;
+                                playProfile(true);
+                            }
+                        };
+
+                        MinecraftAccount acc = MinecraftAccount.load(selectedAccName);
+                        if (acc.isMicrosoft){
+                            new MicrosoftAuthTask(PojavLoginActivity.this, authListener)
+                                    .execute("true", acc.msaRefreshToken);
+                        } else if (acc.accessToken.length() >= 5) {
+                            PojavProfile.updateTokens(PojavLoginActivity.this, selectedAccName, authListener);
+                        } else {
+                            accountDialog.dismiss();
+                            PojavProfile.launch(PojavLoginActivity.this, selectedAccName);
+                        }
+                    } catch (Exception e) {
+                        Tools.showError(PojavLoginActivity.this, e);
+                    }
                 }
             });
-        builder.show();
+            removeButton.setOnClickListener(new View.OnClickListener() {
+                final String selectedAccName = accountName.getText().toString();
+                @Override
+                public void onClick(View v) {
+                    AlertDialog.Builder builder2 = new AlertDialog.Builder(PojavLoginActivity.this);
+                    builder2.setTitle(selectedAccName);
+                    builder2.setMessage(R.string.warning_remove_account);
+                    builder2.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener(){
+
+                        @Override
+                        public void onClick(DialogInterface p1, int p2) {
+                            new InvalidateTokenTask(PojavLoginActivity.this)
+                                    .execute(selectedAccName);
+                            accountListLayout.removeAllViewsInLayout();
+                        }
+                    });
+                    builder2.setNegativeButton(android.R.string.cancel, null);
+                    builder2.show();
+                }
+            });
+
+        }
+
+        accountDialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
+        accountDialog.show();
     }
     
     private MinecraftAccount loginOffline() {
diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/PojavProfile.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/PojavProfile.java
index 8b5fc9468..eab24f646 100644
--- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/PojavProfile.java
+++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/PojavProfile.java
@@ -17,7 +17,7 @@ public class PojavProfile
 	private static String PROFILE_PREF = "pojav_profile";
 	private static String PROFILE_PREF_FILE = "file";
 	public static String PROFILE_PREF_TEMP_CONTENT = "tempContent";
-	
+
 	public static SharedPreferences getPrefs(Context ctx) {
 		return ctx.getSharedPreferences(PROFILE_PREF, Context.MODE_PRIVATE);
 	}
@@ -58,7 +58,7 @@ public class PojavProfile
             return null;
         }
     }
-	
+
     public static String getCurrentProfileName(Context ctx) {
         String name = getPrefs(ctx).getString(PROFILE_PREF_FILE, "");
         // A dirty fix
@@ -101,7 +101,7 @@ public class PojavProfile
     public static void launch(Activity ctx, Object o) {
         PojavProfile.setCurrentProfile(ctx, o);
 
-        Intent intent = new Intent(ctx, PojavV2ActivityManager.getLauncherRemakeVer(ctx)); //MCLauncherActivity.class);
+        Intent intent = new Intent(ctx, PojavLauncherActivity.class); //MCLauncherActivity.class);
         ctx.startActivity(intent);
     }
 
diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/PojavV2ActivityManager.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/PojavV2ActivityManager.java
deleted file mode 100644
index c9edc09b1..000000000
--- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/PojavV2ActivityManager.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package net.kdt.pojavlaunch;
-import android.content.*;
-
-public class PojavV2ActivityManager
-{
-	public static String CATEGORY_LAUNCHER = "launcher";
-	public static Class<?> LAUNCHER_V1 = MCLauncherActivity.class;
-	public static Class<?> LAUNCHER_V2 = PojavLauncherActivity.class;
-
-	public static boolean setLauncherRemakeClass(Context context, Class<?> cls) {
-		return setLauncherRemakeVer(context, cls.getName().equals(LAUNCHER_V1.getName()) ? 0 : 1);
-	}
-
-    public static boolean setLauncherRemakeVer(Context context, int i) {
-		Context context2 = context;
-		int i2 = i;
-        if (i2 >= 0 && i2 <= 1) {
-			return getPref(context2).edit().putInt(CATEGORY_LAUNCHER, i2).commit();
-		} else throw new IllegalArgumentException("ver must be 0 or 1");
-	}
-
-	public static int getLauncherRemakeInt(Context context) {
-		if (Tools.ENABLE_DEV_FEATURES) {
-			return getPref(context).getInt(CATEGORY_LAUNCHER, 0);
-		} else {
-			return 0;
-		}
-	}
-
-	public static Class<?> getLauncherRemakeVer(Context context) {
-		return getLauncherRemakeInt(context) == 0 ? LAUNCHER_V1 : LAUNCHER_V2;
-	}
-
-	private static SharedPreferences getPref(Context ctx) {
-		return ctx.getSharedPreferences("remake", Context.MODE_PRIVATE);
-	}
-}
diff --git a/app_pojavlauncher/src/main/res/layout/launcher_main.xml b/app_pojavlauncher/src/main/res/layout/launcher_main.xml
deleted file mode 100644
index 1a5cafd65..000000000
--- a/app_pojavlauncher/src/main/res/layout/launcher_main.xml
+++ /dev/null
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="fill_parent"
-	android:layout_height="fill_parent"
-	android:orientation="vertical">
-
-	<LinearLayout
-		android:orientation="vertical"
-		android:layout_width="match_parent"
-		android:layout_height="match_parent"
-		android:gravity="center_horizontal">
-
-		<LinearLayout
-			android:id="@+id/launchermainFragmentTabView"
-			android:layout_width="match_parent"
-			android:layout_height="match_parent"
-			android:layout_weight="1.0"
-			android:orientation="vertical">
-
-			<com.google.android.material.tabs.TabLayout
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:id="@+id/launchermainTabLayout"/>
-
-			<androidx.viewpager.widget.ViewPager
-				android:layout_width="match_parent"
-				android:layout_height="0dp"
-				android:layout_weight="1"
-				android:id="@+id/launchermainTabPager"/>
-
-		</LinearLayout>
-
-		<LinearLayout
-			android:layout_alignParentBottom="true"
-			android:orientation="vertical"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:gravity="center_horizontal">
-
-			<ProgressBar
-				android:id="@+id/progressDownloadBar"
-				android:layout_width="match_parent"
-				style="?android:attr/progressBarStyleHorizontal"
-				android:layout_height="10dp"
-				android:layout_above="@id/launchermainFragmentTabView"
-				android:visibility="gone"/>
-
-			<TextView
-				android:layout_width="match_parent"
-				android:layout_height="20dp"
-				android:layout_below="@id/progressDownloadBar"
-				android:gravity="center_horizontal"
-				android:text="@string/global_waiting"
-				android:id="@+id/progressDownloadText"
-				android:visibility="gone"/>
-
-			<LinearLayout
-				android:layout_alignParentBottom="true"
-				android:orientation="horizontal"
-				android:layout_width="match_parent"
-				android:layout_height="80dp"
-				android:gravity="center_horizontal">
-
-				<LinearLayout
-					android:id="@+id/launcherMainLeftLayout"
-					android:orientation="vertical"
-					android:layout_width="wrap_content"
-					android:layout_height="80dp"
-					android:layout_alignParentBottom="true"
-					android:gravity="center_horizontal"
-					android:layout_alignParentLeft="true">
-
-					<LinearLayout
-						android:layout_height="wrap_content"
-						android:layout_width="match_parent"
-						android:orientation="horizontal">
-
-						<TextView
-							android:id="@+id/lMTVVer"
-							android:layout_width="wrap_content"
-							android:layout_height="match_parent"
-							android:gravity="center"
-							android:text="@string/main_version"
-							android:textAppearance="?android:attr/textAppearanceMedium"
-							android:textSize="12sp" />
-
-						<Spinner
-							android:layout_width="match_parent"
-							android:layout_height="40dp"
-							android:id="@+id/launcherMainSelectVersion"/>
-
-					</LinearLayout>
-
-					<Button
-						style="?android:attr/buttonBarButtonStyle"
-						android:layout_width="match_parent"
-						android:layout_height="40dp"
-						android:onClick="launcherMenu"
-						android:text="@string/main_options" />
-
-				</LinearLayout>
-
-				<com.kdt.mcgui.MineButton
-					android:id="@+id/launcherMainPlayButton"
-					android:layout_width="wrap_content"
-					android:layout_height="80dp"
-					android:layout_alignParentBottom="true"
-					android:layout_margin="5dp"
-					android:layout_toLeftOf="@id/launcherMainLeftLayout"
-					android:layout_toRightOf="@id/lMTVVer"
-					android:onClick="launchGame"
-					android:text="@string/main_play" />
-
-				<LinearLayout
-					android:id="@+id/launcherMainRightLayout"
-					android:orientation="vertical"
-					android:layout_width="wrap_content"
-					android:layout_height="80dp"
-					android:layout_alignParentBottom="true"
-					android:gravity="center_horizontal"
-					android:layout_alignParentRight="true">
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="20dp"
-                        android:layout_marginRight="4dp"
-                        android:gravity="center"
-                        android:text="@string/main_welcome"
-                        android:textSize="12sp"
-                        android:id="@+id/launchermain_text_welcome"/>
-                    
-					<TextView
-						android:layout_width="wrap_content"
-						android:layout_height="20dp"
-						android:text="@string/global_waiting"
-						android:id="@+id/launcherMainVersionView"
-						android:textSize="12sp"
-						android:gravity="center"/>
-
-					<LinearLayout
-						android:id="@+id/launcherMainExitbtns"
-						android:orientation="horizontal"
-						android:layout_width="match_parent"
-						android:layout_height="wrap_content">
-
-						<Button
-							style="?android:attr/buttonBarButtonStyle"
-							android:layout_width="88dp"
-							android:layout_height="40dp"
-							android:onClick="mcaccSwitchUser"
-							android:text="@string/main_infodev"
-							android:textSize="10sp" />
-
-						<Button
-							style="?android:attr/buttonBarButtonStyle"
-							android:layout_width="match_parent"
-							android:layout_height="40dp"
-							android:onClick="mcaccLogout"
-							android:text="@string/main_switchuser"
-							android:textSize="10sp" />
-
-					</LinearLayout>
-
-				</LinearLayout>
-
-			</LinearLayout>
-
-		</LinearLayout>
-
-	</LinearLayout>
-
-</LinearLayout>
-
diff --git a/app_pojavlauncher/src/main/res/layout/launcher_main_v3.xml b/app_pojavlauncher/src/main/res/layout/launcher_main_v3.xml
deleted file mode 100644
index 5eed69d42..000000000
--- a/app_pojavlauncher/src/main/res/layout/launcher_main_v3.xml
+++ /dev/null
@@ -1,209 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:orientation="horizontal"
-	android:layout_width="match_parent"
-	android:layout_height="match_parent"
-	android:gravity="center_horizontal">
-
-	<LinearLayout
-		android:id="@+id/launchermain_layout_leftmenu"
-		android:layout_width="match_parent"
-		android:layout_height="match_parent"
-		android:layout_weight="1.0"
-		android:orientation="horizontal"
-		android:background="#1D1D1D">
-
-		<LinearLayout
-			android:layout_width="wrap_content"
-			android:layout_height="match_parent"
-			android:orientation="vertical">
-
-			<LinearLayout
-				android:layout_height="wrap_content"
-				android:layout_width="match_parent"
-				android:orientation="vertical">
-
-				<Spinner
-					android:layout_height="wrap_content"
-					android:layout_width="match_parent"
-					android:id="@+id/launchermain_spinner_account"/>
-
-				<TextView
-					android:layout_height="wrap_content"
-					android:layout_width="wrap_content"
-					android:text="Connected"
-					android:id="@+id/launchermain_text_accountstatus"/>
-
-			</LinearLayout>
-
-			<android.support.design.widget.VerticalTabLayout
-				android:layout_width="wrap_content"
-				android:layout_height="match_parent"
-				android:id="@+id/launchermainTabLayout"/>
-
-		</LinearLayout>
-
-	</LinearLayout>
-
-	<LinearLayout
-		android:layout_height="match_parent"
-		android:layout_width="match_parent"
-		android:orientation="vertical"
-		android:layout_weight="1.0">
-
-		<LinearLayout
-			android:id="@+id/launchermain_layout_viewpager"
-			android:layout_height="match_parent"
-			android:layout_width="match_parent"
-			android:orientation="vertical"
-			android:layout_weight="1.0">
-
-			<androidx.viewpager.widget.ViewPager
-				android:layout_width="match_parent"
-				android:layout_height="match_parent"
-				android:id="@+id/launchermainTabPager"
-				android:background="#272727"/>
-
-		</LinearLayout>
-
-		<LinearLayout
-			android:orientation="vertical"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:gravity="center_horizontal">
-
-			<ProgressBar
-				android:id="@+id/progressDownloadBar"
-				android:layout_width="match_parent"
-				style="?android:attr/progressBarStyleHorizontal"
-				android:layout_height="10dp"
-				android:layout_above="@id/launchermainFragmentTabView"
-				android:visibility="gone"/>
-
-			<TextView
-				android:layout_width="match_parent"
-				android:layout_height="20dp"
-				android:layout_below="@id/progressDownloadBar"
-				android:gravity="center_horizontal"
-				android:text="@string/global_waiting"
-				android:id="@+id/progressDownloadText"
-				android:visibility="gone"/>
-
-			<LinearLayout
-				android:layout_alignParentBottom="true"
-				android:orientation="horizontal"
-				android:layout_width="match_parent"
-				android:layout_height="80dp"
-				android:gravity="center_horizontal">
-
-				<LinearLayout
-					android:id="@+id/launcherMainLeftLayout"
-					android:orientation="vertical"
-					android:layout_width="wrap_content"
-					android:layout_height="80dp"
-					android:layout_alignParentBottom="true"
-					android:gravity="center_horizontal"
-					android:layout_alignParentLeft="true">
-
-					<LinearLayout
-						android:layout_height="wrap_content"
-						android:layout_width="match_parent"
-						android:orientation="horizontal">
-
-						<TextView
-							android:id="@+id/lMTVVer"
-							android:layout_width="wrap_content"
-							android:layout_height="match_parent"
-							android:gravity="center"
-							android:text="@string/main_version"
-							android:textAppearance="?android:attr/textAppearanceMedium"
-							android:textSize="12sp"/>
-
-						<Spinner
-							android:layout_width="match_parent"
-							android:layout_height="40dp"
-							android:id="@+id/launchermain_spinner_version"/>
-
-					</LinearLayout>
-
-					<Button
-						style="?android:attr/buttonBarButtonStyle"
-						android:layout_width="match_parent"
-						android:layout_height="40dp"
-						android:onClick="launcherMenu"
-						android:text="@string/main_options"/>
-
-				</LinearLayout>
-
-				<com.kdt.mcgui.MineButton
-					android:id="@+id/launcherMainPlayButton"
-					android:layout_width="wrap_content"
-					android:layout_height="80dp"
-					android:layout_alignParentBottom="true"
-					android:layout_margin="5dp"
-					android:layout_toLeftOf="@id/launcherMainLeftLayout"
-					android:layout_toRightOf="@id/lMTVVer"
-					android:onClick="launchGame"
-					android:text="@string/main_play"/>
-
-				<LinearLayout
-					android:id="@+id/launcherMainRightLayout"
-					android:orientation="vertical"
-					android:layout_width="wrap_content"
-					android:layout_height="80dp"
-					android:layout_alignParentBottom="true"
-					android:gravity="center_horizontal"
-					android:layout_alignParentRight="true">
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="20dp"
-                        android:layout_marginRight="4dp"
-                        android:gravity="center"
-                        android:text="@string/main_welcome"
-                        android:textSize="12sp"
-                        android:id="@+id/launchermain_text_welcome"/>
-                    
-					<TextView
-						android:layout_width="wrap_content"
-						android:layout_height="20dp"
-						android:text="@string/global_waiting"
-						android:id="@+id/launcherMainVersionView"
-						android:textSize="12sp"
-						android:gravity="center"/>
-
-					<LinearLayout
-						android:id="@+id/launcherMainExitbtns"
-						android:orientation="horizontal"
-						android:layout_width="match_parent"
-						android:layout_height="wrap_content">
-
-						<Button
-							style="?android:attr/buttonBarButtonStyle"
-							android:layout_width="88dp"
-							android:layout_height="40dp"
-							android:onClick="mcaccSwitchUser"
-							android:text="@string/main_infodev"
-							android:textSize="10sp"/>
-
-						<Button
-							style="?android:attr/buttonBarButtonStyle"
-							android:layout_width="match_parent"
-							android:layout_height="40dp"
-							android:onClick="mcaccLogout"
-							android:text="@string/main_switchuser"
-							android:textSize="10sp"/>
-
-					</LinearLayout>
-
-				</LinearLayout>
-
-			</LinearLayout>
-
-		</LinearLayout>
-
-	</LinearLayout>
-
-</LinearLayout>
-
diff --git a/app_pojavlauncher/src/main/res/layout/simple_account_list_holder.xml b/app_pojavlauncher/src/main/res/layout/simple_account_list_holder.xml
new file mode 100644
index 000000000..dba6b6ed1
--- /dev/null
+++ b/app_pojavlauncher/src/main/res/layout/simple_account_list_holder.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <LinearLayout
+            android:id="@+id/accountListLayout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:layout_marginStart="0dp"
+            android:layout_marginEnd="0dp"
+            android:layout_marginTop="0dp"
+            android:layout_marginBottom="0dp"
+
+
+            android:background="#424242"
+
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="0.0">
+
+
+
+
+        </LinearLayout>
+    </ScrollView>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app_pojavlauncher/src/main/res/layout/simple_account_list_item.xml b/app_pojavlauncher/src/main/res/layout/simple_account_list_item.xml
new file mode 100644
index 000000000..69585ea16
--- /dev/null
+++ b/app_pojavlauncher/src/main/res/layout/simple_account_list_item.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <TextView
+        android:id="@+id/accountName"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:minHeight="?android:attr/listPreferredItemHeightSmall"
+        android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+        android:textAppearance="?android:attr/textAppearanceListItemSmall"
+
+        android:text="Name Placeholder"
+
+        app:layout_constraintEnd_toStartOf="@+id/removeBtn"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <ImageButton
+        android:id="@+id/removeBtn"
+        android:layout_width="wrap_content"
+        android:layout_height="0dp"
+        android:background="?attr/selectableItemBackground"
+        android:paddingStart="10dp"
+
+        android:paddingEnd="10dp"
+        app:layout_constraintBottom_toBottomOf="@+id/accountName"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:srcCompat="@drawable/ic_remove" />
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app_pojavlauncher/src/main/res/values/headings_array.xml b/app_pojavlauncher/src/main/res/values/headings_array.xml
index 924447576..11915e475 100644
--- a/app_pojavlauncher/src/main/res/values/headings_array.xml
+++ b/app_pojavlauncher/src/main/res/values/headings_array.xml
@@ -4,7 +4,6 @@
         <item>@string/mcl_option_modinstall</item>
         <item>@string/mcl_option_modinstallwitharg</item>
         <item>@string/mcl_option_customcontrol</item>
-        <item>@string/mcl_option_settings</item>
         <item>@string/mcl_option_about</item>
     </string-array>
 </resources>

From de6e46b2ea9083838076fe60ecd6cde7e102e79a Mon Sep 17 00:00:00 2001
From: SerpentSpirale <serpentspirale@gmail.com>
Date: Fri, 8 Jan 2021 21:51:07 +0100
Subject: [PATCH 04/13] - Updated icons to use with the new layout

---
 .../src/main/res/drawable-mdpi/ic_menu_java.png  | Bin 0 -> 501 bytes
 .../src/main/res/drawable-mdpi/ic_menu_news.png  | Bin 0 -> 280 bytes
 .../main/res/drawable-mdpi/ic_menu_settings.png  | Bin 0 -> 293 bytes
 .../main/res/drawable-mdpi/ic_menu_warning.png   | Bin 0 -> 1254 bytes
 .../src/main/res/drawable-mdpi/ic_remove.png     | Bin 0 -> 506 bytes
 .../src/main/res/drawable/ic_menu_java.png       | Bin 1087 -> 0 bytes
 .../src/main/res/drawable/ic_menu_news.png       | Bin 331 -> 0 bytes
 .../src/main/res/drawable/ic_menu_settings.png   | Bin 333 -> 0 bytes
 8 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100755 app_pojavlauncher/src/main/res/drawable-mdpi/ic_menu_java.png
 create mode 100755 app_pojavlauncher/src/main/res/drawable-mdpi/ic_menu_news.png
 create mode 100755 app_pojavlauncher/src/main/res/drawable-mdpi/ic_menu_settings.png
 create mode 100755 app_pojavlauncher/src/main/res/drawable-mdpi/ic_menu_warning.png
 create mode 100755 app_pojavlauncher/src/main/res/drawable-mdpi/ic_remove.png
 delete mode 100644 app_pojavlauncher/src/main/res/drawable/ic_menu_java.png
 delete mode 100644 app_pojavlauncher/src/main/res/drawable/ic_menu_news.png
 delete mode 100644 app_pojavlauncher/src/main/res/drawable/ic_menu_settings.png

diff --git a/app_pojavlauncher/src/main/res/drawable-mdpi/ic_menu_java.png b/app_pojavlauncher/src/main/res/drawable-mdpi/ic_menu_java.png
new file mode 100755
index 0000000000000000000000000000000000000000..91f945e665673dc6c52a3acc7acbec8f8a503230
GIT binary patch
literal 501
zcmV<R0Sf+!P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGf6951U69E94oEQKA0g6dPK~z{r?bg3b
z0&y6}@w-zyv?2}6M6m`#=+{tC;NTWS)L>hKQ-Qd&HPq5y(bCvjO)X6g5ke3R!BIof
z56Q~GC?z#Z8$O?*=l+3f_`asMgNN`ue($SqoMbxMA8)mH7Wljd3rtrp3z|Pw7Suo6
zEby4(@mlknLGtMiP(MIlJzNq)a_^N`(8`2a@F7R8dAtmY?w46mZM0Zmt`D(5jllUG
z$Sq8X9WY|kENB-mS=5pL^RKli3*5VpEb#kG7G)C*P$O`D2X=DvVh4&Z6&A$8{VW&>
z$<GIQiv<C17Yibx01K=Kc}}PiIKKm%=^3#Dm1><uy3T-!xO_J}y~_JTYJ8XlN9Wfp
zkhcRhg8#4s$J;AnET>lm7F22t78r)y30ES;0)Od(1%tsp7Q_eSxu8bi{0?j_%X1(c
z^t0f`c6Kk$j<VpkEZ-e*+xO3`I~GK3?*=sj=XW4GHz{@?&@Jz99oxI0KAdDh&wZW+
r5!?O2Dm=3wog8C<8iB(<K+}E!!hu`KKRJR?00000NkvXXu0mjf6S~Wm

literal 0
HcmV?d00001

diff --git a/app_pojavlauncher/src/main/res/drawable-mdpi/ic_menu_news.png b/app_pojavlauncher/src/main/res/drawable-mdpi/ic_menu_news.png
new file mode 100755
index 0000000000000000000000000000000000000000..5fdcc075437ed9c671cb67e8bbf3f7ea0630258a
GIT binary patch
literal 280
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN
z`?>!lvI6;>1s;*b3=Cq*Ak26&Fd-W#xYpCfF(kr0St8>A$5O)scV-IzZ+@}k1cSl+
zum(;qehCFDmUXc^`ImiU)RlGB;ND-AQpzmHbl9A$gB3_PD7JAcH(xX{C~;~COZc&j
zvE~(fXrRw#6N40|ga?ZsJle?oV1ZrnPo)S3S)Tt*9XA9NM0w`scxbTrlzd&NbEjd>
zj`qfjIUM~=5)H1bmYw|pVXdyBn|3wwGisb|kQ3U%@+*w5pqkx=#my=qfq}s#JIAee
TJ@-AJ!x=nX{an^LB{Ts5ENxk9

literal 0
HcmV?d00001

diff --git a/app_pojavlauncher/src/main/res/drawable-mdpi/ic_menu_settings.png b/app_pojavlauncher/src/main/res/drawable-mdpi/ic_menu_settings.png
new file mode 100755
index 0000000000000000000000000000000000000000..cda0fed91d7c64e09045076e77def48b9ee8db2e
GIT binary patch
literal 293
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN
z`?>!lvI6;>1s;*b3=Cq*Ak26&Fd-W#xXaVUF(kr0S>j`ZpjWeFY1Er~fwvFeF+FQ;
z$Sttxk`icG$;{}K<;XC9r%%E?h9<^x2G78PinmT1_Oz~Mp3%>};nPXs+;<rwJyr=<
z7<B?>X)v6&I-#m)lreX!gz9fW=C(SK1}<?4HTDZ8EDoyb9OhrP7&I8HU}=4Lf4<y5
z_J<c^3|=u5>{DGf%XM8+XRe@N^1Bawj1mXJiVk_5oj8?a<J4J;ZwjbheBiBfqT$M`
jiU9RPfd&T}8W|a;ZjJaNw%YF_&=(Azu6{1-oD!M<GzVuM

literal 0
HcmV?d00001

diff --git a/app_pojavlauncher/src/main/res/drawable-mdpi/ic_menu_warning.png b/app_pojavlauncher/src/main/res/drawable-mdpi/ic_menu_warning.png
new file mode 100755
index 0000000000000000000000000000000000000000..88e8f78e98f5178bc04b9bf476c45c55f2104a0e
GIT binary patch
literal 1254
zcmV<C1R48@P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!T<mc!T}X1N`L?W1bazDK~z{r#g|=7
z990y@&%iE_1*Im9)P_>44FahZl|J;LsflS5qcLK9sU|crvG$?G_~a7;5>1RIMj;x%
zP_WPt6M?4bgB4?qCdO70TWzS-u6!+vMM{BXciG(;|NlF8*WK;x2Z`8U_;b&kd+xbs
z&d$!v%FV{m<C?K7>oyGc+eb2L7{-FO*B5N;f}Vutpg4a+jgU)+tsmHAC-f_1nbC-n
zhQ9lB*!qAC3ZMb*7PvBI{q)QprGWR6Ngv=`fez1$H3frR(Bm}xCyvST*w0G-;m_zI
zoMX&?56-LtI?dBu8ar>DX(+e8srM++4tRfC;T&L0g<h7EwRGT7Xm@O7S*H3r#fnC3
zFQ7f~$(!z2aK*&oZiumYkyimYqm39kpwhXoPsrTJu<|D}_tlVVZe)o0N}&$DCMP)y
zKqAH*f;L;xs5N!0Q`m)cRA(@U7#?nh4(YX7$)^K*pu<)yDpUPk#`2}}%4xWZ#B+D8
zlvdv>1;r)G$2r6ZW5HpFYqOG10nbB~!SUZ^_T+Kf18&{%pwzzBEw!(9OIdCFhA1kA
zv7i#-+N@+O0PUk5fq4LiG1>E$1TOz#PXf>O9a2`kQ%bkjiRZ2w?G+WnSgyh00p?(?
zOl0f8?a&b#%Sd|l^cOS}SgT=e;o~SQ)Rqlnxkker%;iY70uDm^A`A24?P?c%#cZ#J
z7oBCAO3}sC=MZDLhHJq-h`AhbEC4Ozldc(ZU;AN1u8)4F{K=T%kXVsb)d_PYpuPXX
zHCzkaP_xc?12+_aKwi?VP$kdI+u16yz>=Cv#ta9QqUZ#b4%c|!c{$!4UXZOicM47&
zcmQfdB{DPID<R*w?M=hvnNzwDCqgq5DhG3cMu@pnNGSjn@_F74RV`llQG5gME58%5
z(2A|VvSWwhFvsGBvox!qcD+Y}^bR}>Jw#(>um@*9LDLa47*OKH=yYd{!yGe%pXwu(
zn|mZk6oAUMVrYY03+KKS|4<K{e6~0f@=b~#H=Ws&eX@Ghue}Z+2XkFJdxl3m`!>Co
zBDn)kLG_XA^D^E4uI<T!xf+tG-nYf~`A66zroEZ*9e+=l8`MMGOQ8zT6}3Pmv!@1R
z{`)WK&PwqeTVz}FD{|+NHYwi3i#$8b$=rb7gqC<0_=;78@hDWz&vLr2OI_W$*wC<7
zwluvURR>>`4ZHSgZ)TX2x%Kr@4jtv*?7)7g$;3@%{NpzyH2o(7auS}Mmf*w{2~Pf@
z?0jHu?!mo46SUtz6@xIISh_eW7hh_U(3F>xIpHJNv$b0A$ima_vbr<oLrLW}se8Rw
zZmCnZgdrBdmBnK%&*6&hr*qw@c<gDZ>G+Ulm>+?9xhvYZNetKe|E@4xZtRtKXN|A}
zAHaAPUxh+-Pd81z&RBTSbYqUD`hy4m)Hg<rwqM%@AN}^PJp4pcqw?`DX^uX=Nx3{_
zwE5lbX2N@*Q_%kn_pDK+!Qj{c@x?)xn{`b0CAB5R&NTi7okMrxzMF-}KY<hmdX!fx
Q4*&oF07*qoM6N<$f@4)<EC2ui

literal 0
HcmV?d00001

diff --git a/app_pojavlauncher/src/main/res/drawable-mdpi/ic_remove.png b/app_pojavlauncher/src/main/res/drawable-mdpi/ic_remove.png
new file mode 100755
index 0000000000000000000000000000000000000000..f266a302bbb11b5cf4e98b6ad4cd6257b2d6036d
GIT binary patch
literal 506
zcmV<W0R{evP)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0gp*UK~z{r?U+AH
z#4sF&t8fT{h%P$lAUcRHuKFp2Q@?{Qj)&jEP5cDnAh-(ZB)I764IbjZ$wdS~@R0hx
zNz3KZq-nH4ggo$&<acTFQqsHjk~B?y9fP~@9(JJ)Yj==y#-ZsPR*l6Hxj-9Mg>$_^
z4JLl<z<KxvH{dj!&}5CDaSrFUU}XlFO5+&L$!>ueI1IViGYch5!BO}QA6PKZfvd7B
zF$KDW3$h!W8@MdH5>p`3guL`2d4fl>tB`Ld&2tzUu2ERqcT)$)7U()_Lvoe1ec1L;
z1GeF;7}XE&u0{AMMhdno)P=TNwGJL(Aq?@|Ll<xlo`{j;1F}Y6Sy0%Ath>Imdg!}c
z@eJy0Lw?p2BgqTQkI{ct8j$r<G3vo{=g0K<Z|<@`BL;F21G$KST*N>wVjveWkc$||
zg>RrGxDHpuNHPRjqa!RRtU=Z%#i$CVr?yPf6JuS(C&nLB7RdOTQWJd5GEx@kFl$3_
wkhMij8%uE$cHkHME&QwR7H&b)S};w%0S-4G?PC$@`Tzg`07*qoM6N<$g7lHp)&Kwi

literal 0
HcmV?d00001

diff --git a/app_pojavlauncher/src/main/res/drawable/ic_menu_java.png b/app_pojavlauncher/src/main/res/drawable/ic_menu_java.png
deleted file mode 100644
index dea5ffa4c7f1010137f37ed1068c986c7162607f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1087
zcmV-F1i<@=P)<h;3K|Lk000e1NJLTq0024w0024&1^@s6;k!yG00009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH1Jp@GK~#7F?OMxj
z97Pm8)m7Eq^YBbOnPj9$Nq9tT$btpRhBZIH2k;sB7*??7AF==;Bwj*7*?_SE*p?Y5
z*yEY$?&%lR!}gv6oR`$oXJl`V>v7xD_td$!)Wb&~*C4n^FOipp$c08BGJ(hiFtEB0
zhOAsrF3BpCmAoZw0Au8FRRwHvFw_Bd1YMwQLl<b<V0>h(BWU-L5Ga@CP~k-*a%)xr
z$-4TV9|;?j?zgNE4a|9R$;n3xs8cy-7x!bN@5UlmmK$VizNijM%3c2^LG(=KH${mw
zC-cq>`X7$KV3<yBF?WHUWFl4G89Tj;M6M`mr-wY4Fi@1kvn9;wMx^phfhw2h4NMFj
zjKR<)qqd<7v~AcO9i4p3V@-k?>ZzO|?S+E*P99s;HO3j&*z*U}FkzWwNG?;6Ge#q}
zvXClkowi3{FpDn_C~5D$2R+>vxnh2Z^zk7btH6V?AG}Gq+I<RQ(?X@t3*|FT?fhFE
zcmfRq&$m}852c)LdGruIjzhcsC__$T!PVy6j>V3k3$$(69eEk{LP}=Y(m4_N5N)d*
zmW&NtqKYhcfa!d|xk9__DJLDH1DXJJVPKB=n&#f^8<hP0_z0^+*0kwlgee)@3oY(U
zxMlk6)9)!a*^3d82RQ6U81!WcSuHaheDXCIyvEx)&Fa<i#D+QG|A08+%laflyEWrT
zeh5WbBMd$BVn@&g+BS57whiXV(HSMrE>_4$)$Qo)f{q&vdr02CMfv>!cNy=$bK6Ob
z+@Sj5mm_@jqwKaCGZ01mOyHH5D6+1D<^2;8vD49)0qYJS{a%c#pnFH#hAz;yVP^tW
zpFjMFR<R!cc8bMHb}yN0_-qPZ=?gr?vGCpl%1zgQAgtsyl{@e&Qsau8I@}!5dlR)`
znzbG5(s|<nCFG^QWmtKNV`a>nL5shhK&NYw8@s(;8_F8oSi_swhG6L4(YB!rv~AcO
z_i}K|-HUb^cTBQ!y-bjjHv1s9cw;sJ!_V_yDR*lWVz_@@<kqgWf4-12a^l(;s_<Oa
zI5>Gq$=P&_!9aEk+e;HmS?~JJF5SO714DjzOu4siOtBZscB}cPoII87VN)10mKW^)
zzXy8(==ZoE)mLmJHML}GyDDH8XzQ>$@{)S4EvFghD%XBDBym(qV_w)R&AayOCvlmc
z?bn)sw*4EJ^HoO4KwTpAr0hM?49azkFBbcB-0<ut_z*|(L;BNICE0%CZDWhOA`^Kk
zcIr9q47?092N<?r^DouPE*Z5AU7&44^9I*=b$D&r?Qf3e71QwK5Geov002ovPDHLk
FV1f!r0k;4E

diff --git a/app_pojavlauncher/src/main/res/drawable/ic_menu_news.png b/app_pojavlauncher/src/main/res/drawable/ic_menu_news.png
deleted file mode 100644
index 836049e6a919dae42026ad9e48a89e3dd34e1b8d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 331
zcmeAS@N?(olHy`uVBq!ia0vp^Rv^s51|%Qu_R;`SoCO|{#S9E$svykh8Km+7D9BhG
z<nF|<?wrg^AcrO0(btiIVPik{pF~z5|AD8AV@L(#+gpl!hYUoHePqAsx`D;0*{P64
zr_EYX@D6M1Asqo7cSi5-g|C%g@B3Gu7kTN4_r25E+h;kRJ|Z-?ul@S-&vo0k8qSDP
z<yf`MFunix<)Sm<#?!w(D%FTJ{gR>iDDHLlrBLVoX-$^1Iu>NjSe(VN>eycQy;Y~A
zm#%J;d)uAw#;m+T>e&jZrd64{PFw!CU%9t*+TrTHA~|1|0Mn!A1HbL+<XEM)+kNlz
zv{%3519xS;dVBHeCf<3E_rBl%{$J(UvlX&l;l8Gh``^7j_Wbh3tn0HCfJQHywSeK&
aH@2NGjUFzXd{Z0fR|Zd4KbLh*2~7Y7Dvl5U

diff --git a/app_pojavlauncher/src/main/res/drawable/ic_menu_settings.png b/app_pojavlauncher/src/main/res/drawable/ic_menu_settings.png
deleted file mode 100644
index 95562a75b0821c7a586a8986a807866bd7c3502c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 333
zcmeAS@N?(olHy`uVBq!ia0vp^Rv^s51|%Qu_R;`SoCO|{#S9E$svykh8Km+7D9BhG
z<nF|<?wrg^AcrO0(btiIVPik{pF~z5|B<JQV@L(#+na`5Oojrj4+FP+<%&D(wjp54
zb}?)H#J8$%j@*hncy4k9Yc%)Pl4fqlwA7lP`}4$wDsqfc)YBN0vX|;#TYdEL-%2yt
zdKrs3`q9%APu1jVvp8NA2=P5WCzfxwSE!7STjb+++p|++wqHNL>d?-JU0EEf+7>_v
zi`RA9e>eMEGnJa%-uwEd+0jd(hvjm;Vz0m3>b};q=Ay<PD=`seQ<hNY03Z>3?xe=6
z*iQ3vy8<gpbu`?vZY=(<v_1LYC6M&fkh}5sr^@)Jf1YA3?;Y-I=*W2F8;kry>p#c#
Sz6W}ifx*+&&t;ucLK6V4d4E3u


From 08a95ce3acf0039a6d4674d314695b8c3e6402d6 Mon Sep 17 00:00:00 2001
From: SerpentSpirale <serpentspirale@gmail.com>
Date: Fri, 8 Jan 2021 21:51:25 +0100
Subject: [PATCH 05/13] - Updated account selection layout

---
 .../kdt/pojavlaunch/PojavLoginActivity.java   |  5 ++-
 .../res/layout/simple_account_list_holder.xml | 32 +++++++++++++++----
 2 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java
index 1ef949e65..3576ac3a6 100644
--- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java
+++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java
@@ -671,8 +671,11 @@ public class PojavLoginActivity extends BaseActivity
     public void loginSavedAcc(View view) {
         final Dialog accountDialog = new Dialog(PojavLoginActivity.this);
 
+        int xScreen = PojavLoginActivity.this.getResources().getDisplayMetrics().widthPixels;
+        int yScreen = PojavLoginActivity.this.getResources().getDisplayMetrics().heightPixels;
+
         accountDialog.setContentView(R.layout.simple_account_list_holder);
-        accountDialog.getWindow().setLayout(800,500);
+        accountDialog.getWindow().setLayout((int)(xScreen*0.4),(int)(yScreen*0.8));
 
         LinearLayout accountListLayout = accountDialog.findViewById(R.id.accountListLayout);
         LayoutInflater inflater = (LayoutInflater) this.getSystemService(LAYOUT_INFLATER_SERVICE);
diff --git a/app_pojavlauncher/src/main/res/layout/simple_account_list_holder.xml b/app_pojavlauncher/src/main/res/layout/simple_account_list_holder.xml
index dba6b6ed1..593e59afd 100644
--- a/app_pojavlauncher/src/main/res/layout/simple_account_list_holder.xml
+++ b/app_pojavlauncher/src/main/res/layout/simple_account_list_holder.xml
@@ -1,32 +1,50 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    android:background="#424242"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
 
+    <TextView
+        android:id="@+id/TextViewTitle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:paddingTop="20dp"
+        android:paddingBottom="20dp"
+        android:textSize="26sp"
+        android:textStyle="bold"
+        android:textColor="@android:color/white"
+
+        android:text="Select Account"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+
     <ScrollView
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="0dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
+        app:layout_constraintTop_toBottomOf="@+id/TextViewTitle">
 
         <LinearLayout
             android:id="@+id/accountListLayout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical"
             android:layout_marginStart="0dp"
-            android:layout_marginEnd="0dp"
             android:layout_marginTop="0dp"
+            android:layout_marginEnd="0dp"
             android:layout_marginBottom="0dp"
 
 
-            android:background="#424242"
+
+            android:orientation="vertical"
 
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"

From 1f0e4bf19ae09117d5dac53f5499b99c0c5df052 Mon Sep 17 00:00:00 2001
From: SerpentSpirale <serpentspirale@gmail.com>
Date: Fri, 8 Jan 2021 21:51:48 +0100
Subject: [PATCH 06/13] - Streamlined the suppression process

---
 .../net/kdt/pojavlaunch/PojavLoginActivity.java  | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java
index 3576ac3a6..3ef2bf40d 100644
--- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java
+++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java
@@ -727,20 +727,8 @@ public class PojavLoginActivity extends BaseActivity
                 final String selectedAccName = accountName.getText().toString();
                 @Override
                 public void onClick(View v) {
-                    AlertDialog.Builder builder2 = new AlertDialog.Builder(PojavLoginActivity.this);
-                    builder2.setTitle(selectedAccName);
-                    builder2.setMessage(R.string.warning_remove_account);
-                    builder2.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener(){
-
-                        @Override
-                        public void onClick(DialogInterface p1, int p2) {
-                            new InvalidateTokenTask(PojavLoginActivity.this)
-                                    .execute(selectedAccName);
-                            accountListLayout.removeAllViewsInLayout();
-                        }
-                    });
-                    builder2.setNegativeButton(android.R.string.cancel, null);
-                    builder2.show();
+                    new InvalidateTokenTask(PojavLoginActivity.this).execute(selectedAccName);
+                    accountListLayout.removeViewsInLayout(0,1);
                 }
             });
 

From c791a2dd8e4e4c15d8f73d0f8d8f542ce48c0020 Mon Sep 17 00:00:00 2001
From: SerpentSpirale <serpentspirale@gmail.com>
Date: Fri, 8 Jan 2021 21:52:16 +0100
Subject: [PATCH 07/13] - Updated window size for account selection

---
 .../src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java
index 3ef2bf40d..2f2da4a71 100644
--- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java
+++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java
@@ -675,7 +675,7 @@ public class PojavLoginActivity extends BaseActivity
         int yScreen = PojavLoginActivity.this.getResources().getDisplayMetrics().heightPixels;
 
         accountDialog.setContentView(R.layout.simple_account_list_holder);
-        accountDialog.getWindow().setLayout((int)(xScreen*0.4),(int)(yScreen*0.8));
+
 
         LinearLayout accountListLayout = accountDialog.findViewById(R.id.accountListLayout);
         LayoutInflater inflater = (LayoutInflater) this.getSystemService(LAYOUT_INFLATER_SERVICE);
@@ -734,6 +734,7 @@ public class PojavLoginActivity extends BaseActivity
 
         }
 
+        accountDialog.getWindow().setLayout((int)(xScreen*0.4),(int)Math.min((yScreen*0.8), 200 + accountListLayout.getChildCount()*190));
         accountDialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
         accountDialog.show();
     }

From 2f482eceab941de16ea7862acd0f99ea9dca2e4d Mon Sep 17 00:00:00 2001
From: SerpentSpirale <serpentspirale@gmail.com>
Date: Fri, 8 Jan 2021 21:52:39 +0100
Subject: [PATCH 08/13] - Fixed inproper deletion of accounts

---
 .../pojavlaunch/authenticator/mojang/InvalidateTokenTask.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/InvalidateTokenTask.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/InvalidateTokenTask.java
index dc266025f..1480454a1 100644
--- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/InvalidateTokenTask.java
+++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/InvalidateTokenTask.java
@@ -38,7 +38,7 @@ public class InvalidateTokenTask extends AsyncTask<String, Void, Throwable> {
         if (result != null) {
             Tools.showError(ctx, result);
         }
-        new File(path).delete();
+        boolean test = new File(Tools.DIR_ACCOUNT_NEW + "/" + path + ".json").delete();
     }
 }
 

From f4704301919cc814a72ed4928c53a94ecb5f7b3c Mon Sep 17 00:00:00 2001
From: SerpentSpirale <serpentspirale@gmail.com>
Date: Fri, 8 Jan 2021 21:52:47 +0100
Subject: [PATCH 09/13] - Removed unused variable

---
 .../pojavlaunch/authenticator/mojang/InvalidateTokenTask.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/InvalidateTokenTask.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/InvalidateTokenTask.java
index 1480454a1..2229d3362 100644
--- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/InvalidateTokenTask.java
+++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/InvalidateTokenTask.java
@@ -38,7 +38,7 @@ public class InvalidateTokenTask extends AsyncTask<String, Void, Throwable> {
         if (result != null) {
             Tools.showError(ctx, result);
         }
-        boolean test = new File(Tools.DIR_ACCOUNT_NEW + "/" + path + ".json").delete();
+        new File(Tools.DIR_ACCOUNT_NEW + "/" + path + ".json").delete();
     }
 }
 

From 41507397cf81f8f871c0b91b5942ccf402b16f79 Mon Sep 17 00:00:00 2001
From: SerpentSpirale <serpentspirale@gmail.com>
Date: Fri, 8 Jan 2021 21:53:08 +0100
Subject: [PATCH 10/13] - Tweaked account selection window size - Introduced
 dynamic windows resizing when suppressing account

---
 .../src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java
index 2f2da4a71..e5b9b7515 100644
--- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java
+++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java
@@ -729,12 +729,14 @@ public class PojavLoginActivity extends BaseActivity
                 public void onClick(View v) {
                     new InvalidateTokenTask(PojavLoginActivity.this).execute(selectedAccName);
                     accountListLayout.removeViewsInLayout(0,1);
+                    //Resize the window
+                    accountDialog.getWindow().setLayout((int)(xScreen*0.4),(int)Math.min((yScreen*0.8), 200 + accountListLayout.getChildCount()*150));
                 }
             });
 
         }
 
-        accountDialog.getWindow().setLayout((int)(xScreen*0.4),(int)Math.min((yScreen*0.8), 200 + accountListLayout.getChildCount()*190));
+        accountDialog.getWindow().setLayout((int)(xScreen*0.4),(int)Math.min((yScreen*0.8), 200 + accountListLayout.getChildCount()*150));
         accountDialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
         accountDialog.show();
     }

From c3bfe0cd4a76c778cf400d023a4ce0fba18075b9 Mon Sep 17 00:00:00 2001
From: SerpentSpirale <serpentspirale@gmail.com>
Date: Fri, 8 Jan 2021 22:07:45 +0100
Subject: [PATCH 11/13] - Fixed using an hardcoded string in the login holder
 layout

---
 .../src/main/res/layout/simple_account_list_holder.xml          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app_pojavlauncher/src/main/res/layout/simple_account_list_holder.xml b/app_pojavlauncher/src/main/res/layout/simple_account_list_holder.xml
index 593e59afd..d8dcb4e8c 100644
--- a/app_pojavlauncher/src/main/res/layout/simple_account_list_holder.xml
+++ b/app_pojavlauncher/src/main/res/layout/simple_account_list_holder.xml
@@ -17,7 +17,7 @@
         android:textStyle="bold"
         android:textColor="@android:color/white"
 
-        android:text="Select Account"
+        android:text="@string/login_select_account"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"

From 74633d3aa06825433c3c82172e277e3da3a5304b Mon Sep 17 00:00:00 2001
From: SerpentSpirale <serpentspirale@gmail.com>
Date: Fri, 8 Jan 2021 22:29:13 +0100
Subject: [PATCH 12/13] - Fixed improper tab init phase by allowing them to be
 fully inflated before changing their properties.

---
 .../kdt/pojavlaunch/BaseLauncherActivity.java |  4 ++--
 .../pojavlaunch/PojavLauncherActivity.java    | 20 +++++++++++++++++--
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/BaseLauncherActivity.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/BaseLauncherActivity.java
index b40682dce..058337f47 100644
--- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/BaseLauncherActivity.java
+++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/BaseLauncherActivity.java
@@ -220,7 +220,7 @@ public abstract class BaseLauncherActivity extends BaseActivity {
             File lastCrashFile = Tools.lastFileModified(Tools.DIR_HOME_CRASH);
             if(CrashFragment.isNewCrash(lastCrashFile) || !mCrashView.getLastCrash().isEmpty()){
                 mCrashView.resetCrashLog = false;
-                selectTabPage(2);
+                initTabs(2);
 
             } /*else throw new Exception();*/
         } catch(Throwable e) {
@@ -236,5 +236,5 @@ public abstract class BaseLauncherActivity extends BaseActivity {
         return super.onTouchEvent(event);
     }
 
-    protected abstract void selectTabPage(int pageIndex);
+    protected abstract void initTabs(int pageIndex);
 }
diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/PojavLauncherActivity.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/PojavLauncherActivity.java
index ea5767745..aedab0e2c 100644
--- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/PojavLauncherActivity.java
+++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/PojavLauncherActivity.java
@@ -4,6 +4,8 @@ import android.animation.ValueAnimator;
 import android.graphics.Color;
 import android.graphics.Typeface;
 import android.os.Bundle;
+import android.os.Handler;
+import android.os.Looper;
 import android.support.design.widget.VerticalTabLayout.ViewPagerAdapter;
 import android.view.View;
 import android.widget.AdapterView;
@@ -91,6 +93,7 @@ public class PojavLauncherActivity extends BaseLauncherActivity
         Tabs[2] = findViewById(R.id.btnTab3);
         Tabs[3] = findViewById(R.id.btnTab4);
 
+
         pickAccount();
         
 /*
@@ -191,11 +194,13 @@ public class PojavLauncherActivity extends BaseLauncherActivity
         mPlayButton = (Button) findViewById(R.id.launchermainPlayButton);
 
         statusIsLaunching(false);
+
+        initTabs(0);
     }
 
 
-    @Override
-    protected void selectTabPage(int pageIndex){
+
+    private void selectTabPage(int pageIndex){
         viewPager.setCurrentItem(pageIndex);
         setTabActive(pageIndex);
     }
@@ -246,5 +251,16 @@ public class PojavLauncherActivity extends BaseLauncherActivity
         animation.start();
     }
 
+    protected void initTabs(int activeTab){
+        final Handler handler = new Handler(Looper.getMainLooper());
+        handler.postDelayed(new Runnable() {
+            @Override
+            public void run() {
+                //Do something after 100ms
+                selectTabPage(activeTab);
+            }
+        }, 500);
+    }
+
 }
 

From 2bc8dc0218afc8f79cf1bd8aab8c5dc044c6ebd7 Mon Sep 17 00:00:00 2001
From: SerpentSpirale <serpentspirale@gmail.com>
Date: Sat, 9 Jan 2021 10:14:48 +0100
Subject: [PATCH 13/13] - Restored delete account Dialog

---
 .../kdt/pojavlaunch/PojavLoginActivity.java   | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java
index e5b9b7515..a36fa13d0 100644
--- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java
+++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java
@@ -727,10 +727,21 @@ public class PojavLoginActivity extends BaseActivity
                 final String selectedAccName = accountName.getText().toString();
                 @Override
                 public void onClick(View v) {
-                    new InvalidateTokenTask(PojavLoginActivity.this).execute(selectedAccName);
-                    accountListLayout.removeViewsInLayout(0,1);
-                    //Resize the window
-                    accountDialog.getWindow().setLayout((int)(xScreen*0.4),(int)Math.min((yScreen*0.8), 200 + accountListLayout.getChildCount()*150));
+                    AlertDialog.Builder builder2 = new AlertDialog.Builder(PojavLoginActivity.this);
+                    builder2.setTitle(selectedAccName);
+                    builder2.setMessage(R.string.warning_remove_account);
+                    builder2.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener(){
+
+                        @Override
+                        public void onClick(DialogInterface p1, int p2) {
+                            new InvalidateTokenTask(PojavLoginActivity.this).execute(selectedAccName);
+                            accountListLayout.removeViewsInLayout(0,1);
+                            //Resize the window
+                            accountDialog.getWindow().setLayout((int)(xScreen*0.4),(int)Math.min((yScreen*0.8), 200 + accountListLayout.getChildCount()*150));
+                        }
+                    });
+                    builder2.setNegativeButton(android.R.string.cancel, null);
+                    builder2.show();
                 }
             });