Merge pull request #227 from AnBui2004/master

Empanada
xoureldeen · Feb 15, 2025 · 7dfe243 · 7dfe243
2 parents 8f6838b + 4bac6ff
commit 7dfe243
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 6 deletions.
diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
diff --git 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
@@ -1206,6 +1206,8 @@ public void run() {
                                                 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
@@ -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,13 +110,15 @@ protected void onCreate(Bundle savedInstanceState) {
         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);
         buttonmanualsetup.setOnClickListener(this);
         buttonsetuptryagain.setOnClickListener(this);
         buttonsetupshowlog.setOnClickListener(this);
         textviewshowadvancedsetup.setOnClickListener(this);
+        textviewhideadvancedsetup.setOnClickListener(this);
 
         progressBar = findViewById(R.id.progressBar);
 
@@ -325,6 +328,9 @@ public void onClick(View v) {
         } 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 void onClick(DialogInterface dialog, int which) {
                 } 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
@@ -267,14 +267,21 @@
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:orientation="horizontal"/>
+                    android:orientation="vertical"/>
 
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/btnInstall"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:visibility="gone"
                     android:text="@string/try_again" />
+                <TextView
+                    android:id="@+id/textviewhideadvancedsetup"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingTop="8dp"
+                    android:text="@string/hide_advanced_setup"
+                    android:gravity="center" />
 
             </LinearLayout>
         </LinearLayout>

diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
@@ -362,6 +362,7 @@
     <string name="auto_create_new_hard_drive_when_creating_new_vm">إنشاء محرك أقراص ثابت جديد تلقائيًا عند إنشاء جهاز افتراضي جديد</string>
     <string name="with_size_is_128GB">بحجم 128 جيجابايت.</string>
     <string name="delete_all_content">سيتم مسح كافة البيانات باستثناء النظام.</string>
+    <string name="hide_advanced_setup">إخفاء الإعدادات المتقدمة</string>
 
     <!--======================TERMUX STRINGS====================-->
     <string name="shared_user_label">مستخدم Vterm</string>

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -3,7 +3,7 @@
     <string name="app_name">Vectras VM</string>
 
     <!--======================VECTRAS STRINGS====================-->
-    <string name="app_version" translatable="false">v2.9.5 (3dfx - Doughnut)</string>
+    <string name="app_version" translatable="false">v2.9.5 (3dfx - Empanada)</string>
     <string name="qemu_version" translatable="false">Stable</string>
     <string name="str_home">Home</string>
     <string name="str_logger">Logger</string>
@@ -395,6 +395,7 @@
     <string name="auto_create_new_hard_drive_when_creating_new_vm">Automatically create new hard drive when creating new virtual machine</string>
     <string name="with_size_is_128GB">With size is 128GB.</string>
     <string name="delete_all_content">All data will be erased except the system.</string>
+    <string name="hide_advanced_setup">Hide advanced setup</string>
 
 
     <!--======================TERMUX STRINGS====================-->

diff --git 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": "<h2>v2.9.5-3dfx</h2><ul><li>Bring back 3dfx support.</li><li>Enhance app execution.</li><li>Added some linux programs in x11 display.</li><li>Added alpine linux (x11).</li><li>Russian language by <a href=\"https://github.com/OFGING\" target=\"_blank\">@OFGING</a></li></ul><br><br>New updates are live!",