Skip to content

Commit 561d567

Browse files
committed
Fix Downloader colors
1 parent c906cb5 commit 561d567

6 files changed

Lines changed: 15 additions & 23 deletions

File tree

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@
3939
android:layout_marginRight="1dp"
4040
android:contentDescription="TODO"
4141
android:scaleType="center"
42-
app:srcCompat="@drawable/ic_more_vert" />
42+
app:srcCompat="@drawable/ic_more_vert"
43+
app:tint="?attr/actionColor" />
4344

4445
</RelativeLayout>
4546

@@ -52,7 +53,8 @@
5253
android:contentDescription="TODO"
5354
android:gravity="center"
5455
android:padding="10dp"
55-
android:scaleType="fitXY" />
56+
android:scaleType="fitXY"
57+
app:tint="?attr/actionColor" />
5658

5759
<TextView
5860
android:id="@+id/item_name"

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@
1818
android:contentDescription="TODO"
1919
android:gravity="center"
2020
android:padding="15dp"
21-
android:scaleType="fitXY" />
21+
android:scaleType="fitXY"
22+
app:tint="?attr/actionColor" />
2223

2324
<TextView
2425
android:id="@+id/item_name"
@@ -71,7 +72,8 @@
7172
android:layout_marginRight="4dp"
7273
android:contentDescription="TODO"
7374
android:scaleType="centerInside"
74-
app:srcCompat="@drawable/ic_more_vert" />
75+
app:srcCompat="@drawable/ic_more_vert"
76+
app:tint="?attr/actionColor" />
7577

7678
</RelativeLayout>
7779

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
android:layout_marginRight="8dp"
1111
android:orientation="vertical">
1212

13-
1413
<TextView
1514
android:id="@+id/item_name"
1615
android:layout_width="wrap_content"
@@ -21,9 +20,4 @@
2120
android:textSize="16sp"
2221
android:textStyle="bold" />
2322

24-
<View
25-
android:layout_width="match_parent"
26-
android:layout_height="2dp"
27-
android:background="@color/black_settings_accent_color" />
28-
2923
</LinearLayout>

app/src/main/res/values/attrs.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
<attr name="focused_selector" format="reference" />
1212
<attr name="dashed_border" format="reference" />
1313

14+
<attr name="actionColor" format="color" />
1415
<attr name="separator_color" format="color" />
1516
<attr name="contrast_background_color" format="color" />
1617
<attr name="windowBackground" format="color" />

app/src/main/res/values/styles.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
<!-- Base Theme -->
1515
<style name="Base.V19" parent="Theme.AppCompat.DayNight.NoActionBar">
16+
<item name="actionColor">@color/white</item>
1617
<item name="floatingActionButtonStyle">@style/FloatingActionButtonTheme</item>
1718
<item name="toolbarSearchColor">@color/white</item>
1819
<item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>

app/src/main/res/values/styles_misc.xml

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -61,17 +61,17 @@
6161
</style>
6262

6363
<style name="FloatingActionButtonTheme" parent="Widget.Design.FloatingActionButton">
64-
<item name="tint">@color/white</item>
64+
<item name="tint">?attr/actionColor</item>
6565
</style>
6666

6767
<style name="DarkPopupMenu" parent="ThemeOverlay.AppCompat.Dark.ActionBar"/>
6868

6969
<style name="ToolbarTheme" parent="ThemeOverlay.AppCompat.Dark.ActionBar">
7070
<item name="popupTheme">@style/ThemeOverlay.AppCompat.DayNight.ActionBar</item>
71-
<item name="android:textColorPrimary">@android:color/white</item>
72-
<item name="android:textColorSecondary">@android:color/white</item>
73-
<item name="tint">@color/white</item>
74-
<item name="iconTint">@color/white</item>
71+
<item name="android:textColorPrimary">?attr/actionColor</item>
72+
<item name="android:textColorSecondary">?attr/actionColor</item>
73+
<item name="tint">?attr/actionColor</item>
74+
<item name="iconTint">?attr/actionColor</item>
7575
</style>
7676
<style name="ContrastToolbarTheme" parent="ThemeOverlay.AppCompat.DayNight.ActionBar">
7777
<item name="popupTheme">@style/ThemeOverlay.AppCompat.DayNight.ActionBar</item>
@@ -82,18 +82,10 @@
8282
<item name="toolbarSearchColor">@color/contrastColor</item>
8383
</style>
8484

85-
<style name="WhiteAccentTheme">
86-
<item name="colorAccent">@color/white</item>
87-
</style>
88-
8985
<style name="WhiteTintTheme">
9086
<item name="tint">@color/white</item>
9187
<item name="iconTint">@color/white</item>
9288
</style>
93-
<style name="DarkTintTheme">
94-
<item name="tint">@color/black</item>
95-
<item name="iconTint">@color/black</item>
96-
</style>
9789
<style name="ContrastTintTheme">
9890
<item name="tint">@color/contrastColor</item>
9991
<item name="iconTint">@color/contrastColor</item>

0 commit comments

Comments
 (0)