Miroirs/emu48android
1
0
Fork 0
mirror of https://github.com/dgis/emu48android synced 2025-01-13 08:01:25 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Hide the menu [Default KML script folder] when the default is already displayed (Fix #5).

Browse source
This commit is contained in:
dgis 2020-04-11 00:44:19 +02:00
parent 25fb07f9c0
commit 6343695d7e
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/src/main/java/org/emulator/forty/eight/MainActivity.java
View file

@ -118,7 +118,7 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
private String kmlMimeType = "application/vnd.google-earth.kml+xml"; private String kmlMimeType = "application/vnd.google-earth.kml+xml";
private boolean kmlFolderUseDefault = true; private boolean kmlFolderUseDefault = true;
private String kmlFolderURL = ""; private String kmlFolderURL = "";
private boolean kmFolderChange = true; private boolean kmlFolderChange = true;
private int selectedRAMSize = -1; private int selectedRAMSize = -1;
private boolean[] objectsToSaveItemChecked = null; private boolean[] objectsToSaveItemChecked = null;
@ -454,8 +454,8 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
} }
ArrayList<KMLScriptItem> kmlScripts; ArrayList<KMLScriptItem> kmlScripts;
private void extractKMLScripts() { private void extractKMLScripts() {
if(kmlScripts == null || kmFolderChange) { if(kmlScripts == null || kmlFolderChange) {
kmFolderChange = false; kmlFolderChange = false;
kmlScripts = new ArrayList<>(); kmlScripts = new ArrayList<>();
@ -885,13 +885,13 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
} else } else
kmlScriptsForCurrentModel = kmlScripts; kmlScriptsForCurrentModel = kmlScripts;
boolean hasEmbeddedKMLs = getPackageName().contains("org.emulator.forty.eight"); boolean showDefaultKMLScriptFolderItem = !kmlFolderUseDefault && getPackageName().contains("org.emulator.forty.eight");
int lastIndex = kmlScriptsForCurrentModel.size(); int lastIndex = kmlScriptsForCurrentModel.size();
String[] kmlScriptTitles = new String[lastIndex + (hasEmbeddedKMLs ? 2 : 1)]; String[] kmlScriptTitles = new String[lastIndex + (showDefaultKMLScriptFolderItem ? 2 : 1)];
for (int i = 0; i < kmlScriptsForCurrentModel.size(); i++) for (int i = 0; i < kmlScriptsForCurrentModel.size(); i++)
kmlScriptTitles[i] = kmlScriptsForCurrentModel.get(i).title; kmlScriptTitles[i] = kmlScriptsForCurrentModel.get(i).title;
kmlScriptTitles[lastIndex] = getResources().getString(R.string.load_custom_kml); kmlScriptTitles[lastIndex] = getResources().getString(R.string.load_custom_kml);
if(hasEmbeddedKMLs) if(showDefaultKMLScriptFolderItem)
kmlScriptTitles[lastIndex + 1] = getResources().getString(R.string.load_default_kml); kmlScriptTitles[lastIndex + 1] = getResources().getString(R.string.load_default_kml);
new AlertDialog.Builder(MainActivity.this) new AlertDialog.Builder(MainActivity.this)
.setTitle(getResources().getString(R.string.pick_calculator)) .setTitle(getResources().getString(R.string.pick_calculator))
@ -1437,7 +1437,7 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
// Not found, so we search in the default KML asset folder // Not found, so we search in the default KML asset folder
kmlFolderUseDefault = true; kmlFolderUseDefault = true;
kmFolderChange = true; kmlFolderChange = true;
extractKMLScripts(); extractKMLScripts();
@ -1639,7 +1639,7 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
// https://stackoverflow.com/questions/44185477/intent-action-open-document-tree-doesnt-seem-to-return-a-real-path-to-drive/44185706 // https://stackoverflow.com/questions/44185477/intent-action-open-document-tree-doesnt-seem-to-return-a-real-path-to-drive/44185706
// https://stackoverflow.com/questions/26744842/how-to-use-the-new-sd-card-access-api-presented-for-android-5-0-lollipop // https://stackoverflow.com/questions/26744842/how-to-use-the-new-sd-card-access-api-presented-for-android-5-0-lollipop
} }
kmFolderChange = true; kmlFolderChange = true;
break; break;
case "settings_macro": case "settings_macro":