Merge branch 'master' of https://github.com/johnkil/Android-AppMsg

Author: johnkil

library/src/com/devspark/appmsg/AppMsg.java

@@ -21,6 +21,7 @@
 import android.content.res.Resources;
 import android.view.LayoutInflater;
 import android.view.View;
+import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.view.ViewGroup.LayoutParams;
 import android.view.animation.Animation;
@@ -132,8 +133,21 @@ public static AppMsg makeText(Activity context, CharSequence text, Style style)
         return makeText(context, text, style, R.layout.app_msg);
     }
 
+
+    /**
+     * Make a {@link AppMsg} that just contains a text view.
+     *
+     * @param context The context to use. Usually your
+     *                {@link android.app.Activity} object.
+     * @param text    The text to show. Can be formatted text.
+     * @param style   The style with a background and a duration.
+     */
+    public static AppMsg makeText(Activity context, CharSequence text, Style style, OnClickListener clickListener) {
+        return makeText(context, text, style, R.layout.app_msg);
+    }
+    
     /**
-     * @author mengguoqiang 扩展支持设置字体大小
+     * @author mengguoqiang
      * Make a {@link AppMsg} that just contains a text view.
      *
      * @param context The context to use. Usually your
@@ -144,6 +158,20 @@ public static AppMsg makeText(Activity context, CharSequence text, Style style)
     public static AppMsg makeText(Activity context, CharSequence text, Style style, float textSize) {
         return makeText(context, text, style, R.layout.app_msg, textSize);
     }
+    
+    
+    /**
+     * @author mengguoqiang
+     * Make a {@link AppMsg} that just contains a text view.
+     *
+     * @param context The context to use. Usually your
+     *                {@link android.app.Activity} object.
+     * @param text    The text to show. Can be formatted text.
+     * @param style   The style with a background and a duration.
+     */
+    public static AppMsg makeText(Activity context, CharSequence text, Style style, float textSize, OnClickListener clickListener) {
+        return makeText(context, text, style, R.layout.app_msg, textSize, clickListener);
+    }
 
     /**
      * Make a {@link AppMsg} with a custom layout. The layout must have a {@link TextView} com id {@link android.R.id.message}
@@ -161,8 +189,44 @@ public static AppMsg makeText(Activity context, CharSequence text, Style style,
         return makeText(context, text, style, v, true);
     }
 
+    
     /**
-     * @author mengguoqiang 扩展支持字体大小
+     * Make a {@link AppMsg} with a custom layout. The layout must have a {@link TextView} com id {@link android.R.id.message}
+     *
+     * @param context The context to use. Usually your
+     *                {@link android.app.Activity} object.
+     * @param text    The text to show. Can be formatted text.
+     * @param style   The style with a background and a duration.
+     */
+    public static AppMsg makeText(Activity context, CharSequence text, Style style, int layoutId, OnClickListener clickListener) {
+        LayoutInflater inflate = (LayoutInflater)
+                context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+        View v = inflate.inflate(layoutId, null);
+
+        return makeText(context, text, style, v, true);
+    }
+    
+    
+    
+    /**
+     * @author mengguoqiang
+     * Make a {@link AppMsg} with a custom layout. The layout must have a {@link TextView} com id {@link android.R.id.message}
+     *
+     * @param context The context to use. Usually your
+     *                {@link android.app.Activity} object.
+     * @param text    The text to show. Can be formatted text.
+     * @param style   The style with a background and a duration.
+     */
+    public static AppMsg makeText(Activity context, CharSequence text, Style style, int layoutId, float textSize, OnClickListener clickListener) {
+        LayoutInflater inflate = (LayoutInflater)
+                context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+        View v = inflate.inflate(layoutId, null);
+
+        return makeText(context, text, style, v, true, textSize, clickListener);
+    }
+    
+    /**
+     * @author mengguoqiang
      * Make a {@link AppMsg} with a custom layout. The layout must have a {@link TextView} com id {@link android.R.id.message}
      *
      * @param context The context to use. Usually your
@@ -177,6 +241,9 @@ public static AppMsg makeText(Activity context, CharSequence text, Style style,
 
         return makeText(context, text, style, v, true, textSize);
     }
+    
+    
+ 
 
     /**
      * Make a non-floating {@link AppMsg} with a custom view presented inside the layout.
@@ -192,6 +259,24 @@ public static AppMsg makeText(Activity context, CharSequence text, Style style,
     public static AppMsg makeText(Activity context, CharSequence text, Style style, View customView) {
        return makeText(context, text, style, customView, false);
     }
+    
+    
+
+    /**
+     * Make a non-floating {@link AppMsg} with a custom view presented inside the layout.
+     * It can be used to create non-floating notifications if floating is false.
+     *
+     * @param context  The context to use. Usually your
+     *                 {@link android.app.Activity} object.
+     * @param customView
+     *                 View to be used.
+     * @param text     The text to show. Can be formatted text.
+     * @param style    The style with a background and a duration.
+     */
+    public static AppMsg makeText(Activity context, CharSequence text, Style style, View customView, OnClickListener clickListener) {
+       return makeText(context, text, style, customView, false, clickListener);
+    }
+
 
     /**
      * Make a {@link AppMsg} with a custom view. It can be used to create non-floating notifications if floating is false.
@@ -208,9 +293,26 @@ private static AppMsg makeText(Activity context, CharSequence text, Style style,
         return makeText(context, text, style, view, floating, 0);
     }
 
+    
+    
+    /**
+     * Make a {@link AppMsg} with a custom view. It can be used to create non-floating notifications if floating is false.
+     *
+     * @param context  The context to use. Usually your
+     *                 {@link android.app.Activity} object.
+     * @param view
+     *                 View to be used.
+     * @param text     The text to show. Can be formatted text.
+     * @param style    The style with a background and a duration.
+     * @param floating true if it'll float.
+     */
+    private static AppMsg makeText(Activity context, CharSequence text, Style style, View view, boolean floating, OnClickListener clickListener) {
+        return makeText(context, text, style, view, floating, 0, clickListener);
+    }
+    
     /**
      * 
-     * @author mengguoqiang 扩展支持设置字体大小
+     * @author mengguoqiang 
      * Make a {@link AppMsg} with a custom view. It can be used to create non-floating notifications if floating is false.
      *
      * @param context  The context to use. Usually your
@@ -236,6 +338,47 @@ private static AppMsg makeText(Activity context, CharSequence text, Style style,
 
         return result;
     }
+    
+    
+    
+    /**
+     * 
+     
+     * Make a {@link AppMsg} with a custom view. It can be used to create non-floating notifications if floating is false.
+     *
+     * @param context  The context to use. Usually your
+     *                 {@link android.app.Activity} object.
+     * @param view
+     *                 View to be used.
+     * @param text     The text to show. Can be formatted text.
+     * @param style    The style with a background and a duration.
+     * @param floating true if it'll float.
+     * @param clickListener Clicklistener
+     */
+    private static AppMsg makeText(Activity context, CharSequence text, Style style, View view, boolean floating, 
+    		float textSize, OnClickListener clickListener) {
+        AppMsg result = new AppMsg(context);
+
+        view.setBackgroundResource(style.background);
+        view.setClickable(true);
+
+        TextView tv = (TextView) view.findViewById(android.R.id.message);
+        if(textSize > 0) tv.setTextSize(textSize);
+        tv.setText(text);
+
+        result.mView = view;
+        result.mDuration = style.duration;
+        result.mFloating = floating;
+        
+        view.setOnClickListener(clickListener);
+
+        return result;
+    }
+    
+    
+    
+    
+    
 
     /**
      * Make a {@link AppMsg} with a custom view. It can be used to create non-floating notifications if floating is false.