fenix/Simple-Calendar
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Calendar.git synced 2025-01-16 02:41:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

append the year to the month if its not the current year

Browse Source
This commit is contained in:
tibbi 2016-01-28 21:37:08 +01:00
parent f86ac50bfa
commit c3e2a00b09
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/src/main/java/calendar/simplemobiletools/com/MainActivity.java
View File

@ -20,7 +20,8 @@ import butterknife.ButterKnife;
import butterknife.OnClick; import butterknife.OnClick;
public class MainActivity extends AppCompatActivity { public class MainActivity extends AppCompatActivity {
private static final String PATTERN = "ddMMYYYY"; private static final String DATE_PATTERN = "ddMMYYYY";
private static final String YEAR_PATTERN = "YYYY";
@Bind(R.id.left_arrow) ImageView leftArrow; @Bind(R.id.left_arrow) ImageView leftArrow;
@Bind(R.id.right_arrow) ImageView rightArrow; @Bind(R.id.right_arrow) ImageView rightArrow;
@ -43,7 +44,7 @@ public class MainActivity extends AppCompatActivity {
leftArrow.getDrawable().mutate().setColorFilter(darkGrey, PorterDuff.Mode.SRC_ATOP); leftArrow.getDrawable().mutate().setColorFilter(darkGrey, PorterDuff.Mode.SRC_ATOP);
rightArrow.getDrawable().mutate().setColorFilter(darkGrey, PorterDuff.Mode.SRC_ATOP); rightArrow.getDrawable().mutate().setColorFilter(darkGrey, PorterDuff.Mode.SRC_ATOP);
targetDate = new DateTime(); targetDate = new DateTime();
today = new DateTime().toString(PATTERN); today = targetDate.toString(DATE_PATTERN);
createDays(); createDays();
fillCalendar(); fillCalendar();
@ -88,7 +89,7 @@ public class MainActivity extends AppCompatActivity {
currDate = prevMonthStart + cur; currDate = prevMonthStart + cur;
day.setTextColor(lightGrey); day.setTextColor(lightGrey);
} else if (currDate <= currMonthDays) { } else if (currDate <= currMonthDays) {
if (targetDate.withDayOfMonth(thisMonthDays).toString(PATTERN).equals(today)) { if (targetDate.withDayOfMonth(thisMonthDays).toString(DATE_PATTERN).equals(today)) {
day.setTextSize(todayTextSize); day.setTextSize(todayTextSize);
} }
@ -119,6 +120,14 @@ public class MainActivity extends AppCompatActivity {
private String getMonthName() { private String getMonthName() {
final String[] months = new DateFormatSymbols().getMonths(); final String[] months = new DateFormatSymbols().getMonths();
return months[targetDate.getMonthOfYear() - 1]; final StringBuilder sb = new StringBuilder();
sb.append(months[targetDate.getMonthOfYear() - 1]);
final String targetYear = targetDate.toString(YEAR_PATTERN);
if (!targetYear.equals(new DateTime().toString(YEAR_PATTERN))) {
sb.append(" ");
sb.append(targetYear);
}
return sb.toString();
} }
} }