fenix/Simple-Calendar
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Calendar.git synced 2025-02-19 21:20:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

reordering some functions

Browse Source
This commit is contained in:
tibbi 2017-10-21 16:24:37 +02:00
parent 7524360fea
commit 3cef66f2bf
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -124,7 +124,7 @@ class MainActivity : SimpleActivity(), NavigationListener {
override fun onResume() { override fun onResume() {
super.onResume() super.onResume()
if (mStoredTextColor != config.textColor || mStoredBackgroundColor != config.backgroundColor || mStoredPrimaryColor != config.primaryColor if (mStoredTextColor != config.textColor || mStoredBackgroundColor != config.backgroundColor || mStoredPrimaryColor != config.primaryColor
|| mStoredDayCode != getCurrentDayCode()) { || mStoredDayCode != Formatter.getTodayCode()) {
updateViewPager() updateViewPager()
} }
@ -199,11 +199,9 @@ class MainActivity : SimpleActivity(), NavigationListener {
mStoredTextColor = config.textColor mStoredTextColor = config.textColor
mStoredPrimaryColor = config.primaryColor mStoredPrimaryColor = config.primaryColor
mStoredBackgroundColor = config.backgroundColor mStoredBackgroundColor = config.backgroundColor
mStoredDayCode = getCurrentDayCode() mStoredDayCode = Formatter.getTodayCode()
} }
private fun getCurrentDayCode() = Formatter.getDayCodeFromTS((System.currentTimeMillis() / 1000).toInt())
private fun showViewDialog() { private fun showViewDialog() {
val res = resources val res = resources
val items = arrayListOf( val items = arrayListOf(
@ -304,6 +302,14 @@ class MainActivity : SimpleActivity(), NavigationListener {
} }
} }
private fun handleParseResult(result: IcsImporter.ImportResult) {
toast(when (result) {
IcsImporter.ImportResult.IMPORT_OK -> R.string.holidays_imported_successfully
IcsImporter.ImportResult.IMPORT_PARTIAL -> R.string.importing_some_holidays_failed
else -> R.string.importing_holidays_failed
}, Toast.LENGTH_LONG)
}
private fun addBirthdays() { private fun addBirthdays() {
val birthdays = getString(R.string.birthdays) val birthdays = getString(R.string.birthdays)
var eventTypeId = dbHelper.getEventTypeIdWithTitle(birthdays) var eventTypeId = dbHelper.getEventTypeIdWithTitle(birthdays)
@ -355,14 +361,6 @@ class MainActivity : SimpleActivity(), NavigationListener {
} }
} }
private fun handleParseResult(result: IcsImporter.ImportResult) {
toast(when (result) {
IcsImporter.ImportResult.IMPORT_OK -> R.string.holidays_imported_successfully
IcsImporter.ImportResult.IMPORT_PARTIAL -> R.string.importing_some_holidays_failed
else -> R.string.importing_holidays_failed
}, Toast.LENGTH_LONG)
}
private fun updateView(view: Int) { private fun updateView(view: Int) {
calendar_fab.beGoneIf(view == YEARLY_VIEW) calendar_fab.beGoneIf(view == YEARLY_VIEW)
mIsMonthSelected = view == MONTHLY_VIEW mIsMonthSelected = view == MONTHLY_VIEW

2
app/src/main/kotlin/com/simplemobiletools/calendar/helpers/Formatter.kt
View File

@ -54,6 +54,8 @@ object Formatter {
return "$month $day $year" return "$month $day $year"
} }
fun getTodayCode() = Formatter.getDayCodeFromTS((System.currentTimeMillis() / 1000).toInt())
fun getHours(context: Context, dateTime: DateTime) = dateTime.toString(getHourPattern(context)) fun getHours(context: Context, dateTime: DateTime) = dateTime.toString(getHourPattern(context))
fun getTime(context: Context, dateTime: DateTime) = dateTime.toString(getTimePattern(context)) fun getTime(context: Context, dateTime: DateTime) = dateTime.toString(getTimePattern(context))