From 07e032268fa0abbddcc93b3aa0eb3f6efc2ee759 Mon Sep 17 00:00:00 2001 From: LooKeR Date: Mon, 25 Oct 2021 10:09:18 +0530 Subject: [PATCH] Update: Replace old icons with material icons --- build.gradle | 6 +++--- .../com/looker/droidify/utility/Utils.kt | 6 +----- src/main/res/color/tab_text_color.xml | 2 +- src/main/res/drawable/ic_add.xml | 9 ++++----- src/main/res/drawable/ic_archive.xml | 14 +++++--------- src/main/res/drawable/ic_arrow_down.xml | 12 +++++------- src/main/res/drawable/ic_bug_report.xml | 15 +++++---------- src/main/res/drawable/ic_code.xml | 5 +++-- src/main/res/drawable/ic_copyright.xml | 19 +++++-------------- src/main/res/drawable/ic_delete.xml | 10 +++++----- src/main/res/drawable/ic_donate_regular.xml | 9 +++++---- src/main/res/drawable/ic_edit.xml | 11 ++++------- src/main/res/drawable/ic_email.xml | 13 +++++-------- src/main/res/drawable/ic_history.xml | 14 +++++--------- src/main/res/drawable/ic_launch.xml | 14 ++++++-------- src/main/res/drawable/ic_new_releases.xml | 13 +++++-------- .../drawable/ic_perm_device_information.xml | 13 +++++-------- src/main/res/drawable/ic_person.xml | 13 +++++-------- src/main/res/drawable/ic_photo_camera.xml | 18 ++++++++---------- src/main/res/drawable/ic_save.xml | 13 +++++-------- src/main/res/drawable/ic_search.xml | 14 +++++--------- src/main/res/drawable/ic_sort.xml | 13 ++++++------- src/main/res/drawable/ic_sync.xml | 14 +++++--------- src/main/res/drawable/ic_tune.xml | 13 +++++-------- src/main/res/values/styles.xml | 3 +++ 25 files changed, 114 insertions(+), 172 deletions(-) diff --git a/build.gradle b/build.gradle index 73e64246..a43f3279 100644 --- a/build.gradle +++ b/build.gradle @@ -115,11 +115,11 @@ repositories { dependencies { // Frontend + implementation 'androidx.appcompat:appcompat:1.4.0-beta01' implementation 'androidx.viewpager2:viewpager2:1.0.0' - implementation "androidx.appcompat:appcompat:1.4.0-beta01" - implementation "androidx.fragment:fragment-ktx:1.4.0-alpha10" + implementation 'androidx.fragment:fragment-ktx:1.4.0-alpha10' implementation 'androidx.vectordrawable:vectordrawable:1.1.0' - implementation "com.google.android.material:material:1.5.0-alpha04" + implementation 'com.google.android.material:material:1.5.0-alpha04' // Backend implementation 'io.coil-kt:coil:1.4.0' diff --git a/src/main/kotlin/com/looker/droidify/utility/Utils.kt b/src/main/kotlin/com/looker/droidify/utility/Utils.kt index 00ab11d3..657959f5 100644 --- a/src/main/kotlin/com/looker/droidify/utility/Utils.kt +++ b/src/main/kotlin/com/looker/droidify/utility/Utils.kt @@ -42,11 +42,7 @@ object Utils { } fun getToolbarIcon(context: Context, resId: Int): Drawable { - val drawable = context.getDrawableCompat(resId).mutate() - if (Android.sdk(23)) { - drawable.setTintList(context.getColorFromAttr(R.attr.colorOnPrimarySurface)) - } - return drawable + return context.getDrawableCompat(resId).mutate() } fun calculateHash(signature: Signature): String { diff --git a/src/main/res/color/tab_text_color.xml b/src/main/res/color/tab_text_color.xml index 76a63648..df033810 100644 --- a/src/main/res/color/tab_text_color.xml +++ b/src/main/res/color/tab_text_color.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/src/main/res/drawable/ic_add.xml b/src/main/res/drawable/ic_add.xml index c6afe5d4..1b58d080 100644 --- a/src/main/res/drawable/ic_add.xml +++ b/src/main/res/drawable/ic_add.xml @@ -1,12 +1,11 @@ - + android:viewportHeight="24" + android:tint="?attr/colorControlNormal"> - - + android:pathData="M18,13h-5v5c0,0.55 -0.45,1 -1,1s-1,-0.45 -1,-1v-5H6c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1h5V6c0,-0.55 0.45,-1 1,-1s1,0.45 1,1v5h5c0.55,0 1,0.45 1,1s-0.45,1 -1,1z"/> + \ No newline at end of file diff --git a/src/main/res/drawable/ic_archive.xml b/src/main/res/drawable/ic_archive.xml index 6fd6138f..adefe7ee 100644 --- a/src/main/res/drawable/ic_archive.xml +++ b/src/main/res/drawable/ic_archive.xml @@ -1,14 +1,10 @@ - - + android:viewportHeight="24" + android:tint="?attr/colorControlNormal"> - - + android:fillColor="@android:color/white" + android:pathData="M16.59,9H15V4c0,-0.55 -0.45,-1 -1,-1h-4c-0.55,0 -1,0.45 -1,1v5H7.41c-0.89,0 -1.34,1.08 -0.71,1.71l4.59,4.59c0.39,0.39 1.02,0.39 1.41,0l4.59,-4.59c0.63,-0.63 0.19,-1.71 -0.7,-1.71zM5,19c0,0.55 0.45,1 1,1h12c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1H6c-0.55,0 -1,0.45 -1,1z"/> + \ No newline at end of file diff --git a/src/main/res/drawable/ic_arrow_down.xml b/src/main/res/drawable/ic_arrow_down.xml index ab7e3eeb..e217b722 100644 --- a/src/main/res/drawable/ic_arrow_down.xml +++ b/src/main/res/drawable/ic_arrow_down.xml @@ -1,12 +1,10 @@ - - + android:viewportHeight="24" + android:tint="?attr/colorControlNormal"> - - + android:fillColor="@android:color/white" + android:pathData="M15.88,9.29L12,13.17 8.12,9.29c-0.39,-0.39 -1.02,-0.39 -1.41,0 -0.39,0.39 -0.39,1.02 0,1.41l4.59,4.59c0.39,0.39 1.02,0.39 1.41,0l4.59,-4.59c0.39,-0.39 0.39,-1.02 0,-1.41 -0.39,-0.38 -1.03,-0.39 -1.42,0z"/> + \ No newline at end of file diff --git a/src/main/res/drawable/ic_bug_report.xml b/src/main/res/drawable/ic_bug_report.xml index 2ea88cb2..2b3b24a2 100644 --- a/src/main/res/drawable/ic_bug_report.xml +++ b/src/main/res/drawable/ic_bug_report.xml @@ -1,15 +1,10 @@ - - + android:viewportHeight="24" + android:tint="?attr/colorControlNormal"> - - + android:fillColor="@android:color/white" + android:pathData="M19,8h-1.81c-0.45,-0.78 -1.07,-1.45 -1.82,-1.96l0.93,-0.93c0.39,-0.39 0.39,-1.02 0,-1.41 -0.39,-0.39 -1.02,-0.39 -1.41,0l-1.47,1.47C12.96,5.06 12.49,5 12,5s-0.96,0.06 -1.41,0.17L9.11,3.7c-0.39,-0.39 -1.02,-0.39 -1.41,0 -0.39,0.39 -0.39,1.02 0,1.41l0.92,0.93C7.88,6.55 7.26,7.22 6.81,8L5,8c-0.55,0 -1,0.45 -1,1s0.45,1 1,1h1.09c-0.05,0.33 -0.09,0.66 -0.09,1v1L5,12c-0.55,0 -1,0.45 -1,1s0.45,1 1,1h1v1c0,0.34 0.04,0.67 0.09,1L5,16c-0.55,0 -1,0.45 -1,1s0.45,1 1,1h1.81c1.04,1.79 2.97,3 5.19,3s4.15,-1.21 5.19,-3L19,18c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1h-1.09c0.05,-0.33 0.09,-0.66 0.09,-1v-1h1c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1h-1v-1c0,-0.34 -0.04,-0.67 -0.09,-1L19,10c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1zM13,16h-2c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1h2c0.55,0 1,0.45 1,1s-0.45,1 -1,1zM13,12h-2c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1h2c0.55,0 1,0.45 1,1s-0.45,1 -1,1z"/> + \ No newline at end of file diff --git a/src/main/res/drawable/ic_code.xml b/src/main/res/drawable/ic_code.xml index 1c0066d8..0d08fea8 100644 --- a/src/main/res/drawable/ic_code.xml +++ b/src/main/res/drawable/ic_code.xml @@ -2,8 +2,9 @@ android:width="24dp" android:height="24dp" android:viewportWidth="24" - android:viewportHeight="24"> + android:viewportHeight="24" + android:tint="?attr/colorControlNormal"> \ No newline at end of file diff --git a/src/main/res/drawable/ic_copyright.xml b/src/main/res/drawable/ic_copyright.xml index 4a2ac25e..553cb97c 100644 --- a/src/main/res/drawable/ic_copyright.xml +++ b/src/main/res/drawable/ic_copyright.xml @@ -1,19 +1,10 @@ - - + android:viewportHeight="24" + android:tint="?attr/colorControlNormal"> - - + android:fillColor="@android:color/white" + android:pathData="M10.08,10.86c0.05,-0.33 0.16,-0.62 0.3,-0.87s0.34,-0.46 0.59,-0.62c0.24,-0.15 0.54,-0.22 0.91,-0.23 0.23,0.01 0.44,0.05 0.63,0.13 0.2,0.09 0.38,0.21 0.52,0.36s0.25,0.33 0.34,0.53 0.13,0.42 0.14,0.64h1.79c-0.02,-0.47 -0.11,-0.9 -0.28,-1.29s-0.4,-0.73 -0.7,-1.01 -0.66,-0.5 -1.08,-0.66 -0.88,-0.23 -1.39,-0.23c-0.65,0 -1.22,0.11 -1.7,0.34s-0.88,0.53 -1.2,0.92 -0.56,0.84 -0.71,1.36S8,11.29 8,11.87v0.27c0,0.58 0.08,1.12 0.23,1.64s0.39,0.97 0.71,1.35 0.72,0.69 1.2,0.91c0.48,0.22 1.05,0.34 1.7,0.34 0.47,0 0.91,-0.08 1.32,-0.23s0.77,-0.36 1.08,-0.63 0.56,-0.58 0.74,-0.94 0.29,-0.74 0.3,-1.15h-1.79c-0.01,0.21 -0.06,0.4 -0.15,0.58s-0.21,0.33 -0.36,0.46 -0.32,0.23 -0.52,0.3c-0.19,0.07 -0.39,0.09 -0.6,0.1 -0.36,-0.01 -0.66,-0.08 -0.89,-0.23 -0.25,-0.16 -0.45,-0.37 -0.59,-0.62s-0.25,-0.55 -0.3,-0.88 -0.08,-0.67 -0.08,-1v-0.27c0,-0.35 0.03,-0.68 0.08,-1.01zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8z"/> + \ No newline at end of file diff --git a/src/main/res/drawable/ic_delete.xml b/src/main/res/drawable/ic_delete.xml index 7107d6e3..9522f173 100644 --- a/src/main/res/drawable/ic_delete.xml +++ b/src/main/res/drawable/ic_delete.xml @@ -3,10 +3,10 @@ android:width="24dp" android:height="24dp" android:viewportWidth="24" - android:viewportHeight="24"> + android:viewportHeight="24" + android:tint="?attr/colorControlNormal"> - - + android:fillColor="@android:color/white" + android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V9c0,-1.1 -0.9,-2 -2,-2H8c-1.1,0 -2,0.9 -2,2v10zM18,4h-2.5l-0.71,-0.71c-0.18,-0.18 -0.44,-0.29 -0.7,-0.29H9.91c-0.26,0 -0.52,0.11 -0.7,0.29L8.5,4H6c-0.55,0 -1,0.45 -1,1s0.45,1 1,1h12c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1z"/> + \ No newline at end of file diff --git a/src/main/res/drawable/ic_donate_regular.xml b/src/main/res/drawable/ic_donate_regular.xml index 196125b2..6f80790d 100644 --- a/src/main/res/drawable/ic_donate_regular.xml +++ b/src/main/res/drawable/ic_donate_regular.xml @@ -2,8 +2,9 @@ android:width="24dp" android:height="24dp" android:viewportWidth="24" - android:viewportHeight="24"> + android:viewportHeight="24" + android:tint="?attr/colorControlNormal"> - + android:fillColor="@android:color/white" + android:pathData="M11.8,10.9c-2.27,-0.59 -3,-1.2 -3,-2.15 0,-1.09 1.01,-1.85 2.7,-1.85 1.42,0 2.13,0.54 2.39,1.4 0.12,0.4 0.45,0.7 0.87,0.7h0.3c0.66,0 1.13,-0.65 0.9,-1.27 -0.42,-1.18 -1.4,-2.16 -2.96,-2.54V4.5c0,-0.83 -0.67,-1.5 -1.5,-1.5S10,3.67 10,4.5v0.66c-1.94,0.42 -3.5,1.68 -3.5,3.61 0,2.31 1.91,3.46 4.7,4.13 2.5,0.6 3,1.48 3,2.41 0,0.69 -0.49,1.79 -2.7,1.79 -1.65,0 -2.5,-0.59 -2.83,-1.43 -0.15,-0.39 -0.49,-0.67 -0.9,-0.67h-0.28c-0.67,0 -1.14,0.68 -0.89,1.3 0.57,1.39 1.9,2.21 3.4,2.53v0.67c0,0.83 0.67,1.5 1.5,1.5s1.5,-0.67 1.5,-1.5v-0.65c1.95,-0.37 3.5,-1.5 3.5,-3.55 0,-2.84 -2.43,-3.81 -4.7,-4.4z"/> + \ No newline at end of file diff --git a/src/main/res/drawable/ic_edit.xml b/src/main/res/drawable/ic_edit.xml index f8fb0735..ecb521a6 100644 --- a/src/main/res/drawable/ic_edit.xml +++ b/src/main/res/drawable/ic_edit.xml @@ -1,13 +1,10 @@ - - + android:viewportHeight="24" + android:tint="?attr/colorControlNormal"> - + android:fillColor="@android:color/white" + android:pathData="M3,17.46v3.04c0,0.28 0.22,0.5 0.5,0.5h3.04c0.13,0 0.26,-0.05 0.35,-0.15L17.81,9.94l-3.75,-3.75L3.15,17.1c-0.1,0.1 -0.15,0.22 -0.15,0.36zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z"/> diff --git a/src/main/res/drawable/ic_email.xml b/src/main/res/drawable/ic_email.xml index 0a84f2a0..61853ab9 100644 --- a/src/main/res/drawable/ic_email.xml +++ b/src/main/res/drawable/ic_email.xml @@ -1,13 +1,10 @@ - - + android:viewportHeight="24" + android:tint="?attr/colorControlNormal"> - - + android:fillColor="@android:color/white" + android:pathData="M20,4L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM19.6,8.25l-7.07,4.42c-0.32,0.2 -0.74,0.2 -1.06,0L4.4,8.25c-0.25,-0.16 -0.4,-0.43 -0.4,-0.72 0,-0.67 0.73,-1.07 1.3,-0.72L12,11l6.7,-4.19c0.57,-0.35 1.3,0.05 1.3,0.72 0,0.29 -0.15,0.56 -0.4,0.72z"/> + \ No newline at end of file diff --git a/src/main/res/drawable/ic_history.xml b/src/main/res/drawable/ic_history.xml index cf61d2ee..d535ec2d 100644 --- a/src/main/res/drawable/ic_history.xml +++ b/src/main/res/drawable/ic_history.xml @@ -1,14 +1,10 @@ - - + android:viewportHeight="24" + android:tint="?attr/colorControlNormal"> - - + android:fillColor="@android:color/white" + android:pathData="M13.26,3C8.17,2.86 4,6.95 4,12L2.21,12c-0.45,0 -0.67,0.54 -0.35,0.85l2.79,2.8c0.2,0.2 0.51,0.2 0.71,0l2.79,-2.8c0.31,-0.31 0.09,-0.85 -0.36,-0.85L6,12c0,-3.9 3.18,-7.05 7.1,-7 3.72,0.05 6.85,3.18 6.9,6.9 0.05,3.91 -3.1,7.1 -7,7.1 -1.61,0 -3.1,-0.55 -4.28,-1.48 -0.4,-0.31 -0.96,-0.28 -1.32,0.08 -0.42,0.42 -0.39,1.13 0.08,1.49C9,20.29 10.91,21 13,21c5.05,0 9.14,-4.17 9,-9.26 -0.13,-4.69 -4.05,-8.61 -8.74,-8.74zM12.75,8c-0.41,0 -0.75,0.34 -0.75,0.75v3.68c0,0.35 0.19,0.68 0.49,0.86l3.12,1.85c0.36,0.21 0.82,0.09 1.03,-0.26 0.21,-0.36 0.09,-0.82 -0.26,-1.03l-2.88,-1.71v-3.4c0,-0.4 -0.34,-0.74 -0.75,-0.74z"/> + \ No newline at end of file diff --git a/src/main/res/drawable/ic_launch.xml b/src/main/res/drawable/ic_launch.xml index 805b48a8..05fc477b 100644 --- a/src/main/res/drawable/ic_launch.xml +++ b/src/main/res/drawable/ic_launch.xml @@ -1,13 +1,11 @@ - - + android:viewportHeight="24" + android:tint="?attr/colorControlNormal" + android:autoMirrored="true"> - - + android:fillColor="@android:color/white" + android:pathData="M18,19H6c-0.55,0 -1,-0.45 -1,-1V6c0,-0.55 0.45,-1 1,-1h5c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1H5c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2v-6c0,-0.55 -0.45,-1 -1,-1s-1,0.45 -1,1v5c0,0.55 -0.45,1 -1,1zM14,4c0,0.55 0.45,1 1,1h2.59l-9.13,9.13c-0.39,0.39 -0.39,1.02 0,1.41 0.39,0.39 1.02,0.39 1.41,0L19,6.41V9c0,0.55 0.45,1 1,1s1,-0.45 1,-1V3h-6c-0.55,0 -1,0.45 -1,1z"/> + \ No newline at end of file diff --git a/src/main/res/drawable/ic_new_releases.xml b/src/main/res/drawable/ic_new_releases.xml index 18acca27..25faa67d 100644 --- a/src/main/res/drawable/ic_new_releases.xml +++ b/src/main/res/drawable/ic_new_releases.xml @@ -1,14 +1,11 @@ - + android:viewportHeight="24" + android:tint="?attr/colorControlNormal"> - - + android:fillColor="@android:color/white" + android:pathData="M22.42,11.34l-1.86,-2.12 0.26,-2.81c0.05,-0.5 -0.29,-0.96 -0.77,-1.07l-2.76,-0.63 -1.44,-2.43c-0.26,-0.43 -0.79,-0.61 -1.25,-0.41L12,3 9.41,1.89c-0.46,-0.2 -1,-0.02 -1.25,0.41L6.71,4.72l-2.75,0.62c-0.49,0.11 -0.83,0.56 -0.78,1.07l0.26,2.8 -1.86,2.13c-0.33,0.38 -0.33,0.94 0,1.32l1.86,2.12 -0.26,2.82c-0.05,0.5 0.29,0.96 0.77,1.07l2.76,0.63 1.44,2.42c0.26,0.43 0.79,0.61 1.26,0.41L12,21l2.59,1.11c0.46,0.2 1,0.02 1.25,-0.41l1.44,-2.43 2.76,-0.63c0.49,-0.11 0.82,-0.57 0.77,-1.07l-0.26,-2.81 1.86,-2.12c0.34,-0.36 0.34,-0.92 0.01,-1.3zM13,17h-2v-2h2v2zM12,13c-0.55,0 -1,-0.45 -1,-1L11,8c0,-0.55 0.45,-1 1,-1s1,0.45 1,1v4c0,0.55 -0.45,1 -1,1z"/> + \ No newline at end of file diff --git a/src/main/res/drawable/ic_perm_device_information.xml b/src/main/res/drawable/ic_perm_device_information.xml index d0e66b50..7f5e2b69 100644 --- a/src/main/res/drawable/ic_perm_device_information.xml +++ b/src/main/res/drawable/ic_perm_device_information.xml @@ -1,13 +1,10 @@ - - + android:viewportHeight="24" + android:tint="?attr/colorControlNormal"> - - + android:fillColor="@android:color/white" + android:pathData="M13,7h-2v2h2L13,7zM12,11c-0.55,0 -1,0.45 -1,1v4c0,0.55 0.45,1 1,1s1,-0.45 1,-1v-4c0,-0.55 -0.45,-1 -1,-1zM17,1.01L7,1c-1.1,0 -2,0.9 -2,2v18c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2L19,3c0,-1.1 -0.9,-1.99 -2,-1.99zM17,19L7,19L7,5h10v14z"/> + \ No newline at end of file diff --git a/src/main/res/drawable/ic_person.xml b/src/main/res/drawable/ic_person.xml index b37a4c94..31efe033 100644 --- a/src/main/res/drawable/ic_person.xml +++ b/src/main/res/drawable/ic_person.xml @@ -1,13 +1,10 @@ - - + android:viewportHeight="24" + android:tint="?attr/colorControlNormal"> - - + android:fillColor="@android:color/white" + android:pathData="M12,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM12,14c-2.67,0 -8,1.34 -8,4v1c0,0.55 0.45,1 1,1h14c0.55,0 1,-0.45 1,-1v-1c0,-2.66 -5.33,-4 -8,-4z"/> + \ No newline at end of file diff --git a/src/main/res/drawable/ic_photo_camera.xml b/src/main/res/drawable/ic_photo_camera.xml index 96295404..bc3cef53 100644 --- a/src/main/res/drawable/ic_photo_camera.xml +++ b/src/main/res/drawable/ic_photo_camera.xml @@ -1,15 +1,13 @@ - - + android:viewportHeight="24" + android:tint="?attr/colorControlNormal"> - - + android:fillColor="@android:color/white" + android:pathData="M12,12m-3,0a3,3 0,1 1,6 0a3,3 0,1 1,-6 0"/> + + \ No newline at end of file diff --git a/src/main/res/drawable/ic_save.xml b/src/main/res/drawable/ic_save.xml index f6a40221..7aea9182 100644 --- a/src/main/res/drawable/ic_save.xml +++ b/src/main/res/drawable/ic_save.xml @@ -1,13 +1,10 @@ - - + android:viewportHeight="24" + android:tint="?attr/colorControlNormal"> - - + android:fillColor="@android:color/white" + android:pathData="M17.59,3.59c-0.38,-0.38 -0.89,-0.59 -1.42,-0.59L5,3c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,7.83c0,-0.53 -0.21,-1.04 -0.59,-1.41l-2.82,-2.83zM12,19c-1.66,0 -3,-1.34 -3,-3s1.34,-3 3,-3 3,1.34 3,3 -1.34,3 -3,3zM13,9L7,9c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2h6c1.1,0 2,0.9 2,2s-0.9,2 -2,2z"/> + \ No newline at end of file diff --git a/src/main/res/drawable/ic_search.xml b/src/main/res/drawable/ic_search.xml index 4ee4af87..eb988008 100644 --- a/src/main/res/drawable/ic_search.xml +++ b/src/main/res/drawable/ic_search.xml @@ -1,14 +1,10 @@ - - + android:viewportHeight="24" + android:tint="?attr/colorControlNormal"> - - + android:fillColor="@android:color/white" + android:pathData="M15.5,14h-0.79l-0.28,-0.27c1.2,-1.4 1.82,-3.31 1.48,-5.34 -0.47,-2.78 -2.79,-5 -5.59,-5.34 -4.23,-0.52 -7.79,3.04 -7.27,7.27 0.34,2.8 2.56,5.12 5.34,5.59 2.03,0.34 3.94,-0.28 5.34,-1.48l0.27,0.28v0.79l4.25,4.25c0.41,0.41 1.08,0.41 1.49,0 0.41,-0.41 0.41,-1.08 0,-1.49L15.5,14zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/> + \ No newline at end of file diff --git a/src/main/res/drawable/ic_sort.xml b/src/main/res/drawable/ic_sort.xml index 1796ef09..b63c60b2 100644 --- a/src/main/res/drawable/ic_sort.xml +++ b/src/main/res/drawable/ic_sort.xml @@ -1,12 +1,11 @@ - - + android:viewportHeight="24" + android:tint="?attr/colorControlNormal" + android:autoMirrored="true"> - - + android:fillColor="@android:color/white" + android:pathData="M4,18h4c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1L4,16c-0.55,0 -1,0.45 -1,1s0.45,1 1,1zM3,7c0,0.55 0.45,1 1,1h16c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1L4,6c-0.55,0 -1,0.45 -1,1zM4,13h10c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1L4,11c-0.55,0 -1,0.45 -1,1s0.45,1 1,1z"/> + \ No newline at end of file diff --git a/src/main/res/drawable/ic_sync.xml b/src/main/res/drawable/ic_sync.xml index 9e6f92a7..db96a94a 100644 --- a/src/main/res/drawable/ic_sync.xml +++ b/src/main/res/drawable/ic_sync.xml @@ -1,14 +1,10 @@ - - + android:viewportHeight="24" + android:tint="?attr/colorControlNormal"> - - + android:fillColor="@android:color/white" + android:pathData="M12,4L12,2.21c0,-0.45 -0.54,-0.67 -0.85,-0.35l-2.8,2.79c-0.2,0.2 -0.2,0.51 0,0.71l2.79,2.79c0.32,0.31 0.86,0.09 0.86,-0.36L12,6c3.31,0 6,2.69 6,6 0,0.79 -0.15,1.56 -0.44,2.25 -0.15,0.36 -0.04,0.77 0.23,1.04 0.51,0.51 1.37,0.33 1.64,-0.34 0.37,-0.91 0.57,-1.91 0.57,-2.95 0,-4.42 -3.58,-8 -8,-8zM12,18c-3.31,0 -6,-2.69 -6,-6 0,-0.79 0.15,-1.56 0.44,-2.25 0.15,-0.36 0.04,-0.77 -0.23,-1.04 -0.51,-0.51 -1.37,-0.33 -1.64,0.34C4.2,9.96 4,10.96 4,12c0,4.42 3.58,8 8,8v1.79c0,0.45 0.54,0.67 0.85,0.35l2.79,-2.79c0.2,-0.2 0.2,-0.51 0,-0.71l-2.79,-2.79c-0.31,-0.31 -0.85,-0.09 -0.85,0.36L12,18z"/> + \ No newline at end of file diff --git a/src/main/res/drawable/ic_tune.xml b/src/main/res/drawable/ic_tune.xml index 8b81ff99..967246e0 100644 --- a/src/main/res/drawable/ic_tune.xml +++ b/src/main/res/drawable/ic_tune.xml @@ -1,13 +1,10 @@ - - + android:viewportHeight="24" + android:tint="?attr/colorControlNormal"> - - + android:fillColor="@android:color/white" + android:pathData="M3,18c0,0.55 0.45,1 1,1h5v-2L4,17c-0.55,0 -1,0.45 -1,1zM3,6c0,0.55 0.45,1 1,1h9L13,5L4,5c-0.55,0 -1,0.45 -1,1zM13,20v-1h7c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1h-7v-1c0,-0.55 -0.45,-1 -1,-1s-1,0.45 -1,1v4c0,0.55 0.45,1 1,1s1,-0.45 1,-1zM7,10v1L4,11c-0.55,0 -1,0.45 -1,1s0.45,1 1,1h3v1c0,0.55 0.45,1 1,1s1,-0.45 1,-1v-4c0,-0.55 -0.45,-1 -1,-1s-1,0.45 -1,1zM21,12c0,-0.55 -0.45,-1 -1,-1h-9v2h9c0.55,0 1,-0.45 1,-1zM16,9c0.55,0 1,-0.45 1,-1L17,7h3c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1h-3L17,4c0,-0.55 -0.45,-1 -1,-1s-1,0.45 -1,1v4c0,0.55 0.45,1 1,1z"/> + \ No newline at end of file diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml index 192b01c8..ceac67da 100644 --- a/src/main/res/values/styles.xml +++ b/src/main/res/values/styles.xml @@ -14,6 +14,7 @@ @color/grey_dark @color/accent_light @color/error_light + @color/green300 @color/black @color/green900 @drawable/scrollbar_thumb @@ -38,6 +39,7 @@ @color/green200 @color/accent_dark @color/error_dark + @color/green200 @color/green200 @color/white @drawable/scrollbar_thumb @@ -61,6 +63,7 @@ @color/green50 @color/accent_dark @color/error_dark + @color/green100 @color/green100 @color/white @drawable/scrollbar_thumb