mirror of
https://github.com/SimpleMobileTools/Simple-Calendar.git
synced 2025-02-19 13:10:51 +01:00
use a helper extension function for getting current time seconds
This commit is contained in:
parent
136e5e2fcf
commit
4c9fdc57f7
@ -120,7 +120,7 @@ class MainActivity : SimpleActivity(), NavigationListener {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (mStoredTextColor != config.textColor || mStoredBackgroundColor != config.backgroundColor || mStoredPrimaryColor != config.primaryColor
|
if (mStoredTextColor != config.textColor || mStoredBackgroundColor != config.backgroundColor || mStoredPrimaryColor != config.primaryColor
|
||||||
|| mStoredDayCode != Formatter.getTodayCode()) {
|
|| mStoredDayCode != Formatter.getTodayCode(applicationContext)) {
|
||||||
updateViewPager()
|
updateViewPager()
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -198,7 +198,7 @@ class MainActivity : SimpleActivity(), NavigationListener {
|
|||||||
mStoredBackgroundColor = backgroundColor
|
mStoredBackgroundColor = backgroundColor
|
||||||
mStoredUse24HourFormat = use24hourFormat
|
mStoredUse24HourFormat = use24hourFormat
|
||||||
}
|
}
|
||||||
mStoredDayCode = Formatter.getTodayCode()
|
mStoredDayCode = Formatter.getTodayCode(applicationContext)
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun checkOpenIntents() {
|
private fun checkOpenIntents() {
|
||||||
|
@ -7,6 +7,7 @@ import com.simplemobiletools.calendar.R
|
|||||||
import com.simplemobiletools.calendar.activities.SimpleActivity
|
import com.simplemobiletools.calendar.activities.SimpleActivity
|
||||||
import com.simplemobiletools.calendar.dialogs.DeleteEventDialog
|
import com.simplemobiletools.calendar.dialogs.DeleteEventDialog
|
||||||
import com.simplemobiletools.calendar.extensions.config
|
import com.simplemobiletools.calendar.extensions.config
|
||||||
|
import com.simplemobiletools.calendar.extensions.getNowSeconds
|
||||||
import com.simplemobiletools.calendar.extensions.shareEvents
|
import com.simplemobiletools.calendar.extensions.shareEvents
|
||||||
import com.simplemobiletools.calendar.helpers.Formatter
|
import com.simplemobiletools.calendar.helpers.Formatter
|
||||||
import com.simplemobiletools.calendar.interfaces.DeleteEventsListener
|
import com.simplemobiletools.calendar.interfaces.DeleteEventsListener
|
||||||
@ -31,7 +32,7 @@ class EventListAdapter(activity: SimpleActivity, val listItems: ArrayList<ListIt
|
|||||||
private val allDayString = resources.getString(R.string.all_day)
|
private val allDayString = resources.getString(R.string.all_day)
|
||||||
private val replaceDescriptionWithLocation = activity.config.replaceDescription
|
private val replaceDescriptionWithLocation = activity.config.replaceDescription
|
||||||
private val redTextColor = resources.getColor(R.color.red_text)
|
private val redTextColor = resources.getColor(R.color.red_text)
|
||||||
private val now = (System.currentTimeMillis() / 1000).toInt()
|
private val now = activity.getNowSeconds()
|
||||||
private val todayDate = Formatter.getDayTitle(activity, Formatter.getDayCodeFromTS(now))
|
private val todayDate = Formatter.getDayTitle(activity, Formatter.getDayCodeFromTS(now))
|
||||||
|
|
||||||
override fun getActionMenuId() = R.menu.cab_event_list
|
override fun getActionMenuId() = R.menu.cab_event_list
|
||||||
|
@ -7,6 +7,7 @@ import com.simplemobiletools.calendar.R
|
|||||||
import com.simplemobiletools.calendar.activities.SimpleActivity
|
import com.simplemobiletools.calendar.activities.SimpleActivity
|
||||||
import com.simplemobiletools.calendar.adapters.FilterEventTypeAdapter
|
import com.simplemobiletools.calendar.adapters.FilterEventTypeAdapter
|
||||||
import com.simplemobiletools.calendar.extensions.dbHelper
|
import com.simplemobiletools.calendar.extensions.dbHelper
|
||||||
|
import com.simplemobiletools.calendar.extensions.getNowSeconds
|
||||||
import com.simplemobiletools.commons.extensions.*
|
import com.simplemobiletools.commons.extensions.*
|
||||||
import kotlinx.android.synthetic.main.dialog_export_events.view.*
|
import kotlinx.android.synthetic.main.dialog_export_events.view.*
|
||||||
import java.io.File
|
import java.io.File
|
||||||
@ -16,7 +17,7 @@ class ExportEventsDialog(val activity: SimpleActivity, val path: String, val cal
|
|||||||
init {
|
init {
|
||||||
val view = (activity.layoutInflater.inflate(R.layout.dialog_export_events, null) as ViewGroup).apply {
|
val view = (activity.layoutInflater.inflate(R.layout.dialog_export_events, null) as ViewGroup).apply {
|
||||||
export_events_folder.text = activity.humanizePath(path)
|
export_events_folder.text = activity.humanizePath(path)
|
||||||
export_events_filename.setText("events_${System.currentTimeMillis() / 1000}")
|
export_events_filename.setText("events_${activity.getNowSeconds()}")
|
||||||
|
|
||||||
activity.dbHelper.getEventTypes {
|
activity.dbHelper.getEventTypes {
|
||||||
val eventTypes = HashSet<String>()
|
val eventTypes = HashSet<String>()
|
||||||
|
@ -7,6 +7,7 @@ import android.support.v7.app.AlertDialog
|
|||||||
import android.view.View
|
import android.view.View
|
||||||
import com.simplemobiletools.calendar.R
|
import com.simplemobiletools.calendar.R
|
||||||
import com.simplemobiletools.calendar.extensions.config
|
import com.simplemobiletools.calendar.extensions.config
|
||||||
|
import com.simplemobiletools.calendar.extensions.getNowSeconds
|
||||||
import com.simplemobiletools.calendar.extensions.seconds
|
import com.simplemobiletools.calendar.extensions.seconds
|
||||||
import com.simplemobiletools.calendar.helpers.Formatter
|
import com.simplemobiletools.calendar.helpers.Formatter
|
||||||
import com.simplemobiletools.commons.extensions.getDialogTheme
|
import com.simplemobiletools.commons.extensions.getDialogTheme
|
||||||
@ -56,7 +57,7 @@ class RepeatLimitTypePickerDialog(val activity: Activity, var repeatLimit: Int,
|
|||||||
|
|
||||||
private fun updateRepeatLimitText() {
|
private fun updateRepeatLimitText() {
|
||||||
if (repeatLimit <= 0)
|
if (repeatLimit <= 0)
|
||||||
repeatLimit = (System.currentTimeMillis() / 1000).toInt()
|
repeatLimit = activity.getNowSeconds()
|
||||||
|
|
||||||
val repeatLimitDateTime = Formatter.getDateTimeFromTS(repeatLimit)
|
val repeatLimitDateTime = Formatter.getDateTimeFromTS(repeatLimit)
|
||||||
view.repeat_type_date.text = Formatter.getFullDate(activity, repeatLimitDateTime)
|
view.repeat_type_date.text = Formatter.getFullDate(activity, repeatLimitDateTime)
|
||||||
@ -80,8 +81,7 @@ class RepeatLimitTypePickerDialog(val activity: Activity, var repeatLimit: Int,
|
|||||||
|
|
||||||
@SuppressLint("NewApi")
|
@SuppressLint("NewApi")
|
||||||
private fun showRepetitionLimitDialog() {
|
private fun showRepetitionLimitDialog() {
|
||||||
val now = (System.currentTimeMillis() / 1000).toInt()
|
val repeatLimitDateTime = Formatter.getDateTimeFromTS(if (repeatLimit != 0) repeatLimit else activity.getNowSeconds())
|
||||||
val repeatLimitDateTime = Formatter.getDateTimeFromTS(if (repeatLimit != 0) repeatLimit else now)
|
|
||||||
val datepicker = DatePickerDialog(activity, activity.getDialogTheme(), repetitionLimitDateSetListener, repeatLimitDateTime.year,
|
val datepicker = DatePickerDialog(activity, activity.getDialogTheme(), repetitionLimitDateSetListener, repeatLimitDateTime.year,
|
||||||
repeatLimitDateTime.monthOfYear - 1, repeatLimitDateTime.dayOfMonth)
|
repeatLimitDateTime.monthOfYear - 1, repeatLimitDateTime.dayOfMonth)
|
||||||
|
|
||||||
|
@ -39,6 +39,8 @@ val Context.config: Config get() = Config.newInstance(applicationContext)
|
|||||||
|
|
||||||
val Context.dbHelper: DBHelper get() = DBHelper.newInstance(applicationContext)
|
val Context.dbHelper: DBHelper get() = DBHelper.newInstance(applicationContext)
|
||||||
|
|
||||||
|
fun Context.getNowSeconds() = (System.currentTimeMillis() / 1000).toInt()
|
||||||
|
|
||||||
fun Context.updateWidgets() {
|
fun Context.updateWidgets() {
|
||||||
val widgetsCnt = AppWidgetManager.getInstance(applicationContext).getAppWidgetIds(ComponentName(applicationContext, MyWidgetMonthlyProvider::class.java))
|
val widgetsCnt = AppWidgetManager.getInstance(applicationContext).getAppWidgetIds(ComponentName(applicationContext, MyWidgetMonthlyProvider::class.java))
|
||||||
if (widgetsCnt.isNotEmpty()) {
|
if (widgetsCnt.isNotEmpty()) {
|
||||||
@ -77,7 +79,7 @@ fun Context.scheduleNextEventReminder(event: Event?, dbHelper: DBHelper) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
val now = (System.currentTimeMillis() / 1000).toInt()
|
val now = getNowSeconds()
|
||||||
val reminderSeconds = event.getReminders().reversed().map { it * 60 }
|
val reminderSeconds = event.getReminders().reversed().map { it * 60 }
|
||||||
dbHelper.getEvents(now, now + YEAR, event.id) {
|
dbHelper.getEvents(now, now + YEAR, event.id) {
|
||||||
if (it.isNotEmpty()) {
|
if (it.isNotEmpty()) {
|
||||||
|
@ -732,7 +732,7 @@ class DBHelper private constructor(val context: Context) : SQLiteOpenHelper(cont
|
|||||||
|
|
||||||
fun getRunningEvents(): List<Event> {
|
fun getRunningEvents(): List<Event> {
|
||||||
val events = ArrayList<Event>()
|
val events = ArrayList<Event>()
|
||||||
val ts = (System.currentTimeMillis() / 1000).toInt()
|
val ts = context.getNowSeconds()
|
||||||
|
|
||||||
val selection = "$COL_START_TS <= ? AND $COL_END_TS >= ? AND $COL_REPEAT_INTERVAL IS 0 AND $COL_START_TS != 0"
|
val selection = "$COL_START_TS <= ? AND $COL_END_TS >= ? AND $COL_REPEAT_INTERVAL IS 0 AND $COL_START_TS != 0"
|
||||||
val selectionArgs = arrayOf(ts.toString(), ts.toString())
|
val selectionArgs = arrayOf(ts.toString(), ts.toString())
|
||||||
@ -773,7 +773,7 @@ class DBHelper private constructor(val context: Context) : SQLiteOpenHelper(cont
|
|||||||
}
|
}
|
||||||
|
|
||||||
fun getEventsToExport(includePast: Boolean): ArrayList<Event> {
|
fun getEventsToExport(includePast: Boolean): ArrayList<Event> {
|
||||||
val currTime = (System.currentTimeMillis() / 1000).toString()
|
val currTime = context.getNowSeconds().toString()
|
||||||
var events = ArrayList<Event>()
|
var events = ArrayList<Event>()
|
||||||
|
|
||||||
// non repeating events
|
// non repeating events
|
||||||
|
@ -3,6 +3,7 @@ package com.simplemobiletools.calendar.helpers
|
|||||||
import android.content.Context
|
import android.content.Context
|
||||||
import com.simplemobiletools.calendar.R
|
import com.simplemobiletools.calendar.R
|
||||||
import com.simplemobiletools.calendar.extensions.config
|
import com.simplemobiletools.calendar.extensions.config
|
||||||
|
import com.simplemobiletools.calendar.extensions.getNowSeconds
|
||||||
import com.simplemobiletools.calendar.extensions.seconds
|
import com.simplemobiletools.calendar.extensions.seconds
|
||||||
import org.joda.time.DateTime
|
import org.joda.time.DateTime
|
||||||
import org.joda.time.DateTimeZone
|
import org.joda.time.DateTimeZone
|
||||||
@ -57,7 +58,7 @@ object Formatter {
|
|||||||
return "$month $day $year"
|
return "$month $day $year"
|
||||||
}
|
}
|
||||||
|
|
||||||
fun getTodayCode() = Formatter.getDayCodeFromTS((System.currentTimeMillis() / 1000).toInt())
|
fun getTodayCode(context: Context) = Formatter.getDayCodeFromTS(context.getNowSeconds())
|
||||||
|
|
||||||
fun getHours(context: Context, dateTime: DateTime) = dateTime.toString(getHourPattern(context))
|
fun getHours(context: Context, dateTime: DateTime) = dateTime.toString(getHourPattern(context))
|
||||||
|
|
||||||
|
@ -12,6 +12,7 @@ import com.simplemobiletools.calendar.R
|
|||||||
import com.simplemobiletools.calendar.activities.DayActivity
|
import com.simplemobiletools.calendar.activities.DayActivity
|
||||||
import com.simplemobiletools.calendar.activities.SplashActivity
|
import com.simplemobiletools.calendar.activities.SplashActivity
|
||||||
import com.simplemobiletools.calendar.extensions.config
|
import com.simplemobiletools.calendar.extensions.config
|
||||||
|
import com.simplemobiletools.calendar.extensions.getNowSeconds
|
||||||
import com.simplemobiletools.calendar.extensions.launchNewEventIntent
|
import com.simplemobiletools.calendar.extensions.launchNewEventIntent
|
||||||
import com.simplemobiletools.calendar.services.WidgetService
|
import com.simplemobiletools.calendar.services.WidgetService
|
||||||
import com.simplemobiletools.commons.extensions.getColoredBitmap
|
import com.simplemobiletools.commons.extensions.getColoredBitmap
|
||||||
@ -43,8 +44,7 @@ class MyWidgetListProvider : AppWidgetProvider() {
|
|||||||
setTextSize(R.id.widget_event_list_today, fontSize)
|
setTextSize(R.id.widget_event_list_today, fontSize)
|
||||||
}
|
}
|
||||||
|
|
||||||
val now = (System.currentTimeMillis() / 1000).toInt()
|
val todayText = Formatter.getLongestDate(context.getNowSeconds())
|
||||||
val todayText = Formatter.getLongestDate(now)
|
|
||||||
views.setText(R.id.widget_event_list_today, todayText)
|
views.setText(R.id.widget_event_list_today, todayText)
|
||||||
|
|
||||||
views.setImageViewBitmap(R.id.widget_event_new_event, context.resources.getColoredBitmap(R.drawable.ic_plus, textColor))
|
views.setImageViewBitmap(R.id.widget_event_new_event, context.resources.getColoredBitmap(R.drawable.ic_plus, textColor))
|
||||||
|
Loading…
x
Reference in New Issue
Block a user