From 551e59b780eeab0744aa2ccb1b5df198edc88b33 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Wed, 25 Jan 2017 19:59:42 +0100
Subject: [PATCH] use smaller, but bold font for day letters and week numbers

---
 .../WidgetMonthlyConfigureActivity.kt         |  4 +-
 .../calendar/fragments/MonthFragment.kt       |  4 +-
 .../helpers/MyWidgetMonthlyProvider.kt        |  4 +-
 app/src/main/res/layout/first_row.xml         | 37 ++++++++-----------
 app/src/main/res/layout/fragment_month.xml    | 12 +++---
 .../main/res/layout/fragment_month_widget.xml | 12 +++---
 app/src/main/res/values/dimens.xml            |  3 +-
 app/src/main/res/values/styles.xml            |  5 +++
 8 files changed, 40 insertions(+), 41 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/WidgetMonthlyConfigureActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/WidgetMonthlyConfigureActivity.kt
index a25027385..ad0f5100e 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/WidgetMonthlyConfigureActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/WidgetMonthlyConfigureActivity.kt
@@ -144,13 +144,13 @@ class WidgetMonthlyConfigureActivity : AppCompatActivity(), MonthlyCalendar {
         val len = mDays!!.size
 
         if (applicationContext.config.displayWeekNumbers) {
-            week_num.setTextColor(mWeakTextColor)
+            week_num.setTextColor(mTextColor)
             week_num.visibility = View.VISIBLE
 
             for (i in 0..5) {
                 (findViewById(mRes.getIdentifier("week_num_$i", "id", mPackageName)) as TextView).apply {
                     text = "${mDays!![i * 7 + 3].weekOfYear}:"
-                    setTextColor(mWeakTextColor)
+                    setTextColor(mTextColor)
                     visibility = View.VISIBLE
                 }
             }
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 dfc7bb106..b7f332a0d 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/MonthFragment.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/MonthFragment.kt
@@ -160,13 +160,13 @@ class MonthFragment : Fragment(), MonthlyCalendar {
         if (week_num == null)
             return
 
-        week_num.setTextColor(mWeakTextColor)
+        week_num.setTextColor(mTextColor)
         week_num.beVisibleIf(displayWeekNumbers)
 
         for (i in 0..5) {
             (mHolder.findViewById(mRes.getIdentifier("week_num_$i", "id", mPackageName)) as TextView).apply {
                 text = "${days[i * 7 + 3].weekOfYear}:"
-                setTextColor(mWeakTextColor)
+                setTextColor(mTextColor)
                 beVisibleIf(displayWeekNumbers)
             }
         }
diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/MyWidgetMonthlyProvider.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/MyWidgetMonthlyProvider.kt
index 2fadbe774..45ebb8adc 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/MyWidgetMonthlyProvider.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/MyWidgetMonthlyProvider.kt
@@ -110,14 +110,14 @@ class MyWidgetMonthlyProvider : AppWidgetProvider(), MonthlyCalendar {
         val displayWeekNumbers = mContext.config.displayWeekNumbers
         val len = days.size
         val packageName = mContext.packageName
-        mRemoteViews.setInt(R.id.week_num, "setTextColor", mWeakTextColor)
+        mRemoteViews.setInt(R.id.week_num, "setTextColor", mTextColor)
         mRemoteViews.setViewVisibility(R.id.week_num, if (displayWeekNumbers) View.VISIBLE else View.GONE)
 
         for (i in 0..5) {
             val id = mRes.getIdentifier("week_num_$i", "id", packageName)
             mRemoteViews.apply {
                 setTextViewText(id, days[i * 7 + 3].weekOfYear.toString() + ":")
-                setInt(id, "setTextColor", mWeakTextColor)
+                setInt(id, "setTextColor", mTextColor)
                 setViewVisibility(id, if (displayWeekNumbers) View.VISIBLE else View.GONE)
             }
         }
diff --git a/app/src/main/res/layout/first_row.xml b/app/src/main/res/layout/first_row.xml
index d6f84b084..1d7df5438 100644
--- a/app/src/main/res/layout/first_row.xml
+++ b/app/src/main/res/layout/first_row.xml
@@ -8,7 +8,7 @@
 
     <com.simplemobiletools.commons.views.MyTextView
         android:id="@+id/week_num"
-        style="@style/DayView"
+        style="@style/MetaView"
         android:layout_width="0dp"
         android:layout_height="match_parent"
         android:layout_weight="1"
@@ -17,65 +17,58 @@
 
     <com.simplemobiletools.commons.views.MyTextView
         android:id="@+id/label_0"
-        style="@style/DayView"
+        style="@style/MetaView"
         android:layout_width="0dp"
         android:layout_height="match_parent"
         android:layout_weight="1"
-        android:text="@string/monday_letter"
-        android:textStyle="bold"/>
+        android:text="@string/monday_letter"/>
 
     <com.simplemobiletools.commons.views.MyTextView
         android:id="@+id/label_1"
-        style="@style/DayView"
+        style="@style/MetaView"
         android:layout_width="0dp"
         android:layout_height="match_parent"
         android:layout_weight="1"
-        android:text="@string/tuesday_letter"
-        android:textStyle="bold"/>
+        android:text="@string/tuesday_letter"/>
 
     <com.simplemobiletools.commons.views.MyTextView
         android:id="@+id/label_2"
-        style="@style/DayView"
+        style="@style/MetaView"
         android:layout_width="0dp"
         android:layout_height="match_parent"
         android:layout_weight="1"
-        android:text="@string/wednesday_letter"
-        android:textStyle="bold"/>
+        android:text="@string/wednesday_letter"/>
 
     <com.simplemobiletools.commons.views.MyTextView
         android:id="@+id/label_3"
-        style="@style/DayView"
+        style="@style/MetaView"
         android:layout_width="0dp"
         android:layout_height="match_parent"
         android:layout_weight="1"
-        android:text="@string/thursday_letter"
-        android:textStyle="bold"/>
+        android:text="@string/thursday_letter"/>
 
     <com.simplemobiletools.commons.views.MyTextView
         android:id="@+id/label_4"
-        style="@style/DayView"
+        style="@style/MetaView"
         android:layout_width="0dp"
         android:layout_height="match_parent"
         android:layout_weight="1"
-        android:text="@string/friday_letter"
-        android:textStyle="bold"/>
+        android:text="@string/friday_letter"/>
 
     <com.simplemobiletools.commons.views.MyTextView
         android:id="@+id/label_5"
-        style="@style/DayView"
+        style="@style/MetaView"
         android:layout_width="0dp"
         android:layout_height="match_parent"
         android:layout_weight="1"
-        android:text="@string/saturday_letter"
-        android:textStyle="bold"/>
+        android:text="@string/saturday_letter"/>
 
     <com.simplemobiletools.commons.views.MyTextView
         android:id="@+id/label_6"
-        style="@style/DayView"
+        style="@style/MetaView"
         android:layout_width="0dp"
         android:layout_height="match_parent"
         android:layout_weight="1"
-        android:text="@string/sunday_letter"
-        android:textStyle="bold"/>
+        android:text="@string/sunday_letter"/>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_month.xml b/app/src/main/res/layout/fragment_month.xml
index d0d60fddc..32f2468d5 100644
--- a/app/src/main/res/layout/fragment_month.xml
+++ b/app/src/main/res/layout/fragment_month.xml
@@ -29,7 +29,7 @@
 
             <com.simplemobiletools.commons.views.MyTextView
                 android:id="@+id/week_num_0"
-                style="@style/DayView"
+                style="@style/MetaView"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_weight="1"
@@ -93,7 +93,7 @@
 
             <com.simplemobiletools.commons.views.MyTextView
                 android:id="@+id/week_num_1"
-                style="@style/DayView"
+                style="@style/MetaView"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_weight="1"
@@ -157,7 +157,7 @@
 
             <com.simplemobiletools.commons.views.MyTextView
                 android:id="@+id/week_num_2"
-                style="@style/DayView"
+                style="@style/MetaView"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_weight="1"
@@ -221,7 +221,7 @@
 
             <com.simplemobiletools.commons.views.MyTextView
                 android:id="@+id/week_num_3"
-                style="@style/DayView"
+                style="@style/MetaView"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_weight="1"
@@ -285,7 +285,7 @@
 
             <com.simplemobiletools.commons.views.MyTextView
                 android:id="@+id/week_num_4"
-                style="@style/DayView"
+                style="@style/MetaView"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_weight="1"
@@ -349,7 +349,7 @@
 
             <com.simplemobiletools.commons.views.MyTextView
                 android:id="@+id/week_num_5"
-                style="@style/DayView"
+                style="@style/MetaView"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_weight="1"
diff --git a/app/src/main/res/layout/fragment_month_widget.xml b/app/src/main/res/layout/fragment_month_widget.xml
index 329f488da..4b995f82e 100644
--- a/app/src/main/res/layout/fragment_month_widget.xml
+++ b/app/src/main/res/layout/fragment_month_widget.xml
@@ -29,7 +29,7 @@
 
             <TextView
                 android:id="@+id/week_num_0"
-                style="@style/DayView"
+                style="@style/MetaView"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_weight="1"
@@ -170,7 +170,7 @@
 
             <TextView
                 android:id="@+id/week_num_1"
-                style="@style/DayView"
+                style="@style/MetaView"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_weight="1"
@@ -312,7 +312,7 @@
 
             <TextView
                 android:id="@+id/week_num_2"
-                style="@style/DayView"
+                style="@style/MetaView"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_weight="1"
@@ -453,7 +453,7 @@
 
             <TextView
                 android:id="@+id/week_num_3"
-                style="@style/DayView"
+                style="@style/MetaView"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_weight="1"
@@ -594,7 +594,7 @@
 
             <TextView
                 android:id="@+id/week_num_4"
-                style="@style/DayView"
+                style="@style/MetaView"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_weight="1"
@@ -735,7 +735,7 @@
 
             <TextView
                 android:id="@+id/week_num_5"
-                style="@style/DayView"
+                style="@style/MetaView"
                 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 aa400f121..038f9baf8 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -12,6 +12,7 @@
     <dimen name="min_widget_width">250dp</dimen>
     <dimen name="min_widget_height">250dp</dimen>
 
-    <dimen name="day_text_size">16sp</dimen>
+    <dimen name="meta_text_size">14sp</dimen>
+    <dimen name="day_text_size">17sp</dimen>
     <dimen name="month_text_size">22sp</dimen>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 5260c5b62..13628dced 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -8,6 +8,11 @@
         <item name="android:fontFamily">sans-serif-light</item>
     </style>
 
+    <style name="MetaView" parent="DayView">
+        <item name="android:textStyle">bold</item>
+        <item name="android:textSize">@dimen/meta_text_size</item>
+    </style>
+
     <style name="ArrowStyle">
         <item name="android:background">@drawable/transparent_button</item>
     </style>