Skip to content

Commit

Permalink
Support any week day start.
Browse files Browse the repository at this point in the history
  • Loading branch information
@ysy950803
ysy950803 committed Jul 12, 2024
1 parent baea535 commit c9d04ab
Show file tree
Hide file tree
Showing 9 changed files with 70 additions and 86 deletions.
12 changes: 5 additions & 7 deletions app/src/main/java/com/haibin/calendarviewproject/EnglishWeekBar.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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];
}

/**
Expand Down
12 changes: 5 additions & 7 deletions app/src/main/java/com/haibin/calendarviewproject/custom/CustomWeekBar.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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];
}
}
12 changes: 5 additions & 7 deletions app/src/main/java/com/haibin/calendarviewproject/mix/MixWeekBar.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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];
}
}
12 changes: 5 additions & 7 deletions app/src/main/java/com/haibin/calendarviewproject/solay/SolarWeekBar.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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];
}
}
2 changes: 2 additions & 0 deletions calendarview/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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'
66 changes: 29 additions & 37 deletions calendarview/src/main/java/com/haibin/calendarview/CalendarUtil.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -206,14 +206,13 @@ public static Calendar getNextCalendar(Calendar calendar) {
static int getMonthViewStartDiff(Calendar calendar, int weekStart) {
java.util.Calendar date = java.util.Calendar.getInstance();
date.set(calendar.getYear(), calendar.getMonth() - 1, 1, 12, 0, 0);
int week = date.get(java.util.Calendar.DAY_OF_WEEK);
if (weekStart == CalendarViewDelegate.WEEK_START_WITH_SUN) {
return week - 1;
}
if (weekStart == CalendarViewDelegate.WEEK_START_WITH_MON) {
return week == 1 ? 6 : week - weekStart;
int week = date.get(java.util.Calendar.DAY_OF_WEEK); // 获取该月第一天是星期几
int diff = week - weekStart; // 计算与周起始日的差值
if (diff < 0) {
// 如果差值小于0，说明周起始日在该月第一天之后，需要调整偏移量
diff += 7;
}
return week == CalendarViewDelegate.WEEK_START_WITH_SAT ? 0 : week;
return diff;
}


Expand All @@ -230,14 +229,13 @@ static int getMonthViewStartDiff(Calendar calendar, int weekStart) {
static int getMonthViewStartDiff(int year, int month, int weekStart) {
java.util.Calendar date = java.util.Calendar.getInstance();
date.set(year, month - 1, 1, 12, 0, 0);
int week = date.get(java.util.Calendar.DAY_OF_WEEK);
if (weekStart == CalendarViewDelegate.WEEK_START_WITH_SUN) {
return week - 1;
int week = date.get(java.util.Calendar.DAY_OF_WEEK); // 获取该月第一天是星期几
int diff = week - weekStart; // 计算与周起始日的差值
if (diff < 0) {
// 如果差值小于0，说明周起始日在该月第一天之后，需要调整偏移量
diff += 7;
}
if (weekStart == CalendarViewDelegate.WEEK_START_WITH_MON) {
return week == 1 ? 6 : week - weekStart;
}
return week == CalendarViewDelegate.WEEK_START_WITH_SAT ? 0 : week;
return diff;
}


Expand Down Expand Up @@ -269,14 +267,12 @@ static int getMonthEndDiff(int year, int month, int weekStart) {
private static int getMonthEndDiff(int year, int month, int day, int weekStart) {
java.util.Calendar date = java.util.Calendar.getInstance();
date.set(year, month - 1, day);
int week = date.get(java.util.Calendar.DAY_OF_WEEK);
if (weekStart == CalendarViewDelegate.WEEK_START_WITH_SUN) {
return 7 - week;
int week = date.get(java.util.Calendar.DAY_OF_WEEK); // 获取给定日期是星期几
int diff = week - weekStart; // 计算当前星期与周起始日的差异
if (diff < 0) {
diff += 7; // 如果差异为负数，说明跨越了周末，需要加7
}
if (weekStart == CalendarViewDelegate.WEEK_START_WITH_MON) {
return week == 1 ? 0 : 7 - week + 1;
}
return week == 7 ? 6 : 7 - week - 1;
return 6 - diff; // 从当前星期到周末的天数差，总共7天，所以用6减去差异
}

/**
Expand Down Expand Up @@ -691,15 +687,13 @@ static List<Calendar> initCalendarForWeekView(Calendar calendar, CalendarViewDel
*/
private static int getWeekViewStartDiff(int year, int month, int day, int weekStart) {
java.util.Calendar date = java.util.Calendar.getInstance();
date.set(year, month - 1, day, 12, 0);//
int week = date.get(java.util.Calendar.DAY_OF_WEEK);
if (weekStart == 1) {
return week - 1;
}
if (weekStart == 2) {
return week == 1 ? 6 : week - weekStart;
date.set(year, month - 1, day, 12, 0); // 设置给定的日期
int week = date.get(java.util.Calendar.DAY_OF_WEEK); // 获取这一天是周几
int diff = week - weekStart; // 计算与周起始日的差值
if (diff < 0) {
diff += 7; // 如果差值为负，说明给定日期在周起始日之前，需要加7天
}
return week == 7 ? 0 : week;
return diff;
}


Expand All @@ -717,15 +711,13 @@ private static int getWeekViewStartDiff(int year, int month, int day, int weekSt
*/
public static int getWeekViewEndDiff(int year, int month, int day, int weekStart) {
java.util.Calendar date = java.util.Calendar.getInstance();
date.set(year, month - 1, day, 12, 0);
int week = date.get(java.util.Calendar.DAY_OF_WEEK);
if (weekStart == 1) {
return 7 - week;
}
if (weekStart == 2) {
return week == 1 ? 0 : 7 - week + 1;
date.set(year, month - 1, day, 12, 0); // 设置日期
int week = date.get(java.util.Calendar.DAY_OF_WEEK); // 获取周几
int diff = week - weekStart; // 计算与周起始日的差值
if (diff < 0) {
diff += 7; // 如果差值为负，说明给定日期在周起始日之前，需要加7天
}
return week == 7 ? 6 : 7 - week - 1;
return 6 - diff; // 返回到周结束的天数差异
}


Expand Down
10 changes: 3 additions & 7 deletions calendarview/src/main/java/com/haibin/calendarview/CalendarView.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1537,16 +1537,12 @@ public void setWeekStarWithSat() {

/**
* 设置周起始
* CalendarViewDelegate.WEEK_START_WITH_SUN
* CalendarViewDelegate.WEEK_START_WITH_MON
* CalendarViewDelegate.WEEK_START_WITH_SAT
* 支持周一到周日任意周起始
*
* @param weekStart 周起始
*/
private void setWeekStart(int weekStart) {
if (weekStart != CalendarViewDelegate.WEEK_START_WITH_SUN &&
weekStart != CalendarViewDelegate.WEEK_START_WITH_MON &&
weekStart != CalendarViewDelegate.WEEK_START_WITH_SAT)
public void setWeekStart(int weekStart) {
if (!(java.util.Calendar.SUNDAY <= weekStart && weekStart <= java.util.Calendar.SATURDAY))
return;
if (weekStart == mDelegate.getWeekStart())
return;
Expand Down
26 changes: 12 additions & 14 deletions calendarview/src/main/java/com/haibin/calendarview/WeekBar.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
package com.haibin.calendarview;

import android.content.Context;
import android.util.Log;
import android.util.TypedValue;
import android.view.LayoutInflater;
import android.widget.LinearLayout;
Expand Down Expand Up @@ -108,14 +109,13 @@ protected void onWeekStartChange(int weekStart) {
* @return 通过View的位置和周起始获取星期的对应坐标
*/
protected int getViewIndexByCalendar(Calendar calendar, int weekStart) {
int week = calendar.getWeek() + 1;
if (weekStart == CalendarViewDelegate.WEEK_START_WITH_SUN) {
return week - 1;
int week = calendar.getWeek() + 1; // 获取传入日期是周几，周日为1，周六为7
int offset = weekStart - CalendarViewDelegate.WEEK_START_WITH_SUN; // 计算偏移量
int index = week - offset - 1; // 计算新的索引位置
if (index < 0) {
index += 7; // 如果索引为负数，加上7调整到正确位置
}
if (weekStart == CalendarViewDelegate.WEEK_START_WITH_MON) {
return week == CalendarViewDelegate.WEEK_START_WITH_SUN ? 6 : week - 2;
}
return week == CalendarViewDelegate.WEEK_START_WITH_SAT ? 0 : week;
return index % 7; // 确保索引在0到6之间
}

/**
Expand All @@ -127,14 +127,12 @@ protected int getViewIndexByCalendar(Calendar calendar, int weekStart) {
*/
private String getWeekString(int index, int weekStart) {
String[] weeks = getContext().getResources().getStringArray(R.array.week_string_array);

if (weekStart == CalendarViewDelegate.WEEK_START_WITH_SUN) {
return weeks[index];
}
if (weekStart == CalendarViewDelegate.WEEK_START_WITH_MON) {
return weeks[index == 6 ? 0 : index + 1];
int offset = weekStart - CalendarViewDelegate.WEEK_START_WITH_SUN;
int adjustedIndex = (index + offset) % 7;
if (adjustedIndex < 0) {
adjustedIndex += 7;
}
return weeks[index == 0 ? 6 : index - 1];
return weeks[adjustedIndex];
}

@Override
Expand Down
4 changes: 4 additions & 0 deletions calendarview/src/main/res/values/attrs.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,10 @@
<attr name="week_start_with">
<enum name="sun" value="1" />
<enum name="mon" value="2" />
<enum name="tue" value="3" />
<enum name="wed" value="4" />
<enum name="thu" value="5" />
<enum name="fri" value="6" />
<enum name="sat" value="7" />
</attr>

Expand Down

0 comments on commit c9d04ab

Please sign in to comment.