diff --git a/F-Droid/res/layout/applistitem.xml b/F-Droid/res/layout/applistitem.xml index 6504b21cf..1be74e505 100644 --- a/F-Droid/res/layout/applistitem.xml +++ b/F-Droid/res/layout/applistitem.xml @@ -7,7 +7,6 @@ android:baselineAligned="false" xmlns:tools="http://schemas.android.com/tools" > - - 48dp - 32dp - 16dp 48dp + diff --git a/F-Droid/res/xml/preferences.xml b/F-Droid/res/xml/preferences.xml index 38acc7f38..b47d4e089 100644 --- a/F-Droid/res/xml/preferences.xml +++ b/F-Droid/res/xml/preferences.xml @@ -24,9 +24,6 @@ android:key="language" android:defaultValue="" android:entryValues="@array/languageValues" /> - initialized = new HashMap<>(); @@ -187,14 +184,6 @@ public final class Preferences implements SharedPreferences.OnSharedPreferenceCh } } - public boolean hasCompactLayout() { - if (!isInitialized(PREF_COMPACT_LAYOUT)) { - initialize(PREF_COMPACT_LAYOUT); - compactLayout = preferences.getBoolean(PREF_COMPACT_LAYOUT, DEFAULT_COMPACT_LAYOUT); - } - return compactLayout; - } - public void registerCompactLayoutChangeListener(ChangeListener listener) { compactLayoutListeners.add(listener); } @@ -256,11 +245,6 @@ public final class Preferences implements SharedPreferences.OnSharedPreferenceCh uninitialize(key); switch (key) { - case PREF_COMPACT_LAYOUT: - for (ChangeListener listener : compactLayoutListeners) { - listener.onPreferenceChange(); - } - break; case PREF_ROOTED: for (ChangeListener listener : filterAppsRequiringRootListeners) { listener.onPreferenceChange(); diff --git a/F-Droid/src/org/fdroid/fdroid/views/AppListAdapter.java b/F-Droid/src/org/fdroid/fdroid/views/AppListAdapter.java index 563a411a0..88e2be14e 100644 --- a/F-Droid/src/org/fdroid/fdroid/views/AppListAdapter.java +++ b/F-Droid/src/org/fdroid/fdroid/views/AppListAdapter.java @@ -90,12 +90,9 @@ public abstract class AppListAdapter extends CursorAdapter { private void setupView(Context context, View view, Cursor cursor, ViewHolder holder) { final App app = new App(cursor); - boolean compact = Preferences.get().hasCompactLayout(); - holder.name.setText(app.name); holder.summary.setText(app.summary); - layoutIcon(holder.icon, compact); ImageLoader.getInstance().displayImage(app.iconUrl, holder.icon, displayImageOptions); @@ -138,19 +135,4 @@ public abstract class AppListAdapter extends CursorAdapter { return installedVersionString; } - - private void layoutIcon(ImageView icon, boolean compact) { - int size = (int) mContext.getResources().getDimension(compact - ? R.dimen.applist_icon_compact_size - : R.dimen.applist_icon_normal_size); - - LinearLayout.LayoutParams params = - (LinearLayout.LayoutParams) icon.getLayoutParams(); - - params.height = size; - params.width = size; - - icon.setLayoutParams(params); - } - } diff --git a/F-Droid/src/org/fdroid/fdroid/views/fragments/PreferencesFragment.java b/F-Droid/src/org/fdroid/fdroid/views/fragments/PreferencesFragment.java index f89b1a401..2365e169c 100644 --- a/F-Droid/src/org/fdroid/fdroid/views/fragments/PreferencesFragment.java +++ b/F-Droid/src/org/fdroid/fdroid/views/fragments/PreferencesFragment.java @@ -34,7 +34,6 @@ public class PreferencesFragment extends PreferenceFragment Preferences.PREF_ROOTED, Preferences.PREF_INCOMP_VER, Preferences.PREF_THEME, - Preferences.PREF_COMPACT_LAYOUT, Preferences.PREF_IGN_TOUCH, Preferences.PREF_LOCAL_REPO_NAME, Preferences.PREF_LANGUAGE, @@ -98,10 +97,6 @@ public class PreferencesFragment extends PreferenceFragment textSummary(key, R.string.update_history_summ); break; - case Preferences.PREF_COMPACT_LAYOUT: - checkSummary(key, R.string.compactlayout_on); - break; - case Preferences.PREF_THEME: entrySummary(key); if (changing) {