From e30825b63a5a0ca16d150474cf93c39fd64bcfb3 Mon Sep 17 00:00:00 2001 From: ewt45 <79033456+ewt45@users.noreply.github.com> Date: Fri, 26 May 2023 23:08:13 +0800 Subject: [PATCH 01/24] Create LorieView.java --- app/LorieView.java | 51 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 app/LorieView.java diff --git a/app/LorieView.java b/app/LorieView.java new file mode 100644 index 000000000..0455b0be3 --- /dev/null +++ b/app/LorieView.java @@ -0,0 +1,51 @@ +package com.termux.x11; + +import android.content.Context; +import android.content.SharedPreferences; +import android.preference.PreferenceManager; +import android.util.AttributeSet; +import android.view.SurfaceView; + +public class LorieView extends SurfaceView { + public LorieView(Context context) { + super(context); + } + + public LorieView(Context context, AttributeSet attrs) { + super(context, attrs); + } + + public LorieView(Context context, AttributeSet attrs, int defStyleAttr) { + super(context, attrs, defStyleAttr); + } + + public LorieView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) { + super(context, attrs, defStyleAttr, defStyleRes); + } + + @Override + protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { + try { +// SharedPreferences sp = getContext().getSharedPreferences("com.eltechs.ed.CONTAINER_CONFIG_0",Context.MODE_PRIVATE); + SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(getContext()); + String ratioStr = sp.getString("full_screen_with_ratio",""); + if(ratioStr!=null && ratioStr.contains(":") ){ + String[] strings1 = ratioStr.split(":"); + float ratio = Integer.parseInt(strings1[0])*1f/Integer.parseInt(strings1[1]); + int width = MeasureSpec.getSize(widthMeasureSpec); + int height = MeasureSpec.getSize(heightMeasureSpec); + //左右黑边 + if(width*1f/height > ratio){ + heightMeasureSpec = MeasureSpec.makeMeasureSpec((int) (width/ratio), MeasureSpec.EXACTLY); + } + //上下黑边 + else{ + widthMeasureSpec = MeasureSpec.makeMeasureSpec((int) (height*ratio), MeasureSpec.EXACTLY); + } + } + }catch (Exception e){ + e.printStackTrace(); + } + super.onMeasure(widthMeasureSpec, heightMeasureSpec); + } +} From 9a531ae293462830d41e9a2327fb9e5dd9961507 Mon Sep 17 00:00:00 2001 From: ewt45 <79033456+ewt45@users.noreply.github.com> Date: Fri, 26 May 2023 23:08:39 +0800 Subject: [PATCH 02/24] Delete LorieView.java --- app/LorieView.java | 51 ---------------------------------------------- 1 file changed, 51 deletions(-) delete mode 100644 app/LorieView.java diff --git a/app/LorieView.java b/app/LorieView.java deleted file mode 100644 index 0455b0be3..000000000 --- a/app/LorieView.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.termux.x11; - -import android.content.Context; -import android.content.SharedPreferences; -import android.preference.PreferenceManager; -import android.util.AttributeSet; -import android.view.SurfaceView; - -public class LorieView extends SurfaceView { - public LorieView(Context context) { - super(context); - } - - public LorieView(Context context, AttributeSet attrs) { - super(context, attrs); - } - - public LorieView(Context context, AttributeSet attrs, int defStyleAttr) { - super(context, attrs, defStyleAttr); - } - - public LorieView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) { - super(context, attrs, defStyleAttr, defStyleRes); - } - - @Override - protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { - try { -// SharedPreferences sp = getContext().getSharedPreferences("com.eltechs.ed.CONTAINER_CONFIG_0",Context.MODE_PRIVATE); - SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(getContext()); - String ratioStr = sp.getString("full_screen_with_ratio",""); - if(ratioStr!=null && ratioStr.contains(":") ){ - String[] strings1 = ratioStr.split(":"); - float ratio = Integer.parseInt(strings1[0])*1f/Integer.parseInt(strings1[1]); - int width = MeasureSpec.getSize(widthMeasureSpec); - int height = MeasureSpec.getSize(heightMeasureSpec); - //左右黑边 - if(width*1f/height > ratio){ - heightMeasureSpec = MeasureSpec.makeMeasureSpec((int) (width/ratio), MeasureSpec.EXACTLY); - } - //上下黑边 - else{ - widthMeasureSpec = MeasureSpec.makeMeasureSpec((int) (height*ratio), MeasureSpec.EXACTLY); - } - } - }catch (Exception e){ - e.printStackTrace(); - } - super.onMeasure(widthMeasureSpec, heightMeasureSpec); - } -} From e28a32e9a80ae125e83fc522f4f4f38d510716b3 Mon Sep 17 00:00:00 2001 From: ewt45 <79033456+ewt45@users.noreply.github.com> Date: Fri, 26 May 2023 23:09:03 +0800 Subject: [PATCH 03/24] Create LorieView.java --- .../main/java/com/termux/x11/LorieView.java | 51 +++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 app/src/main/java/com/termux/x11/LorieView.java diff --git a/app/src/main/java/com/termux/x11/LorieView.java b/app/src/main/java/com/termux/x11/LorieView.java new file mode 100644 index 000000000..0455b0be3 --- /dev/null +++ b/app/src/main/java/com/termux/x11/LorieView.java @@ -0,0 +1,51 @@ +package com.termux.x11; + +import android.content.Context; +import android.content.SharedPreferences; +import android.preference.PreferenceManager; +import android.util.AttributeSet; +import android.view.SurfaceView; + +public class LorieView extends SurfaceView { + public LorieView(Context context) { + super(context); + } + + public LorieView(Context context, AttributeSet attrs) { + super(context, attrs); + } + + public LorieView(Context context, AttributeSet attrs, int defStyleAttr) { + super(context, attrs, defStyleAttr); + } + + public LorieView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) { + super(context, attrs, defStyleAttr, defStyleRes); + } + + @Override + protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { + try { +// SharedPreferences sp = getContext().getSharedPreferences("com.eltechs.ed.CONTAINER_CONFIG_0",Context.MODE_PRIVATE); + SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(getContext()); + String ratioStr = sp.getString("full_screen_with_ratio",""); + if(ratioStr!=null && ratioStr.contains(":") ){ + String[] strings1 = ratioStr.split(":"); + float ratio = Integer.parseInt(strings1[0])*1f/Integer.parseInt(strings1[1]); + int width = MeasureSpec.getSize(widthMeasureSpec); + int height = MeasureSpec.getSize(heightMeasureSpec); + //左右黑边 + if(width*1f/height > ratio){ + heightMeasureSpec = MeasureSpec.makeMeasureSpec((int) (width/ratio), MeasureSpec.EXACTLY); + } + //上下黑边 + else{ + widthMeasureSpec = MeasureSpec.makeMeasureSpec((int) (height*ratio), MeasureSpec.EXACTLY); + } + } + }catch (Exception e){ + e.printStackTrace(); + } + super.onMeasure(widthMeasureSpec, heightMeasureSpec); + } +} From 339cac8145f38a4dadfe3b480486dcbb290d86ca Mon Sep 17 00:00:00 2001 From: ewt45 <79033456+ewt45@users.noreply.github.com> Date: Fri, 26 May 2023 23:11:03 +0800 Subject: [PATCH 04/24] Update main_activity.xml --- app/src/main/res/layout/main_activity.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/layout/main_activity.xml b/app/src/main/res/layout/main_activity.xml index 322f30b56..cdc6dddce 100644 --- a/app/src/main/res/layout/main_activity.xml +++ b/app/src/main/res/layout/main_activity.xml @@ -16,7 +16,7 @@ android:paddingRight="0dp" android:paddingBottom="0dp"> - Date: Fri, 26 May 2023 23:12:17 +0800 Subject: [PATCH 05/24] Update preferences.xml --- app/src/main/res/xml/preferences.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index 8c10265f2..dd3d9394c 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -2,6 +2,12 @@ + + Date: Fri, 26 May 2023 23:22:26 +0800 Subject: [PATCH 06/24] Update debug_build.yml --- .github/workflows/debug_build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/debug_build.yml b/.github/workflows/debug_build.yml index b13cfe9a1..19ef6f680 100644 --- a/.github/workflows/debug_build.yml +++ b/.github/workflows/debug_build.yml @@ -1,6 +1,7 @@ name: Build on: + workflow_dispatch: push: branches: - master From 06333f808b48e2e2ad1a8a9b3c39eb2364710817 Mon Sep 17 00:00:00 2001 From: ewt45 <79033456+ewt45@users.noreply.github.com> Date: Fri, 26 May 2023 23:23:25 +0800 Subject: [PATCH 07/24] Update debug_build.yml --- .github/workflows/debug_build.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/debug_build.yml b/.github/workflows/debug_build.yml index 19ef6f680..b13cfe9a1 100644 --- a/.github/workflows/debug_build.yml +++ b/.github/workflows/debug_build.yml @@ -1,7 +1,6 @@ name: Build on: - workflow_dispatch: push: branches: - master From 0941daea9b088fb154a4b6b41cb23e4b5568ae2f Mon Sep 17 00:00:00 2001 From: ewt45 <79033456+ewt45@users.noreply.github.com> Date: Sat, 27 May 2023 09:08:07 +0800 Subject: [PATCH 08/24] Update main_activity.xml --- app/src/main/res/layout/main_activity.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/res/layout/main_activity.xml b/app/src/main/res/layout/main_activity.xml index cdc6dddce..312d57b4f 100644 --- a/app/src/main/res/layout/main_activity.xml +++ b/app/src/main/res/layout/main_activity.xml @@ -17,6 +17,7 @@ android:paddingBottom="0dp"> Date: Sat, 27 May 2023 09:08:40 +0800 Subject: [PATCH 09/24] Update LorieView.java --- app/src/main/java/com/termux/x11/LorieView.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/termux/x11/LorieView.java b/app/src/main/java/com/termux/x11/LorieView.java index 0455b0be3..815d8c849 100644 --- a/app/src/main/java/com/termux/x11/LorieView.java +++ b/app/src/main/java/com/termux/x11/LorieView.java @@ -36,11 +36,11 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { int height = MeasureSpec.getSize(heightMeasureSpec); //左右黑边 if(width*1f/height > ratio){ - heightMeasureSpec = MeasureSpec.makeMeasureSpec((int) (width/ratio), MeasureSpec.EXACTLY); + widthMeasureSpec = MeasureSpec.makeMeasureSpec((int) (height*ratio), MeasureSpec.EXACTLY); } //上下黑边 else{ - widthMeasureSpec = MeasureSpec.makeMeasureSpec((int) (height*ratio), MeasureSpec.EXACTLY); + heightMeasureSpec = MeasureSpec.makeMeasureSpec((int) (width/ratio), MeasureSpec.EXACTLY); } } }catch (Exception e){ From a70021b3408399e058d668c406ad1ccfe6a1ea51 Mon Sep 17 00:00:00 2001 From: ewt45 <79033456+ewt45@users.noreply.github.com> Date: Sat, 27 May 2023 09:56:09 +0800 Subject: [PATCH 10/24] Update main_activity.xml --- app/src/main/res/layout/main_activity.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/res/layout/main_activity.xml b/app/src/main/res/layout/main_activity.xml index 312d57b4f..5759d920d 100644 --- a/app/src/main/res/layout/main_activity.xml +++ b/app/src/main/res/layout/main_activity.xml @@ -6,6 +6,7 @@ android:layout_height="match_parent"> Date: Sat, 27 May 2023 10:43:13 +0800 Subject: [PATCH 11/24] Update preferences.xml --- app/src/main/res/xml/preferences.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index dd3d9394c..880808ccd 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -2,11 +2,11 @@ - + Date: Sat, 27 May 2023 10:43:59 +0800 Subject: [PATCH 12/24] Update LorieView.java --- .../main/java/com/termux/x11/LorieView.java | 41 ++++++++++++++----- 1 file changed, 31 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/com/termux/x11/LorieView.java b/app/src/main/java/com/termux/x11/LorieView.java index 815d8c849..71e808216 100644 --- a/app/src/main/java/com/termux/x11/LorieView.java +++ b/app/src/main/java/com/termux/x11/LorieView.java @@ -6,6 +6,8 @@ import android.util.AttributeSet; import android.view.SurfaceView; +import java.util.regex.PatternSyntaxException; + public class LorieView extends SurfaceView { public LorieView(Context context) { super(context); @@ -26,24 +28,43 @@ public LorieView(Context context, AttributeSet attrs, int defStyleAttr, int defS @Override protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { try { -// SharedPreferences sp = getContext().getSharedPreferences("com.eltechs.ed.CONTAINER_CONFIG_0",Context.MODE_PRIVATE); +// SharedPreferences sp = getContext().getSharedPreferences("com.eltechs.ed.CONTAINER_CONFIG_0", Context.MODE_PRIVATE); SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(getContext()); - String ratioStr = sp.getString("full_screen_with_ratio",""); - if(ratioStr!=null && ratioStr.contains(":") ){ - String[] strings1 = ratioStr.split(":"); - float ratio = Integer.parseInt(strings1[0])*1f/Integer.parseInt(strings1[1]); + boolean shouldResize = sp.getBoolean("should_full_screen_with_ratio", true); //full_screen_with_ratio是字符串类型了 + + float ratio; //宽除以高 + String[] res = null; + switch (sp.getString("displayResolutionMode", "native")) { + case "exact": { + res = sp.getString("displayResolutionExact", "1280x1024").split("x"); + break; + } + case "custom": { + try { + res = sp.getString("displayResolutionCustom", "1280x1024").split("x"); + } catch (NumberFormatException | PatternSyntaxException ignored) { + } + break; + } + default: + break; + } + + ratio = res != null ? Integer.parseInt(res[0]) * 1.0f / Integer.parseInt(res[1]) : 0f; + + if (ratio != 0 && shouldResize) { int width = MeasureSpec.getSize(widthMeasureSpec); int height = MeasureSpec.getSize(heightMeasureSpec); //左右黑边 - if(width*1f/height > ratio){ - widthMeasureSpec = MeasureSpec.makeMeasureSpec((int) (height*ratio), MeasureSpec.EXACTLY); + if (width * 1f / height > ratio) { + widthMeasureSpec = MeasureSpec.makeMeasureSpec((int) (height * ratio), MeasureSpec.EXACTLY); } //上下黑边 - else{ - heightMeasureSpec = MeasureSpec.makeMeasureSpec((int) (width/ratio), MeasureSpec.EXACTLY); + else { + heightMeasureSpec = MeasureSpec.makeMeasureSpec((int) (width / ratio), MeasureSpec.EXACTLY); } } - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); } super.onMeasure(widthMeasureSpec, heightMeasureSpec); From f90338b0aecb13427b3aa2e694b7c842a08b4597 Mon Sep 17 00:00:00 2001 From: ewt45 <79033456+ewt45@users.noreply.github.com> Date: Sat, 27 May 2023 10:44:25 +0800 Subject: [PATCH 13/24] Update LorieView.java --- app/src/main/java/com/termux/x11/LorieView.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/termux/x11/LorieView.java b/app/src/main/java/com/termux/x11/LorieView.java index 71e808216..b0cf72ba0 100644 --- a/app/src/main/java/com/termux/x11/LorieView.java +++ b/app/src/main/java/com/termux/x11/LorieView.java @@ -28,7 +28,7 @@ public LorieView(Context context, AttributeSet attrs, int defStyleAttr, int defS @Override protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { try { -// SharedPreferences sp = getContext().getSharedPreferences("com.eltechs.ed.CONTAINER_CONFIG_0", Context.MODE_PRIVATE); + SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(getContext()); boolean shouldResize = sp.getBoolean("should_full_screen_with_ratio", true); //full_screen_with_ratio是字符串类型了 From abf70fae548f82456aa118e4bbaced46ccecd753 Mon Sep 17 00:00:00 2001 From: ewt45 <79033456+ewt45@users.noreply.github.com> Date: Sat, 27 May 2023 12:11:04 +0800 Subject: [PATCH 14/24] Update preferences.xml --- app/src/main/res/xml/preferences.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index 880808ccd..b10ad4d33 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -2,11 +2,11 @@ - + Date: Sun, 28 May 2023 10:37:55 +0800 Subject: [PATCH 15/24] Update build.gradle --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 55e2b82c6..a61dd9059 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -49,8 +49,8 @@ android { enable true reset() - include "x86", "x86_64", "armeabi-v7a", "arm64-v8a" - universalApk true //generate an additional APK that contains all the ABIs + include "arm64-v8a" + } } From 29841f99c985a8918478f4b9c008450936146994 Mon Sep 17 00:00:00 2001 From: ewt45 <79033456+ewt45@users.noreply.github.com> Date: Sun, 28 May 2023 11:35:26 +0800 Subject: [PATCH 16/24] Update LoriePreferences.java --- .../java/com/termux/x11/LoriePreferences.java | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/app/src/main/java/com/termux/x11/LoriePreferences.java b/app/src/main/java/com/termux/x11/LoriePreferences.java index 4de4157e2..46dce6b68 100644 --- a/app/src/main/java/com/termux/x11/LoriePreferences.java +++ b/app/src/main/java/com/termux/x11/LoriePreferences.java @@ -83,6 +83,28 @@ public static class LoriePreferenceFragment extends PreferenceFragmentCompat imp public void onCreatePreferences(@Nullable Bundle savedInstanceState, @Nullable String rootKey) { addPreferencesFromResource(R.xml.preferences); } + + @Override + public void onDetach() { + // SharedPreferences sp = getContext().getSharedPreferences("com.eltechs.ed.CONTAINER_CONFIG_0", Context.MODE_PRIVATE); + SharedPreferences sp = android.preference.PreferenceManager.getDefaultSharedPreferences(getContext()); + String res = null; + String mode = sp.getString("displayResolutionMode", "native"); + if ("exact".equals(mode)) + res = sp.getString("displayResolutionExact", "1280x1024"); + else if("custom".equals(mode)) + res = sp.getString("displayResolutionCustom", "1280x1024"); + try { + File file = new File(Environment.getExternalStorageDirectory(), "Box64Droid/resolution.conf"); + if (!file.exists()) + file.createNewFile(); + if (res != null && file.canWrite()) + FileUtils.write(file, res, StandardCharsets.UTF_8, false); + } catch (IOException e) { + e.printStackTrace(); + } + super.onDetach(); + } @SuppressWarnings("ConstantConditions") void updatePreferencesLayout() { From ab662e86f93a43b812910fc963ccdfd618100486 Mon Sep 17 00:00:00 2001 From: ewt45 <79033456+ewt45@users.noreply.github.com> Date: Sun, 28 May 2023 11:36:32 +0800 Subject: [PATCH 17/24] Update AndroidManifest.xml --- app/src/main/AndroidManifest.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1e001ac19..736b891d7 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -3,6 +3,7 @@ xmlns:tools="http://schemas.android.com/tools" android:installLocation="internalOnly"> + From f9ccb7ad1046b8294f55f20d14be7723930cac69 Mon Sep 17 00:00:00 2001 From: ewt45 <79033456+ewt45@users.noreply.github.com> Date: Sun, 28 May 2023 11:44:05 +0800 Subject: [PATCH 18/24] Update LoriePreferences.java --- app/src/main/java/com/termux/x11/LoriePreferences.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/src/main/java/com/termux/x11/LoriePreferences.java b/app/src/main/java/com/termux/x11/LoriePreferences.java index 46dce6b68..be9c73a83 100644 --- a/app/src/main/java/com/termux/x11/LoriePreferences.java +++ b/app/src/main/java/com/termux/x11/LoriePreferences.java @@ -2,6 +2,11 @@ import static android.Manifest.permission.WRITE_SECURE_SETTINGS; import static android.content.pm.PackageManager.PERMISSION_GRANTED; +import android.os.Environment; +import org.apache.commons.io.FileUtils; +import java.io.File; +import java.io.IOException; +import java.nio.charset.StandardCharsets; import android.annotation.SuppressLint; import android.app.Dialog; From e34a04d066f32e22d6f79850027644b423de2910 Mon Sep 17 00:00:00 2001 From: ewt45 <79033456+ewt45@users.noreply.github.com> Date: Sun, 28 May 2023 11:55:15 +0800 Subject: [PATCH 19/24] Update build.gradle --- app/build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/app/build.gradle b/app/build.gradle index a61dd9059..b96c74320 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -99,4 +99,5 @@ dependencies { implementation 'androidx.annotation:annotation:1.6.0' implementation 'androidx.drawerlayout:drawerlayout:1.2.0' compileOnly project(':shell-loader:stub') + compileOnly 'commons-io:commons-io:2.12.0' } From 39ae77a378502a4e57d71ec4640aa1e94854996d Mon Sep 17 00:00:00 2001 From: ewt45 <79033456+ewt45@users.noreply.github.com> Date: Sun, 28 May 2023 12:04:52 +0800 Subject: [PATCH 20/24] Update build.gradle --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index b96c74320..79aeba4c4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -99,5 +99,5 @@ dependencies { implementation 'androidx.annotation:annotation:1.6.0' implementation 'androidx.drawerlayout:drawerlayout:1.2.0' compileOnly project(':shell-loader:stub') - compileOnly 'commons-io:commons-io:2.12.0' + } From accb4316c9a814b10c477992650b87b020d20ca0 Mon Sep 17 00:00:00 2001 From: ewt45 <79033456+ewt45@users.noreply.github.com> Date: Sun, 28 May 2023 12:06:39 +0800 Subject: [PATCH 21/24] Update LoriePreferences.java --- app/src/main/java/com/termux/x11/LoriePreferences.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/termux/x11/LoriePreferences.java b/app/src/main/java/com/termux/x11/LoriePreferences.java index be9c73a83..3e838d609 100644 --- a/app/src/main/java/com/termux/x11/LoriePreferences.java +++ b/app/src/main/java/com/termux/x11/LoriePreferences.java @@ -3,7 +3,7 @@ import static android.Manifest.permission.WRITE_SECURE_SETTINGS; import static android.content.pm.PackageManager.PERMISSION_GRANTED; import android.os.Environment; -import org.apache.commons.io.FileUtils; +import java.nio.file.Files; import java.io.File; import java.io.IOException; import java.nio.charset.StandardCharsets; @@ -100,7 +100,7 @@ public void onDetach() { else if("custom".equals(mode)) res = sp.getString("displayResolutionCustom", "1280x1024"); try { - File file = new File(Environment.getExternalStorageDirectory(), "Box64Droid/resolution.conf"); + Files.write(file.toPath(),res.getBytes(StandardCharsets.UTF_8)); if (!file.exists()) file.createNewFile(); if (res != null && file.canWrite()) From 4d6483c188135c551035e46b4814d59e61129e90 Mon Sep 17 00:00:00 2001 From: ewt45 <79033456+ewt45@users.noreply.github.com> Date: Sun, 28 May 2023 12:07:12 +0800 Subject: [PATCH 22/24] Update LoriePreferences.java --- app/src/main/java/com/termux/x11/LoriePreferences.java | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/java/com/termux/x11/LoriePreferences.java b/app/src/main/java/com/termux/x11/LoriePreferences.java index 3e838d609..3790d8447 100644 --- a/app/src/main/java/com/termux/x11/LoriePreferences.java +++ b/app/src/main/java/com/termux/x11/LoriePreferences.java @@ -91,6 +91,7 @@ public void onCreatePreferences(@Nullable Bundle savedInstanceState, @Nullable S @Override public void onDetach() { + // SharedPreferences sp = getContext().getSharedPreferences("com.eltechs.ed.CONTAINER_CONFIG_0", Context.MODE_PRIVATE); SharedPreferences sp = android.preference.PreferenceManager.getDefaultSharedPreferences(getContext()); String res = null; From 64e7104470bcae7478380d193d7053d9d7b50541 Mon Sep 17 00:00:00 2001 From: ewt45 <79033456+ewt45@users.noreply.github.com> Date: Sun, 28 May 2023 12:12:53 +0800 Subject: [PATCH 23/24] Update LoriePreferences.java --- app/src/main/java/com/termux/x11/LoriePreferences.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/termux/x11/LoriePreferences.java b/app/src/main/java/com/termux/x11/LoriePreferences.java index 3790d8447..9974d8c07 100644 --- a/app/src/main/java/com/termux/x11/LoriePreferences.java +++ b/app/src/main/java/com/termux/x11/LoriePreferences.java @@ -101,14 +101,13 @@ public void onDetach() { else if("custom".equals(mode)) res = sp.getString("displayResolutionCustom", "1280x1024"); try { - Files.write(file.toPath(),res.getBytes(StandardCharsets.UTF_8)); + File file = new File(Environment.getExternalStorageDirectory(), "Box64Droid/resolution.conf"); if (!file.exists()) file.createNewFile(); if (res != null && file.canWrite()) - FileUtils.write(file, res, StandardCharsets.UTF_8, false); + Files.write(file.toPath(),res.getBytes(StandardCharsets.UTF_8)); } catch (IOException e) { - e.printStackTrace(); - } + super.onDetach(); } From 99cfaff9721081fcfeed02eb8a2723270f055bad Mon Sep 17 00:00:00 2001 From: ewt45 <79033456+ewt45@users.noreply.github.com> Date: Sun, 28 May 2023 12:18:09 +0800 Subject: [PATCH 24/24] Update LoriePreferences.java --- app/src/main/java/com/termux/x11/LoriePreferences.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/termux/x11/LoriePreferences.java b/app/src/main/java/com/termux/x11/LoriePreferences.java index 9974d8c07..b3597949b 100644 --- a/app/src/main/java/com/termux/x11/LoriePreferences.java +++ b/app/src/main/java/com/termux/x11/LoriePreferences.java @@ -107,7 +107,8 @@ else if("custom".equals(mode)) if (res != null && file.canWrite()) Files.write(file.toPath(),res.getBytes(StandardCharsets.UTF_8)); } catch (IOException e) { - + e.printStackTrace(); + } super.onDetach(); }