diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml index 282711d..d8c3a3f 100644 --- a/.idea/deploymentTargetSelector.xml +++ b/.idea/deploymentTargetSelector.xml @@ -2,10 +2,10 @@ - + - + diff --git a/app/build.gradle b/app/build.gradle index 9a273f5..6d7cfbb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -12,7 +12,7 @@ android { minSdk minApi targetSdk targetApi versionCode 21 - versionName "v2.9.5-3dfx-doughnut" + versionName "v2.9.5-3dfx-empanada" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" multiDexEnabled true } diff --git a/app/src/main/java/com/vectras/vm/CustomRomActivity.java b/app/src/main/java/com/vectras/vm/CustomRomActivity.java index 4581332..d2d701d 100644 --- a/app/src/main/java/com/vectras/vm/CustomRomActivity.java +++ b/app/src/main/java/com/vectras/vm/CustomRomActivity.java @@ -1206,6 +1206,8 @@ public class CustomRomActivity extends AppCompatActivity { UIUtils.UIAlert(activity, getResources().getString(R.string.from) + ": " + jObj.getString("author"), getResources().getString(R.string.description) + ":\n\n" + Html.fromHtml(jObj.getString("desc"))); } } + TextView arch = findViewById(R.id.textArch); + arch.setText(MainSettingsManager.getArch(CustomRomActivity.this)); } catch (JSONException e) { throw new RuntimeException(e); } diff --git a/app/src/main/java/com/vectras/vm/SetupQemuActivity.java b/app/src/main/java/com/vectras/vm/SetupQemuActivity.java index ecd00f9..c232320 100644 --- a/app/src/main/java/com/vectras/vm/SetupQemuActivity.java +++ b/app/src/main/java/com/vectras/vm/SetupQemuActivity.java @@ -79,6 +79,7 @@ public class SetupQemuActivity extends AppCompatActivity implements View.OnClick MaterialButton buttonsetuptryagain; MaterialButton buttonsetupshowlog; TextView textviewshowadvancedsetup; + TextView textviewhideadvancedsetup; AlertDialog alertDialog; private boolean settingup = false; @@ -109,6 +110,7 @@ public class SetupQemuActivity extends AppCompatActivity implements View.OnClick buttonsetuptryagain = findViewById(R.id.buttonsetuptryagain); buttonsetupshowlog = findViewById(R.id.buttonsetupshowlog); textviewshowadvancedsetup = findViewById(R.id.textviewshowadvancedsetup); + textviewhideadvancedsetup = findViewById(R.id.textviewhideadvancedsetup); buttontryconnectagain.setOnClickListener(this); buttonautosetup.setOnClickListener(this); @@ -116,6 +118,7 @@ public class SetupQemuActivity extends AppCompatActivity implements View.OnClick buttonsetuptryagain.setOnClickListener(this); buttonsetupshowlog.setOnClickListener(this); textviewshowadvancedsetup.setOnClickListener(this); + textviewhideadvancedsetup.setOnClickListener(this); progressBar = findViewById(R.id.progressBar); @@ -325,6 +328,9 @@ public class SetupQemuActivity extends AppCompatActivity implements View.OnClick } else if (id == R.id.buttontryconnectagain) { linearload.setVisibility(View.VISIBLE); net.startRequestNetwork(RequestNetworkController.GET,AppConfig.bootstrapfileslink,"anbui",_net_request_listener); + } else if (id == R.id.textviewhideadvancedsetup) { + linearsimplesetupui.setVisibility(View.VISIBLE); + alertDialog.dismiss(); } } @@ -699,6 +705,7 @@ public class SetupQemuActivity extends AppCompatActivity implements View.OnClick } else { setupVectras32(); } + simpleSetupUIControler(1); return; } }); diff --git a/app/src/main/res/layout/activity_setup_qemu.xml b/app/src/main/res/layout/activity_setup_qemu.xml index 38be590..b8be050 100644 --- a/app/src/main/res/layout/activity_setup_qemu.xml +++ b/app/src/main/res/layout/activity_setup_qemu.xml @@ -267,7 +267,7 @@ + android:orientation="vertical"/> + diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index d9bd0db..7290922 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -362,6 +362,7 @@ إنشاء محرك أقراص ثابت جديد تلقائيًا عند إنشاء جهاز افتراضي جديد بحجم 128 جيجابايت. سيتم مسح كافة البيانات باستثناء النظام. + إخفاء الإعدادات المتقدمة مستخدم Vterm diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 22f8d87..d6909ee 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -3,7 +3,7 @@ Vectras VM - v2.9.5 (3dfx - Doughnut) + v2.9.5 (3dfx - Empanada) Stable Home Logger @@ -395,6 +395,7 @@ Automatically create new hard drive when creating new virtual machine With size is 128GB. All data will be erased except the system. + Hide advanced setup diff --git a/web/data/UpdateConfig.json b/web/data/UpdateConfig.json index 0a2ccd5..2e74bc9 100644 --- a/web/data/UpdateConfig.json +++ b/web/data/UpdateConfig.json @@ -1,6 +1,6 @@ { "versionCode":"21", - "versionName":"v2.9.5-3dfx,v2.9.5-3dfx-almondcake,v2.9.5-3dfx-bread,v2.9.5-3dfx-churro,v2.9.5-3dfx-doughnut", + "versionName":"v2.9.5-3dfx,v2.9.5-3dfx-almondcake,v2.9.5-3dfx-bread,v2.9.5-3dfx-churro,v2.9.5-3dfx-doughnut,v2.9.5-3dfx-empanada", "size": "46 MB", "url": "https://github.com/xoureldeen/Vectras-VM-Android/releases/v2.9.5", "Message": "

v2.9.5-3dfx



New updates are live!",