From 1786704213710181079ea991c29b3e545f6c062b Mon Sep 17 00:00:00 2001 From: tibbi Date: Tue, 22 Aug 2017 11:43:24 +0200 Subject: [PATCH] revert some tools:text to android:text so it actually occupies the space --- .../calendar/adapters/DayEventsAdapter.kt | 4 ++-- app/src/main/res/layout/event_item_day_view.xml | 14 +++++++------- app/src/main/res/layout/event_list_item.xml | 14 +++++++------- app/src/main/res/layout/event_list_item_widget.xml | 14 +++++++------- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/DayEventsAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/DayEventsAdapter.kt index 300fcad12..48914c237 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/DayEventsAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/DayEventsAdapter.kt @@ -47,7 +47,7 @@ class DayEventsAdapter(val activity: SimpleActivity, val mItems: List, va allDayString = activity.resources.getString(R.string.all_day) } - val multiSelectorMode = object : ModalMultiSelectorCallback(multiSelector) { + private val multiSelectorMode = object : ModalMultiSelectorCallback(multiSelector) { override fun onActionItemClicked(mode: ActionMode, item: MenuItem): Boolean { when (item.itemId) { R.id.cab_share -> shareEvents() @@ -162,7 +162,7 @@ class DayEventsAdapter(val activity: SimpleActivity, val mItems: List, va return itemView } - fun viewClicked(multiSelector: MultiSelector, event: Event, pos: Int) { + private fun viewClicked(multiSelector: MultiSelector, event: Event, pos: Int) { if (multiSelector.isSelectable) { val isSelected = multiSelector.selectedPositions.contains(layoutPosition) multiSelector.setSelected(this, !isSelected) diff --git a/app/src/main/res/layout/event_item_day_view.xml b/app/src/main/res/layout/event_item_day_view.xml index b5fc3b587..7f6e4156f 100644 --- a/app/src/main/res/layout/event_item_day_view.xml +++ b/app/src/main/res/layout/event_item_day_view.xml @@ -19,15 +19,15 @@ android:id="@+id/event_item_start" android:layout_width="wrap_content" android:layout_height="wrap_content" - tools:text="13:00" - android:textSize="@dimen/day_text_size"/> + android:textSize="@dimen/day_text_size" + tools:text="13:00"/> + android:textSize="@dimen/day_text_size" + tools:text="Event title"/> + android:textSize="@dimen/day_text_size" + tools:text="Event description"/> diff --git a/app/src/main/res/layout/event_list_item.xml b/app/src/main/res/layout/event_list_item.xml index 10833be4a..673ff45c1 100644 --- a/app/src/main/res/layout/event_list_item.xml +++ b/app/src/main/res/layout/event_list_item.xml @@ -22,15 +22,15 @@ android:id="@+id/event_item_start" android:layout_width="wrap_content" android:layout_height="wrap_content" - tools:text="13:00" - android:textSize="@dimen/day_text_size"/> + android:textSize="@dimen/day_text_size" + tools:text="13:00"/> + android:textSize="@dimen/day_text_size" + tools:text="Event title"/> + android:textSize="@dimen/day_text_size" + tools:text="Event description"/> diff --git a/app/src/main/res/layout/event_list_item_widget.xml b/app/src/main/res/layout/event_list_item_widget.xml index 902946942..16b0a827e 100644 --- a/app/src/main/res/layout/event_list_item_widget.xml +++ b/app/src/main/res/layout/event_list_item_widget.xml @@ -11,8 +11,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/activity_margin" - tools:text="13:00" - android:textSize="@dimen/day_text_size"/> + android:textSize="@dimen/day_text_size" + tools:text="13:00"/> + android:textSize="@dimen/day_text_size" + tools:text="Event title"/> + android:textSize="@dimen/day_text_size" + tools:text="Event description"/>