From c3759d9abe33fdbf3df7277a5cf74fa3661e43f4 Mon Sep 17 00:00:00 2001
From: SerpentSpirale <serpentspirale@gmail.com>
Date: Fri, 22 Jan 2021 19:00:42 +0100
Subject: [PATCH] - Changed Play button sizing system to better fit tablets

---
 .../kdt/pojavlaunch/PojavLauncherActivity.java  | 17 +++++------------
 .../src/main/res/layout/launcher_main_v4.xml    |  5 +++--
 2 files changed, 8 insertions(+), 14 deletions(-)

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 880085c33..e285fc71b 100644
--- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/PojavLauncherActivity.java
+++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/PojavLauncherActivity.java
@@ -284,26 +284,22 @@ public class PojavLauncherActivity extends BaseLauncherActivity
     }
 
     private void restoreOldLook(boolean oldLookState){
+        Guideline guideLine = findViewById(R.id.guidelineLeft);
+        ConstraintLayout.LayoutParams params = (ConstraintLayout.LayoutParams) guideLine.getLayoutParams();
         if(oldLookState){
             //UI v1 Style
             //Hide the sidebar
-            Guideline guideLine = findViewById(R.id.guidelineLeft);
-            ConstraintLayout.LayoutParams params = (ConstraintLayout.LayoutParams) guideLine.getLayoutParams();
             params.guidePercent = 0; // 0%, range: 0 <-> 1
-            guideLine.setLayoutParams(params);
 
             //Remove the selected Tab
             selected.setVisibility(View.GONE);
 
             //Enlarge the button, but just a bit.
             params = (ConstraintLayout.LayoutParams) mPlayButton.getLayoutParams();
-            params.width = (int)(params.width*1.80);
-            mPlayButton.setLayoutParams(params);
+            params.matchConstraintPercentWidth = 0.35f;
         }else{
             //UI v2 Style
             //Show the sidebar back
-            Guideline guideLine = findViewById(R.id.guidelineLeft);
-            ConstraintLayout.LayoutParams params = (ConstraintLayout.LayoutParams) guideLine.getLayoutParams();
             params.guidePercent = 0.23f; // 23%, range: 0 <-> 1
             guideLine.setLayoutParams(params);
 
@@ -312,12 +308,9 @@ public class PojavLauncherActivity extends BaseLauncherActivity
 
             //Set the default button size
             params = (ConstraintLayout.LayoutParams) mPlayButton.getLayoutParams();
-            params.width = (int) TypedValue.applyDimension(
-                    TypedValue.COMPLEX_UNIT_DIP,
-                    160,
-                    getResources().getDisplayMetrics());
-            mPlayButton.setLayoutParams(params);
+            params.matchConstraintPercentWidth = 0.25f;
         }
+        mPlayButton.setLayoutParams(params);
     }
 }
 
diff --git a/app_pojavlauncher/src/main/res/layout/launcher_main_v4.xml b/app_pojavlauncher/src/main/res/layout/launcher_main_v4.xml
index 17fc3db2d..eb81b031a 100644
--- a/app_pojavlauncher/src/main/res/layout/launcher_main_v4.xml
+++ b/app_pojavlauncher/src/main/res/layout/launcher_main_v4.xml
@@ -242,14 +242,15 @@
 
     <com.kdt.mcgui.MineButton
         android:id="@+id/launchermainPlayButton"
-        android:layout_width="160dp"
+        android:layout_width="0dp"
         android:layout_height="0dp"
         android:layout_alignParentBottom="true"
         android:onClick="launchGame"
         android:text="@string/main_play"
+        app:layout_constraintWidth_default="percent"
+        app:layout_constraintWidth_percent="0.25"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="@+id/guidelineLeft"
         app:layout_constraintTop_toTopOf="@+id/guidelineBottom" />