Skip to content

Commit 1becd65

Browse files
ldjcmugsajith
ldjcmu
authored and
gsajith
committed
MDC Catalog Icon Updates
PiperOrigin-RevId: 219307796
1 parent ed37888 commit 1becd65

File tree

8 files changed

+118
-56
lines changed

8 files changed

+118
-56
lines changed

‎catalog/java/io/material/catalog/assets/res/drawable/ic_checkbox.xml‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
3+
<!--
4+
Copyright 2018 The Android Open Source Project
5+
6+
Licensed under the Apache License, Version 2.0 (the "License");
7+
you may not use this file except in compliance with the License.
8+
You may obtain a copy of the License at
9+
10+
https://www.apache.org/licenses/LICENSE-2.0
11+
12+
Unless required by applicable law or agreed to in writing, software
13+
distributed under the License is distributed on an "AS IS" BASIS,
14+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
See the License for the specific language governing permissions and
16+
limitations under the License.
17+
-->
18+
19+
<vector
20+
xmlns:android="http://schemas.android.com/apk/res/android"
21+
android:name="vector"
22+
android:width="80dp"
23+
android:height="80dp"
24+
android:viewportHeight="80"
25+
android:viewportWidth="80">
26+
<group android:name="group_2">
27+
<group android:name="mask_2">
28+
<path
29+
android:name="path_1"
30+
android:fillColor="#000"
31+
android:pathData="M 36.458 48.854 L 27.603 39.999 L 30.111 37.494 L 36.458 43.843 L 49.89 30.411 L 52.396 32.917 L 36.458 48.854 Z M 53.222 22.999 L 26.777 22.999 C 24.701 22.999 23.001 24.699 23.001 26.778 L 23.001 53.223 C 23.001 55.299 24.701 56.999 26.777 56.999 L 53.222 56.999 C 55.301 56.999 57.001 55.299 57.001 53.223 L 57.001 26.778 C 57.001 24.699 55.301 22.999 53.222 22.999 Z"
32+
android:strokeWidth="1"/>
33+
</group>
34+
</group>
35+
</vector>

‎catalog/java/io/material/catalog/assets/res/drawable/ic_radio_button.xml‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
3+
<!--
4+
Copyright 2018 The Android Open Source Project
5+
6+
Licensed under the Apache License, Version 2.0 (the "License");
7+
you may not use this file except in compliance with the License.
8+
You may obtain a copy of the License at
9+
10+
https://www.apache.org/licenses/LICENSE-2.0
11+
12+
Unless required by applicable law or agreed to in writing, software
13+
distributed under the License is distributed on an "AS IS" BASIS,
14+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
See the License for the specific language governing permissions and
16+
limitations under the License.
17+
-->
18+
19+
<vector
20+
xmlns:android="http://schemas.android.com/apk/res/android"
21+
android:name="vector"
22+
android:width="80dp"
23+
android:height="80dp"
24+
android:viewportHeight="80"
25+
android:viewportWidth="80">
26+
<group android:name="group">
27+
<path
28+
android:name="path_1_1"
29+
android:fillColor="#000"
30+
android:pathData="M 40 31.5 C 35.308 31.5 31.5 35.308 31.5 40 C 31.5 44.692 35.308 48.5 40 48.5 C 44.692 48.5 48.5 44.692 48.5 40 C 48.5 35.308 44.692 31.5 40 31.5 Z M 40 23 C 30.616 23 23 30.616 23 40 C 23 49.384 30.616 57 40 57 C 49.384 57 57 49.384 57 40 C 57 30.616 49.384 23 40 23 Z M 40 53.6 C 32.486 53.6 26.4 47.514 26.4 40 C 26.4 32.486 32.486 26.4 40 26.4 C 47.514 26.4 53.6 32.486 53.6 40 C 53.6 47.514 47.514 53.6 40 53.6 Z"
31+
android:strokeWidth="1"/>
32+
</group>
33+
</vector>

‎catalog/java/io/material/catalog/assets/res/drawable/ic_switch.xml‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
3+
<!--
4+
Copyright 2018 The Android Open Source Project
5+
6+
Licensed under the Apache License, Version 2.0 (the "License");
7+
you may not use this file except in compliance with the License.
8+
You may obtain a copy of the License at
9+
10+
https://www.apache.org/licenses/LICENSE-2.0
11+
12+
Unless required by applicable law or agreed to in writing, software
13+
distributed under the License is distributed on an "AS IS" BASIS,
14+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
See the License for the specific language governing permissions and
16+
limitations under the License.
17+
-->
18+
19+
<vector
20+
xmlns:android="http://schemas.android.com/apk/res/android"
21+
android:name="vector"
22+
android:width="80dp"
23+
android:height="80dp"
24+
android:viewportHeight="80"
25+
android:viewportWidth="80">
26+
<group android:name="group_2">
27+
<path
28+
android:name="path"
29+
android:fillColor="#bdc1c6"
30+
android:pathData="M 49.565 52.16 L 18.035 52.16 C 11.887 52.16 7 46.97 7 40.44 C 7 33.91 11.887 28.72 18.035 28.72 L 49.565 28.72 C 55.713 28.72 60.6 33.91 60.6 40.44 C 60.6 46.97 55.713 52.16 49.565 52.16 Z"
31+
android:strokeWidth="1"/>
32+
<group android:name="group">
33+
<path
34+
android:name="path_1"
35+
android:fillColor="#000"
36+
android:pathData="M 53.9 23.697 C 49.459 23.697 45.196 25.462 42.056 28.601 C 38.916 31.74 37.15 36.001 37.15 40.44 C 37.15 44.879 38.916 49.14 42.056 52.279 C 45.196 55.418 49.459 57.183 53.9 57.183 C 58.341 57.183 62.604 55.418 65.744 52.279 C 68.884 49.14 70.65 44.879 70.65 40.44 C 70.65 36.001 68.884 31.74 65.744 28.601 C 62.604 25.462 58.341 23.697 53.9 23.697 Z"
37+
android:strokeWidth="1"/>
38+
</group>
39+
<group android:name="group_1">
40+
<path
41+
android:name="path_1_1"
42+
android:fillColor="#000"
43+
android:pathData="M 53.9 23.697 C 49.459 23.697 45.196 25.462 42.056 28.601 C 38.916 31.74 37.15 36.001 37.15 40.44 C 37.15 44.879 38.916 49.14 42.056 52.279 C 45.196 55.418 49.459 57.183 53.9 57.183 C 58.341 57.183 62.604 55.418 65.744 52.279 C 68.884 49.14 70.65 44.879 70.65 40.44 C 70.65 36.001 68.884 31.74 65.744 28.601 C 62.604 25.462 58.341 23.697 53.9 23.697 Z"
44+
android:strokeWidth="1"/>
45+
</group>
46+
</group>
47+
</vector>

‎catalog/java/io/material/catalog/checkbox/CheckBoxFragment.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public abstract static class Module {
6363
@Provides
6464
@ActivityScope
6565
static FeatureDemo provideFeatureDemo() {
66-
return new FeatureDemo(R.string.cat_checkbox_title, R.drawable.ic_check_box_black_24dp) {
66+
return new FeatureDemo(R.string.cat_checkbox_title, R.drawable.ic_checkbox) {
6767
@Override
6868
public Fragment createFragment() {
6969
return new CheckBoxFragment();

‎catalog/java/io/material/catalog/checkbox/res/drawable/ic_check_box_black_24dp.xml‎

Lines changed: 0 additions & 27 deletions
This file was deleted.

‎catalog/java/io/material/catalog/radiobutton/RadioButtonFragment.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,7 @@ public abstract static class Module {
6363
@Provides
6464
@ActivityScope
6565
static FeatureDemo provideFeatureDemo() {
66-
return new FeatureDemo(
67-
R.string.cat_radiobutton_title, R.drawable.ic_radio_button_checked_black_24dp) {
66+
return new FeatureDemo(R.string.cat_radiobutton_title, R.drawable.ic_radio_button) {
6867
@Override
6968
public Fragment createFragment() {
7069
return new RadioButtonFragment();

‎catalog/java/io/material/catalog/radiobutton/res/drawable/ic_radio_button_checked_black_24dp.xml‎

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎catalog/java/io/material/catalog/switchmaterial/SwitchFragment.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public abstract static class Module {
6363
@Provides
6464
@ActivityScope
6565
static FeatureDemo provideFeatureDemo() {
66-
return new FeatureDemo(R.string.cat_switch_title, R.drawable.ic_switches_24px) {
66+
return new FeatureDemo(R.string.cat_switch_title, R.drawable.ic_switch) {
6767
@Override
6868
public Fragment createFragment() {
6969
return new SwitchFragment();

0 commit comments

Comments
 (0)