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

Commit 7d8a0337 authored by Nick Ning's avatar Nick Ning
Browse files

Refactor common dream complication attributes in style. 

Common dream complication view attributes had been defined in multiple places, e.g. clock subtitle widgets all have the same font size but were defined many times in multiple places. Refactored to a single place such that other similar complication entries such as AQI could be added using the same style.

Bug: 224784347
Test: manual
Change-Id: Id1efa1a7ea3add90a1721602a42a2fab367f9ffe
parent 24c45b96

packages/SystemUI/res/layout/dream_overlay_complication_clock_date.xml

+2 −7
Original line number Diff line number Diff line
@@ -17,13 +17,8 @@ 
<TextClock

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

    android:id="@+id/date_view"

    style="@style/clock_subtitle"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:paddingHorizontal="@dimen/dream_overlay_complication_shadow_padding"

    android:gravity="center_horizontal"

    android:textColor="@android:color/white"

    android:shadowColor="@color/keyguard_shadow_color"

    android:shadowRadius="?attr/shadowRadius"

    android:format12Hour="EEE, MMM d"

    android:format24Hour="EEE, MMM d"

    android:textSize="@dimen/dream_overlay_complication_clock_date_text_size"/>
 
    android:format24Hour="EEE, MMM d"/>

packages/SystemUI/res/layout/dream_overlay_complication_weather.xml

+2 −6
Original line number Diff line number Diff line
@@ -17,10 +17,6 @@ 
<TextView

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

    android:id="@+id/weather_view"

    style="@style/clock_subtitle"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:paddingHorizontal="@dimen/dream_overlay_complication_shadow_padding"

    android:textColor="@android:color/white"

    android:shadowColor="@color/keyguard_shadow_color"

    android:shadowRadius="?attr/shadowRadius"

    android:textSize="@dimen/dream_overlay_complication_weather_text_size"/>
 
    android:layout_height="wrap_content" />

packages/SystemUI/res/values/dimens.xml

+1 −2
Original line number Diff line number Diff line
@@ -1382,8 +1382,7 @@ 


    <!-- Dream overlay complications related dimensions -->

    <dimen name="dream_overlay_complication_clock_time_text_size">72sp</dimen>

    <dimen name="dream_overlay_complication_clock_date_text_size">18sp</dimen>

    <dimen name="dream_overlay_complication_weather_text_size">18sp</dimen>

    <dimen name="dream_overlay_complication_clock_subtitle_text_size">18sp</dimen>

    <dimen name="dream_overlay_complication_preview_text_size">36sp</dimen>

    <dimen name="dream_overlay_complication_preview_icon_padding">28dp</dimen>

    <dimen name="dream_overlay_complication_shadow_padding">2dp</dimen>

packages/SystemUI/res/values/styles.xml

+14 −0
Original line number Diff line number Diff line
@@ -1133,4 +1133,18 @@ 
        <item name="android:textSize">14sp</item>

        <item name="android:textColor">?android:attr/textColorSecondary</item>

    </style>



    <!-- Dream Overlay Complication UI styles -->

    <style name="clock_subtitle">

        <item name="android:textSize">@dimen/dream_overlay_complication_clock_subtitle_text_size

        </item>

        <item name="android:paddingHorizontal">@dimen/dream_overlay_complication_shadow_padding

        </item>

        <item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>

        <item name="android:textColor">@android:color/white</item>

        <item name="android:gravity">center_horizontal</item>

        <item name="android:ellipsize">none</item>

        <item name="android:shadowColor">@color/keyguard_shadow_color</item>

        <item name="android:shadowRadius">?attr/shadowRadius</item>

    </style>

</resources>