From a58ba4dfd83745f86e5459ee1e8537250b379d9c Mon Sep 17 00:00:00 2001 From: Agnieszka C <85929121+Aga-C@users.noreply.github.com> Date: Sun, 13 Oct 2024 09:34:30 +0200 Subject: [PATCH 1/3] Added opening daily view from weekly view (#344) --- .../calendar/activities/MainActivity.kt | 18 +++++++++++++++++- .../fossify/calendar/fragments/WeekFragment.kt | 3 +++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/app/src/main/kotlin/org/fossify/calendar/activities/MainActivity.kt b/app/src/main/kotlin/org/fossify/calendar/activities/MainActivity.kt index bfd5b87e6..216a79ece 100644 --- a/app/src/main/kotlin/org/fossify/calendar/activities/MainActivity.kt +++ b/app/src/main/kotlin/org/fossify/calendar/activities/MainActivity.kt @@ -994,6 +994,22 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener { } } + fun openDayFromWeekly(dateTime: DateTime) { + if (currentFragments.last() is DayFragmentsHolder) { + return + } + + val fragment = DayFragmentsHolder() + currentFragments.add(fragment) + val bundle = Bundle() + bundle.putString(DAY_CODE, Formatter.getDayCodeFromDateTime(dateTime)) + fragment.arguments = bundle + supportFragmentManager.beginTransaction().add(R.id.fragments_holder, fragment).commitNow() + resetActionBarTitle() + binding.calendarFab.beVisible() + showBackNavigationArrow() + } + private fun getFragmentsHolder() = when (config.storedView) { DAILY_VIEW -> DayFragmentsHolder() MONTHLY_VIEW -> MonthFragmentsHolder() @@ -1011,7 +1027,7 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener { refreshEvents() } - binding.calendarFab.beGoneIf(currentFragments.size == 1 && config.storedView == YEARLY_VIEW) + binding.calendarFab.beGoneIf(currentFragments.size == 1 && (config.storedView == YEARLY_VIEW || config.storedView == WEEKLY_VIEW)) if (currentFragments.size > 1) { showBackNavigationArrow() } else { diff --git a/app/src/main/kotlin/org/fossify/calendar/fragments/WeekFragment.kt b/app/src/main/kotlin/org/fossify/calendar/fragments/WeekFragment.kt index 53bcb4424..db45bd9ff 100644 --- a/app/src/main/kotlin/org/fossify/calendar/fragments/WeekFragment.kt +++ b/app/src/main/kotlin/org/fossify/calendar/fragments/WeekFragment.kt @@ -232,6 +232,9 @@ class WeekFragment : Fragment(), WeeklyCalendar { if (todayCode == dayCode) { todayColumnIndex = i } + label.setOnClickListener { + (activity as MainActivity).openDayFromWeekly(Formatter.getDateTimeFromCode(dayCode)) + } binding.weekLettersHolder.addView(label) curDay = curDay.plusDays(1) From fb18807cc74ec137a0a608bc264b3555323a332f Mon Sep 17 00:00:00 2001 From: Agnieszka C <85929121+Aga-C@users.noreply.github.com> Date: Sun, 13 Oct 2024 09:50:18 +0200 Subject: [PATCH 2/3] Fixed line length --- .../kotlin/org/fossify/calendar/activities/MainActivity.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/src/main/kotlin/org/fossify/calendar/activities/MainActivity.kt b/app/src/main/kotlin/org/fossify/calendar/activities/MainActivity.kt index 216a79ece..dabff20b5 100644 --- a/app/src/main/kotlin/org/fossify/calendar/activities/MainActivity.kt +++ b/app/src/main/kotlin/org/fossify/calendar/activities/MainActivity.kt @@ -1027,7 +1027,10 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener { refreshEvents() } - binding.calendarFab.beGoneIf(currentFragments.size == 1 && (config.storedView == YEARLY_VIEW || config.storedView == WEEKLY_VIEW)) + binding.calendarFab.beGoneIf( + currentFragments.size == 1 && + (config.storedView == YEARLY_VIEW || config.storedView == WEEKLY_VIEW) + ) if (currentFragments.size > 1) { showBackNavigationArrow() } else { From 79defd52d292037ae9be5cc0360327398732c47b Mon Sep 17 00:00:00 2001 From: Naveen Singh Date: Thu, 14 Nov 2024 20:01:53 +0530 Subject: [PATCH 3/3] Show ripples when day letter is clicked --- app/src/main/res/layout/weekly_view_day_letter.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/res/layout/weekly_view_day_letter.xml b/app/src/main/res/layout/weekly_view_day_letter.xml index 9979d507a..91c228d0c 100644 --- a/app/src/main/res/layout/weekly_view_day_letter.xml +++ b/app/src/main/res/layout/weekly_view_day_letter.xml @@ -5,6 +5,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" + android:background="?selectableItemBackgroundBorderless" android:gravity="center_horizontal" android:textSize="@dimen/normal_text_size" tools:text="@string/monday_letter" />