Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 038d3ae1 authored by Selim Cinek's avatar Selim Cinek
Browse files

Finetunes parts of the notification templates 

The header wasn’t positioned perfectly before

Change-Id: If3c0ea0eb7da7307d1bef7cd8036d4118243a1f1
parent d222ed60

core/res/res/layout/notification_template_header.xml

+18 −10
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
    android:clipChildren="false"

    android:layout_gravity="start|top"

    android:gravity="center_vertical"

    android:paddingTop="5dp"

    android:paddingBottom="16dp"

    android:paddingStart="@dimen/notification_content_margin_start"

    android:paddingEnd="16dp">
@@ -49,7 +50,7 @@ 
        android:layout_height="wrap_content"

        android:textAppearance="@style/TextAppearance.Material.Notification.Info"

        android:layout_marginStart="3dp"

        android:layout_marginEnd="4dp"

        android:layout_marginEnd="2dp"

        android:singleLine="true"

        />

    <TextView
@@ -57,7 +58,8 @@ 
        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:textAppearance="@style/TextAppearance.Material.Notification.Info"

        android:layout_marginEnd="4dp"

        android:layout_marginStart="2dp"

        android:layout_marginEnd="2dp"

        android:text="@string/notification_header_divider_symbol"

        android:visibility="gone"/>

    <TextView
@@ -65,7 +67,8 @@ 
        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:textAppearance="@style/TextAppearance.Material.Notification.Info"

        android:layout_marginEnd="4dp"

        android:layout_marginStart="2dp"

        android:layout_marginEnd="2dp"

        android:visibility="gone"

        android:singleLine="true"/>

    <TextView
@@ -73,7 +76,8 @@ 
        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:textAppearance="@style/TextAppearance.Material.Notification.Info"

        android:layout_marginEnd="4dp"

        android:layout_marginStart="2dp"

        android:layout_marginEnd="2dp"

        android:text="@string/notification_header_divider_symbol"

        android:singleLine="true"

        android:visibility="gone"/>
@@ -82,16 +86,18 @@ 
        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:textAppearance="@style/TextAppearance.Material.Notification.Info"

        android:layout_marginEnd="4dp"

        android:layout_marginStart="2dp"

        android:layout_marginEnd="2dp"

        android:visibility="gone"

        android:maxWidth="60dp"

        android:maxWidth="72dp"

        android:singleLine="true"/>

    <TextView

        android:id="@+id/time_divider"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:textAppearance="@style/TextAppearance.Material.Notification.Info"

        android:layout_marginEnd="4dp"

        android:layout_marginStart="2dp"

        android:layout_marginEnd="2dp"

        android:text="@string/notification_header_divider_symbol"

        android:singleLine="true"

        android:visibility="gone"/>
@@ -99,7 +105,8 @@ 
        android:id="@+id/time"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginEnd="4dp"

        android:layout_marginStart="2dp"

        android:layout_marginEnd="2dp"

        android:layout="@layout/notification_template_part_time"

        android:visibility="gone"

        />
@@ -107,7 +114,8 @@ 
        android:id="@+id/chronometer"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginEnd="4dp"

        android:layout_marginStart="2dp"

        android:layout_marginEnd="2dp"

        android:layout="@layout/notification_template_part_chronometer"

        android:visibility="gone"

        />
@@ -116,7 +124,7 @@ 
        android:background="@null"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="end|center_vertical"

        android:paddingTop="1dp"

        android:src="@drawable/ic_arrow_drop_down"

        android:visibility="gone"

        />

core/res/res/layout/notification_template_material_inbox.xml

+3 −1
Original line number Diff line number Diff line
@@ -34,7 +34,9 @@ 
        android:clipToPadding="false"

        android:orientation="vertical"

        >

        <include layout="@layout/notification_template_part_line1" />

        <include layout="@layout/notification_template_part_line1"

            android:layout_width="match_parent"

            android:layout_height="wrap_content" />

        <include layout="@layout/notification_template_progress"

            android:layout_width="match_parent"

            android:layout_height="15dp"

core/res/res/layout/notification_template_part_line1.xml

+2 −2
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:orientation="horizontal"

    android:layout_marginBottom="1dp"

    >

    <TextView android:id="@+id/title"

        android:textAppearance="@style/TextAppearance.Material.Notification.Title"
@@ -31,10 +32,9 @@ 
        />

    <TextView android:id="@+id/text_line_1"

        android:textAppearance="@style/TextAppearance.Material.Notification"

        android:layout_width="0dp"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:gravity="end|bottom"

        android:layout_weight="1"

        android:layout_marginStart="16dp"

        android:singleLine="true"

        android:ellipsize="marquee"