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

Commit 535db3e0 authored by Amin Shaikh's avatar Amin Shaikh
Browse files

Various theme picker fixes. 

- Add Previous button to custom flow
- Seed custom flow with the currently applied bundled theme
- Use add drawable icon instead of text
- Add padding between checkbox and "Add current wallpaper"
- Show ripple background on "Tap to edit"

Fixes: 130763331
Fixes: 130753131
Fixes: 130761402
Fixes: 130759176
Bug: 130759508
Test: visual
Change-Id: Ia82344befe8ac45489646d840453a71e31c83eae
parent 07c96496

res/drawable/ic_add_24px.xml

0 → 100644
+10 −0
Original line number Diff line number Diff line 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="24dp"

    android:height="24dp"

    android:viewportWidth="24"

    android:viewportHeight="24">

  <path

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

      android:pathData="M20,13h-7v7h-2v-7H4v-2h7V4h2v7h7V13z"/>

</vector>

res/layout/activity_custom_theme.xml

+7 −0
Original line number Diff line number Diff line
@@ -34,6 +34,13 @@ 
        android:layout_width="match_parent"

        android:layout_height="@dimen/custom_theme_nav_height"

        android:layout_marginHorizontal="12dp">

        <Button

            android:id="@+id/previous_button"

            style="@style/ActionSecondaryButton"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_gravity="start|center_vertical"

            android:text="@string/custom_theme_previous"/>

        <Button

            android:id="@+id/next_button"

            style="@style/ActionPrimaryButton"

res/layout/custom_theme_option.xml

+3 −5
Original line number Diff line number Diff line
@@ -34,13 +34,11 @@ 
        android:paddingHorizontal="@dimen/option_tile_padding_horizontal"

        android:paddingVertical="@dimen/option_tile_padding_vertical"

        android:background="@drawable/option_border">

        <TextView

        <ImageView

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_gravity="center"

            android:textSize="@dimen/theme_option_add_size"

            android:textAlignment="center"

            android:textColor="?android:colorAccent"

            android:text="@string/add_custom_theme"/>

            android:src="@drawable/ic_add_24px"

            android:tint="?android:attr/colorAccent" />

    </FrameLayout>

</LinearLayout>

res/layout/fragment_theme_picker.xml

+1 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ 
                android:layout_height="wrap_content"

                android:layout_alignParentStart="true"

                android:layout_centerVertical="true"

                android:paddingLeft="4dp"

                android:minHeight="@dimen/min_taptarget_height"

                android:text="@string/keep_my_wallpaper"/>

            <Button

res/layout/theme_preview_card.xml

+1 −2
Original line number Diff line number Diff line
@@ -65,10 +65,9 @@ 
                android:layout_gravity="center_horizontal"

                android:drawableStart="@drawable/ic_tune_24px"

                android:drawablePadding="8dp"

                android:drawableTint="?android:colorAccent"

                android:gravity="center"

                android:text="@string/edit_custom_theme_lbl"

                android:textAppearance="@style/EditLabelTextAppearance"

                style="@style/EditLabelStyle"

                android:visibility="invisible"/>

        </LinearLayout>

    </FrameLayout>