From 6575482e3f4f97918d86a7c4698f650dafff5dad Mon Sep 17 00:00:00 2001 From: Kenneth Soh Date: Fri, 14 Jun 2024 18:03:31 +0800 Subject: [PATCH] refactor: Fixed linting issues in xml --- .../main/res/drawable-nodpi/clock_dial.xml | 7 +- .../res/drawable-nodpi/clock_hand_hour.xml | 4 +- .../res/drawable-nodpi/clock_hand_minute.xml | 4 +- .../drawable-nodpi/marshmallow_cactus1.xml | 4 +- .../main/res/drawable-nodpi/ndp_platlogo.xml | 4 +- .../main/res/drawable-nodpi/oreo_platlogo.xml | 4 +- .../main/res/drawable-nodpi/pie_platlogo.xml | 4 +- .../res/drawable-nodpi/tiramisu_platlogo.xml | 5 +- .../main/res/drawable-nodpi/u_platlogo.xml | 4 +- .../main/res/drawable/lollipop_android.xml | 1 - app/src/main/res/drawable/lollipop_cloud.xml | 9 +- .../main/res/drawable/lollipop_cloud_off.xml | 11 ++- .../main/res/drawable/lollipop_l_platlogo.xml | 1 - app/src/main/res/drawable/lollipop_moon.xml | 1 - .../main/res/drawable/lollipop_pop_belt.xml | 9 +- .../main/res/drawable/lollipop_pop_droid.xml | 9 +- .../main/res/drawable/lollipop_pop_pizza.xml | 9 +- .../res/drawable/lollipop_pop_stripes.xml | 9 +- .../main/res/drawable/lollipop_pop_swirl.xml | 9 +- .../main/res/drawable/lollipop_pop_vortex.xml | 9 +- .../res/drawable/lollipop_pop_vortex2.xml | 11 ++- app/src/main/res/drawable/lollipop_star.xml | 9 +- app/src/main/res/drawable/lollipop_sun.xml | 1 - app/src/main/res/drawable/lollipop_sun2.xml | 1 - .../main/res/drawable/nougat_food_cookie.xml | 4 +- .../main/res/drawable/nougat_food_donut.xml | 4 +- app/src/main/res/drawable/nougat_icon.xml | 4 +- .../main/res/drawable/oreo_mr1_platlogo.xml | 4 +- .../res/drawable/oreo_mr1_platlogo_new.xml | 8 +- .../main/res/drawable/q_android_logotype.xml | 4 +- app/src/main/res/drawable/r_food_cookie.xml | 4 +- app/src/main/res/drawable/r_ic_toy_mouse.xml | 4 +- .../main/res/drawable/r_ic_water_filled.xml | 4 +- app/src/main/res/drawable/r_platlogo.xml | 4 +- .../res/layout-night/listview_selector.xml | 8 +- .../main/res/layout-v21/nougat_cat_view.xml | 78 --------------- app/src/main/res/layout-v21/pie_toolbar.xml | 97 ------------------- app/src/main/res/layout-v21/s_paint_chip.xml | 32 ------ .../s_paint_chips_widget_preview.xml | 79 --------------- .../s_paint_chips_widget_preview.xml | 10 +- .../main/res/layout/activity_main_screen.xml | 3 +- app/src/main/res/layout/listview_selector.xml | 8 +- app/src/main/res/layout/mland.xml | 8 +- app/src/main/res/layout/nougat_cat_view.xml | 7 +- app/src/main/res/layout/nougat_edit_text.xml | 2 + .../main/res/layout/nougat_food_layout.xml | 1 + app/src/main/res/layout/pie_brushes.xml | 2 +- app/src/main/res/layout/pie_colors.xml | 2 +- app/src/main/res/layout/pie_toolbar.xml | 29 +++--- app/src/main/res/layout/q_platlogo_layout.xml | 11 ++- app/src/main/res/layout/r_edit_text.xml | 2 + app/src/main/res/layout/r_food_layout.xml | 1 + app/src/main/res/layout/s_paint_chip.xml | 5 +- .../layout/s_paint_chips_widget_preview.xml | 25 ++++- app/src/main/res/values/arrays.xml | 6 +- app/src/main/res/values/q_puzzles.xml | 8 +- app/src/main/res/values/strings.xml | 21 ++++ .../res/values/strings_nougat_neko_land.xml | 2 +- app/src/main/res/xml/pref_general.xml | 2 +- .../res/xml/s_paint_chips_widget_info.xml | 2 +- 60 files changed, 207 insertions(+), 427 deletions(-) delete mode 100644 app/src/main/res/layout-v21/nougat_cat_view.xml delete mode 100644 app/src/main/res/layout-v21/pie_toolbar.xml delete mode 100644 app/src/main/res/layout-v21/s_paint_chip.xml delete mode 100644 app/src/main/res/layout-v21/s_paint_chips_widget_preview.xml diff --git a/app/src/main/res/drawable-nodpi/clock_dial.xml b/app/src/main/res/drawable-nodpi/clock_dial.xml index 31695bca..2240b8b9 100644 --- a/app/src/main/res/drawable-nodpi/clock_dial.xml +++ b/app/src/main/res/drawable-nodpi/clock_dial.xml @@ -1,10 +1,13 @@ + android:viewportHeight="380" + tools:ignore="VectorRaster"> + android:fillColor="@color/system_neutral1_200" + tools:ignore="VectorPath" /> \ No newline at end of file diff --git a/app/src/main/res/drawable-nodpi/clock_hand_hour.xml b/app/src/main/res/drawable-nodpi/clock_hand_hour.xml index a861eeab..bbeacc8b 100644 --- a/app/src/main/res/drawable-nodpi/clock_hand_hour.xml +++ b/app/src/main/res/drawable-nodpi/clock_hand_hour.xml @@ -1,9 +1,11 @@ + android:viewportHeight="380" + tools:ignore="VectorRaster"> diff --git a/app/src/main/res/drawable-nodpi/clock_hand_minute.xml b/app/src/main/res/drawable-nodpi/clock_hand_minute.xml index e7129762..2b39e266 100644 --- a/app/src/main/res/drawable-nodpi/clock_hand_minute.xml +++ b/app/src/main/res/drawable-nodpi/clock_hand_minute.xml @@ -1,9 +1,11 @@ + android:viewportHeight="380" + tools:ignore="VectorRaster"> diff --git a/app/src/main/res/drawable-nodpi/marshmallow_cactus1.xml b/app/src/main/res/drawable-nodpi/marshmallow_cactus1.xml index 5da86347..70ded91f 100644 --- a/app/src/main/res/drawable-nodpi/marshmallow_cactus1.xml +++ b/app/src/main/res/drawable-nodpi/marshmallow_cactus1.xml @@ -11,13 +11,15 @@ Copyright (C) 2015 The Android Open Source Project limitations under the License. --> + android:fillColor="#0D904F" + tools:ignore="VectorPath" /> diff --git a/app/src/main/res/drawable-nodpi/ndp_platlogo.xml b/app/src/main/res/drawable-nodpi/ndp_platlogo.xml index 7b31cbe8..4a3e2925 100644 --- a/app/src/main/res/drawable-nodpi/ndp_platlogo.xml +++ b/app/src/main/res/drawable-nodpi/ndp_platlogo.xml @@ -11,10 +11,12 @@ Copyright (C) 2016 The Android Open Source Project limitations under the License. --> + android:viewportHeight="48.0" + tools:ignore="VectorRaster"> diff --git a/app/src/main/res/drawable-nodpi/oreo_platlogo.xml b/app/src/main/res/drawable-nodpi/oreo_platlogo.xml index 79dd9b24..6d8aee5d 100644 --- a/app/src/main/res/drawable-nodpi/oreo_platlogo.xml +++ b/app/src/main/res/drawable-nodpi/oreo_platlogo.xml @@ -11,10 +11,12 @@ Copyright (C) 2017 The Android Open Source Project limitations under the License. --> + android:viewportHeight="48.0" + tools:ignore="VectorRaster"> + android:viewportHeight="64" + tools:ignore="VectorRaster"> - + tools:ignore="VectorPath" /> + android:viewportHeight="512" + tools:ignore="VectorRaster"> diff --git a/app/src/main/res/drawable/lollipop_android.xml b/app/src/main/res/drawable/lollipop_android.xml index 6c446856..607ac521 100644 --- a/app/src/main/res/drawable/lollipop_android.xml +++ b/app/src/main/res/drawable/lollipop_android.xml @@ -11,7 +11,6 @@ Copyright (C) 2014 The Android Open Source Project limitations under the License. --> + android:width="48.0dp" + android:height="48.0dp" + android:viewportWidth="48.0" + android:viewportHeight="48.0"> diff --git a/app/src/main/res/drawable/lollipop_cloud_off.xml b/app/src/main/res/drawable/lollipop_cloud_off.xml index a35f420b..8df3a935 100644 --- a/app/src/main/res/drawable/lollipop_cloud_off.xml +++ b/app/src/main/res/drawable/lollipop_cloud_off.xml @@ -15,11 +15,12 @@ Copyright (C) 2014 The Android Open Source Project --> + android:width="24.0dp" + android:height="24.0dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:fillColor="#FFFFFF" + tools:ignore="VectorPath" /> diff --git a/app/src/main/res/drawable/lollipop_l_platlogo.xml b/app/src/main/res/drawable/lollipop_l_platlogo.xml index 06af5c1c..ea618721 100644 --- a/app/src/main/res/drawable/lollipop_l_platlogo.xml +++ b/app/src/main/res/drawable/lollipop_l_platlogo.xml @@ -11,7 +11,6 @@ Copyright (C) 2014 The Android Open Source Project limitations under the License. --> + android:width="100.0dp" + android:height="100.0dp" + android:viewportWidth="100.0" + android:viewportHeight="100.0"> diff --git a/app/src/main/res/drawable/lollipop_pop_droid.xml b/app/src/main/res/drawable/lollipop_pop_droid.xml index dccf6fbc..eed2e273 100644 --- a/app/src/main/res/drawable/lollipop_pop_droid.xml +++ b/app/src/main/res/drawable/lollipop_pop_droid.xml @@ -14,11 +14,10 @@ Copyright (C) 2014 The Android Open Source Project limitations under the License. --> + android:width="100.0dp" + android:height="100.0dp" + android:viewportWidth="100.0" + android:viewportHeight="100.0"> diff --git a/app/src/main/res/drawable/lollipop_pop_pizza.xml b/app/src/main/res/drawable/lollipop_pop_pizza.xml index b747e1f2..88d96b49 100644 --- a/app/src/main/res/drawable/lollipop_pop_pizza.xml +++ b/app/src/main/res/drawable/lollipop_pop_pizza.xml @@ -14,11 +14,10 @@ Copyright (C) 2014 The Android Open Source Project limitations under the License. --> + android:width="100.0dp" + android:height="100.0dp" + android:viewportWidth="100.0" + android:viewportHeight="100.0"> diff --git a/app/src/main/res/drawable/lollipop_pop_stripes.xml b/app/src/main/res/drawable/lollipop_pop_stripes.xml index 93b9f6d0..faf36ce0 100644 --- a/app/src/main/res/drawable/lollipop_pop_stripes.xml +++ b/app/src/main/res/drawable/lollipop_pop_stripes.xml @@ -14,11 +14,10 @@ Copyright (C) 2014 The Android Open Source Project limitations under the License. --> + android:width="100.0dp" + android:height="100.0dp" + android:viewportWidth="100.0" + android:viewportHeight="100.0"> diff --git a/app/src/main/res/drawable/lollipop_pop_swirl.xml b/app/src/main/res/drawable/lollipop_pop_swirl.xml index 6dedf5d3..e90b3b8e 100644 --- a/app/src/main/res/drawable/lollipop_pop_swirl.xml +++ b/app/src/main/res/drawable/lollipop_pop_swirl.xml @@ -14,11 +14,10 @@ Copyright (C) 2014 The Android Open Source Project limitations under the License. --> + android:width="100.0dp" + android:height="100.0dp" + android:viewportWidth="100.0" + android:viewportHeight="100.0"> diff --git a/app/src/main/res/drawable/lollipop_pop_vortex.xml b/app/src/main/res/drawable/lollipop_pop_vortex.xml index c26a898c..dc7b54fb 100644 --- a/app/src/main/res/drawable/lollipop_pop_vortex.xml +++ b/app/src/main/res/drawable/lollipop_pop_vortex.xml @@ -14,11 +14,10 @@ Copyright (C) 2014 The Android Open Source Project limitations under the License. --> + android:width="100.0dp" + android:height="100.0dp" + android:viewportWidth="100.0" + android:viewportHeight="100.0"> diff --git a/app/src/main/res/drawable/lollipop_pop_vortex2.xml b/app/src/main/res/drawable/lollipop_pop_vortex2.xml index 622115cc..afb0ec70 100644 --- a/app/src/main/res/drawable/lollipop_pop_vortex2.xml +++ b/app/src/main/res/drawable/lollipop_pop_vortex2.xml @@ -15,14 +15,15 @@ Copyright (C) 2014 The Android Open Source Project --> + android:width="100.0dp" + android:height="100.0dp" + android:viewportWidth="100.0" + android:viewportHeight="100.0"> + android:fillColor="#F06292" + tools:ignore="VectorPath" /> diff --git a/app/src/main/res/drawable/lollipop_star.xml b/app/src/main/res/drawable/lollipop_star.xml index 3fb97384..fc7e657d 100644 --- a/app/src/main/res/drawable/lollipop_star.xml +++ b/app/src/main/res/drawable/lollipop_star.xml @@ -14,11 +14,10 @@ Copyright (C) 2014 The Android Open Source Project limitations under the License. --> + android:width="48.0dp" + android:height="48.0dp" + android:viewportWidth="48.0" + android:viewportHeight="48.0"> diff --git a/app/src/main/res/drawable/lollipop_sun.xml b/app/src/main/res/drawable/lollipop_sun.xml index 23257b9e..d38e1d0a 100644 --- a/app/src/main/res/drawable/lollipop_sun.xml +++ b/app/src/main/res/drawable/lollipop_sun.xml @@ -11,7 +11,6 @@ Copyright (C) 2014 The Android Open Source Project limitations under the License. --> + android:pathData="M10.5 3a0.5 0.5 0 1 1 1 0v2.05a0.5 0.5 0 1 1-1 0V3zm3.1 0.42a0.5 0.5 0 0 1 0.93 0.39l-0.8 1.88A0.5 0.5 0 1 1 12.8 5.3l0.8-1.88zm2.7 1.57a0.5 0.5 0 1 1 0.71 0.7l-1.45 1.46a0.5 0.5 0 0 1-0.7-0.71l1.44-1.45zm1.9 2.5a0.5 0.5 0 0 1 0.38 0.92l-1.9 0.77a0.5 0.5 0 0 1-0.37-0.93l1.9-0.77zM19 10.5a0.5 0.5 0 1 1 0 1h-2.05a0.5 0.5 0 0 1 0-1H19zm-0.42 3.1a0.5 0.5 0 0 1-0.39 0.93l-1.88-0.8a0.5 0.5 0 1 1 0.39-0.92l1.88 0.8zm-1.57 2.7a0.5 0.5 0 1 1-0.7 0.71l-1.46-1.45a0.5 0.5 0 0 1 0.71-0.7l1.45 1.44zm-2.5 1.9a0.5 0.5 0 1 1-0.92 0.38l-0.77-1.9a0.5 0.5 0 0 1 0.93-0.37l0.77 1.9zM11.5 19a0.5 0.5 0 1 1-1 0v-2.05a0.5 0.5 0 0 1 1 0V19zm-3.1-0.42a0.5 0.5 0 0 1-0.93-0.39l0.8-1.88A0.5 0.5 0 0 1 9.2 16.7l-0.8 1.88zm-2.7-1.57a0.5 0.5 0 1 1-0.71-0.7l1.45-1.46a0.5 0.5 0 0 1 0.7 0.71L5.7 17.01zm-1.9-2.48a0.5 0.5 0 0 1-0.38-0.92l1.88-0.8a0.5 0.5 0 0 1 0.4 0.92l-1.9 0.8zM3 11.5a0.5 0.5 0 1 1 0-1h2.05a0.5 0.5 0 1 1 0 1H3zm0.42-3.1A0.5 0.5 0 0 1 3.8 7.46l1.88 0.8A0.5 0.5 0 1 1 5.3 9.2L3.42 8.4zm1.57-2.7a0.5 0.5 0 1 1 0.7-0.71l1.46 1.45a0.5 0.5 0 0 1-0.71 0.7L4.99 5.7zm2.5-1.9A0.5 0.5 0 0 1 8.4 3.41l0.77 1.9a0.5 0.5 0 0 1-0.93 0.37L7.48 3.8z" + tools:ignore="VectorPath" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/nougat_food_donut.xml b/app/src/main/res/drawable/nougat_food_donut.xml index 6aa1420f..2fa36be1 100644 --- a/app/src/main/res/drawable/nougat_food_donut.xml +++ b/app/src/main/res/drawable/nougat_food_donut.xml @@ -11,11 +11,13 @@ Copyright (C) 2015 The Android Open Source Project limitations under the License. --> + android:pathData="M24,4.5c-10.5,0,-19,8.5,-19,19s8.5,19,19,19s19,-8.5,19,-19S34.5,4.5,24,4.5z M35.2,15.5l1.6,-1.1 c0.3,-0.2,0.6,-0.1,0.8,0.1l0.1,0.1c0.2,0.3,0.1,0.6,-0.1,0.8l-1.6,1.1c-0.3,0.2,-0.6,0.1,-0.8,-0.1l-0.1,-0.1 C34.9,16.1,35,15.7,35.2,15.5z M32.7,10.7c0,-0.3,0.3,-0.5,0.6,-0.5l0.1,0c0.3,0,0.5,0.3,0.5,0.6l-0.2,2c0,0.3,-0.3,0.5,-0.6,0.5l-0.1,0 c-0.3,0,-0.5,-0.3,-0.5,-0.6L32.7,10.7z M31.7,15.1l1.5,-0.2c0.2,0,0.5,0.1,0.5,0.4l0,0.1c0,0.2,-0.1,0.5,-0.4,0.5l-1.5,0.2 c-0.2,0,-0.5,-0.1,-0.5,-0.4l0,-0.1C31.3,15.4,31.5,15.2,31.7,15.1z M28.8,10.6l1.6,-1.1c0.3,-0.2,0.6,-0.1,0.8,0.1l0.1,0.1 c0.2,0.3,0.1,0.6,-0.1,0.8l-1.6,1.1c-0.3,0.2,-0.6,0.1,-0.8,-0.1l-0.1,-0.1C28.4,11.1,28.5,10.8,28.8,10.6z M25.8,6 c0,-0.3,0.3,-0.5,0.6,-0.5l0.1,0c0.3,0,0.5,0.3,0.5,0.6l-0.2,2c0,0.3,-0.3,0.5,-0.6,0.5l-0.1,0c-0.3,0,-0.5,-0.3,-0.5,-0.6L25.8,6z M20.7,6.5l1.9,-0.7c0.3,-0.1,0.6,0,0.7,0.3l0,0.1c0.1,0.3,0,0.6,-0.3,0.7l-1.9,0.7c-0.3,0.1,-0.6,0,-0.7,-0.3l0,-0.1 C20.3,6.9,20.4,6.6,20.7,6.5z M19.9,10.9l1.5,-0.2c0.2,0,0.5,0.1,0.5,0.4l0,0.1c0,0.2,-0.1,0.5,-0.4,0.5l-1.5,0.2 c-0.2,0,-0.5,-0.1,-0.5,-0.4l0,-0.1C19.5,11.1,19.7,10.9,19.9,10.9z M16,10.9L16,10.9c0.2,-0.3,0.4,-0.4,0.6,-0.3l1.3,0.7 c0.2,0.1,0.3,0.4,0.2,0.6L18,12c-0.1,0.2,-0.4,0.3,-0.6,0.2l-1.3,-0.7C15.9,11.4,15.8,11.1,16,10.9z M15.8,18.5c0.2,0,0.4,0.1,0.5,0.4 l0,0.1c0,0.2,-0.1,0.4,-0.4,0.5l-1.5,0.2c-0.2,0,-0.4,-0.1,-0.5,-0.4l0,-0.1c0,-0.2,0.1,-0.4,0.4,-0.5L15.8,18.5z M14,21.8l-1.6,1.1 c-0.3,0.2,-0.6,0.1,-0.8,-0.1l-0.1,-0.1c-0.2,-0.3,-0.1,-0.6,0.1,-0.8l1.6,-1.1c0.3,-0.2,0.6,-0.1,0.8,0.1l0.1,0.1 C14.3,21.3,14.3,21.6,14,21.8z M12.4,12L12.4,12c0.3,-0.2,0.5,-0.2,0.7,-0.1l1,1.1c0.2,0.2,0.2,0.4,0,0.6L14,13.7 c-0.2,0.2,-0.4,0.2,-0.6,0l-1,-1.1C12.2,12.4,12.2,12.1,12.4,12z M8.3,24.5c0,0.3,-0.3,0.5,-0.6,0.5l-0.1,0c-0.3,0,-0.5,-0.3,-0.5,-0.6 l0.2,-2c0,-0.3,0.3,-0.5,0.6,-0.5l0.1,0c0.3,0,0.5,0.3,0.5,0.6L8.3,24.5z M8.5,16.2v-0.1c0,-0.3,0.2,-0.6,0.6,-0.6h2 c0.3,0,0.6,0.2,0.6,0.6v0.1c0,0.3,-0.2,0.6,-0.6,0.6H9C8.7,16.7,8.5,16.5,8.5,16.2z M10.3,20.7c-0.3,0.2,-0.6,0.1,-0.8,-0.1l-0.1,-0.1 c-0.2,-0.3,-0.1,-0.6,0.1,-0.8l1.6,-1.1c0.3,-0.2,0.6,-0.1,0.8,0.1l0.1,0.1c0.2,0.3,0.1,0.6,-0.1,0.8L10.3,20.7z M11.3,28.3l0,-0.1 c-0.1,-0.3,0,-0.6,0.3,-0.7l1.9,-0.7c0.3,-0.1,0.6,0,0.7,0.3l0,0.1c0.1,0.3,0,0.6,-0.3,0.7L12,28.6C11.7,28.7,11.4,28.6,11.3,28.3z M14.4,33c0,0.2,-0.2,0.4,-0.4,0.4h-1.5c-0.2,0,-0.4,-0.2,-0.4,-0.4v-0.1c0,-0.2,0.2,-0.4,0.4,-0.4H14c0.2,0,0.4,0.2,0.4,0.4V33z M17.9,35.2 l-1.6,1.1c-0.3,0.2,-0.6,0.1,-0.8,-0.1l-0.1,-0.1c-0.2,-0.3,-0.1,-0.6,0.1,-0.8l1.6,-1.1c0.3,-0.2,0.6,-0.1,0.8,0.1l0.1,0.1 C18.2,34.7,18.2,35.1,17.9,35.2z M20.7,33.8l-0.1,0.1c-0.1,0.3,-0.5,0.4,-0.8,0.2l-1.7,-1c-0.3,-0.1,-0.4,-0.5,-0.2,-0.8l0.1,-0.1 c0.1,-0.3,0.5,-0.4,0.8,-0.2l1.7,1C20.7,33.2,20.8,33.5,20.7,33.8z M17.5,23.5c0,-3.6,2.9,-6.5,6.5,-6.5s6.5,2.9,6.5,6.5 c0,3.6,-2.9,6.5,-6.5,6.5S17.5,27.1,17.5,23.5z M27.4,35.7l-1.9,0.7c-0.3,0.1,-0.6,0,-0.7,-0.3l0,-0.1c-0.1,-0.3,0,-0.6,0.3,-0.7l1.9,-0.7 c0.3,-0.1,0.6,0,0.7,0.3l0,0.1C27.9,35.3,27.7,35.6,27.4,35.7z M29.7,32.7l-1.4,0.5c-0.2,0.1,-0.5,0,-0.5,-0.3l0,-0.1 c-0.1,-0.2,0,-0.5,0.3,-0.5l1.4,-0.5c0.2,-0.1,0.5,0,0.5,0.3l0,0.1C30,32.3,29.9,32.6,29.7,32.7z M32.8,35.5l-0.1,0.1 c-0.1,0.3,-0.5,0.4,-0.8,0.2l-1.7,-1c-0.3,-0.1,-0.4,-0.5,-0.2,-0.8l0.1,-0.1c0.1,-0.3,0.5,-0.4,0.8,-0.2l1.7,1C32.8,34.9,32.9,35.2,32.8,35.5z M33.7,30.9c0,0.2,-0.2,0.4,-0.5,0.4l-0.1,0c-0.2,0,-0.4,-0.2,-0.4,-0.5l0.1,-1.5c0,-0.2,0.2,-0.4,0.5,-0.4l0.1,0c0.2,0,0.4,0.2,0.4,0.5 L33.7,30.9z M34.5,26.5l-1.3,0.9c-0.2,0.1,-0.5,0.1,-0.6,-0.1l-0.1,-0.1c-0.1,-0.2,-0.1,-0.5,0.1,-0.6l1.3,-0.9c0.2,-0.1,0.5,-0.1,0.6,0.1 l0.1,0.1C34.8,26.1,34.7,26.3,34.5,26.5z M35.6,20.6l-1.7,-1c-0.3,-0.1,-0.4,-0.5,-0.2,-0.8l0.1,-0.1c0.1,-0.3,0.5,-0.4,0.8,-0.2l1.7,1 c0.3,0.1,0.4,0.5,0.2,0.8l-0.1,0.1C36.2,20.6,35.8,20.7,35.6,20.6z M38.6,27.1l-1.6,1.1c-0.3,0.2,-0.6,0.1,-0.8,-0.1L36.1,28 c-0.2,-0.3,-0.1,-0.6,0.1,-0.8l1.6,-1.1c0.3,-0.2,0.6,-0.1,0.8,0.1l0.1,0.1C38.9,26.6,38.8,27,38.6,27.1z M39,19.4l-1.5,0.2 c-0.2,0,-0.5,-0.1,-0.5,-0.4l0,-0.1c0,-0.2,0.1,-0.5,0.4,-0.5l1.5,-0.2c0.2,0,0.5,0.1,0.5,0.4l0,0.1C39.4,19.1,39.2,19.3,39,19.4z" + tools:ignore="VectorPath" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/nougat_icon.xml b/app/src/main/res/drawable/nougat_icon.xml index 7b31cbe8..4a3e2925 100644 --- a/app/src/main/res/drawable/nougat_icon.xml +++ b/app/src/main/res/drawable/nougat_icon.xml @@ -11,10 +11,12 @@ Copyright (C) 2016 The Android Open Source Project limitations under the License. --> + android:viewportHeight="48.0" + tools:ignore="VectorRaster"> diff --git a/app/src/main/res/drawable/oreo_mr1_platlogo.xml b/app/src/main/res/drawable/oreo_mr1_platlogo.xml index 2d4e0418..587e7032 100644 --- a/app/src/main/res/drawable/oreo_mr1_platlogo.xml +++ b/app/src/main/res/drawable/oreo_mr1_platlogo.xml @@ -12,6 +12,7 @@ Copyright (C) 2017 The Android Open Source Project limitations under the License. --> + android:pathData="M22 40.5c0.36 0 0.73-0.01 1.09-0.03l-0.18-3A15.77 15.77 0 0 1 22 37.5v3zm2.17-0.13a18.48 18.48 0 0 0 1.08-0.15l-0.53-2.96c-0.3 0.05-0.6 0.1-0.9 0.13l0.35 2.98zM26.32 40a18.37 18.37 0 0 0 1.05-0.28l-0.87-2.87a15.37 15.37 0 0 1-0.88 0.23l0.7 2.92zm2.1-0.64l-1.03-2.81a15.39 15.39 0 0 0 0.84-0.34l1.2 2.74a18.39 18.39 0 0 1-1 0.41zm1.99-0.87l-1.37-2.67a15.46 15.46 0 0 0 0.8-0.44l1.52 2.59a18.46 18.46 0 0 1-0.95 0.52zm1.89-1.11l-1.67-2.5a15.55 15.55 0 0 0 0.74-0.52l1.81 2.39a18.55 18.55 0 0 1-0.88 0.63zm1.75-1.33l-1.95-2.28a15.6 15.6 0 0 0 0.67-0.61l2.09 2.15a18.6 18.6 0 0 1-0.8 0.74zm1.6-1.55l-2.22-2.02a15.6 15.6 0 0 0 0.6-0.7l2.33 1.9a18.6 18.6 0 0 1-0.72 0.82zM37 32.82l-2.43-1.76a15.53 15.53 0 0 0 0.5-0.75l2.54 1.6c-0.2 0.31-0.4 0.61-0.61 0.9zm1.15-1.8l-2.62-1.47a15.45 15.45 0 0 0 0.42-0.8l2.7 1.3a18.45 18.45 0 0 1-0.5 0.97zm0.95-1.98l-2.77-1.14a15.38 15.38 0 0 0 0.32-0.86l2.84 0.98a18.38 18.38 0 0 1-0.39 1.02zm0.72-2.09c0.1-0.34 0.18-0.7 0.26-1.05l-2.93-0.63a15.38 15.38 0 0 1-0.22 0.88l2.89 0.8zm0.46-2.15a18.52 18.52 0 0 0 0.13-1.08l-2.99-0.28a15.52 15.52 0 0 1-0.1 0.9l2.96 0.46zm0.2-2.2a18.81 18.81 0 0 0 0-1.1l-3 0.08a16 16 0 0 1 0 0.92l3 0.1zm-0.06-2.2a18.54 18.54 0 0 0-0.12-1.07l-2.97 0.43c0.04 0.3 0.08 0.6 0.1 0.9l3-0.25zm-0.31-2.15a18.39 18.39 0 0 0-0.25-1.06l-2.9 0.78a15.39 15.39 0 0 1 0.21 0.89l2.94-0.6zm-0.57-2.12l-2.85 0.95a15.37 15.37 0 0 0-0.31-0.85l2.78-1.12a18.37 18.37 0 0 1 0.38 1.02zm-0.83-2.06l-2.71 1.29a15.44 15.44 0 0 0-0.42-0.81l2.63-1.45a18.44 18.44 0 0 1 0.5 0.97zm-1.03-1.88l-2.54 1.6a15.53 15.53 0 0 0-0.5-0.76l2.44-1.74 0.6 0.9zm-1.28-1.79l-2.33 1.88a15.6 15.6 0 0 0-0.6-0.69l2.23-2.02a18.6 18.6 0 0 1 0.7 0.83zm-1.48-1.63l-2.1 2.14a15.6 15.6 0 0 0-0.67-0.62l1.97-2.26a18.6 18.6 0 0 1 0.8 0.74zM33.24 7.3l-1.82 2.38a15.55 15.55 0 0 0-0.74-0.53l1.68-2.49c0.3 0.2 0.6 0.42 0.88 0.64zm-1.71-1.17L29.98 8.7a15.47 15.47 0 0 0-0.8-0.45l1.4-2.66a18.47 18.47 0 0 1 0.95 0.54zm-1.95-1.02l-1.23 2.74A15.4 15.4 0 0 0 27.5 7.5l1.06-2.8a18.4 18.4 0 0 1 1.01 0.4zm-2.06-0.78l-0.9 2.86a15.37 15.37 0 0 0-0.87-0.24l0.72-2.92a18.37 18.37 0 0 1 1.05 0.3zM25.38 3.8a18.47 18.47 0 0 0-1.08-0.17l-0.37 2.98c0.3 0.04 0.6 0.08 0.9 0.14l0.55-2.95zm-2.2-0.27A18.75 18.75 0 0 0 22.1 3.5l-0.02 3L23 6.53l0.19-3zM21 3.53a18.6 18.6 0 0 0-1.08 0.09l0.33 2.98a15.6 15.6 0 0 1 0.91-0.08l-0.16-3zm-2.16 0.24A18.4 18.4 0 0 0 17.76 4l0.68 2.92a15.4 15.4 0 0 1 0.9-0.18l-0.51-2.96zm-2.14 0.5l0.86 2.88a15.37 15.37 0 0 0-0.86 0.28l-1.03-2.81a18.37 18.37 0 0 1 1.03-0.35zm-2.07 0.76l1.2 2.75a15.42 15.42 0 0 0-0.83 0.4L13.63 5.5a18.42 18.42 0 0 1 0.99-0.47zM12.7 6l1.5 2.6a15.5 15.5 0 0 0-0.76 0.48l-1.66-2.5A18.5 18.5 0 0 1 12.7 6zm-1.83 1.22l1.8 2.4a15.58 15.58 0 0 0-0.7 0.57L10.01 7.9a18.58 18.58 0 0 1 0.85-0.68zM9.19 8.66l2.07 2.16a15.6 15.6 0 0 0-0.63 0.65l-2.2-2.04a18.6 18.6 0 0 1 0.76-0.77zm-1.51 1.63l2.32 1.9a15.57 15.57 0 0 0-0.56 0.72l-2.42-1.76a18.57 18.57 0 0 1 0.66-0.86zm-1.23 1.69l2.52 1.62a15.5 15.5 0 0 0-0.47 0.78l-2.61-1.47a18.5 18.5 0 0 1 0.56-0.93zm-1.08 1.9l2.7 1.32a15.41 15.41 0 0 0-0.38 0.83l-2.77-1.15a18.41 18.41 0 0 1 0.45-1zm-0.85 2.04l2.84 0.98a15.37 15.37 0 0 0-0.28 0.87L4.2 16.96c0.1-0.35 0.2-0.7 0.32-1.04zm-0.6 2.12a18.43 18.43 0 0 0-0.2 1.07l2.97 0.47c0.05-0.3 0.1-0.6 0.17-0.9l-2.93-0.64zm-0.34 2.18a18.65 18.65 0 0 0-0.07 1.09l3 0.11 0.06-0.91-2.99-0.29zm-0.08 2.2a18.7 18.7 0 0 0 0.06 1.1l3-0.25a15.7 15.7 0 0 1-0.06-0.91l-3 0.07zm0.18 2.18a18.44 18.44 0 0 0 0.18 1.07l2.95-0.6a15.44 15.44 0 0 1-0.16-0.9L3.68 24.6zm0.43 2.14l2.9-0.77a15.37 15.37 0 0 0 0.26 0.88l-2.85 0.94a18.37 18.37 0 0 1-0.3-1.05zm0.7 2.1l2.78-1.11a15.4 15.4 0 0 0 0.36 0.83l-2.71 1.27a18.4 18.4 0 0 1-0.44-1zm0.9 1.95l2.65-1.43a15.48 15.48 0 0 0 0.45 0.8l-2.55 1.57a18.48 18.48 0 0 1-0.54-0.94zm1.17 1.87l2.45-1.73a15.56 15.56 0 0 0 0.54 0.73l-2.34 1.87a18.56 18.56 0 0 1-0.65-0.87zm1.37 1.72l2.23-2a15.6 15.6 0 0 0 0.63 0.65l-2.1 2.14a18.6 18.6 0 0 1-0.76-0.79zm1.58 1.56l1.98-2.26c0.22 0.2 0.46 0.39 0.7 0.58l-1.84 2.37a18.59 18.59 0 0 1-0.84-0.7zm1.66 1.28l1.7-2.46a15.52 15.52 0 0 0 0.77 0.5l-1.56 2.56a18.52 18.52 0 0 1-0.91-0.6zm1.87 1.14l1.4-2.65a15.43 15.43 0 0 0 0.82 0.4l-1.24 2.73a18.43 18.43 0 0 1-0.98-0.48zm2 0.91l1.08-2.8a15.37 15.37 0 0 0 0.86 0.3l-0.9 2.86a18.37 18.37 0 0 1-1.04-0.36zm2.1 0.67a18.4 18.4 0 0 0 1.07 0.23l0.56-2.94a15.4 15.4 0 0 1-0.9-0.2l-0.72 2.91zm2.18 0.41a18.57 18.57 0 0 0 1.08 0.1l0.2-2.99a15.57 15.57 0 0 1-0.9-0.09l-0.38 2.98zm2.2 0.15H22v-3h-0.13l-0.03 3z" + tools:ignore="VectorPath" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/oreo_mr1_platlogo_new.xml b/app/src/main/res/drawable/oreo_mr1_platlogo_new.xml index 261015cb..cbe8a82d 100644 --- a/app/src/main/res/drawable/oreo_mr1_platlogo_new.xml +++ b/app/src/main/res/drawable/oreo_mr1_platlogo_new.xml @@ -11,14 +11,12 @@ Copyright (C) 2017 The Android Open Source Project limitations under the License. --> - + android:viewportHeight="48.0" + tools:ignore="VectorRaster"> diff --git a/app/src/main/res/drawable/q_android_logotype.xml b/app/src/main/res/drawable/q_android_logotype.xml index d21eaf6f..68464463 100644 --- a/app/src/main/res/drawable/q_android_logotype.xml +++ b/app/src/main/res/drawable/q_android_logotype.xml @@ -11,10 +11,12 @@ Copyright (C) 2015 The Android Open Source Project limitations under the License. --> + android:viewportHeight="64.0" + tools:ignore="VectorRaster"> diff --git a/app/src/main/res/drawable/r_food_cookie.xml b/app/src/main/res/drawable/r_food_cookie.xml index 74dd1343..2397d51b 100644 --- a/app/src/main/res/drawable/r_food_cookie.xml +++ b/app/src/main/res/drawable/r_food_cookie.xml @@ -15,6 +15,7 @@ Copyright (C) 2017 The Android Open Source Project limitations under the License. --> + android:pathData="M10.5 3a0.5 0.5 0 1 1 1 0v2.05a0.5 0.5 0 1 1-1 0V3zm3.1 0.42a0.5 0.5 0 0 1 0.93 0.39l-0.8 1.88A0.5 0.5 0 1 1 12.8 5.3l0.8-1.88zm2.7 1.57a0.5 0.5 0 1 1 0.71 0.7l-1.45 1.46a0.5 0.5 0 0 1-0.7-0.71l1.44-1.45zm1.9 2.5a0.5 0.5 0 0 1 0.38 0.92l-1.9 0.77a0.5 0.5 0 0 1-0.37-0.93l1.9-0.77zM19 10.5a0.5 0.5 0 1 1 0 1h-2.05a0.5 0.5 0 0 1 0-1H19zm-0.42 3.1a0.5 0.5 0 0 1-0.39 0.93l-1.88-0.8a0.5 0.5 0 1 1 0.39-0.92l1.88 0.8zm-1.57 2.7a0.5 0.5 0 1 1-0.7 0.71l-1.46-1.45a0.5 0.5 0 0 1 0.71-0.7l1.45 1.44zm-2.5 1.9a0.5 0.5 0 1 1-0.92 0.38l-0.77-1.9a0.5 0.5 0 0 1 0.93-0.37l0.77 1.9zM11.5 19a0.5 0.5 0 1 1-1 0v-2.05a0.5 0.5 0 0 1 1 0V19zm-3.1-0.42a0.5 0.5 0 0 1-0.93-0.39l0.8-1.88A0.5 0.5 0 0 1 9.2 16.7l-0.8 1.88zm-2.7-1.57a0.5 0.5 0 1 1-0.71-0.7l1.45-1.46a0.5 0.5 0 0 1 0.7 0.71L5.7 17.01zm-1.9-2.48a0.5 0.5 0 0 1-0.38-0.92l1.88-0.8a0.5 0.5 0 0 1 0.4 0.92l-1.9 0.8zM3 11.5a0.5 0.5 0 1 1 0-1h2.05a0.5 0.5 0 1 1 0 1H3zm0.42-3.1A0.5 0.5 0 0 1 3.8 7.46l1.88 0.8A0.5 0.5 0 1 1 5.3 9.2L3.42 8.4zm1.57-2.7a0.5 0.5 0 1 1 0.7-0.71l1.46 1.45a0.5 0.5 0 0 1-0.71 0.7L4.99 5.7zm2.5-1.9A0.5 0.5 0 0 1 8.4 3.41l0.77 1.9a0.5 0.5 0 0 1-0.93 0.37L7.48 3.8z" + tools:ignore="VectorPath" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/r_ic_toy_mouse.xml b/app/src/main/res/drawable/r_ic_toy_mouse.xml index c838829f..51471eeb 100644 --- a/app/src/main/res/drawable/r_ic_toy_mouse.xml +++ b/app/src/main/res/drawable/r_ic_toy_mouse.xml @@ -14,6 +14,7 @@ limitations under the License. --> + android:fillColor="#FF4080" + tools:ignore="VectorPath" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/r_ic_water_filled.xml b/app/src/main/res/drawable/r_ic_water_filled.xml index 43475309..1f232e0c 100644 --- a/app/src/main/res/drawable/r_ic_water_filled.xml +++ b/app/src/main/res/drawable/r_ic_water_filled.xml @@ -14,11 +14,13 @@ limitations under the License. --> + android:fillColor="#0080FF" + tools:ignore="VectorPath" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/r_platlogo.xml b/app/src/main/res/drawable/r_platlogo.xml index e74ad3d8..1ec978c3 100644 --- a/app/src/main/res/drawable/r_platlogo.xml +++ b/app/src/main/res/drawable/r_platlogo.xml @@ -1,8 +1,10 @@ + android:viewportHeight="512" + tools:ignore="VectorRaster"> diff --git a/app/src/main/res/layout-night/listview_selector.xml b/app/src/main/res/layout-night/listview_selector.xml index f1fec374..436efd96 100644 --- a/app/src/main/res/layout-night/listview_selector.xml +++ b/app/src/main/res/layout-night/listview_selector.xml @@ -20,7 +20,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textAppearance="?android:attr/textAppearanceMedium" - android:text="%ANDROID VERSION%" + android:text="@string/android_version_template" android:id="@+id/tvTitle" android:textColor="@color/white" /> @@ -28,20 +28,18 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textAppearance="?android:attr/textAppearanceSmall" - android:text="Android %RANGE%" + android:text="@string/android_range_template" android:id="@+id/tvRange" android:layout_below="@+id/tvTitle" - android:layout_alignParentLeft="true" android:layout_alignParentStart="true" /> \ No newline at end of file diff --git a/app/src/main/res/layout-v21/nougat_cat_view.xml b/app/src/main/res/layout-v21/nougat_cat_view.xml deleted file mode 100644 index 2978cd14..00000000 --- a/app/src/main/res/layout-v21/nougat_cat_view.xml +++ /dev/null @@ -1,78 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout-v21/pie_toolbar.xml b/app/src/main/res/layout-v21/pie_toolbar.xml deleted file mode 100644 index d9cf3d5f..00000000 --- a/app/src/main/res/layout-v21/pie_toolbar.xml +++ /dev/null @@ -1,97 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout-v21/s_paint_chip.xml b/app/src/main/res/layout-v21/s_paint_chip.xml deleted file mode 100644 index d8605ba4..00000000 --- a/app/src/main/res/layout-v21/s_paint_chip.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - \ No newline at end of file diff --git a/app/src/main/res/layout-v21/s_paint_chips_widget_preview.xml b/app/src/main/res/layout-v21/s_paint_chips_widget_preview.xml deleted file mode 100644 index cc407551..00000000 --- a/app/src/main/res/layout-v21/s_paint_chips_widget_preview.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout-v31/s_paint_chips_widget_preview.xml b/app/src/main/res/layout-v31/s_paint_chips_widget_preview.xml index ed6bf7b2..e1b82046 100644 --- a/app/src/main/res/layout-v31/s_paint_chips_widget_preview.xml +++ b/app/src/main/res/layout-v31/s_paint_chips_widget_preview.xml @@ -18,7 +18,7 @@ android:backgroundTint="@android:color/system_neutral1_500" android:fontFamily="?android:attr/textAppearanceLarge" android:gravity="center" - android:text="N1-500" + android:text="@string/sample_n_color" android:textColor="?android:attr/textColorPrimary" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_main_screen.xml b/app/src/main/res/layout/activity_main_screen.xml index 60cec36e..97e7e992 100644 --- a/app/src/main/res/layout/activity_main_screen.xml +++ b/app/src/main/res/layout/activity_main_screen.xml @@ -20,7 +20,7 @@