From 5b6e515a06eba87269a74778a2af3e0bb00ae866 Mon Sep 17 00:00:00 2001 From: Peter Serwylo Date: Thu, 8 Jun 2017 17:24:12 +1000 Subject: [PATCH] Add final artwork and correctly read colours. Carrie specified colours earlier, and they were added to the code. However they were not being read correctly. This changes that so that lowercase resource names (e.g. "category_games") are used instead. It also adds the final category artwork, for "Games" which was missed prior. The rest still generate colours and patterns if they don't have a colour or an image specified. --- .../views/categories/CategoryController.java | 2 +- app/src/main/res/drawable/category_games.png | Bin 0 -> 11147 bytes 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 app/src/main/res/drawable/category_games.png diff --git a/app/src/main/java/org/fdroid/fdroid/views/categories/CategoryController.java b/app/src/main/java/org/fdroid/fdroid/views/categories/CategoryController.java index 7184066dd..a4250f827 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/categories/CategoryController.java +++ b/app/src/main/java/org/fdroid/fdroid/views/categories/CategoryController.java @@ -120,7 +120,7 @@ public class CategoryController extends RecyclerView.ViewHolder implements Loade } public static int getBackgroundColour(Context context, @NonNull String categoryName) { - int colourId = getCategoryResource(context, categoryName, "color", false); + int colourId = getCategoryResource(context, categoryName, "color", true); if (colourId > 0) { return ContextCompat.getColor(context, colourId); } diff --git a/app/src/main/res/drawable/category_games.png b/app/src/main/res/drawable/category_games.png new file mode 100644 index 0000000000000000000000000000000000000000..90879cc5b173a56fd4a1a53e68c7238042d908df GIT binary patch literal 11147 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 literal 0 HcmV?d00001