diff --git a/app/build.gradle b/app/build.gradle index c195b8c..e70d898 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -11,7 +11,7 @@ android { minSdk minApi targetSdk targetApi versionCode 21 - versionName "v2.9.5-3dfx-quincejelly" + versionName "v2.9.5-3dfx-rugelach" 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 8675aed..3cf2ca5 100644 --- a/app/src/main/java/com/vectras/vm/CustomRomActivity.java +++ b/app/src/main/java/com/vectras/vm/CustomRomActivity.java @@ -538,6 +538,14 @@ public class CustomRomActivity extends AppCompatActivity { } }); + LinearLayout lineardisclaimer = findViewById(R.id.lineardisclaimer); + lineardisclaimer.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + VectrasApp.oneDialogNew(getString(R.string.dont_miss_out), getString(R.string.disclaimer_when_using_rom), getString(R.string.i_agree), false, false, CustomRomActivity.this); + } + }); + modify = getIntent().getBooleanExtra("MODIFY", false); if (modify) { created = true; diff --git a/app/src/main/java/com/vectras/vm/VectrasApp.java b/app/src/main/java/com/vectras/vm/VectrasApp.java index dcf1959..50acaf7 100644 --- a/app/src/main/java/com/vectras/vm/VectrasApp.java +++ b/app/src/main/java/com/vectras/vm/VectrasApp.java @@ -720,6 +720,23 @@ public class VectrasApp extends Application { alertDialog.show(); } + public static void oneDialogNew(String _title, String _message, String _buttontext,boolean _cancel, boolean _finish, Activity _activity) { + AlertDialog alertDialog = new AlertDialog.Builder(_activity, R.style.MainDialogTheme).create(); + alertDialog.setTitle(_title); + alertDialog.setMessage(_message); + if (!_cancel) { + alertDialog.setCancelable(false); + } + alertDialog.setButton(DialogInterface.BUTTON_POSITIVE, _buttontext, new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int which) { + if (_finish) { + _activity.finish(); + } + } + }); + alertDialog.show(); + } + public static void oneDialogWithContext(String _title, String _message, boolean _cancel, Context _context) { AlertDialog alertDialog = new AlertDialog.Builder(_context, R.style.MainDialogTheme).create(); alertDialog.setTitle(_title); diff --git a/app/src/main/res/drawable/verified_user_24px.xml b/app/src/main/res/drawable/verified_user_24px.xml new file mode 100644 index 0000000..e0bddb4 --- /dev/null +++ b/app/src/main/res/drawable/verified_user_24px.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/layout/activity_custom_rom.xml b/app/src/main/res/layout/activity_custom_rom.xml index 03ba2e0..414828e 100644 --- a/app/src/main/res/layout/activity_custom_rom.xml +++ b/app/src/main/res/layout/activity_custom_rom.xml @@ -229,13 +229,23 @@ android:text="@string/add" android:visibility="gone"/> - + android:gravity="center_vertical" + android:padding="8sp" + android:background="?android:attr/selectableItemBackground" + android:id="@+id/lineardisclaimer"> + + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 1d9c16a..2bd04c6 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 - Quince Jelly) + v2.9.5 (3dfx - Rugelach) Stable Home Logger @@ -426,6 +426,10 @@ Commands are not allowed to contain \"|\". Reason Size too large, try qcow2 format. + By using any files of this ROM or any files containing anything in any way, you agree that we (developers or contributors to Vectras VM) and the creator or creators of this ROM or these files will not be responsible for any unintended problems that will happen to you and your things. But if the creator or creators of this ROM or these files are confirmed to intentionally want to cause harm to you or anyone else, the creator or creators of this ROM or these files will be responsible. And it also means that you have agreed to the Terms and Policies of the owner, provider or owners, providers of the operating system or operating systems contained in this ROM. + I agree + Don\'t miss out! + When you import any ROM or use files that contain anything, you accept all of this. Click here to read it all. Vterm diff --git a/web/data/UpdateConfig.json b/web/data/UpdateConfig.json index e476333..3f2a6ba 100644 --- a/web/data/UpdateConfig.json +++ b/web/data/UpdateConfig.json @@ -1,15 +1,15 @@ { "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,v2.9.5-3dfx-empanada,v2.9.5-3dfx-flan,v2.9.5-3dfx-gugelhupf,v2.9.5-3dfx-hamentaschen,v2.9.5-3dfx-italianice,v2.9.5-3dfx-ladyfingers,v2.9.5-3dfx-madeleine,v2.9.5-3dfx-neapolitanicecream,v2.9.5-3dfx-orangecake,v2.9.5-3dfx-profiterole,v2.9.5-3dfx-quincejelly", + "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,v2.9.5-3dfx-flan,v2.9.5-3dfx-gugelhupf,v2.9.5-3dfx-hamentaschen,v2.9.5-3dfx-italianice,v2.9.5-3dfx-ladyfingers,v2.9.5-3dfx-madeleine,v2.9.5-3dfx-neapolitanicecream,v2.9.5-3dfx-orangecake,v2.9.5-3dfx-profiterole,v2.9.5-3dfx-quincejelly,v2.9.5-3dfx-rugelach", "size": "46 MB", "url": "https://github.com/xoureldeen/Vectras-VM-Android/releases/v2.9.5", "Message": "

v2.9.5-3dfx

  • Bring back 3dfx support.
  • Enhance app execution.
  • Added some linux programs in x11 display.
  • Added alpine linux (x11).
  • Russian language by @OFGING


New updates are live!", "cancellable": true, "versionCodeBeta":"21", - "versionNameBeta":"v2.9.5-3dfx-quincejelly", - "versionNameBetas":"v2.9.5-3dfx-madeleine,v2.9.5-3dfx-neapolitanicecream,v2.9.5-3dfx-orangecake,v2.9.5-3dfx-profiterole,v2.9.5-3dfx-quincejelly", + "versionNameBeta":"v2.9.5-3dfx-rugelach", + "versionNameBetas":"v2.9.5-3dfx-madeleine,v2.9.5-3dfx-neapolitanicecream,v2.9.5-3dfx-orangecake,v2.9.5-3dfx-profiterole,v2.9.5-3dfx-quincejelly,v2.9.5-3dfx-rugelach", "sizeBeta": "48 MB", "urlBeta": "https://github.com/AnBui2004/Vectras-VM-Emu-Android/releases", - "MessageBeta": "

Quince Jelly

Bugs fixed.", + "MessageBeta": "

Rugelach

Bugs fixed.", "cancellableBeta": true }