Updated the app icon to be the new layer-style of API 26.

client/src/main/AndroidManifest.xml

@@ -9,7 +9,7 @@
  <application
  android:name=".App"
  android:allowBackup="true"
- android:icon="@mipmap/app_icon"
+ android:icon="@drawable/app_icon"
  android:label="@string/app_name"
  android:supportsRtl="true"
  tools:replace="android:supportsRtl"

client/src/main/res/drawable-anydpi-v26/app_icon.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+ <background android:drawable="@drawable/ic_launcher_background"/>
+ <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>

planet-render/src/main/java/au/com/codeka/warworlds/planetrender/ui/AppContent.java

@@ -1,5 +1,7 @@
 package au.com.codeka.warworlds.planetrender.ui;
 
+import org.omg.CORBA.Environment;
+
 import au.com.codeka.warworlds.common.Colour;
 import au.com.codeka.warworlds.common.Image;
 import au.com.codeka.warworlds.common.PerlinNoise;
@@ -21,9 +23,11 @@
 import java.io.UnsupportedEncodingException;
 import java.nio.charset.Charset;
 import java.nio.file.Files;
+import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.List;
 import java.util.Locale;
 import java.util.Random;
 import javax.swing.DefaultComboBoxModel;
@@ -245,31 +249,44 @@ private void initialize() {
  }
 
  private String[] getTemplateNames() {
- ArrayList<String> fileNames = new ArrayList<>();
  File[] files = getSamplesDirectory().listFiles();
  if (files == null) {
  return new String[] {};
  }
 
+ ArrayList<String> fileNames = new ArrayList<>();
+ getTemplateNames(getSamplesDirectory(), "", fileNames);
+
+ String[] array = new String[fileNames.size()];
+ fileNames.toArray(array);
+ Arrays.sort(array);
+ return array;
+ }
+
+ private void getTemplateNames(File rootDir, String prefix, List<String> fileNames) {
+ File[] files = rootDir.listFiles();
+ if (files == null) {
+ return;
+ }
+
  for (File file : files) {
+ if (file.isDirectory() && !file.getName().startsWith(".")) {
+ getTemplateNames(file, prefix + file.getName() + File.separator, fileNames);
+ continue;
+ }
+
  String name = file.getName();
  if (!name.endsWith(".xml")) {
  continue;
  }
- name = name.substring(0, name.length() - 4);
- name = name.replace('-', ' ');
- fileNames.add(name);
- }
 
- String[] array = new String[fileNames.size()];
- fileNames.toArray(array);
- Arrays.sort(array);
- return array;
+ fileNames.add(prefix + name);
+ }
  }
 
  private String loadTemplate(String name) {
  File dir = getSamplesDirectory();
- File templateFile = new File(dir, name.replace(' ', '-') + ".xml");
+ File templateFile = new File(dir, name);
  try {
  return new String(Files.readAllBytes(Paths.get(templateFile.toString())),
  Charset.forName("utf-8"));
@@ -279,6 +296,6 @@ private String loadTemplate(String name) {
  }
 
  private File getSamplesDirectory() {
- return new File("xml");
+ return new File("renderer");
  }
 }