diff --git a/android/app/build.gradle b/android/app/build.gradle index b9b39ec2b..295168835 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -30,8 +30,8 @@ android { defaultConfig { externalNativeBuild { cmake { - arguments "-DCMAKE_BUILD_TYPE=Release" - abiFilters "arm64-v8a", "armeabi-v7a" + arguments "-DCMAKE_BUILD_TYPE=RelWithDebInfo" + abiFilters "x86_64" // "arm64-v8a", "armeabi-v7a" } } } diff --git a/android/app/src/main/java/com/github/stenzek/duckstation/GameListEntry.java b/android/app/src/main/java/com/github/stenzek/duckstation/GameListEntry.java index 0f3d1d1d5..f1e1e77ff 100644 --- a/android/app/src/main/java/com/github/stenzek/duckstation/GameListEntry.java +++ b/android/app/src/main/java/com/github/stenzek/duckstation/GameListEntry.java @@ -110,20 +110,19 @@ public class GameListEntry { public void fillView(View view) { ((TextView) view.findViewById(R.id.game_list_view_entry_title)).setText(mTitle); ((TextView) view.findViewById(R.id.game_list_view_entry_subtitle)).setText(getSubTitle()); - ((TextView) view.findViewById(R.id.game_list_view_entry_code)).setText(mCode); int regionDrawableId; switch (mRegion) { case NTSC_J: regionDrawableId = R.drawable.flag_jp; break; + case PAL: + regionDrawableId = R.drawable.flag_eu; + break; case NTSC_U: default: regionDrawableId = R.drawable.flag_us; break; - case PAL: - regionDrawableId = R.drawable.flag_eu; - break; } ((ImageView) view.findViewById(R.id.game_list_view_entry_region_icon)) @@ -131,11 +130,6 @@ public class GameListEntry { int typeDrawableId; switch (mType) { - case Disc: - default: - typeDrawableId = R.drawable.ic_media_cdrom; - break; - case PSExe: typeDrawableId = R.drawable.ic_emblem_system; break; @@ -143,9 +137,41 @@ public class GameListEntry { case Playlist: typeDrawableId = R.drawable.ic_baseline_playlist_play_24; break; + + case Disc: + default: + typeDrawableId = R.drawable.ic_media_cdrom; + break; } ((ImageView) view.findViewById(R.id.game_list_view_entry_type_icon)) .setImageDrawable(ContextCompat.getDrawable(view.getContext(), typeDrawableId)); + + int compatibilityDrawableId; + switch (mCompatibilityRating) + { + case DoesntBoot: + compatibilityDrawableId = R.drawable.ic_star_1; + break; + case CrashesInIntro: + compatibilityDrawableId = R.drawable.ic_star_2; + break; + case CrashesInGame: + compatibilityDrawableId = R.drawable.ic_star_3; + break; + case GraphicalAudioIssues: + compatibilityDrawableId = R.drawable.ic_star_4; + break; + case NoIssues: + compatibilityDrawableId = R.drawable.ic_star_5; + break; + case Unknown: + default: + compatibilityDrawableId = R.drawable.ic_star_0; + break; + } + + ((ImageView) view.findViewById(R.id.game_list_view_compatibility_icon)) + .setImageDrawable(ContextCompat.getDrawable(view.getContext(), compatibilityDrawableId)); } } diff --git a/android/app/src/main/res/drawable/ic_star_0.png b/android/app/src/main/res/drawable/ic_star_0.png new file mode 100644 index 000000000..e5b56db70 Binary files /dev/null and b/android/app/src/main/res/drawable/ic_star_0.png differ diff --git a/android/app/src/main/res/drawable/ic_star_1.png b/android/app/src/main/res/drawable/ic_star_1.png new file mode 100644 index 000000000..ae91a29ac Binary files /dev/null and b/android/app/src/main/res/drawable/ic_star_1.png differ diff --git a/android/app/src/main/res/drawable/ic_star_2.png b/android/app/src/main/res/drawable/ic_star_2.png new file mode 100644 index 000000000..f7bee9b1d Binary files /dev/null and b/android/app/src/main/res/drawable/ic_star_2.png differ diff --git a/android/app/src/main/res/drawable/ic_star_3.png b/android/app/src/main/res/drawable/ic_star_3.png new file mode 100644 index 000000000..330aefbac Binary files /dev/null and b/android/app/src/main/res/drawable/ic_star_3.png differ diff --git a/android/app/src/main/res/drawable/ic_star_4.png b/android/app/src/main/res/drawable/ic_star_4.png new file mode 100644 index 000000000..4e9f58dfa Binary files /dev/null and b/android/app/src/main/res/drawable/ic_star_4.png differ diff --git a/android/app/src/main/res/drawable/ic_star_5.png b/android/app/src/main/res/drawable/ic_star_5.png new file mode 100644 index 000000000..aa5707ea7 Binary files /dev/null and b/android/app/src/main/res/drawable/ic_star_5.png differ diff --git a/android/app/src/main/res/layout/game_list_view_entry.xml b/android/app/src/main/res/layout/game_list_view_entry.xml index 0fd6a73db..0dc1ac201 100644 --- a/android/app/src/main/res/layout/game_list_view_entry.xml +++ b/android/app/src/main/res/layout/game_list_view_entry.xml @@ -22,7 +22,7 @@ android:layout_height="wrap_content" android:layout_marginLeft="10dp" android:layout_marginTop="8dp" - android:layout_marginRight="64dp" + android:layout_marginRight="80dp" android:focusable="false" android:focusableInTouchMode="false" android:text="Game Title" @@ -36,7 +36,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginLeft="10dp" - android:layout_marginRight="64dp" + android:layout_marginRight="80dp" android:focusable="false" android:focusableInTouchMode="false" android:paddingBottom="8px" @@ -46,17 +46,16 @@ app:layout_constraintStart_toEndOf="@+id/game_list_view_entry_type_icon" app:layout_constraintTop_toBottomOf="@+id/game_list_view_entry_title" /> - @@ -64,13 +63,13 @@ android:id="@+id/game_list_view_entry_region_icon" android:layout_width="32dp" android:layout_height="28dp" - android:layout_marginTop="8px" - android:layout_marginEnd="8dp" + android:layout_marginTop="8dp" + android:layout_marginEnd="24dp" android:focusable="false" android:focusableInTouchMode="false" android:paddingBottom="8px" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintTop_toBottomOf="@+id/game_list_view_entry_code" + app:layout_constraintTop_toBottomOf="@+id/game_list_view_compatibility_icon" app:srcCompat="@drawable/flag_jp" /> \ No newline at end of file