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

More improvements to the app list layout

Browse Source 
* Don't use a RelativeLayout for the whole thing
* Use more external paddings, not per-element paddings
* Center everything vertically
This commit is contained in:
Daniel Martí 2014-04-10 16:33:15 +02:00
parent e7f76705c8
commit 8ed76f47ee
2 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
res/layout/applistitem.xml
View File

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:orientation="horizontal"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="5dp" android:padding="10dp"
android:baselineAligned="false" > android:baselineAligned="false" >
<!-- Actual icon size is dependent on preferences and set in <!-- Actual icon size is dependent on preferences and set in
@ -13,8 +13,7 @@
android:contentDescription="@string/app_icon" android:contentDescription="@string/app_icon"
android:layout_width="56dp" android:layout_width="56dp"
android:layout_height="56dp" android:layout_height="56dp"
android:layout_centerVertical="true" android:layout_gravity="center_vertical"
android:padding="5dp"
android:scaleType="fitCenter" android:scaleType="fitCenter"
/> />
@ -22,10 +21,11 @@
android:orientation="vertical" android:orientation="vertical"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="5dp" android:paddingLeft="10dp"
android:paddingStart="10dp"
android:layout_toRightOf="@id/icon" android:layout_toRightOf="@id/icon"
android:layout_toEndOf="@id/icon" android:layout_toEndOf="@id/icon"
android:layout_centerVertical="true" android:layout_gravity="center_vertical"
android:baselineAligned="false" > android:baselineAligned="false" >
<LinearLayout <LinearLayout
@ -33,17 +33,18 @@
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:baselineAligned="false" android:baselineAligned="false"
android:layout_marginBottom="3dp"
> >
<TextView android:id="@+id/name" <TextView android:id="@+id/name"
android:textSize="17sp" android:textSize="17sp"
android:textStyle="bold" android:textStyle="bold"
android:paddingBottom="3sp"
android:singleLine="true" android:singleLine="true"
android:ellipsize="end" android:ellipsize="end"
android:layout_weight="2" android:layout_weight="2"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:textAlignment="viewStart" android:textAlignment="viewStart"
/> />
@ -54,8 +55,9 @@
android:layout_weight="1" android:layout_weight="1"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="6sp" android:layout_marginLeft="8dp"
android:layout_marginStart="6sp" android:layout_marginStart="8dp"
android:layout_gravity="center_vertical"
android:textAlignment="viewEnd" android:textAlignment="viewEnd"
/> />
@ -75,6 +77,7 @@
android:layout_weight="2" android:layout_weight="2"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:textAlignment="viewStart" android:textAlignment="viewStart"
/> />
@ -87,13 +90,12 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="6sp" android:layout_marginLeft="6sp"
android:layout_marginStart="6sp" android:layout_marginStart="6sp"
android:layout_gravity="center_vertical"
android:textAlignment="viewEnd" android:textAlignment="viewEnd"
/> />
<!--android:layout_alignParentRight="true"-->
<!--android:layout_alignParentEnd="true"-->
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</RelativeLayout> </LinearLayout>

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

@ -9,7 +9,7 @@ import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.RelativeLayout; import android.widget.LinearLayout;
import android.widget.TextView; import android.widget.TextView;
import com.nostra13.universalimageloader.core.DisplayImageOptions; import com.nostra13.universalimageloader.core.DisplayImageOptions;
import com.nostra13.universalimageloader.core.ImageLoader; import com.nostra13.universalimageloader.core.ImageLoader;
@ -151,8 +151,8 @@ abstract public class AppListAdapter extends CursorAdapter {
? R.dimen.applist_icon_compact_size ? R.dimen.applist_icon_compact_size
: R.dimen.applist_icon_normal_size)); : R.dimen.applist_icon_normal_size));
RelativeLayout.LayoutParams params = LinearLayout.LayoutParams params =
(RelativeLayout.LayoutParams)icon.getLayoutParams(); (LinearLayout.LayoutParams)icon.getLayoutParams();
params.height = size; params.height = size;
params.width = size; params.width = size;