Commit | Line | Data |
---|---|---|
7a94b5bc | 1 | From a36ad14268d30c19f15e88ce3c6ff74035233c53 Mon Sep 17 00:00:00 2001 |
6bcbafcd L |
2 | From: Ivan Iskandar <iiiiskandar14@gmail.com> |
3 | Date: Sun, 18 Sep 2016 10:12:05 +0700 | |
7653b73c | 4 | Subject: [PATCH 01/20] Settings: Expose dashboard category and tile color |
6bcbafcd L |
5 | |
6 | Change-Id: Ia9c83eb9b8360923ed52e03641b4179681a80330 | |
7 | --- | |
8 | res/drawable/dashboard_category_title_bg.xml | 21 +++++++++++++++++++++ | |
9 | res/drawable/dashboard_tile_bg.xml | 21 +++++++++++++++++++++ | |
10 | res/drawable/selectable_card.xml | 4 ++-- | |
11 | res/layout/dashboard_category.xml | 2 +- | |
12 | res/values/projekt_colors.xml | 21 +++++++++++++++++++++ | |
13 | 5 files changed, 66 insertions(+), 3 deletions(-) | |
14 | create mode 100644 res/drawable/dashboard_category_title_bg.xml | |
15 | create mode 100644 res/drawable/dashboard_tile_bg.xml | |
16 | create mode 100644 res/values/projekt_colors.xml | |
17 | ||
18 | diff --git a/res/drawable/dashboard_category_title_bg.xml b/res/drawable/dashboard_category_title_bg.xml | |
19 | new file mode 100644 | |
7a94b5bc | 20 | index 0000000000..7427ee9b05 |
6bcbafcd L |
21 | --- /dev/null |
22 | +++ b/res/drawable/dashboard_category_title_bg.xml | |
23 | @@ -0,0 +1,21 @@ | |
24 | +<?xml version="1.0" encoding="utf-8"?> | |
25 | +<!-- | |
7a94b5bc | 26 | + Copyright (c) 2016-2017 Projekt Substratum |
6bcbafcd L |
27 | + |
28 | + Licensed under the Apache License, Version 2.0 (the "License"); | |
29 | + you may not use this file except in compliance with the License. | |
30 | + You may obtain a copy of the License at | |
31 | + | |
32 | + http://www.apache.org/licenses/LICENSE-2.0 | |
33 | + | |
34 | + Unless required by applicable law or agreed to in writing, software | |
35 | + distributed under the License is distributed on an "AS IS" BASIS, | |
36 | + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | |
37 | + See the License for the specific language governing permissions and | |
38 | + limitations under the License. | |
39 | +--> | |
40 | + | |
41 | +<shape xmlns:android="http://schemas.android.com/apk/res/android" | |
42 | + android:shape="rectangle"> | |
43 | + <solid android:color="@color/dashboard_category_title_background" /> | |
44 | +</shape> | |
45 | diff --git a/res/drawable/dashboard_tile_bg.xml b/res/drawable/dashboard_tile_bg.xml | |
46 | new file mode 100644 | |
7a94b5bc | 47 | index 0000000000..e8a190b677 |
6bcbafcd L |
48 | --- /dev/null |
49 | +++ b/res/drawable/dashboard_tile_bg.xml | |
50 | @@ -0,0 +1,21 @@ | |
51 | +<?xml version="1.0" encoding="utf-8"?> | |
52 | +<!-- | |
7a94b5bc | 53 | + Copyright (c) 2016-2017 Projekt Substratum |
6bcbafcd L |
54 | + |
55 | + Licensed under the Apache License, Version 2.0 (the "License"); | |
56 | + you may not use this file except in compliance with the License. | |
57 | + You may obtain a copy of the License at | |
58 | + | |
59 | + http://www.apache.org/licenses/LICENSE-2.0 | |
60 | + | |
61 | + Unless required by applicable law or agreed to in writing, software | |
62 | + distributed under the License is distributed on an "AS IS" BASIS, | |
63 | + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | |
64 | + See the License for the specific language governing permissions and | |
65 | + limitations under the License. | |
66 | +--> | |
67 | + | |
68 | +<shape xmlns:android="http://schemas.android.com/apk/res/android" | |
69 | + android:shape="rectangle"> | |
70 | + <solid android:color="@color/selectable_card_background" /> | |
71 | +</shape> | |
72 | diff --git a/res/drawable/selectable_card.xml b/res/drawable/selectable_card.xml | |
7a94b5bc | 73 | index df9ddb1367..74018b214b 100644 |
6bcbafcd L |
74 | --- a/res/drawable/selectable_card.xml |
75 | +++ b/res/drawable/selectable_card.xml | |
76 | @@ -18,5 +18,5 @@ | |
77 | <ripple | |
78 | xmlns:android="http://schemas.android.com/apk/res/android" | |
79 | android:color="?android:attr/colorControlHighlight"> | |
80 | - <item android:drawable="@color/card_background"/> | |
81 | -</ripple> | |
82 | \ No newline at end of file | |
83 | + <item android:drawable="@drawable/dashboard_tile_bg"/> | |
84 | +</ripple> | |
85 | diff --git a/res/layout/dashboard_category.xml b/res/layout/dashboard_category.xml | |
7a94b5bc | 86 | index 2e5dd5ce06..7836644806 100644 |
6bcbafcd L |
87 | --- a/res/layout/dashboard_category.xml |
88 | +++ b/res/layout/dashboard_category.xml | |
89 | @@ -20,7 +20,7 @@ | |
90 | android:layout_height="@dimen/dashboard_category_height" | |
91 | android:orientation="vertical" | |
92 | android:paddingBottom="8dip" | |
93 | - android:background="@color/card_background"> | |
94 | + android:background="@drawable/dashboard_category_title_bg"> | |
95 | ||
96 | <TextView android:id="@android:id/title" | |
97 | android:layout_width="match_parent" | |
98 | diff --git a/res/values/projekt_colors.xml b/res/values/projekt_colors.xml | |
99 | new file mode 100644 | |
7a94b5bc | 100 | index 0000000000..c30d7eda21 |
6bcbafcd L |
101 | --- /dev/null |
102 | +++ b/res/values/projekt_colors.xml | |
103 | @@ -0,0 +1,21 @@ | |
104 | +<?xml version="1.0" encoding="utf-8"?> | |
105 | +<!-- | |
7a94b5bc | 106 | + Copyright (c) 2016-2017 Projekt Substratum |
6bcbafcd L |
107 | + |
108 | + Licensed under the Apache License, Version 2.0 (the "License"); | |
109 | + you may not use this file except in compliance with the License. | |
110 | + You may obtain a copy of the License at | |
111 | + | |
112 | + http://www.apache.org/licenses/LICENSE-2.0 | |
113 | + | |
114 | + Unless required by applicable law or agreed to in writing, software | |
115 | + distributed under the License is distributed on an "AS IS" BASIS, | |
116 | + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | |
117 | + See the License for the specific language governing permissions and | |
118 | + limitations under the License. | |
119 | +--> | |
120 | +<resources> | |
121 | + <!-- Dashboard category and tile background --> | |
122 | + <color name="dashboard_category_title_background">@color/card_background</color> | |
123 | + <color name="selectable_card_background">@color/card_background</color> | |
124 | +</resources> | |
125 | -- | |
7a94b5bc | 126 | 2.11.1 |
6bcbafcd | 127 |