Fixed #7: Added option to set start of week in Configuration

call following API while setting up your adapter `configuration.weekStartOffset = RecyclerCalendarConfiguration.START_DAY_OF_WEEK.MONDAY` Only 3 days [SATURDAY, SUNDAY, MONDAY] are allowed as start of week, which should be sufficient for all cases.
tejpratap46 · Sep 6, 2021 · fe5151b · fe5151b
1 parent e136aa6
commit fe5151b
Show file tree

Hide file tree

Showing 19 changed files with 95 additions and 125 deletions.
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
diff --git a/README.md b/README.md
@@ -150,26 +150,28 @@ endCal.time = date
 endCal.add(Calendar.MONTH, 3)  
 
 val configuration: SimpleRecyclerCalendarConfiguration =
-            SimpleRecyclerCalendarConfiguration(
-                calenderViewType = RecyclerCalendarConfiguration.CalenderViewType.VERTICAL, // calendarViewType could be VERTICAL OR HORIZONTAL
-                calendarLocale = Locale.getDefault(),
-                includeMonthHeader = true,
-                selectionMode = SimpleRecyclerCalendarConfiguration.SelectionModeNone() // selectionMode could be one of [SelectionModeNone, SelectionModeSingle, SelectionModeMultiple, SelectionModeRange]
-            )
-
-        calenderView!!.initialise(
-            startDate,
-            endDate,
-            configuration,
-            object : SimpleRecyclerCalendarAdapter.OnDateSelected {
-                override fun onDateSelected(date: Date) {
-                    Toast.makeText(
-                        calenderView!!.context,
-                        "Date Selected: ${CalendarUtils.getGmt(date)}",
-                        Toast.LENGTH_LONG
-                    ).show()
-                }
-            })
+    SimpleRecyclerCalendarConfiguration(
+        calenderViewType = RecyclerCalendarConfiguration.CalenderViewType.VERTICAL, // calendarViewType could be VERTICAL OR HORIZONTAL
+        calendarLocale = Locale.getDefault(),
+        includeMonthHeader = true,
+        selectionMode = SimpleRecyclerCalendarConfiguration.SelectionModeNone() // selectionMode could be one of [SelectionModeNone, SelectionModeSingle, SelectionModeMultiple, SelectionModeRange]
+    )
+configuration.weekStartOffset = RecyclerCalendarConfiguration.START_DAY_OF_WEEK.MONDAY
+
+
+calenderView!!.initialise(
+    startDate,
+    endDate,
+    configuration,
+    object : SimpleRecyclerCalendarAdapter.OnDateSelected {
+        override fun onDateSelected(date: Date) {
+            Toast.makeText(
+                calenderView!!.context,
+                "Date Selected: ${CalendarUtils.getGmt(date)}",
+                Toast.LENGTH_LONG
+            ).show()
+        }
+    })
 ```
 *To know More about SimpleRecyclerCalendarView visit [SimpleRecyclerCalendarActivity](https://github.com/tejpratap46/RecyclerCalendarAndroid/blob/master/app/src/main/java/com/tejpratapsingh/recyclercalendaractivity/simple/SimpleRecyclerCalendarActivity.kt)*
 
@@ -199,24 +201,25 @@ endCal.time = date
 endCal.add(Calendar.MONTH, 3)  
 
 val configuration: InfiniteRecyclerCalendarConfiguration =
-            InfiniteRecyclerCalendarConfiguration(
-                calenderViewType = RecyclerCalendarConfiguration.CalenderViewType.VERTICAL, // calendarViewType could be VERTICAL OR HORIZONTAL
-                calendarLocale = Locale.getDefault(),
-                includeMonthHeader = true,
-                selectionMode = InfiniteRecyclerCalendarConfiguration.SelectionModeNone() // selectionMode could be one of [SelectionModeNone, SelectionModeSingle, SelectionModeMultiple, SelectionModeRange]
-            )
-
-        calenderView!!.initialise(
-            configuration,
-            object : InfiniteRecyclerCalenderAdapter.OnDateSelected {
-                override fun onDateSelected(date: Date) {
-                    Toast.makeText(
-                        calenderView!!.context,
-                        "Date Selected: ${CalendarUtils.getGmt(date)}",
-                        Toast.LENGTH_LONG
-                    ).show()
-                }
-            })
+    InfiniteRecyclerCalendarConfiguration(
+        calenderViewType = RecyclerCalendarConfiguration.CalenderViewType.VERTICAL, // calendarViewType could be VERTICAL OR HORIZONTAL
+        calendarLocale = Locale.getDefault(),
+        includeMonthHeader = true,
+        selectionMode = InfiniteRecyclerCalendarConfiguration.SelectionModeNone() // selectionMode could be one of [SelectionModeNone, SelectionModeSingle, SelectionModeMultiple, SelectionModeRange]
+    )
+configuration.weekStartOffset = RecyclerCalendarConfiguration.START_DAY_OF_WEEK.MONDAY
+
+calenderView!!.initialise(
+    configuration,
+    object : InfiniteRecyclerCalenderAdapter.OnDateSelected {
+        override fun onDateSelected(date: Date) {
+            Toast.makeText(
+                calenderView!!.context,
+                "Date Selected: ${CalendarUtils.getGmt(date)}",
+                Toast.LENGTH_LONG
+            ).show()
+        }
+    })
 ```
 *To know More about InfiniteRecyclerCalendarActivity visit [InfiniteRecyclerCalendarActivity](https://github.com/tejpratap46/RecyclerCalendarAndroid/blob/master/app/src/main/java/com/tejpratapsingh/recyclercalendaractivity/simple/InfiniteRecyclerCalendarActivity.kt)*
 

diff --git a/app/build.gradle b/app/build.gradle
@@ -1,9 +1,6 @@
 apply plugin: 'com.android.application'
-
 apply plugin: 'kotlin-android'
 
-apply plugin: 'kotlin-android-extensions'
-
 android {
     compileSdkVersion 30
     defaultConfig {
@@ -25,13 +22,13 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'androidx.core:core-ktx:1.3.2'
-    implementation 'androidx.recyclerview:recyclerview:1.1.0'
+    implementation 'androidx.appcompat:appcompat:1.3.1'
+    implementation 'androidx.core:core-ktx:1.6.0'
+    implementation 'androidx.recyclerview:recyclerview:1.2.1'
     implementation project(path: ':recyclercalendar')
-    implementation 'com.google.android.material:material:1.2.1'
+    implementation 'com.google.android.material:material:1.4.0'
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
-    testImplementation 'junit:junit:4.13.1'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+    testImplementation 'junit:junit:4.13.2'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
 }
diff --git a/...java/com/tejpratapsingh/recyclercalendaractivity/horizontal/HorizontalCalendarActivity.kt b/...java/com/tejpratapsingh/recyclercalendaractivity/horizontal/HorizontalCalendarActivity.kt
@@ -34,6 +34,7 @@ class HorizontalCalendarActivity : AppCompatActivity() {
                 calendarLocale = Locale.getDefault(),
                 includeMonthHeader = true
             )
+        configuration.weekStartOffset = RecyclerCalendarConfiguration.START_DAY_OF_WEEK.MONDAY
 
         textViewSelectedDate.text =
             CalendarUtils.dateStringFromFormat(

diff --git a/...va/com/tejpratapsingh/recyclercalendaractivity/simple/InfiniteRecyclerCalendarActivity.kt b/...va/com/tejpratapsingh/recyclercalendaractivity/simple/InfiniteRecyclerCalendarActivity.kt
@@ -14,7 +14,6 @@ import com.tejpratapsingh.recyclercalendar.utilities.CalendarUtils
 import com.tejpratapsingh.recyclercalendar.views.InfiniteRecyclerCalendarView
 import com.tejpratapsingh.recyclercalendaractivity.R
 import java.util.*
-import kotlin.collections.HashMap
 
 class InfiniteRecyclerCalendarActivity : AppCompatActivity() {
 
@@ -29,15 +28,6 @@ class InfiniteRecyclerCalendarActivity : AppCompatActivity() {
 
         calenderView = findViewById(R.id.calendarRecyclerView)
 
-        val date = Date()
-        date.time = System.currentTimeMillis()
-
-        val startCal = Calendar.getInstance()
-
-        val endCal = Calendar.getInstance()
-        endCal.time = date
-        endCal.add(Calendar.MONTH, 3)
-
         val buttonSetting: ImageButton = findViewById(R.id.buttonSimpleSettings)
         val layoutSettingContainer: LinearLayout = findViewById(R.id.layoutSettingContainer)
 
@@ -56,35 +46,22 @@ class InfiniteRecyclerCalendarActivity : AppCompatActivity() {
             // Switch to Vertical View
             calendarViewType = RecyclerCalendarConfiguration.CalenderViewType.VERTICAL
 
-            refreshCalendarCalendar(
-                startDate = startCal.time,
-                endDate = endCal.time
-            )
+            refreshCalendarCalendar()
         }
 
         radioViewTypeHorizontal.setOnClickListener {
             // Switch to Horizontal View
             calendarViewType = RecyclerCalendarConfiguration.CalenderViewType.HORIZONTAL
 
-            refreshCalendarCalendar(
-                startDate = startCal.time,
-                endDate = endCal.time
-            )
+            refreshCalendarCalendar()
         }
 
         selectionMode = InfiniteRecyclerCalendarConfiguration.SelectionModeNone()
 
-        refreshCalendarCalendar(
-            startDate = startCal.time,
-            endDate = endCal.time
-
-        )
+        refreshCalendarCalendar()
     }
 
-    private fun refreshCalendarCalendar(
-        startDate: Date,
-        endDate: Date
-    ) {
+    private fun refreshCalendarCalendar() {
         if (calenderView == null || selectionMode == null) {
             return
         }
@@ -96,6 +73,8 @@ class InfiniteRecyclerCalendarActivity : AppCompatActivity() {
                 selectionMode = selectionMode!!
             )
 
+        configuration.weekStartOffset = RecyclerCalendarConfiguration.START_DAY_OF_WEEK.MONDAY
+
         calenderView!!.initialise(
             configuration,
             object : InfiniteRecyclerCalenderAdapter.OnDateSelected {

diff --git a/...java/com/tejpratapsingh/recyclercalendaractivity/simple/SimpleRecyclerCalendarActivity.kt b/...java/com/tejpratapsingh/recyclercalendaractivity/simple/SimpleRecyclerCalendarActivity.kt
@@ -142,6 +142,7 @@ class SimpleRecyclerCalendarActivity : AppCompatActivity() {
                 includeMonthHeader = true,
                 selectionMode = selectionMode!!
             )
+        configuration.weekStartOffset = RecyclerCalendarConfiguration.START_DAY_OF_WEEK.MONDAY
 
         calenderView!!.initialise(
             startDate,

diff --git a/...ain/java/com/tejpratapsingh/recyclercalendaractivity/vertical/VerticalCalendarActivity.kt b/...ain/java/com/tejpratapsingh/recyclercalendaractivity/vertical/VerticalCalendarActivity.kt
@@ -38,6 +38,8 @@ class VerticalCalendarActivity : AppCompatActivity() {
                 includeMonthHeader = true
             )
 
+        configuration.weekStartOffset = RecyclerCalendarConfiguration.START_DAY_OF_WEEK.MONDAY
+
         // Some Random Events
         for (i in 0..30 step 3) {
             val eventCal = Calendar.getInstance()

diff --git a/...java/com/tejpratapsingh/recyclercalendaractivity/viewpager/ui/main/PlaceholderFragment.kt b/...java/com/tejpratapsingh/recyclercalendaractivity/viewpager/ui/main/PlaceholderFragment.kt
@@ -27,7 +27,7 @@ class PlaceholderFragment : Fragment() {
         savedInstanceState: Bundle?
     ): View? {
         val root = inflater.inflate(R.layout.fragment_view_pager_calendar, container, false)
-        val sectionNumber: Int = arguments!!.get(ARG_SECTION_NUMBER) as Int
+        val sectionNumber: Int = requireArguments().get(ARG_SECTION_NUMBER) as Int
         val calendarRecyclerView: RecyclerView = root.findViewById(R.id.calendarRecyclerView)
         val date = Date()
         date.time = System.currentTimeMillis()
@@ -42,6 +42,7 @@ class PlaceholderFragment : Fragment() {
                 calendarLocale = Locale.getDefault(),
                 includeMonthHeader = false
             )
+        configuration.weekStartOffset = RecyclerCalendarConfiguration.START_DAY_OF_WEEK.MONDAY
 
         // Some Random Events
         for (i in 0..30 step 3) {
@@ -95,7 +96,7 @@ class PlaceholderFragment : Fragment() {
                         }
                     }
                 }
-            );
+            )
 
         calendarRecyclerView.adapter = calendarAdapterViewPager
         return root

diff --git a/build.gradle b/build.gradle
@@ -1,15 +1,15 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.4.10'
+    ext.kotlin_version = '1.5.21'
     repositories {
         google()
-        jcenter()
+        mavenCentral()
 
     }
     dependencies {
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
-        classpath 'com.android.tools.build:gradle:4.1.0'
+        classpath 'com.android.tools.build:gradle:7.0.2'
         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
@@ -19,8 +19,7 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
-
+        mavenCentral()
     }
 }
 

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
diff --git a/jitpack.yml b/jitpack.yml
@@ -0,0 +1,2 @@
+jdk:
+  - openjdk11
diff --git a/recyclercalendar/build.gradle b/recyclercalendar/build.gradle
@@ -1,18 +1,12 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
-
-apply plugin: 'com.github.dcendents.android-maven'
-group='com.github.tejpratap46'
 
 android {
     compileSdkVersion 30
 
     defaultConfig {
         minSdkVersion 15
         targetSdkVersion 30
-        versionCode 1
-        versionName "1.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles 'consumer-rules.pro'
@@ -30,10 +24,10 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'androidx.recyclerview:recyclerview:1.1.0'
-    implementation 'androidx.core:core-ktx:1.3.2'
-    testImplementation 'junit:junit:4.13.1'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+    implementation 'androidx.appcompat:appcompat:1.3.1'
+    implementation 'androidx.recyclerview:recyclerview:1.2.1'
+    implementation 'androidx.core:core-ktx:1.6.0'
+    testImplementation 'junit:junit:4.13.2'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
 }