Cherish: Bring back icon shapes, icon packs, fonts customization

Signed-off-by: Pranav Vashi <neobuddy89@gmail.com>
Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
This commit is contained in:
SagarMakhar
2021-12-29 16:58:56 +00:00
committed by Hưng Phan
parent b18c25feff
commit 2b8315724d
9 changed files with 847 additions and 18 deletions

View File

@@ -0,0 +1,48 @@
<?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="wrap_content"
android:layout_margin="7dp"
android:layout_gravity="center"
android:orientation="vertical">
<FrameLayout
android:id="@+id/option_tile"
android:layout_width="match_parent"
android:layout_height="75dp"
android:gravity="center"
android:layout_gravity="center"
android:paddingHorizontal="10dp"
android:paddingVertical="10dp"
android:background="@drawable/option_border_custom">
<TextView android:id="@+id/option_title"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:textAppearance="@style/OptionTitleTextAppearance"/>
</FrameLayout>
<TextView
android:id="@+id/option_label"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:textAppearance="@style/OptionTitleTextAppearance"/>
</LinearLayout>

View File

@@ -0,0 +1,88 @@
<?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:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:gravity="center"
android:orientation="vertical">
<LinearLayout
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_centerInParent="true"
android:gravity="center"
android:orientation="vertical"
android:paddingHorizontal="5dp"
android:paddingVertical="5dp"
android:background="@drawable/option_border_custom">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal">
<ImageView
android:id="@+id/image1"
android:layout_width="30dp"
android:layout_height="30dp"
android:background="@drawable/icon_background"
android:backgroundTint="?android:attr/textColorSecondary"
android:tint="?android:attr/textColorPrimary" />
<ImageView
android:id="@+id/image2"
android:layout_width="30dp"
android:layout_height="30dp"
android:background="@drawable/icon_background"
android:backgroundTint="?android:attr/textColorSecondary"
android:tint="?android:attr/textColorPrimary" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal">
<ImageView
android:id="@+id/image3"
android:layout_width="30dp"
android:layout_height="30dp"
android:background="@drawable/icon_background"
android:backgroundTint="?android:attr/textColorSecondary"
android:tint="?android:attr/textColorPrimary" />
<ImageView
android:id="@+id/image4"
android:layout_width="30dp"
android:layout_height="30dp"
android:background="@drawable/icon_background"
android:backgroundTint="?android:attr/textColorSecondary"
android:tint="?android:attr/textColorSecondary" />
</LinearLayout>
</LinearLayout>
<TextView
android:id="@+id/option_label"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:textAppearance="@style/OptionTitleTextAppearance"/>
</LinearLayout>

View File

@@ -530,12 +530,13 @@
<string name="theme_customization_category">Theming</string>
<!-- [CHAR_LIMIT=NONE] Developer Settings: Title of the setting which enables overlays to customize the adaptive icon shape (e.g. launcher and quick settings icons). -->
<string name="theme_customization_icon_shape_title">Icon shape</string>
<!-- [CHAR_LIMIT=NONE] Developer Settings: Title of the setting which enables overlays to customize accent color. -->
<string name="theme_customization_accent_color_title">Accent color</string>
<string name="theme_customization_icon_shape_summary">Set system icon shape style</string>
<!-- [CHAR_LIMIT=NONE] Developer Settings: Title of the setting which enables overlays to customize headline and body fonts. -->
<string name="theme_customization_font_title">Headline / Body font</string>
<!-- [CHAR_LIMIT=NONE] Developer Settings: Title of the setting which enables overlays to customize the statusbar icon -->
<string name="theme_customization_sysui_icon_title">Statusbar icon</string>
<string name="theme_customization_font_summary">Set system font style</string>
<!-- [CHAR_LIMIT=NONE] Developer Settings: Title of the setting which enables overlays to customize the system wide icon pack. -->
<string name="theme_customization_icon_pack_title">Icon pack</string>
<string name="theme_customization_icon_pack_summary">Set custom icon pack style</string>
<!-- VoWiFi icon -->
<string name="vowifi_icon_title">VoWiFi icon</string>

View File

@@ -22,4 +22,5 @@
<dimen name="fod_picker_item_size">100dp</dimen>
<dimen name="fod_picker_item_padding">20dp</dimen>
<color name="option_border_default">#5f6368</color>
</resources>

View File

@@ -73,17 +73,26 @@
android:fragment="com.android.settings.display.darkmode.DarkModeSettingsFragment"
settings:controller="com.android.settings.display.DarkUIPreferenceController" />
<ListPreference
<!-- Font style -->
<Preference
android:key="android.theme.customization.font"
android:title="@string/theme_customization_font_title"/>
android:title="@string/theme_customization_font_title"
android:summary="@string/theme_customization_font_summary"
android:fragment="com.cherish.settings.fragments.ui.FontsPicker"/>
<ListPreference
android:key="android.theme.customization.adaptive_icon_shape"
android:title="@string/theme_customization_icon_shape_title"/>
<ListPreference
<!-- Icon pack -->
<Preference
android:key="android.theme.customization.icon_pack"
android:title="@string/theme_customization_sysui_icon_title"/>
android:title="@string/theme_customization_icon_pack_title"
android:summary="@string/theme_customization_icon_pack_summary"
android:fragment="com.cherish.settings.fragments.ui.StatusbarIcons"/>
<!-- Adaptive icon shape -->
<Preference
android:key="android.theme.customization.adaptive_icon_shape"
android:title="@string/theme_customization_icon_shape_title"
android:summary="@string/theme_customization_icon_shape_summary"
android:fragment="com.cherish.settings.fragments.ui.IconShapes"/>
<ListPreference
android:key="android.theme.customization.signal_icon"