From b90418f723d58a6a91a514d1c0a44ab17375ba45 Mon Sep 17 00:00:00 2001 From: Narinder Rana Date: Mon, 4 Jan 2021 18:03:37 +0530 Subject: [PATCH 1/7] add round bg to current date in monty view and remove separator lines --- res/values/colors.xml | 2 +- .../calendar/month/MonthWeekEventsView.java | 21 ++++++++++++++----- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/res/values/colors.xml b/res/values/colors.xml index 9636878dc..4555f7f44 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -104,7 +104,7 @@ #FFDDDDDD - @lineageos.platform:color/color_default_blue1 + #FFFFFFFF #FFFFFFFF #FFF2F2F2 #FFEEEEEE diff --git a/src/com/android/calendar/month/MonthWeekEventsView.java b/src/com/android/calendar/month/MonthWeekEventsView.java index df25f2d3d..f26ed504c 100644 --- a/src/com/android/calendar/month/MonthWeekEventsView.java +++ b/src/com/android/calendar/month/MonthWeekEventsView.java @@ -158,6 +158,7 @@ public class MonthWeekEventsView extends SimpleWeekView { private ObjectAnimator mTodayAnimator = null; private int[] mDayXs; + /** * Shows up as an error if we don't include this. */ @@ -319,6 +320,9 @@ public class MonthWeekEventsView extends SimpleWeekView { mMonthNumAscentHeight = (int) (-mMonthNumPaint.ascent() + 0.5f); mMonthNumHeight = (int) (mMonthNumPaint.descent() - mMonthNumPaint.ascent() + 0.5f); + + + mEventPaint = new TextPaint(); mEventPaint.setFakeBoldText(true); mEventPaint.setAntiAlias(true); @@ -456,7 +460,7 @@ public class MonthWeekEventsView extends SimpleWeekView { drawWeekNums(canvas); drawDaySeparators(canvas); if (mHasToday && mAnimateToday) { - drawToday(canvas); + drawToday(canvas); } if (mShowDetailsInMonth) { drawEvents(canvas); @@ -513,7 +517,7 @@ public class MonthWeekEventsView extends SimpleWeekView { } p.setColor(mDaySeparatorInnerColor); p.setStrokeWidth(mDaySeparatorInnerWidth); - canvas.drawLines(lines, 0, lines.length, p); + // canvas.drawLines(lines, 0, lines.length, p); } @Override @@ -616,20 +620,27 @@ public class MonthWeekEventsView extends SimpleWeekView { time.setJulianDay(julianMonday); for (; i < numCount; i++) { + x = computeDayLeftPosition(i - offset) - (mSidePaddingMonthNumber); if (mHasToday && todayIndex == i) { - mMonthNumPaint.setColor(mMonthNumTodayColor); + ///// mMonthNumPaint.setFakeBoldText(isBold = true); if (i + 1 < numCount) { // Make sure the color will be set back on the next // iteration isFocusMonth = !mFocusDay[i + 1]; } + mMonthNumPaint.setColor(getContext().getResources().getColor(R.color.color_default_blue1)); + canvas.drawCircle(x-40, y-10, 50,mMonthNumPaint); + mMonthNumPaint.setColor(mMonthNumTodayColor); } else if (mFocusDay[i] != isFocusMonth) { isFocusMonth = mFocusDay[i]; mMonthNumPaint.setColor(isFocusMonth ? mMonthNumColor : mMonthNumOtherColor); } - x = computeDayLeftPosition(i - offset) - (mSidePaddingMonthNumber); - canvas.drawText(mDayNumbers[i], x, y, mMonthNumPaint); + + + + canvas.drawText(mDayNumbers[i], x-25, y+10, mMonthNumPaint); + if (isBold) { mMonthNumPaint.setFakeBoldText(isBold = false); } -- GitLab From b6b3cf9e15014c441e204a6dd025da3a0f024d3f Mon Sep 17 00:00:00 2001 From: Narinder Rana Date: Mon, 4 Jan 2021 20:51:32 +0530 Subject: [PATCH 2/7] update round bg and update tool bar title color --- src/com/android/calendar/AboutActivity.kt | 2 +- src/com/android/calendar/AllInOneActivity.java | 1 + src/com/android/calendar/settings/SettingsActivity.kt | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/com/android/calendar/AboutActivity.kt b/src/com/android/calendar/AboutActivity.kt index 8ce1227f2..d831d362d 100644 --- a/src/com/android/calendar/AboutActivity.kt +++ b/src/com/android/calendar/AboutActivity.kt @@ -16,7 +16,7 @@ class AboutActivity : AppCompatActivity() { setContentView(R.layout.simple_frame_layout_material) val toolbar = findViewById(R.id.toolbar) - toolbar.setTitleTextColor(resources.getColor(R.color.color_default_blue1)) + toolbar.setTitleTextColor(resources.getColor(R.color.color_default_primary_text)) toolbar.setSubtitleTextColor(resources.getColor(R.color.color_default_blue1)) setSupportActionBar(toolbar) supportActionBar?.setDisplayHomeAsUpEnabled(true) diff --git a/src/com/android/calendar/AllInOneActivity.java b/src/com/android/calendar/AllInOneActivity.java index 9eb43d66b..cc59eeeec 100644 --- a/src/com/android/calendar/AllInOneActivity.java +++ b/src/com/android/calendar/AllInOneActivity.java @@ -462,6 +462,7 @@ public class AllInOneActivity extends AbstractCalendarActivity implements EventH private void setupToolbar(int viewType) { mToolbar = (Toolbar) findViewById(R.id.toolbar); + mToolbar.setTitleTextColor(this.getResources().getColor(R.color.color_default_primary_text)); if (mToolbar == null) { if (DEBUG) { Log.d(TAG, "Didn't find a toolbar"); diff --git a/src/com/android/calendar/settings/SettingsActivity.kt b/src/com/android/calendar/settings/SettingsActivity.kt index 1a22a289d..d9a0d0388 100644 --- a/src/com/android/calendar/settings/SettingsActivity.kt +++ b/src/com/android/calendar/settings/SettingsActivity.kt @@ -56,7 +56,7 @@ class SettingsActivity : AppCompatActivity(), setContentView(R.layout.simple_frame_layout_material) val toolbar = findViewById(R.id.toolbar) - toolbar.setTitleTextColor(resources.getColor(R.color.color_default_blue1)) + toolbar.setTitleTextColor(resources.getColor(R.color.color_default_primary_text)) toolbar.setSubtitleTextColor(resources.getColor(R.color.color_default_blue1)) setSupportActionBar(toolbar) -- GitLab From 23d939085562044ff978481b9c3345406140d721 Mon Sep 17 00:00:00 2001 From: Narinder Rana Date: Thu, 7 Jan 2021 08:26:02 +0530 Subject: [PATCH 3/7] update toolbar title color blue to black --- src/com/android/calendar/CalendarToolbarHandler.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/com/android/calendar/CalendarToolbarHandler.java b/src/com/android/calendar/CalendarToolbarHandler.java index 3ab2de35d..141238832 100644 --- a/src/com/android/calendar/CalendarToolbarHandler.java +++ b/src/com/android/calendar/CalendarToolbarHandler.java @@ -42,6 +42,7 @@ public class CalendarToolbarHandler { public CalendarToolbarHandler(AppCompatActivity context, Toolbar toolbar, int defaultViewType) { mContext = context; mToolbar = toolbar; + mToolbar.setSubtitleTextColor(context.getResources().getColor(R.color.color_default_primary_text)); mCurrentViewType = defaultViewType; mMidnightHandler = new Handler(); @@ -80,6 +81,7 @@ public class CalendarToolbarHandler { switch (mCurrentViewType) { case CalendarController.ViewType.DAY: mToolbar.setSubtitle(buildDayOfWeek()); + mToolbar.setTitle(buildFullDate()); break; case CalendarController.ViewType.WEEK: -- GitLab From 982ece8df4ec73dab47b40a20c1ecc0375528b33 Mon Sep 17 00:00:00 2001 From: Narinder Rana Date: Thu, 7 Jan 2021 09:32:14 +0530 Subject: [PATCH 4/7] add styles in date picker and time picker --- res/layout/edit_event_1.xml | 31 ++++++++++++------- res/values/styles.xml | 6 ++++ .../android/calendar/event/EditEventView.java | 18 ++++++++--- 3 files changed, 39 insertions(+), 16 deletions(-) diff --git a/res/layout/edit_event_1.xml b/res/layout/edit_event_1.xml index aaa6bdd40..3ed49b957 100644 --- a/res/layout/edit_event_1.xml +++ b/res/layout/edit_event_1.xml @@ -25,7 +25,7 @@ + android:paddingBottom="5dip" + android:orientation="horizontal" + android:layout_marginBottom="5dp" + > + + android:textColor="@color/color_default_primary_text" /> diff --git a/res/values/styles.xml b/res/values/styles.xml index 320bf4bbc..6d74ebf54 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -303,4 +303,10 @@ + + diff --git a/src/com/android/calendar/event/EditEventView.java b/src/com/android/calendar/event/EditEventView.java index 88337adc1..1fcddf81e 100644 --- a/src/com/android/calendar/event/EditEventView.java +++ b/src/com/android/calendar/event/EditEventView.java @@ -121,6 +121,8 @@ public class EditEventView implements View.OnClickListener, DialogInterface.OnCa * and zero commas, should insert an extra comma (followed by the space). */ private static InputFilter[] sRecipientFilters = new InputFilter[]{new Rfc822InputFilter()}; + private final View calendar_selector_group_view; + private final View calendar_group_view; public boolean mIsMultipane; ArrayList mEditOnlyList = new ArrayList(); ArrayList mEditViewList = new ArrayList(); @@ -259,6 +261,8 @@ public class EditEventView implements View.OnClickListener, DialogInterface.OnCa mAvailabilitySpinner = (Spinner) view.findViewById(R.id.availability); mAccessLevelSpinner = (Spinner) view.findViewById(R.id.visibility); mCalendarSelectorGroup = view.findViewById(R.id.calendar_selector_group); + calendar_selector_group_view = view.findViewById(R.id.calendar_selector_group_view); + calendar_group_view = view.findViewById(R.id.calendar_group_view); mCalendarSelectorWrapper = view.findViewById(R.id.calendar_selector_wrapper); mCalendarStaticGroup = view.findViewById(R.id.calendar_group); mRemindersGroup = view.findViewById(R.id.reminders_row); @@ -982,7 +986,8 @@ public class EditEventView implements View.OnClickListener, DialogInterface.OnCa mView.findViewById(R.id.calendar_textview_with_colorpicker) .setBackgroundColor(displayColor); } else { - mView.findViewById(R.id.calendar_group).setBackgroundColor(displayColor); + //mView.findViewById(R.id.calendar_group).setBackgroundColor(displayColor); + calendar_group_view.setBackgroundColor(displayColor); } } else { setSpinnerBackgroundColor(displayColor); @@ -993,7 +998,9 @@ public class EditEventView implements View.OnClickListener, DialogInterface.OnCa if (mIsMultipane) { mCalendarSelectorWrapper.setBackgroundColor(displayColor); } else { - mCalendarSelectorGroup.setBackgroundColor(displayColor); + calendar_selector_group_view.setBackgroundColor(displayColor); + //calendar_group_view.setBackgroundColor(displayColor); + } } @@ -1701,14 +1708,14 @@ public class EditEventView implements View.OnClickListener, DialogInterface.OnCa if (mStartTimePickerDialog != null) { mStartTimePickerDialog.dismiss(); } - mStartTimePickerDialog = new TimePickerDialog(mActivity, new TimeListener(v), + mStartTimePickerDialog = new TimePickerDialog(mActivity, R.style.datepicker, new TimeListener(v), mTime.hour, mTime.minute, DateFormat.is24HourFormat(mActivity)); dialog = mStartTimePickerDialog; } else { if (mEndTimePickerDialog != null) { mEndTimePickerDialog.dismiss(); } - mEndTimePickerDialog = new TimePickerDialog(mActivity, new TimeListener(v), + mEndTimePickerDialog = new TimePickerDialog(mActivity, R.style.datepicker, new TimeListener(v), mTime.hour, mTime.minute, DateFormat.is24HourFormat(mActivity)); dialog = mEndTimePickerDialog; @@ -1800,8 +1807,9 @@ public class EditEventView implements View.OnClickListener, DialogInterface.OnCa if (mDatePickerDialog != null) { mDatePickerDialog.dismiss(); } - mDatePickerDialog = new DatePickerDialog(mActivity, listener, + mDatePickerDialog = new DatePickerDialog(mActivity, R.style.datepicker, listener, mTime.year, mTime.month, mTime.monthDay); + mDatePickerDialog.show(); } } -- GitLab From ce821834000dfa8382ff666874d26d4a00ea0b26 Mon Sep 17 00:00:00 2001 From: Narinder Rana Date: Fri, 15 Jan 2021 11:07:03 +0530 Subject: [PATCH 5/7] refine the code --- res/values/colors.xml | 2 +- src/com/android/calendar/month/MonthWeekEventsView.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/res/values/colors.xml b/res/values/colors.xml index 4555f7f44..6c81f2e61 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -104,7 +104,7 @@ #FFDDDDDD - #FFFFFFFF + @lineageos.platform:color/color_default_foreground #FFFFFFFF #FFF2F2F2 #FFEEEEEE diff --git a/src/com/android/calendar/month/MonthWeekEventsView.java b/src/com/android/calendar/month/MonthWeekEventsView.java index f26ed504c..a5278fb60 100644 --- a/src/com/android/calendar/month/MonthWeekEventsView.java +++ b/src/com/android/calendar/month/MonthWeekEventsView.java @@ -517,7 +517,7 @@ public class MonthWeekEventsView extends SimpleWeekView { } p.setColor(mDaySeparatorInnerColor); p.setStrokeWidth(mDaySeparatorInnerWidth); - // canvas.drawLines(lines, 0, lines.length, p); + } @Override @@ -622,7 +622,7 @@ public class MonthWeekEventsView extends SimpleWeekView { for (; i < numCount; i++) { x = computeDayLeftPosition(i - offset) - (mSidePaddingMonthNumber); if (mHasToday && todayIndex == i) { - ///// + mMonthNumPaint.setFakeBoldText(isBold = true); if (i + 1 < numCount) { // Make sure the color will be set back on the next -- GitLab From c65e98df082a38ce942aca532f78899091c23eed Mon Sep 17 00:00:00 2001 From: Narinder Rana Date: Fri, 15 Jan 2021 12:27:01 +0530 Subject: [PATCH 6/7] update month view current date Round --- .../calendar/month/MonthWeekEventsView.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/com/android/calendar/month/MonthWeekEventsView.java b/src/com/android/calendar/month/MonthWeekEventsView.java index a5278fb60..b3cb6f97e 100644 --- a/src/com/android/calendar/month/MonthWeekEventsView.java +++ b/src/com/android/calendar/month/MonthWeekEventsView.java @@ -517,7 +517,7 @@ public class MonthWeekEventsView extends SimpleWeekView { } p.setColor(mDaySeparatorInnerColor); p.setStrokeWidth(mDaySeparatorInnerWidth); - + canvas.drawLines(lines, 0, lines.length, p); } @Override @@ -621,6 +621,7 @@ public class MonthWeekEventsView extends SimpleWeekView { for (; i < numCount; i++) { x = computeDayLeftPosition(i - offset) - (mSidePaddingMonthNumber); + if (mHasToday && todayIndex == i) { mMonthNumPaint.setFakeBoldText(isBold = true); @@ -630,16 +631,15 @@ public class MonthWeekEventsView extends SimpleWeekView { isFocusMonth = !mFocusDay[i + 1]; } mMonthNumPaint.setColor(getContext().getResources().getColor(R.color.color_default_blue1)); - canvas.drawCircle(x-40, y-10, 50,mMonthNumPaint); + canvas.drawCircle(x-35, y-20, 40,mMonthNumPaint); mMonthNumPaint.setColor(mMonthNumTodayColor); } else if (mFocusDay[i] != isFocusMonth) { isFocusMonth = mFocusDay[i]; mMonthNumPaint.setColor(isFocusMonth ? mMonthNumColor : mMonthNumOtherColor); } - - - - canvas.drawText(mDayNumbers[i], x-25, y+10, mMonthNumPaint); + double relation = Math.sqrt(canvas.getWidth() * canvas.getHeight()); + mMonthNumPaint.setTextSize((int)relation / 12); + canvas.drawText(mDayNumbers[i], x-12, y-5, mMonthNumPaint); if (isBold) { mMonthNumPaint.setFakeBoldText(isBold = false); @@ -692,7 +692,7 @@ public class MonthWeekEventsView extends SimpleWeekView { infoX = x; infoY = y + (mMonthNumHeight + mLunarPaddingLunar) * (num + 1); } - canvas.drawText(info, infoX, infoY, mMonthNumPaint); + canvas.drawText(info, infoX, infoY, mMonthNumPaint); num = num + 1; } -- GitLab From 08a6215bc0a8aec0a18f567d40dfc5fa428d501d Mon Sep 17 00:00:00 2001 From: Narinder Rana Date: Fri, 15 Jan 2021 20:50:49 +0530 Subject: [PATCH 7/7] update month view current date Round --- src/com/android/calendar/month/MonthWeekEventsView.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/com/android/calendar/month/MonthWeekEventsView.java b/src/com/android/calendar/month/MonthWeekEventsView.java index b3cb6f97e..2e53a97ab 100644 --- a/src/com/android/calendar/month/MonthWeekEventsView.java +++ b/src/com/android/calendar/month/MonthWeekEventsView.java @@ -517,7 +517,7 @@ public class MonthWeekEventsView extends SimpleWeekView { } p.setColor(mDaySeparatorInnerColor); p.setStrokeWidth(mDaySeparatorInnerWidth); - canvas.drawLines(lines, 0, lines.length, p); + // canvas.drawLines(lines, 0, lines.length, p); } @Override @@ -631,7 +631,7 @@ public class MonthWeekEventsView extends SimpleWeekView { isFocusMonth = !mFocusDay[i + 1]; } mMonthNumPaint.setColor(getContext().getResources().getColor(R.color.color_default_blue1)); - canvas.drawCircle(x-35, y-20, 40,mMonthNumPaint); + canvas.drawCircle(x-35, y-22, 40,mMonthNumPaint); mMonthNumPaint.setColor(mMonthNumTodayColor); } else if (mFocusDay[i] != isFocusMonth) { isFocusMonth = mFocusDay[i]; -- GitLab