mirror of
https://github.com/SimpleMobileTools/Simple-Calendar.git
synced 2025-06-05 21:59:17 +02:00
move the holiday ics files back in assets folder
This commit is contained in:
@@ -191,6 +191,9 @@ class MainActivity : SimpleActivity(), NavigationListener {
|
|||||||
|
|
||||||
private fun addHolidays() {
|
private fun addHolidays() {
|
||||||
val items = getHolidayRadioItems()
|
val items = getHolidayRadioItems()
|
||||||
|
RadioGroupDialog(this, items, -1) {
|
||||||
|
importEventsDialog(it as String)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun updateView(view: Int) {
|
private fun updateView(view: Int) {
|
||||||
@@ -517,38 +520,38 @@ class MainActivity : SimpleActivity(), NavigationListener {
|
|||||||
private fun getHolidayRadioItems(): ArrayList<RadioItem> {
|
private fun getHolidayRadioItems(): ArrayList<RadioItem> {
|
||||||
val items = ArrayList<RadioItem>()
|
val items = ArrayList<RadioItem>()
|
||||||
|
|
||||||
LinkedHashMap<String, Int>().apply {
|
LinkedHashMap<String, String>().apply {
|
||||||
put("Algeria", R.raw.algeria)
|
put("Algeria", "algeria.ics")
|
||||||
put("België", R.raw.belgium)
|
put("België", "belgium.ics")
|
||||||
put("Bolivia", R.raw.bolivia)
|
put("Bolivia", "bolivia.ics")
|
||||||
put("Brasil", R.raw.brazil)
|
put("Brasil", "brazil.ics")
|
||||||
put("Canada", R.raw.canada)
|
put("Canada", "canada.ics")
|
||||||
put("Česká republika", R.raw.czech)
|
put("Česká republika", "czech.ics")
|
||||||
put("Deutschland", R.raw.germany)
|
put("Deutschland", "germany.ics")
|
||||||
put("Eesti", R.raw.estonia)
|
put("Eesti", "estonia.ics")
|
||||||
put("España", R.raw.spain)
|
put("España", "spain.ics")
|
||||||
put("Éire", R.raw.ireland)
|
put("Éire", "ireland.ics")
|
||||||
put("France", R.raw.france)
|
put("France", "france.ics")
|
||||||
put("Hanguk", R.raw.southkorea)
|
put("Hanguk", "southkorea.ics")
|
||||||
put("Hellas", R.raw.greece)
|
put("Hellas", "greece.ics")
|
||||||
put("India", R.raw.india)
|
put("India", "india.ics")
|
||||||
put("Ísland", R.raw.iceland)
|
put("Ísland", "iceland.ics")
|
||||||
put("Italia", R.raw.italy)
|
put("Italia", "italy.ics")
|
||||||
put("Magyarország", R.raw.hungary)
|
put("Magyarország", "hungary.ics")
|
||||||
put("Nederland", R.raw.netherlands)
|
put("Nederland", "netherlands.ics")
|
||||||
put("Nihon", R.raw.japan)
|
put("Nihon", "japan.ics")
|
||||||
put("Norge", R.raw.norway)
|
put("Norge", "norway.ics")
|
||||||
put("Pākistān", R.raw.pakistan)
|
put("Pākistān", "pakistan.ics")
|
||||||
put("Polska", R.raw.poland)
|
put("Polska", "poland.ics")
|
||||||
put("Portugal", R.raw.portugal)
|
put("Portugal", "portugal.ics")
|
||||||
put("Rossiya", R.raw.russia)
|
put("Rossiya", "russia.ics")
|
||||||
put("Schweiz", R.raw.switzerland)
|
put("Schweiz", "switzerland.ics")
|
||||||
put("Slovenija", R.raw.slovenia)
|
put("Slovenija", "slovenia.ics")
|
||||||
put("Slovensko", R.raw.slovakia)
|
put("Slovensko", "slovakia.ics")
|
||||||
put("Suomi", R.raw.finland)
|
put("Suomi", "finland.ics")
|
||||||
put("Sverige", R.raw.sweden)
|
put("Sverige", "sweden.ics")
|
||||||
put("United Kingdom", R.raw.unitedkingdom)
|
put("United Kingdom", "unitedkingdom.ics")
|
||||||
put("United States", R.raw.unitedstates)
|
put("United States", "unitedstates.ics")
|
||||||
|
|
||||||
var i = 0
|
var i = 0
|
||||||
for ((country, file) in this) {
|
for ((country, file) in this) {
|
||||||
@@ -556,10 +559,6 @@ class MainActivity : SimpleActivity(), NavigationListener {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
RadioGroupDialog(this, items, -1) {
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
return items
|
return items
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -41,7 +41,13 @@ class IcsImporter {
|
|||||||
val importIDs = context.dbHelper.getImportIds()
|
val importIDs = context.dbHelper.getImportIds()
|
||||||
var prevLine = ""
|
var prevLine = ""
|
||||||
|
|
||||||
File(path).inputStream().bufferedReader().use {
|
val inputStream = if (path.contains("/")) {
|
||||||
|
File(path).inputStream()
|
||||||
|
} else {
|
||||||
|
context.assets.open(path)
|
||||||
|
}
|
||||||
|
|
||||||
|
inputStream.bufferedReader().use {
|
||||||
while (true) {
|
while (true) {
|
||||||
var line = it.readLine() ?: break
|
var line = it.readLine() ?: break
|
||||||
if (line.trim().isEmpty())
|
if (line.trim().isEmpty())
|
||||||
|
Reference in New Issue
Block a user