Skip to content

Commit 81e93ca

Browse files
committed
#154 Horizontal lines (separators) are now above Day headers, not below them
1 parent c72380a commit 81e93ca

File tree

5 files changed

+24
-24
lines changed

5 files changed

+24
-24
lines changed

app/src/main/res/layout/day_header_center.xml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,18 @@
1111
android:paddingBottom="@dimen/entry_bottom_padding">
1212

1313
<TextView
14-
android:id="@+id/day_header_title"
15-
style="@style/DayHeaderTitle"
14+
android:id="@+id/day_header_separator"
15+
style="@style/DayHeaderSeparator"
1616
android:layout_width="fill_parent"
17-
android:layout_height="fill_parent"
18-
android:gravity="center"
17+
android:layout_height="1dp"
1918
tools:ignore="SelectableText" />
2019

2120
<TextView
22-
android:id="@+id/day_header_separator"
23-
style="@style/DayHeaderSeparator"
21+
android:id="@+id/day_header_title"
22+
style="@style/DayHeaderTitle"
2423
android:layout_width="fill_parent"
25-
android:layout_height="1dp"
24+
android:layout_height="fill_parent"
25+
android:gravity="center"
2626
tools:ignore="SelectableText" />
2727

2828
</LinearLayout>

app/src/main/res/layout/day_header_left.xml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,18 @@
1111
android:paddingBottom="@dimen/entry_bottom_padding">
1212

1313
<TextView
14-
android:id="@+id/day_header_title"
15-
style="@style/DayHeaderTitle"
14+
android:id="@+id/day_header_separator"
15+
style="@style/DayHeaderSeparator"
1616
android:layout_width="fill_parent"
17-
android:layout_height="fill_parent"
18-
android:gravity="left"
17+
android:layout_height="1dp"
1918
tools:ignore="SelectableText" />
2019

2120
<TextView
22-
android:id="@+id/day_header_separator"
23-
style="@style/DayHeaderSeparator"
21+
android:id="@+id/day_header_title"
22+
style="@style/DayHeaderTitle"
2423
android:layout_width="fill_parent"
25-
android:layout_height="1dp"
24+
android:layout_height="fill_parent"
25+
android:gravity="left"
2626
tools:ignore="SelectableText" />
2727

2828
</LinearLayout>

app/src/main/res/layout/day_header_right.xml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,18 @@
1111
android:paddingBottom="@dimen/entry_bottom_padding">
1212

1313
<TextView
14-
android:id="@+id/day_header_title"
15-
style="@style/DayHeaderTitle"
14+
android:id="@+id/day_header_separator"
15+
style="@style/DayHeaderSeparator"
1616
android:layout_width="fill_parent"
17-
android:layout_height="fill_parent"
18-
android:gravity="right"
17+
android:layout_height="1dp"
1918
tools:ignore="SelectableText" />
2019

2120
<TextView
22-
android:id="@+id/day_header_separator"
23-
style="@style/DayHeaderSeparator"
21+
android:id="@+id/day_header_title"
22+
style="@style/DayHeaderTitle"
2423
android:layout_width="fill_parent"
25-
android:layout_height="1dp"
24+
android:layout_height="fill_parent"
25+
android:gravity="right"
2626
tools:ignore="SelectableText" />
2727

2828
</LinearLayout>

app/src/main/res/values/dimens.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
<dimen name="event_time_width">80dp</dimen>
1313
<dimen name="entry_bottom_padding">2dp</dimen>
1414
<dimen name="day_header_padding_left">12dp</dimen>
15-
<dimen name="day_header_padding_top">12dp</dimen>
15+
<dimen name="day_header_padding_top">2dp</dimen>
1616
<dimen name="day_header_padding_right">10dp</dimen>
17-
<dimen name="day_header_padding_bottom">2dp</dimen>
17+
<dimen name="day_header_padding_bottom">12dp</dimen>
1818
<!-- Default screen margins, per the Android Design guidelines. -->
1919
<dimen name="activity_horizontal_margin">16dp</dimen>
2020
<dimen name="activity_vertical_margin">16dp</dimen>

app/src/main/res/values/styles.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
<style name="DayHeaderTitle" parent="android:Widget.Holo.TextView">
1616
<item name="android:ellipsize">marquee</item>
17-
<item name="android:gravity">right|bottom</item>
17+
<item name="android:gravity">right|top</item>
1818
<item name="android:paddingBottom">@dimen/day_header_padding_bottom</item>
1919
<item name="android:paddingRight">@dimen/day_header_padding_right</item>
2020
<item name="android:paddingTop">@dimen/day_header_padding_top</item>

0 commit comments

Comments
 (0)