erik/TESRemoteProgrammer
erik/TESRemoteProgrammer
1
0
Fork 0
Code Issues Pull requests Releases Activity

Added default configurations loading.

Browse source
This commit is contained in:
Erik C. Thauvin 2016-08-26 22:33:13 -07:00
parent 4b067c224c
commit d4035ea817
1 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/MainActivity.kt
View file

@ -60,6 +60,7 @@ class MainActivity : AppCompatActivity(), AnkoLogger {
lateinit var config: Config lateinit var config: Config
val configurations_data = "configurations.dat" val configurations_data = "configurations.dat"
val current_config_data = "config.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 val read_request_code = 42
companion object { companion object {
@ -198,7 +199,7 @@ class MainActivity : AppCompatActivity(), AnkoLogger {
.movementMethod = LinkMovementMethod.getInstance() .movementMethod = LinkMovementMethod.getInstance()
} }
R.id.action_config -> { R.id.action_config -> {
val configs = loadConfigurations().configs val configs = loadConfigurations().configs.toSortedMap()
val keys = configs.keys val keys = configs.keys
val checked = keys.indexOf(config.params.name) val checked = keys.indexOf(config.params.name)
val alert = AlertDialog.Builder(this) val alert = AlertDialog.Builder(this)
@ -261,12 +262,12 @@ class MainActivity : AppCompatActivity(), AnkoLogger {
} }
} catch (ex: FileNotFoundException) { } catch (ex: FileNotFoundException) {
val confs = Configurations() val confs = Configurations()
config = Gson().fromJson(InputStreamReader(resources.openRawResource(R.raw.dks_1802)),
Config::class.java) defaultConfigs.forEach {
confs.configs.put(config.params.name, config) config = Gson().fromJson(InputStreamReader(resources.openRawResource(it)),
config = Gson().fromJson(InputStreamReader(resources.openRawResource(R.raw.dks_1802_epd)), Config::class.java)
Config::class.java) confs.configs.put(config.params.name, config)
confs.configs.put(config.params.name, config) }
saveConfigurations(confs) saveConfigurations(confs)
saveConfig(false) saveConfig(false)