Support any week day start.

.gitignore

@@ -43,7 +43,7 @@ captures/
 
 # Intellij
 *.iml
-.idea/workspace.xml
+.idea
 
 # Keystore files
 *.jks

app/src/main/java/com/haibin/calendarviewproject/EnglishWeekBar.java

@@ -54,14 +54,12 @@ protected void onWeekStartChange(int weekStart) {
      */
     private String getWeekString(int index, int weekStart) {
         String[] weeks = getContext().getResources().getStringArray(R.array.english_week_string_array);
-
-        if (weekStart == 1) {
-            return weeks[index];
-        }
-        if (weekStart == 2) {
-            return weeks[index == 6 ? 0 : index + 1];
+        int offset = weekStart - java.util.Calendar.SUNDAY;
+        int adjustedIndex = (index + offset) % 7;
+        if (adjustedIndex < 0) {
+            adjustedIndex += 7;
         }
-        return weeks[index == 0 ? 6 : index - 1];
+        return weeks[adjustedIndex];
     }
 
     /**

app/src/main/java/com/haibin/calendarviewproject/custom/CustomWeekBar.java

@@ -52,13 +52,11 @@ protected void onWeekStartChange(int weekStart) {
      */
     private String getWeekString(int index, int weekStart) {
         String[] weeks = getContext().getResources().getStringArray(R.array.chinese_week_string_array);
-
-        if (weekStart == 1) {
-            return weeks[index];
-        }
-        if (weekStart == 2) {
-            return weeks[index == 6 ? 0 : index + 1];
+        int offset = weekStart - java.util.Calendar.SUNDAY;
+        int adjustedIndex = (index + offset) % 7;
+        if (adjustedIndex < 0) {
+            adjustedIndex += 7;
         }
-        return weeks[index == 0 ? 6 : index - 1];
+        return weeks[adjustedIndex];
     }
 }

app/src/main/java/com/haibin/calendarviewproject/mix/MixWeekBar.java

@@ -52,13 +52,11 @@ protected void onWeekStartChange(int weekStart) {
      */
     private String getWeekString(int index, int weekStart) {
         String[] weeks = getContext().getResources().getStringArray(R.array.chinese_week_string_array);
-
-        if (weekStart == 1) {
-            return weeks[index];
-        }
-        if (weekStart == 2) {
-            return weeks[index == 6 ? 0 : index + 1];
+        int offset = weekStart - java.util.Calendar.SUNDAY;
+        int adjustedIndex = (index + offset) % 7;
+        if (adjustedIndex < 0) {
+            adjustedIndex += 7;
         }
-        return weeks[index == 0 ? 6 : index - 1];
+        return weeks[adjustedIndex];
     }
 }

app/src/main/java/com/haibin/calendarviewproject/solay/SolarWeekBar.java

@@ -41,13 +41,11 @@ protected void onWeekStartChange(int weekStart) {
      */
     private String getWeekString(int index, int weekStart) {
         String[] weeks = getContext().getResources().getStringArray(R.array.english_week_string_array);
-
-        if (weekStart == 1) {
-            return weeks[index];
-        }
-        if (weekStart == 2) {
-            return weeks[index == 6 ? 0 : index + 1];
+        int offset = weekStart - java.util.Calendar.SUNDAY;
+        int adjustedIndex = (index + offset) % 7;
+        if (adjustedIndex < 0) {
+            adjustedIndex += 7;
         }
-        return weeks[index == 0 ? 6 : index - 1];
+        return weeks[adjustedIndex];
     }
 }

build.gradle

@@ -4,6 +4,7 @@ buildscript {
     repositories {
         jcenter()
         google()
+        maven { url "https://repo.grails.org/grails/core/" }
     }
     dependencies {
         //noinspection GradleDependency
@@ -17,6 +18,7 @@ allprojects {
     repositories {
         jcenter()
         google()
+        maven { url "https://repo.grails.org/grails/core/" }
     }
 }
 

calendarview/build.gradle

@@ -42,5 +42,7 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'androidx.recyclerview:recyclerview:1.1.0'
     testImplementation 'junit:junit:4.12'
+
+    compileOnly("androidx.viewpager:viewpager:1.0.0")
 }
 apply from: '../script/gradle-jcenter-push.gradle'