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

Unverified Commit 4a3bd3c2 authored by Michael Bestas's avatar Michael Bestas Committed by LuK1337
Browse files

fixup! ThemePicker: Bring back fonts, icon pack, shape customization

Change-Id: Icfe73018be802246649b7aa3f3cafcf46948c979
parent 27ceeeb3
Loading
Loading
Loading
Loading
+55 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
     Copyright (C) 2019 The Android Open Source Project

     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at

          http://www.apache.org/licenses/LICENSE-2.0

     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-->
<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"
    android:layout_gravity="center"
    android:orientation="vertical"
    tools:showIn="@layout/theme_preview_card">
    <TextView
        style="@style/FontCardTitleStyle"
        android:id="@+id/font_card_title"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_gravity="center"
        android:gravity="center_horizontal"
        android:maxLines="1"
        android:text="@string/font_card_title"/>
    <Space
        android:layout_width="match_parent"
        android:layout_height="0dp"
        android:layout_weight="1"/>
    <View
        android:id="@+id/font_card_divider"
        android:layout_width="16dp"
        android:layout_height="2dp"
        android:layout_gravity="center"
        android:background="?android:colorAccent"/>
    <Space
        android:layout_width="match_parent"
        android:layout_height="0dp"
        android:layout_weight="1"/>
    <TextView
        style="@style/FontCardBodyTextStyle"
        android:id="@+id/font_card_body"
        android:layout_height="wrap_content"
        android:layout_gravity="bottom|center_horizontal"
        android:gravity="center_horizontal"
        android:text="@string/font_card_body"/>
</LinearLayout>
 No newline at end of file
+91 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
     Copyright (C) 2019 The Android Open Source Project

     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at

          http://www.apache.org/licenses/LICENSE-2.0

     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-->
<LinearLayout
    xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:layout_gravity="center"
    android:gravity="center_horizontal"
    android:orientation="vertical">
    <LinearLayout
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:gravity="center_horizontal"
        android:orientation="horizontal">
        <ImageView
            android:id="@+id/preview_icon_0"
            android:layout_width="@dimen/preview_theme_icon_size"
            android:layout_height="@dimen/preview_theme_icon_size"
            android:layout_weight="1"
            android:tint="@color/theme_preview_icon_color"/>
        <Space
            android:layout_width="@dimen/preview_theme_icon_size"
            android:layout_height="match_parent"
            android:layout_weight="0" />
        <ImageView
            android:id="@+id/preview_icon_1"
            android:layout_width="@dimen/preview_theme_icon_size"
            android:layout_height="@dimen/preview_theme_icon_size"
            android:layout_weight="1"
            android:tint="@color/theme_preview_icon_color"/>
        <Space
            android:layout_width="@dimen/preview_theme_icon_size"
            android:layout_height="match_parent"
            android:layout_weight="0" />
        <ImageView
            android:id="@+id/preview_icon_2"
            android:layout_width="@dimen/preview_theme_icon_size"
            android:layout_height="@dimen/preview_theme_icon_size"
            android:layout_weight="1"
            android:tint="@color/theme_preview_icon_color"/>
    </LinearLayout>
    <Space
        android:layout_width="match_parent"
        android:layout_height="68dp" />
    <LinearLayout
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:gravity="bottom|center_horizontal"
        android:orientation="horizontal">
        <ImageView
            android:id="@+id/preview_icon_3"
            android:layout_width="@dimen/preview_theme_icon_size"
            android:layout_height="@dimen/preview_theme_icon_size"
            android:layout_weight="1"
            android:tint="@color/theme_preview_icon_color"/>
        <Space
            android:layout_width="@dimen/preview_theme_icon_size"
            android:layout_height="match_parent"
            android:layout_weight="0" />
        <ImageView
            android:id="@+id/preview_icon_4"
            android:layout_width="@dimen/preview_theme_icon_size"
            android:layout_height="@dimen/preview_theme_icon_size"
            android:layout_weight="1"
            android:tint="@color/theme_preview_icon_color"/>
        <Space
            android:layout_width="@dimen/preview_theme_icon_size"
            android:layout_height="match_parent"
            android:layout_weight="0" />
        <ImageView
            android:id="@+id/preview_icon_5"
            android:layout_width="@dimen/preview_theme_icon_size"
            android:layout_height="@dimen/preview_theme_icon_size"
            android:layout_weight="1"
            android:tint="@color/theme_preview_icon_color"/>
    </LinearLayout>
</LinearLayout>
 No newline at end of file
+127 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
     Copyright (C) 2019 The Android Open Source Project

     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at

          http://www.apache.org/licenses/LICENSE-2.0

     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-->
<LinearLayout
    xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:layout_gravity="center"
    android:gravity="center_horizontal"
    android:orientation="vertical">
        <LinearLayout
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:gravity="center_horizontal"
            android:orientation="horizontal">
                <FrameLayout
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:layout_weight="1">
                        <ImageView
                            android:id="@+id/shape_preview_icon_0"
                            android:layout_width="@dimen/preview_theme_shape_size"
                            android:layout_height="@dimen/preview_theme_shape_size"
                            android:layout_gravity="center_horizontal"
                            android:layout_margin="4dp"
                            android:elevation="4dp"/>
                </FrameLayout>
                <Space
                    android:layout_width="@dimen/preview_theme_shape_size"
                    android:layout_height="match_parent"
                    android:layout_weight="0" />
                <FrameLayout
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:layout_weight="1">
                        <ImageView
                            android:id="@+id/shape_preview_icon_1"
                            android:layout_width="@dimen/preview_theme_shape_size"
                            android:layout_height="@dimen/preview_theme_shape_size"
                            android:layout_gravity="center_horizontal"
                            android:layout_margin="4dp"
                            android:elevation="4dp"/>
                </FrameLayout>
                <Space
                    android:layout_width="@dimen/preview_theme_shape_size"
                    android:layout_height="match_parent"
                    android:layout_weight="0" />
                <FrameLayout
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:layout_weight="1">
                        <ImageView
                            android:id="@+id/shape_preview_icon_2"
                            android:layout_width="@dimen/preview_theme_shape_size"
                            android:layout_height="@dimen/preview_theme_shape_size"
                            android:layout_gravity="center_horizontal"
                            android:layout_margin="4dp"
                            android:elevation="4dp"/>
                </FrameLayout>
        </LinearLayout>
        <Space
            android:layout_width="match_parent"
            android:layout_height="60dp" />
        <LinearLayout
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:gravity="bottom|center_horizontal"
            android:orientation="horizontal">
                <FrameLayout
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:layout_weight="1">
                        <ImageView
                            android:id="@+id/shape_preview_icon_3"
                            android:layout_width="@dimen/preview_theme_shape_size"
                            android:layout_height="@dimen/preview_theme_shape_size"
                            android:layout_gravity="center_horizontal"
                            android:layout_margin="4dp"
                            android:elevation="4dp"/>
                </FrameLayout>
                <Space
                    android:layout_width="@dimen/preview_theme_shape_size"
                    android:layout_height="match_parent"
                    android:layout_weight="0" />
                <FrameLayout
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:layout_weight="1">
                        <ImageView
                            android:id="@+id/shape_preview_icon_4"
                            android:layout_width="@dimen/preview_theme_shape_size"
                            android:layout_height="@dimen/preview_theme_shape_size"
                            android:layout_gravity="center_horizontal"
                            android:layout_margin="4dp"
                            android:elevation="4dp"/>
                </FrameLayout>
                <Space
                    android:layout_width="@dimen/preview_theme_shape_size"
                    android:layout_height="match_parent"
                    android:layout_weight="0" />
                <FrameLayout
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:layout_weight="1">
                        <ImageView
                            android:id="@+id/shape_preview_icon_5"
                            android:layout_width="@dimen/preview_theme_shape_size"
                            android:layout_height="@dimen/preview_theme_shape_size"
                            android:layout_margin="4dp"
                            android:layout_gravity="center_horizontal"
                            android:elevation="4dp"/>
                </FrameLayout>
        </LinearLayout>
</LinearLayout>
 No newline at end of file
+54 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
     Copyright (C) 2019 The Android Open Source Project

     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at

          http://www.apache.org/licenses/LICENSE-2.0

     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
              android:layout_width="wrap_content"
              android:layout_height="wrap_content"
              android:orientation="vertical">

    <FrameLayout
        android:id="@+id/option_tile"
        android:layout_width="@dimen/option_tile_width"
        android:layout_height="@dimen/option_tile_width"
        android:layout_gravity="center_horizontal"
        android:paddingHorizontal="@dimen/option_tile_padding_horizontal"
        android:paddingVertical="@dimen/option_tile_padding_vertical"
        android:layout_marginHorizontal="@dimen/component_options_margin_horizontal"
        android:background="@drawable/option_border">
        <TextView
            android:id="@+id/thumbnail_text"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_gravity="center"
            android:textSize="@dimen/font_comonent_option_thumbnail_size"
            android:textAlignment="center"
            android:textColor="?android:attr/colorForeground"
            android:text="@string/font_component_option_thumbnail"/>
    </FrameLayout>

    <TextView
        android:id="@+id/option_label"
        android:layout_width="@dimen/option_label_width"
        android:layout_height="24dp"
        android:layout_gravity="center_horizontal"
        android:layout_marginTop="@dimen/theme_option_label_margin"
        android:gravity="center"
        android:textAppearance="@style/OptionTitleTextAppearance"
        android:singleLine="true"
        android:scrollHorizontally="true"
        android:ellipsize="marquee"
        android:marqueeRepeatLimit="marquee_forever"/>
</LinearLayout>
+51 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
     Copyright (C) 2019 The Android Open Source Project

     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at

          http://www.apache.org/licenses/LICENSE-2.0

     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
              android:layout_width="wrap_content"
              android:layout_height="wrap_content"
              android:orientation="vertical">

    <FrameLayout
        android:id="@+id/option_tile"
        android:layout_width="@dimen/option_tile_width"
        android:layout_height="@dimen/option_tile_width"
        android:layout_gravity="center_horizontal"
        android:paddingHorizontal="@dimen/option_tile_padding_horizontal"
        android:paddingVertical="@dimen/option_tile_padding_vertical"
        android:layout_marginHorizontal="@dimen/component_options_margin_horizontal"
        android:background="@drawable/option_border">
        <ImageView
            android:id="@+id/option_icon"
            android:layout_width="@dimen/component_icon_thumb_size"
            android:layout_height="@dimen/component_icon_thumb_size"
            android:layout_gravity="center"
            android:tint="?android:colorForeground"/>
    </FrameLayout>

    <TextView
        android:id="@+id/option_label"
        android:layout_width="@dimen/option_label_width"
        android:layout_height="24dp"
        android:layout_gravity="center_horizontal"
        android:layout_marginTop="@dimen/theme_option_label_margin"
        android:gravity="center"
        android:textAppearance="@style/OptionTitleTextAppearance"
        android:singleLine="true"
        android:scrollHorizontally="true"
        android:ellipsize="marquee"
        android:marqueeRepeatLimit="marquee_forever"/>
</LinearLayout>
Loading