From 759beb985bef2bf8c8758d2b30c5a189cf5f8c2e Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Fri, 3 Feb 2017 21:01:12 +0100
Subject: [PATCH] update hours top margin on weekly view dynamically

---
 .../simplemobiletools/calendar/activities/MainActivity.kt    | 5 +++++
 .../com/simplemobiletools/calendar/fragments/WeekFragment.kt | 1 +
 app/src/main/res/layout/activity_main.xml                    | 1 -
 app/src/main/res/layout/fragment_week.xml                    | 2 +-
 app/src/main/res/values-sw600dp/dimens.xml                   | 1 -
 app/src/main/res/values/dimens.xml                           | 1 -
 6 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/MainActivity.kt
index ac98c469c..8ef5e0968 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/MainActivity.kt
@@ -11,6 +11,7 @@ import android.support.v4.view.ViewPager
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
+import android.widget.LinearLayout
 import android.widget.TextView
 import com.simplemobiletools.calendar.BuildConfig
 import com.simplemobiletools.calendar.R
@@ -263,6 +264,10 @@ class MainActivity : SimpleActivity(), EventListFragment.DeleteListener {
         })
     }
 
+    fun updateHoursTopMargin(margin: Int) {
+        (week_view_hours_scrollview.layoutParams as LinearLayout.LayoutParams).setMargins(0, margin, 0, 0)
+    }
+
     private fun getWeekTimestamps(targetWeekTS: Int): List<Int> {
         val weekTSs = ArrayList<Int>(PREFILLED_WEEKS)
         for (i in -PREFILLED_WEEKS / 2..PREFILLED_WEEKS / 2) {
diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/WeekFragment.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/WeekFragment.kt
index cf57b2673..f58f9e9ba 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/WeekFragment.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/WeekFragment.kt
@@ -81,6 +81,7 @@ class WeekFragment : Fragment(), WeeklyCalendar {
                 mView.week_events_scrollview.viewTreeObserver.removeOnGlobalLayoutListener(this)
                 minScrollY = mRowHeight * context.config.startWeeklyAt
                 maxScrollY = mRowHeight * context.config.endWeeklyAt
+                (activity as MainActivity).updateHoursTopMargin(mView.week_letters_holder.height)
 
                 val bounds = Rect()
                 week_events_holder.getGlobalVisibleRect(bounds)
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 2f3e78492..ef1f48314 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -23,7 +23,6 @@
                 android:id="@+id/week_view_hours_scrollview"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/weekly_view_day_letters_height"
                 android:overScrollMode="never"
                 android:paddingTop="@dimen/medium_margin"
                 android:scrollbars="none">
diff --git a/app/src/main/res/layout/fragment_week.xml b/app/src/main/res/layout/fragment_week.xml
index 96099612f..09643eca1 100644
--- a/app/src/main/res/layout/fragment_week.xml
+++ b/app/src/main/res/layout/fragment_week.xml
@@ -9,7 +9,7 @@
     <LinearLayout
         android:id="@+id/week_letters_holder"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/weekly_view_day_letters_height"
+        android:layout_height="wrap_content"
         android:gravity="center_vertical"
         android:orientation="horizontal">
 
diff --git a/app/src/main/res/values-sw600dp/dimens.xml b/app/src/main/res/values-sw600dp/dimens.xml
index b7ef2ad66..21012d3e2 100644
--- a/app/src/main/res/values-sw600dp/dimens.xml
+++ b/app/src/main/res/values-sw600dp/dimens.xml
@@ -5,7 +5,6 @@
     <dimen name="weekly_view_row_height">90dp</dimen>
     <dimen name="weekly_view_row_minus_one_height">89dp</dimen>
     <dimen name="weekly_view_events_height">2160dp</dimen>      <!-- weekly_view_row_height * 24 hours -->
-    <dimen name="weekly_view_day_letters_height">50dp</dimen>
     <dimen name="weekly_view_minimal_event_height">15dp</dimen>
 
     <dimen name="meta_text_size">20sp</dimen>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 038f9baf8..3e0960ae3 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -6,7 +6,6 @@
     <dimen name="weekly_view_row_height">60dp</dimen>
     <dimen name="weekly_view_row_minus_one_height">59dp</dimen>
     <dimen name="weekly_view_events_height">1440dp</dimen>      <!-- weekly_view_row_height * 24 hours -->
-    <dimen name="weekly_view_day_letters_height">40dp</dimen>
     <dimen name="weekly_view_minimal_event_height">10dp</dimen>
 
     <dimen name="min_widget_width">250dp</dimen>