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

Commit 4786c76c authored by Nishith Khanna's avatar Nishith Khanna
Browse files

Merge branch 'epic34-s-app_redesign' into 'v1-s' 

Updater: Redesign app according to our palette

See merge request !76
parents 776e8c38 2f969101

Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ android_app { 
        "androidx.localbroadcastmanager_localbroadcastmanager",

        "androidx.preference_preference",

        "androidx.recyclerview_recyclerview",

        "elib",

    ],



    platform_apis: true,

res/layout/activity_updates.xml

+13 −4
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
        android:fitsSystemWindows="true"

        android:outlineAmbientShadowColor="@android:color/transparent"

        android:outlineSpotShadowColor="@android:color/transparent"

        android:background="?android:attr/colorPrimary"

        android:background="@color/toolbar_collapsed"

        android:theme="@style/Theme.CollapsingToolbar.Settings">



        <com.google.android.material.appbar.CollapsingToolbarLayout
@@ -46,14 +46,24 @@ 
                android:paddingStart="16dp"

                app:layout_collapseMode="parallax">



                <TextView

                    android:id="@+id/header_current_version"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:paddingBottom="24dp"

                    android:text="Current version:"

                    android:textColor="?android:attr/textColorPrimary"

                    android:textSize="16sp" />



                <TextView

                    android:id="@+id/header_title"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:fontFamily="sans-serif-light"

                    android:paddingBottom="16dp"

                    android:paddingBottom="24dp"

                    android:layout_below="@id/header_current_version"

                    android:textColor="?android:attr/textColorPrimary"

                    android:textSize="56sp" />

                    android:textSize="30sp" />



                <TextView

                    android:id="@+id/header_build_version"
@@ -76,7 +86,6 @@ 
                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:layout_below="@id/header_build_date"

                    android:layout_marginTop="8dp"

                    android:textColor="?android:attr/textColorPrimary"

                    android:textSize="12sp" />

            </RelativeLayout>

res/values-night/colors.xml

+0 −4
Original line number Diff line number Diff line
@@ -2,9 +2,5 @@ 
<resources>

    <color name="theme_primary">#212121</color>

    <color name="theme_primary_dark">#1c1c1c</color>

    <color name="theme_accent">@*android:color/accent_device_default_dark</color>

    <color name="background">@*android:color/system_neutral1_800</color>

    <color name="toolbar_collapsed">@android:color/system_neutral1_700</color>



    <color name="inverted">#f5f5f5</color>

</resources>

res/values/colors.xml

+3 −3
Original line number Diff line number Diff line
@@ -2,9 +2,9 @@ 
<resources>

    <color name="theme_primary">#f5f5f5</color>

    <color name="theme_primary_dark">#e0e0e0</color>

    <color name="theme_accent">@*android:color/accent_device_default_light</color>

    <color name="background">@*android:color/system_neutral1_0</color>

    <color name="toolbar_collapsed">@android:color/system_neutral1_100</color>

    <color name="theme_accent">@color/e_accent</color>

    <color name="background">@color/e_background_variant</color>

    <color name="toolbar_collapsed">@color/e_action_bar</color>

    <color name="tv_background">#FF0E0E0F</color>

    <color name="tv_card_background">#222222</color>

res/values/strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -170,4 +170,7 @@ 


    <!-- /e/ info dialog-->

    <string name="info_dialog_message_e">/e/OS updates are full installation packages. That means you can always install only the latest update, even if you skipped some in between!</string>



    <!-- /e/ brand changes-->

    <string name="header_title_text_e">/e/OS\n%1$s</string>

</resources>