- hide set color api because:

* it make my develop become hard
* it is no use for user

Author: ForgetAll

.idea/misc.xml

@@ -1 +1,2 @@
 /build
+/src/main/java/com.xiasuhuei321.loadingdialog/需要完成的工作笔记.txt

LoadingDialog/.gitignore

@@ -72,8 +72,8 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
     @Override
     protected void onDraw(Canvas canvas) {
         // 圆心坐标 (center,center)
-        int center = mWidth / 2;
-        int radius = mWidth / 2 - 8;
+        int center = mWidth >> 1;
+        int radius = (mWidth >> 1) - 8;
         if (currentLineIndex >= 12)
             currentLineIndex = 0;
 //        canvas.rotate(currentLineIndex * 30, center, center);

LoadingDialog/src/main/java/com/xiasuhuei321/loadingdialog/view/LoadCircleView.java

@@ -2,9 +2,11 @@
 
 import android.app.Dialog;
 import android.content.Context;
+import android.content.DialogInterface;
 import android.os.Handler;
 import android.os.Message;
 import android.support.annotation.ColorInt;
+import android.util.Log;
 import android.util.TypedValue;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -80,6 +82,12 @@ public void onBackPressed() {
         mLoadingDialog.setContentView(layout, new LinearLayout.LayoutParams(
                 LinearLayout.LayoutParams.MATCH_PARENT,
                 LinearLayout.LayoutParams.MATCH_PARENT));
+        mLoadingDialog.setOnDismissListener(new DialogInterface.OnDismissListener() {
+            @Override
+            public void onDismiss(DialogInterface dialog) {
+                mContext = null;
+            }
+        });
         initStyle();
     }
 
@@ -168,6 +176,8 @@ private void initStyle() {
     //----------------------------------对外提供的api------------------------------//
 
     /**
+     * please invoke show() method at last,because it's
+     * return value is void
      * 请在最后调用show，因此show返回值为void会使链式api断开
      */
     public void show() {
@@ -177,18 +187,27 @@ public void show() {
             mCircleLoadView.setVisibility(View.GONE);
             mLoadingDialog.show();
             mLoadingView.startAnim();
-        } else if(loadStyle == STYLE_LINE) {
+            Log.e("show", "style_ring");
+        } else if (loadStyle == STYLE_LINE) {
             mCircleLoadView.setVisibility(View.VISIBLE);
             mLoadingView.setVisibility(View.GONE);
             mLoadingDialog.show();
+            Log.e("show", "style_line");
         }
     }
 
-    public void setLoadStyle(int style) {
+    /**
+     * set load style
+     * 设置load的样式，目前支持转圈圈和菊花转圈圈
+     *
+     * @param style
+     */
+    public LoadingDialog setLoadStyle(int style) {
         if (style >= 3) {
             throw new IllegalArgumentException("Your style is wrong!");
         }
         this.loadStyle = style;
+        return this;
     }
 
     /**
@@ -242,6 +261,8 @@ public LoadingDialog setFailedText(String msg) {
     }
 
     /**
+     * when you need a successful feedback,please invoke
+     * this method in success's callback
      * 当你需要一个成功的反馈的时候，在加载成功的回调中调用此方法
      */
     public void loadSuccess() {
@@ -253,6 +274,8 @@ public void loadSuccess() {
     }
 
     /**
+     * when you need a fail feedback,please invoke this
+     * method in failed callback
      * 当你需要一个失败的反馈的时候，在加载失败的回调中调用此方法
      */
     public void loadFailed() {
@@ -329,9 +352,10 @@ public int getSpeed() {
     }
 
     /**
-     * 此方法改变成功失败绘制的颜色
+     * 此方法改变成功失败绘制的颜色，此方法增加了处理的复杂性，暂时不公开此方法。
+     * 而且暂时没有做到方便调用，真的要用的话十分的麻烦，暂时隐藏，后续不确定是否公开。
      */
-    public LoadingDialog setDrawColor(@ColorInt int color) {
+    private LoadingDialog setDrawColor(@ColorInt int color) {
         mFailedView.setDrawColor(color);
         mSuccessView.setDrawColor(color);
         loadingText.setTextColor(color);
@@ -378,10 +402,10 @@ public LoadingDialog setShowTime(long time) {
     }
 
     /**
+     * set the size of load text size
      * 设置加载字体大小
      *
-     * @param size 尺寸，单位sp
-     *             来将sp转换为对应的px值
+     * @param size 尺寸，单位sp，来将sp转换为对应的px值
      * @return 这个对象
      */
     public LoadingDialog setTextSize(float size) {
@@ -396,6 +420,7 @@ public static void initStyle(StyleManager style) {
     }
 
     /**
+     * dispatch the event when draw finish
      * 传递绘制完成的事件
      *
      * @param o 回调接口

LoadingDialog/src/main/java/com/xiasuhuei321/loadingdialog/view/LoadingDialog.java

@@ -11,7 +11,6 @@
 /**
  * Created by [email protected] on 2016/11/5.
  * desc:
- * TODO: 目前这个对勾还有点问题，在下个版本发布之前解决这个问题！问题在两条线的交点
  */
 
 public class RightDiaView extends View {

LoadingDialog/src/main/java/com/xiasuhuei321/loadingdialog/view/RightDiaView.java

@@ -21,7 +21,8 @@
         <activity
             android:name=".SampleActivity"
             android:screenOrientation="portrait" />
-        <activity android:name=".TempActivity" />
+        <activity android:name=".TempActivity"
+            android:screenOrientation="portrait"/>
     </application>
 
 </manifest>

LoadingDialog/src/main/java/com/xiasuhuei321/loadingdialog/需要完成的工作笔记.txt

@@ -35,7 +35,8 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
     private long delayedTime = 1000L;
     private int repeatTime = 0;
     private boolean intercept_back_event = false;
-    private int color = Color.argb(100, 255, 255, 255);
+    private int color = Color.argb(255, 255, 255, 255);
+    private int style = LoadingDialog.STYLE_LINE;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -94,8 +95,12 @@ public void onClick(View v) {
             case R.id.btn1:
                 ld = new LoadingDialog(this);
                 ld.setInterceptBack(intercept_back_event)
-                        .setLoadingText("加载中...");
-                h.sendEmptyMessage(LOADING);
+                        .setLoadingText("加载中...")
+                        .setLoadStyle(style)
+                        .show();
+
+//                h.sendEmptyMessage(LOADING);
+
                 saveForThesePeopleWhoDoNotCallCloseAndUseInterceptBackMethod(intercept_back_event);
                 break;
 
@@ -106,7 +111,8 @@ public void onClick(View v) {
                         .setInterceptBack(intercept_back_event)
                         .setLoadSpeed(speed)
                         .setRepeatCount(repeatTime)
-                        .setDrawColor(color)
+//                        .setDrawColor(color)
+                        .setLoadStyle(style)
                         .show();
                 h.sendEmptyMessageDelayed(LOAD_SUCCESS, delayedTime);
                 saveForThesePeopleWhoDoNotCallCloseAndUseInterceptBackMethod(intercept_back_event);
@@ -119,8 +125,9 @@ public void onClick(View v) {
                         .setInterceptBack(intercept_back_event)
                         .setLoadSpeed(speed)
                         .setRepeatCount(repeatTime)
-                        .setDrawColor(color)
+//                        .setDrawColor(color)
                         .setShowTime(5000)//延时5秒自动关闭，默认1秒
+                        .setLoadStyle(style)
                         .show();
                 h.sendEmptyMessageDelayed(LOAD_FAILED, delayedTime);
                 saveForThesePeopleWhoDoNotCallCloseAndUseInterceptBackMethod(intercept_back_event);
@@ -133,8 +140,9 @@ public void onClick(View v) {
                         .setInterceptBack(intercept_back_event)
                         .setLoadSpeed(speed)
                         .closeSuccessAnim()
-                        .setDrawColor(color)
+//                        .setDrawColor(color)
                         .setRepeatCount(repeatTime)
+                        .setLoadStyle(style)
                         .show();
                 h.sendEmptyMessageDelayed(LOAD_WITHOUT_ANIM_SUCCESS, delayedTime);
                 saveForThesePeopleWhoDoNotCallCloseAndUseInterceptBackMethod(intercept_back_event);
@@ -147,9 +155,10 @@ public void onClick(View v) {
                         .setInterceptBack(intercept_back_event)
                         .setLoadSpeed(speed)
                         .closeFailedAnim()
-                        .setDrawColor(color)
+//                        .setDrawColor(color)
                         .setSize(SizeUtils.dip2px(this, 100))
                         .setRepeatCount(repeatTime)
+                        .setLoadStyle(style)
                         .show();
                 h.sendEmptyMessageDelayed(LOAD_WITHOUT_ANIM_FAILED, delayedTime);
                 saveForThesePeopleWhoDoNotCallCloseAndUseInterceptBackMethod(intercept_back_event);
@@ -217,11 +226,12 @@ public boolean onOptionsItemSelected(MenuItem item) {
                 Toast.makeText(this, "now the loading callback will be draw:" + (repeatTime + 1) + " times", Toast.LENGTH_LONG).show();
                 break;
             case R.id.color:
-                color = color == Color.argb(100, 255, 255, 255) ? Color.BLUE : Color.argb(100, 255, 255, 255);
+                color = color == Color.argb(255, 255, 255, 255) ? Color.BLUE : Color.argb(255, 255, 255, 255);
                 Toast.makeText(this, "now the color is:" + color, Toast.LENGTH_LONG).show();
                 break;
             case R.id.style:
-
+                style = style == LoadingDialog.STYLE_LINE ? LoadingDialog.STYLE_RING : LoadingDialog.STYLE_LINE;
+                Toast.makeText(this, "now the style is changed", Toast.LENGTH_SHORT).show();
                 break;
         }
         return true;

app/src/main/AndroidManifest.xml

@@ -3,7 +3,6 @@
 import android.app.Application;
 
 import com.xiasuhuei321.loadingdialog.manager.StyleManager;
-import com.xiasuhuei321.loadingdialog.view.LoadingDialog;
 
 /**
  * Created by [email protected] on 2016/11/12.
@@ -18,9 +17,9 @@ public void onCreate() {
 
         //在这里调用方法设置s的属性
         //code here...
-        s.Anim(false).repeatTime(0).contentSize(-1).intercept(true)
-                .setLoadStyle(LoadingDialog.STYLE_LINE);
+//        s.Anim(true).repeatTime(0).contentSize(-1).intercept(true)
+//                .setLoadStyle(LoadingDialog.STYLE_LINE);
 
-        LoadingDialog.initStyle(s);
+//        LoadingDialog.initStyle(s);
     }
 }

app/src/main/java/com/xiasuhuei321/sample/MainActivity.java

@@ -19,6 +19,7 @@
 
     <item
         android:id="@+id/color"
+        android:visible="false"
         android:title="@string/change_color" />
 
     <item