From bac2bd933bad0cfac0c04e2cffe5b2b46bf868f1 Mon Sep 17 00:00:00 2001 From: seven332 Date: Sun, 3 May 2015 13:59:54 +0800 Subject: [PATCH] Rename SimpleDialogView to SceneDialogView --- ...impleDialogView.java => SceneDialogView.java} | 8 ++++---- .../main/java/com/hippo/scene/SimpleDialog.java | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) rename app/src/main/java/com/hippo/scene/{SimpleDialogView.java => SceneDialogView.java} (87%) diff --git a/app/src/main/java/com/hippo/scene/SimpleDialogView.java b/app/src/main/java/com/hippo/scene/SceneDialogView.java similarity index 87% rename from app/src/main/java/com/hippo/scene/SimpleDialogView.java rename to app/src/main/java/com/hippo/scene/SceneDialogView.java index a1d4de893..09ed39446 100644 --- a/app/src/main/java/com/hippo/scene/SimpleDialogView.java +++ b/app/src/main/java/com/hippo/scene/SceneDialogView.java @@ -24,24 +24,24 @@ import com.hippo.util.ViewUtils; import com.hippo.widget.HotspotTouchHelper; import com.hippo.widget.Hotspotable; -public class SimpleDialogView extends SceneView implements View.OnClickListener, Hotspotable { +public class SceneDialogView extends SceneView implements View.OnClickListener, Hotspotable { private float mHostpotX; private float mHostpotY; private OnClickOutOfDialogListener mOnClickOutOfDialogListener; - public SimpleDialogView(Context context) { + public SceneDialogView(Context context) { super(context); init(); } - public SimpleDialogView(Context context, AttributeSet attrs) { + public SceneDialogView(Context context, AttributeSet attrs) { super(context, attrs); init(); } - public SimpleDialogView(Context context, AttributeSet attrs, int defStyleAttr) { + public SceneDialogView(Context context, AttributeSet attrs, int defStyleAttr) { super(context, attrs, defStyleAttr); init(); } diff --git a/app/src/main/java/com/hippo/scene/SimpleDialog.java b/app/src/main/java/com/hippo/scene/SimpleDialog.java index 28dbf012f..9116efa36 100644 --- a/app/src/main/java/com/hippo/scene/SimpleDialog.java +++ b/app/src/main/java/com/hippo/scene/SimpleDialog.java @@ -30,7 +30,7 @@ import com.hippo.util.ViewUtils; import com.hippo.widget.IndicatingScrollView; public class SimpleDialog extends SceneDialog implements View.OnClickListener, - SimpleDialogView.OnClickOutOfDialogListener { + SceneDialogView.OnClickOutOfDialogListener { private static final int BACKGROUND_COLOR = 0x61000000; @@ -38,7 +38,7 @@ public class SimpleDialog extends SceneDialog implements View.OnClickListener, private StageActivity mActivity; - private SimpleDialogView mSimpleDialogView; + private SceneDialogView mSceneDialogView; private SimpleDialogFrame mFrame; private View mBody; private TextView mTitle; @@ -70,7 +70,7 @@ public class SimpleDialog extends SceneDialog implements View.OnClickListener, mActivity.getLayoutInflater().inflate(R.layout.simple_dialog, mFrame); - mSimpleDialogView = (SimpleDialogView) getSceneView(); + mSceneDialogView = (SceneDialogView) getSceneView(); mBody = findViewById(R.id.body); mTitle = (TextView) mBody.findViewById(R.id.title); mSpaceTitleContent = (Space) mBody.findViewById(R.id.space_title_content); @@ -123,12 +123,12 @@ public class SimpleDialog extends SceneDialog implements View.OnClickListener, } } - mSimpleDialogView.setOnClickOutOfDialogListener(this); + mSceneDialogView.setOnClickOutOfDialogListener(this); } @Override protected SceneView createSceneView(Context context) { - return new SimpleDialogView(context); + return new SceneDialogView(context); } @Override @@ -146,12 +146,12 @@ public class SimpleDialog extends SceneDialog implements View.OnClickListener, throw new IllegalArgumentException("location must be an array of two integers"); } - if (mSimpleDialogView == null) { + if (mSceneDialogView == null) { location[0] = 0; location[1] = 0; } else { - location[0] = mSimpleDialogView.getWidth() / 2; - location[1] = (mSimpleDialogView.getHeight() - mFitPaddingBottom) / 2; + location[0] = mSceneDialogView.getWidth() / 2; + location[1] = (mSceneDialogView.getHeight() - mFitPaddingBottom) / 2; } }