diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 86a821a..df0cd57 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -29,7 +29,7 @@ jobs: run: | if [[ -n "${{ secrets.TELEGRAM_BOT_TOKEN }}" ]]; then for chat in \ - "-d chat_id=${{ secrets.TELEGRAM_CHAT_ID }} -d message_thread_id=13762" \ + "-d chat_id=${{ secrets.TELEGRAM_CHAT_ID }} -d message_thread_id=8" \ "-d chat_id=${{ secrets.TELEGRAM_CHAT_ID_VEC }}"; do curl -s -o /dev/null -X POST "https://api.telegram.org/bot${{ secrets.TELEGRAM_BOT_TOKEN }}/sendMessage" \ $chat \ @@ -67,7 +67,7 @@ jobs: until [ $tries -ge 5 ]; do success_targets=false for target in \ - "-F chat_id=${{ secrets.TELEGRAM_CHAT_ID }} -F message_thread_id=13762" \ + "-F chat_id=${{ secrets.TELEGRAM_CHAT_ID }} -F message_thread_id=8" \ "-F chat_id=${{ secrets.TELEGRAM_CHAT_ID_VEC }}"; do if curl -s -o /dev/null -F document=@"$file" $target \ @@ -95,7 +95,7 @@ jobs: if [ "$success" = false ]; then for chat in \ - "-d chat_id=${{ secrets.TELEGRAM_CHAT_ID }} -d message_thread_id=13762" \ + "-d chat_id=${{ secrets.TELEGRAM_CHAT_ID }} -d message_thread_id=8" \ "-d chat_id=${{ secrets.TELEGRAM_CHAT_ID_VEC }}"; do curl -s -o /dev/null -X POST "https://api.telegram.org/bot${{ secrets.TELEGRAM_BOT_TOKEN }}/sendMessage" \ $chat \ diff --git a/app/build.gradle b/app/build.gradle index e071c54..9c7fb62 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -11,7 +11,7 @@ android { minSdk minApi targetSdk targetApi versionCode 21 - versionName "v2.9.5.9-3dfx" + versionName "v2.9.5.10-3dfx" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" multiDexEnabled true } @@ -87,7 +87,7 @@ dependencies { // implementation("com.google.android.gms:play-services-auth:21.4.0") // implementation("com.google.firebase:firebase-crashlytics") // implementation 'com.google.android.gms:play-services-ads:24.6.0' - implementation 'com.google.guava:guava:33.4.8-jre' + implementation 'com.google.guava:guava:33.5.0-jre' implementation 'com.google.code.gson:gson:2.13.2' implementation 'com.squareup.okhttp3:okhttp:5.1.0' implementation "androidx.window:window:1.4.0" diff --git a/app/src/main/java/android/androidVNC/VncCanvasActivity.java b/app/src/main/java/android/androidVNC/VncCanvasActivity.java index 82bf18e..06a960a 100644 --- a/app/src/main/java/android/androidVNC/VncCanvasActivity.java +++ b/app/src/main/java/android/androidVNC/VncCanvasActivity.java @@ -33,10 +33,12 @@ import android.os.SystemClock; import android.util.Log; import android.view.Display; import android.view.KeyEvent; +import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuItem; import android.view.MotionEvent; import android.view.View; +import android.view.ViewGroup; import android.view.Window; import android.view.WindowManager; import android.view.inputmethod.InputMethodManager; @@ -44,6 +46,7 @@ import android.widget.AdapterView; import android.widget.AdapterView.OnItemClickListener; import android.widget.ArrayAdapter; import android.widget.ListView; +import android.widget.RelativeLayout; import android.widget.ZoomControls; import com.antlersoft.android.bc.BCFactory; @@ -1799,6 +1802,29 @@ public abstract class VncCanvasActivity extends AppCompatActivity { } public void reconnect() { + // Recreate canvas to change resolution as resolution when changed in some Linux OS may cause canvas to not resize accordingly. + + // Remove old canvas + ViewGroup parent = findViewById(R.id.vnc_canvas_layout); + parent.removeView(vncCanvas); + + // Create new canvas + VncCanvas newCanvas = new VncCanvas(this); + newCanvas.setId(R.id.vnc_canvas); // Reassign ID + newCanvas.setKeepScreenOn(true); + + // Add to parent + RelativeLayout.LayoutParams params = new RelativeLayout.LayoutParams( + ViewGroup.LayoutParams.WRAP_CONTENT, + ViewGroup.LayoutParams.WRAP_CONTENT + ); + params.addRule(RelativeLayout.CENTER_IN_PARENT, RelativeLayout.TRUE); + + parent.addView(newCanvas, params); + + // Reassign reference variable + vncCanvas = newCanvas; + vncCanvas.initializeVncCanvas(connection, new Runnable() { public void run() { setModes(); diff --git a/app/src/main/java/com/vectras/vm/home/HomeActivity.java b/app/src/main/java/com/vectras/vm/home/HomeActivity.java index f511f6e..8b01f54 100644 --- a/app/src/main/java/com/vectras/vm/home/HomeActivity.java +++ b/app/src/main/java/com/vectras/vm/home/HomeActivity.java @@ -138,7 +138,7 @@ public class HomeActivity extends AppCompatActivity implements RomStoreFragment. // UIUtils.setOnApplyWindowInsetsListenerTop(bindingContent.main); // UIUtils.setOnApplyWindowInsetsListenerLeftOnly(binding.navView); -// UIUtils.setOnApplyWindowInsetsListenerBottomOnly(binding.rvRomstoresearch); + UIUtils.setOnApplyWindowInsetsListenerBottomOnly(binding.rvRomstoresearch); // UIUtils.setOnApplyWindowInsetsListenerBottomOnly(binding.lnSearchempty); initialize(bundle); diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 8b8b4fe..fdf454c 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.9-3dfx + v2.9.5.10-3dfx Stable Home Logger diff --git a/web/data/UpdateConfig.json b/web/data/UpdateConfig.json index fd4f710..a986af8 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,v2.9.5-3dfx-rugelach,v2.9.5-3dfx-scone,v2.9.5-3dfx-tart,v2.9.5-3dfx-ube-halaya,v2.9.5-3dfx-victoria-sponge,v2.9.5-3dfx-waffle,v2.9.5-3dfx-xangos,v2.9.5-3dfx-yorkshire-pudding,v2.9.5-3dfx-zeppole,v2.9.5.1-3dfx,v2.9.5.2-3dfx,v2.9.5.3-3dfx,v2.9.5.4-3dfx,v2.9.5.5-3dfx,v2.9.5.6-3dfx,v2.9.5.7-3dfx,v2.9.5.8-3dfx,v2.9.5.9-3dfx", + "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,v2.9.5-3dfx-scone,v2.9.5-3dfx-tart,v2.9.5-3dfx-ube-halaya,v2.9.5-3dfx-victoria-sponge,v2.9.5-3dfx-waffle,v2.9.5-3dfx-xangos,v2.9.5-3dfx-yorkshire-pudding,v2.9.5-3dfx-zeppole,v2.9.5.1-3dfx,v2.9.5.2-3dfx,v2.9.5.3-3dfx,v2.9.5.4-3dfx,v2.9.5.5-3dfx,v2.9.5.6-3dfx,v2.9.5.7-3dfx,v2.9.5.8-3dfx,v2.9.5.9-3dfx,v2.9.5.10-3dfx", "size": "46 MB", "url": "https://github.com/xoureldeen/Vectras-VM-Android/releases/v2.9.5", "Message": "

v2.9.5-3dfx



New updates are live!", "cancellable": true, "versionCodeBeta":"21", - "versionNameBeta":"v2.9.5.9-3dfx", - "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,v2.9.5-3dfx-scone,v2.9.5-3dfx-tart,v2.9.5-3dfx-victoria-sponge,v2.9.5-3dfx-waffle,v2.9.5-3dfx-xangos,v2.9.5-3dfx-yorkshire-pudding,v2.9.5-3dfx-zeppole,v2.9.5.1-3dfx,v2.9.5.2-3dfx,v2.9.5.3-3dfx,v2.9.5.4-3dfx,v2.9.5.5-3dfx,v2.9.5.6-3dfx,v2.9.5.7-3dfx,v2.9.5.8-3dfx,v2.9.5.9-3dfx", + "versionNameBeta":"v2.9.5.10-3dfx", + "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,v2.9.5-3dfx-scone,v2.9.5-3dfx-tart,v2.9.5-3dfx-victoria-sponge,v2.9.5-3dfx-waffle,v2.9.5-3dfx-xangos,v2.9.5-3dfx-yorkshire-pudding,v2.9.5-3dfx-zeppole,v2.9.5.1-3dfx,v2.9.5.2-3dfx,v2.9.5.3-3dfx,v2.9.5.4-3dfx,v2.9.5.5-3dfx,v2.9.5.6-3dfx,v2.9.5.7-3dfx,v2.9.5.8-3dfx,v2.9.5.9-3dfx,v2.9.5.10-3dfx", "sizeBeta": "41 MB", "urlBeta": "https://github.com/AnBui2004/Vectras-VM-Emu-Android/releases", - "MessageBeta": "

v2.9.5.9-3dfx

Bugs fixed.", + "MessageBeta": "

v2.9.5.10-3dfx

Bugs fixed.", "cancellableBeta": true }