feature: add removeAllViews method on WeekView

Author: tobiasschuerg

app/src/main/java/de/tobiasschuerg/weekview/sample/SampleActivity.kt

@@ -22,7 +22,7 @@ import org.threeten.bp.temporal.ChronoUnit
 
 class SampleActivity : AppCompatActivity() {
 
-    private val weekView: WeekView by lazy { findViewById<WeekView>(R.id.week_view) }
+    private val weekView: WeekView by lazy { findViewById(R.id.week_view) }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         AndroidThreeTen.init(this)
@@ -31,6 +31,7 @@ class SampleActivity : AppCompatActivity() {
 
         val config = EventConfig(showSubtitle = false, showTimeEnd = false)
         weekView.eventConfig = config
+        weekView.setShowNowIndicator(true)
 
         // set up the WeekView with the data
         weekView.addEvents(EventCreator.weekData)
@@ -87,23 +88,18 @@ class SampleActivity : AppCompatActivity() {
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         when (item.title) {
-            "Add" -> addRandomItem()
-            "Clear" -> removeAllEvents()
+            "Add" -> {
+                Log.i(TAG, "add option clicked")
+                weekView.addEvent(EventCreator.createRandomEvent())
+            }
+            "Clear" -> {
+                Log.i(TAG, "clear option clicked")
+                weekView.removeAllEvents()
+            }
         }
         return true
     }
 
-    private fun removeAllEvents() {
-        Log.i(TAG, "removeAllEvents()")
-        weekView.removeViews(1, weekView.childCount - 1)
-    }
-
-    private fun addRandomItem() {
-        Log.i(TAG, "addRandomItem()")
-        val newEvent = EventCreator.createRandomEvent()
-        weekView.addEvent(newEvent)
-    }
-
     companion object {
         private const val TAG = "SampleActivity"
     }

library/src/main/java/de/tobiasschuerg/weekview/view/EventView.kt

@@ -26,7 +26,7 @@ import de.tobiasschuerg.weekview.util.toLocalString
 class EventView(
     context: Context,
     val event: Event.Single,
-    val config: EventConfig,
+    private val config: EventConfig,
     var scalingFactor: Float = 1f
 
 ) : View(context) {
@@ -36,7 +36,7 @@ class EventView(
 
     private val textPaint: Paint by lazy { Paint().apply { isAntiAlias = true } }
 
-    private val subjectName: String by lazy { if (config.useShortNames) event.shortTitle else event.title }
+    private val eventName: String by lazy { if (config.useShortNames) event.shortTitle else event.title }
 
     private val textBounds: Rect = Rect()
 
@@ -83,15 +83,15 @@ class EventView(
         }
 
         // title
-        val maxTextSize = TextHelper.fitText(subjectName, textPaint.textSize * 3, width - (paddingLeft + paddingRight), height / 4)
+        val maxTextSize = TextHelper.fitText(eventName, textPaint.textSize * 3, width - (paddingLeft + paddingRight), height / 4)
         textPaint.textSize = maxTextSize
-        textPaint.getTextBounds(subjectName, 0, subjectName.length, textBounds)
+        textPaint.getTextBounds(eventName, 0, eventName.length, textBounds)
         var weight = weightStartTime + weightUpperText
         if (weight == 0) {
             weight++
         }
         val subjectY = getY(weight, weightTitle, textBounds)
-        canvas.drawText(subjectName, (width / 2 - textBounds.centerX()).toFloat(), subjectY.toFloat(), textPaint)
+        canvas.drawText(eventName, (width / 2 - textBounds.centerX()).toFloat(), subjectY.toFloat(), textPaint)
 
         textPaint.textSize = TextHelper.fitText(
             "123456", maxTextSize, width / 2,

library/src/main/java/de/tobiasschuerg/weekview/view/WeekBackgroundView.kt

@@ -43,7 +43,7 @@ internal class WeekBackgroundView constructor(context: Context) : View(context)
         }
     }
 
-    private var isInScreenshotMode = false
+    var showNowIndicator = false
 
     val topOffsetPx: Int = context.dipToPixelI(32f)
     private val leftOffset: Int = context.dipToPixelI(48f)
@@ -83,8 +83,8 @@ internal class WeekBackgroundView constructor(context: Context) : View(context)
         canvas.drawHorizontalDividers()
         canvas.drawColumnsWithHeaders()
 
-        Log.d(TAG, "Screenshot mode? $isInScreenshotMode")
-        if (!isInScreenshotMode && !isInEditMode) {
+        Log.d(TAG, "Show now indicator? $showNowIndicator")
+        if (showNowIndicator && !isInEditMode) {
             drawNowIndicator(canvas)
         }
         Log.d(TAG, "Drawing background completed.")
@@ -215,10 +215,6 @@ internal class WeekBackgroundView constructor(context: Context) : View(context)
         super.onMeasure(widthMeasureSpec, heightMeasureSpec2)
     }
 
-    fun setScreenshotMode(screenshotMode: Boolean) {
-        isInScreenshotMode = screenshotMode
-    }
-
     fun updateTimes(timeSpan: TimeSpan) {
         var timesHaveChanged = false
         if (timeSpan.start.isBefore(startTime)) {

library/src/main/java/de/tobiasschuerg/weekview/view/WeekView.kt

@@ -32,7 +32,6 @@ class WeekView(context: Context, attributeSet: AttributeSet) :
     private val backgroundView: WeekBackgroundView
     private val overlapsWith = ArrayList<EventView>()
 
-    private var isInScreenshotMode = false
     private var layoutCount = 0
 
     private var clickListener: ((view: EventView) -> Unit)? = null
@@ -190,9 +189,6 @@ class WeekView(context: Context, attributeSet: AttributeSet) :
         Log.v(TAG, "Laying out timetable for the ${++layoutCount} time.")
         Log.v(TAG, "l: $l, t: $t, r: $r, b: $b")
         super.onLayout(true, l, t, r, b)
-        if (isInScreenshotMode) {
-            backgroundView.setScreenshotMode(true)
-        }
 
         val saturdayEnabled = backgroundView.days.contains(DayOfWeek.SATURDAY)
         val sundayEnabled = backgroundView.days.contains(DayOfWeek.SUNDAY)
@@ -259,8 +255,8 @@ class WeekView(context: Context, attributeSet: AttributeSet) :
         }
     }
 
-    fun setScreenshotModeEnabled(enabled: Boolean) {
-        isInScreenshotMode = enabled
+    fun setShowNowIndicator(enabled: Boolean) {
+        backgroundView.showNowIndicator = enabled
     }
 
     private fun overlaps(left: EventView, right: EventView): Boolean {
@@ -279,6 +275,21 @@ class WeekView(context: Context, attributeSet: AttributeSet) :
         return lessonStartsWithing || lessonEndsWithing || lessonWithin
     }
 
+    /**
+     * Removed all [EventView]s.
+     */
+    fun removeAllEvents() = removeViews(1, childCount - 1)
+
+    /**
+     * Removes ALL [View]s - also the background.
+     * This is probably not what you want.
+     */
+    @Deprecated(
+        message = "Better use removeAllEvents in order to keep the background!",
+        replaceWith = ReplaceWith("removeAllEvents()")
+    )
+    override fun removeAllViews() = super.removeAllViews()
+
     companion object {
         private const val TAG = "WeekView"
     }