diff --git a/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/MainActivity.kt b/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/MainActivity.kt index 6e4e49e..d6c16ff 100644 --- a/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/MainActivity.kt +++ b/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/MainActivity.kt @@ -60,6 +60,7 @@ class MainActivity : AppCompatActivity(), AnkoLogger { lateinit var config: Config val configurations_data = "configurations.dat" val current_config_data = "config.dat" + val defaultConfigs = listOf(R.raw.dks_1802, R.raw.dks_1802_epd, R.raw.dks_1812, R.raw.dks_1803_1808_1810) val read_request_code = 42 companion object { @@ -198,7 +199,7 @@ class MainActivity : AppCompatActivity(), AnkoLogger { .movementMethod = LinkMovementMethod.getInstance() } R.id.action_config -> { - val configs = loadConfigurations().configs + val configs = loadConfigurations().configs.toSortedMap() val keys = configs.keys val checked = keys.indexOf(config.params.name) val alert = AlertDialog.Builder(this) @@ -261,12 +262,12 @@ class MainActivity : AppCompatActivity(), AnkoLogger { } } catch (ex: FileNotFoundException) { val confs = Configurations() - config = Gson().fromJson(InputStreamReader(resources.openRawResource(R.raw.dks_1802)), - Config::class.java) - confs.configs.put(config.params.name, config) - config = Gson().fromJson(InputStreamReader(resources.openRawResource(R.raw.dks_1802_epd)), - Config::class.java) - confs.configs.put(config.params.name, config) + + defaultConfigs.forEach { + config = Gson().fromJson(InputStreamReader(resources.openRawResource(it)), + Config::class.java) + confs.configs.put(config.params.name, config) + } saveConfigurations(confs) saveConfig(false)