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

fix some issues related to week number displaying

Browse Source
This commit is contained in:
tibbi 2017-10-07 23:43:45 +02:00
parent 6788062bde
commit 901684e152
5 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/kotlin/com/simplemobiletools/calendar/fragments/MonthFragment.kt
View File

@ -35,6 +35,7 @@ class MonthFragment : Fragment(), MonthlyCalendar {
private var mWeakTextColor = 0
private var mSundayFirst = false
private var mDayCode = ""
private var mPackageName = ""
private var dividerMargin = 0
var listener: NavigationListener? = null
@ -48,6 +49,7 @@ class MonthFragment : Fragment(), MonthlyCalendar {
val view = inflater!!.inflate(R.layout.fragment_month, container, false)
mRes = resources
dividerMargin = mRes.displayMetrics.density.toInt()
mPackageName = activity.packageName
mHolder = view.calendar_holder
mDayCode = arguments.getString(DAY_CODE)
@ -146,7 +148,7 @@ class MonthFragment : Fragment(), MonthlyCalendar {
if (!mSundayFirst)
index = (index + 1) % letters.size
(mHolder.findViewById(mRes.getIdentifier("label_$i", "id", activity.packageName)) as TextView).apply {
(mHolder.findViewById(mRes.getIdentifier("label_$i", "id", mPackageName)) as TextView).apply {
setTextColor(mTextColor)
text = getString(letters[index])
}
@ -154,7 +156,6 @@ class MonthFragment : Fragment(), MonthlyCalendar {
}
private fun updateDays(days: List<DayMonthly>) {
val packageName = activity.packageName
val displayWeekNumbers = mConfig.displayWeekNumbers
val len = days.size
@ -165,7 +166,7 @@ class MonthFragment : Fragment(), MonthlyCalendar {
week_num.beVisibleIf(displayWeekNumbers)
for (i in 0..5) {
(mHolder.findViewById(mRes.getIdentifier("week_num_$i", "id", packageName)) as TextView).apply {
(mHolder.findViewById(mRes.getIdentifier("week_num_$i", "id", mPackageName)) as TextView).apply {
text = "${days[i * 7 + 3].weekOfYear}:"
setTextColor(mTextColor)
beVisibleIf(displayWeekNumbers)
@ -173,7 +174,7 @@ class MonthFragment : Fragment(), MonthlyCalendar {
}
for (i in 0 until len) {
(mHolder.findViewById(mRes.getIdentifier("day_$i", "id", packageName)) as LinearLayout).apply {
(mHolder.findViewById(mRes.getIdentifier("day_$i", "id", mPackageName)) as LinearLayout).apply {
val day = days[i]
setOnClickListener { openDay(day.code) }

2
app/src/main/res/layout/day_monthly_item_view.xml
View File

@ -11,5 +11,5 @@
android:maxLines="1"
android:paddingLeft="@dimen/tiny_margin"
android:paddingRight="@dimen/tiny_margin"
android:textSize="@dimen/small_text_size"
android:textSize="@dimen/day_monthly_text_size"
tools:text="1"/>

14
app/src/main/res/layout/fragment_month.xml
View File

@ -30,11 +30,10 @@
<com.simplemobiletools.commons.views.MyTextView
android:id="@+id/week_num_0"
style="@style/MetaView"
style="@style/WeekNumberStyle"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="#2200ff00"
android:visibility="gone"/>
<LinearLayout
@ -103,7 +102,7 @@
<com.simplemobiletools.commons.views.MyTextView
android:id="@+id/week_num_1"
style="@style/MetaView"
style="@style/WeekNumberStyle"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
@ -175,11 +174,10 @@
<com.simplemobiletools.commons.views.MyTextView
android:id="@+id/week_num_2"
style="@style/MetaView"
style="@style/WeekNumberStyle"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="#22ff0000"
android:visibility="gone"/>
<LinearLayout
@ -248,7 +246,7 @@
<com.simplemobiletools.commons.views.MyTextView
android:id="@+id/week_num_3"
style="@style/MetaView"
style="@style/WeekNumberStyle"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
@ -320,7 +318,7 @@
<com.simplemobiletools.commons.views.MyTextView
android:id="@+id/week_num_4"
style="@style/MetaView"
style="@style/WeekNumberStyle"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
@ -392,7 +390,7 @@
<com.simplemobiletools.commons.views.MyTextView
android:id="@+id/week_num_5"
style="@style/MetaView"
style="@style/WeekNumberStyle"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"

1
app/src/main/res/values/dimens.xml
View File

@ -17,6 +17,7 @@
<dimen name="yearly_month_padding">0dp</dimen>
<dimen name="day_monthly_text_size">11sp</dimen>
<dimen name="meta_text_size">14sp</dimen>
<dimen name="day_text_size">17sp</dimen>
<dimen name="month_text_size">22sp</dimen>

8
app/src/main/res/values/styles.xml
View File

@ -13,6 +13,14 @@
<item name="android:textSize">@dimen/meta_text_size</item>
</style>
<style name="WeekNumberStyle">
<item name="android:textStyle">bold</item>
<item name="android:gravity">top|center_horizontal</item>
<item name="android:textSize">@dimen/day_monthly_text_size</item>
<item name="android:textColor">@color/default_text_color</item>
<item name="android:fontFamily">sans-serif-light</item>
</style>
<style name="ArrowStyle">
<item name="android:background">@drawable/transparent_button</item>
</style>