Skip to content
This repository was archived by the owner on Sep 29, 2025. It is now read-only.

Commit ddacfd4

Browse files
AbandonedCartAbandonedCart
authored
Merge pull request #1418 from reicast/ac/android
Convert to compat tints instead of style definitions
2 parents ab4566d + 57dacb4 commit ddacfd4

File tree

12 files changed

+79
-107
lines changed

12 files changed

+79
-107
lines changed

‎shell/android-studio/reicast/src/main/java/com/reicast/emulator/FileBrowser.java‎

Lines changed: 42 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import android.app.Activity;
44
import android.content.Context;
55
import android.content.SharedPreferences;
6+
import android.content.res.ColorStateList;
67
import android.graphics.Typeface;
78
import android.graphics.drawable.Drawable;
89
import android.net.Uri;
@@ -16,7 +17,9 @@
1617
import android.support.design.widget.Snackbar;
1718
import android.support.graphics.drawable.VectorDrawableCompat;
1819
import android.support.v4.app.Fragment;
20+
import android.support.v4.content.ContextCompat;
1921
import android.support.v4.content.FileProvider;
22+
import android.support.v4.widget.ImageViewCompat;
2023
import android.view.Gravity;
2124
import android.view.LayoutInflater;
2225
import android.view.View;
@@ -316,7 +319,19 @@ private void createListHeader(String header_text, View view, boolean hasBios) {
316319
R.layout.bios_list_item, null, false);
317320

318321
((TextView) childview.findViewById(R.id.item_name)).setText(R.string.boot_bios);
319-
((ImageView) childview.findViewById(R.id.item_icon)).setImageResource(R.mipmap.disk_bios);
322+
ImageView icon = (ImageView) childview.findViewById(R.id.item_icon);
323+
icon.setImageResource(R.mipmap.disk_bios);
324+
int app_theme = mPrefs.getInt(Config.pref_app_theme, 0);
325+
if (app_theme == 7) {
326+
ImageViewCompat.setImageTintList(icon, ColorStateList.valueOf(
327+
ContextCompat.getColor(getActivity(), R.color.colorDreamTint)));
328+
} else if (app_theme == 1) {
329+
ImageViewCompat.setImageTintList(icon, ColorStateList.valueOf(
330+
ContextCompat.getColor(getActivity(), R.color.colorBlueTint)));
331+
} else {
332+
ImageViewCompat.setImageTintList(icon, ColorStateList.valueOf(
333+
ContextCompat.getColor(getActivity(), R.color.colorDarkTint)));
334+
}
320335

321336
childview.setTag(null);
322337

@@ -335,7 +350,19 @@ public void onClick(View view) {
335350
R.layout.bios_list_item, null, false);
336351

337352
((TextView) childview.findViewById(R.id.item_name)).setText(R.string.clear_search);
338-
((ImageView) childview.findViewById(R.id.item_icon)).setImageResource(R.mipmap.disk_unknown);
353+
ImageView icon = (ImageView) childview.findViewById(R.id.item_icon);
354+
icon.setImageResource(R.mipmap.disk_unknown);
355+
int app_theme = mPrefs.getInt(Config.pref_app_theme, 0);
356+
if (app_theme == 7) {
357+
ImageViewCompat.setImageTintList(icon, ColorStateList.valueOf(
358+
ContextCompat.getColor(getActivity(), R.color.colorDreamTint)));
359+
} else if (app_theme == 1) {
360+
ImageViewCompat.setImageTintList(icon, ColorStateList.valueOf(
361+
ContextCompat.getColor(getActivity(), R.color.colorBlueTint)));
362+
} else {
363+
ImageViewCompat.setImageTintList(icon, ColorStateList.valueOf(
364+
ContextCompat.getColor(getActivity(), R.color.colorDarkTint)));
365+
}
339366

340367
childview.setTag(null);
341368

@@ -491,10 +518,22 @@ protected void onPostExecute(List<File> list) {
491518
else
492519
((TextView) childview.findViewById(R.id.item_name)).setText(file.getName());
493520

494-
((ImageView) childview.findViewById(R.id.item_icon)).setImageResource(file == null
521+
ImageView icon = (ImageView) childview.findViewById(R.id.item_icon);
522+
icon.setImageResource(file == null
495523
? R.drawable.ic_settings: file.isDirectory()
496524
? R.drawable.ic_folder_black_24dp : R.drawable.disk_unknown);
497525

526+
if (app_theme == 7) {
527+
ImageViewCompat.setImageTintList(icon, ColorStateList.valueOf(
528+
ContextCompat.getColor(browser.get().getActivity(), R.color.colorDreamTint)));
529+
} else if (app_theme == 1) {
530+
ImageViewCompat.setImageTintList(icon, ColorStateList.valueOf(
531+
ContextCompat.getColor(browser.get().getActivity(), R.color.colorBlueTint)));
532+
} else {
533+
ImageViewCompat.setImageTintList(icon, ColorStateList.valueOf(
534+
ContextCompat.getColor(browser.get().getActivity(), R.color.colorDarkTint)));
535+
}
536+
498537
childview.setTag(file);
499538

500539
// vw.findViewById(R.id.childview).setBackgroundColor(0xFFFFFFFF);

‎shell/android-studio/reicast/src/main/java/com/reicast/emulator/XMLParser.java‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import android.app.AlertDialog;
44
import android.content.Context;
55
import android.content.SharedPreferences;
6+
import android.content.res.ColorStateList;
67
import android.graphics.Bitmap;
78
import android.graphics.BitmapFactory;
89
import android.graphics.drawable.BitmapDrawable;
@@ -11,6 +12,8 @@
1112
import android.net.NetworkInfo;
1213
import android.os.AsyncTask;
1314
import android.os.Build;
15+
import android.support.v4.content.ContextCompat;
16+
import android.support.v4.widget.ImageViewCompat;
1417
import android.view.View;
1518
import android.view.View.OnLongClickListener;
1619
import android.widget.ImageView;
@@ -220,7 +223,19 @@ private void initializeDefaults() {
220223
: nameLower.endsWith(".cdi") ? R.drawable.cdi
221224
: R.drawable.disk_unknown);
222225
}
223-
((ImageView) childview.get().findViewById(R.id.item_icon)).setImageDrawable(game_icon);
226+
ImageView icon = (ImageView) childview.get().findViewById(R.id.item_icon);
227+
icon.setImageDrawable(game_icon);
228+
int app_theme = mPrefs.getInt(Config.pref_app_theme, 0);
229+
if (app_theme == 7) {
230+
ImageViewCompat.setImageTintList(icon, ColorStateList.valueOf(
231+
ContextCompat.getColor(mContext.get(), R.color.colorDreamTint)));
232+
} else if (app_theme == 1) {
233+
ImageViewCompat.setImageTintList(icon, ColorStateList.valueOf(
234+
ContextCompat.getColor(mContext.get(), R.color.colorBlueTint)));
235+
} else {
236+
ImageViewCompat.setImageTintList(icon, ColorStateList.valueOf(
237+
ContextCompat.getColor(mContext.get(), R.color.colorDarkTint)));
238+
}
224239
}
225240

226241
private boolean isNetworkAvailable() {

‎shell/android-studio/reicast/src/main/res/layout-v14/input_fragment.xml‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -169,8 +169,7 @@
169169
android:layout_width="48dp"
170170
android:layout_height="48dp"
171171
android:layout_centerInParent="true"
172-
android:scaleType="fitCenter"
173-
android:tint="@android:color/transparent"/>
172+
android:scaleType="fitCenter"/>
174173

175174
<TextView
176175
android:layout_width="0dp"
@@ -227,8 +226,7 @@
227226
android:layout_height="48dp"
228227
android:layout_centerInParent="true"
229228
android:scaleType="fitCenter"
230-
app:srcCompat="@drawable/input"
231-
android:tint="@android:color/transparent"/>
229+
app:srcCompat="@drawable/input"/>
232230

233231
<TextView
234232
android:id="@+id/controller_text_a"
@@ -319,8 +317,7 @@
319317
android:layout_height="48dp"
320318
android:layout_centerInParent="true"
321319
android:scaleType="fitCenter"
322-
app:srcCompat="@drawable/input"
323-
android:tint="@android:color/transparent"/>
320+
app:srcCompat="@drawable/input"/>
324321

325322
<TextView
326323
android:id="@+id/controller_text_b"
@@ -425,8 +422,7 @@
425422
android:layout_height="48dp"
426423
android:layout_centerInParent="true"
427424
android:scaleType="fitCenter"
428-
app:srcCompat="@drawable/input"
429-
android:tint="@android:color/transparent"/>
425+
app:srcCompat="@drawable/input"/>
430426

431427
<TextView
432428
android:id="@+id/controller_text_c"
@@ -531,8 +527,7 @@
531527
android:layout_height="48dp"
532528
android:layout_centerInParent="true"
533529
android:scaleType="fitCenter"
534-
app:srcCompat="@drawable/input"
535-
android:tint="@android:color/transparent"/>
530+
app:srcCompat="@drawable/input"/>
536531

537532
<TextView
538533
android:id="@+id/controller_text_d"

‎shell/android-studio/reicast/src/main/res/layout-v14/input_mod_fragment.xml‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,7 @@
9797
android:id="@+id/a_button_icon"
9898
android:layout_width="48dp"
9999
android:layout_height="48dp"
100-
app:srcCompat="@drawable/input"
101-
android:tint="@android:color/transparent"/>
100+
app:srcCompat="@drawable/input"/>
102101

103102
<TextView
104103
android:id="@+id/a_button_key"
@@ -150,8 +149,7 @@
150149
android:id="@+id/b_button_icon"
151150
android:layout_width="48dp"
152151
android:layout_height="48dp"
153-
app:srcCompat="@drawable/input"
154-
android:tint="@android:color/transparent"/>
152+
app:srcCompat="@drawable/input"/>
155153

156154
<TextView
157155
android:id="@+id/b_button_key"
@@ -203,8 +201,7 @@
203201
android:id="@+id/x_button_icon"
204202
android:layout_width="48dp"
205203
android:layout_height="48dp"
206-
app:srcCompat="@drawable/input"
207-
android:tint="@android:color/transparent"/>
204+
app:srcCompat="@drawable/input"/>
208205

209206
<TextView
210207
android:id="@+id/x_button_key"
@@ -256,8 +253,7 @@
256253
android:id="@+id/y_button_icon"
257254
android:layout_width="48dp"
258255
android:layout_height="48dp"
259-
app:srcCompat="@drawable/input"
260-
android:tint="@android:color/transparent"/>
256+
app:srcCompat="@drawable/input"/>
261257

262258
<TextView
263259
android:id="@+id/y_button_key"

‎shell/android-studio/reicast/src/main/res/layout/browser_fragment_header.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@
2525
android:layout_marginRight="2dp"
2626
android:layout_marginTop="2dp"
2727
android:scaleType="fitCenter"
28-
app:srcCompat="@drawable/ic_settings"
29-
android:tint="@android:color/transparent"/>
28+
app:srcCompat="@drawable/ic_settings"/>
3029

3130
<TextView
3231
android:id="@+id/item_name"

‎shell/android-studio/reicast/src/main/res/layout/change_item.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@
2424
android:layout_width="60dip"
2525
android:layout_height="60dip"
2626
android:gravity="center"
27-
app:srcCompat="@drawable/ic_github"
28-
android:tint="@android:color/transparent"/>
27+
app:srcCompat="@drawable/ic_github"/>
2928
</LinearLayout>
3029
<!-- Main Commit Content -->
3130

‎shell/android-studio/reicast/src/main/res/layout/cloud_fragment.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@
4343
android:layout_width="wrap_content"
4444
android:layout_height="wrap_content"
4545
android:contentDescription="cloudImg"
46-
app:srcCompat="@drawable/cloud_big"
47-
android:tint="@android:color/transparent"/>
46+
app:srcCompat="@drawable/cloud_big"/>
4847

4948
</LinearLayout>

‎shell/android-studio/reicast/src/main/res/layout/dialog_item.xml‎

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

‎shell/android-studio/reicast/src/main/res/layout/input_fragment.xml‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -169,8 +169,7 @@
169169
android:layout_width="48dp"
170170
android:layout_height="48dp"
171171
android:layout_centerInParent="true"
172-
android:scaleType="fitCenter"
173-
android:tint="@android:color/transparent"/>
172+
android:scaleType="fitCenter"/>
174173

175174
<TextView
176175
android:layout_width="0dp"
@@ -227,8 +226,7 @@
227226
android:layout_height="48dp"
228227
android:layout_centerInParent="true"
229228
android:scaleType="fitCenter"
230-
app:srcCompat="@drawable/input"
231-
android:tint="@android:color/transparent"/>
229+
app:srcCompat="@drawable/input"/>
232230

233231
<TextView
234232
android:id="@+id/controller_text_a"
@@ -319,8 +317,7 @@
319317
android:layout_height="48dp"
320318
android:layout_centerInParent="true"
321319
android:scaleType="fitCenter"
322-
app:srcCompat="@drawable/input"
323-
android:tint="@android:color/transparent"/>
320+
app:srcCompat="@drawable/input"/>
324321

325322
<TextView
326323
android:id="@+id/controller_text_b"
@@ -425,8 +422,7 @@
425422
android:layout_height="48dp"
426423
android:layout_centerInParent="true"
427424
android:scaleType="fitCenter"
428-
app:srcCompat="@drawable/input"
429-
android:tint="@android:color/transparent"/>
425+
app:srcCompat="@drawable/input"/>
430426

431427
<TextView
432428
android:id="@+id/controller_text_c"
@@ -531,8 +527,7 @@
531527
android:layout_height="48dp"
532528
android:layout_centerInParent="true"
533529
android:scaleType="fitCenter"
534-
app:srcCompat="@drawable/input"
535-
android:tint="@android:color/transparent"/>
530+
app:srcCompat="@drawable/input"/>
536531

537532
<TextView
538533
android:id="@+id/controller_text_d"

‎shell/android-studio/reicast/src/main/res/layout/input_mod_fragment.xml‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,7 @@
9797
android:id="@+id/a_button_icon"
9898
android:layout_width="48dp"
9999
android:layout_height="48dp"
100-
app:srcCompat="@drawable/input"
101-
android:tint="@android:color/transparent"/>
100+
app:srcCompat="@drawable/input"/>
102101

103102
<TextView
104103
android:id="@+id/a_button_key"
@@ -150,8 +149,7 @@
150149
android:id="@+id/b_button_icon"
151150
android:layout_width="48dp"
152151
android:layout_height="48dp"
153-
app:srcCompat="@drawable/input"
154-
android:tint="@android:color/transparent"/>
152+
app:srcCompat="@drawable/input"/>
155153

156154
<TextView
157155
android:id="@+id/b_button_key"
@@ -203,8 +201,7 @@
203201
android:id="@+id/x_button_icon"
204202
android:layout_width="48dp"
205203
android:layout_height="48dp"
206-
app:srcCompat="@drawable/input"
207-
android:tint="@android:color/transparent"/>
204+
app:srcCompat="@drawable/input"/>
208205

209206
<TextView
210207
android:id="@+id/x_button_key"

0 commit comments

Comments
 (0)