Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Support /icons-* per-density icon folders (repo version 11)

Browse Source
This commit is contained in:
Daniel Martí 2014-01-07 18:23:26 +01:00
parent 9709b4f51c
commit d3686de3cd
1 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/org/fdroid/fdroid/DB.java
View File

@ -46,6 +46,7 @@ import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteOpenHelper; import android.database.sqlite.SQLiteOpenHelper;
import android.preference.PreferenceManager; import android.preference.PreferenceManager;
import android.text.TextUtils.SimpleStringSplitter; import android.text.TextUtils.SimpleStringSplitter;
import android.util.DisplayMetrics;
import android.util.Log; import android.util.Log;
import org.fdroid.fdroid.compat.Compatibility; import org.fdroid.fdroid.compat.Compatibility;
@ -881,6 +882,25 @@ public class DB {
c = db.query(TABLE_APK, cols, null, null, null, null, c = db.query(TABLE_APK, cols, null, null, null, null,
"vercode desc"); "vercode desc");
c.moveToFirst(); c.moveToFirst();
DisplayMetrics metrics = mContext.getResources()
.getDisplayMetrics();
String iconsDir = null;
if (metrics.densityDpi >= 640) {
iconsDir = "/icons-640/";
} else if (metrics.densityDpi >= 480) {
iconsDir = "/icons-480/";
} else if (metrics.densityDpi >= 320) {
iconsDir = "/icons-320/";
} else if (metrics.densityDpi >= 240) {
iconsDir = "/icons-240/";
} else if (metrics.densityDpi >= 160) {
iconsDir = "/icons-160/";
} else {
iconsDir = "/icons-120/";
}
metrics = null;
while (!c.isAfterLast()) { while (!c.isAfterLast()) {
String id = c.getString(0); String id = c.getString(0);
App app = apps.get(id); App app = apps.get(id);
@ -908,11 +928,13 @@ public class DB {
app.apks.add(apk); app.apks.add(apk);
if (app.iconUrl == null && app.icon != null) { if (app.iconUrl == null && app.icon != null) {
for (DB.Repo repo : repos) { for (DB.Repo repo : repos) {
if (repo.id == repoid) { if (repo.id != repoid) continue;
app.iconUrl = if (repo.version >= 11) {
repo.address + "/icons/" + app.icon; app.iconUrl = repo.address + iconsDir + app.icon;
break; } else {
app.iconUrl = repo.address + "/icons/" + app.icon;
} }
break;
} }
} }
c.moveToNext(); c.moveToNext();