psmattas/android_packages_apps_Cherish
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Themes: Redesign themes section

Browse Source 
Add live previews for accents, icons shapes and more

Signed-off-by: AndroBuddy <anirudhchimpidi8@gmail.com>
Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
This commit is contained in:
AndroBuddy
2021-07-25 03:07:16 +07:00
committed by Hưng Phan
parent 22cb3c1afa
commit 8fd35f708f
22 changed files with 341 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
res/color/colors.xml
View File

@@ -16,7 +16,6 @@
<resources>
<!-- Preview Icons -->
<color name="preview_icon_shape_color">@*android:color/accent_device_default_dark</color>
<color name="wave-background">@*android:color/primary_dark_device_default_dark</color>
<color name="preview_container_border">@*android:color/accent_device_default_light</color>
</resources>

57
res/drawable/accent_elements_preview.xml Normal file
View File

@@ -0,0 +1,57 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2020 ProjectFluid
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.
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="134.38dp"
android:height="125dp"
android:viewportWidth="134.38"
android:viewportHeight="125">
<!-- Button -->
<path android:fillColor="?android:attr/colorAccent"
android:pathData="M0 101C0 98.7909 1.79086 97 4 97H130.38C132.589 97 134.38 98.7909 134.38 101V121C134.38 123.209 132.589 125 130.38 125H4C1.79086 125 0 123.209 0 121V101Z" />
<!-- Slider -->
<path android:fillColor="#000000"
android:fillAlpha="0.08"
android:pathData="M0 57.5C0 56.6716 0.671573 56 1.5 56H128.83C129.658 56 130.33 56.6716 130.33 57.5C130.33 58.3284 129.658 59 128.83 59H1.5C0.671573 59 0 58.3284 0 57.5Z" />
<path android:fillColor="?android:attr/colorAccent"
android:pathData="M1.5 56C0.671573 56 0 56.6716 0 57.5C0 58.3284 0.671573 59 1.5 59H93.0341C93.2809 59.761 93.7142 60.461 94.3066 61.0355C95.2734 61.9732 96.5847 62.5 97.952 62.5C99.3193 62.5 100.631 61.9732 101.597 61.0355C102.564 60.0979 103.107 58.8261 103.107 57.5C103.107 56.1739 102.564 54.9021 101.597 53.9645C100.631 53.0268 99.3193 52.5 97.952 52.5C96.5847 52.5 95.2734 53.0268 94.3066 53.9645C93.7142 54.539 93.2809 55.239 93.0341 56H1.5Z"/>
<!-- Switch -->
<path android:fillColor="?android:attr/colorAccent"
android:fillAlpha="0.2"
android:pathData="M119.5 0H97.8335C94.9603 0 92.2047 1.14138 90.1731 3.17306C88.1414 5.20473 87 7.96027 87 10.8335C87 13.7067 88.1414 16.4623 90.1731 18.4939C92.2047 20.5256 94.9603 21.667 97.8335 21.667H119.5C122.374 21.667 125.129 20.5256 127.161 18.4939C129.193 16.4623 130.334 13.7067 130.334 10.8335C130.334 7.96027 129.193 5.20473 127.161 3.17306C125.129 1.14138 122.374 0 119.5 0Z" />
<path android:fillColor="?android:attr/colorAccent"
android:pathData="M119.5 17.3342C117.776 17.3342 116.123 16.6494 114.904 15.4303C113.685 14.2113 113 12.558 113 10.8341C113 9.11015 113.685 7.45682 114.904 6.23782C116.123 5.01881 117.776 4.33398 119.5 4.33398C121.224 4.33398 122.877 5.01881 124.096 6.23782C125.315 7.45682 126 9.11015 126 10.8341C126 12.558 125.315 14.2113 124.096 15.4303C122.877 16.6494 121.224 17.3342 119.5 17.3342Z" />
<!-- Radio -->
<path android:fillColor="?android:attr/colorAccent"
android:pathData="M43.4645 8.46447C44.4021 7.52678 45.6739 7 47 7C48.3261 7 49.5979 7.52678 50.5355 8.46447C51.4732 9.40215 52 10.6739 52 12C52 13.3261 51.4732 14.5979 50.5355 15.5355C49.5979 16.4732 48.3261 17 47 17C45.6739 17 44.4021 16.4732 43.4645 15.5355C42.5268 14.5979 42 13.3261 42 12C42 10.6739 42.5268 9.40215 43.4645 8.46447Z" />
<path android:fillColor="?android:attr/colorAccent"
android:fillType="evenOdd"
android:pathData="M47 2C45.6868 2 44.3864 2.25866 43.1732 2.7612C41.9599 3.26375 40.8575 4.00035 39.9289 4.92893C38.0536 6.8043 37 9.34784 37 12C37 14.6522 38.0536 17.1957 39.9289 19.0711C40.8575 19.9997 41.9599 20.7362 43.1732 21.2388C44.3864 21.7413 45.6868 22 47 22C49.6522 22 52.1957 20.9464 54.0711 19.0711C55.9464 17.1957 57 14.6522 57 12C57 10.6868 56.7413 9.38642 56.2388 8.17317C55.7362 6.95991 54.9997 5.85752 54.0711 4.92893C53.1425 4.00035 52.0401 3.26375 50.8268 2.7612C49.6136 2.25866 48.3132 2 47 2ZM41.3431 17.6569C42.8434 19.1571 44.8783 20 47 20C49.1217 20 51.1566 19.1571 52.6569 17.6569C54.1571 16.1566 55 14.1217 55 12C55 9.87827 54.1571 7.84344 52.6569 6.34315C51.1566 4.84285 49.1217 4 47 4C44.8783 4 42.8434 4.84285 41.3431 6.34315C39.8429 7.84344 39 9.87827 39 12C39 14.1217 39.8429 16.1566 41.3431 17.6569Z" />
<!-- CheckBox -->
<path android:fillColor="?android:attr/colorAccent"
android:pathData="M10 17L5 12L6.41 10.58L10 14.17L17.59 6.58L19 8L10 17ZM19 3H5C3.89 3 3 3.89 3 5V19C3 19.5304 3.21071 20.0391 3.58579 20.4142C3.96086 20.7893 4.46957 21 5 21H19C19.5304 21 20.0391 20.7893 20.4142 20.4142C20.7893 20.0391 21 19.5304 21 19V5C21 3.89 20.1 3 19 3Z" />
</vector>

27
res/drawable/accents_tiles_preview.xml Normal file
View File

@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2020 ProjectFluid
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.
-->
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape android:shape="rectangle">
<size android:width="314.44dp"
android:height="125dp" />
</shape>
</item>
<item android:drawable="@drawable/tiles_shape_preview" android:gravity="right"/>
<item android:drawable="@drawable/accent_elements_preview" android:gravity="left"/>
</layer-list>

26
res/drawable/fluid_icon.xml
View File

@@ -1,26 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2020 ProjectFluid
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.
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:height="24dp"
android:width="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#ffffff"
android:pathData="M12,3.77L11.25,4.61C11.25,4.61 9.97,6.06 8.68,7.94C7.39,9.82 6,12.07 6,14.23A6,6 0 0,0 12,20.23A6,6 0 0,0 18,14.23C18,12.07 16.61,9.82 15.32,7.94C14.03,6.06 12.75,4.61 12.75,4.61L12,3.77M12,6.9C12.44,7.42 12.84,7.85 13.68,9.07C14.89,10.83 16,13.07 16,14.23C16,16.45 14.22,18.23 12,18.23C9.78,18.23 8,16.45 8,14.23C8,13.07 9.11,10.83 10.32,9.07C11.16,7.85 11.56,7.42 12,6.9Z" />
</vector>

28
res/drawable/font_preview_background.xml
View File

@@ -1,28 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2020 ProjectFluid
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.
-->
<vector
xmlns:android="http://schemas.android.com/apk/res/android"
android:width="1280dp"
android:height="549dp"
android:viewportWidth="1280"
android:viewportHeight="548">
<path
android:pathData="M0 0V548.127H1280V0"
android:fillColor="?android:attr/colorAccent"
android:fillAlpha="0.2"/>
</vector>

11
res/drawable/ic_preview_alien.xml Normal file
View File

@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<vector android:width="24dp"
android:height="24dp"
android:viewportHeight="24"
android:viewportWidth="24"
xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#FFFFFF"
android:pathData="M10.31 10.93C11.33 12.57 11.18 14.5 9.96 15.28C8.74 16.04 6.92 15.33 5.89 13.69C4.87 12.05 5.03 10.1 6.25 9.34C7.47 8.58 9.29 9.29 10.31 10.93ZM12 17.75C14 17.75 14.5 17 14.5 17C14.5 17 14 19 12 19C10 19 9.5 17.03 9.5 17C9.5 17 10 17.75 12 17.75ZM17.75 9.34C18.97 10.1 19.13 12.05 18.11 13.69C17.08 15.33 15.26 16.04 14.04 15.28C12.82 14.5 12.67 12.57 13.69 10.93C14.71 9.29 16.53 8.58 17.75 9.34ZM12 20C14.5 20 20 14.86 20 11C20 7.14 16.41 4 12 4C7.59 4 4 7.14 4 11C4 14.86 9.5 20 12 20ZM12 2C17.5 2 22 6.04 22 11C22 15.08 16.32 22 12 22C7.68 22 2 15.08 2 11C2 6.04 6.5 2 12 2Z" />
</vector>

11
res/drawable/ic_preview_fluid.xml Normal file
View File

@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<vector android:width="24dp"
android:height="24dp"
android:viewportHeight="24"
android:viewportWidth="24"
xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#72BBFF"
android:pathData="M12 3.76953L11.25 4.60953C11.25 4.60953 9.97 6.05953 8.68 7.93953C7.39 9.81953 6 12.0695 6 14.2295C6 15.8208 6.63214 17.347 7.75736 18.4722C8.88258 19.5974 10.4087 20.2295 12 20.2295C13.5913 20.2295 15.1174 19.5974 16.2426 18.4722C17.3679 17.347 18 15.8208 18 14.2295C18 12.0695 16.61 9.81953 15.32 7.93953C14.03 6.05953 12.75 4.60953 12.75 4.60953L12 3.76953ZM12 6.89953C12.44 7.41953 12.84 7.84953 13.68 9.06953C14.89 10.8295 16 13.0695 16 14.2295C16 16.4495 14.22 18.2295 12 18.2295C9.78 18.2295 8 16.4495 8 14.2295C8 13.0695 9.11 10.8295 10.32 9.06953C11.16 7.84953 11.56 7.41953 12 6.89953Z" />
</vector>

11
res/drawable/ic_preview_moon.xml Normal file
View File

@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<vector android:width="24dp"
android:height="24dp"
android:viewportHeight="24"
android:viewportWidth="24"
xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#FFCF72"
android:pathData="M17.7503 4.09L15.2203 6.03L16.1303 9.09L13.5003 7.28L10.8703 9.09L11.7803 6.03L9.25031 4.09L12.4403 4L13.5003 1L14.5603 4L17.7503 4.09ZM21.2503 11L19.6103 12.25L20.2003 14.23L18.5003 13.06L16.8003 14.23L17.3903 12.25L15.7503 11L17.8103 10.95L18.5003 9L19.1903 10.95L21.2503 11ZM18.9703 15.95C19.8003 15.87 20.6903 17.05 20.1603 17.8C19.8403 18.25 19.5003 18.67 19.0803 19.07C15.1703 23 8.84031 23 4.94031 19.07C1.03031 15.17 1.03031 8.83 4.94031 4.93C5.34031 4.53 5.76031 4.17 6.21031 3.85C6.96031 3.32 8.14031 4.21 8.06031 5.04C7.79031 7.9 8.75031 10.87 10.9503 13.06C13.1403 15.26 16.1003 16.22 18.9703 15.95ZM17.3303 17.97C14.5003 17.81 11.7003 16.64 9.53031 14.5C7.36031 12.31 6.20031 9.5 6.04031 6.68C3.23031 9.82 3.34031 14.64 6.35031 17.66C9.37031 20.67 14.1903 20.78 17.3303 17.97Z" />
</vector>

11
res/drawable/ic_preview_wifi.xml Normal file
View File

@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<vector android:width="24dp"
android:height="24dp"
android:viewportHeight="24"
android:viewportWidth="24"
xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#FFFFFF"
android:pathData="M11.9999 3C7.78988 3 3.69988 4.41 0.379883 7C4.40988 12.06 7.88988 16.37 11.9999 21.5C16.0799 16.42 20.2399 11.24 23.6499 7C20.3199 4.41 16.2199 3 11.9999 3ZM11.9999 5C15.0699 5 18.0899 5.86 20.7099 7.45L18.7699 9.88C17.2599 9 14.8799 8 11.9999 8C8.99988 8 6.67988 9 5.20988 9.84L3.26988 7.44C5.90988 5.85 8.92988 5 11.9999 5Z" />
</vector>

25
res/drawable/preview_background_container.xml Normal file
View File

@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2020 ProjectFluid
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.
-->
<shape android:shape="rectangle"
xmlns:android="http://schemas.android.com/apk/res/android">
<size android:width="200dp"
android:height="166dp" />
<stroke android:width="2dp"
android:color="@color/preview_container_border" />
<corners android:radius="8dp" />
</shape>

33
res/drawable/preview_base.xml
View File

@@ -1,33 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2020 ProjectFluid
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.
-->
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/wave"/>
<item android:gravity="center">
<com.android.settingslib.widget.AdaptiveIconShapeDrawable
android:height="290dp"
android:width="290dp"
android:color="@color/preview_icon_shape_color"/>
</item>
<item android:height="181dp"
android:width="181dp"
android:gravity="center"
android:drawable="@drawable/fluid_icon"/>
</layer-list>

33
res/drawable/preview_wallpaper.xml
View File

@@ -1,33 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2020 ProjectFluid
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.
-->
<vector
xmlns:android="http://schemas.android.com/apk/res/android"
android:width="1280dp"
android:height="510dp"
android:viewportWidth="1280"
android:viewportHeight="510">
<path
android:pathData="M -11 -788 L 1291 -788 L 1291 1156 C 1291 1234.42 1227.42 1298 1149 1298 L 131 1298 C 52.576 1298 -11 1234.42 -11 1156 L -11 -788 Z"
android:fillColor="?android:attr/colorAccent"
android:fillAlpha="0.2" />
<path
android:pathData="M 1281 60 L 1227.17 68.203 C 1173.33 76.405 1065.67 92.81 958 158.431 C 850.333 224.051 742.667 260.203 635 252 C 527.333 243.797 419.667 174.836 312 158.431 C 149 133.594 42.833 306.077 -11 355.292 L -11 969 C -11 1043.56 49.42 1104 123.979 1104 L 1146.02 1104 C 1220.58 1104 1281 1043.56 1281 969 L 1281 60 Z"
android:fillColor="?android:attr/colorAccent"
android:fillAlpha="0.1" />
</vector>

89
res/drawable/tiles_shape_preview.xml Normal file
View File

@@ -0,0 +1,89 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2020 ProjectFluid
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.
-->
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape android:shape="rectangle">
<size android:width="123dp"
android:height="125dp"/>
</shape>
</item>
<item android:gravity="top">
<layer-list>
<item android:gravity="left">
<layer-list>
<item>
<com.android.settingslib.widget.AdaptiveIconShapeDrawable
android:height="44dp"
android:width="44dp"
android:color="#FF7272"/>
</item>
<item android:drawable="@drawable/ic_preview_wifi"
android:width="26.4dp"
android:height="26.4dp"
android:gravity="center"/>
</layer-list>
</item>
<item android:gravity="right">
<layer-list>
<item>
<com.android.settingslib.widget.AdaptiveIconShapeDrawable
android:height="44dp"
android:width="44dp"
android:color="#72CCFF"/>
</item>
<item android:drawable="@drawable/ic_preview_alien"
android:width="26.4dp"
android:height="26.4dp"
android:gravity="center"/>
</layer-list>
</item>
</layer-list>
</item>
<item android:gravity="bottom">
<layer-list>
<item android:gravity="left">
<layer-list>
<item>
<com.android.settingslib.widget.AdaptiveIconShapeDrawable
android:height="44dp"
android:width="44dp"
android:color="#3372BBFF"/>
</item>
<item android:drawable="@drawable/ic_preview_fluid"
android:width="26.4dp"
android:height="26.4dp"
android:gravity="center"/>
</layer-list>
</item>
<item android:gravity="right">
<layer-list>
<item>
<com.android.settingslib.widget.AdaptiveIconShapeDrawable
android:height="44dp"
android:width="44dp"
android:color="#33FFCF72"/>
</item>
<item android:drawable="@drawable/ic_preview_moon"
android:width="26.4dp"
android:height="26.4dp"
android:gravity="center"/>
</layer-list>
</item>
</layer-list>
</item>
</layer-list>

27
res/drawable/wave.xml
View File

@@ -1,27 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2020 ProjectFluid
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.
-->
<vector
xmlns:android="http://schemas.android.com/apk/res/android"
android:width="1280dp"
android:height="549dp"
android:viewportWidth="1280"
android:viewportHeight="549">
<path
android:pathData="M 320.779 193.922 C 214.891 174.977 46.715 228.948 0 256.061 L 0 548.126 L 1280 548.126 L 1280 212.866 L 1227.06 227.074 C 1174.11 243.65 1068.22 272.067 959.221 291.011 C 853.333 309.956 747.445 319.428 641.557 295.747 C 532.555 272.067 426.667 212.866 320.779 193.922 Z"
android:fillColor="@color/wave-background" />
</vector>

43
res/layout/accents_shapes_base_preview.xml Normal file
View File

@@ -0,0 +1,43 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2020 ProjectFluid
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:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp">
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/preview_background_container"
android:layout_gravity="center"
android:layout_margin="20dp">
<ImageView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:src="@drawable/accents_tiles_preview"
android:layout_gravity="center"
android:layout_marginStart="20dp"
android:layout_marginEnd="20dp"
tools:ignore="ContentDescription" />
</FrameLayout>
</LinearLayout>

32
res/layout/base_preview.xml
View File

@@ -1,32 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2020 ProjectFluid
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="180dp"
android:layout_gravity="center|top">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:scaleType="centerCrop"
android:background="@drawable/preview_wallpaper"
android:src="@drawable/preview_base"
tools:ignore="ContentDescription"/>
</LinearLayout>

34
res/layout/font_preview.xml
View File

@@ -1,34 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2020 ProjectFluid
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="180dp"
android:layout_gravity="center|top"
android:scaleType="centerCrop"
android:background="@drawable/font_preview_background">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="ColtOS Font Preview : This is how fonts will appear"
android:textSize="32sp"
android:textColor="?android:attr/colorAccent"
android:layout_marginStart="40dp"
android:layout_marginEnd="40dp"
android:layout_gravity="center"/>
</LinearLayout>

40
res/layout/fonts_base_preview.xml Normal file
View File

@@ -0,0 +1,40 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2020 ProjectFluid
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:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp">
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/preview_background_container"
android:layout_margin="20dp">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="CherishOS Font Preview : This is how fonts will appear"
android:textSize="24dp"
android:textColor="?android:attr/colorAccent"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"/>
</FrameLayout>
</LinearLayout>

1
res/values/cherish_colors.xml
View File

@@ -31,4 +31,5 @@
<!-- FOD icon picker -->
<color name="fod_item_background_stroke_color">#d6d6d6</color>
<color name="preview_container_border">@*android:color/accent_device_default_light</color>
</resources>

8
res/values/cherish_strings.xml
View File

@@ -1256,7 +1256,12 @@
<!-- [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 the statusbar icon -->
<string name="themes_base">System Customisation for CherishOS</string>
<string name="theme_customization_sysui_icon_title">Statusbar icon</string>
<string name="theme_customization_settings_icon_title">Settings icons</string>
<string name="theme_customization_systemui_title">Base Theme</string>
<string name="themes_color">Theming</string>
<string name="themes_summary">Theming section</string>
<!-- Clock style -->
<string name="clock_style_title">Clock style</string>
<string name="clock_style_summary">Customize lockscreen clock</string>
@@ -1268,4 +1273,7 @@
<!-- Customization titles -->
<string name="themes_ui">Themes UI</string>
<!-- Accent Picker -->
<string name="accent_color_summary">Choose your desired accent</string>
</resources>

6
res/xml/cherish_settings_theme.xml
View File

@@ -23,7 +23,8 @@
android:title="@string/theme_customization_category">
<ListPreference
android:layout="@layout/base_preview" />
android:layout="@layout/accents_shapes_base_preview"
android:selectable="false" />
<Preference
android:key="dark_ui_mode"
@@ -60,7 +61,8 @@
</Preference>
<ListPreference
android:layout="@layout/font_preview" />
android:layout="@layout/fonts_base_preview"
android:selectable="false" />
<com.android.settings.display.FontDialogPreference
android:key="custom_font"