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

non-compact stuff is now hidden by default via xml

Browse Source 
Also, forgot to add the backwards compatibility for END_OF
This commit is contained in:
Daniel Martí 2013-07-08 14:26:07 +02:00
parent 74ca3c2aa5
commit 0c259673d8
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
res/layout/applistitem.xml
View File

@ -28,11 +28,13 @@
<ImageView android:id="@+id/icon_status_has_updates" <ImageView android:id="@+id/icon_status_has_updates"
android:layout_width="18dp" android:layout_width="18dp"
android:layout_height="18dp" android:layout_height="18dp"
android:visibility="gone"
android:gravity="end" /> android:gravity="end" />
<ImageView android:id="@+id/icon_status_installed" <ImageView android:id="@+id/icon_status_installed"
android:layout_width="18dp" android:layout_width="18dp"
android:layout_height="18dp" android:layout_height="18dp"
android:visibility="gone"
android:gravity="end" /> android:gravity="end" />
</LinearLayout> </LinearLayout>

16
src/org/fdroid/fdroid/views/AppListAdapter.java
View File

@ -62,9 +62,6 @@ abstract public class AppListAdapter extends BaseAdapter {
init = true; init = true;
} }
ImageView iconUpdates = (ImageView) convertView.findViewById(R.id.icon_status_has_updates);
ImageView iconInstalled = (ImageView) convertView.findViewById(R.id.icon_status_installed);
TextView name = (TextView) convertView.findViewById(R.id.name); TextView name = (TextView) convertView.findViewById(R.id.name);
TextView summary = (TextView) convertView.findViewById(R.id.summary); TextView summary = (TextView) convertView.findViewById(R.id.summary);
TextView status = (TextView) convertView.findViewById(R.id.status); TextView status = (TextView) convertView.findViewById(R.id.status);
@ -87,17 +84,19 @@ abstract public class AppListAdapter extends BaseAdapter {
icon.setImageResource(android.R.drawable.sym_def_app_icon); icon.setImageResource(android.R.drawable.sym_def_app_icon);
} }
iconUpdates.setVisibility(View.GONE);
iconInstalled.setVisibility(View.GONE);
if (init) { if (init) {
iconInstalled.setImageResource(R.drawable.ic_cab_done_holo_dark);
iconUpdates.setImageResource(R.drawable.ic_menu_refresh);
SharedPreferences prefs = PreferenceManager SharedPreferences prefs = PreferenceManager
.getDefaultSharedPreferences(mContext); .getDefaultSharedPreferences(mContext);
pref_compactlayout = prefs.getBoolean("compactlayout", false); pref_compactlayout = prefs.getBoolean("compactlayout", false);
if (pref_compactlayout == true) { if (pref_compactlayout == true) {
ImageView iconInstalled = (ImageView) convertView.findViewById(R.id.icon_status_installed);
ImageView iconUpdates = (ImageView) convertView.findViewById(R.id.icon_status_has_updates);
iconInstalled.setImageResource(R.drawable.ic_cab_done_holo_dark);
iconUpdates.setImageResource(R.drawable.ic_menu_refresh);
status.setVisibility(View.GONE); status.setVisibility(View.GONE);
license.setVisibility(View.GONE); license.setVisibility(View.GONE);
@ -106,6 +105,7 @@ abstract public class AppListAdapter extends BaseAdapter {
RelativeLayout.LayoutParams.WRAP_CONTENT, RelativeLayout.LayoutParams.WRAP_CONTENT,
RelativeLayout.LayoutParams.WRAP_CONTENT); RelativeLayout.LayoutParams.WRAP_CONTENT);
summaryLayout.addRule(RelativeLayout.BELOW, R.id.name); summaryLayout.addRule(RelativeLayout.BELOW, R.id.name);
summaryLayout.addRule(RelativeLayout.RIGHT_OF, R.id.icon);
summaryLayout.addRule(RelativeLayout.END_OF, R.id.icon); summaryLayout.addRule(RelativeLayout.END_OF, R.id.icon);
summary.setLayoutParams(summaryLayout); summary.setLayoutParams(summaryLayout);