Icon and label change option

squashed + dummy icons
This commit is contained in:
Sad Ellie 2023-04-20 10:43:49 +03:00
parent b7127e75a9
commit 59ec10017f
75 changed files with 892 additions and 86 deletions

View File

@ -5,7 +5,7 @@
<application <application
android:name=".UnittoApplication" android:name=".UnittoApplication"
android:icon="@mipmap/ic_launcher" android:icon="@mipmap/ic_launcher_1_green"
android:label="@string/app_name" android:label="@string/app_name"
android:supportsRtl="true" android:supportsRtl="true"
@ -25,6 +25,117 @@
<data android:scheme="app" android:host="com.sadellie.unitto" /> <data android:scheme="app" android:host="com.sadellie.unitto" />
</intent-filter> </intent-filter>
</activity> </activity>
<activity-alias
android:name=".custom.MainActivity2"
android:targetActivity=".MainActivity"
android:icon="@mipmap/ic_launcher_1_red"
android:enabled="false"
android:allowTaskReparenting="true"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity-alias>
<activity-alias
android:name=".custom.MainActivity3"
android:targetActivity=".MainActivity"
android:icon="@mipmap/ic_launcher_1_orange"
android:enabled="false"
android:allowTaskReparenting="true"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity-alias>
<activity-alias
android:name=".custom.MainActivity4"
android:targetActivity=".MainActivity"
android:icon="@mipmap/ic_launcher_2_green"
android:label="@string/calculator"
android:enabled="false"
android:allowTaskReparenting="true"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity-alias>
<activity-alias
android:name=".custom.MainActivity5"
android:targetActivity=".MainActivity"
android:icon="@mipmap/ic_launcher_2_red"
android:label="@string/calculator"
android:enabled="false"
android:allowTaskReparenting="true"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity-alias>
<activity-alias
android:name=".custom.MainActivity6"
android:targetActivity=".MainActivity"
android:icon="@mipmap/ic_launcher_2_orange"
android:label="@string/calculator"
android:enabled="false"
android:allowTaskReparenting="true"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity-alias>
<activity-alias
android:name=".custom.MainActivity7"
android:targetActivity=".MainActivity"
android:icon="@mipmap/ic_launcher_3_green"
android:label="@string/calculator"
android:enabled="false"
android:allowTaskReparenting="true"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity-alias>
<activity-alias
android:name=".custom.MainActivity8"
android:targetActivity=".MainActivity"
android:icon="@mipmap/ic_launcher_3_red"
android:label="@string/calculator"
android:enabled="false"
android:allowTaskReparenting="true"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity-alias>
<activity-alias
android:name=".custom.MainActivity9"
android:targetActivity=".MainActivity"
android:icon="@mipmap/ic_launcher_3_orange"
android:label="@string/calculator"
android:enabled="false"
android:allowTaskReparenting="true"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity-alias>
</application> </application>
</manifest> </manifest>

View File

@ -1,16 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="108dp"
android:height="108dp"
android:viewportWidth="108"
android:viewportHeight="108">
<group android:scaleX="0.3559164"
android:scaleY="0.3559164"
android:translateX="37.271927"
android:translateY="24.247612">
<group android:translateY="133.59375">
<path android:pathData="M85.359375,-102L85.359375,-34.09375Q85.359375,-17.90625,74.90625,-8.453125Q64.46875,1,47.109375,1Q29.53125,1,19.1875,-8.3125Q8.859375,-17.625,8.859375,-34.171875L8.859375,-102L26.578125,-102L26.578125,-33.953125Q26.578125,-23.765625,31.78125,-18.375Q36.984375,-13,47.109375,-13Q67.640625,-13,67.640625,-34.515625L67.640625,-102L85.359375,-102Z"
android:fillColor="#186C31"/>
</group>
</group>
</vector>

View File

@ -1,16 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="72dp"
android:height="72dp"
android:viewportWidth="108"
android:viewportHeight="108">
<group android:scaleX="0.3559164"
android:scaleY="0.3559164"
android:translateX="37.271927"
android:translateY="24.247612">
<group android:translateY="133.59375">
<path android:pathData="M85.359375,-102L85.359375,-34.09375Q85.359375,-17.90625,74.90625,-8.453125Q64.46875,1,47.109375,1Q29.53125,1,19.1875,-8.3125Q8.859375,-17.625,8.859375,-34.171875L8.859375,-102L26.578125,-102L26.578125,-33.953125Q26.578125,-23.765625,31.78125,-18.375Q36.984375,-13,47.109375,-13Q67.640625,-13,67.640625,-34.515625L67.640625,-102L85.359375,-102Z"
android:fillColor="#186C31"/>
</group>
</group>
</vector>

View File

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/ic_launcher_background"/>
<foreground android:drawable="@drawable/ic_launcher_foreground"/>
<!--suppress AndroidElementNotAllowed -->
<monochrome android:drawable="@drawable/ic_launcher_monochrome"/>
</adaptive-icon>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 883 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

View File

@ -0,0 +1,45 @@
<!--
~ Unitto is a unit converter for Android
~ Copyright (c) 2023 Elshan Agaev
~
~ This program is free software: you can redistribute it and/or modify
~ it under the terms of the GNU General Public License as published by
~ the Free Software Foundation, either version 3 of the License, or
~ (at your option) any later version.
~
~ This program is distributed in the hope that it will be useful,
~ but WITHOUT ANY WARRANTY; without even the implied warranty of
~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
~ GNU General Public License for more details.
~
~ You should have received a copy of the GNU General Public License
~ along with this program. If not, see <https://www.gnu.org/licenses/>.
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="108dp"
android:height="108dp"
android:viewportWidth="66"
android:viewportHeight="66">
<group android:scaleX="0.396"
android:scaleY="0.396"
android:translateX="20.053"
android:translateY="20.174">
<path
android:pathData="M9,3.5L25,3.5A4.5,4.5 0,0 1,29.5 8L29.5,24A4.5,4.5 0,0 1,25 28.5L9,28.5A4.5,4.5 0,0 1,4.5 24L4.5,8A4.5,4.5 0,0 1,9 3.5z"
android:strokeWidth="3"
android:fillColor="#00000000"
android:strokeColor="#ffffff"/>
<path
android:pathData="M40,36.5L56,36.5A4.5,4.5 0,0 1,60.5 41L60.5,57A4.5,4.5 0,0 1,56 61.5L40,61.5A4.5,4.5 0,0 1,35.5 57L35.5,41A4.5,4.5 0,0 1,40 36.5z"
android:strokeWidth="3"
android:fillColor="#00000000"
android:strokeColor="#ffffff"/>
<path
android:pathData="M18.5,40C18.5,39.172 17.828,38.5 17,38.5C16.172,38.5 15.5,39.172 15.5,40H18.5ZM15.939,62.061C16.525,62.646 17.475,62.646 18.061,62.061L27.607,52.515C28.192,51.929 28.192,50.979 27.607,50.393C27.021,49.808 26.071,49.808 25.485,50.393L17,58.879L8.515,50.393C7.929,49.808 6.979,49.808 6.393,50.393C5.808,50.979 5.808,51.929 6.393,52.515L15.939,62.061ZM15.5,40L15.5,61H18.5V40H15.5Z"
android:fillColor="#ffffff"/>
<path
android:pathData="M46.5,25C46.5,25.828 47.172,26.5 48,26.5C48.828,26.5 49.5,25.828 49.5,25L46.5,25ZM49.061,2.939C48.475,2.354 47.525,2.354 46.939,2.939L37.393,12.485C36.808,13.071 36.808,14.021 37.393,14.607C37.979,15.192 38.929,15.192 39.515,14.607L48,6.121L56.485,14.607C57.071,15.192 58.021,15.192 58.607,14.607C59.192,14.021 59.192,13.071 58.607,12.485L49.061,2.939ZM49.5,25L49.5,4L46.5,4L46.5,25L49.5,25Z"
android:fillColor="#ffffff"/>
</group>
</vector>

View File

@ -0,0 +1,33 @@
<!--
~ Unitto is a unit converter for Android
~ Copyright (c) 2023 Elshan Agaev
~
~ This program is free software: you can redistribute it and/or modify
~ it under the terms of the GNU General Public License as published by
~ the Free Software Foundation, either version 3 of the License, or
~ (at your option) any later version.
~
~ This program is distributed in the hope that it will be useful,
~ but WITHOUT ANY WARRANTY; without even the implied warranty of
~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
~ GNU General Public License for more details.
~
~ You should have received a copy of the GNU General Public License
~ along with this program. If not, see <https://www.gnu.org/licenses/>.
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="108dp"
android:height="108dp"
android:viewportWidth="66"
android:viewportHeight="66">
<group android:scaleX="0.40408164"
android:scaleY="0.40408164"
android:translateX="19.665306"
android:translateY="19.665306">
<path
android:pathData="M20,38C20,36.343 21.343,35 23,35C24.657,35 26,36.343 26,38C26,39.657 24.657,41 23,41C21.343,41 20,39.657 20,38ZM30,38C30,36.343 31.343,35 33,35C34.657,35 36,36.343 36,38C36,39.657 34.657,41 33,41C31.343,41 30,39.657 30,38ZM40,38C40,36.343 41.343,35 43,35C44.657,35 46,36.343 46,38C46,39.657 44.657,41 43,41C41.343,41 40,39.657 40,38ZM33,43C34.657,43 36,44.343 36,46C36,47.657 34.657,49 33,49C31.343,49 30,47.657 30,46C30,44.343 31.343,43 33,43ZM43,43C41.343,43 40,44.343 40,46C40,47.657 41.343,49 43,49C44.657,49 46,47.657 46,46C46,44.343 44.657,43 43,43ZM23,43C21.343,43 20,44.343 20,46C20,47.657 21.343,49 23,49C24.657,49 26,47.657 26,46C26,44.343 24.657,43 23,43ZM36,54C36,52.343 34.657,51 33,51C31.343,51 30,52.343 30,54C30,55.657 31.343,57 33,57C34.657,57 36,55.657 36,54ZM46,54C46,52.343 44.657,51 43,51C41.343,51 40,52.343 40,54C40,55.657 41.343,57 43,57C44.657,57 46,55.657 46,54ZM20,54C20,52.343 21.343,51 23,51C24.657,51 26,52.343 26,54C26,55.657 24.657,57 23,57C21.343,57 20,55.657 20,54ZM18,3C14.686,3 12,5.686 12,9V57C12,60.314 14.686,63 18,63H48C51.314,63 54,60.314 54,57V9C54,5.686 51.314,3 48,3H18ZM17,13C17,10.791 18.791,9 21,9H45C47.209,9 49,10.791 49,13V25C49,27.209 47.209,29 45,29H21C18.791,29 17,27.209 17,25V13ZM38.172,13.465L41.354,16.646C41.549,16.842 41.549,17.158 41.354,17.354L38.172,20.535C37.976,20.731 37.66,20.731 37.465,20.535C37.269,20.34 37.269,20.024 37.465,19.828L39.793,17.5H32C31.724,17.5 31.5,17.276 31.5,17C31.5,16.724 31.724,16.5 32,16.5H39.793L37.465,14.172C37.269,13.976 37.269,13.66 37.465,13.465C37.66,13.269 37.976,13.269 38.172,13.465ZM24.646,21.354L27.828,24.535C28.024,24.731 28.34,24.731 28.535,24.535C28.731,24.34 28.731,24.024 28.535,23.828L26.207,21.5H34C34.276,21.5 34.5,21.276 34.5,21C34.5,20.724 34.276,20.5 34,20.5H26.207L28.535,18.172C28.731,17.976 28.731,17.66 28.535,17.465C28.34,17.269 28.024,17.269 27.828,17.465L24.646,20.646C24.451,20.842 24.451,21.158 24.646,21.354Z"
android:fillColor="#ffffff"
android:fillType="evenOdd"/>
</group>
</vector>

View File

@ -0,0 +1,45 @@
<!--
~ Unitto is a unit converter for Android
~ Copyright (c) 2023 Elshan Agaev
~
~ This program is free software: you can redistribute it and/or modify
~ it under the terms of the GNU General Public License as published by
~ the Free Software Foundation, either version 3 of the License, or
~ (at your option) any later version.
~
~ This program is distributed in the hope that it will be useful,
~ but WITHOUT ANY WARRANTY; without even the implied warranty of
~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
~ GNU General Public License for more details.
~
~ You should have received a copy of the GNU General Public License
~ along with this program. If not, see <https://www.gnu.org/licenses/>.
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="108dp"
android:height="108dp"
android:viewportWidth="66"
android:viewportHeight="66">
<group android:scaleX="0.4125"
android:scaleY="0.4125"
android:translateX="19.3875"
android:translateY="19.3875">
<path
android:pathData="M42,36C38.686,36 36,38.686 36,42V56C36,59.314 38.686,62 42,62H56C59.314,62 62,59.314 62,56V42C62,38.686 59.314,36 56,36H42ZM49,41C47.895,41 47,41.895 47,43C47,44.105 47.895,45 49,45C50.105,45 51,44.105 51,43C51,41.895 50.105,41 49,41ZM42,47C40.895,47 40,47.895 40,49C40,50.105 40.895,51 42,51H56C57.105,51 58,50.105 58,49C58,47.895 57.105,47 56,47H42ZM47,55C47,53.895 47.895,53 49,53C50.105,53 51,53.895 51,55C51,56.105 50.105,57 49,57C47.895,57 47,56.105 47,55Z"
android:fillColor="#ffffff"
android:fillType="evenOdd"/>
<path
android:pathData="M10,36C6.686,36 4,38.686 4,42V56C4,59.314 6.686,62 10,62H24C27.314,62 30,59.314 30,56V42C30,38.686 27.314,36 24,36H10ZM9.929,41.929C10.71,41.148 11.976,41.148 12.757,41.929L17,46.172L21.243,41.929C22.024,41.148 23.29,41.148 24.071,41.929C24.852,42.71 24.852,43.976 24.071,44.757L19.828,49L24.071,53.243C24.852,54.024 24.852,55.29 24.071,56.071C23.29,56.852 22.024,56.852 21.243,56.071L17,51.828L12.757,56.071C11.976,56.852 10.71,56.852 9.929,56.071C9.148,55.29 9.148,54.024 9.929,53.243L14.172,49L9.929,44.757C9.148,43.976 9.148,42.71 9.929,41.929Z"
android:fillColor="#ffffff"
android:fillType="evenOdd"/>
<path
android:pathData="M42,4C38.686,4 36,6.686 36,10V24C36,27.314 38.686,30 42,30H56C59.314,30 62,27.314 62,24V10C62,6.686 59.314,4 56,4H42ZM42,15C40.895,15 40,15.895 40,17C40,18.105 40.895,19 42,19H56C57.105,19 58,18.105 58,17C58,15.895 57.105,15 56,15H42Z"
android:fillColor="#ffffff"
android:fillType="evenOdd"/>
<path
android:pathData="M10,4C6.686,4 4,6.686 4,10V24C4,27.314 6.686,30 10,30H24C27.314,30 30,27.314 30,24V10C30,6.686 27.314,4 24,4H10ZM17,8C18.105,8 19,8.895 19,10V15H24C25.105,15 26,15.895 26,17C26,18.105 25.105,19 24,19H19V24C19,25.105 18.105,26 17,26C15.895,26 15,25.105 15,24V19H10C8.895,19 8,18.105 8,17C8,15.895 8.895,15 10,15H15V10C15,8.895 15.895,8 17,8Z"
android:fillColor="#ffffff"
android:fillType="evenOdd"/>
</group>
</vector>

View File

@ -0,0 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Unitto is a unit converter for Android
~ Copyright (c) 2023 Elshan Agaev
~
~ This program is free software: you can redistribute it and/or modify
~ it under the terms of the GNU General Public License as published by
~ the Free Software Foundation, either version 3 of the License, or
~ (at your option) any later version.
~
~ This program is distributed in the hope that it will be useful,
~ but WITHOUT ANY WARRANTY; without even the implied warranty of
~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
~ GNU General Public License for more details.
~
~ You should have received a copy of the GNU General Public License
~ along with this program. If not, see <https://www.gnu.org/licenses/>.
-->
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/ic_launcher_green_background"/>
<foreground android:drawable="@drawable/ic_launcher_1_foreground"/>
<monochrome android:drawable="@drawable/ic_launcher_1_foreground"/>
</adaptive-icon>

View File

@ -0,0 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Unitto is a unit converter for Android
~ Copyright (c) 2023 Elshan Agaev
~
~ This program is free software: you can redistribute it and/or modify
~ it under the terms of the GNU General Public License as published by
~ the Free Software Foundation, either version 3 of the License, or
~ (at your option) any later version.
~
~ This program is distributed in the hope that it will be useful,
~ but WITHOUT ANY WARRANTY; without even the implied warranty of
~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
~ GNU General Public License for more details.
~
~ You should have received a copy of the GNU General Public License
~ along with this program. If not, see <https://www.gnu.org/licenses/>.
-->
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/ic_launcher_orange_background"/>
<foreground android:drawable="@drawable/ic_launcher_1_foreground"/>
<monochrome android:drawable="@drawable/ic_launcher_1_foreground"/>
</adaptive-icon>

View File

@ -0,0 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Unitto is a unit converter for Android
~ Copyright (c) 2023 Elshan Agaev
~
~ This program is free software: you can redistribute it and/or modify
~ it under the terms of the GNU General Public License as published by
~ the Free Software Foundation, either version 3 of the License, or
~ (at your option) any later version.
~
~ This program is distributed in the hope that it will be useful,
~ but WITHOUT ANY WARRANTY; without even the implied warranty of
~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
~ GNU General Public License for more details.
~
~ You should have received a copy of the GNU General Public License
~ along with this program. If not, see <https://www.gnu.org/licenses/>.
-->
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/ic_launcher_red_background"/>
<foreground android:drawable="@drawable/ic_launcher_1_foreground"/>
<monochrome android:drawable="@drawable/ic_launcher_1_foreground"/>
</adaptive-icon>

View File

@ -0,0 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Unitto is a unit converter for Android
~ Copyright (c) 2023 Elshan Agaev
~
~ This program is free software: you can redistribute it and/or modify
~ it under the terms of the GNU General Public License as published by
~ the Free Software Foundation, either version 3 of the License, or
~ (at your option) any later version.
~
~ This program is distributed in the hope that it will be useful,
~ but WITHOUT ANY WARRANTY; without even the implied warranty of
~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
~ GNU General Public License for more details.
~
~ You should have received a copy of the GNU General Public License
~ along with this program. If not, see <https://www.gnu.org/licenses/>.
-->
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/ic_launcher_green_background"/>
<foreground android:drawable="@drawable/ic_launcher_2_foreground"/>
<monochrome android:drawable="@drawable/ic_launcher_2_foreground"/>
</adaptive-icon>

View File

@ -0,0 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Unitto is a unit converter for Android
~ Copyright (c) 2023 Elshan Agaev
~
~ This program is free software: you can redistribute it and/or modify
~ it under the terms of the GNU General Public License as published by
~ the Free Software Foundation, either version 3 of the License, or
~ (at your option) any later version.
~
~ This program is distributed in the hope that it will be useful,
~ but WITHOUT ANY WARRANTY; without even the implied warranty of
~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
~ GNU General Public License for more details.
~
~ You should have received a copy of the GNU General Public License
~ along with this program. If not, see <https://www.gnu.org/licenses/>.
-->
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/ic_launcher_orange_background"/>
<foreground android:drawable="@drawable/ic_launcher_2_foreground"/>
<monochrome android:drawable="@drawable/ic_launcher_2_foreground"/>
</adaptive-icon>

View File

@ -0,0 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Unitto is a unit converter for Android
~ Copyright (c) 2023 Elshan Agaev
~
~ This program is free software: you can redistribute it and/or modify
~ it under the terms of the GNU General Public License as published by
~ the Free Software Foundation, either version 3 of the License, or
~ (at your option) any later version.
~
~ This program is distributed in the hope that it will be useful,
~ but WITHOUT ANY WARRANTY; without even the implied warranty of
~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
~ GNU General Public License for more details.
~
~ You should have received a copy of the GNU General Public License
~ along with this program. If not, see <https://www.gnu.org/licenses/>.
-->
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/ic_launcher_red_background"/>
<foreground android:drawable="@drawable/ic_launcher_2_foreground"/>
<monochrome android:drawable="@drawable/ic_launcher_2_foreground"/>
</adaptive-icon>

View File

@ -0,0 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Unitto is a unit converter for Android
~ Copyright (c) 2023 Elshan Agaev
~
~ This program is free software: you can redistribute it and/or modify
~ it under the terms of the GNU General Public License as published by
~ the Free Software Foundation, either version 3 of the License, or
~ (at your option) any later version.
~
~ This program is distributed in the hope that it will be useful,
~ but WITHOUT ANY WARRANTY; without even the implied warranty of
~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
~ GNU General Public License for more details.
~
~ You should have received a copy of the GNU General Public License
~ along with this program. If not, see <https://www.gnu.org/licenses/>.
-->
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/ic_launcher_green_background"/>
<foreground android:drawable="@drawable/ic_launcher_3_foreground"/>
<monochrome android:drawable="@drawable/ic_launcher_3_foreground"/>
</adaptive-icon>

View File

@ -0,0 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Unitto is a unit converter for Android
~ Copyright (c) 2023 Elshan Agaev
~
~ This program is free software: you can redistribute it and/or modify
~ it under the terms of the GNU General Public License as published by
~ the Free Software Foundation, either version 3 of the License, or
~ (at your option) any later version.
~
~ This program is distributed in the hope that it will be useful,
~ but WITHOUT ANY WARRANTY; without even the implied warranty of
~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
~ GNU General Public License for more details.
~
~ You should have received a copy of the GNU General Public License
~ along with this program. If not, see <https://www.gnu.org/licenses/>.
-->
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/ic_launcher_orange_background"/>
<foreground android:drawable="@drawable/ic_launcher_3_foreground"/>
<monochrome android:drawable="@drawable/ic_launcher_3_foreground"/>
</adaptive-icon>

View File

@ -0,0 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Unitto is a unit converter for Android
~ Copyright (c) 2023 Elshan Agaev
~
~ This program is free software: you can redistribute it and/or modify
~ it under the terms of the GNU General Public License as published by
~ the Free Software Foundation, either version 3 of the License, or
~ (at your option) any later version.
~
~ This program is distributed in the hope that it will be useful,
~ but WITHOUT ANY WARRANTY; without even the implied warranty of
~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
~ GNU General Public License for more details.
~
~ You should have received a copy of the GNU General Public License
~ along with this program. If not, see <https://www.gnu.org/licenses/>.
-->
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/ic_launcher_red_background"/>
<foreground android:drawable="@drawable/ic_launcher_3_foreground"/>
<monochrome android:drawable="@drawable/ic_launcher_3_foreground"/>
</adaptive-icon>

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1015 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.1 KiB

View File

@ -0,0 +1,23 @@
<?xml version="1.0" encoding="utf-8"?><!--
~ Unitto is a unit converter for Android
~ Copyright (c) 2023 Elshan Agaev
~
~ This program is free software: you can redistribute it and/or modify
~ it under the terms of the GNU General Public License as published by
~ the Free Software Foundation, either version 3 of the License, or
~ (at your option) any later version.
~
~ This program is distributed in the hope that it will be useful,
~ but WITHOUT ANY WARRANTY; without even the implied warranty of
~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
~ GNU General Public License for more details.
~
~ You should have received a copy of the GNU General Public License
~ along with this program. If not, see <https://www.gnu.org/licenses/>.
-->
<resources>
<color name="ic_launcher_green_background">#186C31</color>
<color name="ic_launcher_orange_background">#FF9800</color>
<color name="ic_launcher_red_background">#E91E63</color>
</resources>

View File

@ -1324,6 +1324,7 @@
<string name="enable_dynamic_colors_support">Use colors from your wallpaper</string> <string name="enable_dynamic_colors_support">Use colors from your wallpaper</string>
<string name="color_scheme">Color scheme</string> <string name="color_scheme">Color scheme</string>
<string name="selected_color">Selected color</string> <string name="selected_color">Selected color</string>
<string name="selected_launcher_icon">Selected icon</string>
<!--MISC.--> <!--MISC.-->
<string name="loading_label">Loading…</string> <string name="loading_label">Loading…</string>
@ -1331,6 +1332,9 @@
<string name="copied">Copied %1$s!</string> <string name="copied">Copied %1$s!</string>
<string name="cancel_label">Cancel</string> <string name="cancel_label">Cancel</string>
<string name="ok_label" translatable="false">OK</string> <string name="ok_label" translatable="false">OK</string>
<string name="apply_label">Apply</string>
<string name="warning_label">Warning!</string>
<string name="icon_change_warning">This feature is unstable. App will be closed to apply changes. Restart your launcher if nothing changes. Reinstall app from phone settings if things go horribly. You have been warned!</string>
<string name="search_bar_placeholder">Search units</string> <string name="search_bar_placeholder">Search units</string>
<string name="search_placeholder">No results found</string> <string name="search_placeholder">No results found</string>
<string name="search_placeholder_button_label">Open settings</string> <string name="search_placeholder_button_label">Open settings</string>

View File

@ -0,0 +1,47 @@
/*
* Unitto is a unit converter for Android
* Copyright (c) 2023 Elshan Agaev
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package com.sadellie.unitto.data.model
import androidx.annotation.DrawableRes
import androidx.annotation.StringRes
private const val unitto = 0xFF186c31
private const val white = 0xFFFFFFFF
private const val red = 0xFFE91E63
private const val orange = 0xFFFF9800
enum class LauncherIcon(
val component: String,
@StringRes val labelString: Int = R.string.app_name,
@DrawableRes val foregroundDrawable: Int,
val foregroundColor: Long,
val backgroundColor: Long,
) {
MAIN_DEFAULT( "com.sadellie.unitto.MainActivity", R.string.app_name, R.drawable.ic_launcher_1_foreground, white, unitto),
MAIN_RED( "com.sadellie.unitto.custom.MainActivity2", R.string.app_name, R.drawable.ic_launcher_1_foreground, white, red),
MAIN_ORANGE( "com.sadellie.unitto.custom.MainActivity3", R.string.app_name, R.drawable.ic_launcher_1_foreground, white, orange),
CALC1_DEFAULT( "com.sadellie.unitto.custom.MainActivity4", R.string.calculator, R.drawable.ic_launcher_2_foreground, white, unitto),
CALC1_RED( "com.sadellie.unitto.custom.MainActivity5", R.string.calculator, R.drawable.ic_launcher_2_foreground, white, red),
CALC1_ORANGE( "com.sadellie.unitto.custom.MainActivity6", R.string.calculator, R.drawable.ic_launcher_2_foreground, white, orange),
CALC2_DEFAULT( "com.sadellie.unitto.custom.MainActivity7", R.string.calculator, R.drawable.ic_launcher_3_foreground, white, unitto),
CALC2_RED( "com.sadellie.unitto.custom.MainActivity8", R.string.calculator, R.drawable.ic_launcher_3_foreground, white, red),
CALC2_ORANGE( "com.sadellie.unitto.custom.MainActivity9", R.string.calculator, R.drawable.ic_launcher_3_foreground, white, orange),
}

View File

@ -32,6 +32,7 @@ import com.sadellie.unitto.core.base.Separator
import com.sadellie.unitto.core.base.TopLevelDestinations import com.sadellie.unitto.core.base.TopLevelDestinations
import com.sadellie.unitto.data.model.ALL_UNIT_GROUPS import com.sadellie.unitto.data.model.ALL_UNIT_GROUPS
import com.sadellie.unitto.data.model.AbstractUnit import com.sadellie.unitto.data.model.AbstractUnit
import com.sadellie.unitto.data.model.LauncherIcon
import com.sadellie.unitto.data.model.UnitGroup import com.sadellie.unitto.data.model.UnitGroup
import com.sadellie.unitto.data.model.UnitsListSorting import com.sadellie.unitto.data.model.UnitsListSorting
import com.sadellie.unitto.data.units.MyUnitIDS import com.sadellie.unitto.data.units.MyUnitIDS
@ -62,6 +63,7 @@ import javax.inject.Inject
* @property unitConverterFavoritesOnly If true will show only units that are marked as favorite. * @property unitConverterFavoritesOnly If true will show only units that are marked as favorite.
* @property unitConverterFormatTime If true will format time to be more human readable. * @property unitConverterFormatTime If true will format time to be more human readable.
* @property unitConverterSorting Units list sorting mode. * @property unitConverterSorting Units list sorting mode.
* @property launcherIcon Current [LauncherIcon]/
*/ */
data class UserPreferences( data class UserPreferences(
val themingMode: ThemingMode? = null, val themingMode: ThemingMode? = null,
@ -81,6 +83,7 @@ data class UserPreferences(
val unitConverterFavoritesOnly: Boolean = false, val unitConverterFavoritesOnly: Boolean = false,
val unitConverterFormatTime: Boolean = false, val unitConverterFormatTime: Boolean = false,
val unitConverterSorting: UnitsListSorting = UnitsListSorting.USAGE, val unitConverterSorting: UnitsListSorting = UnitsListSorting.USAGE,
val launcherIcon: LauncherIcon = LauncherIcon.MAIN_DEFAULT
) )
/** /**
@ -108,6 +111,7 @@ class UserPreferencesRepository @Inject constructor(private val dataStore: DataS
val UNIT_CONVERTER_FAVORITES_ONLY = booleanPreferencesKey("UNIT_CONVERTER_FAVORITES_ONLY_PREF_KEY") val UNIT_CONVERTER_FAVORITES_ONLY = booleanPreferencesKey("UNIT_CONVERTER_FAVORITES_ONLY_PREF_KEY")
val UNIT_CONVERTER_FORMAT_TIME = booleanPreferencesKey("UNIT_CONVERTER_FORMAT_TIME_PREF_KEY") val UNIT_CONVERTER_FORMAT_TIME = booleanPreferencesKey("UNIT_CONVERTER_FORMAT_TIME_PREF_KEY")
val UNIT_CONVERTER_SORTING = stringPreferencesKey("UNIT_CONVERTER_SORTING_PREF_KEY") val UNIT_CONVERTER_SORTING = stringPreferencesKey("UNIT_CONVERTER_SORTING_PREF_KEY")
val LAUNCHER_ICON = stringPreferencesKey("LAUNCHER_ICON_PREF_KEY")
} }
val userPreferencesFlow: Flow<UserPreferences> = dataStore.data val userPreferencesFlow: Flow<UserPreferences> = dataStore.data
@ -149,8 +153,8 @@ class UserPreferencesRepository @Inject constructor(private val dataStore: DataS
val radianMode: Boolean = preferences[PrefsKeys.RADIAN_MODE] ?: true val radianMode: Boolean = preferences[PrefsKeys.RADIAN_MODE] ?: true
val unitConverterFavoritesOnly: Boolean = preferences[PrefsKeys.UNIT_CONVERTER_FAVORITES_ONLY] ?: false val unitConverterFavoritesOnly: Boolean = preferences[PrefsKeys.UNIT_CONVERTER_FAVORITES_ONLY] ?: false
val unitConverterFormatTime: Boolean = preferences[PrefsKeys.UNIT_CONVERTER_FORMAT_TIME] ?: false val unitConverterFormatTime: Boolean = preferences[PrefsKeys.UNIT_CONVERTER_FORMAT_TIME] ?: false
val unitConverterSorting: UnitsListSorting = preferences[PrefsKeys.UNIT_CONVERTER_SORTING]?.let { UnitsListSorting.valueOf(it) } val unitConverterSorting: UnitsListSorting = preferences[PrefsKeys.UNIT_CONVERTER_SORTING]?.let { UnitsListSorting.valueOf(it) } ?: UnitsListSorting.USAGE
?: UnitsListSorting.USAGE val launcherIcon: LauncherIcon = preferences[PrefsKeys.LAUNCHER_ICON]?.let { LauncherIcon.valueOf(it) } ?: LauncherIcon.MAIN_DEFAULT
UserPreferences( UserPreferences(
themingMode = themingMode, themingMode = themingMode,
@ -169,7 +173,8 @@ class UserPreferencesRepository @Inject constructor(private val dataStore: DataS
radianMode = radianMode, radianMode = radianMode,
unitConverterFavoritesOnly = unitConverterFavoritesOnly, unitConverterFavoritesOnly = unitConverterFavoritesOnly,
unitConverterFormatTime = unitConverterFormatTime, unitConverterFormatTime = unitConverterFormatTime,
unitConverterSorting = unitConverterSorting unitConverterSorting = unitConverterSorting,
launcherIcon = launcherIcon
) )
} }
@ -346,4 +351,15 @@ class UserPreferencesRepository @Inject constructor(private val dataStore: DataS
preferences[PrefsKeys.UNIT_CONVERTER_SORTING] = sorting.name preferences[PrefsKeys.UNIT_CONVERTER_SORTING] = sorting.name
} }
} }
/**
* Update [UserPreferences.launcherIcon].
*
* @see UserPreferences.launcherIcon
*/
suspend fun updateLauncherIcon(icon: LauncherIcon) {
dataStore.edit { preferences ->
preferences[PrefsKeys.LAUNCHER_ICON] = icon.name
}
}
} }

View File

@ -22,9 +22,11 @@ import androidx.compose.ui.graphics.Color
import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope import androidx.lifecycle.viewModelScope
import com.sadellie.unitto.core.ui.Formatter import com.sadellie.unitto.core.ui.Formatter
import com.sadellie.unitto.data.model.LauncherIcon
import com.sadellie.unitto.data.model.UnitGroup import com.sadellie.unitto.data.model.UnitGroup
import com.sadellie.unitto.data.model.UnitsListSorting import com.sadellie.unitto.data.model.UnitsListSorting
import com.sadellie.unitto.data.unitgroups.UnitGroupsRepository import com.sadellie.unitto.data.unitgroups.UnitGroupsRepository
import com.sadellie.unitto.data.userprefs.UserPreferences
import com.sadellie.unitto.data.userprefs.UserPreferencesRepository import com.sadellie.unitto.data.userprefs.UserPreferencesRepository
import dagger.hilt.android.lifecycle.HiltViewModel import dagger.hilt.android.lifecycle.HiltViewModel
import io.github.sadellie.themmo.ThemingMode import io.github.sadellie.themmo.ThemingMode
@ -41,10 +43,10 @@ class SettingsViewModel @Inject constructor(
private val userPrefsRepository: UserPreferencesRepository, private val userPrefsRepository: UserPreferencesRepository,
private val unitGroupsRepository: UnitGroupsRepository, private val unitGroupsRepository: UnitGroupsRepository,
) : ViewModel() { ) : ViewModel() {
var userPrefs = userPrefsRepository.userPreferencesFlow val userPrefs = userPrefsRepository.userPreferencesFlow
.onEach { Formatter.setSeparator(it.separator) } .onEach { Formatter.setSeparator(it.separator) }
.stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000), .stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000),
com.sadellie.unitto.data.userprefs.UserPreferences() UserPreferences()
) )
val shownUnitGroups = unitGroupsRepository.shownUnitGroups val shownUnitGroups = unitGroupsRepository.shownUnitGroups
val hiddenUnitGroups = unitGroupsRepository.hiddenUnitGroups val hiddenUnitGroups = unitGroupsRepository.hiddenUnitGroups
@ -197,6 +199,16 @@ class SettingsViewModel @Inject constructor(
} }
} }
/**
* @see UserPreferencesRepository.updateLauncherIcon
*/
fun updateLauncherIcon(icon: LauncherIcon, finished: () -> Unit?) {
viewModelScope.launch {
userPrefsRepository.updateLauncherIcon(icon)
finished()
}
}
/** /**
* Prevent from dragging over non-draggable items (headers and hidden) * Prevent from dragging over non-draggable items (headers and hidden)
* *

View File

@ -18,8 +18,13 @@
package com.sadellie.unitto.feature.settings package com.sadellie.unitto.feature.settings
import android.app.Activity
import android.content.ComponentName
import android.content.Context
import android.content.pm.PackageManager
import android.os.Build import android.os.Build
import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.AnimatedVisibility
import androidx.compose.animation.animateColorAsState
import androidx.compose.animation.expandVertically import androidx.compose.animation.expandVertically
import androidx.compose.animation.fadeIn import androidx.compose.animation.fadeIn
import androidx.compose.animation.fadeOut import androidx.compose.animation.fadeOut
@ -29,36 +34,63 @@ import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.material.icons.Icons import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Colorize import androidx.compose.material.icons.filled.Colorize
import androidx.compose.material.icons.filled.DarkMode import androidx.compose.material.icons.filled.DarkMode
import androidx.compose.material.icons.filled.Delete
import androidx.compose.material.icons.filled.Palette import androidx.compose.material.icons.filled.Palette
import androidx.compose.material.icons.filled.Warning
import androidx.compose.material3.AlertDialog
import androidx.compose.material3.FilledTonalButton
import androidx.compose.material3.Icon import androidx.compose.material3.Icon
import androidx.compose.material3.ListItem import androidx.compose.material3.ListItem
import androidx.compose.material3.Text import androidx.compose.material3.Text
import androidx.compose.material3.TextButton
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.derivedStateOf
import androidx.compose.runtime.getValue import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember import androidx.compose.runtime.remember
import androidx.compose.runtime.saveable.rememberSaveable
import androidx.compose.runtime.setValue
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Color
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.sadellie.unitto.core.ui.R import com.sadellie.unitto.core.ui.R
import com.sadellie.unitto.core.ui.common.Header import com.sadellie.unitto.core.ui.common.Header
import com.sadellie.unitto.core.ui.common.NavigateUpButton import com.sadellie.unitto.core.ui.common.NavigateUpButton
import com.sadellie.unitto.core.ui.common.UnittoListItem
import com.sadellie.unitto.core.ui.common.UnittoScreenWithLargeTopBar
import com.sadellie.unitto.feature.settings.components.ColorSelector
import com.sadellie.unitto.core.ui.common.SegmentedButton import com.sadellie.unitto.core.ui.common.SegmentedButton
import com.sadellie.unitto.core.ui.common.SegmentedButtonRow import com.sadellie.unitto.core.ui.common.SegmentedButtonRow
import com.sadellie.unitto.core.ui.common.UnittoListItem
import com.sadellie.unitto.core.ui.common.UnittoScreenWithLargeTopBar
import com.sadellie.unitto.data.model.LauncherIcon
import com.sadellie.unitto.feature.settings.components.ColorSelector
import com.sadellie.unitto.feature.settings.components.IconsSelector
import io.github.sadellie.themmo.ThemingMode import io.github.sadellie.themmo.ThemingMode
import io.github.sadellie.themmo.ThemmoController import io.github.sadellie.themmo.ThemmoController
private val colorSchemes: List<Color> by lazy {
listOf(
Color(0xFFE91E63),
Color(0xFFFF9800),
Color(0xFF4CAF50),
Color(0xFF2196F3),
Color(0xFF9C27B0),
Color(0xFF5C76AA),
Color(0xFF756FAA),
Color(0xFF9E6C2A),
)
}
@Composable @Composable
internal fun ThemesRoute( internal fun ThemesRoute(
navigateUpAction: () -> Unit = {}, navigateUpAction: () -> Unit = {},
themmoController: ThemmoController, themmoController: ThemmoController,
viewModel: SettingsViewModel viewModel: SettingsViewModel
) { ) {
val userPrefs = viewModel.userPrefs.collectAsStateWithLifecycle()
ThemesScreen( ThemesScreen(
navigateUpAction = navigateUpAction, navigateUpAction = navigateUpAction,
currentThemingMode = themmoController.currentThemingMode, currentThemingMode = themmoController.currentThemingMode,
@ -80,7 +112,11 @@ internal fun ThemesRoute(
onColorChange = { onColorChange = {
themmoController.setCustomColor(it) themmoController.setCustomColor(it)
viewModel.updateCustomColor(it) viewModel.updateCustomColor(it)
} },
currentIcon = userPrefs.value.launcherIcon,
onIconChange = { newValue, callback ->
viewModel.updateLauncherIcon(newValue, callback)
},
) )
} }
@ -95,7 +131,10 @@ private fun ThemesScreen(
onAmoledThemeChange: (Boolean) -> Unit, onAmoledThemeChange: (Boolean) -> Unit,
selectedColor: Color, selectedColor: Color,
onColorChange: (Color) -> Unit, onColorChange: (Color) -> Unit,
currentIcon: LauncherIcon,
onIconChange: (LauncherIcon, () -> Unit) -> Unit
) { ) {
val mContext = LocalContext.current
val themingModes by remember { val themingModes by remember {
mutableStateOf( mutableStateOf(
mapOf( mapOf(
@ -105,12 +144,72 @@ private fun ThemesScreen(
) )
) )
} }
var showIconChangeWarning: Boolean by rememberSaveable { mutableStateOf(false) }
var selectedLauncherIcon: LauncherIcon by remember { mutableStateOf(currentIcon) }
var selectedLauncherIconColor: Color by remember { mutableStateOf(Color(currentIcon.backgroundColor)) }
val selectedLauncherIconColorAnim = animateColorAsState(targetValue = selectedLauncherIconColor)
val launcherIcons: List<LauncherIcon> by remember(selectedLauncherIcon) {
derivedStateOf {
LauncherIcon
.values()
.toList()
.filter { Color(it.backgroundColor) == selectedLauncherIconColor }
}
}
UnittoScreenWithLargeTopBar( UnittoScreenWithLargeTopBar(
title = stringResource(R.string.theme_setting), title = stringResource(R.string.theme_setting),
navigationIcon = { NavigateUpButton(navigateUpAction) } navigationIcon = { NavigateUpButton(navigateUpAction) }
) { paddingValues -> ) { paddingValues ->
LazyColumn(contentPadding = paddingValues) { LazyColumn(contentPadding = paddingValues) {
item {
ListItem(
headlineContent = { Text(stringResource(R.string.selected_color)) },
supportingContent = {
ColorSelector(
modifier = Modifier.padding(top = 12.dp),
selected = selectedLauncherIconColor,
onItemClick = {
selectedLauncherIconColor = it
},
colorSchemes = remember {
LauncherIcon.values().map { Color(it.backgroundColor) }
.distinct()
},
)
},
modifier = Modifier.padding(start = 40.dp)
)
}
item {
ListItem(
headlineContent = { Text(stringResource(R.string.selected_launcher_icon)) },
supportingContent = {
IconsSelector(
modifier = Modifier.padding(top = 12.dp),
selectedColor = selectedLauncherIconColorAnim.value,
icons = launcherIcons,
selectedIcon = selectedLauncherIcon,
onIconChange = { selectedLauncherIcon = it }
)
},
modifier = Modifier.padding(start = 40.dp)
)
}
item {
FilledTonalButton(
modifier = Modifier.padding(start = 56.dp),
enabled = currentIcon != selectedLauncherIcon,
onClick = { showIconChangeWarning = true },
) {
Text(stringResource(R.string.apply_label))
}
}
item { item {
ListItem( ListItem(
leadingContent = { leadingContent = {
@ -190,7 +289,9 @@ private fun ThemesScreen(
ColorSelector( ColorSelector(
modifier = Modifier.padding(top = 12.dp), modifier = Modifier.padding(top = 12.dp),
selected = selectedColor, selected = selectedColor,
onItemClick = onColorChange onItemClick = onColorChange,
colorSchemes = colorSchemes,
defaultColor = Color(0xFF186c31)
) )
}, },
modifier = Modifier.padding(start = 40.dp) modifier = Modifier.padding(start = 40.dp)
@ -199,6 +300,63 @@ private fun ThemesScreen(
} }
} }
} }
if (showIconChangeWarning) {
AlertDialog(
icon = {
Icon(Icons.Default.Warning, stringResource(R.string.warning_label))
},
title = {
Text(stringResource(R.string.warning_label))
},
text = {
Text(
stringResource(R.string.icon_change_warning)
)
},
confirmButton = {
TextButton(
onClick = {
onIconChange(selectedLauncherIcon) {
mContext.changeIcon(selectedLauncherIcon)
(mContext as Activity).finish()
}
showIconChangeWarning = false
}
) {
Text(stringResource(R.string.apply_label))
}
},
dismissButton = {
TextButton(
onClick = { showIconChangeWarning = false }
) {
Text(stringResource(R.string.cancel_label))
}
},
onDismissRequest = { showIconChangeWarning = false }
)
}
}
private fun Context.changeIcon(newIcon: LauncherIcon) {
// Enable new icon
packageManager.setComponentEnabledSetting(
ComponentName(this, newIcon.component),
PackageManager.COMPONENT_ENABLED_STATE_ENABLED,
PackageManager.DONT_KILL_APP
)
val packages = LauncherIcon.values().toList() - newIcon
// We make sure that other icons are disabled to avoid bugs.
packages.forEach {
packageManager.setComponentEnabledSetting(
ComponentName(this, it.component),
PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
PackageManager.DONT_KILL_APP
)
}
} }
@Preview @Preview
@ -213,6 +371,8 @@ private fun Preview() {
isAmoledThemeEnabled = false, isAmoledThemeEnabled = false,
onAmoledThemeChange = {}, onAmoledThemeChange = {},
selectedColor = Color.Unspecified, selectedColor = Color.Unspecified,
onColorChange = {} onColorChange = {},
currentIcon = LauncherIcon.MAIN_DEFAULT,
onIconChange = {_,_->}
) )
} }

View File

@ -30,7 +30,8 @@ import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.aspectRatio import androidx.compose.foundation.layout.aspectRatio
import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.width import androidx.compose.foundation.layout.width
import androidx.compose.foundation.lazy.LazyRow import androidx.compose.foundation.lazy.LazyRow
import androidx.compose.foundation.shape.CircleShape import androidx.compose.foundation.shape.CircleShape
@ -41,11 +42,9 @@ import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.surfaceColorAtElevation import androidx.compose.material3.surfaceColorAtElevation
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.ui.Alignment import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.luminance import androidx.compose.ui.graphics.luminance
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
@ -55,34 +54,24 @@ internal fun ColorSelector(
modifier: Modifier = Modifier, modifier: Modifier = Modifier,
selected: Color, selected: Color,
onItemClick: (Color) -> Unit, onItemClick: (Color) -> Unit,
colorSchemes: List<Color>,
defaultColor: Color? = null
) { ) {
val colorSchemes: List<Color> by remember {
mutableStateOf(
listOf(
Color(0xFFE91E63),
Color(0xFFFF9800),
Color(0xFF4CAF50),
Color(0xFF2196F3),
Color(0xFF9C27B0),
Color(0xFF5C76AA),
Color(0xFF756FAA),
Color(0xFF9E6C2A),
)
)
}
LazyRow( LazyRow(
modifier = modifier, modifier = modifier,
horizontalArrangement = Arrangement.spacedBy(8.dp) horizontalArrangement = Arrangement.spacedBy(8.dp)
) { ) {
// Default, Unitto colors if (defaultColor != null) {
item { // Default, Unitto colors
ColorCheckbox( item {
color = Color(0xFF186c31), ColorCheckbox(
selected = Color.Unspecified == selected, color = defaultColor,
onClick = { onItemClick(Color.Unspecified) } selected = Color.Unspecified == selected,
) onClick = { onItemClick(Color.Unspecified) }
)
}
} }
colorSchemes.forEach { colorSchemes.forEach {
item { item {
ColorCheckbox( ColorCheckbox(
@ -103,20 +92,20 @@ private fun ColorCheckbox(
) { ) {
Box( Box(
modifier = Modifier modifier = Modifier
.clickable(onClick = onClick)
.background(
MaterialTheme.colorScheme.surfaceColorAtElevation(2.dp),
RoundedCornerShape(25)
)
.width(72.dp) .width(72.dp)
.aspectRatio(1f), .clip(RoundedCornerShape(25))
.clickable(onClick = onClick)
.background(MaterialTheme.colorScheme.surfaceColorAtElevation(2.dp)),
contentAlignment = Alignment.Center contentAlignment = Alignment.Center
) { ) {
Box( Box(
modifier = Modifier modifier = Modifier
.background(color, CircleShape) .fillMaxSize()
.size(54.dp) .aspectRatio(1f)
.border(1.dp, Color.Black.copy(0.5f), CircleShape) .padding(8.dp)
.clip(CircleShape)
.background(color)
.border(1.dp, Color.Black.copy(0.5f), CircleShape),
) )
AnimatedVisibility( AnimatedVisibility(
visible = selected, visible = selected,

View File

@ -0,0 +1,144 @@
/*
* Unitto is a unit converter for Android
* Copyright (c) 2023 Elshan Agaev
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package com.sadellie.unitto.feature.settings.components
import androidx.annotation.DrawableRes
import androidx.annotation.StringRes
import androidx.compose.animation.core.tween
import androidx.compose.animation.fadeIn
import androidx.compose.animation.fadeOut
import androidx.compose.animation.scaleIn
import androidx.compose.animation.scaleOut
import androidx.compose.foundation.background
import androidx.compose.foundation.border
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.aspectRatio
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.lazy.LazyRow
import androidx.compose.foundation.lazy.items
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Check
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.material3.surfaceColorAtElevation
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.draw.scale
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.luminance
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp
import com.sadellie.unitto.data.model.LauncherIcon
@Composable
internal fun IconsSelector(
modifier: Modifier,
selectedColor: Color,
icons: List<LauncherIcon>,
selectedIcon: LauncherIcon,
onIconChange: (LauncherIcon) -> Unit
) {
LazyRow(
modifier = modifier,
horizontalArrangement = Arrangement.spacedBy(8.dp)) {
items(icons) {
IconCheckbox(
iconRes = it.foregroundDrawable,
foregroundColor = Color(it.foregroundColor),
backGroundColor = selectedColor,
selected = it == selectedIcon,
onClick = { onIconChange(it) },
label = it.labelString
)
}
}
}
@Composable
private fun IconCheckbox(
@DrawableRes iconRes: Int,
foregroundColor: Color,
backGroundColor: Color,
@StringRes label: Int,
selected: Boolean,
onClick: () -> Unit
) {
Column(
modifier = Modifier
.width(72.dp)
.clip(RoundedCornerShape(25))
.clickable(onClick = onClick)
.background(MaterialTheme.colorScheme.surfaceColorAtElevation(2.dp))
.padding(bottom = 8.dp)
,
horizontalAlignment = Alignment.CenterHorizontally
) {
Box(
modifier = Modifier
.fillMaxSize()
.aspectRatio(1f)
.padding(8.dp)
.clip(CircleShape)
.background(backGroundColor)
.border(1.dp, Color.Black.copy(0.5f), CircleShape),
contentAlignment = Alignment.Center
) {
Icon(
painter = painterResource(iconRes),
contentDescription = null,
tint = foregroundColor,
modifier = Modifier.scale(1.5f)
)
// bug in language, need to call it like this
androidx.compose.animation.AnimatedVisibility(
visible = selected,
enter = fadeIn(tween(250)) + scaleIn(tween(150)),
exit = fadeOut(tween(250)) + scaleOut(tween(150)),
) {
Box(
modifier = Modifier
.background(MaterialTheme.colorScheme.scrim.copy(0.5f))
.fillMaxSize(),
contentAlignment = Alignment.Center
) {
Icon(
imageVector = Icons.Default.Check,
contentDescription = null,
tint = if (backGroundColor.luminance() > 0.5) Color.Black else Color.White,
)
}
}
}
Text(stringResource(label), style = MaterialTheme.typography.labelSmall)
}
}