Skip to content

Commit bc11586

Browse files
tobexyztobexyz
authored
Merge pull request #251 from tobexyz/feat/issue245
Feat/issue245
2 parents aa7e8e6 + 76424d5 commit bc11586

18 files changed

Lines changed: 132 additions & 54 deletions

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
PROGRESS.md
12
KIRO.md
23
reports
34
.kiro

‎yaacc/src/main/java/de/yaacc/browser/ContentListFragment.java‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,8 @@ private void init(Bundle savedInstanceState, View contentlistView) {
103103
currentFolderNameView = contentlistView.findViewById(R.id.contentListCurrentFolderName);
104104
currentReceivers = contentlistView.findViewById(R.id.contentListCurrentReceivers);
105105
currentProvider = contentlistView.findViewById(R.id.contentListCurrentProvider);
106+
tintCompoundDrawables(currentReceivers);
107+
tintCompoundDrawables(currentProvider);
106108
topSeperator = contentlistView.findViewById(R.id.contentListTopSeperator);
107109
contentList = contentlistView.findViewById(R.id.contentList);
108110
progressBar = contentlistView.findViewById(R.id.contentListProgressBar);
@@ -139,6 +141,16 @@ private void init(Bundle savedInstanceState, View contentlistView) {
139141

140142
}
141143

144+
private void tintCompoundDrawables(TextView textView) {
145+
Drawable[] drawables = textView.getCompoundDrawablesRelative();
146+
for (int i = 0; i < drawables.length; i++) {
147+
if (drawables[i] != null) {
148+
drawables[i] = ThemeHelper.tintDrawable(drawables[i], requireContext().getTheme());
149+
}
150+
}
151+
textView.setCompoundDrawablesRelativeWithIntrinsicBounds(drawables[0], drawables[1], drawables[2], drawables[3]);
152+
}
153+
142154
@Override
143155
public void onSaveInstanceState(@NonNull Bundle outState) {
144156
super.onSaveInstanceState(outState);

‎yaacc/src/main/java/de/yaacc/imageviewer/ImageViewerActivity.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -435,6 +435,12 @@ public void exit() {
435435
@Override
436436
public boolean onCreateOptionsMenu(android.view.Menu menu) {
437437
getMenuInflater().inflate(R.menu.activity_image_viewer, menu);
438+
for (int i = 0; i < menu.size(); i++) {
439+
android.view.MenuItem item = menu.getItem(i);
440+
if (item.getIcon() != null) {
441+
item.setIcon(ThemeHelper.tintDrawable(item.getIcon(), getTheme()));
442+
}
443+
}
438444
return true;
439445
}
440446

‎yaacc/src/main/java/de/yaacc/player/AVTransportPlayerActivity.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -438,10 +438,11 @@ private void doSetTrackInfo() {
438438
URI albumArtUri = getPlayer().getAlbumArt();
439439

440440
if (null != albumArtUri) {
441+
albumArtView.setImageTintList(null);
441442
ImageDownloadTask imageDownloadTask = new ImageDownloadTask(albumArtView);
442443
imageDownloadTask.executeOnExecutor(((Yaacc) getApplicationContext()).getContentLoadExecutor(), Uri.parse(albumArtUri.toString()));
443444
} else if (getPlayer().getIcon() != null) {
444-
445+
albumArtView.setImageTintList(null);
445446
albumArtView.setImageBitmap(getPlayer().getIcon());
446447
} else {
447448
albumArtView.setImageDrawable(ThemeHelper.tintDrawable(albumArtView.getDrawable(), getTheme()));

‎yaacc/src/main/java/de/yaacc/player/MusicPlayerActivity.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -318,6 +318,7 @@ private void doSetTrackInfo() {
318318
ImageView albumArtView = (ImageView) findViewById(R.id.musicActivityImageView);
319319
URI albumArtUri = getPlayer().getAlbumArt();
320320
if (null != albumArtUri) {
321+
albumArtView.setImageTintList(null);
321322
ImageDownloadTask imageDownloadTask = new ImageDownloadTask(albumArtView);
322323
imageDownloadTask.executeOnExecutor(((Yaacc) getApplicationContext()).getContentLoadExecutor(), Uri.parse(albumArtUri.toString()));
323324
} else {

‎yaacc/src/main/res/layout/activity_avtransport_player.xml‎

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,8 @@
7878
android:adjustViewBounds="false"
7979
android:contentDescription="@string/avtransportPlayerActivityImageView"
8080
android:scaleType="fitCenter"
81-
app:srcCompat="@drawable/ic_baseline_devices_128" />
81+
app:srcCompat="@drawable/ic_baseline_devices_128"
82+
app:tint="?attr/colorControlNormal" />
8283

8384
<RelativeLayout
8485
android:layout_width="match_parent"
@@ -192,39 +193,44 @@
192193
android:layout_height="48dp"
193194
android:layout_marginStart="2dp"
194195
android:contentDescription="@string/play"
195-
app:srcCompat="@drawable/ic_baseline_play_arrow_32" />
196+
app:srcCompat="@drawable/ic_baseline_play_arrow_32"
197+
app:tint="?attr/colorControlNormal" />
196198

197199
<ImageButton
198200
android:id="@+id/avtransportPlayerActivityControlPause"
199201
android:layout_width="48dp"
200202
android:layout_height="48dp"
201203
android:layout_marginStart="2dp"
202204
android:contentDescription="@string/pause"
203-
app:srcCompat="@drawable/ic_baseline_pause_32" />
205+
app:srcCompat="@drawable/ic_baseline_pause_32"
206+
app:tint="?attr/colorControlNormal" />
204207

205208
<ImageButton
206209
android:id="@+id/avtransportPlayerActivityControlStop"
207210
android:layout_width="48dp"
208211
android:layout_height="48dp"
209212
android:layout_marginStart="2dp"
210213
android:contentDescription="@string/stop"
211-
app:srcCompat="@drawable/ic_baseline_stop_32" />
214+
app:srcCompat="@drawable/ic_baseline_stop_32"
215+
app:tint="?attr/colorControlNormal" />
212216

213217
<ImageButton
214218
android:id="@+id/avtransportPlayerActivityControlPlaylist"
215219
android:layout_width="48dp"
216220
android:layout_height="48dp"
217221
android:layout_marginStart="2dp"
218222
android:contentDescription="@string/playlist"
219-
app:srcCompat="@drawable/ic_baseline_playlist_play_32" />
223+
app:srcCompat="@drawable/ic_baseline_playlist_play_32"
224+
app:tint="?attr/colorControlNormal" />
220225

221226
<ImageButton
222227
android:id="@+id/avtransportPlayerActivityControlExit"
223228
android:layout_width="48dp"
224229
android:layout_height="48dp"
225230
android:layout_marginStart="2dp"
226231
android:contentDescription="@string/exit"
227-
app:srcCompat="@drawable/ic_baseline_cancel_32" />
232+
app:srcCompat="@drawable/ic_baseline_cancel_32"
233+
app:tint="?attr/colorControlNormal" />
228234
</LinearLayout>
229235

230236
<LinearLayout
@@ -242,15 +248,17 @@
242248
android:layout_height="48dp"
243249
android:layout_marginStart="2dp"
244250
android:contentDescription="@string/previous"
245-
app:srcCompat="@drawable/ic_baseline_skip_previous_32" />
251+
app:srcCompat="@drawable/ic_baseline_skip_previous_32"
252+
app:tint="?attr/colorControlNormal" />
246253

247254
<ImageButton
248255
android:id="@+id/avtransportPlayerActivityControlFastRewind"
249256
android:layout_width="48dp"
250257
android:layout_height="48dp"
251258
android:layout_marginStart="2dp"
252259
android:contentDescription="@string/fast_rewind"
253-
app:srcCompat="@drawable/ic_baseline_fast_rewind_32" />
260+
app:srcCompat="@drawable/ic_baseline_fast_rewind_32"
261+
app:tint="?attr/colorControlNormal" />
254262

255263

256264
<ImageButton
@@ -259,15 +267,17 @@
259267
android:layout_height="48dp"
260268
android:layout_marginStart="2dp"
261269
android:contentDescription="@string/fast_forward"
262-
app:srcCompat="@drawable/ic_baseline_fast_forward_32" />
270+
app:srcCompat="@drawable/ic_baseline_fast_forward_32"
271+
app:tint="?attr/colorControlNormal" />
263272

264273
<ImageButton
265274
android:id="@+id/avtransportPlayerActivityControlNext"
266275
android:layout_width="48dp"
267276
android:layout_height="48dp"
268277
android:layout_marginStart="2dp"
269278
android:contentDescription="@string/next"
270-
app:srcCompat="@drawable/ic_baseline_skip_next_32" />
279+
app:srcCompat="@drawable/ic_baseline_skip_next_32"
280+
app:tint="?attr/colorControlNormal" />
271281

272282
</LinearLayout>
273283

‎yaacc/src/main/res/layout/activity_browse.xml‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@
4141
android:layout_toStartOf="@+id/controlPrev"
4242
android:layout_toLeftOf="@+id/controlPrev"
4343
android:contentDescription="@string/browse_button_devices"
44-
app:srcCompat="@drawable/ic_baseline_devices_48" />
44+
app:srcCompat="@drawable/ic_baseline_devices_48"
45+
app:tint="?attr/colorControlNormal" />
4546

4647
<ImageButton
4748
android:id="@+id/controlPrev"
@@ -50,15 +51,17 @@
5051
android:layout_toStartOf="@+id/controlStop"
5152
android:layout_toLeftOf="@+id/controlStop"
5253
android:contentDescription="@string/browse_button_prev"
53-
app:srcCompat="@drawable/ic_baseline_skip_previous_32" />
54+
app:srcCompat="@drawable/ic_baseline_skip_previous_32"
55+
app:tint="?attr/colorControlNormal" />
5456

5557
<ImageButton
5658
android:id="@+id/controlStop"
5759
android:layout_width="wrap_content"
5860
android:layout_height="wrap_content"
5961
android:layout_centerHorizontal="true"
6062
android:contentDescription="@string/browse_button_stop"
61-
app:srcCompat="@drawable/ic_baseline_stop_32" />
63+
app:srcCompat="@drawable/ic_baseline_stop_32"
64+
app:tint="?attr/colorControlNormal" />
6265

6366
<ImageButton
6467
android:id="@+id/controlNext"
@@ -67,7 +70,8 @@
6770
android:layout_toEndOf="@+id/controlStop"
6871
android:layout_toRightOf="@+id/controlStop"
6972
android:contentDescription="@string/browse_button_next"
70-
app:srcCompat="@drawable/ic_baseline_skip_next_32" />
73+
app:srcCompat="@drawable/ic_baseline_skip_next_32"
74+
app:tint="?attr/colorControlNormal" />
7175

7276
<ImageButton
7377
android:id="@+id/controlReceiverDevices"
@@ -77,7 +81,8 @@
7781
android:layout_toEndOf="@+id/controlNext"
7882
android:layout_toRightOf="@+id/controlNext"
7983
android:contentDescription="@string/browse_button_devices"
80-
app:srcCompat="@drawable/ic_baseline_devices_32" />
84+
app:srcCompat="@drawable/ic_baseline_devices_32"
85+
app:tint="?attr/colorControlNormal" />
8186

8287
</RelativeLayout>
8388

‎yaacc/src/main/res/layout/activity_multi_content_player.xml‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@
3636
android:adjustViewBounds="false"
3737
android:contentDescription="@string/multiContentPlayerActivityImageView"
3838
android:scaleType="fitCenter"
39-
app:srcCompat="@drawable/yaacc192_32" />
39+
app:srcCompat="@drawable/yaacc192_32"
40+
app:tint="?attr/colorControlNormal" />
4041

4142
<LinearLayout
4243
android:layout_width="match_parent"
@@ -54,47 +55,53 @@
5455
android:layout_marginStart="2dp"
5556
android:contentDescription="@string/previous"
5657
android:scaleType="center"
57-
app:srcCompat="@drawable/ic_baseline_skip_previous_32" />
58+
app:srcCompat="@drawable/ic_baseline_skip_previous_32"
59+
app:tint="?attr/colorControlNormal" />
5860

5961
<ImageButton
6062
android:id="@+id/multiContentPlayerActivityControlPlay"
6163
android:layout_width="48dp"
6264
android:layout_height="48dp"
6365
android:layout_marginStart="2dp"
6466
android:contentDescription="@string/play"
65-
app:srcCompat="@drawable/ic_baseline_play_arrow_32" />
67+
app:srcCompat="@drawable/ic_baseline_play_arrow_32"
68+
app:tint="?attr/colorControlNormal" />
6669

6770
<ImageButton
6871
android:id="@+id/multiContentPlayerActivityControlPause"
6972
android:layout_width="48dp"
7073
android:layout_height="48dp"
7174
android:layout_marginStart="2dp"
7275
android:contentDescription="@string/pause"
73-
app:srcCompat="@drawable/ic_baseline_pause_32" />
76+
app:srcCompat="@drawable/ic_baseline_pause_32"
77+
app:tint="?attr/colorControlNormal" />
7478

7579
<ImageButton
7680
android:id="@+id/multiContentPlayerActivityControlStop"
7781
android:layout_width="48dp"
7882
android:layout_height="48dp"
7983
android:layout_marginStart="2dp"
8084
android:contentDescription="@string/stop"
81-
app:srcCompat="@drawable/ic_baseline_stop_32" />
85+
app:srcCompat="@drawable/ic_baseline_stop_32"
86+
app:tint="?attr/colorControlNormal" />
8287

8388
<ImageButton
8489
android:id="@+id/multiContentPlayerActivityControlNext"
8590
android:layout_width="48dp"
8691
android:layout_height="48dp"
8792
android:layout_marginStart="2dp"
8893
android:contentDescription="@string/next"
89-
app:srcCompat="@drawable/ic_baseline_skip_next_32" />
94+
app:srcCompat="@drawable/ic_baseline_skip_next_32"
95+
app:tint="?attr/colorControlNormal" />
9096

9197
<ImageButton
9298
android:id="@+id/multiContentPlayerActivityControlPlaylist"
9399
android:layout_width="48dp"
94100
android:layout_height="48dp"
95101
android:layout_marginStart="2dp"
96102
android:contentDescription="@string/playlist"
97-
app:srcCompat="@drawable/ic_baseline_playlist_play_32" />
103+
app:srcCompat="@drawable/ic_baseline_playlist_play_32"
104+
app:tint="?attr/colorControlNormal" />
98105

99106

100107
<ImageButton
@@ -103,7 +110,8 @@
103110
android:layout_height="48dp"
104111
android:layout_marginStart="2dp"
105112
android:contentDescription="@string/exit"
106-
app:srcCompat="@drawable/ic_baseline_cancel_32" />
113+
app:srcCompat="@drawable/ic_baseline_cancel_32"
114+
app:tint="?attr/colorControlNormal" />
107115
</LinearLayout>
108116

109117

‎yaacc/src/main/res/layout/activity_music_player.xml‎

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@
3737
android:adjustViewBounds="false"
3838
android:contentDescription="@string/musicActivityImageView"
3939
android:scaleType="fitCenter"
40-
app:srcCompat="@drawable/ic_baseline_library_music_128" />
40+
app:srcCompat="@drawable/ic_baseline_library_music_128"
41+
app:tint="?attr/colorControlNormal" />
4142

4243

4344
<RelativeLayout
@@ -151,7 +152,8 @@
151152
android:layout_height="48dp"
152153
android:layout_marginStart="2dp"
153154
android:contentDescription="@string/play"
154-
app:srcCompat="@drawable/ic_baseline_play_arrow_32" />
155+
app:srcCompat="@drawable/ic_baseline_play_arrow_32"
156+
app:tint="?attr/colorControlNormal" />
155157

156158
<ImageButton
157159
android:id="@+id/musicActivityControlPause"
@@ -160,15 +162,17 @@
160162
android:layout_marginStart="2dp"
161163
android:contentDescription="@string/pause"
162164
android:gravity="bottom"
163-
app:srcCompat="@drawable/ic_baseline_pause_32" />
165+
app:srcCompat="@drawable/ic_baseline_pause_32"
166+
app:tint="?attr/colorControlNormal" />
164167

165168
<ImageButton
166169
android:id="@+id/musicActivityControlStop"
167170
android:layout_width="48dp"
168171
android:layout_height="48dp"
169172
android:layout_marginStart="2dp"
170173
android:contentDescription="@string/stop"
171-
app:srcCompat="@drawable/ic_baseline_stop_32" />
174+
app:srcCompat="@drawable/ic_baseline_stop_32"
175+
app:tint="?attr/colorControlNormal" />
172176

173177

174178
<ImageButton
@@ -177,15 +181,17 @@
177181
android:layout_height="48dp"
178182
android:layout_marginStart="2dp"
179183
android:contentDescription="@string/playlist"
180-
app:srcCompat="@drawable/ic_baseline_playlist_play_32" />
184+
app:srcCompat="@drawable/ic_baseline_playlist_play_32"
185+
app:tint="?attr/colorControlNormal" />
181186

182187
<ImageButton
183188
android:id="@+id/musicActivityControlExit"
184189
android:layout_width="48dp"
185190
android:layout_height="48dp"
186191
android:layout_marginStart="2dp"
187192
android:contentDescription="@string/exit"
188-
app:srcCompat="@drawable/ic_baseline_cancel_32" />
193+
app:srcCompat="@drawable/ic_baseline_cancel_32"
194+
app:tint="?attr/colorControlNormal" />
189195
</LinearLayout>
190196

191197

@@ -204,15 +210,17 @@
204210
android:layout_height="48dp"
205211
android:layout_marginStart="2dp"
206212
android:contentDescription="@string/previous"
207-
app:srcCompat="@drawable/ic_baseline_skip_previous_32" />
213+
app:srcCompat="@drawable/ic_baseline_skip_previous_32"
214+
app:tint="?attr/colorControlNormal" />
208215

209216
<ImageButton
210217
android:id="@+id/musicActivityControlFastRewind"
211218
android:layout_width="48dp"
212219
android:layout_height="48dp"
213220
android:layout_marginStart="2dp"
214221
android:contentDescription="@string/fast_rewind"
215-
app:srcCompat="@drawable/ic_baseline_fast_rewind_32" />
222+
app:srcCompat="@drawable/ic_baseline_fast_rewind_32"
223+
app:tint="?attr/colorControlNormal" />
216224

217225

218226
<ImageButton
@@ -221,15 +229,17 @@
221229
android:layout_height="48dp"
222230
android:layout_marginStart="2dp"
223231
android:contentDescription="@string/fast_forward"
224-
app:srcCompat="@drawable/ic_baseline_fast_forward_32" />
232+
app:srcCompat="@drawable/ic_baseline_fast_forward_32"
233+
app:tint="?attr/colorControlNormal" />
225234

226235
<ImageButton
227236
android:id="@+id/musicActivityControlNext"
228237
android:layout_width="48dp"
229238
android:layout_height="48dp"
230239
android:layout_marginStart="2dp"
231240
android:contentDescription="@string/next"
232-
app:srcCompat="@drawable/ic_baseline_skip_next_32" />
241+
app:srcCompat="@drawable/ic_baseline_skip_next_32"
242+
app:tint="?attr/colorControlNormal" />
233243

234244
</LinearLayout>
235245

0 commit comments

Comments
 (0)