Skip to content

Commit

Permalink
v2.3
Browse files Browse the repository at this point in the history
  • Loading branch information
epicstudios856 committed Jan 13, 2024
1 parent 7350c7c commit a512997
Show file tree
Hide file tree
Showing 27 changed files with 2,325 additions and 1,672 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
![logo](https://raw.githubusercontent.com/epicstudios856/Vectras-VM-Android/master/resources/vectras-logo.png)
![logo](https://github.com/ahmedbarakat2007/Vectras-windows-emulator/assets/118398763/096d4a06-8d3c-489f-9fb5-d273f361200c)
[![Telegram Channel][ico-telegram]][link-telegram]
[![Latest Version][ico-version]][link-releases]
[![Software License][ico-license]](LICENSE.md)
Expand Down
8 changes: 4 additions & 4 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ android {
applicationId "com.vectras.vm"
minSdk 21
targetSdk 34
versionCode 6
versionName "2.2"
versionCode 7
versionName "2.3"

ndk { abiFilters "armeabi-v7a","arm64-v8a", "x86", "x86_64" }
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
Expand Down Expand Up @@ -53,8 +53,8 @@ dependencies {
implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'com.google.android.material:material:1.11.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.6.2'
implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2'
implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.7.0'
implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0'
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
implementation 'androidx.navigation:navigation-fragment:2.7.6'
Expand Down
4 changes: 3 additions & 1 deletion app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,9 @@
<activity
android:name="com.vectras.qemu.MainSDLActivity"
android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation|screenSize|smallestScreenSize"
android:launchMode="singleTask" />
android:launchMode="singleTask"
android:theme="@style/Theme.FullScreen"
android:windowSoftInputMode="adjustPan" />
<activity
android:name="com.vectras.qemu.MainVNCActivity"
android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation|screenSize|smallestScreenSize"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/android/androidVNC/Utils.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import android.app.Activity;
import android.app.ActivityManager;
import android.app.AlertDialog;
import androidx.appcompat.app.AlertDialog;
import android.app.ActivityManager.MemoryInfo;
import android.content.Context;
import android.content.DialogInterface;
Expand Down
8 changes: 6 additions & 2 deletions app/src/main/java/com/vectras/qemu/Config.java
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@
import android.widget.ImageView.ScaleType;

import com.vectras.vm.AppConfig;
import com.vectras.vm.SplashActivity;
import com.vectras.vm.VectrasApp;

import java.util.Hashtable;
import java.util.LinkedHashMap;
Expand Down Expand Up @@ -116,7 +118,7 @@ public static String getTmpFolder() {
public static String getMachineDir(){
return getBasefileDir() + machineFolder;
}
public static String logFilePath = null;
public static String logFilePath = cacheDir + "/vectras/vectras-log.txt";


public static final String defaultDNSServer = "8.8.8.8";
Expand Down Expand Up @@ -176,7 +178,9 @@ public static enum MouseMode {
//Change to true in prod if you want to be notified by default for new versions
public static boolean defaultCheckNewVersion = true;

public static final String sharedFolder = AppConfig.sharedFolder;
// App config
public static final String datadirpath = VectrasApp.getApp().getExternalFilesDir("data")+"/";
public static final String sharedFolder = datadirpath + "Vectras/ProgramFiles/";

public static String machinename = "VECTRAS";
public static int paused = 0;
Expand Down

0 comments on commit a512997

Please sign in to comment.