fenix/Simple-Calendar
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Calendar.git synced 2025-06-05 21:59:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

update hours top margin on weekly view dynamically

Browse Source
This commit is contained in:
tibbi
2017-02-03 21:01:12 +01:00
parent dca227af33
commit 759beb985b
6 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/kotlin/com/simplemobiletools/calendar/activities/MainActivity.kt
View File

@@ -11,6 +11,7 @@ import android.support.v4.view.ViewPager
import android.view.Menu import android.view.Menu
import android.view.MenuItem import android.view.MenuItem
import android.view.View import android.view.View
import android.widget.LinearLayout
import android.widget.TextView import android.widget.TextView
import com.simplemobiletools.calendar.BuildConfig import com.simplemobiletools.calendar.BuildConfig
import com.simplemobiletools.calendar.R 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> { private fun getWeekTimestamps(targetWeekTS: Int): List<Int> {
val weekTSs = ArrayList<Int>(PREFILLED_WEEKS) val weekTSs = ArrayList<Int>(PREFILLED_WEEKS)
for (i in -PREFILLED_WEEKS / 2..PREFILLED_WEEKS / 2) { for (i in -PREFILLED_WEEKS / 2..PREFILLED_WEEKS / 2) {

1
app/src/main/kotlin/com/simplemobiletools/calendar/fragments/WeekFragment.kt
View File

@@ -81,6 +81,7 @@ class WeekFragment : Fragment(), WeeklyCalendar {
mView.week_events_scrollview.viewTreeObserver.removeOnGlobalLayoutListener(this) mView.week_events_scrollview.viewTreeObserver.removeOnGlobalLayoutListener(this)
minScrollY = mRowHeight * context.config.startWeeklyAt minScrollY = mRowHeight * context.config.startWeeklyAt
maxScrollY = mRowHeight * context.config.endWeeklyAt maxScrollY = mRowHeight * context.config.endWeeklyAt
(activity as MainActivity).updateHoursTopMargin(mView.week_letters_holder.height)
val bounds = Rect() val bounds = Rect()
week_events_holder.getGlobalVisibleRect(bounds) week_events_holder.getGlobalVisibleRect(bounds)

1
app/src/main/res/layout/activity_main.xml
View File

@@ -23,7 +23,6 @@
android:id="@+id/week_view_hours_scrollview" android:id="@+id/week_view_hours_scrollview"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/weekly_view_day_letters_height"
android:overScrollMode="never" android:overScrollMode="never"
android:paddingTop="@dimen/medium_margin" android:paddingTop="@dimen/medium_margin"
android:scrollbars="none"> android:scrollbars="none">

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

@@ -9,7 +9,7 @@
<LinearLayout <LinearLayout
android:id="@+id/week_letters_holder" android:id="@+id/week_letters_holder"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/weekly_view_day_letters_height" android:layout_height="wrap_content"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal"> android:orientation="horizontal">

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

@@ -5,7 +5,6 @@
<dimen name="weekly_view_row_height">90dp</dimen> <dimen name="weekly_view_row_height">90dp</dimen>
<dimen name="weekly_view_row_minus_one_height">89dp</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_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="weekly_view_minimal_event_height">15dp</dimen>
<dimen name="meta_text_size">20sp</dimen> <dimen name="meta_text_size">20sp</dimen>

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

@@ -6,7 +6,6 @@
<dimen name="weekly_view_row_height">60dp</dimen> <dimen name="weekly_view_row_height">60dp</dimen>
<dimen name="weekly_view_row_minus_one_height">59dp</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_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="weekly_view_minimal_event_height">10dp</dimen>
<dimen name="min_widget_width">250dp</dimen> <dimen name="min_widget_width">250dp</dimen>