fenix
/
Simple-Calendar
mirror of https://github.com/SimpleMobileTools/Simple-Calendar.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

revert some tools:text to android:text so it actually occupies the space

This commit is contained in:
tibbi 2017-08-22 11:43:24 +02:00
parent 3f31762b3b
commit 1786704213
4 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/kotlin/com/simplemobiletools/calendar/adapters/DayEventsAdapter.kt
View File

@ -47,7 +47,7 @@ class DayEventsAdapter(val activity: SimpleActivity, val mItems: List<Event>, va
allDayString = activity.resources.getString(R.string.all_day) 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 { override fun onActionItemClicked(mode: ActionMode, item: MenuItem): Boolean {
when (item.itemId) { when (item.itemId) {
R.id.cab_share -> shareEvents() R.id.cab_share -> shareEvents()
@ -162,7 +162,7 @@ class DayEventsAdapter(val activity: SimpleActivity, val mItems: List<Event>, va
return itemView return itemView
} }
fun viewClicked(multiSelector: MultiSelector, event: Event, pos: Int) { private fun viewClicked(multiSelector: MultiSelector, event: Event, pos: Int) {
if (multiSelector.isSelectable) { if (multiSelector.isSelectable) {
val isSelected = multiSelector.selectedPositions.contains(layoutPosition) val isSelected = multiSelector.selectedPositions.contains(layoutPosition)
multiSelector.setSelected(this, !isSelected) multiSelector.setSelected(this, !isSelected)

14
app/src/main/res/layout/event_item_day_view.xml
View File

@ -19,15 +19,15 @@
android:id="@+id/event_item_start" android:id="@+id/event_item_start"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="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"/>
<com.simplemobiletools.commons.views.MyTextView <com.simplemobiletools.commons.views.MyTextView
android:id="@+id/event_item_end" android:id="@+id/event_item_end"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@+id/event_item_start" android:layout_below="@+id/event_item_start"
tools:text="15:00" android:text="15:00"
android:textSize="@dimen/day_text_size"/> android:textSize="@dimen/day_text_size"/>
<com.simplemobiletools.commons.views.MyTextView <com.simplemobiletools.commons.views.MyTextView
@ -39,8 +39,8 @@
android:ellipsize="end" android:ellipsize="end"
android:maxLines="1" android:maxLines="1"
android:paddingRight="@dimen/activity_margin" android:paddingRight="@dimen/activity_margin"
tools:text="Event title" android:textSize="@dimen/day_text_size"
android:textSize="@dimen/day_text_size"/> tools:text="Event title"/>
<com.simplemobiletools.commons.views.MyTextView <com.simplemobiletools.commons.views.MyTextView
android:id="@+id/event_item_description" android:id="@+id/event_item_description"
@ -53,8 +53,8 @@
android:ellipsize="end" android:ellipsize="end"
android:maxLines="1" android:maxLines="1"
android:paddingRight="@dimen/activity_margin" android:paddingRight="@dimen/activity_margin"
tools:text="Event description" android:textSize="@dimen/day_text_size"
android:textSize="@dimen/day_text_size"/> tools:text="Event description"/>
</RelativeLayout> </RelativeLayout>
</FrameLayout> </FrameLayout>

14
app/src/main/res/layout/event_list_item.xml
View File

@ -22,15 +22,15 @@
android:id="@+id/event_item_start" android:id="@+id/event_item_start"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="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"/>
<com.simplemobiletools.commons.views.MyTextView <com.simplemobiletools.commons.views.MyTextView
android:id="@+id/event_item_end" android:id="@+id/event_item_end"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@+id/event_item_start" android:layout_below="@+id/event_item_start"
tools:text="15:00" android:text="15:00"
android:textSize="@dimen/day_text_size"/> android:textSize="@dimen/day_text_size"/>
<com.simplemobiletools.commons.views.MyTextView <com.simplemobiletools.commons.views.MyTextView
@ -41,8 +41,8 @@
android:layout_toRightOf="@+id/event_item_start" android:layout_toRightOf="@+id/event_item_start"
android:ellipsize="end" android:ellipsize="end"
android:maxLines="1" android:maxLines="1"
tools:text="Event title" android:textSize="@dimen/day_text_size"
android:textSize="@dimen/day_text_size"/> tools:text="Event title"/>
<com.simplemobiletools.commons.views.MyTextView <com.simplemobiletools.commons.views.MyTextView
android:id="@+id/event_item_description" android:id="@+id/event_item_description"
@ -54,8 +54,8 @@
android:alpha=".4" android:alpha=".4"
android:ellipsize="end" android:ellipsize="end"
android:maxLines="1" android:maxLines="1"
tools:text="Event description" android:textSize="@dimen/day_text_size"
android:textSize="@dimen/day_text_size"/> tools:text="Event description"/>
</RelativeLayout> </RelativeLayout>
</FrameLayout> </FrameLayout>

14
app/src/main/res/layout/event_list_item_widget.xml
View File

@ -11,8 +11,8 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/activity_margin" 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"/>
<TextView <TextView
android:id="@+id/event_item_end" android:id="@+id/event_item_end"
@ -20,7 +20,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@+id/event_item_start" android:layout_below="@+id/event_item_start"
android:layout_marginLeft="@dimen/activity_margin" android:layout_marginLeft="@dimen/activity_margin"
tools:text="15:00" android:text="15:00"
android:textSize="@dimen/day_text_size"/> android:textSize="@dimen/day_text_size"/>
<TextView <TextView
@ -32,8 +32,8 @@
android:ellipsize="end" android:ellipsize="end"
android:maxLines="1" android:maxLines="1"
android:paddingRight="@dimen/activity_margin" android:paddingRight="@dimen/activity_margin"
tools:text="Event title" android:textSize="@dimen/day_text_size"
android:textSize="@dimen/day_text_size"/> tools:text="Event title"/>
<TextView <TextView
android:id="@+id/event_item_description" android:id="@+id/event_item_description"
@ -46,7 +46,7 @@
android:ellipsize="end" android:ellipsize="end"
android:maxLines="1" android:maxLines="1"
android:paddingRight="@dimen/activity_margin" android:paddingRight="@dimen/activity_margin"
tools:text="Event description" android:textSize="@dimen/day_text_size"
android:textSize="@dimen/day_text_size"/> tools:text="Event description"/>
</RelativeLayout> </RelativeLayout>