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

draw a Plus on an empty grid on click

Browse Source
This commit is contained in:
tibbi
2017-02-05 10:05:11 +01:00
parent 6a1b06a356
commit 8f14755215
2 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
app/src/main/kotlin/com/simplemobiletools/calendar/fragments/WeekFragment.kt
View File

@@ -7,6 +7,7 @@ import android.graphics.drawable.ColorDrawable
import android.os.Bundle import android.os.Bundle
import android.support.v4.app.Fragment import android.support.v4.app.Fragment
import android.view.* import android.view.*
import android.widget.ImageView
import android.widget.LinearLayout import android.widget.LinearLayout
import android.widget.RelativeLayout import android.widget.RelativeLayout
import android.widget.TextView import android.widget.TextView
@@ -43,12 +44,14 @@ class WeekFragment : Fragment(), WeeklyCalendar {
private var wasFragmentInit = false private var wasFragmentInit = false
private var wasExtraHeightAdded = false private var wasExtraHeightAdded = false
private var clickStartTime = 0L private var clickStartTime = 0L
lateinit var inflater: LayoutInflater
lateinit var mView: View lateinit var mView: View
lateinit var mCalendar: WeeklyCalendarImpl lateinit var mCalendar: WeeklyCalendarImpl
lateinit var mRes: Resources lateinit var mRes: Resources
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
this.inflater = inflater
mRowHeight = (context.resources.getDimension(R.dimen.weekly_view_row_height)).toInt() mRowHeight = (context.resources.getDimension(R.dimen.weekly_view_row_height)).toInt()
minScrollY = mRowHeight * context.config.startWeeklyAt minScrollY = mRowHeight * context.config.startWeeklyAt
mWeekTimestamp = arguments.getInt(WEEK_START_TIMESTAMP) mWeekTimestamp = arguments.getInt(WEEK_START_TIMESTAMP)
@@ -70,8 +73,8 @@ class WeekFragment : Fragment(), WeeklyCalendar {
}) })
} }
(0..6).map { (LayoutInflater.from(context).inflate(R.layout.stroke_vertical_divider, mView.week_vertical_grid_holder)) } (0..6).map { inflater.inflate(R.layout.stroke_vertical_divider, mView.week_vertical_grid_holder) }
(0..23).map { (LayoutInflater.from(context).inflate(R.layout.stroke_horizontal_divider, mView.week_horizontal_grid_holder)) } (0..23).map { inflater.inflate(R.layout.stroke_horizontal_divider, mView.week_horizontal_grid_holder) }
mCalendar = WeeklyCalendarImpl(this, context) mCalendar = WeeklyCalendarImpl(this, context)
wasFragmentInit = true wasFragmentInit = true
@@ -160,18 +163,26 @@ class WeekFragment : Fragment(), WeeklyCalendar {
.forEach { .forEach {
activity.runOnUiThread { it.removeAllViews() } activity.runOnUiThread { it.removeAllViews() }
it.setOnTouchListener { view, motionEvent -> it.setOnTouchListener { view, motionEvent ->
checkGridClick(motionEvent) checkGridClick(motionEvent, it)
true true
} }
} }
} }
private fun checkGridClick(event: MotionEvent) { private fun checkGridClick(event: MotionEvent, view: ViewGroup) {
when (event.action) { when (event.action) {
MotionEvent.ACTION_DOWN -> clickStartTime = System.currentTimeMillis() MotionEvent.ACTION_DOWN -> clickStartTime = System.currentTimeMillis()
MotionEvent.ACTION_UP -> { MotionEvent.ACTION_UP -> {
if (System.currentTimeMillis() - clickStartTime < CLICK_DURATION_THRESHOLD) { if (System.currentTimeMillis() - clickStartTime < CLICK_DURATION_THRESHOLD) {
val rowHeight = resources.getDimension(R.dimen.weekly_view_row_height)
val hour = (event.y / rowHeight).toInt()
(inflater.inflate(R.layout.week_grid_item, null, false) as ImageView).apply {
view.addView(this)
background = ColorDrawable(primaryColor)
layoutParams.width = view.width
layoutParams.height = rowHeight.toInt()
y = hour * rowHeight
}
} }
} }
else -> { else -> {
@@ -204,13 +215,13 @@ class WeekFragment : Fragment(), WeeklyCalendar {
val startMinutes = startDateTime.minuteOfDay val startMinutes = startDateTime.minuteOfDay
val duration = endDateTime.minuteOfDay - startMinutes val duration = endDateTime.minuteOfDay - startMinutes
(LayoutInflater.from(context).inflate(R.layout.week_event_marker, null, false) as TextView).apply { (inflater.inflate(R.layout.week_event_marker, null, false) as TextView).apply {
background = ColorDrawable(primaryColor) background = ColorDrawable(primaryColor)
text = event.title text = event.title
activity.runOnUiThread { activity.runOnUiThread {
layout.addView(this) layout.addView(this)
y = startMinutes * minuteHeight
(layoutParams as RelativeLayout.LayoutParams).apply { (layoutParams as RelativeLayout.LayoutParams).apply {
topMargin = (startMinutes * minuteHeight).toInt()
width = layout.width - 1 width = layout.width - 1
minHeight = if (event.startTS == event.endTS) minimalHeight else (duration * minuteHeight).toInt() - 1 minHeight = if (event.startTS == event.endTS) minimalHeight else (duration * minuteHeight).toInt() - 1
} }
@@ -242,7 +253,7 @@ class WeekFragment : Fragment(), WeeklyCalendar {
} }
private fun addAllDayEvent(event: Event) { private fun addAllDayEvent(event: Event) {
(LayoutInflater.from(context).inflate(R.layout.week_all_day_event_marker, null, false) as TextView).apply { (inflater.inflate(R.layout.week_all_day_event_marker, null, false) as TextView).apply {
background = ColorDrawable(primaryColor) background = ColorDrawable(primaryColor)
text = event.title text = event.title

6
app/src/main/res/layout/week_grid_item.xml
View File

@@ -3,6 +3,6 @@
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/week_holder" android:id="@+id/week_holder"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/weekly_view_row_minus_one_height" android:layout_height="match_parent"
android:background="@android:color/transparent" android:scaleType="centerInside"
android:scaleType="centerInside"/> android:src="@drawable/ic_plus"/>