Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[TIMOB-19796] Android: Fixed CardView Layout #7466

Merged
merged 1 commit into from
Nov 30, 2015
Merged

[TIMOB-19796] Android: Fixed CardView Layout #7466

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
261 changes: 178 additions & 83 deletions android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiUICardView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,104 +12,201 @@
import org.appcelerator.titanium.TiC;
import org.appcelerator.titanium.proxy.TiViewProxy;
import org.appcelerator.titanium.util.TiConvert;
import org.appcelerator.titanium.view.TiCompositeLayout;
import org.appcelerator.titanium.view.TiUIView;
import org.appcelerator.titanium.view.TiCompositeLayout.LayoutArrangement;

import android.content.Context;
import android.support.v7.widget.CardView;
import android.view.View;
import android.view.ViewGroup;
import android.widget.FrameLayout;

public class TiUICardView extends TiUIView
{
private static final String TAG = "TiUICardView";
private int contentPaddingBottom = 0;
private int contentPaddingLeft = 0;
private int contentPaddingRight = 0;
private int contentPaddingTop = 0;

public TiUICardView(final TiViewProxy proxy)
{
super(proxy);
Log.d(TAG, "Creating a cardview", Log.DEBUG_MODE);

CardView cardview = new CardView(getProxy().getActivity())
{
@Override
protected void onLayout(boolean changed, int left, int top, int right, int bottom)
{
super.onLayout(changed, left, top, right, bottom);

if (proxy != null && proxy.hasListeners(TiC.EVENT_POST_LAYOUT)) {
proxy.fireEvent(TiC.EVENT_POST_LAYOUT, null, false);
}
}
};
cardview.setPadding(0, 0, 0, 0);
cardview.setFocusable(false);
setNativeView(cardview);

}

@Override
public void processProperties(KrollDict d)
{
super.processProperties(d);

CardView cardview = (CardView) getNativeView();

if (d.containsKey(TiC.PROPERTY_CARD_BACKGROUND_COLOR)) {
cardview.setCardBackgroundColor(TiConvert.toColor(d, TiC.PROPERTY_CARD_BACKGROUND_COLOR));
}
public int contentPaddingLeft, contentPaddingTop, contentPaddingRight, contentPaddingBottom;

if (d.containsKey(TiC.PROPERTY_CARD_CORNER_RADIUS)) {
cardview.setRadius(TiConvert.toFloat(d.get(TiC.PROPERTY_CARD_CORNER_RADIUS)));
}
private static final String TAG = "TiUICardView";

if (d.containsKey(TiC.PROPERTY_CARD_USE_COMPAT_PADDING)) {
cardview.setUseCompatPadding(TiConvert.toBoolean(d, TiC.PROPERTY_CARD_USE_COMPAT_PADDING, false));
}
public class TiUICardViewLayout extends TiCompositeLayout {

if (d.containsKey(TiC.PROPERTY_CARD_ELEVATION)) {
cardview.setCardElevation(TiConvert.toFloat(d.get(TiC.PROPERTY_CARD_ELEVATION)));
}
public TiUICardViewLayout(Context context, LayoutArrangement arrangement)
{
super(context, arrangement, proxy);
}

if (d.containsKey(TiC.PROPERTY_CARD_MAX_ELEVATION)) {
cardview.setMaxCardElevation(TiConvert.toFloat(d.get(TiC.PROPERTY_CARD_MAX_ELEVATION)));
}
}

if (d.containsKey(TiC.PROPERTY_CARD_PREVENT_CORNER_OVERLAP)) {
cardview.setPreventCornerOverlap(TiConvert.toBoolean(d, TiC.PROPERTY_CARD_PREVENT_CORNER_OVERLAP, false));
}
public class TiCardView extends CardView {

if (d.containsKey(TiC.PROPERTY_CONTENT_PADDING)) {
contentPaddingBottom = TiConvert.toInt(d, TiC.PROPERTY_CONTENT_PADDING);
contentPaddingLeft = contentPaddingBottom;
contentPaddingRight = contentPaddingBottom;
contentPaddingTop = contentPaddingBottom;
}
private TiUICardViewLayout layout;

if (d.containsKey(TiC.PROPERTY_CONTENT_PADDING_BOTTOM)) {
contentPaddingBottom = TiConvert.toInt(d, TiC.PROPERTY_CONTENT_PADDING_BOTTOM);
}
public TiCardView(Context context, LayoutArrangement arrangement)
{
super(context);

if (d.containsKey(TiC.PROPERTY_CONTENT_PADDING_LEFT)) {
contentPaddingLeft = TiConvert.toInt(d, TiC.PROPERTY_CONTENT_PADDING_LEFT);
}
layout = new TiUICardViewLayout(context, arrangement);
FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
ViewGroup.LayoutParams.MATCH_PARENT);
layout.setLayoutParams(params);
super.addView(layout, params);
}

if (d.containsKey(TiC.PROPERTY_CONTENT_PADDING_RIGHT)) {
contentPaddingRight = TiConvert.toInt(d, TiC.PROPERTY_CONTENT_PADDING_RIGHT);
}
public TiUICardViewLayout getLayout()
{
return layout;
}

if (d.containsKey(TiC.PROPERTY_CONTENT_PADDING_TOP)) {
contentPaddingTop = TiConvert.toInt(d, TiC.PROPERTY_CONTENT_PADDING_TOP);
}
@Override
public void addView(View child, android.view.ViewGroup.LayoutParams params)
{
layout.addView(child, params);
}

@Override
protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
super.onLayout(changed, left, top, right, bottom);
if (proxy != null && proxy.hasListeners(TiC.EVENT_POST_LAYOUT)) {
proxy.fireEvent(TiC.EVENT_POST_LAYOUT, null, false);
}
}


}

public TiUICardView(final TiViewProxy proxy)
{
// we create the view after the properties are processed
super(proxy);
}

public TiUICardViewLayout getLayout()
{
View nativeView = getNativeView();
return ((TiCardView) nativeView).layout;

}

cardview.setContentPadding(contentPaddingLeft, contentPaddingTop, contentPaddingRight, contentPaddingBottom);
@Override
public void add(TiUIView child)
{
super.add(child);

cardview.invalidate();
}

@Override
public void propertyChanged(String key, Object oldValue, Object newValue, KrollProxy proxy)
{
CardView cardview = (CardView) getNativeView();
if (getNativeView() != null) {
getLayout().requestLayout();
if (child.getNativeView() != null) {
child.getNativeView().requestLayout();
}
}
}

@Override
public void remove(TiUIView child)
{
if (child != null) {
View cv = child.getOuterView();
if (cv != null) {
View nv = getLayout();
if (nv instanceof ViewGroup) {
((ViewGroup) nv).removeView(cv);
children.remove(child);
child.setParent(null);
}
}
}
}

@Override
public void resort()
{
View v = getLayout();
if ( v instanceof TiCompositeLayout) {
((TiCompositeLayout) v).resort();
}
}

@Override
public void processProperties(KrollDict d)
{
super.processProperties(d);

// we create the view here
View view = null;
LayoutArrangement arrangement = LayoutArrangement.DEFAULT;

if (d.containsKey(TiC.PROPERTY_LAYOUT) && d.getString(TiC.PROPERTY_LAYOUT).equals(TiC.LAYOUT_VERTICAL)) {
arrangement = LayoutArrangement.VERTICAL;
} else if (d.containsKey(TiC.PROPERTY_LAYOUT) && d.getString(TiC.PROPERTY_LAYOUT).equals(TiC.LAYOUT_HORIZONTAL)) {
arrangement = LayoutArrangement.HORIZONTAL;
}

view = new TiCardView(getProxy().getActivity(), arrangement);
view.setPadding(0, 0, 0, 0);
view.setFocusable(false);
TiCardView cardview = (TiCardView) view;

if (d.containsKey(TiC.PROPERTY_CARD_BACKGROUND_COLOR)) {
cardview.setCardBackgroundColor(TiConvert.toColor(d, TiC.PROPERTY_CARD_BACKGROUND_COLOR));
}

if (d.containsKey(TiC.PROPERTY_CARD_CORNER_RADIUS)) {
cardview.setRadius(TiConvert.toFloat(d.get(TiC.PROPERTY_CARD_CORNER_RADIUS)));
}

if (d.containsKey(TiC.PROPERTY_CARD_USE_COMPAT_PADDING)) {
cardview.setUseCompatPadding(TiConvert.toBoolean(d, TiC.PROPERTY_CARD_USE_COMPAT_PADDING, false));
}

if (d.containsKey(TiC.PROPERTY_CARD_ELEVATION)) {
cardview.setCardElevation(TiConvert.toFloat(d.get(TiC.PROPERTY_CARD_ELEVATION)));
}

if (d.containsKey(TiC.PROPERTY_CARD_MAX_ELEVATION)) {
cardview.setMaxCardElevation(TiConvert.toFloat(d.get(TiC.PROPERTY_CARD_MAX_ELEVATION)));
}

if (d.containsKey(TiC.PROPERTY_CARD_PREVENT_CORNER_OVERLAP)) {
cardview.setPreventCornerOverlap(TiConvert.toBoolean(d, TiC.PROPERTY_CARD_PREVENT_CORNER_OVERLAP, false));
}

if (d.containsKey(TiC.PROPERTY_CONTENT_PADDING)) {
contentPaddingBottom = TiConvert.toInt(d, TiC.PROPERTY_CONTENT_PADDING);
contentPaddingLeft = contentPaddingBottom;
contentPaddingRight = contentPaddingBottom;
contentPaddingTop = contentPaddingBottom;
}

if (d.containsKey(TiC.PROPERTY_CONTENT_PADDING_BOTTOM)) {
contentPaddingBottom = TiConvert.toInt(d, TiC.PROPERTY_CONTENT_PADDING_BOTTOM);
}

if (d.containsKey(TiC.PROPERTY_CONTENT_PADDING_LEFT)) {
contentPaddingLeft = TiConvert.toInt(d, TiC.PROPERTY_CONTENT_PADDING_LEFT);
}

if (d.containsKey(TiC.PROPERTY_CONTENT_PADDING_RIGHT)) {
contentPaddingRight = TiConvert.toInt(d, TiC.PROPERTY_CONTENT_PADDING_RIGHT);
}

if (d.containsKey(TiC.PROPERTY_CONTENT_PADDING_TOP)) {
contentPaddingTop = TiConvert.toInt(d, TiC.PROPERTY_CONTENT_PADDING_TOP);
}

cardview.setContentPadding(contentPaddingLeft, contentPaddingTop, contentPaddingRight, contentPaddingBottom);

setNativeView(view);

}

@Override
public void propertyChanged(String key, Object oldValue, Object newValue, KrollProxy proxy)
{
if (Log.isDebugModeEnabled()) {
Log.d(TAG, "Property: " + key + " old: " + oldValue + " new: " + newValue, Log.DEBUG_MODE);
}

TiCardView cardview = ((TiCardView) getNativeView());

if (key.equals(TiC.PROPERTY_CARD_BACKGROUND_COLOR)) {
cardview.setCardBackgroundColor(TiConvert.toColor(TiConvert.toString(newValue)));
cardview.requestLayout();
Expand Down Expand Up @@ -154,8 +251,6 @@ public void propertyChanged(String key, Object oldValue, Object newValue, KrollP
} else {
super.propertyChanged(key, oldValue, newValue, proxy);
}


}
}

}