Revision 840ad93e
Added by Leszek Koltunski 7 months ago
src/main/java/org/distorted/dialogs/RubikDialogTutorial.java | ||
---|---|---|
108 | 108 |
|
109 | 109 |
LinearLayout layout = view.findViewById(R.id.tutLayout); |
110 | 110 |
|
111 |
int colorB = getResources().getColor(R.color.light_grey);
|
|
111 |
int colorB = getResources().getColor(R.color.lightGrey);
|
|
112 | 112 |
int colorT = getResources().getColor(R.color.white); |
113 | 113 |
|
114 | 114 |
int numTuts = tutorials.length; |
src/main/java/org/distorted/helpers/ObjectGridCreator.java | ||
---|---|---|
189 | 189 |
params.rightMargin = m; |
190 | 190 |
view.setLayoutParams(params); |
191 | 191 |
|
192 |
view.setBackgroundResource(R.color.dark_grey);
|
|
192 |
view.setBackgroundResource(R.color.darkGrey);
|
|
193 | 193 |
|
194 | 194 |
int p = (int)(TITLE_PADDING*height); |
195 | 195 |
view.setPadding( p,p,p,p ); |
... | ... | |
208 | 208 |
params.leftMargin = m; |
209 | 209 |
params.rightMargin = m; |
210 | 210 |
view.setLayoutParams(params); |
211 |
view.setBackgroundResource(R.color.dark_grey);
|
|
211 |
view.setBackgroundResource(R.color.darkGrey);
|
|
212 | 212 |
view.setGravity(Gravity.CENTER); |
213 | 213 |
|
214 | 214 |
int size = (int)(TEXT_SIZE*height); |
src/main/java/org/distorted/main/MainActivity.java | ||
---|---|---|
364 | 364 |
|
365 | 365 |
public void onSettings(View v) |
366 | 366 |
{ |
367 |
int sw = (int)(340*mDensity + 0.5f);
|
|
367 |
int sw = (int)(345*mDensity + 0.5f);
|
|
368 | 368 |
int sh = (int)(188*mDensity + 0.5f); |
369 | 369 |
|
370 | 370 |
int vw = v.getWidth(); |
src/main/java/org/distorted/main/MainObjectPopup.java | ||
---|---|---|
185 | 185 |
{ |
186 | 186 |
RubikScores scores = RubikScores.getInstance(); |
187 | 187 |
Resources res = act.getResources(); |
188 |
ColorStateList colorG = ColorStateList.valueOf(res.getColor(R.color.green));
|
|
189 |
ColorStateList colorD = ColorStateList.valueOf(res.getColor(R.color.dark_grey));
|
|
188 |
ColorStateList colorG = ColorStateList.valueOf(res.getColor(R.color.normalGreen));
|
|
189 |
ColorStateList colorD = ColorStateList.valueOf(res.getColor(R.color.darkGrey));
|
|
190 | 190 |
|
191 | 191 |
int layoutWidth = (int)(width*MENU_WIDTH); |
192 | 192 |
int levelHeight = (int)(width*BUTTON_HEIGHT); |
src/main/res/drawable/tab_background_selected.xml | ||
---|---|---|
1 | 1 |
<?xml version="1.0" encoding="utf-8"?> |
2 | 2 |
<shape xmlns:android="http://schemas.android.com/apk/res/android" > |
3 |
<solid android:color="@color/grey"/>
|
|
3 |
<solid android:color="?normalC"/>
|
|
4 | 4 |
</shape> |
src/main/res/drawable/tab_background_unselected.xml | ||
---|---|---|
1 | 1 |
<?xml version="1.0" encoding="utf-8"?> |
2 | 2 |
<shape xmlns:android="http://schemas.android.com/apk/res/android" > |
3 |
<solid android:color="@color/dark_grey"/>
|
|
3 |
<solid android:color="?darkC"/>
|
|
4 | 4 |
</shape> |
src/main/res/drawable/ui_spinner.xml | ||
---|---|---|
4 | 4 |
<layer-list> |
5 | 5 |
<item> |
6 | 6 |
<shape android:shape="rectangle"> |
7 |
<solid android:color="@color/light_grey" />
|
|
7 |
<solid android:color="?lightC" />
|
|
8 | 8 |
<corners android:radius="6dip" /> |
9 | 9 |
<stroke |
10 |
android:color="@color/grey"
|
|
10 |
android:color="?normalC"
|
|
11 | 11 |
android:width="2dp"/> |
12 | 12 |
</shape> |
13 | 13 |
</item> |
src/main/res/layout-ldrtl/info.xml | ||
---|---|---|
16 | 16 |
android:layout_width="match_parent" |
17 | 17 |
android:layout_height="0dp" |
18 | 18 |
android:layout_weight="1.0" |
19 |
android:background="@color/light_grey"
|
|
19 |
android:background="?lightC"
|
|
20 | 20 |
android:orientation="vertical" > |
21 | 21 |
|
22 | 22 |
<LinearLayout |
... | ... | |
26 | 26 |
android:layout_weight="1" |
27 | 27 |
android:paddingLeft="5dp" |
28 | 28 |
android:paddingRight="5dp" |
29 |
android:background="@color/grey"
|
|
29 |
android:background="?normalC"
|
|
30 | 30 |
android:orientation="horizontal"> |
31 | 31 |
|
32 | 32 |
<TextView |
... | ... | |
61 | 61 |
android:layout_weight="1" |
62 | 62 |
android:paddingLeft="5dp" |
63 | 63 |
android:paddingRight="5dp" |
64 |
android:background="@color/grey"
|
|
64 |
android:background="?normalC"
|
|
65 | 65 |
android:orientation="horizontal"> |
66 | 66 |
|
67 | 67 |
<TextView |
... | ... | |
127 | 127 |
android:layout_weight="1" |
128 | 128 |
android:paddingLeft="5dp" |
129 | 129 |
android:paddingRight="5dp" |
130 |
android:background="@color/grey"
|
|
130 |
android:background="?normalC"
|
|
131 | 131 |
android:orientation="horizontal"> |
132 | 132 |
|
133 | 133 |
<TextView |
... | ... | |
162 | 162 |
android:layout_weight="1" |
163 | 163 |
android:paddingLeft="5dp" |
164 | 164 |
android:paddingRight="5dp" |
165 |
android:background="@color/grey"
|
|
165 |
android:background="?normalC"
|
|
166 | 166 |
android:orientation="horizontal"> |
167 | 167 |
|
168 | 168 |
<TextView |
... | ... | |
198 | 198 |
android:layout_height="100dp" |
199 | 199 |
android:layout_gravity="end" |
200 | 200 |
android:orientation="horizontal" |
201 |
android:background="@color/light_grey">
|
|
201 |
android:background="?lightC">
|
|
202 | 202 |
</LinearLayout> |
203 | 203 |
|
204 | 204 |
</LinearLayout> |
src/main/res/layout/bandaged.xml | ||
---|---|---|
9 | 9 |
android:id="@+id/bandagedCreatorTopView" |
10 | 10 |
android:layout_width="match_parent" |
11 | 11 |
android:layout_height="100dp" |
12 |
android:background="@color/light_grey"
|
|
12 |
android:background="?lightC"
|
|
13 | 13 |
android:orientation="horizontal"> |
14 | 14 |
|
15 | 15 |
<HorizontalScrollView |
src/main/res/layout/bandaged_pane.xml | ||
---|---|---|
3 | 3 |
android:id="@+id/bandagedCreatorObjectPane" |
4 | 4 |
android:layout_width="200dp" |
5 | 5 |
android:layout_height="match_parent" |
6 |
android:background="@color/light_grey"
|
|
6 |
android:background="?lightC"
|
|
7 | 7 |
android:orientation="vertical"> |
8 | 8 |
|
9 | 9 |
<ImageView |
src/main/res/layout/config.xml | ||
---|---|---|
3 | 3 |
android:id="@+id/mainLayout" |
4 | 4 |
android:layout_width="match_parent" |
5 | 5 |
android:layout_height="match_parent" |
6 |
android:background="@color/light_grey"
|
|
6 |
android:background="?lightC"
|
|
7 | 7 |
android:orientation="vertical"> |
8 | 8 |
|
9 | 9 |
<org.distorted.config.ConfigSurfaceView |
... | ... | |
22 | 22 |
android:layout_marginBottom="5dp" |
23 | 23 |
android:paddingLeft="5dp" |
24 | 24 |
android:paddingRight="5dp" |
25 |
android:background="@color/grey"
|
|
25 |
android:background="?normalC"
|
|
26 | 26 |
android:orientation="vertical" > |
27 | 27 |
|
28 | 28 |
<LinearLayout |
... | ... | |
93 | 93 |
android:gravity="center" |
94 | 94 |
android:paddingLeft="5dp" |
95 | 95 |
android:paddingRight="5dp" |
96 |
android:background="@color/grey"
|
|
96 |
android:background="?normalC"
|
|
97 | 97 |
android:orientation="vertical" > |
98 | 98 |
</LinearLayout> |
99 | 99 |
|
... | ... | |
103 | 103 |
android:layout_height="100dp" |
104 | 104 |
android:layout_gravity="end" |
105 | 105 |
android:orientation="horizontal" |
106 |
android:background="@color/light_grey">
|
|
106 |
android:background="?lightC">
|
|
107 | 107 |
</LinearLayout> |
108 | 108 |
|
109 | 109 |
</LinearLayout> |
src/main/res/layout/dialog_about.xml | ||
---|---|---|
2 | 2 |
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" |
3 | 3 |
android:layout_width="match_parent" |
4 | 4 |
android:layout_height="wrap_content" |
5 |
android:background="@color/grey"
|
|
5 |
android:background="?normalC"
|
|
6 | 6 |
android:orientation="vertical"> |
7 | 7 |
|
8 | 8 |
<LinearLayout |
... | ... | |
12 | 12 |
android:gravity="center|fill_horizontal" |
13 | 13 |
android:layout_marginLeft="10dp" |
14 | 14 |
android:layout_marginRight="10dp" |
15 |
android:background="@color/dark_grey"
|
|
15 |
android:background="?darkC"
|
|
16 | 16 |
android:orientation="horizontal"> |
17 | 17 |
|
18 | 18 |
<ImageView |
... | ... | |
31 | 31 |
android:layout_height="match_parent" |
32 | 32 |
android:layout_weight="1" |
33 | 33 |
android:gravity="center|fill_horizontal" |
34 |
android:background="@color/dark_grey"
|
|
34 |
android:background="?darkC"
|
|
35 | 35 |
android:orientation="vertical"> |
36 | 36 |
|
37 | 37 |
<TextView |
... | ... | |
56 | 56 |
android:layout_marginLeft="10dp" |
57 | 57 |
android:layout_marginRight="10dp" |
58 | 58 |
android:layout_marginTop="5dp" |
59 |
android:background="@color/dark_grey"
|
|
59 |
android:background="?darkC"
|
|
60 | 60 |
android:orientation="horizontal"> |
61 | 61 |
|
62 | 62 |
<ImageView |
... | ... | |
75 | 75 |
android:layout_height="wrap_content" |
76 | 76 |
android:layout_weight="1" |
77 | 77 |
android:gravity="center|fill_horizontal" |
78 |
android:background="@color/dark_grey"
|
|
78 |
android:background="?darkC"
|
|
79 | 79 |
android:orientation="vertical"> |
80 | 80 |
|
81 | 81 |
<TextView |
... | ... | |
110 | 110 |
android:layout_marginLeft="10dp" |
111 | 111 |
android:layout_marginRight="10dp" |
112 | 112 |
android:layout_marginTop="5dp" |
113 |
android:background="@color/dark_grey"
|
|
113 |
android:background="?darkC"
|
|
114 | 114 |
android:orientation="horizontal"> |
115 | 115 |
|
116 | 116 |
<ImageView |
... | ... | |
157 | 157 |
android:layout_marginLeft="10dp" |
158 | 158 |
android:layout_marginRight="10dp" |
159 | 159 |
android:layout_marginTop="5dp" |
160 |
android:background="@color/dark_grey"
|
|
160 |
android:background="?darkC"
|
|
161 | 161 |
android:orientation="horizontal"> |
162 | 162 |
|
163 | 163 |
<ImageView |
src/main/res/layout/dialog_creators_pane.xml | ||
---|---|---|
3 | 3 |
xmlns:android="http://schemas.android.com/apk/res/android" |
4 | 4 |
android:layout_width="match_parent" |
5 | 5 |
android:layout_height="wrap_content" |
6 |
android:background="@color/medium_grey"
|
|
6 |
android:background="?mediumC"
|
|
7 | 7 |
android:padding="8dp" |
8 | 8 |
android:orientation="horizontal"> |
9 | 9 |
|
src/main/res/layout/dialog_delete_object.xml | ||
---|---|---|
12 | 12 |
android:layout_marginLeft="10dp" |
13 | 13 |
android:layout_marginRight="10dp" |
14 | 14 |
android:layout_marginTop="0dp" |
15 |
android:background="@color/grey"
|
|
15 |
android:background="?normalC"
|
|
16 | 16 |
android:orientation="vertical"> |
17 | 17 |
|
18 | 18 |
<TextView |
src/main/res/layout/dialog_error.xml | ||
---|---|---|
6 | 6 |
android:layout_marginLeft="10dp" |
7 | 7 |
android:layout_marginRight="10dp" |
8 | 8 |
android:layout_marginTop="0dp" |
9 |
android:background="@color/grey"
|
|
9 |
android:background="?normalC"
|
|
10 | 10 |
android:orientation="vertical"> |
11 | 11 |
|
12 | 12 |
<TextView |
src/main/res/layout/dialog_message.xml | ||
---|---|---|
5 | 5 |
android:layout_marginLeft="10dp" |
6 | 6 |
android:layout_marginTop="0dp" |
7 | 7 |
android:layout_marginRight="10dp" |
8 |
android:background="@color/grey"
|
|
8 |
android:background="?normalC"
|
|
9 | 9 |
android:gravity="center|fill_horizontal"> |
10 | 10 |
|
11 | 11 |
<TextView |
src/main/res/layout/dialog_new_record.xml | ||
---|---|---|
12 | 12 |
android:layout_marginLeft="10dp" |
13 | 13 |
android:layout_marginRight="10dp" |
14 | 14 |
android:layout_marginTop="0dp" |
15 |
android:background="@color/grey"
|
|
15 |
android:background="?normalC"
|
|
16 | 16 |
android:orientation="vertical"> |
17 | 17 |
|
18 | 18 |
<TextView |
src/main/res/layout/dialog_pattern_child_item.xml | ||
---|---|---|
6 | 6 |
|
7 | 7 |
<TextView |
8 | 8 |
android:id="@+id/child" |
9 |
android:background="@color/dark_grey"
|
|
9 |
android:background="?darkC"
|
|
10 | 10 |
android:layout_width="match_parent" |
11 | 11 |
android:layout_height="wrap_content" |
12 | 12 |
android:layout_marginTop="5sp" |
src/main/res/layout/dialog_pattern_single.xml | ||
---|---|---|
9 | 9 |
|
10 | 10 |
<ExpandableListView |
11 | 11 |
android:id="@+id/patternListView" |
12 |
android:background="@color/grey"
|
|
12 |
android:background="?normalC"
|
|
13 | 13 |
android:layout_marginLeft="10dp" |
14 | 14 |
android:layout_marginRight="10dp" |
15 | 15 |
android:layout_marginBottom="10dp" |
src/main/res/layout/dialog_pattern_tab.xml | ||
---|---|---|
1 | 1 |
<?xml version="1.0" encoding="utf-8"?> |
2 | 2 |
<ExpandableListView xmlns:android="http://schemas.android.com/apk/res/android" |
3 | 3 |
android:id="@+id/patternListView" |
4 |
android:background="@color/grey"
|
|
4 |
android:background="?normalC"
|
|
5 | 5 |
android:paddingLeft="0dp" |
6 | 6 |
android:paddingRight="0dp" |
7 | 7 |
android:paddingTop="10dp" |
src/main/res/layout/dialog_privacy.xml | ||
---|---|---|
6 | 6 |
android:layout_marginLeft="10dp" |
7 | 7 |
android:layout_marginRight="10dp" |
8 | 8 |
android:layout_marginTop="0dp" |
9 |
android:background="@color/grey"
|
|
9 |
android:background="?normalC"
|
|
10 | 10 |
android:orientation="vertical"> |
11 | 11 |
|
12 | 12 |
<TextView |
src/main/res/layout/dialog_save_object.xml | ||
---|---|---|
12 | 12 |
android:layout_marginLeft="10dp" |
13 | 13 |
android:layout_marginRight="10dp" |
14 | 14 |
android:layout_marginTop="0dp" |
15 |
android:background="@color/grey"
|
|
15 |
android:background="?normalC"
|
|
16 | 16 |
android:orientation="vertical"> |
17 | 17 |
|
18 | 18 |
<TextView |
src/main/res/layout/dialog_scores_scramble_title.xml | ||
---|---|---|
3 | 3 |
android:id="@+id/scoresScrambleLayout" |
4 | 4 |
android:layout_width="match_parent" |
5 | 5 |
android:layout_height="wrap_content" |
6 |
android:background="@color/grey"
|
|
6 |
android:background="?normalC"
|
|
7 | 7 |
|
8 | 8 |
android:paddingBottom="0dp" |
9 | 9 |
android:paddingTop="0dp" |
... | ... | |
17 | 17 |
android:layout_height="wrap_content" |
18 | 18 |
android:textSize="24sp" |
19 | 19 |
android:gravity="center" |
20 |
android:background="@color/grey"
|
|
20 |
android:background="?normalC"
|
|
21 | 21 |
android:paddingBottom="0dp" |
22 | 22 |
android:paddingTop="0dp" |
23 | 23 |
android:paddingLeft="5dp" |
src/main/res/layout/dialog_set_name.xml | ||
---|---|---|
12 | 12 |
android:layout_marginLeft="10dp" |
13 | 13 |
android:layout_marginRight="10dp" |
14 | 14 |
android:layout_marginTop="0dp" |
15 |
android:background="@color/grey"
|
|
15 |
android:background="?normalC"
|
|
16 | 16 |
android:orientation="vertical"> |
17 | 17 |
|
18 | 18 |
<TextView |
src/main/res/layout/dialog_settings.xml | ||
---|---|---|
11 | 11 |
android:gravity="center|fill_horizontal" |
12 | 12 |
android:layout_marginLeft="10dp" |
13 | 13 |
android:layout_marginRight="10dp" |
14 |
android:background="@color/grey"
|
|
14 |
android:background="?normalC"
|
|
15 | 15 |
android:orientation="vertical"> |
16 | 16 |
|
17 | 17 |
<LinearLayout |
src/main/res/layout/dialog_solved.xml | ||
---|---|---|
12 | 12 |
android:layout_marginLeft="10dp" |
13 | 13 |
android:layout_marginRight="10dp" |
14 | 14 |
android:layout_marginTop="0dp" |
15 |
android:background="@color/grey"
|
|
15 |
android:background="?normalC"
|
|
16 | 16 |
android:orientation="vertical"> |
17 | 17 |
|
18 | 18 |
<TextView |
src/main/res/layout/dialog_solver_error.xml | ||
---|---|---|
12 | 12 |
android:layout_marginLeft="10dp" |
13 | 13 |
android:layout_marginRight="10dp" |
14 | 14 |
android:layout_marginTop="0dp" |
15 |
android:background="@color/grey"
|
|
15 |
android:background="?normalC"
|
|
16 | 16 |
android:orientation="vertical"> |
17 | 17 |
|
18 | 18 |
<TextView |
src/main/res/layout/dialog_solvers_pane.xml | ||
---|---|---|
3 | 3 |
xmlns:android="http://schemas.android.com/apk/res/android" |
4 | 4 |
android:layout_width="match_parent" |
5 | 5 |
android:layout_height="wrap_content" |
6 |
android:background="@color/medium_grey"
|
|
6 |
android:background="?mediumC"
|
|
7 | 7 |
android:padding="8dp" |
8 | 8 |
android:orientation="horizontal"> |
9 | 9 |
|
src/main/res/layout/dialog_stars_explain.xml | ||
---|---|---|
4 | 4 |
android:layout_height="fill_parent" |
5 | 5 |
android:gravity="center|fill_horizontal" |
6 | 6 |
android:padding="10dp" |
7 |
android:background="@color/grey"
|
|
7 |
android:background="?normalC"
|
|
8 | 8 |
android:orientation="vertical"> |
9 | 9 |
|
10 | 10 |
<TextView |
11 | 11 |
android:id="@+id/stars_dialog_explain" |
12 |
android:background="@color/dark_grey"
|
|
12 |
android:background="?darkC"
|
|
13 | 13 |
android:layout_width="match_parent" |
14 | 14 |
android:layout_height="match_parent" |
15 | 15 |
android:gravity="start" |
src/main/res/layout/dialog_stars_status.xml | ||
---|---|---|
4 | 4 |
android:layout_width="fill_parent" |
5 | 5 |
android:layout_height="fill_parent" |
6 | 6 |
android:gravity="center|fill_horizontal" |
7 |
android:background="@color/grey"
|
|
7 |
android:background="?normalC"
|
|
8 | 8 |
android:orientation="vertical"> |
9 | 9 |
|
10 | 10 |
<LinearLayout |
... | ... | |
14 | 14 |
android:padding="5dp" |
15 | 15 |
android:gravity="center" |
16 | 16 |
android:layout_marginTop="10dp" |
17 |
android:background="@color/light_grey"
|
|
17 |
android:background="?lightC"
|
|
18 | 18 |
android:orientation="vertical"> |
19 | 19 |
|
20 | 20 |
<TextView |
... | ... | |
42 | 42 |
android:layout_height="80dp" |
43 | 43 |
android:padding="5dp" |
44 | 44 |
android:layout_marginTop="10dp" |
45 |
android:background="@color/light_grey"
|
|
45 |
android:background="?lightC"
|
|
46 | 46 |
android:orientation="horizontal"> |
47 | 47 |
|
48 | 48 |
<ImageView |
... | ... | |
71 | 71 |
android:layout_height="80dp" |
72 | 72 |
android:padding="5dp" |
73 | 73 |
android:layout_marginTop="10dp" |
74 |
android:background="@color/light_grey"
|
|
74 |
android:background="?lightC"
|
|
75 | 75 |
android:orientation="horizontal"> |
76 | 76 |
|
77 | 77 |
<ImageView |
... | ... | |
100 | 100 |
android:layout_height="80dp" |
101 | 101 |
android:padding="5dp" |
102 | 102 |
android:layout_marginTop="10dp" |
103 |
android:background="@color/light_grey"
|
|
103 |
android:background="?lightC"
|
|
104 | 104 |
android:orientation="horizontal"> |
105 | 105 |
|
106 | 106 |
<ImageView |
src/main/res/layout/dialog_tutorial_row.xml | ||
---|---|---|
3 | 3 |
android:layout_width="fill_parent" |
4 | 4 |
android:layout_height="fill_parent" |
5 | 5 |
android:gravity="center|fill_horizontal" |
6 |
android:background="@color/grey"
|
|
6 |
android:background="?normalC"
|
|
7 | 7 |
android:orientation="vertical"> |
8 | 8 |
|
9 | 9 |
<TextView |
... | ... | |
18 | 18 |
android:paddingLeft="2dp" |
19 | 19 |
android:paddingRight="2dp" |
20 | 20 |
android:maxLines="1" |
21 |
android:background="@color/dark_grey"/>
|
|
21 |
android:background="?darkC"/>
|
|
22 | 22 |
|
23 | 23 |
<LinearLayout |
24 | 24 |
android:id="@+id/tutorialLayout" |
... | ... | |
28 | 28 |
android:layout_marginRight="10dp" |
29 | 29 |
android:paddingLeft="5dp" |
30 | 30 |
android:paddingRight="5dp" |
31 |
android:background="@color/dark_grey"
|
|
31 |
android:background="?darkC"
|
|
32 | 32 |
android:orientation="horizontal"> |
33 | 33 |
|
34 | 34 |
<ImageView |
src/main/res/layout/dialog_updates_pane.xml | ||
---|---|---|
3 | 3 |
xmlns:android="http://schemas.android.com/apk/res/android" |
4 | 4 |
android:layout_width="match_parent" |
5 | 5 |
android:layout_height="wrap_content" |
6 |
android:background="@color/medium_grey"
|
|
6 |
android:background="?mediumC"
|
|
7 | 7 |
android:padding="8dp" |
8 | 8 |
android:orientation="horizontal" |
9 | 9 |
android:baselineAligned="false"> |
src/main/res/layout/dialog_whatsnew_pane.xml | ||
---|---|---|
3 | 3 |
xmlns:android="http://schemas.android.com/apk/res/android" |
4 | 4 |
android:layout_width="match_parent" |
5 | 5 |
android:layout_height="wrap_content" |
6 |
android:background="@color/medium_grey"
|
|
6 |
android:background="?mediumC"
|
|
7 | 7 |
android:padding="8dp" |
8 | 8 |
android:orientation="vertical"> |
9 | 9 |
|
src/main/res/layout/exit_app.xml | ||
---|---|---|
5 | 5 |
android:layout_marginLeft="10dp" |
6 | 6 |
android:layout_marginTop="0dp" |
7 | 7 |
android:layout_marginRight="10dp" |
8 |
android:background="@color/grey"
|
|
8 |
android:background="?normalC"
|
|
9 | 9 |
android:gravity="center|fill_horizontal"> |
10 | 10 |
|
11 | 11 |
<TextView |
src/main/res/layout/info.xml | ||
---|---|---|
16 | 16 |
android:layout_width="match_parent" |
17 | 17 |
android:layout_height="0dp" |
18 | 18 |
android:layout_weight="1.0" |
19 |
android:background="@color/light_grey"
|
|
19 |
android:background="?lightC"
|
|
20 | 20 |
android:orientation="vertical" > |
21 | 21 |
|
22 | 22 |
<LinearLayout |
... | ... | |
26 | 26 |
android:layout_weight="1" |
27 | 27 |
android:paddingLeft="5dp" |
28 | 28 |
android:paddingRight="5dp" |
29 |
android:background="@color/grey"
|
|
29 |
android:background="?normalC"
|
|
30 | 30 |
android:orientation="horizontal"> |
31 | 31 |
|
32 | 32 |
<TextView |
... | ... | |
61 | 61 |
android:layout_weight="1" |
62 | 62 |
android:paddingLeft="5dp" |
63 | 63 |
android:paddingRight="5dp" |
64 |
android:background="@color/grey"
|
|
64 |
android:background="?normalC"
|
|
65 | 65 |
android:orientation="horizontal"> |
66 | 66 |
|
67 | 67 |
<TextView |
... | ... | |
127 | 127 |
android:layout_weight="1" |
128 | 128 |
android:paddingLeft="5dp" |
129 | 129 |
android:paddingRight="5dp" |
130 |
android:background="@color/grey"
|
|
130 |
android:background="?normalC"
|
|
131 | 131 |
android:orientation="horizontal"> |
132 | 132 |
|
133 | 133 |
<TextView |
... | ... | |
162 | 162 |
android:layout_weight="1" |
163 | 163 |
android:paddingLeft="5dp" |
164 | 164 |
android:paddingRight="5dp" |
165 |
android:background="@color/grey"
|
|
165 |
android:background="?normalC"
|
|
166 | 166 |
android:orientation="horizontal"> |
167 | 167 |
|
168 | 168 |
<TextView |
... | ... | |
198 | 198 |
android:layout_height="100dp" |
199 | 199 |
android:layout_gravity="end" |
200 | 200 |
android:orientation="horizontal" |
201 |
android:background="@color/light_grey">
|
|
201 |
android:background="?lightC">
|
|
202 | 202 |
</LinearLayout> |
203 | 203 |
|
204 | 204 |
</LinearLayout> |
src/main/res/layout/main.xml | ||
---|---|---|
13 | 13 |
android:layout_weight="0.00" |
14 | 14 |
android:gravity="center" |
15 | 15 |
android:orientation="horizontal" |
16 |
android:background="?darkBackground">
|
|
16 |
android:background="?darkC">
|
|
17 | 17 |
</LinearLayout> |
18 | 18 |
|
19 | 19 |
<LinearLayout |
... | ... | |
24 | 24 |
android:gravity="center" |
25 | 25 |
android:weightSum="1.0" |
26 | 26 |
android:orientation="horizontal" |
27 |
android:background="?darkBackground"
|
|
27 |
android:background="?darkC"
|
|
28 | 28 |
android:baselineAligned="false"> |
29 | 29 |
|
30 | 30 |
<LinearLayout |
... | ... | |
94 | 94 |
android:layout_width="match_parent" |
95 | 95 |
android:layout_height="0dp" |
96 | 96 |
android:layout_weight="0.84" |
97 |
android:background="?lightBackground">
|
|
97 |
android:background="?lightC">
|
|
98 | 98 |
</ScrollView> |
99 | 99 |
|
100 | 100 |
<LinearLayout |
... | ... | |
103 | 103 |
android:layout_height="0dp" |
104 | 104 |
android:layout_weight="0.08" |
105 | 105 |
android:orientation="horizontal" |
106 |
android:background="?darkBackground">
|
|
106 |
android:background="?darkC">
|
|
107 | 107 |
|
108 | 108 |
<RelativeLayout |
109 | 109 |
android:id="@+id/bottomLayout" |
src/main/res/layout/object_popup.xml | ||
---|---|---|
14 | 14 |
android:paddingRight="10dp" |
15 | 15 |
android:paddingLeft="10dp" |
16 | 16 |
android:singleLine="true" |
17 |
android:backgroundTint="@color/dark_grey"
|
|
17 |
android:backgroundTint="?darkC"
|
|
18 | 18 |
android:gravity="center"/> |
19 | 19 |
|
20 | 20 |
<Button |
... | ... | |
25 | 25 |
android:paddingRight="10dp" |
26 | 26 |
android:paddingLeft="10dp" |
27 | 27 |
android:singleLine="true" |
28 |
android:backgroundTint="@color/dark_grey"
|
|
28 |
android:backgroundTint="?darkC"
|
|
29 | 29 |
android:gravity="center"/> |
30 | 30 |
|
31 | 31 |
<Button |
... | ... | |
36 | 36 |
android:paddingRight="10dp" |
37 | 37 |
android:paddingLeft="10dp" |
38 | 38 |
android:singleLine="true" |
39 |
android:backgroundTint="@color/dark_grey"
|
|
39 |
android:backgroundTint="?darkC"
|
|
40 | 40 |
android:gravity="center"/> |
41 | 41 |
|
42 | 42 |
<Button |
... | ... | |
47 | 47 |
android:paddingRight="10dp" |
48 | 48 |
android:paddingLeft="10dp" |
49 | 49 |
android:singleLine="true" |
50 |
android:backgroundTint="@color/dark_grey"
|
|
50 |
android:backgroundTint="?darkC"
|
|
51 | 51 |
android:gravity="center"/> |
52 | 52 |
|
53 | 53 |
<Button |
... | ... | |
58 | 58 |
android:paddingRight="10dp" |
59 | 59 |
android:paddingLeft="10dp" |
60 | 60 |
android:singleLine="true" |
61 |
android:backgroundTint="@color/dark_grey"
|
|
61 |
android:backgroundTint="?darkC"
|
|
62 | 62 |
android:gravity="center"/> |
63 | 63 |
|
64 | 64 |
<TextView |
... | ... | |
81 | 81 |
android:layout_height="wrap_content" |
82 | 82 |
android:paddingRight="10dp" |
83 | 83 |
android:paddingLeft="10dp" |
84 |
android:backgroundTint="@color/dark_grey"/>
|
|
84 |
android:backgroundTint="?darkC"/>
|
|
85 | 85 |
<Button |
86 | 86 |
android:id="@+id/level1" |
87 | 87 |
android:text="@string/level1" |
... | ... | |
89 | 89 |
android:layout_height="wrap_content" |
90 | 90 |
android:paddingRight="10dp" |
91 | 91 |
android:paddingLeft="10dp" |
92 |
android:backgroundTint="@color/dark_grey"/>
|
|
92 |
android:backgroundTint="?darkC"/>
|
|
93 | 93 |
<Button |
94 | 94 |
android:id="@+id/level2" |
95 | 95 |
android:text="@string/level2" |
... | ... | |
97 | 97 |
android:layout_height="wrap_content" |
98 | 98 |
android:paddingRight="10dp" |
99 | 99 |
android:paddingLeft="10dp" |
100 |
android:backgroundTint="@color/dark_grey"/>
|
|
100 |
android:backgroundTint="?darkC"/>
|
|
101 | 101 |
</LinearLayout> |
102 | 102 |
|
103 | 103 |
<LinearLayout |
... | ... | |
113 | 113 |
android:layout_height="wrap_content" |
114 | 114 |
android:paddingRight="10dp" |
115 | 115 |
android:paddingLeft="10dp" |
116 |
android:backgroundTint="@color/dark_grey"/>
|
|
116 |
android:backgroundTint="?darkC"/>
|
|
117 | 117 |
<Button |
118 | 118 |
android:id="@+id/level4" |
119 | 119 |
android:text="@string/level4" |
... | ... | |
121 | 121 |
android:layout_height="wrap_content" |
122 | 122 |
android:paddingRight="10dp" |
123 | 123 |
android:paddingLeft="10dp" |
124 |
android:backgroundTint="@color/dark_grey"/>
|
|
124 |
android:backgroundTint="?darkC"/>
|
|
125 | 125 |
<Button |
126 | 126 |
android:id="@+id/level5" |
127 | 127 |
android:text="@string/level5" |
... | ... | |
129 | 129 |
android:layout_height="wrap_content" |
130 | 130 |
android:paddingRight="10dp" |
131 | 131 |
android:paddingLeft="10dp" |
132 |
android:backgroundTint="@color/dark_grey"/>
|
|
132 |
android:backgroundTint="?darkC"/>
|
|
133 | 133 |
</LinearLayout> |
134 | 134 |
|
135 | 135 |
<LinearLayout |
... | ... | |
145 | 145 |
android:layout_height="wrap_content" |
146 | 146 |
android:paddingRight="10dp" |
147 | 147 |
android:paddingLeft="10dp" |
148 |
android:backgroundTint="@color/dark_grey"/>
|
|
148 |
android:backgroundTint="?darkC"/>
|
|
149 | 149 |
<Button |
150 | 150 |
android:id="@+id/level7" |
151 | 151 |
android:text="@string/level7" |
... | ... | |
153 | 153 |
android:layout_height="wrap_content" |
154 | 154 |
android:paddingRight="10dp" |
155 | 155 |
android:paddingLeft="10dp" |
156 |
android:backgroundTint="@color/dark_grey"/>
|
|
156 |
android:backgroundTint="?darkC"/>
|
|
157 | 157 |
<Button |
158 | 158 |
android:id="@+id/levelM" |
159 | 159 |
android:text="@string/levelM" |
... | ... | |
161 | 161 |
android:layout_height="wrap_content" |
162 | 162 |
android:paddingRight="10dp" |
163 | 163 |
android:paddingLeft="10dp" |
164 |
android:backgroundTint="@color/dark_grey"/>
|
|
164 |
android:backgroundTint="?darkC"/>
|
|
165 | 165 |
</LinearLayout> |
166 | 166 |
</LinearLayout> |
src/main/res/layout/popup_menu.xml | ||
---|---|---|
15 | 15 |
android:paddingRight="10dp" |
16 | 16 |
android:paddingLeft="10dp" |
17 | 17 |
android:singleLine="true" |
18 |
android:backgroundTint="@color/dark_grey"
|
|
18 |
android:backgroundTint="?darkC"
|
|
19 | 19 |
android:gravity="center"/> |
20 | 20 |
|
21 | 21 |
<Button |
... | ... | |
27 | 27 |
android:paddingRight="10dp" |
28 | 28 |
android:paddingLeft="10dp" |
29 | 29 |
android:singleLine="true" |
30 |
android:backgroundTint="@color/dark_grey"
|
|
30 |
android:backgroundTint="?darkC"
|
|
31 | 31 |
android:gravity="center"/> |
32 | 32 |
|
33 | 33 |
<Button |
... | ... | |
39 | 39 |
android:paddingRight="10dp" |
40 | 40 |
android:paddingLeft="10dp" |
41 | 41 |
android:singleLine="true" |
42 |
android:backgroundTint="@color/dark_grey"
|
|
42 |
android:backgroundTint="?darkC"
|
|
43 | 43 |
android:gravity="center"/> |
44 | 44 |
|
45 | 45 |
<Button |
... | ... | |
51 | 51 |
android:paddingRight="10dp" |
52 | 52 |
android:paddingLeft="10dp" |
53 | 53 |
android:singleLine="true" |
54 |
android:backgroundTint="@color/dark_grey"
|
|
54 |
android:backgroundTint="?darkC"
|
|
55 | 55 |
android:gravity="center"/> |
56 | 56 |
|
57 | 57 |
<Button |
... | ... | |
63 | 63 |
android:paddingRight="10dp" |
64 | 64 |
android:paddingLeft="10dp" |
65 | 65 |
android:singleLine="true" |
66 |
android:backgroundTint="@color/dark_grey"
|
|
66 |
android:backgroundTint="?darkC"
|
|
67 | 67 |
android:gravity="center"/> |
68 | 68 |
|
69 | 69 |
<Button |
... | ... | |
75 | 75 |
android:paddingRight="10dp" |
76 | 76 |
android:paddingLeft="10dp" |
77 | 77 |
android:singleLine="true" |
78 |
android:backgroundTint="@color/dark_grey"
|
|
78 |
android:backgroundTint="?darkC"
|
|
79 | 79 |
android:gravity="center"/> |
80 | 80 |
|
81 | 81 |
<Button |
... | ... | |
87 | 87 |
android:paddingRight="10dp" |
88 | 88 |
android:paddingLeft="10dp" |
89 | 89 |
android:singleLine="true" |
90 |
android:backgroundTint="@color/dark_grey"
|
|
90 |
android:backgroundTint="?darkC"
|
|
91 | 91 |
android:gravity="center"/> |
92 | 92 |
|
93 | 93 |
<TextView |
... | ... | |
112 | 112 |
android:layout_height="30dp" |
113 | 113 |
android:paddingRight="10dp" |
114 | 114 |
android:paddingLeft="10dp" |
115 |
android:backgroundTint="@color/dark_grey"/>
|
|
115 |
android:backgroundTint="?darkC"/>
|
|
116 | 116 |
<Button |
117 | 117 |
android:id="@+id/level2" |
118 | 118 |
android:text="@string/level2" |
... | ... | |
120 | 120 |
android:layout_height="30dp" |
121 | 121 |
android:paddingRight="10dp" |
122 | 122 |
android:paddingLeft="10dp" |
123 |
android:backgroundTint="@color/dark_grey"/>
|
|
123 |
android:backgroundTint="?darkC"/>
|
|
124 | 124 |
<Button |
125 | 125 |
android:id="@+id/level3" |
126 | 126 |
android:text="@string/level3" |
... | ... | |
128 | 128 |
android:layout_height="30dp" |
129 | 129 |
android:paddingRight="10dp" |
130 | 130 |
android:paddingLeft="10dp" |
131 |
android:backgroundTint="@color/dark_grey"/>
|
|
131 |
android:backgroundTint="?darkC"/>
|
|
132 | 132 |
</LinearLayout> |
133 | 133 |
|
134 | 134 |
<LinearLayout |
... | ... | |
145 | 145 |
android:layout_height="30dp" |
146 | 146 |
android:paddingRight="10dp" |
147 | 147 |
android:paddingLeft="10dp" |
148 |
android:backgroundTint="@color/dark_grey"/>
|
|
148 |
android:backgroundTint="?darkC"/>
|
|
149 | 149 |
<Button |
150 | 150 |
android:id="@+id/level5" |
151 | 151 |
android:text="@string/level5" |
... | ... | |
153 | 153 |
android:layout_height="30dp" |
154 | 154 |
android:paddingRight="10dp" |
155 | 155 |
android:paddingLeft="10dp" |
156 |
android:backgroundTint="@color/dark_grey"/>
|
|
156 |
android:backgroundTint="?darkC"/>
|
|
157 | 157 |
<Button |
158 | 158 |
android:id="@+id/level6" |
159 | 159 |
android:text="@string/level6" |
... | ... | |
161 | 161 |
android:layout_height="30dp" |
162 | 162 |
android:paddingRight="10dp" |
163 | 163 |
android:paddingLeft="10dp" |
164 |
android:backgroundTint="@color/dark_grey"/>
|
|
164 |
android:backgroundTint="?darkC"/>
|
|
165 | 165 |
</LinearLayout> |
166 | 166 |
|
167 | 167 |
<LinearLayout |
... | ... | |
178 | 178 |
android:layout_height="30dp" |
179 | 179 |
android:paddingRight="10dp" |
180 | 180 |
android:paddingLeft="10dp" |
181 |
android:backgroundTint="@color/dark_grey"/>
|
|
181 |
android:backgroundTint="?darkC"/>
|
|
182 | 182 |
<Button |
183 | 183 |
android:id="@+id/level8" |
184 | 184 |
android:text="@string/level8" |
... | ... | |
186 | 186 |
android:layout_height="30dp" |
187 | 187 |
android:paddingRight="10dp" |
188 | 188 |
android:paddingLeft="10dp" |
189 |
android:backgroundTint="@color/dark_grey"/>
|
|
189 |
android:backgroundTint="?darkC"/>
|
|
190 | 190 |
<Button |
191 | 191 |
android:id="@+id/levelM" |
192 | 192 |
android:text="@string/levelM" |
... | ... | |
194 | 194 |
android:layout_height="30dp" |
195 | 195 |
android:paddingRight="10dp" |
196 | 196 |
android:paddingLeft="10dp" |
197 |
android:backgroundTint="@color/dark_grey"/>
|
|
197 |
android:backgroundTint="?darkC"/>
|
|
198 | 198 |
</LinearLayout> |
199 | 199 |
</LinearLayout> |
src/main/res/layout/popup_object.xml | ||
---|---|---|
22 | 22 |
android:id="@+id/bottomLayout" |
23 | 23 |
android:layout_width="match_parent" |
24 | 24 |
android:layout_height="60dp" |
25 |
android:background="@color/grey"
|
|
25 |
android:background="?normalC"
|
|
26 | 26 |
android:paddingEnd="10dp" |
27 | 27 |
android:paddingStart="10dp"> |
28 | 28 |
|
src/main/res/layout/settings_popup.xml | ||
---|---|---|
12 | 12 |
android:layout_height="wrap_content" |
13 | 13 |
android:text="@string/settings_title" |
14 | 14 |
android:textSize="34sp" |
15 |
android:background="@color/light_grey"
|
|
15 |
android:background="?lightC"
|
|
16 | 16 |
android:gravity="center"/> |
17 | 17 |
|
18 | 18 |
<GridLayout |
src/main/res/layout/settings_popup_android25.xml | ||
---|---|---|
12 | 12 |
android:layout_height="wrap_content" |
13 | 13 |
android:text="@string/settings_title" |
14 | 14 |
android:textSize="34sp" |
15 |
android:background="@color/light_grey"
|
|
15 |
android:background="?lightC"
|
|
16 | 16 |
android:gravity="center"/> |
17 | 17 |
|
18 | 18 |
<GridLayout |
src/main/res/values-de/strings.xml | ||
---|---|---|
90 | 90 |
<string name="config_corner">Ecken</string> |
91 | 91 |
<string name="config_no_support">Das aktuelle Puzzle unterstützt keine Farbanpassung.</string> |
92 | 92 |
|
93 |
<string name="config_message">Berühre die Aufkleber, um ihre Farbe zu ändern.</string> |
|
94 |
<string name="bandage_message">Verbinden Sie den Würfel, indem Sie ihn berühren.</string> |
|
95 |
<string name="solver_message">Richte eine verschlüsselte Position ein, indem du die Sticker berührst.</string> |
|
96 |
|
|
97 |
<string name="theme">Thema</string> |
|
98 |
<string name="theme_white">Weiß</string> |
|
99 |
<string name="theme_grey">Grau</string> |
|
100 |
<string name="theme_green">Grün</string> |
|
101 |
|
|
93 | 102 |
<string name="sort_classic">Klassisch</string> |
94 | 103 |
<string name="sort_shape">Form</string> |
95 | 104 |
<string name="sort_difficulty">Schwierigkeit</string> |
src/main/res/values-es/strings.xml | ||
---|---|---|
90 | 90 |
<string name="config_corner">Esquinas</string> |
91 | 91 |
<string name="config_no_support">El cubo actual no admite el ajuste de colores.</string> |
92 | 92 |
|
93 |
<string name="config_message">Toca las pegatinas para cambiar su color.</string> |
|
94 |
<string name="bandage_message">Venda el cubo tocándolo.</string> |
|
95 |
<string name="solver_message">Establece la posición de revuelto tocando las pegatinas.</string> |
|
96 |
|
|
97 |
<string name="theme">Tema</string> |
|
98 |
<string name="theme_white">Blanco</string> |
|
99 |
<string name="theme_grey">Gris</string> |
|
100 |
<string name="theme_green">Verde</string> |
|
101 |
|
|
93 | 102 |
<string name="sort_classic">Clásico</string> |
94 | 103 |
<string name="sort_shape">Forma</string> |
95 | 104 |
<string name="sort_difficulty">Dificultad</string> |
src/main/res/values-fr/strings.xml | ||
---|---|---|
90 | 90 |
<string name="config_corner">Coins</string> |
91 | 91 |
<string name="config_no_support">Le cube actuel ne prend pas en charge le réglage des couleurs.</string> |
92 | 92 |
|
93 |
<string name="config_message">Touchez les autocollants pour changer leur couleur.</string> |
|
94 |
<string name="bandage_message">Panser le cube en le touchant.</string> |
|
95 |
<string name="solver_message">Mettre en place une position brouillée en touchant les autocollants.</string> |
|
96 |
|
|
97 |
<string name="theme">Thème</string> |
|
98 |
<string name="theme_white">Blanc</string> |
|
99 |
<string name="theme_grey">Gris</string> |
|
100 |
<string name="theme_green">Vert</string> |
|
101 |
|
|
93 | 102 |
<string name="sort_classic">Classique</string> |
94 | 103 |
<string name="sort_shape">Forme</string> |
95 | 104 |
<string name="sort_difficulty">Difficulté</string> |
src/main/res/values-ja/strings.xml | ||
---|---|---|
90 | 90 |
<string name="config_corner">角</string> |
91 | 91 |
<string name="config_no_support">現在のキューブは色の調整をサポートしていません。</string> |
92 | 92 |
|
93 |
<string name="config_message">ステッカーをタッチすると色が変わります。</string> |
|
94 |
<string name="bandage_message">キューブをタッチして包帯を巻きます。</string> |
|
95 |
<string name="solver_message">シールをタッチして、スクランブルポジションを設定します。</string> |
|
96 |
|
|
97 |
<string name="theme">テーマ</string> |
|
98 |
<string name="theme_white">ホワイト</string> |
|
99 |
<string name="theme_grey">グレー</string> |
|
100 |
<string name="theme_green">グリーン</string> |
|
101 |
|
|
93 | 102 |
<string name="sort_classic">古典学</string> |
94 | 103 |
<string name="sort_shape">形</string> |
95 | 104 |
<string name="sort_difficulty">困難</string> |
src/main/res/values-ko/strings.xml | ||
---|---|---|
90 | 90 |
<string name="config_corner">모서리</string> |
91 | 91 |
<string name="config_no_support">현재 큐브는 색상 조정을 지원하지 않습니다.</string> |
92 | 92 |
|
93 |
<string name="config_message">스티커를 터치하여 색상을 변경합니다.</string> |
|
94 |
<string name="bandage_message">큐브를 터치하여 붕대를 감습니다.</string> |
|
95 |
<string name="solver_message">스티커를 터치하여 스크램블 위치를 설정합니다.</string> |
|
96 |
|
|
97 |
<string name="theme">테마</string> |
|
98 |
<string name="theme_white">흰색</string> |
|
99 |
<string name="theme_grey">회색</string> |
|
100 |
<string name="theme_green">녹색</string> |
|
101 |
|
|
93 | 102 |
<string name="sort_classic">전통적인</string> |
94 | 103 |
<string name="sort_shape">모양</string> |
95 | 104 |
<string name="sort_difficulty">어려움</string> |
src/main/res/values-pl/strings.xml | ||
---|---|---|
90 | 90 |
<string name="config_corner">Rogi</string> |
91 | 91 |
<string name="config_no_support">Bieżąca kostka nie wspomaga zmieniania kolorów.</string> |
92 | 92 |
|
93 |
<string name="config_message">Aby zmienic kolor naklejki, dotknij jej.</string> |
|
94 |
<string name="bandage_message">Żeby zabandażować kostkę, dotknij jej.</string> |
|
95 |
<string name="solver_message">Dotknij naklejki żeby zmienić jej kolor i tym samym ustawić pozycję początkową.</string> |
|
96 |
|
|
97 |
<string name="theme">Styl</string> |
|
98 |
<string name="theme_white">Bialy</string> |
|
99 |
<string name="theme_grey">Szary</string> |
|
100 |
<string name="theme_green">Zielony</string> |
|
101 |
|
|
93 | 102 |
<string name="sort_classic">Klasycznie</string> |
94 | 103 |
<string name="sort_shape">Kształt</string> |
95 | 104 |
<string name="sort_difficulty">Trudność</string> |
src/main/res/values-ru/strings.xml | ||
---|---|---|
90 | 90 |
<string name="config_corner">Углы</string> |
91 | 91 |
<string name="config_no_support">Текущий куб не поддерживает настройку цветов.</string> |
92 | 92 |
|
93 |
<string name="config_message">Прикоснитесь к наклейкам, чтобы изменить их цвет.</string> |
|
94 |
<string name="bandage_message">Перевяжите кубик, прикоснувшись к нему.</string> |
|
95 |
<string name="solver_message">Установите скремблированную позицию, касаясь наклеек.</string> |
|
96 |
|
|
97 |
<string name="theme">Тема</string> |
|
98 |
<string name="theme_white">Белый</string> |
|
99 |
<string name="theme_grey">Серый</string> |
|
100 |
<string name="theme_green">Зеленый</string> |
|
101 |
|
|
93 | 102 |
<string name="sort_classic">Классик</string> |
94 | 103 |
<string name="sort_shape">Форма</string> |
95 | 104 |
<string name="sort_difficulty">Сложность</string> |
src/main/res/values-zh-rCN/strings.xml | ||
---|---|---|
90 | 90 |
<string name="config_corner">角</string> |
91 | 91 |
<string name="config_no_support">目前拼图不支持调整颜色。</string> |
92 | 92 |
|
93 |
<string name="config_message">触摸贴纸可改变其颜色。</string> |
|
94 |
<string name="bandage_message">通过触摸来包扎魔方。</string> |
|
95 |
<string name="solver_message">通过触摸贴纸来设置拼图位置。</string> |
|
96 |
|
|
97 |
<string name="theme">主题</string> |
|
98 |
<string name="theme_white">白色</string> |
|
99 |
<string name="theme_grey">灰色</string> |
|
100 |
<string name="theme_green">绿色</string> |
|
101 |
|
|
93 | 102 |
<string name="sort_classic">經典的</string> |
94 | 103 |
<string name="sort_shape">形狀</string> |
95 | 104 |
<string name="sort_difficulty">困难</string> |
src/main/res/values-zh-rTW/strings.xml | ||
---|---|---|
90 | 90 |
<string name="config_corner">角</string> |
91 | 91 |
<string name="config_no_support">目前拼圖不支援調整顏色。</string> |
92 | 92 |
|
93 |
<string name="config_message">觸摸貼紙以更改其顏色。</string> |
|
94 |
<string name="bandage_message">透過觸摸立方體來包紮它。</string> |
|
95 |
<string name="solver_message">透過觸控貼紙設定打亂位置。</string> |
|
96 |
|
|
97 |
<string name="theme">主題</string> |
|
98 |
<string name="theme_white">白色的</string> |
|
99 |
<string name="theme_grey">灰色的</string> |
|
100 |
<string name="theme_green">綠色的</string> |
|
101 |
|
|
93 | 102 |
<string name="sort_classic">经典的</string> |
94 | 103 |
<string name="sort_shape">形状</string> |
95 | 104 |
<string name="sort_difficulty">困難</string> |
src/main/res/values/attr.xml | ||
---|---|---|
1 | 1 |
<?xml version="1.0" encoding="utf-8"?> |
2 | 2 |
<resources> |
3 | 3 |
|
4 |
<attr name="darkBackground" format="reference|color" /> |
|
5 |
<attr name="lightBackground" format="reference|color" /> |
|
4 |
<attr name="darkC" format="reference|color" /> |
|
5 |
<attr name="normalC" format="reference|color" /> |
|
6 |
<attr name="mediumC" format="reference|color" /> |
|
7 |
<attr name="lightC" format="reference|color" /> |
|
6 | 8 |
|
7 | 9 |
</resources> |
src/main/res/values/colors.xml | ||
---|---|---|
4 | 4 |
<color name="colorPrimaryDark">#00574B</color> |
5 | 5 |
<color name="colorAccent">#D81B60</color> |
6 | 6 |
<color name="red">#ffff0000</color> |
7 |
<color name="dark_green">#ff009900</color> |
|
8 |
<color name="green">#ff00cc00</color> |
|
9 |
<color name="dark_grey">#ff222222</color> |
|
10 |
<color name="grey">#ff333333</color> |
|
11 |
<color name="light_grey">#ff555555</color> |
|
12 |
<color name="medium_grey">#ff444444</color> |
|
13 | 7 |
<color name="black">#ff010101</color> |
14 |
<color name="dark_white">#ffe0e0e0</color> |
|
15 | 8 |
<color name="white">#ffffffff</color> |
9 |
|
|
10 |
<color name="darkGreen">#ff009900</color> |
|
11 |
<color name="normalGreen">#ff00aa00</color> |
|
12 |
<color name="mediumGreen">#ff00bb00</color> |
|
13 |
<color name="lightGreen">#ff00cc00</color> |
|
14 |
|
|
15 |
<color name="darkGrey">#ff222222</color> |
|
16 |
<color name="normalGrey">#ff333333</color> |
|
17 |
<color name="mediumGrey">#ff444444</color> |
|
18 |
<color name="lightGrey">#ff555555</color> |
|
19 |
|
|
20 |
<color name="darkWhite">#ffd0d0d0</color> |
|
21 |
<color name="normalWhite">#ffe0e0e0</color> |
|
22 |
<color name="mediumWhite">#fff0f0f0</color> |
|
23 |
<color name="lightWhite">#ffffffff</color> |
|
16 | 24 |
</resources> |
src/main/res/values/styles.xml | ||
---|---|---|
13 | 13 |
</style> |
14 | 14 |
|
15 | 15 |
<style name="GreyTheme" parent="@style/BaseMaterialThemeNoActionBar"> |
16 |
<item name="darkBackground">@color/dark_grey</item> |
|
17 |
<item name="lightBackground">@color/grey</item> |
|
16 |
<item name="darkC">@color/darkGrey</item> |
|
17 |
<item name="normalC">@color/normalGrey</item> |
|
18 |
<item name="mediumC">@color/mediumGrey</item> |
|
19 |
<item name="lightC">@color/lightGrey</item> |
|
18 | 20 |
</style> |
19 | 21 |
|
20 | 22 |
<style name="WhiteTheme" parent="@style/BaseMaterialThemeNoActionBar"> |
21 |
<item name="darkBackground">@color/dark_white</item> |
|
22 |
<item name="lightBackground">@color/white</item> |
|
23 |
<item name="darkC">@color/darkWhite</item> |
|
24 |
<item name="normalC">@color/normalWhite</item> |
|
25 |
<item name="mediumC">@color/mediumWhite</item> |
|
26 |
<item name="lightC">@color/lightWhite</item> |
|
23 | 27 |
</style> |
24 | 28 |
|
25 | 29 |
<style name="GreenTheme" parent="@style/BaseMaterialThemeNoActionBar"> |
26 |
<item name="darkBackground">@color/dark_green</item> |
|
27 |
<item name="lightBackground">@color/green</item> |
|
30 |
<item name="darkC">@color/darkGreen</item> |
|
31 |
<item name="normalC">@color/normalGreen</item> |
|
32 |
<item name="mediumC">@color/mediumGreen</item> |
|
33 |
<item name="lightC">@color/lightGreen</item> |
|
28 | 34 |
</style> |
29 | 35 |
|
30 | 36 |
<style name="NegativeButtonStyle" parent="Widget.MaterialComponents.Button.TextButton.Dialog"> |
... | ... | |
36 | 42 |
</style> |
37 | 43 |
|
38 | 44 |
<style name="ButtonStyleTextColor"> |
39 |
<item name="colorOnPrimary">@color/white</item>
|
|
40 |
<item name="colorOnSecondary">@color/dark_grey</item>
|
|
41 |
<item name="colorOnSurface">@color/light_grey</item>
|
|
45 |
<item name="colorOnPrimary">@color/normalWhite</item>
|
|
46 |
<item name="colorOnSecondary">@color/darkGrey</item>
|
|
47 |
<item name="colorOnSurface">@color/lightGrey</item>
|
|
42 | 48 |
</style> |
43 | 49 |
|
44 | 50 |
</resources> |
Also available in: Unified diff
major progress with colors in styles