From 901684e152bca4226efa484f16a51156f9e792a5 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Sat, 7 Oct 2017 23:43:45 +0200
Subject: [PATCH] fix some issues related to week number displaying

---
 .../calendar/fragments/MonthFragment.kt            |  9 +++++----
 app/src/main/res/layout/day_monthly_item_view.xml  |  2 +-
 app/src/main/res/layout/fragment_month.xml         | 14 ++++++--------
 app/src/main/res/values/dimens.xml                 |  1 +
 app/src/main/res/values/styles.xml                 |  8 ++++++++
 5 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/MonthFragment.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/MonthFragment.kt
index 05964e904..a3ff293b9 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/MonthFragment.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/MonthFragment.kt
@@ -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) }
 
diff --git a/app/src/main/res/layout/day_monthly_item_view.xml b/app/src/main/res/layout/day_monthly_item_view.xml
index 16d5bc61c..1905ed0b6 100644
--- a/app/src/main/res/layout/day_monthly_item_view.xml
+++ b/app/src/main/res/layout/day_monthly_item_view.xml
@@ -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"/>
diff --git a/app/src/main/res/layout/fragment_month.xml b/app/src/main/res/layout/fragment_month.xml
index 3bae233d8..236b2b4a6 100644
--- a/app/src/main/res/layout/fragment_month.xml
+++ b/app/src/main/res/layout/fragment_month.xml
@@ -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"
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 26b557525..4f84b5cff 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -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>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 13628dced..3d7da088b 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -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>