fenix
/
Simple-Calendar
mirror of https://github.com/SimpleMobileTools/Simple-Calendar.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

some code style updating

This commit is contained in:
tibbi 2017-08-20 21:58:16 +02:00
parent 3505567083
commit ec02fb162e
2 changed files with 31 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
app/src/main/kotlin/com/simplemobiletools/calendar/activities/MainActivity.kt
View File

@ -207,16 +207,11 @@ class MainActivity : SimpleActivity(), NavigationListener {
}
}
private fun shouldGoToTodayBeVisible(): Boolean {
return if (config.storedView == WEEKLY_VIEW) {
week_view_view_pager.currentItem != mDefaultWeeklyPage
} else if (config.storedView == MONTHLY_VIEW) {
main_view_pager.currentItem != mDefaultMonthlyPage
} else if (config.storedView == YEARLY_VIEW) {
main_view_pager.currentItem != mDefaultYearlyPage
} else {
false
}
private fun shouldGoToTodayBeVisible() = when {
config.storedView == WEEKLY_VIEW -> week_view_view_pager.currentItem != mDefaultWeeklyPage
config.storedView == MONTHLY_VIEW -> main_view_pager.currentItem != mDefaultMonthlyPage
config.storedView == YEARLY_VIEW -> main_view_pager.currentItem != mDefaultYearlyPage
else -> false
}
private fun showFilterDialog() {
@ -281,14 +276,11 @@ class MainActivity : SimpleActivity(), NavigationListener {
private fun updateViewPager() {
resetTitle()
if (config.storedView == YEARLY_VIEW) {
fillYearlyViewPager()
} else if (config.storedView == EVENTS_LIST_VIEW) {
fillEventsList()
} else if (config.storedView == WEEKLY_VIEW) {
fillWeeklyViewPager()
} else {
openMonthlyToday()
when {
config.storedView == YEARLY_VIEW -> fillYearlyViewPager()
config.storedView == EVENTS_LIST_VIEW -> fillEventsList()
config.storedView == WEEKLY_VIEW -> fillWeeklyViewPager()
else -> openMonthlyToday()
}
mWeekScrollY = 0
@ -300,14 +292,11 @@ class MainActivity : SimpleActivity(), NavigationListener {
}
private fun refreshViewPager() {
if (config.storedView == YEARLY_VIEW) {
(main_view_pager.adapter as MyYearPagerAdapter).refreshEvents(main_view_pager.currentItem)
} else if (config.storedView == EVENTS_LIST_VIEW) {
fillEventsList()
} else if (config.storedView == WEEKLY_VIEW) {
(week_view_view_pager.adapter as MyWeekPagerAdapter).refreshEvents(week_view_view_pager.currentItem)
} else {
(main_view_pager.adapter as MyMonthPagerAdapter).refreshEvents(main_view_pager.currentItem)
when {
config.storedView == YEARLY_VIEW -> (main_view_pager.adapter as MyYearPagerAdapter).refreshEvents(main_view_pager.currentItem)
config.storedView == EVENTS_LIST_VIEW -> fillEventsList()
config.storedView == WEEKLY_VIEW -> (week_view_view_pager.adapter as MyWeekPagerAdapter).refreshEvents(week_view_view_pager.currentItem)
else -> (main_view_pager.adapter as MyMonthPagerAdapter).refreshEvents(main_view_pager.currentItem)
}
}
@ -326,9 +315,9 @@ class MainActivity : SimpleActivity(), NavigationListener {
}
private fun tryImportEventsFromFile(uri: Uri) {
if (uri.scheme == "file") {
importEventsDialog(uri.path)
} else if (uri.scheme == "content") {
when {
uri.scheme == "file" -> importEventsDialog(uri.path)
uri.scheme == "content" -> {
val tempFile = getTempFile()
if (tempFile == null) {
toast(R.string.unknown_error_occurred)
@ -339,8 +328,8 @@ class MainActivity : SimpleActivity(), NavigationListener {
val out = FileOutputStream(tempFile)
inputStream.copyTo(out)
importEventsDialog(tempFile.absolutePath)
} else {
toast(R.string.invalid_file_format)
}
else -> toast(R.string.invalid_file_format)
}
}

4
app/src/main/kotlin/com/simplemobiletools/calendar/helpers/CalDAVEventsHandler.kt
View File

@ -64,7 +64,7 @@ class CalDAVEventsHandler(val context: Context) {
return calendars
}
fun fetchCalDAVCalendarEvents(calendarId: Int, eventTypeId: Int) {
private fun fetchCalDAVCalendarEvents(calendarId: Int, eventTypeId: Int) {
val importIdsMap = HashMap<String, Event>()
val fetchedEventIds = ArrayList<String>()
val existingEvents = context.dbHelper.getEventsFromCalDAVCalendar(calendarId)
@ -208,7 +208,7 @@ class CalDAVEventsHandler(val context: Context) {
context.contentResolver.delete(contentUri, null, null)
}
fun getCalDAVEventReminders(eventId: Long): List<Int> {
private fun getCalDAVEventReminders(eventId: Long): List<Int> {
val reminders = ArrayList<Int>()
val uri = CalendarContract.Reminders.CONTENT_URI
val projection = arrayOf(