external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-16 02:38:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Android] update init message

Browse Source
This commit is contained in:
Anthony Calosa
2021-02-05 15:40:56 +08:00
parent 113df1d7cf
commit cff21e9ac7
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
forge-gui-android/src/forge/app/Main.java
View File

@@ -39,7 +39,7 @@ import android.widget.Button;
import android.widget.TableLayout; import android.widget.TableLayout;
import android.widget.TableRow; import android.widget.TableRow;
import android.widget.TextView; import android.widget.TextView;
import com.badlogic.gdx.Gdx; import com.badlogic.gdx.Version;
import com.badlogic.gdx.backends.android.AndroidApplication; import com.badlogic.gdx.backends.android.AndroidApplication;
import forge.Forge; import forge.Forge;
import forge.interfaces.IDeviceAdapter; import forge.interfaces.IDeviceAdapter;
@@ -59,7 +59,6 @@ public class Main extends AndroidApplication {
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
//get total device RAM in mb //get total device RAM in mb
ActivityManager actManager = (ActivityManager) getSystemService(ACTIVITY_SERVICE); ActivityManager actManager = (ActivityManager) getSystemService(ACTIVITY_SERVICE);
ActivityManager.MemoryInfo memInfo = new ActivityManager.MemoryInfo(); ActivityManager.MemoryInfo memInfo = new ActivityManager.MemoryInfo();
@@ -69,12 +68,6 @@ public class Main extends AndroidApplication {
boolean permissiongranted = checkPermission(); boolean permissiongranted = checkPermission();
Gadapter = new AndroidAdapter(this.getContext()); Gadapter = new AndroidAdapter(this.getContext());
initForge(Gadapter, permissiongranted, totalMemory, isTabletDevice(this.getContext()), Build.VERSION.SDK_INT, Build.VERSION.RELEASE); initForge(Gadapter, permissiongranted, totalMemory, isTabletDevice(this.getContext()), Build.VERSION.SDK_INT, Build.VERSION.RELEASE);
//permission
if(!permissiongranted){
//requestPermission();
displayMessage(Gadapter);
}
} }
private static boolean isTabletDevice(Context activityContext) { private static boolean isTabletDevice(Context activityContext) {
Display display = ((Activity) activityContext).getWindowManager().getDefaultDisplay(); Display display = ((Activity) activityContext).getWindowManager().getDefaultDisplay();
@@ -89,7 +82,7 @@ public class Main extends AndroidApplication {
} }
return false; return false;
} }
private void displayMessage(AndroidAdapter adapter){ private void displayMessage(AndroidAdapter adapter, boolean ex, String msg){
TableLayout TL = new TableLayout(this); TableLayout TL = new TableLayout(this);
TableRow row = new TableRow(this); TableRow row = new TableRow(this);
TableRow row2 = new TableRow(this); TableRow row2 = new TableRow(this);
@@ -103,6 +96,10 @@ public class Main extends AndroidApplication {
" 2) Tap Permissions\n"+ " 2) Tap Permissions\n"+
" 3) Turn on the Storage Permission.\n\n"+ " 3) Turn on the Storage Permission.\n\n"+
"(You can tap anywhere to exit and restart the app)\n\n"; "(You can tap anywhere to exit and restart the app)\n\n";
if (ex) {
title = "Forge didn't initialize!\n";
steps = msg + "\n\n";
}
SpannableString ss1= new SpannableString(title); SpannableString ss1= new SpannableString(title);
ss1.setSpan(new StyleSpan(Typeface.BOLD), 0, ss1.length(), 0); ss1.setSpan(new StyleSpan(Typeface.BOLD), 0, ss1.length(), 0);
@@ -212,14 +209,16 @@ public class Main extends AndroidApplication {
if (permissiongranted){ if (permissiongranted){
//establish assets directory //establish assets directory
if (!Environment.MEDIA_MOUNTED.equals(Environment.getExternalStorageState())) { if (!Environment.MEDIA_MOUNTED.equals(Environment.getExternalStorageState())) {
Gdx.app.error("Forge", "Can't access external storage"); /*Gdx.app.error("Forge", "Can't access external storage");
adapter.exit(); adapter.exit();*/
displayMessage(adapter, true, getDeviceName()+"\n"+"Android "+AndroidRelease+"\n"+"RAM "+ totalRAM+"MB" +"\n"+"LibGDX "+ Version.VERSION+"\n"+"Can't access external storage");
return; return;
} }
String assetsDir = Environment.getExternalStorageDirectory() + "/Forge/"; String assetsDir = Environment.getExternalStorageDirectory() + "/Forge/";
if (!FileUtil.ensureDirectoryExists(assetsDir)) { if (!FileUtil.ensureDirectoryExists(assetsDir)) {
Gdx.app.error("Forge", "Can't access external storage"); /*Gdx.app.error("Forge", "Can't access external storage");
adapter.exit(); adapter.exit();*/
displayMessage(adapter, true, getDeviceName()+"\n"+"Android "+AndroidRelease+"\n"+"RAM "+ totalRAM+"MB" +"\n"+"LibGDX "+ Version.VERSION+"\n"+"Path: " + assetsDir);
return; return;
} }
@@ -253,6 +252,7 @@ public class Main extends AndroidApplication {
//set current orientation //set current orientation
Main.this.setRequestedOrientation(Main.this.getResources().getConfiguration().orientation); Main.this.setRequestedOrientation(Main.this.getResources().getConfiguration().orientation);
initialize(Forge.getApp(new AndroidClipboard(), adapter, "", false, isPortrait, totalRAM, isTabletDevice, AndroidAPI, AndroidRelease, getDeviceName())); initialize(Forge.getApp(new AndroidClipboard(), adapter, "", false, isPortrait, totalRAM, isTabletDevice, AndroidAPI, AndroidRelease, getDeviceName()));
displayMessage(adapter, false, "");
} }
} }