Skip to content

Commit a0be8bd

Browse files
mathiascodeCl1608Ho
authored andcommitted
Use less hacky way to tint icons (#44)
1 parent c2e622d commit a0be8bd

File tree

19 files changed

+69
-115
lines changed

19 files changed

+69
-115
lines changed

app/src/main/java/org/cuberite/android/fragments/ControlFragment.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ public void onClick(View view) {
109109
}
110110
});
111111
} else if (state == State.READY) {
112-
int colorTo = ContextCompat.getColor(getContext(), R.color.success);
112+
int colorTo = ContextCompat.getColor(getContext(), R.color.accent);
113113
animateColorChange(mainButton, mainButtonColor, colorTo);
114114
mainButton.setText(getText(R.string.do_start_cuberite));
115115
mainButton.setOnClickListener(new View.OnClickListener() {
@@ -119,7 +119,7 @@ public void onClick(View view) {
119119
}
120120
});
121121
} else {
122-
int colorTo = ContextCompat.getColor(getContext(), R.color.primary);
122+
int colorTo = ContextCompat.getColor(getContext(), R.color.accent);
123123
animateColorChange(mainButton, mainButtonColor, colorTo);
124124
mainButton.setText(getText(R.string.do_install_cuberite));
125125
mainButton.setOnClickListener(new View.OnClickListener() {
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<selector xmlns:android="http://schemas.android.com/apk/res/android">
33
<item android:state_checked="true" android:color="@color/accent"/>
4-
<item android:color="?android:attr/textColorSecondary"/>
4+
<item android:color="@color/primary"/>
55
</selector>

app/src/main/res/drawable/ic_cloud_download.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
android:viewportWidth="24"
55
android:viewportHeight="24">
66
<path
7-
android:fillColor="#FF000000"
7+
android:fillColor="?attr/colorPrimary"
88
android:pathData="M19.35,10.04C18.67,6.59 15.64,4 12,4 9.11,4 6.6,5.64 5.35,8.04 2.34,8.36 0,10.91 0,14c0,3.31 2.69,6 6,6h13c2.76,0 5,-2.24 5,-5 0,-2.64 -2.05,-4.78 -4.65,-4.96zM19,18L6,18c-2.21,0 -4,-1.79 -4,-4 0,-2.05 1.53,-3.76 3.56,-3.97l1.07,-0.11 0.5,-0.95C8.08,7.14 9.94,6 12,6c2.62,0 4.88,1.86 5.39,4.43l0.3,1.5 1.53,0.11c1.56,0.1 2.78,1.41 2.78,2.96 0,1.65 -1.35,3 -3,3zM13.45,10h-2.9v3L8,13l4,4 4,-4h-2.55z"/>
99
</vector>

app/src/main/res/drawable/ic_execute.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
android:viewportWidth="24"
55
android:viewportHeight="24">
66
<path
7-
android:fillColor="#FF000000"
7+
android:fillColor="?attr/colorPrimary"
88
android:pathData="M4.01,6.03l7.51,3.22 -7.52,-1 0.01,-2.22m7.5,8.72L4,17.97v-2.22l7.51,-1M2.01,3L2,10l15,2 -15,2 0.01,7L23,12 2.01,3z"/>
99
</vector>

app/src/main/res/drawable/ic_info.xml

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

app/src/main/res/drawable/ic_install.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
android:viewportWidth="24"
55
android:viewportHeight="24">
66
<path
7-
android:fillColor="#FF000000"
7+
android:fillColor="?attr/colorPrimary"
88
android:pathData="M20.54,5.23l-1.39,-1.68C18.88,3.21 18.47,3 18,3L6,3c-0.47,0 -0.88,0.21 -1.16,0.55L3.46,5.23C3.17,5.57 3,6.02 3,6.5L3,19c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,6.5c0,-0.48 -0.17,-0.93 -0.46,-1.27zM6.24,5h11.52l0.81,0.97L5.44,5.97l0.8,-0.97zM5,19L5,8h14v11L5,19zM13.45,10h-2.9v3L8,13l4,4 4,-4h-2.55z"/>
99
</vector>

app/src/main/res/drawable/ic_policy.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
android:viewportWidth="24"
55
android:viewportHeight="24">
66
<path
7-
android:fillColor="#FF000000"
7+
android:fillColor="?attr/colorPrimary"
88
android:pathData="M12,1L3,5v6c0,5.55 3.84,10.74 9,12c5.16,-1.26 9,-6.45 9,-12V5L12,1zM19,11c0,1.85 -0.51,3.65 -1.38,5.21l-1.45,-1.45c1.29,-1.94 1.07,-4.58 -0.64,-6.29c-1.95,-1.95 -5.12,-1.95 -7.07,0c-1.95,1.95 -1.95,5.12 0,7.07c1.71,1.71 4.35,1.92 6.29,0.64l1.72,1.72c-1.19,1.42 -2.73,2.51 -4.47,3.04C7.98,19.69 5,15.52 5,11V6.3l7,-3.11l7,3.11V11zM12,15c-1.66,0 -3,-1.34 -3,-3s1.34,-3 3,-3s3,1.34 3,3S13.66,15 12,15z"/>
99
</vector>

app/src/main/res/drawable/ic_webadmin.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
android:viewportWidth="24"
55
android:viewportHeight="24">
66
<path
7-
android:fillColor="#FF000000"
7+
android:fillColor="?attr/colorPrimary"
88
android:pathData="M22.61,18.99l-9.08,-9.08c0.93,-2.34 0.45,-5.1 -1.44,-7C9.79,0.61 6.21,0.4 3.66,2.26L7.5,6.11 6.08,7.52 2.25,3.69C0.39,6.23 0.6,9.82 2.9,12.11c1.86,1.86 4.57,2.35 6.89,1.48l9.11,9.11c0.39,0.39 1.02,0.39 1.41,0l2.3,-2.3c0.4,-0.38 0.4,-1.01 0,-1.41zM19.61,20.59l-9.46,-9.46c-0.61,0.45 -1.29,0.72 -2,0.82 -1.36,0.2 -2.79,-0.21 -3.83,-1.25C3.37,9.76 2.93,8.5 3,7.26l3.09,3.09 4.24,-4.24 -3.09,-3.09c1.24,-0.07 2.49,0.37 3.44,1.31 1.08,1.08 1.49,2.57 1.24,3.96 -0.12,0.71 -0.42,1.37 -0.88,1.96l9.45,9.45 -0.88,0.89z"/>
99
</vector>

app/src/main/res/layout/fragment_console.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@
5454
android:contentDescription="@string/do_execute_line"
5555
android:layout_alignParentEnd="true"
5656
android:layout_alignParentRight="true"
57-
android:tint="@color/execute_button"
5857
app:srcCompat="@drawable/ic_execute" />
5958
</RelativeLayout>
6059
</androidx.cardview.widget.CardView>

app/src/main/res/layout/fragment_control.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
android:insetBottom="0dp"
1515
android:padding="6dp"
1616
android:textAllCaps="false"
17-
android:textColor="@color/main_button_text"
17+
android:textColor="@color/white"
1818
app:elevation="0dp"
1919
app:cornerRadius="75dp" />
2020
</RelativeLayout>

0 commit comments

Comments
 (0)