Skip to content

Added margins to week numbers in month views (#265) #285

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
naveensingh merged 5 commits into from
Jan 14, 2025
Merged

Added margins to week numbers in month views (#265) #285

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
75c9d97
Added margins to week numbers in month views (#265)
Aga-C Jul 25, 2024
54c0951
Merge branch 'master' into add-margins-month-views
naveensingh Jan 14, 2025
b618d97
Added right margin
Aga-C Jan 14, 2025
5eb64fb
Merge branch 'add-margins-month-views' of https://github.com/Aga-C/Ca…
Aga-C Jan 14, 2025
46c678c
Revert the month view margins for now
naveensingh Jan 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/src/main/kotlin/org/fossify/calendar/views/MonthView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ class MonthView(context: Context, attrs: AttributeSet, defStyle: Int) : View(con
val weekOfYear = days.getOrNull(i * 7 + 3)?.weekOfYear ?: 1
val id = "$weekOfYear:"
val yPos = i * dayHeight + weekDaysLetterHeight
canvas.drawText(id, horizontalOffset.toFloat() * 0.9f, yPos + textPaint.textSize, weekNumberPaint)
canvas.drawText(id, horizontalOffset.toFloat(), yPos + textPaint.textSize, weekNumberPaint)
}
}

Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/layout-land/fragment_month_day.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
android:id="@+id/month_day_view_wrapper"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/smaller_margin"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/month_day_list_holder"
app:layout_constraintWidth_percent="0.45" />
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/layout/fragment_month.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
android:id="@+id/month_view_wrapper"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="@dimen/smaller_margin"
android:layout_below="@+id/top_left_arrow" />

</RelativeLayout>
1 change: 1 addition & 0 deletions app/src/main/res/layout/fragment_month_day.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
android:id="@+id/month_day_view_wrapper"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginLeft="@dimen/small_margin"
app:layout_constraintBottom_toTopOf="@+id/month_day_list_holder"
app:layout_constraintHeight_percent="0.3"
app:layout_constraintStart_toStartOf="parent"
Expand Down
Loading