fenix/Simple-Calendar
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Calendar.git synced 2025-06-05 21:59:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

use proper day at adding new event from Day screen

Browse Source
This commit is contained in:
tibbi
2016-09-18 10:56:17 +02:00
parent 605f9e1671
commit 18a985692a
1 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
app/src/main/kotlin/com/simplemobiletools/calendar/activities/DayActivity.kt
View File

@@ -22,6 +22,7 @@ class DayActivity : SimpleActivity(), NavigationListener {
private var mSelectedItemsCnt: Int = 0 private var mSelectedItemsCnt: Int = 0
private var mSnackbar: Snackbar? = null private var mSnackbar: Snackbar? = null
private var mToBeDeleted: MutableList<Int>? = null private var mToBeDeleted: MutableList<Int>? = null
private var mPagerDays: MutableList<String>? = null
companion object { companion object {
val DELETED_ID = "deleted_id" val DELETED_ID = "deleted_id"
@@ -38,11 +39,7 @@ class DayActivity : SimpleActivity(), NavigationListener {
fillViewPager(mDayCode!!) fillViewPager(mDayCode!!)
day_fab.setOnClickListener { day_fab.setOnClickListener { addNewEvent() }
val eventIntent = Intent(applicationContext, EventActivity::class.java)
eventIntent.putExtra(Constants.DAY_CODE, mDayCode)
startActivity(eventIntent)
}
//mToBeDeleted = ArrayList<Int>() //mToBeDeleted = ArrayList<Int>()
} }
@@ -53,20 +50,24 @@ class DayActivity : SimpleActivity(), NavigationListener {
} }
private fun fillViewPager(targetDay: String) { private fun fillViewPager(targetDay: String) {
val codes = getDays(targetDay) getDays(targetDay)
val adapter = MyDayPagerAdapter(supportFragmentManager, codes, this) val adapter = MyDayPagerAdapter(supportFragmentManager, mPagerDays!!, this)
view_pager.adapter = adapter view_pager.adapter = adapter
view_pager.currentItem = codes.size / 2 view_pager.currentItem = mPagerDays!!.size / 2
} }
private fun getDays(code: String): List<String> { private fun addNewEvent() {
val days = ArrayList<String>(PREFILLED_DAYS) val eventIntent = Intent(applicationContext, EventActivity::class.java)
eventIntent.putExtra(Constants.DAY_CODE, mPagerDays?.get(view_pager.currentItem))
startActivity(eventIntent)
}
private fun getDays(code: String) {
mPagerDays = ArrayList<String>(PREFILLED_DAYS)
val today = Formatter.getDateTimeFromCode(code) val today = Formatter.getDateTimeFromCode(code)
for (i in -PREFILLED_DAYS / 2..PREFILLED_DAYS / 2) { for (i in -PREFILLED_DAYS / 2..PREFILLED_DAYS / 2) {
days.add(Formatter.getDayCodeFromDateTime(today.plusDays(i))) mPagerDays!!.add(Formatter.getDayCodeFromDateTime(today.plusDays(i)))
} }
return days
} }
private fun switchToDay(dayCode: String) { private fun switchToDay(dayCode: String) {