From c7ace4ff8e33c5786e8d08ba20a72a5dd56555f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Fri, 1 Nov 2013 19:40:45 +0100 Subject: [PATCH] New loading/default app icon (kudos to mray) --- media/fdroid-logo-2013/default-app.svg | 1524 ++++++++++++++++++++++++ res/layout/applistitem.xml | 7 +- src/org/fdroid/fdroid/DB.java | 2 +- src/org/fdroid/fdroid/FDroidApp.java | 50 +- 4 files changed, 1544 insertions(+), 39 deletions(-) create mode 100644 media/fdroid-logo-2013/default-app.svg diff --git a/media/fdroid-logo-2013/default-app.svg b/media/fdroid-logo-2013/default-app.svg new file mode 100644 index 000000000..92d7842f5 --- /dev/null +++ b/media/fdroid-logo-2013/default-app.svg @@ -0,0 +1,1524 @@ + + + + + default applications icon + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + default applications icon + + + Robert Martinez + + + + + + + + + + diff --git a/res/layout/applistitem.xml b/res/layout/applistitem.xml index 19b374c4b..b40892ee1 100644 --- a/res/layout/applistitem.xml +++ b/res/layout/applistitem.xml @@ -11,8 +11,8 @@ + android:paddingTop="4dp" /> repos = db.getRepos(); for (DB.App app : apps) { + if (app.icon == null) continue; for (DB.Repo repo : repos) { - DB.Apk bestApk = app.apks.get(0); - if (repo.id == bestApk.repo) { + int latestRepo = app.apks.get(0).repo; + if (repo.id == latestRepo) { app.iconUrl = repo.address + "/icons/" + app.icon; break; } @@ -202,10 +183,11 @@ public class FDroidApp extends Application { List repos = db.getRepos(); for (DB.App app : apps) { + if (app.icon == null) continue; if (!invalidApps.contains(app.id)) continue; for (DB.Repo repo : repos) { - DB.Apk bestApk = app.apks.get(0); - if (repo.id == bestApk.repo) { + int latestRepo = app.apks.get(0).repo; + if (repo.id == latestRepo) { app.iconUrl = repo.address + "/icons/" + app.icon; break; }