From c8670a08c36bfa8cd9746ca7cc7b461e7c5c66c4 Mon Sep 17 00:00:00 2001 From: Sad Ellie Date: Thu, 26 Oct 2023 17:31:35 +0300 Subject: [PATCH] Fix shortcut icons --- .../unitto/core/base/TopLevelDestinations.kt | 8 ++-- .../ic_shortcut_calculator.xml | 25 ++++++++++++ .../ic_shortcut_date_calculator.xml | 25 ++++++++++++ .../ic_shortcut_time_zone.xml | 25 ++++++++++++ .../ic_shortcut_unit_converter.xml | 25 ++++++++++++ .../main/res/drawable/calculator_shortcut.xml | 34 ----------------- .../res/drawable/date_calculator_shortcut.xml | 34 ----------------- .../res/drawable/ic_calculator_foreground.xml | 31 +++++++++++++++ .../ic_date_calculator_foreground.xml | 31 +++++++++++++++ .../res/drawable/ic_shortcut_calculator.xml | 37 ++++++++++++++++++ .../drawable/ic_shortcut_date_calculator.xml | 37 ++++++++++++++++++ .../res/drawable/ic_shortcut_time_zone.xml | 37 ++++++++++++++++++ .../drawable/ic_shortcut_unit_converter.xml | 38 +++++++++++++++++++ .../res/drawable/ic_time_zone_foreground.xml | 29 ++++++++++++++ ...t.xml => ic_unit_converter_foreground.xml} | 25 +++++------- .../main/res/drawable/time_zone_shortcut.xml | 34 ----------------- core/base/src/main/res/values/colors.xml | 2 + 17 files changed, 356 insertions(+), 121 deletions(-) create mode 100644 core/base/src/main/res/drawable-anydpi-v26/ic_shortcut_calculator.xml create mode 100644 core/base/src/main/res/drawable-anydpi-v26/ic_shortcut_date_calculator.xml create mode 100644 core/base/src/main/res/drawable-anydpi-v26/ic_shortcut_time_zone.xml create mode 100644 core/base/src/main/res/drawable-anydpi-v26/ic_shortcut_unit_converter.xml delete mode 100644 core/base/src/main/res/drawable/calculator_shortcut.xml delete mode 100644 core/base/src/main/res/drawable/date_calculator_shortcut.xml create mode 100644 core/base/src/main/res/drawable/ic_calculator_foreground.xml create mode 100644 core/base/src/main/res/drawable/ic_date_calculator_foreground.xml create mode 100644 core/base/src/main/res/drawable/ic_shortcut_calculator.xml create mode 100644 core/base/src/main/res/drawable/ic_shortcut_date_calculator.xml create mode 100644 core/base/src/main/res/drawable/ic_shortcut_time_zone.xml create mode 100644 core/base/src/main/res/drawable/ic_shortcut_unit_converter.xml create mode 100644 core/base/src/main/res/drawable/ic_time_zone_foreground.xml rename core/base/src/main/res/drawable/{unit_converter_shortcut.xml => ic_unit_converter_foreground.xml} (58%) delete mode 100644 core/base/src/main/res/drawable/time_zone_shortcut.xml diff --git a/core/base/src/main/java/com/sadellie/unitto/core/base/TopLevelDestinations.kt b/core/base/src/main/java/com/sadellie/unitto/core/base/TopLevelDestinations.kt index a7b581f6..47b02ce6 100644 --- a/core/base/src/main/java/com/sadellie/unitto/core/base/TopLevelDestinations.kt +++ b/core/base/src/main/java/com/sadellie/unitto/core/base/TopLevelDestinations.kt @@ -57,7 +57,7 @@ sealed class TopLevelDestinations( shortcut = Shortcut( R.string.unit_converter_title, R.string.unit_converter_title, - R.drawable.unit_converter_shortcut + R.drawable.ic_shortcut_unit_converter ) ) @@ -68,7 +68,7 @@ sealed class TopLevelDestinations( shortcut = Shortcut( R.string.calculator_title, R.string.calculator_title, - R.drawable.calculator_shortcut + R.drawable.ic_shortcut_calculator ) ) @@ -79,7 +79,7 @@ sealed class TopLevelDestinations( shortcut = Shortcut( R.string.date_calculator_title, R.string.date_calculator_title, - R.drawable.date_calculator_shortcut + R.drawable.ic_shortcut_date_calculator ) ) @@ -90,7 +90,7 @@ sealed class TopLevelDestinations( shortcut = Shortcut( R.string.time_zone_title, R.string.time_zone_title, - R.drawable.time_zone_shortcut + R.drawable.ic_shortcut_time_zone ) ) diff --git a/core/base/src/main/res/drawable-anydpi-v26/ic_shortcut_calculator.xml b/core/base/src/main/res/drawable-anydpi-v26/ic_shortcut_calculator.xml new file mode 100644 index 00000000..234715a2 --- /dev/null +++ b/core/base/src/main/res/drawable-anydpi-v26/ic_shortcut_calculator.xml @@ -0,0 +1,25 @@ + + + + + + + diff --git a/core/base/src/main/res/drawable-anydpi-v26/ic_shortcut_date_calculator.xml b/core/base/src/main/res/drawable-anydpi-v26/ic_shortcut_date_calculator.xml new file mode 100644 index 00000000..dbd6bba5 --- /dev/null +++ b/core/base/src/main/res/drawable-anydpi-v26/ic_shortcut_date_calculator.xml @@ -0,0 +1,25 @@ + + + + + + + diff --git a/core/base/src/main/res/drawable-anydpi-v26/ic_shortcut_time_zone.xml b/core/base/src/main/res/drawable-anydpi-v26/ic_shortcut_time_zone.xml new file mode 100644 index 00000000..20aabfc0 --- /dev/null +++ b/core/base/src/main/res/drawable-anydpi-v26/ic_shortcut_time_zone.xml @@ -0,0 +1,25 @@ + + + + + + + diff --git a/core/base/src/main/res/drawable-anydpi-v26/ic_shortcut_unit_converter.xml b/core/base/src/main/res/drawable-anydpi-v26/ic_shortcut_unit_converter.xml new file mode 100644 index 00000000..f6468c95 --- /dev/null +++ b/core/base/src/main/res/drawable-anydpi-v26/ic_shortcut_unit_converter.xml @@ -0,0 +1,25 @@ + + + + + + + diff --git a/core/base/src/main/res/drawable/calculator_shortcut.xml b/core/base/src/main/res/drawable/calculator_shortcut.xml deleted file mode 100644 index 6ee7105b..00000000 --- a/core/base/src/main/res/drawable/calculator_shortcut.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - diff --git a/core/base/src/main/res/drawable/date_calculator_shortcut.xml b/core/base/src/main/res/drawable/date_calculator_shortcut.xml deleted file mode 100644 index 3a3ae5cf..00000000 --- a/core/base/src/main/res/drawable/date_calculator_shortcut.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - diff --git a/core/base/src/main/res/drawable/ic_calculator_foreground.xml b/core/base/src/main/res/drawable/ic_calculator_foreground.xml new file mode 100644 index 00000000..cd7c704b --- /dev/null +++ b/core/base/src/main/res/drawable/ic_calculator_foreground.xml @@ -0,0 +1,31 @@ + + + + + + + + diff --git a/core/base/src/main/res/drawable/ic_date_calculator_foreground.xml b/core/base/src/main/res/drawable/ic_date_calculator_foreground.xml new file mode 100644 index 00000000..30dfea93 --- /dev/null +++ b/core/base/src/main/res/drawable/ic_date_calculator_foreground.xml @@ -0,0 +1,31 @@ + + + + + + + + diff --git a/core/base/src/main/res/drawable/ic_shortcut_calculator.xml b/core/base/src/main/res/drawable/ic_shortcut_calculator.xml new file mode 100644 index 00000000..47da0346 --- /dev/null +++ b/core/base/src/main/res/drawable/ic_shortcut_calculator.xml @@ -0,0 +1,37 @@ + + + + + + + + + + diff --git a/core/base/src/main/res/drawable/ic_shortcut_date_calculator.xml b/core/base/src/main/res/drawable/ic_shortcut_date_calculator.xml new file mode 100644 index 00000000..14426977 --- /dev/null +++ b/core/base/src/main/res/drawable/ic_shortcut_date_calculator.xml @@ -0,0 +1,37 @@ + + + + + + + + + + diff --git a/core/base/src/main/res/drawable/ic_shortcut_time_zone.xml b/core/base/src/main/res/drawable/ic_shortcut_time_zone.xml new file mode 100644 index 00000000..28fe5b1c --- /dev/null +++ b/core/base/src/main/res/drawable/ic_shortcut_time_zone.xml @@ -0,0 +1,37 @@ + + + + + + + + + + diff --git a/core/base/src/main/res/drawable/ic_shortcut_unit_converter.xml b/core/base/src/main/res/drawable/ic_shortcut_unit_converter.xml new file mode 100644 index 00000000..c77a88d9 --- /dev/null +++ b/core/base/src/main/res/drawable/ic_shortcut_unit_converter.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + diff --git a/core/base/src/main/res/drawable/ic_time_zone_foreground.xml b/core/base/src/main/res/drawable/ic_time_zone_foreground.xml new file mode 100644 index 00000000..3a4a124a --- /dev/null +++ b/core/base/src/main/res/drawable/ic_time_zone_foreground.xml @@ -0,0 +1,29 @@ + + + + + + + diff --git a/core/base/src/main/res/drawable/unit_converter_shortcut.xml b/core/base/src/main/res/drawable/ic_unit_converter_foreground.xml similarity index 58% rename from core/base/src/main/res/drawable/unit_converter_shortcut.xml rename to core/base/src/main/res/drawable/ic_unit_converter_foreground.xml index f880b1ec..1d912cbb 100644 --- a/core/base/src/main/res/drawable/unit_converter_shortcut.xml +++ b/core/base/src/main/res/drawable/ic_unit_converter_foreground.xml @@ -15,20 +15,15 @@ ~ You should have received a copy of the GNU General Public License ~ along with this program. If not, see . --> - - - - - - + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> + + + + diff --git a/core/base/src/main/res/drawable/time_zone_shortcut.xml b/core/base/src/main/res/drawable/time_zone_shortcut.xml deleted file mode 100644 index ca7ae110..00000000 --- a/core/base/src/main/res/drawable/time_zone_shortcut.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - diff --git a/core/base/src/main/res/values/colors.xml b/core/base/src/main/res/values/colors.xml index 071b5abe..1a825eb3 100644 --- a/core/base/src/main/res/values/colors.xml +++ b/core/base/src/main/res/values/colors.xml @@ -19,4 +19,6 @@ #FCFCF7 #FFFFFF + #378648 + #F5F5F5 \ No newline at end of file