Skip to content

Commit 76424d5

Browse files
committed
fix: icons in light mode #245
1 parent 3de7229 commit 76424d5

5 files changed

Lines changed: 22 additions & 1 deletion

File tree

.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 {

0 commit comments

Comments
 (0)