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

Commit ce546290 authored by Stefan Niedermann's avatar Stefan Niedermann
Browse files

Upgrade note list widget style

parent ba4ac3e7

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

+14 −9
Original line number Diff line number Diff line
@@ -3,37 +3,42 @@ 
    xmlns:app="http://schemas.android.com/apk/res-auto"

    xmlns:tools="http://schemas.android.com/tools"

    android:id="@+id/widget_note_list_entry"

    android:layout_height="wrap_content"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:orientation="horizontal"

    android:padding="@dimen/widget_note_list_padding">

    android:paddingStart="@dimen/spacer_1hx"

    android:paddingLeft="@dimen/spacer_1hx"

    android:paddingTop="@dimen/spacer_1x"

    android:paddingEnd="@dimen/spacer_1hx"

    android:paddingRight="@dimen/spacer_1hx"

    android:paddingBottom="@dimen/spacer_1x">



    <ImageView

        android:id="@+id/widget_entry_fav_icon"

        android:layout_width="@dimen/widget_note_list_fav_icon_width"

        android:layout_height="@dimen/widget_note_list_fav_icon_height"

        android:layout_gravity="center_vertical"

        android:contentDescription="@string/widget_entry_fav_contentDescription"

        android:foregroundGravity="center_vertical"

        android:paddingStart="@dimen/widget_note_list_inner_padding"

        android:paddingLeft="@dimen/widget_note_list_inner_padding"

        android:paddingEnd="@dimen/widget_note_list_outer_padding"

        android:paddingRight="@dimen/widget_note_list_outer_padding"

        app:srcCompat="@drawable/ic_star_yellow_24dp"

        android:contentDescription="@string/widget_entry_fav_contentDescription" />

        app:srcCompat="@drawable/ic_star_yellow_24dp" />



    <TextView

        android:id="@+id/widget_entry_content_tv"

        android:layout_width="0dp"

        android:layout_height="match_parent"

        android:layout_gravity="center_vertical"

        android:layout_weight="1"

        android:ellipsize="end"

        android:lines="1"

        android:paddingStart="@dimen/widget_note_list_inner_padding"

        android:paddingLeft="@dimen/widget_note_list_inner_padding"

        android:paddingEnd="@dimen/widget_note_list_outer_padding"

        android:paddingRight="@dimen/widget_note_list_outer_padding"

        android:layout_gravity="center_vertical"

        android:layout_weight="1"

        android:textColor="@color/widget_fg_default"

        android:ellipsize="end"

        android:lines="1"

        tools:text="@string/app_name_long" />



</LinearLayout>

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

+15 −9
Original line number Diff line number Diff line
@@ -3,37 +3,43 @@ 
    xmlns:app="http://schemas.android.com/apk/res-auto"

    xmlns:tools="http://schemas.android.com/tools"

    android:id="@+id/widget_note_list_entry_dark"

    android:layout_height="wrap_content"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:orientation="horizontal"

    android:padding="@dimen/widget_note_list_padding">

    android:paddingStart="@dimen/spacer_1hx"

    android:paddingLeft="@dimen/spacer_1hx"

    android:paddingTop="@dimen/spacer_1x"

    android:paddingEnd="@dimen/spacer_1hx"

    android:paddingRight="@dimen/spacer_1hx"

    android:paddingBottom="@dimen/spacer_1x"

    tools:background="@color/widget_background_dark_theme">



    <ImageView

        android:id="@+id/widget_entry_fav_icon_dark"

        android:layout_width="@dimen/widget_note_list_fav_icon_width"

        android:layout_height="@dimen/widget_note_list_fav_icon_height"

        android:layout_gravity="center_vertical"

        android:contentDescription="@string/widget_entry_fav_contentDescription"

        android:foregroundGravity="center_vertical"

        android:paddingStart="@dimen/widget_note_list_inner_padding"

        android:paddingLeft="@dimen/widget_note_list_inner_padding"

        android:paddingEnd="@dimen/widget_note_list_outer_padding"

        android:paddingRight="@dimen/widget_note_list_outer_padding"

        app:srcCompat="@drawable/ic_star_yellow_24dp"

        android:contentDescription="@string/widget_entry_fav_contentDescription" />

        app:srcCompat="@drawable/ic_star_yellow_24dp" />



    <TextView

        android:id="@+id/widget_entry_content_tv_dark"

        android:layout_width="0dp"

        android:layout_height="match_parent"

        android:layout_gravity="center_vertical"

        android:layout_weight="1"

        android:ellipsize="end"

        android:lines="1"

        android:paddingStart="@dimen/widget_note_list_inner_padding"

        android:paddingLeft="@dimen/widget_note_list_inner_padding"

        android:paddingEnd="@dimen/widget_note_list_outer_padding"

        android:paddingRight="@dimen/widget_note_list_outer_padding"

        android:layout_gravity="center_vertical"

        android:layout_weight="1"

        android:textColor="@color/fg_default_dark_theme"

        android:lines="1"

        android:ellipsize="end"

        tools:text="@string/app_name_long" />



</LinearLayout>

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

+20 −19
Original line number Diff line number Diff line
@@ -10,53 +10,54 @@ 
    <RelativeLayout

        android:layout_width="match_parent"

        android:layout_height="@dimen/widget_note_list_header_height"

        android:background="@color/primary"

        android:background="@drawable/ic_launcher_background"

        android:padding="@dimen/widget_note_list_hdr_padding">



        <ImageView

            android:id="@+id/widget_note_header_icon"

            android:layout_width="@dimen/widget_note_list_icon_width"

            android:layout_height="match_parent"

            android:src="@mipmap/ic_launcher"

            android:layout_alignParentLeft="true"

            android:layout_alignParentStart="true"

            android:layout_alignParentLeft="true"

            android:layout_alignParentBottom="true"

            android:contentDescription="@string/widget_app_launcher_contentDescription"

            android:paddingStart="@dimen/widget_note_list_outer_padding"

            android:paddingEnd="@dimen/widget_note_list_inner_padding"

            android:paddingLeft="@dimen/widget_note_list_outer_padding"

            android:paddingEnd="@dimen/widget_note_list_inner_padding"

            android:paddingRight="@dimen/widget_note_list_inner_padding"

            android:contentDescription="@string/widget_app_launcher_contentDescription" />

            android:scaleX="2"

            android:scaleY="2"

            android:src="@drawable/ic_launcher_foreground" />



        <TextView

            android:id="@+id/widget_note_list_title_tv"

            android:layout_width="wrap_content"

            android:layout_height="match_parent"

            android:textColor="@color/widget_fg_contrast"

            android:textStyle="bold"

            android:textSize="18sp"

            android:layout_toRightOf="@id/widget_note_header_icon"

            android:layout_toEndOf="@id/widget_note_header_icon"

            android:layout_toLeftOf="@id/widget_note_list_create_icon"

            android:layout_toStartOf="@id/widget_note_list_create_icon"

            android:layout_toLeftOf="@id/widget_note_list_create_icon"

            android:layout_toEndOf="@id/widget_note_header_icon"

            android:layout_toRightOf="@id/widget_note_header_icon"

            android:gravity="center_vertical"

            android:paddingStart="@dimen/widget_note_list_outer_padding"

            android:paddingEnd="@dimen/widget_note_list_inner_padding"

            android:paddingLeft="@dimen/widget_note_list_outer_padding"

            android:paddingEnd="@dimen/widget_note_list_inner_padding"

            android:paddingRight="@dimen/widget_note_list_inner_padding"

            android:textColor="@color/widget_fg_contrast"

            android:textSize="18sp"

            tools:text="@string/app_name" />



        <ImageView

            android:id="@+id/widget_note_list_create_icon"

            android:layout_width="@dimen/widget_note_list_icon_width"

            android:layout_height="match_parent"

            android:src="@drawable/ic_add_white_24dp"

            android:layout_alignParentRight="true"

            android:layout_alignParentEnd="true"

            android:layout_alignParentRight="true"

            android:contentDescription="@string/widget_create_note"

            android:paddingStart="@dimen/widget_note_list_inner_padding"

            android:paddingEnd="@dimen/widget_note_list_outer_padding"

            android:paddingLeft="@dimen/widget_note_list_inner_padding"

            android:paddingEnd="@dimen/widget_note_list_outer_padding"

            android:paddingRight="@dimen/widget_note_list_outer_padding"

            android:contentDescription="@string/widget_create_note" />

            android:src="@drawable/ic_add_white_24dp" />



    </RelativeLayout>

    <!-- End header -->

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

+23 −21
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:tools="http://schemas.android.com/tools"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    xmlns:tools="http://schemas.android.com/tools"

    android:background="@color/widget_background_dark_theme"

    android:orientation="vertical"

    android:background="@color/widget_background_dark_theme">

    tools:background="@null">



    <!-- Widget header -->

    <RelativeLayout

        android:layout_width="match_parent"

        android:layout_height="@dimen/widget_note_list_header_height"

        android:background="@color/primary"

        android:background="@drawable/ic_launcher_background"

        android:padding="@dimen/widget_note_list_hdr_padding">



        <ImageView

            android:id="@+id/widget_note_header_icon_dark"

            android:layout_width="@dimen/widget_note_list_icon_width"

            android:layout_height="match_parent"

            android:src="@mipmap/ic_launcher"

            android:layout_alignParentLeft="true"

            android:layout_alignParentStart="true"

            android:layout_alignParentLeft="true"

            android:layout_alignParentBottom="true"

            android:paddingStart="4dp"

            android:contentDescription="@string/widget_app_launcher_contentDescription"

            android:paddingStart="@dimen/widget_note_list_outer_padding"

            android:paddingLeft="@dimen/widget_note_list_outer_padding"

            android:paddingEnd="@dimen/widget_note_list_inner_padding"

            android:paddingLeft="4dp"

            android:paddingRight="@dimen/widget_note_list_inner_padding"

            android:contentDescription="@string/widget_app_launcher_contentDescription" />

            android:scaleX="2"

            android:scaleY="2"

            android:src="@drawable/ic_launcher_foreground" />



        <TextView

            android:id="@+id/widget_note_list_title_tv_dark"

            android:layout_width="match_parent"

            android:id="@+id/widget_note_list_title_tv"

            android:layout_width="wrap_content"

            android:layout_height="match_parent"

            android:textColor="@color/fg_default_dark_theme"

            android:textStyle="bold"

            android:textSize="18sp"

            android:layout_toRightOf="@id/widget_note_header_icon_dark"

            android:layout_toEndOf="@id/widget_note_header_icon_dark"

            android:layout_toStartOf="@id/widget_note_list_create_icon_dark"

            android:layout_toLeftOf="@id/widget_note_list_create_icon_dark"

            android:layout_toEndOf="@id/widget_note_header_icon_dark"

            android:layout_toRightOf="@id/widget_note_header_icon_dark"

            android:gravity="center_vertical"

            android:paddingStart="@dimen/widget_note_list_outer_padding"

            android:paddingEnd="@dimen/widget_note_list_inner_padding"

            android:paddingLeft="@dimen/widget_note_list_outer_padding"

            android:paddingEnd="@dimen/widget_note_list_inner_padding"

            android:paddingRight="@dimen/widget_note_list_inner_padding"

            android:textColor="@color/widget_fg_contrast"

            android:textSize="18sp"

            tools:text="@string/app_name" />



        <ImageView

            android:id="@+id/widget_note_list_create_icon_dark"

            android:layout_width="@dimen/widget_note_list_icon_width"

            android:layout_height="match_parent"

            android:src="@drawable/ic_add_white_24dp"

            android:layout_alignParentRight="true"

            android:layout_alignParentEnd="true"

            android:layout_alignParentRight="true"

            android:contentDescription="@string/widget_create_note"

            android:paddingStart="@dimen/widget_note_list_inner_padding"

            android:paddingEnd="@dimen/widget_note_list_outer_padding"

            android:paddingLeft="@dimen/widget_note_list_inner_padding"

            android:paddingEnd="@dimen/widget_note_list_outer_padding"

            android:paddingRight="@dimen/widget_note_list_outer_padding"

            android:contentDescription="@string/widget_create_note" />

            android:src="@drawable/ic_add_white_24dp" />



    </RelativeLayout>

    <!-- End header -->