fenix/Simple-Calendar
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Calendar.git synced 2025-02-10 08:50:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

use isNougatPlus, extract WEEKLY_EVENT_ID_LABEL constant

Browse Source
This commit is contained in:
darthpaul 2021-09-21 19:19:04 +01:00
parent 595081c758
commit 81e32534f8
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,7 +6,6 @@ import android.content.ClipDescription
import android.content.Intent import android.content.Intent
import android.content.res.Resources import android.content.res.Resources
import android.graphics.drawable.ColorDrawable import android.graphics.drawable.ColorDrawable
import android.os.Build
import android.os.Bundle import android.os.Bundle
import android.os.Handler import android.os.Handler
import android.util.Range import android.util.Range
@ -36,6 +35,7 @@ import org.joda.time.DateTime
import org.joda.time.Days import org.joda.time.Days
class WeekFragment : Fragment(), WeeklyCalendar { class WeekFragment : Fragment(), WeeklyCalendar {
private val WEEKLY_EVENT_ID_LABEL = "event_id_label"
private val PLUS_FADEOUT_DELAY = 5000L private val PLUS_FADEOUT_DELAY = 5000L
private val MIN_SCALE_FACTOR = 0.3f private val MIN_SCALE_FACTOR = 0.3f
private val MAX_SCALE_FACTOR = 5f private val MAX_SCALE_FACTOR = 5f
@ -425,6 +425,7 @@ class WeekFragment : Fragment(), WeeklyCalendar {
addEvents(currEvents) addEvents(currEvents)
} }
@SuppressLint("NewApi")
private fun addEvents(events: ArrayList<Event>) { private fun addEvents(events: ArrayList<Event>) {
initGrid() initGrid()
allDayHolders.clear() allDayHolders.clear()
@ -565,8 +566,8 @@ class WeekFragment : Fragment(), WeeklyCalendar {
setOnLongClickListener { view -> setOnLongClickListener { view ->
currentlyDraggedView = view currentlyDraggedView = view
val shadowBuilder = View.DragShadowBuilder(view) val shadowBuilder = View.DragShadowBuilder(view)
val clipData = ClipData.newPlainText("event_id_label", event.id.toString()) val clipData = ClipData.newPlainText(WEEKLY_EVENT_ID_LABEL, event.id.toString())
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { if (isNougatPlus()) {
view.startDragAndDrop(clipData, shadowBuilder, null, 0) view.startDragAndDrop(clipData, shadowBuilder, null, 0)
} else { } else {
view.startDrag(clipData, shadowBuilder, null, 0) view.startDrag(clipData, shadowBuilder, null, 0)
@ -687,6 +688,7 @@ class WeekFragment : Fragment(), WeeklyCalendar {
} }
} }
@SuppressLint("NewApi")
private fun addAllDayEvent(event: Event) { private fun addAllDayEvent(event: Event) {
(inflater.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 {
var backgroundColor = eventTypeColors.get(event.eventType, primaryColor) var backgroundColor = eventTypeColors.get(event.eventType, primaryColor)
@ -780,8 +782,8 @@ class WeekFragment : Fragment(), WeeklyCalendar {
setOnLongClickListener { view -> setOnLongClickListener { view ->
currentlyDraggedView = view currentlyDraggedView = view
val shadowBuilder = View.DragShadowBuilder(view) val shadowBuilder = View.DragShadowBuilder(view)
val clipData = ClipData.newPlainText("event_id_label", event.id.toString()) val clipData = ClipData.newPlainText(WEEKLY_EVENT_ID_LABEL, event.id.toString())
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { if (isNougatPlus()) {
view.startDragAndDrop(clipData, shadowBuilder, null, 0) view.startDragAndDrop(clipData, shadowBuilder, null, 0)
} else { } else {
view.startDrag(clipData, shadowBuilder, null, 0) view.startDrag(clipData, shadowBuilder, null, 0)