A lot of changes: Kotlin, time/date formatting fixes, demo activity for whole view snapping...

README.md

@@ -1,60 +1,13 @@
-[Join our slack](https://join.slack.com/t/androidweekview/shared_invite/enQtMzEyMDE3NzU3NTM3LWQyZGRhNjRlMTUzNzNlNjNlM2M0OTMyMDhjMzE1NDMzOGQzYzhjNzI2YjZhZWM3MzJiY2I1YmY2NGEwOTlkNTY)
+A fork of this repository:
+https://github.com/Quachero/Android-Week-View
+Which is a fork of this:
+https://github.com/Quivr/Android-Week-View
+Which is a fork of this:
+https://github.com/alamkanak/Android-Week-View
 
+All because all of those aren't functional anymore...
 
-Android Week View
-=================
+I've added so many things compared to them. You can read about them in a pull request I've made:
+https://github.com/Quivr/Android-Week-View/pull/97
+https://github.com/Quachero/Android-Week-View/pull/1
 
-**Android Week View** is an android library to display calendars (week view or day view) within the app. It supports custom styling.
-
-[Why this fork? (features + community & contributing)](https://github.com/Quivr/Android-Week-View/issues/45)
-
-![](images/screen-shot.png)
-
-Features
-------------
-
-* Week view calendar
-* Day view calendar
-* Custom styling
-* Vertical scrolling and zooming
-* Infinite horizontal scrolling
-* Possibility to set min and max date
-* Possibility to set range of visible hours
-* All day events at the top
-* Live preview of custom styling in xml preview window
-
-Who uses it
----------------
-
-* [Quivr](https://quivr.be/en/)
-* [Series Addict](https://play.google.com/store/apps/details?id=com.alamkanak.seriesaddict)
-* [Unicaen Timetable](https://play.google.com/store/apps/details?id=fr.skyost.timetable)
-* Using the library? Just make an issue
-
-Getting Started
----------------
-
-See the [wiki](https://github.com/Quivr/Android-Week-View/wiki)
-
-Sample
-----------
-
-There is also a [sample app](https://github.com/quivr/Android-Week-View/tree/master/sample) to get you started.
-
-
-License
-----------
-
-    Copyright 2014 Raquib-ul-Alam
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.

build.gradle

@@ -1,11 +1,14 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
+    ext.kotlin_version = '1.3.21'
     repositories {
         jcenter()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.3'
+        classpath 'com.android.tools.build:gradle:3.3.1'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -18,6 +21,7 @@ allprojects {
     group = GROUP
 
     repositories {
+        google()
         jcenter()
     }
 }

gradle.properties

@@ -9,4 +9,6 @@ POM_LICENCE_NAME=The Apache Software License, Version 2.0
 POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt
 POM_LICENCE_DIST=repo
 POM_DEVELOPER_ID=quivr
-POM_DEVELOPER_NAME=Quivr
+POM_DEVELOPER_NAME=Quivr
+android.useAndroidX=true
+android.enableJetifier=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Sun Aug 06 18:02:35 CEST 2017
+#Fri Feb 08 08:07:15 IST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip

library/build.gradle

@@ -1,25 +1,26 @@
 apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
 
 repositories {
     mavenCentral()
 }
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion '25.0.2'
+    compileSdkVersion 28
 
     defaultConfig {
-        minSdkVersion 9
-        targetSdkVersion 25
+        minSdkVersion 14
+        targetSdkVersion 28
     }
 }
 
 configurations {
     javadocDeps
 }
 dependencies {
-    compile 'com.android.support:appcompat-v7:25.1.0'
-    javadocDeps 'com.android.support:appcompat-v7:25.1.0'
+    implementation 'androidx.appcompat:appcompat:1.0.2'
+    javadocDeps 'androidx.appcompat:appcompat:1.0.2'
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }
 
-apply from: 'gradle-mvn-push.gradle'
+apply from: 'gradle-mvn-push.gradle'

library/gradle-mvn-push.gradle

@@ -18,7 +18,7 @@ apply plugin: 'maven'
 apply plugin: 'signing'
 
 def isReleaseBuild() {
-    return VERSION_NAME.contains("SNAPSHOT") == false
+    return !VERSION_NAME.contains("SNAPSHOT")
 }
 
 def getReleaseRepositoryUrl() {
@@ -112,4 +112,4 @@ afterEvaluate { project ->
         archives androidSourcesJar
         // archives androidJavadocsJar
     }
-}
+}

library/project.properties

@@ -1 +1,2 @@
-android.library=true
+# suppress inspection "UnusedProperty" for whole file
+android.library=true

library/src/main/AndroidManifest.xml

@@ -1 +1 @@
-<manifest package="com.alamkanak.weekview"></manifest>
+<manifest package="com.alamkanak.weekview"/>

library/src/main/java/com/alamkanak/weekview/DateTimeInterpreter.kt

@@ -0,0 +1,11 @@
+package com.alamkanak.weekview
+
+import java.util.*
+
+interface DateTimeInterpreter {
+    fun getFormattedWeekDayTitle(date: Calendar): String
+
+    fun getFormattedTimeOfDay(hour: Int, minutes: Int): String
+
+
+}

library/src/main/java/com/alamkanak/weekview/DrawPerformanceTester.kt

@@ -0,0 +1,27 @@
+package com.alamkanak.weekview
+
+import android.util.Log
+
+class DrawPerformanceTester(val measureDrawTime: Boolean = true) {
+    var drawSamplesCount = 0L
+    var drawTotalTime = 0L
+
+    private var startTime: Long = 0L
+
+    fun startMeasure() {
+        if (!measureDrawTime)
+            return
+        startTime = System.currentTimeMillis()
+    }
+
+    fun endMeasure() {
+        if (!measureDrawTime)
+            return
+        val endTime = System.currentTimeMillis()
+        val totalTime = endTime - startTime
+        ++drawSamplesCount
+        drawTotalTime += totalTime
+        val drawAverageTime = drawTotalTime.toFloat() / drawSamplesCount.toFloat()
+        Log.d("AppLog", "currentTime:$totalTime average:$drawAverageTime")
+    }
+}

library/src/main/java/com/alamkanak/weekview/MonthLoader.kt

@@ -0,0 +1,30 @@
+package com.alamkanak.weekview
+
+import java.util.*
+
+class MonthLoader(var onMonthChangeListener: MonthChangeListener?) : WeekViewLoader {
+
+    override fun toWeekViewPeriodIndex(instance: Calendar): Double {
+        return (instance.get(Calendar.YEAR) * 12).toDouble() + instance.get(Calendar.MONTH).toDouble() + (instance.get(Calendar.DAY_OF_MONTH) - 1) / 30.0
+    }
+
+    override fun onLoad(periodIndex: Int): MutableList<out WeekViewEvent>? {
+        return onMonthChangeListener!!.onMonthChange(periodIndex / 12, periodIndex % 12 + 1)
+    }
+
+    interface MonthChangeListener {
+        /**
+         *
+         * Very important interface, it's the base to load events in the calendar.
+         * This method is called three times: once to load the previous month, once to load the next month and once to load the current month.
+         * **That's why you can have three times the same event at the same place if you mess up with the configuration**
+         *
+         * @param newYear  : year of the events required by the view.
+         * @param newMonth :
+         *
+         *month of the events required by the view **1 based (not like JAVA API) : January = 1 and December = 12**.
+         * @return a list of the events happening **during the specified month**.
+         */
+        fun onMonthChange(newYear: Int, newMonth: Int): MutableList<out WeekViewEvent>?
+    }
+}

library/src/main/java/com/alamkanak/weekview/PrefetchingWeekViewLoader.kt

@@ -0,0 +1,45 @@
+package com.alamkanak.weekview
+
+import androidx.annotation.IntRange
+import java.util.*
+
+/**
+ * <h1>PrefetchingWeekViewLoader</h1>
+ * This class provides prefetching data loading behaviour.
+ * By setting a specific period of N, data is retrieved for the current period,
+ * the next N periods and the previous N periods.
+ */
+/**
+ * @param weekViewLoader An instance of the WeekViewLoader class
+ * @param prefetchingPeriod The amount of periods to be fetched before and after the
+ * current period. Must be 1 or greater.
+ */
+class PrefetchingWeekViewLoader(val weekViewLoader: WeekViewLoader, @IntRange(from = 1L) val prefetchingPeriod: Int = 1) : WeekViewLoader {
+
+    init {
+        if (prefetchingPeriod < 1)
+            throw IllegalArgumentException("Must specify prefetching period of at least 1!")
+    }
+
+    override fun onLoad(periodIndex: Int): MutableList<WeekViewEvent>? {
+        // fetch the current period
+        var loadedEvents = weekViewLoader.onLoad(periodIndex)
+        val events = ArrayList<WeekViewEvent>()
+        if (loadedEvents != null)
+            events.addAll(loadedEvents)
+        // fetch periods before/after
+        for (i in 1..this.prefetchingPeriod) {
+            loadedEvents = weekViewLoader.onLoad(periodIndex - i)
+            if (loadedEvents != null)
+                events.addAll(loadedEvents)
+            loadedEvents = weekViewLoader.onLoad(periodIndex + i)
+            if (loadedEvents != null)
+                events.addAll(loadedEvents)
+        }
+        // return list of all events together
+        return events
+    }
+
+    override fun toWeekViewPeriodIndex(instance: Calendar) = weekViewLoader.toWeekViewPeriodIndex(instance)
+
+}

library/src/main/java/com/alamkanak/weekview/SimpleDate.kt

@@ -0,0 +1,9 @@
+package com.alamkanak.weekview
+
+import java.util.*
+
+data class SimpleDate(val year: Int, val month: Int, val dayOfMonth: Int) {
+    override fun toString(): String = "$year-$month-$dayOfMonth"
+
+    constructor(cal: Calendar) : this(cal.get(Calendar.YEAR), cal.get(Calendar.MONTH), cal.get(Calendar.DAY_OF_MONTH))
+}

library/src/main/java/com/alamkanak/weekview/TextColorPicker.kt

@@ -0,0 +1,10 @@
+package com.alamkanak.weekview
+
+import androidx.annotation.ColorInt
+
+interface TextColorPicker {
+
+    @ColorInt
+    fun getTextColor(event: WeekViewEvent): Int
+
+}