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

Commit 2e99f5ce authored by Nishith Khanna's avatar Nishith Khanna
Browse files

Merge branch '288-update_widget_ui' into 'master' 

Update widgets ui to make it consistent with other widgets

See merge request !88
parents 521a55ce 2b61f865

app/src/main/res/drawable/ic_search_white_alpha_24dp.xml

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
        android:height="18dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0"

        android:tint="?widgetPrimaryTextColor">

        android:tint="?widgetSearchIconColor">

    <path

        android:fillColor="#DEFFFFFF"

        android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>

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

+2 −2
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ 
                        android:layout_width="wrap_content"

                        android:layout_height="wrap_content"

                        android:layout_gravity="center_vertical"

                        android:textColor="?widgetSecondaryTextColor"

                        android:textColor="?widgetPrimaryTextColor"

                        android:textSize="16sp" />



                    <TextView
@@ -105,7 +105,7 @@ 
                        android:layout_width="wrap_content"

                        android:layout_height="wrap_content"

                        android:layout_gravity="center_vertical"

                        android:textColor="?widgetSecondaryTextColor"

                        android:textColor="?widgetPrimaryTextColor"

                        android:textSize="14sp" />

                </LinearLayout>

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

+1 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ 
    <attr name="widgetPrimaryTextColor" format="color" />

    <attr name="widgetSecondaryTextColor" format="color" />

    <attr name="widgetSettingsIconColor" format="color" />

    <attr name="widgetSearchIconColor" format="color" />

    <attr name="searchBarTheme" format="reference" />



</resources>

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

+4 −2
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
        <item name="widgetPrimaryTextColor">#DEFFFFFF</item>

        <item name="widgetSecondaryTextColor">#99FFFFFF</item>

        <item name="widgetSettingsIconColor">?widgetPrimaryTextColor</item>

        <item name="widgetSearchIconColor">#DEFFFFFF</item>

    </style>



    <style name="HomeScreenTheme.DarkText" parent="BaseHomeScreenTheme">
@@ -36,9 +37,10 @@ 
        <item name="workspaceTextColor">@color/app_label_color_dark</item>

        <item name="dotOnColor">@color/dot_on_color_dark</item>

        <item name="dotOffColor">@color/dot_off_color_dark</item>

        <item name="widgetPrimaryTextColor">#BD000000</item>

        <item name="widgetSecondaryTextColor">#BD000000</item>

        <item name="widgetPrimaryTextColor">#99000000</item>

        <item name="widgetSecondaryTextColor">#61000000</item>

        <item name="widgetSettingsIconColor">#61000000</item>

        <item name="widgetSearchIconColor">#BD000000</item>

    </style>



    <style name="label_shadow">