timob-12176: set min row height to 30dp, fix layout of default template

tidev · Mar 26, 2013 · 4c4c5cb · 4c4c5cb
1 parent f3ceb32
commit 4c4c5cb
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/listview/TiBaseListViewItem.java b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/listview/TiBaseListViewItem.java
@@ -10,6 +10,7 @@
 import java.util.HashMap;
 
 import org.appcelerator.kroll.KrollDict;
+import org.appcelerator.titanium.TiDimension;
 import org.appcelerator.titanium.view.TiCompositeLayout;
 import org.appcelerator.titanium.view.TiUIView;
 
@@ -22,6 +23,7 @@ public class TiBaseListViewItem extends TiCompositeLayout{
 
 	private HashMap<String, ViewItem> viewsMap;
 	private ViewItem viewItem;
+	private int minHeight;
 	public TiBaseListViewItem(Context context) {
 		super(context);
 		viewsMap = new HashMap<String, ViewItem>();
@@ -30,7 +32,9 @@ public TiBaseListViewItem(Context context) {
 	public TiBaseListViewItem(Context context, AttributeSet set) {
 		super(context, set);
 		setId(TiListView.listContentId);
-		setMinimumHeight(TiListView.MIN_ROW_HEIGHT);
+		TiDimension heightDimension = new TiDimension(TiListView.MIN_ROW_HEIGHT, TiDimension.TYPE_UNDEFINED);
+		minHeight = heightDimension.getAsPixels(this);
+		setMinimumHeight(minHeight);
 		viewsMap = new HashMap<String, ViewItem>();
 		viewItem = new ViewItem(null, new KrollDict());
 	}
@@ -58,8 +62,8 @@ public TiUIView getViewFromBinding(String binding) {
 	protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
 		int h = MeasureSpec.getSize(heightMeasureSpec);
 		int hMode = MeasureSpec.getMode(heightMeasureSpec);
-		if (h < TiListView.MIN_ROW_HEIGHT && hMode == MeasureSpec.EXACTLY) {
-			h = TiListView.MIN_ROW_HEIGHT;
+		if (h < minHeight && hMode == MeasureSpec.EXACTLY) {
+			h = minHeight;
 		}
 		super.onMeasure(widthMeasureSpec, MeasureSpec.makeMeasureSpec(h, hMode));
 	}

diff --git a/...modules/ui/src/java/ti/modules/titanium/ui/widget/listview/TiDefaultListViewTemplate.java b/...modules/ui/src/java/ti/modules/titanium/ui/widget/listview/TiDefaultListViewTemplate.java
@@ -42,8 +42,8 @@ public void generateDefaultProps(Activity activity) {
 		labelProxy.getProperties().put(TiC.PROPERTY_TOUCH_ENABLED, false);
 		labelProxy.setActivity(activity);
 		//Generate properties
-		defaultLabelProperties.put(TiC.PROPERTY_LEFT, "2%");
-		defaultLabelProperties.put(TiC.PROPERTY_WIDTH, "80%");
+		defaultLabelProperties.put(TiC.PROPERTY_LEFT, "2dp");
+		defaultLabelProperties.put(TiC.PROPERTY_WIDTH, "55%");
 		defaultLabelProperties.put(TiC.PROPERTY_TEXT, "label");
 		//bind the proxy and default propertiess
 		DataItem labelItem = new DataItem(labelProxy, TiC.PROPERTY_TITLE, rootItem);
@@ -58,7 +58,7 @@ public void generateDefaultProps(Activity activity) {
 		imageProxy.getProperties().put(TiC.PROPERTY_TOUCH_ENABLED, false);
 		imageProxy.setActivity(activity);
 		//Generate properties
-		defaultImageProperties.put(TiC.PROPERTY_RIGHT, "0");
+		defaultImageProperties.put(TiC.PROPERTY_RIGHT, "25dp");
 		defaultImageProperties.put(TiC.PROPERTY_WIDTH, "15%");
 		//bind the proxy and default properties
 		DataItem imageItem = new DataItem (imageProxy, TiC.PROPERTY_IMAGE, rootItem);

diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/listview/TiListView.java b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/listview/TiListView.java
@@ -66,7 +66,7 @@ public class TiListView extends TiUIView {
 	 */
 	public static List<String> MUST_SET_PROPERTIES = Arrays.asList(TiC.PROPERTY_VALUE);
 
-	public static final int MIN_ROW_HEIGHT = 50;
+	public static final String MIN_ROW_HEIGHT = "30dp";
 	public static final int HEADER_FOOTER_ITEM_TYPE = 0;
 	public static final int BUILT_IN_TEMPLATE_ITEM_TYPE = 1;